From 45704e36c5786b34adf698fc7941177367be9dbc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 18 Jun 2013 09:00:46 +0530
Subject: [PATCH 0001/1154] Add Kobo Aura HD to Welcome Wizard

---
 src/calibre/gui2/wizard/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 798ac5faca..f813eed892 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -139,7 +139,7 @@ class Kobo(Device):
     id = 'kobo'
 
 class KoboVox(Kobo):
-    name = 'Kobo Vox'
+    name = 'Kobo Vox and Kobo Aura HD'
     output_profile = 'tablet'
     id = 'kobo_vox'
 

From 77baa05d3dbc3f13ae1d4aae1214775b2eb47c2f Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Tue, 18 Jun 2013 09:14:34 -0600
Subject: [PATCH 0002/1154] When in synchronous mode (direct to iBooks),
 disable PDF transfers, as we can't update metadata in iTunes. Not sure when
 this started, but as of 11.0.4 it's broken.

---
 src/calibre/devices/apple/driver.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 66d27bad2b..aa90e2a9ef 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -1073,6 +1073,24 @@ class ITUNES(DriverBase):
         self.plugboards = plugboards
         self.plugboard_func = pb_func
 
+    def settings(self):
+        '''
+        iBooks won't accept PDFs through the automation interface (11.0.4), not sure
+        when that became a problem. If we're directly connected to the iDevice,
+        remove PDF from list of supported formats.
+        '''
+        if self.verbose:
+            logger().info("%s.settings()" % self.__class__.__name__)
+
+        # If direct connection, remove PDF support
+        if self.manual_sync_mode:
+            opts = super(ITUNES, self).settings()
+            if 'pdf' in opts.format_map:
+                opts.format_map.remove('pdf')
+            return opts
+        else:
+            return super(ITUNES, self).settings()
+
     def shutdown(self):
         if False and self.verbose:
             logger().info("%s.shutdown()\n" % self.__class__.__name__)
@@ -3014,6 +3032,7 @@ class ITUNES(DriverBase):
                 lb_added.year.set(metadata_x.pubdate.year)
 
             if db_added:
+                # This will fail for PDF files
                 db_added.name.set(metadata_x.title)
                 db_added.album.set(metadata_x.title)
                 db_added.artist.set(authors_to_string(metadata_x.authors))

From ccaa960edf9733e78028cb50c73b805790196a3e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 19 Jun 2013 10:02:20 +0530
Subject: [PATCH 0003/1154] pep8

---
 src/calibre/gui2/dialogs/plugin_updater.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py
index 3820169876..df76bec27d 100644
--- a/src/calibre/gui2/dialogs/plugin_updater.py
+++ b/src/calibre/gui2/dialogs/plugin_updater.py
@@ -254,7 +254,7 @@ Platforms: Windows, OSX, Linux; History: Yes;</span></i></li>
         return self.installed_version is not None
 
     def is_upgrade_available(self):
-        return self.is_installed() and (self.installed_version < self.available_version \
+        return self.is_installed() and (self.installed_version < self.available_version
                 or self.is_deprecated)
 
     def is_valid_platform(self):
@@ -317,7 +317,7 @@ class DisplayPluginModel(QAbstractTableModel):
 
     def data(self, index, role):
         if not index.isValid():
-            return NONE;
+            return NONE
         row, col = index.row(), index.column()
         if row < 0 or row >= self.rowCount():
             return NONE
@@ -357,7 +357,7 @@ class DisplayPluginModel(QAbstractTableModel):
             else:
                 return self._get_status_tooltip(display_plugin)
         elif role == Qt.ForegroundRole:
-            if col != 1: # Never change colour of the donation column
+            if col != 1:  # Never change colour of the donation column
                 if display_plugin.is_deprecated:
                     return QVariant(QBrush(Qt.blue))
                 if display_plugin.is_disabled():
@@ -417,7 +417,7 @@ class DisplayPluginModel(QAbstractTableModel):
                     icon_name = 'plugin_upgrade_invalid.png'
             else:
                 icon_name = 'plugin_upgrade_ok.png'
-        else: # A plugin available not currently installed
+        else:  # A plugin available not currently installed
             if display_plugin.is_valid_to_install():
                 icon_name = 'plugin_new_valid.png'
             else:
@@ -429,11 +429,11 @@ class DisplayPluginModel(QAbstractTableModel):
             return QVariant(_('This plugin has been deprecated and should be uninstalled')+'\n\n'+
                             _('Right-click to see more options'))
         if not display_plugin.is_valid_platform():
-            return QVariant(_('This plugin can only be installed on: %s') % \
+            return QVariant(_('This plugin can only be installed on: %s') %
                             ', '.join(display_plugin.platforms)+'\n\n'+
                             _('Right-click to see more options'))
         if numeric_version < display_plugin.calibre_required_version:
-            return QVariant(_('You must upgrade to at least Calibre %s before installing this plugin') % \
+            return QVariant(_('You must upgrade to at least Calibre %s before installing this plugin') %
                             self._get_display_version(display_plugin.calibre_required_version)+'\n\n'+
                             _('Right-click to see more options'))
         if display_plugin.installed_version < display_plugin.available_version:
@@ -687,7 +687,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
 
     def _install_clicked(self):
         display_plugin = self._selected_display_plugin()
-        if not question_dialog(self, _('Install %s')%display_plugin.name, '<p>' + \
+        if not question_dialog(self, _('Install %s')%display_plugin.name, '<p>' +
                 _('Installing plugins is a <b>security risk</b>. '
                 'Plugins can contain a virus/malware. '
                     'Only install it if you got it from a trusted source.'
@@ -886,3 +886,4 @@ class PluginUpdaterDialog(SizePersistedDialog):
         pt.write(raw)
         pt.close()
         return pt.name
+

From 07c935b700bd6e7d35f3e587caa1a189b1a49669 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 19 Jun 2013 10:12:03 +0530
Subject: [PATCH 0004/1154] Do not show builtin plugins in the get new plugins
 dialog

If a builtin plugin with the same name as a third party plugin exists,
then the builtin plagin was displayed in the get new plugins dialog as
installed (happened with the new DOCX Input plugin).
---
 src/calibre/gui2/dialogs/plugin_updater.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py
index df76bec27d..c5d79218f9 100644
--- a/src/calibre/gui2/dialogs/plugin_updater.py
+++ b/src/calibre/gui2/dialogs/plugin_updater.py
@@ -89,7 +89,7 @@ def get_installed_plugin_status(display_plugin):
     display_plugin.installed_version = None
     display_plugin.plugin = None
     for plugin in initialized_plugins():
-        if plugin.name == display_plugin.name:
+        if plugin.name == display_plugin.name and plugin.plugin_path is not None:
             display_plugin.plugin = plugin
             display_plugin.installed_version = plugin.version
             break

From 0e14d36438eeb7ed8f39610267a1c78b7f98889f Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Wed, 19 Jun 2013 14:23:43 +1000
Subject: [PATCH 0005/1154] SQL delete needs firmware check for older Kobo
 firmare

Kobo driver: Fix a regression when deleting empty shelves on Kobo devices with older firmware.
Fixes #1192441 [Private bug](https://bugs.launchpad.net/calibre/+bug/1192441)

As reported here,
http://www.mobileread.com/forums/showthread.php?t=214760, if the Kobo
device is using firmware before 2.5.0, it doesn't have the Activity
table. The delete from this table when maintaining shelves needs a
version check around it.
---
 src/calibre/devices/kobo/driver.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index cddf6a561f..cb325efb07 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -1880,7 +1880,7 @@ class KOBOTOUCH(KOBO):
 
                     # Remove any entries for the Activity table - removes tile from new home page
                     if self.has_activity_table():
-                        debug_print('KoboTouch:delete_via_sql: detete from Activity')
+                        debug_print('KoboTouch:delete_via_sql: delete from Activity')
                         cursor.execute('delete from Activity where Id =?', t)
 
                     connection.commit()
@@ -2391,7 +2391,8 @@ class KOBOTOUCH(KOBO):
         cursor = connection.cursor()
         cursor.execute(delete_query)
         cursor.execute(update_query)
-        cursor.execute(delete_activity_query)
+        if self.has_activity_table():
+            cursor.execute(delete_activity_query)
         connection.commit()
         cursor.close()
 

From 8bd6cc840c8460279d1413cdf5ed141f0c12a9a4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 19 Jun 2013 11:36:33 +0530
Subject: [PATCH 0006/1154] DOCX metadata: Be more intelligent for covers

DOCX metadata: When reading covers from DOCX files use the first image
as specified in the actual markup instead of just the first image in the
container.
---
 src/calibre/ebooks/metadata/docx.py | 40 ++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/calibre/ebooks/metadata/docx.py b/src/calibre/ebooks/metadata/docx.py
index ea34d27d3a..2c8b91bc70 100644
--- a/src/calibre/ebooks/metadata/docx.py
+++ b/src/calibre/ebooks/metadata/docx.py
@@ -8,29 +8,39 @@ __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 from calibre.ebooks.docx.container import DOCX
+from calibre.ebooks.docx.names import XPath, get
 
-from calibre.utils.zipfile import ZipFile
 from calibre.utils.magick.draw import identify_data
 
+images = XPath('//*[name()="w:drawing" or name()="w:pict"]/descendant::*[(name()="a:blip" and @r:embed) or (name()="v:imagedata" and @r:id)][1]')
+
+def get_cover(docx):
+    doc = docx.document
+    rid_map = docx.document_relationships[0]
+    for image in images(doc):
+        rid = get(image, 'r:embed') or get(image, 'r:id')
+        if rid in rid_map:
+            try:
+                raw = docx.read(rid_map[rid])
+                width, height, fmt = identify_data(raw)
+            except Exception:
+                continue
+            if 0.8 <= height/width <= 1.8 and height*width >= 160000:
+                return (fmt, raw)
+
 def get_metadata(stream):
     c = DOCX(stream, extract=False)
     mi = c.metadata
+    try:
+        cdata = get_cover(c)
+    except Exception:
+        cdata = None
+        import traceback
+        traceback.print_exc()
     c.close()
     stream.seek(0)
-    cdata = None
-    with ZipFile(stream, 'r') as zf:
-        for zi in zf.infolist():
-            ext = zi.filename.rpartition('.')[-1].lower()
-            if cdata is None and ext in {'jpeg', 'jpg', 'png', 'gif'}:
-                raw = zf.read(zi)
-                try:
-                    width, height, fmt = identify_data(raw)
-                except:
-                    continue
-                if 0.8 <= height/width <= 1.8 and height*width >= 160000:
-                    cdata = (fmt, raw)
-        if cdata is not None:
-            mi.cover_data = cdata
+    if cdata is not None:
+        mi.cover_data = cdata
 
     return mi
 

From 8020f489ca9eb51f3b997aba384f08bd4143ebcb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 19 Jun 2013 12:39:20 +0530
Subject: [PATCH 0007/1154] pep8

---
 src/calibre/web/feeds/templates.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/calibre/web/feeds/templates.py b/src/calibre/web/feeds/templates.py
index a22a79ef20..68af525cfd 100644
--- a/src/calibre/web/feeds/templates.py
+++ b/src/calibre/web/feeds/templates.py
@@ -13,7 +13,7 @@ from lxml.html.builder import HTML, HEAD, TITLE, STYLE, DIV, BODY, \
 
 from calibre import preferred_encoding, strftime, isbytestring
 
-def CLASS(*args, **kwargs): # class is a reserved word in Python
+def CLASS(*args, **kwargs):  # class is a reserved word in Python
     kwargs['class'] = ' '.join(args)
     return kwargs
 
@@ -26,7 +26,7 @@ class Template(object):
         self.html_lang = lang
 
     def generate(self, *args, **kwargs):
-        if not kwargs.has_key('style'):
+        if 'style' not in kwargs:
             kwargs['style'] = ''
         for key in kwargs.keys():
             if isbytestring(kwargs[key]):
@@ -152,8 +152,8 @@ class FeedTemplate(Template):
         body.append(div)
         if getattr(feed, 'image', None):
             div.append(DIV(IMG(
-                alt = feed.image_alt if feed.image_alt else '',
-                src = feed.image_url
+                alt=feed.image_alt if feed.image_alt else '',
+                src=feed.image_url
                 ),
                 CLASS('calibre_feed_image')))
         if getattr(feed, 'description', None):
@@ -261,8 +261,8 @@ class TouchscreenIndexTemplate(Template):
         for i, feed in enumerate(feeds):
             if feed:
                 tr = TR()
-                tr.append(TD( CLASS('calibre_rescale_120'), A(feed.title, href='feed_%d/index.html'%i)))
-                tr.append(TD( '%s' % len(feed.articles), style="text-align:right"))
+                tr.append(TD(CLASS('calibre_rescale_120'), A(feed.title, href='feed_%d/index.html'%i)))
+                tr.append(TD('%s' % len(feed.articles), style="text-align:right"))
                 toc.append(tr)
         div = DIV(
                 masthead_p,
@@ -307,7 +307,7 @@ class TouchscreenFeedTemplate(Template):
         if f > 0:
             link = A(CLASS('feed_link'),
                      trim_title(feeds[f-1].title),
-                     href = '../feed_%d/index.html' % int(f-1))
+                     href='../feed_%d/index.html' % int(f-1))
         navbar_tr.append(TD(CLASS('feed_prev'),link))
 
         # Up to Sections
@@ -319,13 +319,12 @@ class TouchscreenFeedTemplate(Template):
         if f < len(feeds)-1:
             link = A(CLASS('feed_link'),
                      trim_title(feeds[f+1].title),
-                     href = '../feed_%d/index.html' % int(f+1))
+                     href='../feed_%d/index.html' % int(f+1))
         navbar_tr.append(TD(CLASS('feed_next'),link))
         navbar_t.append(navbar_tr)
         top_navbar = navbar_t
         bottom_navbar = copy.copy(navbar_t)
-        #print "\n%s\n" % etree.tostring(navbar_t, pretty_print=True)
-
+        # print "\n%s\n" % etree.tostring(navbar_t, pretty_print=True)
 
         # Build the page
         head = HEAD(TITLE(feed.title))
@@ -342,8 +341,8 @@ class TouchscreenFeedTemplate(Template):
 
         if getattr(feed, 'image', None):
             div.append(DIV(IMG(
-                alt = feed.image_alt if feed.image_alt else '',
-                src = feed.image_url
+                alt=feed.image_alt if feed.image_alt else '',
+                src=feed.image_url
                 ),
                 CLASS('calibre_feed_image')))
         if getattr(feed, 'description', None):
@@ -411,6 +410,7 @@ class TouchscreenNavBarTemplate(Template):
         navbar_tr.append(TD(CLASS('article_next'),link))
         navbar_t.append(navbar_tr)
         navbar.append(navbar_t)
-        #print "\n%s\n" % etree.tostring(navbar, pretty_print=True)
+        # print "\n%s\n" % etree.tostring(navbar, pretty_print=True)
 
         self.root = HTML(head, BODY(navbar))
+

From adcc1739a65a5f5dc2a1bc6b0f13531534a00c98 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 19 Jun 2013 13:12:14 +0530
Subject: [PATCH 0008/1154] News download: "downloaded from" for touchscreens

News download: Add the "downloaded from" link at the bottom of every
article when using a touchscreen output profile (like the Tablet
profile).
---
 src/calibre/web/feeds/templates.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/calibre/web/feeds/templates.py b/src/calibre/web/feeds/templates.py
index 68af525cfd..3ee90c43a6 100644
--- a/src/calibre/web/feeds/templates.py
+++ b/src/calibre/web/feeds/templates.py
@@ -387,6 +387,14 @@ class TouchscreenNavBarTemplate(Template):
         navbar_t = TABLE(CLASS('touchscreen_navbar'))
         navbar_tr = TR()
 
+        if bottom and not url.startswith('file://'):
+            navbar.append(HR())
+            text = 'This article was downloaded by '
+            p = PT(text, STRONG(__appname__), A(url, href=url),
+                    style='text-align:left; max-width: 100%; overflow: hidden;')
+            p[0].tail = ' from '
+            navbar.append(p)
+            navbar.append(BR())
         # | Previous
         if art > 0:
             link = A(CLASS('article_link'),_('Previous'),href='%s../article_%d/index.html'%(prefix, art-1))

From 91b9bc6f0d9030d8e62b3a471dae6fa81c10d981 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 09:05:57 +0530
Subject: [PATCH 0009/1154] When searching allow use of uppercase locations

When searching allow use of uppercase location names, such as AUTHOR
instead of author, automatically lowercasing them. Fixes #1192785 [search errors are replicated automatically](https://bugs.launchpad.net/calibre/+bug/1192785)
---
 src/calibre/utils/search_query_parser.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index a4e88d021f..745e01670f 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -240,8 +240,8 @@ class Parser(object):
             # the search string is something like 'author: "foo"' because it
             # will be interpreted as 'author:"foo"'. I am choosing to accept the
             # possible error. The expression should be written '"author:" foo'
-            if len(words) > 1 and words[0] in self.locations:
-                loc = words[0]
+            if len(words) > 1 and words[0].lower() in self.locations:
+                loc = words[0].lower()
                 words = words[1:]
                 if len(words) == 1 and self.token_type() == self.QUOTED_WORD:
                     return ['token', loc, self.token(advance=True)]

From 0f2d569f1624f7934984d8c3ee99d74934a4f479 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 09:19:16 +0530
Subject: [PATCH 0010/1154] Add a test for uppercase locations

---
 src/calibre/utils/search_query_parser.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index 745e01670f..2682088681 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -697,6 +697,7 @@ class Tester(SearchQueryParser):
     tests = {
              'Dysfunction' : set([348]),
              'title:Dysfunction' : set([348]),
+             'Title:Dysfunction' : set([348]),
              'title:Dysfunction OR author:Laurie': set([348, 444]),
              '(tag:txt or tag:pdf)': set([33, 258, 354, 305, 242, 51, 55, 56, 154]),
              '(tag:txt OR tag:pdf) and author:Tolstoy': set([55, 56]),

From 8f9528e517367041a216a98f5b5a6800bb9526f2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 09:19:35 +0530
Subject: [PATCH 0011/1154] ...

---
 session.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/session.vim b/session.vim
index a513afc2ec..a786e71451 100644
--- a/session.vim
+++ b/session.vim
@@ -25,7 +25,7 @@ fun! CalibreLog()
     " Setup buffers to edit the calibre changelog and version info prior to
     " making a release.
     enew
-    read ! git log --first-parent "--pretty=\%an:::\%n\%s\%n\%b\%n" -500
+    read ! git log  "--pretty=\%an:::\%n\%s\%n\%b\%n" -500
     setl nomodifiable noswapfile buftype=nofile
     hi def link au Keyword
     syntax match au /^.*:::$/

From 2f37913801aa0758154711a0d8cff4dd69861ddc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 10:02:52 +0530
Subject: [PATCH 0012/1154] Confirm when dropping files onto Book Details

When dropping files onto the Book Details panel, ask for confirmation
before adding the files to the book. The confirmation can be disabled.
---
 src/calibre/gui2/actions/add.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index e18f5fe77c..4071ad1468 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -14,6 +14,7 @@ from calibre import as_unicode
 from calibre.gui2 import (error_dialog, choose_files, choose_dir,
         warning_dialog, info_dialog)
 from calibre.gui2.dialogs.add_empty_book import AddEmptyBookDialog
+from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.dialogs.progress import ProgressDialog
 from calibre.gui2.widgets import IMAGE_EXTENSIONS
 from calibre.ebooks import BOOK_EXTENSIONS
@@ -119,7 +120,6 @@ class AddAction(InterfaceAction):
         if current_idx.isValid():
             view.model().current_changed(current_idx, current_idx)
 
-
     def add_recursive(self, single):
         root = choose_dir(self.gui, 'recursive book import root dir dialog',
                           'Select root folder')
@@ -205,7 +205,6 @@ class AddAction(InterfaceAction):
                         'authors']))
                 return
 
-
             mi = MetaInformation(None)
             mi.isbn = x['isbn']
             if self.isbn_add_tags:
@@ -227,7 +226,8 @@ class AddAction(InterfaceAction):
             return
         db = self.gui.library_view.model().db
         current_idx = self.gui.library_view.currentIndex()
-        if not current_idx.isValid(): return
+        if not current_idx.isValid():
+            return
         cid = db.id(current_idx.row())
         from calibre.gui2.dnd import DownloadDialog
         d = DownloadDialog(url, fname, self.gui)
@@ -235,7 +235,7 @@ class AddAction(InterfaceAction):
         if d.err is None:
             self.files_dropped_on_book(None, [d.fpath], cid=cid)
 
-    def files_dropped_on_book(self, event, paths, cid=None):
+    def files_dropped_on_book(self, event, paths, cid=None, do_confirm=True):
         accept = False
         if self.gui.current_view() is not self.gui.library_view:
             return
@@ -243,8 +243,10 @@ class AddAction(InterfaceAction):
         cover_changed = False
         current_idx = self.gui.library_view.currentIndex()
         if cid is None:
-            if not current_idx.isValid(): return
+            if not current_idx.isValid():
+                return
             cid = db.id(current_idx.row()) if cid is None else cid
+        formats = []
         for path in paths:
             ext = os.path.splitext(path)[1].lower()
             if ext:
@@ -257,10 +259,18 @@ class AddAction(InterfaceAction):
                     db.set_cover(cid, pmap)
                     cover_changed = True
             elif ext in BOOK_EXTENSIONS:
-                db.add_format_with_hooks(cid, ext, path, index_is_id=True)
+                formats.append((ext, path))
                 accept = True
         if accept and event is not None:
             event.accept()
+        if do_confirm and formats:
+            if not confirm(
+                _('You have dropped some files onto the book <b>%s</b>. This will'
+                  ' add or replace the files for this book. Do you want to proceed?') % db.title(cid, index_is_id=True),
+                'confirm_drop_on_book', parent=self.gui):
+                formats = []
+        for ext, path in formats:
+            db.add_format_with_hooks(cid, ext, path, index_is_id=True)
         if current_idx.isValid():
             self.gui.library_view.model().current_changed(current_idx, current_idx)
         if cover_changed:
@@ -277,10 +287,9 @@ class AddAction(InterfaceAction):
             to_device = allow_device and self.gui.stack.currentIndex() != 0
             self._add_books(books, to_device)
             if to_device:
-                self.gui.status_bar.show_message(\
+                self.gui.status_bar.show_message(
                         _('Uploading books to device.'), 2000)
 
-
     def add_filesystem_book(self, paths, allow_device=True):
         self._add_filesystem_book(paths, allow_device=allow_device)
 
@@ -453,3 +462,4 @@ class AddAction(InterfaceAction):
             self._adder.add(ok_paths)
 
 
+

From f964f512cf93d0a1c1fece37d933d1c00f2a7a56 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 10:11:38 +0530
Subject: [PATCH 0013/1154] Fix unable to change case for search queries

Fix unable to change the case of a previously used search because of the
search history.
---
 src/calibre/gui2/search_box.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 6cfa3d0fec..85ddf533c4 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -197,7 +197,7 @@ class SearchBox2(QComboBox):  # {{{
         self.search.emit(text)
 
         if store_in_history:
-            idx = self.findText(text, Qt.MatchFixedString)
+            idx = self.findText(text, Qt.MatchFixedString|Qt.MatchCaseSensitive)
             self.block_signals(True)
             if idx < 0:
                 self.insertItem(0, text)

From b7d7a98fa65eaa07d2225e74bcc8c4c4a7ebe365 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 10:20:39 +0530
Subject: [PATCH 0014/1154] HTMLZ Output: Fix handling of images with URL
 unsafe filenames

Fixes #1192687 [htmlz output not rewriting img and urls](https://bugs.launchpad.net/calibre/+bug/1192687)
---
 src/calibre/ebooks/htmlz/oeb2html.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/htmlz/oeb2html.py b/src/calibre/ebooks/htmlz/oeb2html.py
index c6a7276f6c..b162d9e19c 100644
--- a/src/calibre/ebooks/htmlz/oeb2html.py
+++ b/src/calibre/ebooks/htmlz/oeb2html.py
@@ -18,7 +18,7 @@ from urlparse import urldefrag
 
 from calibre import prepare_string_for_xml
 from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace,\
-    OEB_IMAGES, XLINK, rewrite_links
+    OEB_IMAGES, XLINK, rewrite_links, urlnormalize
 from calibre.ebooks.oeb.stylizer import Stylizer
 from calibre.utils.logging import default_log
 
@@ -100,7 +100,7 @@ class OEB2HTML(object):
     def rewrite_link(self, url, page=None):
         if not page:
             return url
-        abs_url = page.abshref(url)
+        abs_url = page.abshref(urlnormalize(url))
         if abs_url in self.images:
             return 'images/%s' % self.images[abs_url]
         if abs_url in self.links:

From 59d1054cbff4007b46aecd0d54ebdc1df9ae4152 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 11:50:19 +0530
Subject: [PATCH 0015/1154] DOCX Input: Add support for images used as bullets

---
 src/calibre/ebooks/docx/images.py    |  7 ++++---
 src/calibre/ebooks/docx/numbering.py | 31 ++++++++++++++++++++++++----
 src/calibre/ebooks/docx/to_html.py   |  4 ++--
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/calibre/ebooks/docx/images.py b/src/calibre/ebooks/docx/images.py
index e24b550797..ea3685316f 100644
--- a/src/calibre/ebooks/docx/images.py
+++ b/src/calibre/ebooks/docx/images.py
@@ -100,11 +100,12 @@ class Images(object):
     def __call__(self, relationships_by_id):
         self.rid_map = relationships_by_id
 
-    def generate_filename(self, rid, base=None):
+    def generate_filename(self, rid, base=None, rid_map=None):
         if rid in self.used:
             return self.used[rid]
-        raw = self.docx.read(self.rid_map[rid])
-        base = base or ascii_filename(self.rid_map[rid].rpartition('/')[-1]).replace(' ', '_') or 'image'
+        rid_map = self.rid_map if rid_map is None else rid_map
+        raw = self.docx.read(rid_map[rid])
+        base = base or ascii_filename(rid_map[rid].rpartition('/')[-1]).replace(' ', '_') or 'image'
         ext = what(None, raw) or base.rpartition('.')[-1] or 'jpeg'
         base = base.rpartition('.')[0]
         if not base:
diff --git a/src/calibre/ebooks/docx/numbering.py b/src/calibre/ebooks/docx/numbering.py
index 0178df3227..2bf86eea27 100644
--- a/src/calibre/ebooks/docx/numbering.py
+++ b/src/calibre/ebooks/docx/numbering.py
@@ -40,13 +40,14 @@ class Level(object):
         self.paragraph_style = self.character_style = None
         self.is_numbered = False
         self.num_template = None
+        self.pic_id = None
 
         if lvl is not None:
             self.read_from_xml(lvl)
 
     def copy(self):
         ans = Level()
-        for x in ('restart', 'start', 'fmt', 'para_link', 'paragraph_style', 'character_style', 'is_numbered', 'num_template'):
+        for x in ('restart', 'pic_id', 'start', 'fmt', 'para_link', 'paragraph_style', 'character_style', 'is_numbered', 'num_template'):
             setattr(ans, x, getattr(self, x))
         return ans
 
@@ -80,6 +81,8 @@ class Level(object):
             if val == 'bullet':
                 self.is_numbered = False
                 self.fmt = {'\uf0a7':'square', 'o':'circle'}.get(lt, 'disc')
+                for lpid in XPath('./w:lvlPicBulletId[@w:val]')(lvl):
+                    self.pic_id = get(lpid, 'w:val')
             else:
                 self.is_numbered = True
                 self.fmt = STYLE_MAP.get(val, 'decimal')
@@ -103,6 +106,19 @@ class Level(object):
             else:
                 self.character_style.update(ps)
 
+    def css(self, images, pic_map, rid_map):
+        ans = {'list-style-type': self.fmt}
+        if self.pic_id:
+            rid = pic_map.get(self.pic_id, None)
+            if rid:
+                try:
+                    fname = images.generate_filename(rid, rid_map=rid_map)
+                except Exception:
+                    fname = None
+                else:
+                    ans['list-style-image'] = 'url("images/%s")' % fname
+        return ans
+
 class NumberingDefinition(object):
 
     def __init__(self, parent=None):
@@ -127,9 +143,16 @@ class Numbering(object):
         self.definitions = {}
         self.instances = {}
         self.counters = {}
+        self.pic_map = {}
 
-    def __call__(self, root, styles):
+    def __call__(self, root, styles, rid_map):
         ' Read all numbering style definitions '
+        self.rid_map = rid_map
+        for npb in XPath('./w:numPicBullet[@w:numPicBulletId]')(root):
+            npbid = get(npb, 'w:numPicBulletId')
+            for idata in XPath('descendant::v:imagedata[@r:id]')(npb):
+                rid = get(idata, 'r:id')
+                self.pic_map[npbid] = rid
         lazy_load = {}
         for an in XPath('./w:abstractNum[@w:abstractNumId]')(root):
             an_id = get(an, 'w:abstractNumId')
@@ -198,7 +221,7 @@ class Numbering(object):
             if (restart is None and ilvl == levelnum + 1) or restart == levelnum + 1:
                 counter[ilvl] = lvl.start
 
-    def apply_markup(self, items, body, styles, object_map):
+    def apply_markup(self, items, body, styles, object_map, images):
         for p, num_id, ilvl in items:
             d = self.instances.get(num_id, None)
             if d is not None:
@@ -232,7 +255,7 @@ class Numbering(object):
             if has_template:
                 wrap.set('lvlid', lvlid)
             else:
-                wrap.set('class', styles.register({'list-style-type': lvl.fmt}, 'list'))
+                wrap.set('class', styles.register(lvl.css(images, self.pic_map, self.rid_map), 'list'))
             parent.insert(idx, wrap)
             last_val = None
             for child in current_run:
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 963d1fc6c8..79020d9c0a 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -137,7 +137,7 @@ class Convert(object):
                 except (TypeError, ValueError):
                     lvl = 0
                 numbered.append((html_obj, num_id, lvl))
-        self.numbering.apply_markup(numbered, self.body, self.styles, self.object_map)
+        self.numbering.apply_markup(numbered, self.body, self.styles, self.object_map, self.images)
         self.apply_frames()
 
         if len(self.body) > 0:
@@ -263,7 +263,7 @@ class Convert(object):
             except KeyError:
                 self.log.warn('Numbering styles %s do not exist' % nname)
             else:
-                numbering(fromstring(raw), self.styles)
+                numbering(fromstring(raw), self.styles, self.docx.get_relationships(nname)[0])
 
         self.styles.resolve_numbering(numbering)
 

From c8b9d624cdf2c4e8cc821f5704b2a9a6d1a0a8fa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 12:02:12 +0530
Subject: [PATCH 0016/1154] Fix caching of images in docx to use filenames
 instead of possibly non-unique relationship ids.

---
 src/calibre/ebooks/docx/images.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/docx/images.py b/src/calibre/ebooks/docx/images.py
index ea3685316f..85e957a589 100644
--- a/src/calibre/ebooks/docx/images.py
+++ b/src/calibre/ebooks/docx/images.py
@@ -101,10 +101,11 @@ class Images(object):
         self.rid_map = relationships_by_id
 
     def generate_filename(self, rid, base=None, rid_map=None):
-        if rid in self.used:
-            return self.used[rid]
         rid_map = self.rid_map if rid_map is None else rid_map
-        raw = self.docx.read(rid_map[rid])
+        fname = rid_map[rid]
+        if fname in self.used:
+            return self.used[fname]
+        raw = self.docx.read(fname)
         base = base or ascii_filename(rid_map[rid].rpartition('/')[-1]).replace(' ', '_') or 'image'
         ext = what(None, raw) or base.rpartition('.')[-1] or 'jpeg'
         base = base.rpartition('.')[0]
@@ -118,7 +119,7 @@ class Images(object):
             n, e = base.rpartition('.')[0::2]
             name = '%s-%d.%s' % (n, c, e)
             c += 1
-        self.used[rid] = name
+        self.used[fname] = name
         with open(os.path.join(self.dest_dir, name), 'wb') as f:
             f.write(raw)
         self.all_images.add('images/' + name)

From 6aea840b3e998ee335ade1815d949894747a46f2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 20 Jun 2013 12:03:45 +0530
Subject: [PATCH 0017/1154] Ebook-viewer: Show docx cover, if present

---
 src/calibre/ebooks/oeb/iterator/book.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py
index 4ebd543aab..d3cedce688 100644
--- a/src/calibre/ebooks/oeb/iterator/book.py
+++ b/src/calibre/ebooks/oeb/iterator/book.py
@@ -143,7 +143,7 @@ class EbookIterator(BookmarksMixin):
 
         cover = self.opf.cover
         if cover and self.ebook_ext in {'lit', 'mobi', 'prc', 'opf', 'fb2',
-                                        'azw', 'azw3'}:
+                                        'azw', 'azw3', 'docx'}:
             cfile = os.path.join(self.base, 'calibre_iterator_cover.html')
             rcpath = os.path.relpath(cover, self.base).replace(os.sep, '/')
             chtml = (TITLEPAGE%prepare_string_for_xml(rcpath, True)).encode('utf-8')

From ee47445d99c7db10a53b62fd278cd25e53c42be5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 21 Jun 2013 08:35:02 +0530
Subject: [PATCH 0018/1154] Update The Walrus Mag

Fixes #1193021 [Update recipe The Walrus Mag](https://bugs.launchpad.net/calibre/+bug/1193021)
---
 recipes/walrusmag.recipe | 47 ++++++----------------------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/recipes/walrusmag.recipe b/recipes/walrusmag.recipe
index 5c10100fe4..72b110b046 100644
--- a/recipes/walrusmag.recipe
+++ b/recipes/walrusmag.recipe
@@ -1,46 +1,13 @@
 from calibre.web.feeds.news import BasicNewsRecipe
 
-class AdvancedUserRecipe1282101454(BasicNewsRecipe):
-    title = 'The Walrus Mag'
+class AdvancedUserRecipe1371743239(BasicNewsRecipe):
+    title          = u'The Walrus Mag'
+    description = 'National general interest magazine about Canada and its place in the world'
     language = 'en'
-    __author__ = 'TonytheBookworm'
-    description = 'national general interest magazine about Canada and its place in the world'
-    publisher = 'Tony Stegall'
-    category = 'Canada, news'
-    oldest_article = 365
+    __author__ = 'Bert'
+    oldest_article = 34
     max_articles_per_feed = 100
+    auto_cleanup = True
 
-    masthead_url = 'http://www.walrusmagazine.com/images/wordmark.png'
-    keep_only_tags    = [
-                         dict(name='h1'),
-                         dict(name='div', attrs={'id':['prbody']})
-      #                 ,dict(attrs={'id':['cxArticleText','cxArticleBodyText']})
-                        ]
-    feeds          = [
-                      ('Walrus Magazine', 'http://feeds.feedburner.com/WalrusFeatureArticles?format=xml'),
-
-                     ]
-
-
-
-
-    def print_version(self, url):
-        split1 = url.split("/articles/")
-        #print 'THE SPLIT IS: ', split1
-        url1 = split1[0]
-        #print 'url1 is: ',url1
-        url2 = split1[1]
-        #print 'url2 is: ',url2
-
-
-  #need to convert to print_version
-  #originalversion is : http://www.walrusmagazine.com/articles/2010.09-frontier-no-one-can-hear-you-scream/
-  #printversion should be: http://www.walrusmagazine.com/print/2010.09-frontier-no-one-can-hear-you-scream/
-
-
-
-
-        print_url = url1 + '/print/' + url2
-        #print 'THIS URL WILL PRINT: ', print_url # this is a test string to see what the url is it will return
-        return print_url
+    feeds          = [(u'The Walrus Mag', u'http://thewalrus.ca/feed/')]
 

From 10bbb183372a3d98d5174726b1e068f5bd085ead Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 21 Jun 2013 08:40:46 +0530
Subject: [PATCH 0019/1154] ...

---
 manual/develop.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manual/develop.rst b/manual/develop.rst
index a939a442b4..9e5b47e8e7 100644
--- a/manual/develop.rst
+++ b/manual/develop.rst
@@ -49,7 +49,7 @@ All the |app| python code is in the ``calibre`` package. This package contains t
         * Metadata reading, writing, and downloading is all in ``ebooks.metadata``
         * Conversion happens in a pipeline, for the structure of the pipeline,
           see :ref:`conversion-introduction`. The pipeline consists of an input
-          plugin, various transforms and an output plugin. The that code constructs
+          plugin, various transforms and an output plugin. The code that constructs
           and drives the pipeline is in :file:`plumber.py`. The pipeline works on a
           representation of an ebook that is like an unzipped epub, with
           manifest, spine, toc, guide, html content, etc. The

From b8753d0b95db8b64436c450b46ac9c6ac6353cb2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 21 Jun 2013 09:11:09 +0530
Subject: [PATCH 0020/1154] version 0.9.36

---
 Changelog.yaml           | 59 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 8462264e38..f952b961e2 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,65 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.36
+  date: 2013-06-21
+
+  new features:
+    - title: "DOCX Input: Support for Table of Contents created using the Word Table of Contents tool. calibre now first looks for such a Table of Contents and only if one is not found does it generate a ToC from headings."
+
+    - title: "DOCX Input: Add support for images used as bullets in lists"
+
+    - title: "DOCX Input: If a large image that looks like a cover is present at the start of the document, remove it and use it as the cover of the output ebook. This can be turned off under the DOCX Input section of the conversion dialog."
+
+    - title: "When dropping files onto the Book Details panel, ask for confirmation before adding the files to the book. The confirmation can be disabled."
+
+    - title: "News download: Add the 'downloaded from' link at the bottom of every article when using a touchscreen output profile (like the Tablet profile)."
+
+    - title: "E-book viewer: Change the bookmark button to always popup a menu when clicked, makes accessing existing bookmarks easier."
+
+    - title: "After a bulk metadata download, focus the review button on the popup notification, instead of the OK button."
+      tickets: [1190931]
+ 
+  bug fixes:
+    - title: "DOCX Input: Hide text that has been marked as not being visible in the web view in Word."
+
+    - title: "DOCX Input: When converting docx files with large numbers of unnamed images, do not crash on windows."
+      tickets: [1191354]
+
+    - title: "DOCX Input: Add support for the Word setting 'No space between paragraphs with the same style'."
+      tickets: [119100]
+
+    - title: "MOBI Output: Fix rendering of SVG images that embed large raster images in 64bit calibre installs."
+      tickets: [1191020]
+
+    - title: "HTMLZ Output: Fix handling of images with URL unsafe filenames."
+      tickets: [1192687]
+
+    - title: "Fix unable to change the case of a previously used search because of the search history."
+
+    - title: "When searching allow use of uppercase location names, such as AUTHOR instead of author, automatically lowercasing them."
+      tickets: [1192785]
+
+    - title: "DOCX metadata: When reading covers from DOCX files use the first image as specified in the actual markup instead of just the first image in the container."
+
+    - title: "Kobo driver: Fix a regression when deleting empty shelves on Kobo devices with older firmware."
+      tickets: [1192441]
+
+    - title: "Do not show builtin plugins in the get new plugins dialog If a builtin plugin with the same name as a third party plugin exists, then the builtin plagin was displayed in the get new plugins dialog as installed (happened with the new DOCX Input plugin)."
+
+    - title: "Apple driver: When in synchronous mode (direct to iBooks), disable PDF transfers, as we can't update metadata in iTunes. Not sure when this started, but as of iTunes 11.0.4 it's broken."
+
+    - title: "Get Books: Fix error when using internal browser on some systems"
+      tickets: [1191199]
+
+  improved recipes:
+    - The Walrus Mag
+    - Various Polish news sources
+
+  new recipes:
+    - title: Various Polish news sources
+      author: fenuks
+
 - version: 0.9.35
   date: 2013-06-14
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index fb2743fd7c..6834a4e66d 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 35)
+numeric_version = (0, 9, 36)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 27678a85c6342aeb48e56b3464e0fdc84ed0f374 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 21 Jun 2013 16:33:43 +0530
Subject: [PATCH 0021/1154] Add tests for set_metadata()

---
 src/calibre/db/cache.py         | 36 +++++++++++++++++++++++------
 src/calibre/db/tests/base.py    |  6 ++---
 src/calibre/db/tests/writing.py | 40 +++++++++++++++++++++++++++++++--
 src/calibre/db/write.py         |  2 +-
 4 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index b79ff2a31b..88f06b43ba 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -843,9 +843,25 @@ class Cache(object):
     @write_api
     def set_metadata(self, book_id, mi, ignore_errors=False, force_changes=False,
                      set_title=True, set_authors=True):
-        if callable(getattr(mi, 'to_book_metadata', None)):
+        '''
+        Set metadata for the book `id` from the `Metadata` object `mi`
+
+        Setting force_changes=True will force set_metadata to update fields even
+        if mi contains empty values. In this case, 'None' is distinguished from
+        'empty'. If mi.XXX is None, the XXX is not replaced, otherwise it is.
+        The tags, identifiers, and cover attributes are special cases. Tags and
+        identifiers cannot be set to None so then will always be replaced if
+        force_changes is true. You must ensure that mi contains the values you
+        want the book to have. Covers are always changed if a new cover is
+        provided, but are never deleted. Also note that force_changes has no
+        effect on setting title or authors.
+        '''
+
+        try:
             # Handle code passing in an OPF object instead of a Metadata object
             mi = mi.to_book_metadata()
+        except (AttributeError, TypeError):
+            pass
 
         def set_field(name, val, **kwargs):
             self._set_field(name, {book_id:val}, **kwargs)
@@ -864,7 +880,7 @@ class Cache(object):
             set_field('authors', authors, do_path_update=False)
 
         if path_changed:
-            self._update_path((book_id,))
+            self._update_path({book_id})
 
         def protected_set_field(name, val, **kwargs):
             try:
@@ -890,12 +906,16 @@ class Cache(object):
         if cdata is not None:
             self._set_cover({book_id: cdata})
 
-        for field in ('title_sort', 'author_sort', 'publisher', 'series',
-            'tags', 'comments', 'languages', 'pubdate'):
+        for field in ('author_sort', 'publisher', 'series', 'tags', 'comments',
+            'languages', 'pubdate'):
             val = mi.get(field, None)
             if (force_changes and val is not None) or not mi.is_null(field):
                 protected_set_field(field, val)
 
+        val = mi.get('title_sort', None)
+        if (force_changes and val is not None) or not mi.is_null('title_sort'):
+            protected_set_field('sort', val)
+
         # identifiers will always be replaced if force_changes is True
         mi_idents = mi.get_identifiers()
         if force_changes:
@@ -917,9 +937,11 @@ class Cache(object):
                 val = mi.get(key, None)
                 if force_changes or val is not None:
                     protected_set_field(key, val)
-                    extra = mi.get_extra(key)
-                    if extra is not None:
-                        protected_set_field(key+'_index', extra)
+                    idx = key + '_index'
+                    if idx in self.fields:
+                        extra = mi.get_extra(key)
+                        if extra is not None or force_changes:
+                            protected_set_field(idx, extra)
 
     # }}}
 
diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index cc8da89b05..b57b017ba3 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -78,7 +78,7 @@ class BaseTest(unittest.TestCase):
     def cloned_library(self):
         return self.clone_library(self.library_path)
 
-    def compare_metadata(self, mi1, mi2):
+    def compare_metadata(self, mi1, mi2, exclude=()):
         allfk1 = mi1.all_field_keys()
         allfk2 = mi2.all_field_keys()
         self.assertEqual(allfk1, allfk2)
@@ -88,7 +88,7 @@ class BaseTest(unittest.TestCase):
                     'ondevice_col', 'last_modified', 'has_cover',
                     'cover_data'}.union(allfk1)
         for attr in all_keys:
-            if attr == 'user_metadata':
+            if attr == 'user_metadata' or attr in exclude:
                 continue
             attr1, attr2 = getattr(mi1, attr), getattr(mi2, attr)
             if attr == 'formats':
@@ -97,7 +97,7 @@ class BaseTest(unittest.TestCase):
                 attr1, attr2 = set(attr1), set(attr2)
             self.assertEqual(attr1, attr2,
                     '%s not the same: %r != %r'%(attr, attr1, attr2))
-            if attr.startswith('#'):
+            if attr.startswith('#') and attr + '_index' not in exclude:
                 attr1, attr2 = mi1.get_extra(attr), mi2.get_extra(attr)
                 self.assertEqual(attr1, attr2,
                     '%s {#extra} not the same: %r != %r'%(attr, attr1, attr2))
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 6d3169b905..5d04c11def 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -376,7 +376,43 @@ class WritingTest(BaseTest):
             self.assertTrue(old.has_cover(book_id))
     # }}}
 
-    def test_set_metadata(self):
+    def test_set_metadata(self):  # {{{
         ' Test setting of metadata '
-        self.assertTrue(False, 'TODO: test set_metadata()')
+        ae = self.assertEqual
+        cache = self.init_cache(self.cloned_library)
+
+        # Check that changing title/author updates the path
+        mi = cache.get_metadata(1)
+        old_path = cache.field_for('path', 1)
+        old_title, old_author = mi.title, mi.authors[0]
+        ae(old_path, '%s/%s (1)' % (old_author, old_title))
+        mi.title, mi.authors = 'New Title', ['New Author']
+        cache.set_metadata(1, mi)
+        ae(cache.field_for('path', 1), '%s/%s (1)' % (mi.authors[0], mi.title))
+        p = cache.format_abspath(1, 'FMT1')
+        self.assertTrue(mi.authors[0] in p and mi.title in p)
+
+        # Compare old and new set_metadata()
+        db = self.init_old(self.cloned_library)
+        mi = db.get_metadata(1, index_is_id=True, get_cover=True, cover_as_data=True)
+        mi2 = db.get_metadata(3, index_is_id=True, get_cover=True, cover_as_data=True)
+        db.set_metadata(2, mi)
+        db.set_metadata(1, mi2, force_changes=True)
+        oldmi = db.get_metadata(2, index_is_id=True, get_cover=True, cover_as_data=True)
+        oldmi2 = db.get_metadata(1, index_is_id=True, get_cover=True, cover_as_data=True)
+        db.close()
+        del db
+        cache = self.init_cache(self.cloned_library)
+        cache.set_metadata(2, mi)
+        nmi = cache.get_metadata(2, get_cover=True, cover_as_data=True)
+        ae(oldmi.cover_data, nmi.cover_data)
+        self.compare_metadata(nmi, oldmi, exclude={'last_modified', 'format_metadata'})
+        cache.set_metadata(1, mi2, force_changes=True)
+        nmi2 = cache.get_metadata(1, get_cover=True, cover_as_data=True)
+        # The new code does not allow setting of #series_index to None, instead
+        # it is reset to 1.0
+        ae(nmi2.get_extra('#series'), 1.0)
+        self.compare_metadata(nmi2, oldmi2, exclude={'last_modified', 'format_metadata', '#series_index'})
+
+    # }}}
 
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 7fdb2070c0..9bae3e6abb 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -212,7 +212,7 @@ def custom_series_index(book_id_val_map, db, field, *args):
         ids = series_field.ids_for_book(book_id)
         if ids:
             sequence.append((sidx, book_id, ids[0]))
-            field.table.book_col_map[book_id] = sidx
+        field.table.book_col_map[book_id] = sidx
     if sequence:
         db.conn.executemany('UPDATE %s SET %s=? WHERE book=? AND value=?'%(
                 field.metadata['table'], field.metadata['column']), sequence)

From 4a105ef459fe5204d6218c4b2bdf8084ba5dc78c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 21 Jun 2013 16:40:47 +0530
Subject: [PATCH 0022/1154] ...

---
 src/calibre/db/tests/legacy.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 48408d6105..af6b977aef 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -120,7 +120,8 @@ class LegacyTest(BaseTest):
         for attr in dir(db):
             if attr in SKIP_ATTRS:
                 continue
-            self.assertTrue(hasattr(ndb, attr), 'The attribute %s is missing' % attr)
+            if not hasattr(ndb, attr):
+                raise AssertionError('The attribute %s is missing' % attr)
             obj, nobj  = getattr(db, attr), getattr(ndb, attr)
             if attr not in SKIP_ARGSPEC:
                 try:

From a2aad03af904e174463464a9139247e665ca685e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 21 Jun 2013 22:25:37 +0530
Subject: [PATCH 0023/1154] Stop using googlecode for file hosting

---
 setup/hosting.py | 44 ++++++++++++++++++++++++++++++++++++--------
 setup/upload.py  | 12 ++++++++++--
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/setup/hosting.py b/setup/hosting.py
index 8707388181..9853f181a4 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -10,13 +10,13 @@ __docformat__ = 'restructuredtext en'
 import os, time, sys, traceback, subprocess, urllib2, re, base64, httplib
 from argparse import ArgumentParser, FileType
 from subprocess import check_call
-from tempfile import NamedTemporaryFile#, mkdtemp
+from tempfile import NamedTemporaryFile
 from collections import OrderedDict
 
 import mechanize
 from lxml import html
 
-def login_to_google(username, password):
+def login_to_google(username, password):  # {{{
     br = mechanize.Browser()
     br.addheaders = [('User-agent',
         'Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20100101 Firefox/9.0')]
@@ -30,15 +30,16 @@ def login_to_google(username, password):
         x = re.search(br'(?is)<title>.*?</title>', raw)
         if x is not None:
             print ('Title of post login page: %s'%x.group())
-        #open('/tmp/goog.html', 'wb').write(raw)
+        # open('/tmp/goog.html', 'wb').write(raw)
         raise ValueError(('Failed to login to google with credentials: %s %s'
             '\nGoogle sometimes requires verification when logging in from a '
             'new IP address. Use lynx to login and supply the verification, '
             'at: lynx -accept_all_cookies https://accounts.google.com/ServiceLogin?service=code')
                 %(username, password))
     return br
+# }}}
 
-class ReadFileWithProgressReporting(file): # {{{
+class ReadFileWithProgressReporting(file):  # {{{
 
     def __init__(self, path, mode='rb'):
         file.__init__(self, path, mode)
@@ -101,7 +102,7 @@ class Base(object):  # {{{
 
 #}}}
 
-class GoogleCode(Base):# {{{
+class GoogleCode(Base):  # {{{
 
     def __init__(self,
             # A mapping of filenames to file descriptions. The descriptions are
@@ -141,7 +142,7 @@ class GoogleCode(Base):# {{{
             # The pattern to match filenames for the files being uploaded and
             # extract version information from them. Must have a named group
             # named version
-            filename_pattern=r'{appname}-(?:portable-installer-)?(?P<version>.+?)(?:-(?:i686|x86_64|32bit|64bit))?\.(?:zip|exe|msi|dmg|tar\.bz2|tar\.xz|txz|tbz2)'
+            filename_pattern=r'{appname}-(?:portable-installer-)?(?P<version>.+?)(?:-(?:i686|x86_64|32bit|64bit))?\.(?:zip|exe|msi|dmg|tar\.bz2|tar\.xz|txz|tbz2)'  # noqa
 
             ):
         self.username, self.password, = username, password
@@ -227,7 +228,8 @@ class GoogleCode(Base):# {{{
             paths = eval(raw) if raw else {}
             paths.update(self.paths)
             rem = [x for x in paths if self.version not in x]
-            for x in rem: paths.pop(x)
+            for x in rem:
+                paths.pop(x)
             raw = ['%r : %r,'%(k, v) for k, v in paths.items()]
             raw = '{\n\n%s\n\n}\n'%('\n'.join(raw))
             with NamedTemporaryFile() as t:
@@ -347,7 +349,7 @@ class GoogleCode(Base):# {{{
 
 # }}}
 
-class SourceForge(Base): # {{{
+class SourceForge(Base):  # {{{
 
     # Note that you should manually ssh once to username,project@frs.sourceforge.net
     # on the staging server so that the host key is setup
@@ -378,6 +380,28 @@ class SourceForge(Base): # {{{
 
 # }}}
 
+def upload_to_servers(files, version):  # {{{
+    for server, rdir in {'files':'/usr/share/nginx/html'}.iteritems():
+        print('Uploading to server:', server)
+        server = '%s.calibre-ebook.com' % server
+        rdir = '%s/%s/' % (rdir, version)
+        for x in files:
+            start = time.time()
+            print ('Uploading', x)
+            for i in range(5):
+                try:
+                    check_call(['rsync', '-h', '-z', '--progress', '-e', 'ssh -x', x,
+                    'root@%s:%s'%(server, rdir)])
+                except KeyboardInterrupt:
+                    raise SystemExit(1)
+                except:
+                    print ('\nUpload failed, trying again in 30 seconds')
+                    time.sleep(30)
+                else:
+                    break
+            print ('Uploaded in', int(time.time() - start), 'seconds\n\n')
+# }}}
+
 # CLI {{{
 def cli_parser():
     epilog='Copyright Kovid Goyal 2012'
@@ -409,6 +433,7 @@ def cli_parser():
     sf = subparsers.add_parser('sourceforge', help='Upload to sourceforge',
             epilog=epilog)
     cron = subparsers.add_parser('cron', help='Call script from cron')
+    subparsers.add_parser('calibre', help='Upload to calibre file servers')
 
     a = gc.add_argument
 
@@ -471,8 +496,11 @@ def main(args=None):
         sf()
     elif args.service == 'cron':
         login_to_google(args.username, args.password)
+    elif args.service == 'calibre':
+        upload_to_servers(ofiles, args.version)
 
 if __name__ == '__main__':
     main()
 # }}}
 
+
diff --git a/setup/upload.py b/setup/upload.py
index 673f9f4679..1c7348bfe9 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -81,7 +81,7 @@ class ReUpload(Command):  # {{{
 
 # Data {{{
 def get_google_data():
-    with open(os.path.expanduser('~/work/kde/conf/googlecodecalibre'), 'rb') as f:
+    with open(os.path.expanduser('~/work/env/private/googlecodecalibre'), 'rb') as f:
         gc_password, ga_un, pw = f.read().strip().split('|')
 
     return {
@@ -111,6 +111,9 @@ def sf_cmdline(ver, sdata):
     return [__appname__, ver, 'fmap', 'sourceforge', sdata['project'],
             sdata['username']]
 
+def calibre_cmdline(ver):
+    return [__appname__, ver, 'fmap', 'calibre']
+
 def run_remote_upload(args):
     print 'Running remotely:', ' '.join(args)
     subprocess.check_call(['ssh', '-x', '%s@%s'%(STAGING_USER, STAGING_HOST),
@@ -133,7 +136,8 @@ class UploadInstallers(Command):  # {{{
         try:
             self.upload_to_staging(tdir, files)
             self.upload_to_sourceforge()
-            self.upload_to_google(opts.replace)
+            self.upload_to_calibre()
+            # self.upload_to_google(opts.replace)
         finally:
             shutil.rmtree(tdir, ignore_errors=True)
 
@@ -170,6 +174,10 @@ class UploadInstallers(Command):  # {{{
         sdata = get_sourceforge_data()
         args = sf_cmdline(__version__, sdata)
         run_remote_upload(args)
+
+    def upload_to_calibre(self):
+        run_remote_upload(calibre_cmdline(__version__))
+
 # }}}
 
 class UploadUserManual(Command):  # {{{

From b06d080987897347494bbc202872e70e6fbb5bae Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 22 Jun 2013 07:05:24 +0530
Subject: [PATCH 0024/1154] Update La Nacion (Costa Rica)

---
 recipes/la_nacion_cr.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/la_nacion_cr.recipe b/recipes/la_nacion_cr.recipe
index ae320064d6..99b927edbb 100644
--- a/recipes/la_nacion_cr.recipe
+++ b/recipes/la_nacion_cr.recipe
@@ -20,7 +20,7 @@ class crnews(BasicNewsRecipe):
     no_stylesheets = True
 
 
-    feeds          = [(u'Portada', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=portada'), (u'Ultima Hora', u'http://www.nacion.com/Generales/RSS/UltimaHoraRss.aspx'), (u'Nacionales', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=elpais'), (u'Entretenimiento', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=entretenimiento'), (u'Sucesos', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=sucesos'), (u'Deportes', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=deportes'), (u'Internacionales', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=mundo'), (u'Economia', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=economia'), (u'Aldea Global', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=aldeaglobal'), (u'Tecnologia', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=tecnologia'), (u'Opinion', u'http://www.nacion.com/Generales/RSS/EdicionRss.aspx?section=opinion')]
+    feeds          = [(u'Portada', u'http://www.nacion.com/rss/'), (u'Ultima Hora', u'http://www.nacion.com/rss/latest/'), (u'Nacionales', u'http://www.nacion.com/rss/nacional/'), (u'Entretenimiento', u'http://www.nacion.com/rss/ocio/'), (u'Sucesos', u'http://www.nacion.com/rss/sucesos/'), (u'Deportes', u'http://www.nacion.com/rss/deportes/'), (u'Internacionales', u'http://www.nacion.com/rss/mundo/'), (u'Economia', u'http://www.nacion.com/rss/economia/'), (u'Vivir', u'http://www.nacion.com/rss/vivir/'), (u'Tecnologia', u'http://www.nacion.com/rss/tecnologia/'), (u'Opinion', u'http://www.nacion.com/rss/opinion/')]
 
     def get_cover_url(self):
         index = 'http://kiosko.net/cr/np/cr_nacion.html'

From ec2bd359abbaa941dd7cc505b45d21753d914ade Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 22 Jun 2013 07:30:27 +0530
Subject: [PATCH 0025/1154] Copy calibre releases to my backup hdd

---
 setup/upload.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setup/upload.py b/setup/upload.py
index 1c7348bfe9..a113eef703 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -133,15 +133,18 @@ class UploadInstallers(Command):  # {{{
         files = {x:installer_description(x) for x in
                 all_possible.intersection(available)}
         tdir = mkdtemp()
+        backup = os.path.join('/mnt/external/calibre/%s' % __version__)
+        if not os.path.exists(backup):
+            os.mkdir(backup)
         try:
-            self.upload_to_staging(tdir, files)
+            self.upload_to_staging(tdir, backup, files)
             self.upload_to_sourceforge()
             self.upload_to_calibre()
             # self.upload_to_google(opts.replace)
         finally:
             shutil.rmtree(tdir, ignore_errors=True)
 
-    def upload_to_staging(self, tdir, files):
+    def upload_to_staging(self, tdir, backup, files):
         os.mkdir(tdir+'/dist')
         hosting = os.path.join(os.path.dirname(os.path.abspath(__file__)),
             'hosting.py')
@@ -149,6 +152,7 @@ class UploadInstallers(Command):  # {{{
 
         for f in files:
             shutil.copyfile(f, os.path.join(tdir, f))
+            shutil.copyfile(f, os.path.join(backup, f))
 
         with open(os.path.join(tdir, 'fmap'), 'wb') as fo:
             for f, desc in files.iteritems():

From bf1055abd97934eacc3c015769a9a82cd54b362a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 22 Jun 2013 07:42:30 +0530
Subject: [PATCH 0026/1154] fetch-ebbok-metadata: Fix --opf argument requiring
 a value

---
 src/calibre/ebooks/metadata/sources/cli.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/cli.py b/src/calibre/ebooks/metadata/sources/cli.py
index f8b9c6b7a9..b20c6a5bfa 100644
--- a/src/calibre/ebooks/metadata/sources/cli.py
+++ b/src/calibre/ebooks/metadata/sources/cli.py
@@ -34,9 +34,9 @@ def option_parser():
     parser.add_option('-i', '--isbn', help='Book ISBN')
     parser.add_option('-v', '--verbose', default=False, action='store_true',
                       help='Print the log to the console (stderr)')
-    parser.add_option('-o', '--opf', help='Output the metadata in OPF format')
+    parser.add_option('-o', '--opf', help='Output the metadata in OPF format instead of human readable text.', action='store_true', default=False)
     parser.add_option('-c', '--cover',
-            help='Specify a filename. The cover, if available, will be saved to it')
+            help='Specify a filename. The cover, if available, will be saved to it. Without this option, no cover will be downloaded.')
     parser.add_option('-d', '--timeout', default='30',
             help='Timeout in seconds. Default is 30')
 
@@ -71,16 +71,14 @@ def main(args=sys.argv):
     if opts.cover and results:
         cover = download_cover(log, title=opts.title, authors=authors,
                 identifiers=result.identifiers, timeout=int(opts.timeout))
-        if cover is None:
+        if cover is None and not opts.opf:
             prints('No cover found', file=sys.stderr)
         else:
             save_cover_data_to(cover[-1], opts.cover)
             result.cover = cf = opts.cover
 
-
     log = buf.getvalue()
 
-
     result = (metadata_to_opf(result) if opts.opf else
                     unicode(result).encode('utf-8'))
 
@@ -95,3 +93,4 @@ def main(args=sys.argv):
 
 if __name__ == '__main__':
     sys.exit(main())
+

From 6a134427c84491d7d5df488a3eb1aa55c68a7109 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 22 Jun 2013 07:59:40 +0530
Subject: [PATCH 0027/1154] Update Frontline

---
 recipes/frontlineonnet.recipe | 51 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/recipes/frontlineonnet.recipe b/recipes/frontlineonnet.recipe
index dc1d16cfd4..73d866c3b3 100644
--- a/recipes/frontlineonnet.recipe
+++ b/recipes/frontlineonnet.recipe
@@ -46,35 +46,34 @@ class Frontlineonnet(BasicNewsRecipe):
 
     keep_only_tags= [
                       dict(name='div', attrs={'id':'content'})
-                     #,dict(attrs={'class':'byline'})
                     ]
-    #remove_attributes=['size','noshade','border']
-
-    #def preprocess_html(self, soup):
-        #for item in soup.findAll(style=True):
-            #del item['style']
-        #for item in soup.findAll('img'):
-            #if not item.has_key('alt'):
-               #item['alt'] = 'image'
-        #return soup
+    remove_attributes=['size','noshade','border']
 
     def parse_index(self):
         articles = []
+        current_section = None
+        feeds = []
         soup = self.index_to_soup(self.INDEX)
-        for feed_link in soup.findAll('div', id='headseccol'):
-            a = feed_link.find('a', href=True)
-            title = self.tag_to_string(a)
-            url = a['href']
-            articles.append({
-                              'title'      :title
-                             ,'date'       :''
-                             ,'url'        :url
-                             ,'description':''
-                            })
-        return [('Frontline', articles)]
+        for h3 in soup.findAll('h3'):
+            if h3.get('class', None) == 'artListSec':
+                if articles:
+                    feeds.append((current_section, articles))
+                articles = []
+                current_section = self.tag_to_string(h3).strip()
+                self.log(current_section)
+            elif h3.get('id', None) in {'headseccol', 'headsec'}:
+                a = h3.find('a', href=True)
+                if a is not None:
+                    title = self.tag_to_string(a)
+                    url = a['href']
+                    articles.append({
+                                    'title'      :title
+                                    ,'date'       :''
+                                    ,'url'        :url
+                                    ,'description':''
+                                    })
+                    self.log('\t', title, url)
+        if articles:
+            feeds.append((current_section, articles))
+        return feeds
 
-    #def print_version(self, url):
-        #return "http://www.hinduonnet.com/thehindu/thscrip/print.pl?prd=fline&file=" + url.rpartition('/')[2]
-
-    #def image_url_processor(self, baseurl, url):
-        #return url.replace('../images/', self.INDEX + 'images/').strip()

From 2ee5ad2e301c7acfb7a3b137a998b71d8ac87d52 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 22 Jun 2013 08:30:59 +0530
Subject: [PATCH 0028/1154] Ensure dist files have correct permissions

---
 setup/upload.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup/upload.py b/setup/upload.py
index a113eef703..784c0cf9f8 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -151,8 +151,10 @@ class UploadInstallers(Command):  # {{{
         shutil.copyfile(hosting, os.path.join(tdir, 'hosting.py'))
 
         for f in files:
-            shutil.copyfile(f, os.path.join(tdir, f))
-            shutil.copyfile(f, os.path.join(backup, f))
+            for x in (tdir, backup):
+                dest = os.path.join(x, f)
+                shutil.copyfile(f, dest)
+                os.chmod(dest, stat.S_IREAD|stat.S_IWRITE|stat.S_IRGRP|stat.S_IROTH)
 
         with open(os.path.join(tdir, 'fmap'), 'wb') as fo:
             for f, desc in files.iteritems():

From 8042ad136fa7d11f3eb3e69c357ba3e88a0d1b41 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Sat, 22 Jun 2013 09:28:37 -0700
Subject: [PATCH 0029/1154] Improved error handling for float values with
 non-period decimal points, bad datetime.datetime values.

---
 src/calibre/devices/idevice/parse_xml.py | 30 +++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/calibre/devices/idevice/parse_xml.py b/src/calibre/devices/idevice/parse_xml.py
index 80d8ebaccd..6982b5a213 100755
--- a/src/calibre/devices/idevice/parse_xml.py
+++ b/src/calibre/devices/idevice/parse_xml.py
@@ -192,22 +192,30 @@ class XmlPropertyListParser(object):
         pattern = XmlPropertyListParser.DATETIME_PATTERN
         match = pattern.match(content)
         if not match:
-            raise PropertyListParseError("Failed to parse datetime '%s'" % content)
+            print("XmlPropertyListParser() ERROR: error parsing %s as datetime" % repr(content))
+            #raise PropertyListParseError("Failed to parse datetime '%s'" % content)
+            d = datetime.datetime.today()
+        else:
+            groups, components = match.groupdict(), []
+            for key in units:
+                value = groups[key]
+                if value is None:
+                    break
+                components.append(int(value))
+            while len(components) < 3:
+                components.append(1)
 
-        groups, components = match.groupdict(), []
-        for key in units:
-            value = groups[key]
-            if value is None:
-                break
-            components.append(int(value))
-        while len(components) < 3:
-            components.append(1)
+            d = datetime.datetime(*components)
 
-        d = datetime.datetime(*components)
         self._push_value(d)
 
     def _parse_real(self, name, content):
-        self._push_value(float(content))
+        content = content.replace(',', '.')
+        try:
+            self._push_value(float(content))
+        except:
+            print("XmlPropertyListParser() WARNING: error converting %s to float" % repr(content))
+            self._push_value(0.0)
 
     def _parse_integer(self, name, content):
         self._push_value(int(content))

From 4fe86065f9ecef37c1c3ef9a85170bc36e5bfacf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 23 Jun 2013 09:09:45 +0530
Subject: [PATCH 0030/1154] Fix scanning for books on Aluratek Color

Fix a regression that broke scanning for books on all devices that used
the Aluratek Color driver. Fixes #1192940 [No longer seeing books on Odys Leon (Aluratek colour)](https://bugs.launchpad.net/calibre/+bug/1192940)
---
 src/calibre/devices/misc.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index 4a2e6aa864..b20ec3ca6e 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -211,6 +211,7 @@ class ALURATEK_COLOR(USBMS):
     VENDOR_NAME = ['USB_2.0', 'EZREADER', 'C4+']
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['USB_FLASH_DRIVER', '.', 'TOUCH']
     SCAN_FROM_ROOT = True
+    SUPPORTS_SUB_DIRS_FOR_SCAN = True
 
 class TREKSTOR(USBMS):
 

From c8889644bd77beee40423f608301071be1743f77 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 23 Jun 2013 10:47:29 +0530
Subject: [PATCH 0031/1154] Remove obsolete recipes

---
 recipes/living_digital.recipe | 16 ----------------
 recipes/pc_quest_india.recipe | 16 ----------------
 2 files changed, 32 deletions(-)
 delete mode 100644 recipes/living_digital.recipe
 delete mode 100644 recipes/pc_quest_india.recipe

diff --git a/recipes/living_digital.recipe b/recipes/living_digital.recipe
deleted file mode 100644
index 2fcf50dfab..0000000000
--- a/recipes/living_digital.recipe
+++ /dev/null
@@ -1,16 +0,0 @@
-from calibre.web.feeds.news import CalibrePeriodical
-
-class LivingDigital(CalibrePeriodical):
-
-    title = 'Living Digital'
-    calibre_periodicals_slug = 'living-digital'
-
-    description = '''
-    Catch the latest buzz in the digital world with Living Digital. Enjoy
-    reviews, news, features and recommendations on a wide range of consumer
-    technology products - from smartphones to flat panel TVs, netbooks to
-    cameras, and many more consumer lifestyle gadgets. To subscribe, visit
-    <a href="http://news.calibre-ebook.com/periodical/living-digital">calibre
-    Periodicals</a>.
-    '''
-    language = 'en_IN'
diff --git a/recipes/pc_quest_india.recipe b/recipes/pc_quest_india.recipe
deleted file mode 100644
index e45272a2df..0000000000
--- a/recipes/pc_quest_india.recipe
+++ /dev/null
@@ -1,16 +0,0 @@
-from calibre.web.feeds.news import CalibrePeriodical
-
-class PCQ(CalibrePeriodical):
-
-    title = 'PCQuest'
-    calibre_periodicals_slug = 'pc-quest-india'
-
-    description = '''
-    Buying a tech product? Seeking a tech solution? Consult PCQuest, India's
-    market-leading selection and implementation guide for the latest
-    technologies: servers, business apps, security, open source, gadgets and
-    more. To subscribe visit, <a
-    href="http://news.calibre-ebook.com/periodical/pc-quest-india">calibre
-    Periodicals</a>.
-    '''
-    language = 'en_IN'

From e8e4dbc35b0a3070c446b5562e4508b18ad346c8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 Jun 2013 09:56:07 +0530
Subject: [PATCH 0032/1154] Update Miradasalsur.

Fixes #1193922 [Updated recipe for Miradas al Sur](https://bugs.launchpad.net/calibre/+bug/1193922)
---
 recipes/icons/miradasalsur.png | Bin 0 -> 1120 bytes
 recipes/miradasalsur.recipe    |  97 ++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 recipes/icons/miradasalsur.png

diff --git a/recipes/icons/miradasalsur.png b/recipes/icons/miradasalsur.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cb7d033addb5d783f10eda8764433907d27df0c
GIT binary patch
literal 1120
zcmdr~?OT&o7{8xAV<PZulcnYm*a&paNG6t0YQBI13ZkH3YAU59L8-7XF^LyN6!9e$
zF%l6}97d^#mf8pVpjKRTq1Xnb0u2Wn;9#(4&)ey6^<Q+~*STMR_qonFzf&9^w~X>o
zdH?_w9Tl+}d->RMC$ZH8%Mt)ch+mNyIf8hsh{cLr*l;w9c#g->D8h~xkbpZp5)k4L
zgCQ;)U<jT;$VuaxAaFF|Fd88SHyI3du@2m2c%0A(;T>IgKydMh8$qmqt1K>$B6f%o
zForc(*VvM>?df^WN53N%H(XF|&N(_#S=*m?jA{J!Rmthzk}|<gBY}6+UN=HetNW~G
z@aqVTvHx<<1ZtCL=5Ib>4@9a#{UMWlc9UlaZMF)CeHN3}Ez;U*F54p4{z<AWnFVd&
z-xHfMl(DZ#9B9cdHY(?sJawqoF0e!Rey+c*wrh3IHf41{K*!W21C<R=An-*}>Of{u
zE2-(tE;XvcOyh%*xt~Lh;f8w;<=Peq=}gUX_H?|u)BKpwyo^g3)R%OFrfqMjQ8}+&
zG1p#y)8wstu`=BpzwJ4wn3Gkugsokm?c1@xiS&J$oc25ipUSUq&%wu2bnTOLbY-;>
zeEylAG*of1S*&iAg+2vUrzWcZyx}Q1tutzabyq>FTTov{ZujJ{C!lVTg}1o{b;WG4
zR9~_t>Mi<wx}|xf%VI4obJRBu-hX5*JY~KAu&2Cgpy-U#aQCmBxsC^aaQuI?FqkvM
zavY|Z;dm^VZ4TjF;P_E~6w!iXj8;q;?L=sJj5uDv3F7fD`hSQlZTm(5!Y4XnQR40j
zLQV_{a7!f@-Tvw4I|}LDy1;O)5(vo+FG{Ys(x6n_Y?OG5KvDk#B_Rwy8m{?zhz!>a
zKm`z&Yl$m{<U0SW-y5b=AU#ul_S=f@&Q+eTx=>wn@e&*?K6JR`Na@jI$4`87^3>@v
z*!|_6oV{P|%l$epzo2mcfg<>1d)lYz8J~T=W9P2SEd3YRu<nEP8#aEpY4etpk3QbI
zEmaB8G0RuP#;uHBwK^ej&Dx}7c=x?|^B26oaM9u=5s^!mMG-Lb&EU6Yh3IC7&UyQt
zxnbcXc)g(t3{rUdPMfaK%%Hrqprk0DslI+vf0bG+CIcpboS5LPAYPj|i6SPyE|pHf
muOTAEZjy2C<2^jRD5-3LB(|raJ(eCLJUTKiqJHt_{C@#Cu=t_?

literal 0
HcmV?d00001

diff --git a/recipes/miradasalsur.recipe b/recipes/miradasalsur.recipe
index fd306adc86..4794503384 100644
--- a/recipes/miradasalsur.recipe
+++ b/recipes/miradasalsur.recipe
@@ -1,18 +1,17 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
-elargentino.com
+sur.infonews.com
 '''
 
+import datetime
+from calibre import strftime
 from calibre.web.feeds.news import BasicNewsRecipe
 from calibre.ebooks.BeautifulSoup import Tag
 
 class MiradasAlSur(BasicNewsRecipe):
     title                 = 'Miradas al Sur'
     __author__            = 'Darko Miletic'
-    description           = 'Revista Argentina'
+    description           = 'Semanario Argentino'
     publisher             = 'ElArgentino.com'
     category              = 'news, politics, Argentina'
     oldest_article        = 7
@@ -20,53 +19,51 @@ class MiradasAlSur(BasicNewsRecipe):
     no_stylesheets        = True
     use_embedded_content  = False
     encoding              = 'utf-8'
-    language = 'es_AR'
+    language              = 'es_AR'
+    remove_empty_feeds    = True
+    masthead_url          = 'http://sur.infonews.com/sites/default/files/www_miradas_al_sur_com_logo.gif'
+    extra_css             = """
+                             body{font-family: Arial,Helvetica,sans-serif}
+                             h1{font-family: Georgia,Times,serif}
+                             .field-field-story-author{color: gray; font-size: small}                             
+                            """
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        , 'series'    : title
+                        }
+                            
+    keep_only_tags = [dict(name='div', attrs={'id':['content-header', 'content-area']})]
+    remove_tags    = [ 
+                      dict(name=['link','meta','iframe','embed','object']), 
+                      dict(name='form', attrs={'class':'fivestar-widget'}),
+                      dict(attrs={'class':lambda x: x and 'terms-inline' in x.split()})
+                     ]
 
-    lang                  = 'es-AR'
-    direction             = 'ltr'
-    INDEX                 = 'http://www.elargentino.com/medios/123/Miradas-al-Sur.html'
-    extra_css             = ' .titulo{font-size: x-large; font-weight: bold} .volantaImp{font-size: small; font-weight: bold} '
-
-    html2lrf_options = [
-                          '--comment'  , description
-                        , '--category' , category
-                        , '--publisher', publisher
-                        ]
-
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0cm; margin-top: 0em; margin-bottom: 0.5em} "'
-
-    keep_only_tags = [dict(name='div', attrs={'class':'ContainerPop'})]
-
-    remove_tags = [dict(name='link')]
-
-    feeds = [(u'Articulos', u'http://www.elargentino.com/Highlights.aspx?ParentType=Section&ParentId=123&Content-Type=text/xml&ChannelDesc=Miradas%20al%20Sur')]
-
-    def print_version(self, url):
-        main, sep, article_part = url.partition('/nota-')
-        article_id, rsep, rrest = article_part.partition('-')
-        return u'http://www.elargentino.com/Impresion.aspx?Id=' + article_id
-
-    def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        soup.html['lang'] = self.lang
-        soup.html['dir' ] = self.direction
-        mlang = Tag(soup,'meta',[("http-equiv","Content-Language"),("content",self.lang)])
-        mcharset = Tag(soup,'meta',[("http-equiv","Content-Type"),("content","text/html; charset=utf-8")])
-        soup.head.insert(0,mlang)
-        soup.head.insert(1,mcharset)
-        return soup
+    feeds = [
+             (u'Politica'           , u'http://sur.infonews.com/taxonomy/term/1/0/feed' ),
+             (u'Internacional'      , u'http://sur.infonews.com/taxonomy/term/2/0/feed' ),
+             (u'Informe Especial'   , u'http://sur.infonews.com/taxonomy/term/14/0/feed'),
+             (u'Delitos y pesquisas', u'http://sur.infonews.com/taxonomy/term/6/0/feed' ),
+             (u'Lesa Humanidad'     , u'http://sur.infonews.com/taxonomy/term/7/0/feed' ),
+             (u'Cultura'            , u'http://sur.infonews.com/taxonomy/term/8/0/feed' ),
+             (u'Deportes'           , u'http://sur.infonews.com/taxonomy/term/9/0/feed' ),
+             (u'Contratapa'         , u'http://sur.infonews.com/taxonomy/term/10/0/feed'),
+            ]
 
     def get_cover_url(self):
+        # determine the series number, unfortunately not gonna happen now
+        #self.conversion_options.update({'series_index':seriesnr})
         cover_url = None
-        soup = self.index_to_soup(self.INDEX)
-        cover_item = soup.find('div',attrs={'class':'colder'})
+        cdate = datetime.date.today()
+        todayweekday = cdate.isoweekday()
+        if (todayweekday != 7):
+            cdate -= datetime.timedelta(days=todayweekday)        
+        cover_page_url = cdate.strftime('http://sur.infonews.com/ediciones/%Y-%m-%d/tapa');
+        soup = self.index_to_soup(cover_page_url)
+        cover_item = soup.find('img', attrs={'class':lambda x: x and 'imagecache-tapa_edicion_full' in x.split()})
         if cover_item:
-           clean_url = self.image_url_processor(None,cover_item.div.img['src'])
-           cover_url = 'http://www.elargentino.com' + clean_url + '&height=600'
+           cover_url = cover_item['src']
         return cover_url
-
-    def image_url_processor(self, baseurl, url):
-        base, sep, rest = url.rpartition('?Id=')
-        img, sep2, rrest = rest.partition('&')
-        return base + sep + img

From 3b0f7a90e401804bb662cee1055fee7f58284f98 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 Jun 2013 10:18:24 +0530
Subject: [PATCH 0033/1154] News download: Respect more default conversion
 settings

News download: Apply the default page margin conversion settings. Also,
when converting to PDF, apply the pdf conversion defaults. Fixes #1193763 [Private bug](https://bugs.launchpad.net/calibre/+bug/1193763)
---
 src/calibre/gui2/tools.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py
index eda60a4fec..32e3174c8d 100644
--- a/src/calibre/gui2/tools.py
+++ b/src/calibre/gui2/tools.py
@@ -24,7 +24,7 @@ from calibre.ebooks.conversion.config import GuiRecommendations, \
     load_defaults, load_specifics, save_specifics
 from calibre.gui2.convert import bulk_defaults_for_input_format
 
-def convert_single_ebook(parent, db, book_ids, auto_conversion=False, # {{{
+def convert_single_ebook(parent, db, book_ids, auto_conversion=False,  # {{{
         out_format=None, show_no_format_warning=True):
     changed = False
     jobs = []
@@ -47,7 +47,7 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False, # {{{
                 result = d.exec_()
 
             if result == QDialog.Accepted:
-                #if not convert_existing(parent, db, [book_id], d.output_format):
+                # if not convert_existing(parent, db, [book_id], d.output_format):
                 #    continue
 
                 mi = db.get_metadata(book_id, True)
@@ -116,7 +116,6 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False, # {{{
                     msg = _('This book has no actual ebook files')
                 res.append('%s - %s'%(title, msg))
 
-
             msg = '%s' % '\n'.join(res)
             warning_dialog(parent, _('Could not convert some books'),
                 _('Could not convert %(num)d of %(tot)d books, because no supported source'
@@ -254,7 +253,7 @@ class QueueBulk(QProgressDialog):
 
 # }}}
 
-def fetch_scheduled_recipe(arg): # {{{
+def fetch_scheduled_recipe(arg):  # {{{
     fmt = prefs['output_format'].lower()
     # Never use AZW3 for periodicals...
     if fmt == 'azw3':
@@ -266,6 +265,10 @@ def fetch_scheduled_recipe(arg): # {{{
     if 'output_profile' in ps:
         recs.append(('output_profile', ps['output_profile'],
             OptionRecommendation.HIGH))
+    for edge in ('left', 'top', 'bottom', 'right'):
+        edge = 'margin_' + edge
+        if edge in ps:
+            recs.append((edge, ps[edge], OptionRecommendation.HIGH))
 
     lf = load_defaults('look_and_feel')
     if lf.get('base_font_size', 0.0) != 0.0:
@@ -283,18 +286,24 @@ def fetch_scheduled_recipe(arg): # {{{
     if epub.get('epub_flatten', False):
         recs.append(('epub_flatten', True, OptionRecommendation.HIGH))
 
+    if fmt == 'pdf':
+        pdf = load_defaults('pdf_output')
+        from calibre.customize.ui import plugin_for_output_format
+        p = plugin_for_output_format('pdf')
+        for opt in p.options:
+            recs.append(opt.name, pdf.get(opt.name, opt.recommended_value), OptionRecommendation.HIGH)
+
     args = [arg['recipe'], pt.name, recs]
     if arg['username'] is not None:
         recs.append(('username', arg['username'], OptionRecommendation.HIGH))
     if arg['password'] is not None:
         recs.append(('password', arg['password'], OptionRecommendation.HIGH))
 
-
     return 'gui_convert', args, _('Fetch news from ')+arg['title'], fmt.upper(), [pt]
 
 # }}}
 
-def generate_catalog(parent, dbspec, ids, device_manager, db): # {{{
+def generate_catalog(parent, dbspec, ids, device_manager, db):  # {{{
     from calibre.gui2.dialogs.catalog import Catalog
 
     # Build the Catalog dialog in gui2.dialogs.catalog
@@ -354,7 +363,7 @@ def generate_catalog(parent, dbspec, ids, device_manager, db): # {{{
             d.catalog_title
 # }}}
 
-def convert_existing(parent, db, book_ids, output_format): # {{{
+def convert_existing(parent, db, book_ids, output_format):  # {{{
     already_converted_ids = []
     already_converted_titles = []
     for book_id in book_ids:
@@ -372,3 +381,4 @@ def convert_existing(parent, db, book_ids, output_format): # {{{
     return book_ids
 # }}}
 
+

From f58b8aee4fd223ad6f2434389de276956765eb88 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 Jun 2013 10:21:42 +0530
Subject: [PATCH 0034/1154] Update taz.de (RSS)

Fixes #18 (RSS Recipe broken: Taz RSS)
---
 recipes/taz_rss.recipe | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes/taz_rss.recipe b/recipes/taz_rss.recipe
index 90cf27a303..3ccbe2a4f1 100644
--- a/recipes/taz_rss.recipe
+++ b/recipes/taz_rss.recipe
@@ -18,7 +18,6 @@ class TazRSSRecipe(BasicNewsRecipe):
 
     feeds          = [(u'TAZ main feed', u'http://www.taz.de/rss.xml')]
     keep_only_tags = [dict(name='div', attrs={'class': 'sect sect_article'})]
-    remove_tags_after = dict(name='div', attrs={'class': 'rack'})
     remove_tags = [
          dict(name=['div'], attrs={'class': 'artikelwerbung'}),
          dict(name=['ul'], attrs={'class': 'toolbar'}),]

From d2292a759d5718ea6cb82360d7e3026652020f18 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 Jun 2013 18:04:07 +0530
Subject: [PATCH 0035/1154] Upload installers to downloadbestsoftware.com as
 well

---
 setup/hosting.py | 26 ++++++++++++++++++++++++++
 setup/upload.py  |  6 ++++++
 2 files changed, 32 insertions(+)

diff --git a/setup/hosting.py b/setup/hosting.py
index 9853f181a4..76ab3992a0 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -402,6 +402,29 @@ def upload_to_servers(files, version):  # {{{
             print ('Uploaded in', int(time.time() - start), 'seconds\n\n')
 # }}}
 
+def upload_to_dbs(files, version):  # {{{
+    print('Uploading to downloadbestsoftware.com')
+    server = 'www.downloadbestsoft-mirror1.com'
+    rdir = 'release/'
+    check_call(['ssh', 'kovid@%s' % server, 'rm -f release/*'])
+    for x in files:
+        start = time.time()
+        print ('Uploading', x)
+        for i in range(5):
+            try:
+                check_call(['rsync', '-h', '-z', '--progress', '-e', 'ssh -x', x,
+                'kovid@%s:%s'%(server, rdir)])
+            except KeyboardInterrupt:
+                raise SystemExit(1)
+            except:
+                print ('\nUpload failed, trying again in 30 seconds')
+                time.sleep(30)
+            else:
+                break
+        print ('Uploaded in', int(time.time() - start), 'seconds\n\n')
+    check_call(['ssh', 'kovid@%s' % server, '/home/kovid/uploadFiles'])
+# }}}
+
 # CLI {{{
 def cli_parser():
     epilog='Copyright Kovid Goyal 2012'
@@ -434,6 +457,7 @@ def cli_parser():
             epilog=epilog)
     cron = subparsers.add_parser('cron', help='Call script from cron')
     subparsers.add_parser('calibre', help='Upload to calibre file servers')
+    subparsers.add_parser('dbs', help='Upload to downloadbestsoftware.com')
 
     a = gc.add_argument
 
@@ -498,6 +522,8 @@ def main(args=None):
         login_to_google(args.username, args.password)
     elif args.service == 'calibre':
         upload_to_servers(ofiles, args.version)
+    elif args.service == 'dbs':
+        upload_to_dbs(ofiles, args.version)
 
 if __name__ == '__main__':
     main()
diff --git a/setup/upload.py b/setup/upload.py
index 784c0cf9f8..8a4e467dd0 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -114,6 +114,9 @@ def sf_cmdline(ver, sdata):
 def calibre_cmdline(ver):
     return [__appname__, ver, 'fmap', 'calibre']
 
+def dbs_cmdline(ver):
+    return [__appname__, ver, 'fmap', 'dbs']
+
 def run_remote_upload(args):
     print 'Running remotely:', ' '.join(args)
     subprocess.check_call(['ssh', '-x', '%s@%s'%(STAGING_USER, STAGING_HOST),
@@ -140,6 +143,7 @@ class UploadInstallers(Command):  # {{{
             self.upload_to_staging(tdir, backup, files)
             self.upload_to_sourceforge()
             self.upload_to_calibre()
+            self.upload_to_dbs()
             # self.upload_to_google(opts.replace)
         finally:
             shutil.rmtree(tdir, ignore_errors=True)
@@ -184,6 +188,8 @@ class UploadInstallers(Command):  # {{{
     def upload_to_calibre(self):
         run_remote_upload(calibre_cmdline(__version__))
 
+    def upload_to_dbs(self):
+        run_remote_upload(dbs_cmdline(__version__))
 # }}}
 
 class UploadUserManual(Command):  # {{{

From 7089c66a986ec8741216449d76d6fd79e4afdc9d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 Jun 2013 18:45:05 +0530
Subject: [PATCH 0036/1154] LRF Output: Fix &quot; entities in attribute values
 causing problems

---
 src/calibre/ebooks/lrf/html/convert_from.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py
index c755cabd92..2b9a3617dc 100644
--- a/src/calibre/ebooks/lrf/html/convert_from.py
+++ b/src/calibre/ebooks/lrf/html/convert_from.py
@@ -104,7 +104,7 @@ class HTMLConverter(object):
 
                         # Replace entities
                         (re.compile(ur'&(\S+?);'), partial(entity_to_unicode,
-                                                           exceptions=['lt', 'gt', 'amp'])),
+                                                           exceptions=['lt', 'gt', 'amp', 'quot'])),
                         # Remove comments from within style tags as they can mess up BeatifulSoup
                         (re.compile(r'(<style.*?</style>)', re.IGNORECASE|re.DOTALL),
                          strip_style_comments),

From 8f30c17486701bf2cc29a84c98af5336de75fc56 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Mon, 24 Jun 2013 14:14:08 -0700
Subject: [PATCH 0037/1154] Fixed typo(?) in set_metadata() for touched files.

---
 src/calibre/utils/podofo/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/podofo/__init__.py b/src/calibre/utils/podofo/__init__.py
index 13c12a9bb3..a0b5d85331 100644
--- a/src/calibre/utils/podofo/__init__.py
+++ b/src/calibre/utils/podofo/__init__.py
@@ -36,7 +36,7 @@ def set_metadata(stream, mi):
         except WorkerError as e:
             raise Exception('Failed to set PDF metadata: %s'%e.orig_tb)
         if touched:
-            with open(os.path.join(tdir, u'output.pdf'), 'rb') as f:
+            with open(os.path.join(tdir, u'input.pdf'), 'rb') as f:
                 f.seek(0, 2)
                 if f.tell() > 100:
                     f.seek(0)

From 5b07091d5939c0f25e3122d66817ed86f22968e1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 25 Jun 2013 09:12:04 +0530
Subject: [PATCH 0038/1154] Make the manual self contained

---
 manual/resources/simple_donate_button.gif | Bin 0 -> 2132 bytes
 manual/templates/layout.html              |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 manual/resources/simple_donate_button.gif

diff --git a/manual/resources/simple_donate_button.gif b/manual/resources/simple_donate_button.gif
new file mode 100644
index 0000000000000000000000000000000000000000..42dd2c3c88f13d0a8eebeecfff7088effdcf8566
GIT binary patch
literal 2132
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
S)>Pm;G$y93r-%lC)Bga!y^>S_

literal 0
HcmV?d00001

diff --git a/manual/templates/layout.html b/manual/templates/layout.html
index b8389b0ac9..188e829469 100644
--- a/manual/templates/layout.html
+++ b/manual/templates/layout.html
@@ -62,7 +62,7 @@
         <form action="https://www.paypal.com/cgi-bin/webscr" method="post" title="Contribute to support calibre development">
             <input type="hidden" name="cmd" value="_s-xclick" />
             <input type="hidden" name="hosted_button_id" value="AF4H3B8QVDG6N" />
-            <input type="image" src="http://manual.calibre-ebook.com/simple_donate_button.gif" border="0" name="submit" alt="Contribute to support calibre development" style="border:0pt" />
+            <input type="image" src="_static/simple_donate_button.gif" border="0" name="submit" alt="Contribute to support calibre development" style="border:0pt" />
             <img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1" />
         </form>
         <hr/>

From 230ef564eef44b81bc004f1cd21016c3c012adc5 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 25 Jun 2013 08:20:07 +0200
Subject: [PATCH 0039/1154] Fix bug #1193763 - Save to device template
 generates exception for custom column names.

---
 src/calibre/gui2/dialogs/template_dialog.py   | 2 ++
 src/calibre/gui2/preferences/save_template.py | 5 +++--
 src/calibre/gui2/preferences/saving.py        | 3 ++-
 src/calibre/gui2/preferences/sending.py       | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py
index 2bafc2812a..3db6e37eb0 100644
--- a/src/calibre/gui2/dialogs/template_dialog.py
+++ b/src/calibre/gui2/dialogs/template_dialog.py
@@ -262,6 +262,8 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
             self.mi.rating = 4.0
             self.mi.tags = [_('Tag 1'), _('Tag 2')]
             self.mi.languages = ['eng']
+            if fm is not None:
+                self.mi.set_all_user_metadata(fm.custom_field_metadata())
 
         # Remove help icon on title bar
         icon = self.windowIcon()
diff --git a/src/calibre/gui2/preferences/save_template.py b/src/calibre/gui2/preferences/save_template.py
index 627c4c7fa9..145e014800 100644
--- a/src/calibre/gui2/preferences/save_template.py
+++ b/src/calibre/gui2/preferences/save_template.py
@@ -24,7 +24,7 @@ class SaveTemplate(QWidget, Ui_Form):
         Ui_Form.__init__(self)
         self.setupUi(self)
 
-    def initialize(self, name, default, help):
+    def initialize(self, name, default, help, field_metadata):
         variables = sorted(FORMAT_ARG_DESCS.keys())
         rows = []
         for var in variables:
@@ -36,6 +36,7 @@ class SaveTemplate(QWidget, Ui_Form):
         table = u'<table>%s</table>'%(u'\n'.join(rows))
         self.template_variables.setText(table)
 
+        self.field_metadata = field_metadata
         self.opt_template.initialize(name+'_template_history',
                 default, help)
         self.opt_template.editTextChanged.connect(self.changed)
@@ -44,7 +45,7 @@ class SaveTemplate(QWidget, Ui_Form):
         self.open_editor.clicked.connect(self.do_open_editor)
 
     def do_open_editor(self):
-        t = TemplateDialog(self, self.opt_template.text())
+        t = TemplateDialog(self, self.opt_template.text(), fm=self.field_metadata)
         t.setWindowTitle(_('Edit template'))
         if t.exec_():
             self.opt_template.set_value(t.rule[1])
diff --git a/src/calibre/gui2/preferences/saving.py b/src/calibre/gui2/preferences/saving.py
index bd5fcbb078..e1a235803d 100644
--- a/src/calibre/gui2/preferences/saving.py
+++ b/src/calibre/gui2/preferences/saving.py
@@ -34,7 +34,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         ConfigWidgetBase.initialize(self)
         self.save_template.blockSignals(True)
         self.save_template.initialize('save_to_disk', self.proxy['template'],
-                self.proxy.help('template'))
+                self.proxy.help('template'),
+                self.gui.library_view.model().db.field_metadata)
         self.save_template.blockSignals(False)
 
     def restore_defaults(self):
diff --git a/src/calibre/gui2/preferences/sending.py b/src/calibre/gui2/preferences/sending.py
index 3fce5cb072..bc46ac500b 100644
--- a/src/calibre/gui2/preferences/sending.py
+++ b/src/calibre/gui2/preferences/sending.py
@@ -44,7 +44,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         ConfigWidgetBase.initialize(self)
         self.send_template.blockSignals(True)
         self.send_template.initialize('send_to_device', self.proxy['send_template'],
-                self.proxy.help('send_template'))
+                self.proxy.help('send_template'),
+                self.gui.library_view.model().db.field_metadata)
         self.send_template.blockSignals(False)
 
     def restore_defaults(self):

From 2096dce1cdcea621f314145f71d5ad5a7390a13e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 25 Jun 2013 13:09:51 +0530
Subject: [PATCH 0040/1154] Move User Manual and staging to the download server

---
 setup/hosting.py | 113 ++++++++++++++++++++++++++++++++++++++++++++---
 setup/upload.py  |  11 +++--
 2 files changed, 112 insertions(+), 12 deletions(-)

diff --git a/setup/hosting.py b/setup/hosting.py
index 76ab3992a0..1e78f4694d 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -7,16 +7,14 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, time, sys, traceback, subprocess, urllib2, re, base64, httplib
+import os, time, sys, traceback, subprocess, urllib2, re, base64, httplib, shutil
 from argparse import ArgumentParser, FileType
 from subprocess import check_call
 from tempfile import NamedTemporaryFile
 from collections import OrderedDict
 
-import mechanize
-from lxml import html
-
 def login_to_google(username, password):  # {{{
+    import mechanize
     br = mechanize.Browser()
     br.addheaders = [('User-agent',
         'Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20100101 Firefox/9.0')]
@@ -246,6 +244,7 @@ class GoogleCode(Base):  # {{{
         return login_to_google(self.username, self.gmail_password)
 
     def get_files_hosted_by_google_code(self):
+        from lxml import html
         self.info('Getting existing files in google code:', self.gc_project)
         raw = urllib2.urlopen(self.files_list).read()
         root = html.fromstring(raw)
@@ -380,11 +379,111 @@ class SourceForge(Base):  # {{{
 
 # }}}
 
+def generate_index():  # {{{
+    os.chdir('/srv/download')
+    releases = set()
+    for x in os.listdir('.'):
+        if os.path.isdir(x) and '.' in x:
+            releases.add(tuple((int(y) for y in x.split('.'))))
+    rmap = OrderedDict()
+    for rnum in sorted(releases, reverse=True):
+        series = rnum[:2] if rnum[0] == 0 else rnum[:1]
+        if series not in rmap:
+            rmap[series] = []
+        rmap[series].append(rnum)
+
+    template = '''<!DOCTYPE html>\n<html lang="en"> <head> <meta charset="utf-8"> <title>{title}</title> <style type="text/css"> {style} </style> </head> <body> <h1>{title}</h1> <p>{msg}</p> {body} </body> </html> '''  # noqa
+    style = '''
+    body { font-family: sans-serif; background-color: #eee; }
+    a { text-decoration: none; }
+    a:visited { color: blue }
+    a:hover { color: red }
+    ul { list-style-type: none }
+    li { padding-bottom: 1ex }
+    dd li { text-indent: 0; margin: 0 }
+    dd ul { padding: 0; margin: 0 }
+    dt { font-weight: bold }
+    dd { margin-bottom: 2ex }
+    '''
+    body = []
+    for series in rmap:
+        body.append('<li><a href="{0}.html" title="Releases in the {0}.x series">{0}.x</a>\xa0\xa0\xa0<span style="font-size:smaller">[{1} releases]</span></li>'.format(  # noqa
+                '.'.join(map(type(''), series)), len(rmap[series])))
+    body = '<ul>{0}</ul>'.format(' '.join(body))
+    index = template.format(title='Previous calibre releases', style=style, msg='Choose a series of calibre releases', body=body)
+    with open('index.html', 'wb') as f:
+        f.write(index.encode('utf-8'))
+
+    for series, releases in rmap.iteritems():
+        sname = '.'.join(map(type(''), series))
+        body = [
+            '<li><a href="{0}/" title="Release {0}">{0}</a></li>'.format('.'.join(map(type(''), r)))
+            for r in releases]
+        body = '<ul class="release-list">{0}</ul>'.format(' '.join(body))
+        index = template.format(title='Previous calibre releases (%s.x)' % sname, style=style,
+                                msg='Choose a calibre release', body=body)
+        with open('%s.html' % sname, 'wb') as f:
+            f.write(index.encode('utf-8'))
+
+        for r in releases:
+            rname = '.'.join(map(type(''), r))
+            os.chdir(rname)
+            try:
+                body = []
+                files = os.listdir('.')
+                windows = [x for x in files if x.endswith('.msi')]
+                if windows:
+                    windows = ['<li><a href="{0}" title="{1}">{1}</a></li>'.format(
+                        x, 'Windows 64-bit Installer' if '64bit' in x else 'Windows 32-bit Installer')
+                        for x in windows]
+                    body.append('<dt>Windows</dt><dd><ul>{0}</ul></dd>'.format(' '.join(windows)))
+                portable = [x for x in files if '-portable-' in x]
+                if portable:
+                    body.append('<dt>Calibre Portable</dt><dd><a href="{0}" title="{1}">{1}</a></dd>'.format(
+                        portable[0], 'Calibre Portable Installer'))
+                osx = [x for x in files if x.endswith('.dmg')]
+                if osx:
+                    body.append('<dt>Apple Mac</dt><dd><a href="{0}" title="{1}">{1}</a></dd>'.format(
+                        osx[0], 'OS X Disk Image (.dmg)'))
+                linux = [x for x in files if x.endswith('.bz2')]
+                if linux:
+                    linux = ['<li><a href="{0}" title="{1}">{1}</a></li>'.format(
+                        x, 'Linux 64-bit binary' if 'x86_64' in x else 'Linux 32-bit binary')
+                        for x in linux]
+                    body.append('<dt>Linux</dt><dd><ul>{0}</ul></dd>'.format(' '.join(linux)))
+                source = [x for x in files if x.endswith('.xz') or x.endswith('.gz')]
+                if source:
+                    body.append('<dt>Source Code</dt><dd><a href="{0}" title="{1}">{1}</a></dd>'.format(
+                        source[0], 'Source code (all platforms)'))
+
+                body = '<dl>{0}</dl>'.format(''.join(body))
+                index = template.format(title='calibre release (%s)' % rname, style=style,
+                                msg='', body=body)
+                with open('index.html', 'wb') as f:
+                    f.write(index.encode('utf-8'))
+            finally:
+                os.chdir('..')
+
+# }}}
+
 def upload_to_servers(files, version):  # {{{
-    for server, rdir in {'files':'/usr/share/nginx/html'}.iteritems():
+    base = '/srv/download/'
+    dest = os.path.join(base, version)
+    if not os.path.exists(dest):
+        os.mkdir(dest)
+    for src in files:
+        shutil.copyfile(src, os.path.join(dest, os.path.basename(src)))
+    generate_index()
+
+    for server, rdir in {'files':'/srv/download/'}.iteritems():
         print('Uploading to server:', server)
         server = '%s.calibre-ebook.com' % server
-        rdir = '%s/%s/' % (rdir, version)
+        # Copy the generated index files
+        print ('Copying generated index')
+        check_call(['rsync', '-hzr', '-e', 'ssh -x', '--include', '*.html',
+                    '--filter', '-! */', base, 'root@%s:%s' % (server, rdir)])
+        # Copy the release files
+        rdir = '%s%s/' % (rdir, version)
         for x in files:
             start = time.time()
             print ('Uploading', x)
@@ -400,6 +499,7 @@ def upload_to_servers(files, version):  # {{{
                 else:
                     break
             print ('Uploaded in', int(time.time() - start), 'seconds\n\n')
+
 # }}}
 
 def upload_to_dbs(files, version):  # {{{
@@ -530,3 +630,4 @@ if __name__ == '__main__':
 # }}}
 
 
+
diff --git a/setup/upload.py b/setup/upload.py
index 8a4e467dd0..639a2e98d5 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -19,10 +19,9 @@ from setup import Command, __version__, installer_name, __appname__
 PREFIX = "/var/www/calibre-ebook.com"
 DOWNLOADS = PREFIX+"/htdocs/downloads"
 BETAS = DOWNLOADS +'/betas'
-USER_MANUAL = '/var/www/localhost/htdocs/'
 HTML2LRF = "calibre/ebooks/lrf/html/demo"
 TXT2LRF  = "src/calibre/ebooks/lrf/txt/demo"
-STAGING_HOST = '67.207.135.179'
+STAGING_HOST = 'download.calibre-ebook.com'
 STAGING_USER = 'root'
 STAGING_DIR = '/root/staging'
 
@@ -141,8 +140,8 @@ class UploadInstallers(Command):  # {{{
             os.mkdir(backup)
         try:
             self.upload_to_staging(tdir, backup, files)
-            self.upload_to_sourceforge()
             self.upload_to_calibre()
+            self.upload_to_sourceforge()
             self.upload_to_dbs()
             # self.upload_to_google(opts.replace)
         finally:
@@ -219,9 +218,9 @@ class UploadUserManual(Command):  # {{{
         for x in glob.glob(self.j(path, '*')):
             self.build_plugin_example(x)
 
-        check_call(' '.join(['rsync', '-z', '-r', '--progress',
-            'manual/.build/html/',
-                    'bugs:%s'%USER_MANUAL]), shell=True)
+        for host in ('download', 'files'):
+            check_call(' '.join(['rsync', '-z', '-r', '--progress',
+                'manual/.build/html/', '%s:/srv/manual/' % host]), shell=True)
 # }}}
 
 class UploadDemo(Command):  # {{{

From e4876b579eba58402b507b58557a8c92db5037f4 Mon Sep 17 00:00:00 2001
From: Hakan Tandogan <hakan@gurkensalat.com>
Date: Tue, 25 Jun 2013 19:47:48 +0200
Subject: [PATCH 0041/1154] On book merge, merge identifiers as well. In case
 of conflict, the target wins.

---
 src/calibre/gui2/actions/edit_metadata.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index e5a9bfbc7d..84b1d367c6 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -399,8 +399,7 @@ class EditMetadataAction(InterfaceAction):
         if safe_merge:
             if not confirm('<p>'+_(
                 'Book formats and metadata from the selected books '
-                'will be added to the <b>first selected book</b> (%s). '
-                'ISBN will <i>not</i> be merged.<br><br> '
+                'will be added to the <b>first selected book</b> (%s).<br> '
                 'The second and subsequently selected books will not '
                 'be deleted or changed.<br><br>'
                 'Please confirm you want to proceed.')%title
@@ -413,7 +412,7 @@ class EditMetadataAction(InterfaceAction):
                 'Book formats from the selected books will be merged '
                 'into the <b>first selected book</b> (%s). '
                 'Metadata in the first selected book will not be changed. '
-                'Author, Title, ISBN and all other metadata will <i>not</i> be merged.<br><br>'
+                'Author, Title and all other metadata will <i>not</i> be merged.<br><br>'
                 'After merger the second and subsequently '
                 'selected books, with any metadata they have will be <b>deleted</b>. <br><br>'
                 'All book formats of the first selected book will be kept '
@@ -427,8 +426,7 @@ class EditMetadataAction(InterfaceAction):
         else:
             if not confirm('<p>'+_(
                 'Book formats and metadata from the selected books will be merged '
-                'into the <b>first selected book</b> (%s). '
-                'ISBN will <i>not</i> be merged.<br><br>'
+                'into the <b>first selected book</b> (%s).<br> '
                 'After merger the second and '
                 'subsequently selected books will be <b>deleted</b>. <br><br>'
                 'All book formats of the first selected book will be kept '
@@ -490,11 +488,13 @@ class EditMetadataAction(InterfaceAction):
     def merge_metadata(self, dest_id, src_ids):
         db = self.gui.library_view.model().db
         dest_mi = db.get_metadata(dest_id, index_is_id=True)
+        merged_identifiers = db.get_identifiers(dest_id, index_is_id=True)
         orig_dest_comments = dest_mi.comments
         dest_cover = db.cover(dest_id, index_is_id=True)
         had_orig_cover = bool(dest_cover)
         for src_id in src_ids:
             src_mi = db.get_metadata(src_id, index_is_id=True)
+
             if src_mi.comments and orig_dest_comments != src_mi.comments:
                 if not dest_mi.comments:
                     dest_mi.comments = src_mi.comments
@@ -523,7 +523,15 @@ class EditMetadataAction(InterfaceAction):
             if not dest_mi.series:
                 dest_mi.series = src_mi.series
                 dest_mi.series_index = src_mi.series_index
+
+            src_identifiers = db.get_identifiers(src_id, index_is_id=True)
+            src_identifiers.update(merged_identifiers)
+            merged_identifiers = src_identifiers.copy()
+
         db.set_metadata(dest_id, dest_mi, ignore_errors=False)
+
+        db.set_identifiers(dest_id, merged_identifiers)
+
         if not had_orig_cover and dest_cover:
             db.set_cover(dest_id, dest_cover)
 

From 7b6a742f2542ba5265898785a5dace388c11e5f5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 26 Jun 2013 00:07:00 +0530
Subject: [PATCH 0042/1154] ...

---
 src/calibre/gui2/actions/edit_metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index babd690384..729de33c7f 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -426,7 +426,7 @@ class EditMetadataAction(InterfaceAction):
         else:
             if not confirm('<p>'+_(
                 'Book formats and metadata from the selected books will be merged '
-                'into the <b>first selected book</b> (%s).<br> '
+                'into the <b>first selected book</b> (%s).<br><br>'
                 'After merger the second and '
                 'subsequently selected books will be <b>deleted</b>. <br><br>'
                 'All book formats of the first selected book will be kept '

From 30cea5df3a8f5b3c125912854b78699f9cbd4219 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 26 Jun 2013 10:40:00 +0530
Subject: [PATCH 0043/1154] ...

---
 src/calibre/web/fetch/javascript.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/web/fetch/javascript.py b/src/calibre/web/fetch/javascript.py
index 56460c18bf..6e9ef86ff1 100644
--- a/src/calibre/web/fetch/javascript.py
+++ b/src/calibre/web/fetch/javascript.py
@@ -128,6 +128,8 @@ def download_resources(browser, resource_cache, output_dir):
             else:
                 img_counter += 1
                 ext = what(None, raw) or 'jpg'
+                if ext == 'jpeg':
+                    ext = 'jpg'  # Apparently Moon+ cannot handle .jpeg
                 href = 'img_%d.%s' % (img_counter, ext)
             dest = os.path.join(output_dir, href)
             resource_cache[h] = dest

From 03452d2a038873d8df345512c7433019ada7efa2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 26 Jun 2013 14:59:46 +0530
Subject: [PATCH 0044/1154] Conversion: Add option to embed all referenced
 fonts

Conversion: Add an option to embed all fonts that are referenced in the
input document but are not already embedded. This will search your
system for the referenced font, and if found, the font will be embedded.
Only works if the output format supports font embedding (for example:
EPUB or AZW3).
---
 src/calibre/ebooks/conversion/cli.py          |   5 +-
 src/calibre/ebooks/conversion/plumber.py      |  17 +
 .../ebooks/oeb/transforms/embed_fonts.py      | 233 +++++++++++
 src/calibre/ebooks/oeb/transforms/flatcss.py  |   2 +-
 src/calibre/ebooks/oeb/transforms/subset.py   | 208 +++++-----
 src/calibre/gui2/convert/look_and_feel.py     |   2 +-
 src/calibre/gui2/convert/look_and_feel.ui     | 371 +++++++++---------
 7 files changed, 561 insertions(+), 277 deletions(-)
 create mode 100644 src/calibre/ebooks/oeb/transforms/embed_fonts.py

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index f2e5f4e3c9..a0abebc5fe 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -136,7 +136,7 @@ def add_pipeline_options(parser, plumber):
                   [
                       'base_font_size', 'disable_font_rescaling',
                       'font_size_mapping', 'embed_font_family',
-                      'subset_embedded_fonts',
+                      'subset_embedded_fonts', 'embed_all_fonts',
                       'line_height', 'minimum_line_height',
                       'linearize_tables',
                       'extra_css', 'filter_css',
@@ -320,7 +320,7 @@ def main(args=sys.argv):
         opts.search_replace = read_sr_patterns(opts.search_replace, log)
 
     recommendations = [(n.dest, getattr(opts, n.dest),
-                        OptionRecommendation.HIGH) \
+                        OptionRecommendation.HIGH)
                                         for n in parser.options_iter()
                                         if n.dest]
     plumber.merge_ui_recommendations(recommendations)
@@ -342,3 +342,4 @@ def main(args=sys.argv):
 
 if __name__ == '__main__':
     sys.exit(main())
+
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 1f459229c8..a96574e904 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -205,6 +205,16 @@ OptionRecommendation(name='embed_font_family',
             'with some output formats, principally EPUB and AZW3.')
         ),
 
+OptionRecommendation(name='embed_all_fonts',
+        recommended_value=False, level=OptionRecommendation.LOW,
+        help=_(
+            'Embed every font that is referenced in the input document '
+            'but not already embedded. This will search your system for the '
+            'fonts, and if found, they will be embedded. Embedding will only work '
+            'if the format you are converting to supports embedded fonts, such as '
+            'EPUB, AZW3 or PDF.'
+        )),
+
 OptionRecommendation(name='subset_embedded_fonts',
         recommended_value=False, level=OptionRecommendation.LOW,
         help=_(
@@ -965,6 +975,9 @@ OptionRecommendation(name='search_replace',
         if self.for_regex_wizard and hasattr(self.opts, 'no_process'):
             self.opts.no_process = True
         self.flush()
+        if self.opts.embed_all_fonts or self.opts.embed_font_family:
+            # Start the threaded font scanner now, for performance
+            from calibre.utils.fonts.scanner import font_scanner  # noqa
         import cssutils, logging
         cssutils.log.setLevel(logging.WARN)
         get_types_map()  # Ensure the mimetypes module is intialized
@@ -1129,6 +1142,10 @@ OptionRecommendation(name='search_replace',
         RemoveFakeMargins()(self.oeb, self.log, self.opts)
         RemoveAdobeMargins()(self.oeb, self.log, self.opts)
 
+        if self.opts.embed_all_fonts:
+            from calibre.ebooks.oeb.transforms.embed_fonts import EmbedFonts
+            EmbedFonts()(self.oeb, self.log, self.opts)
+
         if self.opts.subset_embedded_fonts and self.output_plugin.file_type != 'pdf':
             from calibre.ebooks.oeb.transforms.subset import SubsetFonts
             SubsetFonts()(self.oeb, self.log, self.opts)
diff --git a/src/calibre/ebooks/oeb/transforms/embed_fonts.py b/src/calibre/ebooks/oeb/transforms/embed_fonts.py
new file mode 100644
index 0000000000..027b8af1de
--- /dev/null
+++ b/src/calibre/ebooks/oeb/transforms/embed_fonts.py
@@ -0,0 +1,233 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import logging
+from collections import defaultdict
+
+import cssutils
+from lxml import etree
+
+from calibre import guess_type
+from calibre.ebooks.oeb.base import XPath, CSS_MIME, XHTML
+from calibre.ebooks.oeb.transforms.subset import get_font_properties, find_font_face_rules, elem_style
+from calibre.utils.filenames import ascii_filename
+from calibre.utils.fonts.scanner import font_scanner, NoFonts
+
+def used_font(style, embedded_fonts):
+    ff = [unicode(f) for f in style.get('font-family', []) if unicode(f).lower() not in {
+        'serif', 'sansserif', 'sans-serif', 'fantasy', 'cursive', 'monospace'}]
+    if not ff:
+        return False, None
+    lnames = {unicode(x).lower() for x in ff}
+
+    matching_set = []
+
+    # Filter on font-family
+    for ef in embedded_fonts:
+        flnames = {x.lower() for x in ef.get('font-family', [])}
+        if not lnames.intersection(flnames):
+            continue
+        matching_set.append(ef)
+    if not matching_set:
+        return True, None
+
+    # Filter on font-stretch
+    widths = {x:i for i, x in enumerate(('ultra-condensed',
+            'extra-condensed', 'condensed', 'semi-condensed', 'normal',
+            'semi-expanded', 'expanded', 'extra-expanded', 'ultra-expanded'
+            ))}
+
+    width = widths[style.get('font-stretch', 'normal')]
+    for f in matching_set:
+        f['width'] = widths[style.get('font-stretch', 'normal')]
+
+    min_dist = min(abs(width-f['width']) for f in matching_set)
+    if min_dist > 0:
+        return True, None
+    nearest = [f for f in matching_set if abs(width-f['width']) ==
+        min_dist]
+    if width <= 4:
+        lmatches = [f for f in nearest if f['width'] <= width]
+    else:
+        lmatches = [f for f in nearest if f['width'] >= width]
+    matching_set = (lmatches or nearest)
+
+    # Filter on font-style
+    fs = style.get('font-style', 'normal')
+    matching_set = [f for f in matching_set if f.get('font-style', 'normal') == fs]
+
+    # Filter on font weight
+    fw = int(style.get('font-weight', '400'))
+    matching_set = [f for f in matching_set if f.get('weight', 400) == fw]
+
+    if not matching_set:
+        return True, None
+    return True, matching_set[0]
+
+
+class EmbedFonts(object):
+
+    '''
+    Embed all referenced fonts, if found on system. Must be called after CSS flattening.
+    '''
+
+    def __call__(self, oeb, log, opts):
+        self.oeb, self.log, self.opts = oeb, log, opts
+        self.sheet_cache = {}
+        self.find_style_rules()
+        self.find_embedded_fonts()
+        self.parser = cssutils.CSSParser(loglevel=logging.CRITICAL, log=logging.getLogger('calibre.css'))
+        self.warned = set()
+        self.warned2 = set()
+
+        for item in oeb.spine:
+            if not hasattr(item.data, 'xpath'):
+                continue
+            sheets = []
+            for href in XPath('//h:link[@href and @type="text/css"]/@href')(item.data):
+                sheet = self.oeb.manifest.hrefs.get(item.abshref(href), None)
+                if sheet is not None:
+                    sheets.append(sheet)
+            if sheets:
+                self.process_item(item, sheets)
+
+    def find_embedded_fonts(self):
+        '''
+        Find all @font-face rules and extract the relevant info from them.
+        '''
+        self.embedded_fonts = []
+        for item in self.oeb.manifest:
+            if not hasattr(item.data, 'cssRules'):
+                continue
+            self.embedded_fonts.extend(find_font_face_rules(item, self.oeb))
+
+    def find_style_rules(self):
+        '''
+        Extract all font related style information from all stylesheets into a
+        dict mapping classes to font properties specified by that class. All
+        the heavy lifting has already been done by the CSS flattening code.
+        '''
+        rules = defaultdict(dict)
+        for item in self.oeb.manifest:
+            if not hasattr(item.data, 'cssRules'):
+                continue
+            for i, rule in enumerate(item.data.cssRules):
+                if rule.type != rule.STYLE_RULE:
+                    continue
+                props = {k:v for k,v in
+                        get_font_properties(rule).iteritems() if v}
+                if not props:
+                    continue
+                for sel in rule.selectorList:
+                    sel = sel.selectorText
+                    if sel and sel.startswith('.'):
+                        # We dont care about pseudo-selectors as the worst that
+                        # can happen is some extra characters will remain in
+                        # the font
+                        sel = sel.partition(':')[0]
+                        rules[sel[1:]].update(props)
+
+        self.style_rules = dict(rules)
+
+    def get_page_sheet(self):
+        if self.page_sheet is None:
+            manifest = self.oeb.manifest
+            id_, href = manifest.generate('page_css', 'page_styles.css')
+            self.page_sheet = manifest.add(id_, href, CSS_MIME, data=self.parser.parseString('', validate=False))
+            head = self.current_item.xpath('//*[local-name()="head"][1]')
+            if head:
+                href = self.current_item.relhref(href)
+                l = etree.SubElement(head[0], XHTML('link'),
+                    rel='stylesheet', type=CSS_MIME, href=href)
+                l.tail = '\n'
+            else:
+                self.log.warn('No <head> cannot embed font rules')
+        return self.page_sheet
+
+    def process_item(self, item, sheets):
+        ff_rules = []
+        self.current_item = item
+        self.page_sheet = None
+        for sheet in sheets:
+            if 'page_css' in sheet.id:
+                ff_rules.extend(find_font_face_rules(sheet, self.oeb))
+                self.page_sheet = sheet
+
+        base = {'font-family':['serif'], 'font-weight': '400',
+                'font-style':'normal', 'font-stretch':'normal'}
+
+        for body in item.data.xpath('//*[local-name()="body"]'):
+            self.find_usage_in(body, base, ff_rules)
+
+    def find_usage_in(self, elem, inherited_style, ff_rules):
+        style = elem_style(self.style_rules, elem.get('class', '') or '', inherited_style)
+        for child in elem:
+            self.find_usage_in(child, style, ff_rules)
+        has_font, existing = used_font(style, ff_rules)
+        if not has_font:
+            return
+        if existing is None:
+            in_book = used_font(style, self.embedded_fonts)[1]
+            if in_book is None:
+                # Try to find the font in the system
+                added = self.embed_font(style)
+                if added is not None:
+                    ff_rules.append(added)
+                    self.embedded_fonts.append(added)
+            else:
+                # TODO: Create a page rule from the book rule (cannot use it
+                # directly as paths might be different)
+                item = in_book['item']
+                sheet = self.parser.parseString(in_book['rule'].cssText, validate=False)
+                rule = sheet.cssRules[0]
+                page_sheet = self.get_page_sheet()
+                href = page_sheet.abshref(item.href)
+                rule.style.setProperty('src', 'url(%s)' % href)
+                ff_rules.append(find_font_face_rules(sheet, self.oeb)[0])
+                page_sheet.data.insertRule(rule, len(page_sheet.data.cssRules))
+
+    def embed_font(self, style):
+        ff = [unicode(f) for f in style.get('font-family', []) if unicode(f).lower() not in {
+            'serif', 'sansserif', 'sans-serif', 'fantasy', 'cursive', 'monospace'}]
+        if not ff:
+            return
+        ff = ff[0]
+        if ff in self.warned:
+            return
+        try:
+            fonts = font_scanner.fonts_for_family(ff)
+        except NoFonts:
+            self.log.warn('Failed to find fonts for family:', ff, 'not embedding')
+            self.warned.add(ff)
+            return
+        try:
+            weight = int(style.get('font-weight', '400'))
+        except (ValueError, TypeError, AttributeError):
+            w = style['font-weight']
+            if w not in self.warned2:
+                self.log.warn('Invalid weight in font style: %r' % w)
+                self.warned2.add(w)
+            return
+        for f in fonts:
+            if f['weight'] == weight and f['font-style'] == style.get('font-style', 'normal') and f['font-stretch'] == style.get('font-stretch', 'normal'):
+                self.log('Embedding font %s from %s' % (f['full_name'], f['path']))
+                data = font_scanner.get_font_data(f)
+                name = f['full_name']
+                ext = 'otf' if f['is_otf'] else 'ttf'
+                name = ascii_filename(name).replace(' ', '-').replace('(', '').replace(')', '')
+                fid, href = self.oeb.manifest.generate(id=u'font', href=u'fonts/%s.%s'%(name, ext))
+                item = self.oeb.manifest.add(fid, href, guess_type('dummy.'+ext)[0], data=data)
+                item.unload_data_from_memory()
+                page_sheet = self.get_page_sheet()
+                href = page_sheet.relhref(item.href)
+                css = '''@font-face { font-family: "%s"; font-weight: %s; font-style: %s; font-stretch: %s; src: url(%s) }''' % (
+                    f['font-family'], f['font-weight'], f['font-style'], f['font-stretch'], href)
+                sheet = self.parser.parseString(css, validate=False)
+                page_sheet.data.insertRule(sheet.cssRules[0], len(page_sheet.data.cssRules))
+                return find_font_face_rules(sheet, self.oeb)[0]
+
diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index dd2d20333d..9c08934938 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -194,7 +194,7 @@ class CSSFlattener(object):
         for i, font in enumerate(faces):
             ext = 'otf' if font['is_otf'] else 'ttf'
             fid, href = self.oeb.manifest.generate(id=u'font',
-                href=u'%s.%s'%(ascii_filename(font['full_name']).replace(u' ', u'-'), ext))
+                href=u'fonts/%s.%s'%(ascii_filename(font['full_name']).replace(u' ', u'-'), ext))
             item = self.oeb.manifest.add(fid, href,
                     guess_type('dummy.'+ext)[0],
                     data=font_scanner.get_font_data(font))
diff --git a/src/calibre/ebooks/oeb/transforms/subset.py b/src/calibre/ebooks/oeb/transforms/subset.py
index 744e37b193..96170bd49c 100644
--- a/src/calibre/ebooks/oeb/transforms/subset.py
+++ b/src/calibre/ebooks/oeb/transforms/subset.py
@@ -12,6 +12,111 @@ from collections import defaultdict
 from calibre.ebooks.oeb.base import urlnormalize
 from calibre.utils.fonts.sfnt.subset import subset, NoGlyphs, UnsupportedFont
 
+def get_font_properties(rule, default=None):
+    '''
+    Given a CSS rule, extract normalized font properties from
+    it. Note that shorthand font property should already have been expanded
+    by the CSS flattening code.
+    '''
+    props = {}
+    s = rule.style
+    for q in ('font-family', 'src', 'font-weight', 'font-stretch',
+            'font-style'):
+        g = 'uri' if q == 'src' else 'value'
+        try:
+            val = s.getProperty(q).propertyValue[0]
+            val = getattr(val, g)
+            if q == 'font-family':
+                val = [x.value for x in s.getProperty(q).propertyValue]
+                if val and val[0] == 'inherit':
+                    val = None
+        except (IndexError, KeyError, AttributeError, TypeError, ValueError):
+            val = None if q in {'src', 'font-family'} else default
+        if q in {'font-weight', 'font-stretch', 'font-style'}:
+            val = unicode(val).lower() if (val or val == 0) else val
+            if val == 'inherit':
+                val = default
+        if q == 'font-weight':
+            val = {'normal':'400', 'bold':'700'}.get(val, val)
+            if val not in {'100', '200', '300', '400', '500', '600', '700',
+                    '800', '900', 'bolder', 'lighter'}:
+                val = default
+            if val == 'normal':
+                val = '400'
+        elif q == 'font-style':
+            if val not in {'normal', 'italic', 'oblique'}:
+                val = default
+        elif q == 'font-stretch':
+            if val not in {'normal', 'ultra-condensed', 'extra-condensed',
+                    'condensed', 'semi-condensed', 'semi-expanded',
+                    'expanded', 'extra-expanded', 'ultra-expanded'}:
+                val = default
+        props[q] = val
+    return props
+
+
+def find_font_face_rules(sheet, oeb):
+    '''
+    Find all @font-face rules in the given sheet and extract the relevant info from them.
+    sheet can be either a ManifestItem or a CSSStyleSheet.
+    '''
+    ans = []
+    try:
+        rules = sheet.data.cssRules
+    except AttributeError:
+        rules = sheet.cssRules
+
+    for i, rule in enumerate(rules):
+        if rule.type != rule.FONT_FACE_RULE:
+            continue
+        props = get_font_properties(rule, default='normal')
+        if not props['font-family'] or not props['src']:
+            continue
+
+        try:
+            path = sheet.abshref(props['src'])
+        except AttributeError:
+            path = props['src']
+        ff = oeb.manifest.hrefs.get(urlnormalize(path), None)
+        if not ff:
+            continue
+        props['item'] = ff
+        if props['font-weight'] in {'bolder', 'lighter'}:
+            props['font-weight'] = '400'
+        props['weight'] = int(props['font-weight'])
+        props['rule'] = rule
+        props['chars'] = set()
+        ans.append(props)
+
+    return ans
+
+
+def elem_style(style_rules, cls, inherited_style):
+    '''
+    Find the effective style for the given element.
+    '''
+    classes = cls.split()
+    style = inherited_style.copy()
+    for cls in classes:
+        style.update(style_rules.get(cls, {}))
+    wt = style.get('font-weight', None)
+    pwt = inherited_style.get('font-weight', '400')
+    if wt == 'bolder':
+        style['font-weight'] = {
+                '100':'400',
+                '200':'400',
+                '300':'400',
+                '400':'700',
+                '500':'700',
+                }.get(pwt, '900')
+    elif wt == 'lighter':
+        style['font-weight'] = {
+                '600':'400', '700':'400',
+                '800':'700', '900':'700'}.get(pwt, '100')
+
+    return style
+
+
 class SubsetFonts(object):
 
     '''
@@ -76,72 +181,15 @@ class SubsetFonts(object):
             self.log('Reduced total font size to %.1f%% of original'%
                     (totals[0]/totals[1] * 100))
 
-    def get_font_properties(self, rule, default=None):
-        '''
-        Given a CSS rule, extract normalized font properties from
-        it. Note that shorthand font property should already have been expanded
-        by the CSS flattening code.
-        '''
-        props = {}
-        s = rule.style
-        for q in ('font-family', 'src', 'font-weight', 'font-stretch',
-                'font-style'):
-            g = 'uri' if q == 'src' else 'value'
-            try:
-                val = s.getProperty(q).propertyValue[0]
-                val = getattr(val, g)
-                if q == 'font-family':
-                    val = [x.value for x in s.getProperty(q).propertyValue]
-                    if val and val[0] == 'inherit':
-                        val = None
-            except (IndexError, KeyError, AttributeError, TypeError, ValueError):
-                val = None if q in {'src', 'font-family'} else default
-            if q in {'font-weight', 'font-stretch', 'font-style'}:
-                val = unicode(val).lower() if (val or val == 0) else val
-                if val == 'inherit':
-                    val = default
-            if q == 'font-weight':
-                val = {'normal':'400', 'bold':'700'}.get(val, val)
-                if val not in {'100', '200', '300', '400', '500', '600', '700',
-                        '800', '900', 'bolder', 'lighter'}:
-                    val = default
-                if val == 'normal': val = '400'
-            elif q == 'font-style':
-                if val not in {'normal', 'italic', 'oblique'}:
-                    val = default
-            elif q == 'font-stretch':
-                if val not in { 'normal', 'ultra-condensed', 'extra-condensed',
-                        'condensed', 'semi-condensed', 'semi-expanded',
-                        'expanded', 'extra-expanded', 'ultra-expanded'}:
-                    val = default
-            props[q] = val
-        return props
-
     def find_embedded_fonts(self):
         '''
         Find all @font-face rules and extract the relevant info from them.
         '''
         self.embedded_fonts = []
         for item in self.oeb.manifest:
-            if not hasattr(item.data, 'cssRules'): continue
-            for i, rule in enumerate(item.data.cssRules):
-                if rule.type != rule.FONT_FACE_RULE:
-                    continue
-                props = self.get_font_properties(rule, default='normal')
-                if not props['font-family'] or not props['src']:
-                    continue
-
-                path = item.abshref(props['src'])
-                ff = self.oeb.manifest.hrefs.get(urlnormalize(path), None)
-                if not ff:
-                    continue
-                props['item'] = ff
-                if props['font-weight'] in {'bolder', 'lighter'}:
-                    props['font-weight'] = '400'
-                props['weight'] = int(props['font-weight'])
-                props['chars'] = set()
-                props['rule'] = rule
-                self.embedded_fonts.append(props)
+            if not hasattr(item.data, 'cssRules'):
+                continue
+            self.embedded_fonts.extend(find_font_face_rules(item, self.oeb))
 
     def find_style_rules(self):
         '''
@@ -151,12 +199,13 @@ class SubsetFonts(object):
         '''
         rules = defaultdict(dict)
         for item in self.oeb.manifest:
-            if not hasattr(item.data, 'cssRules'): continue
+            if not hasattr(item.data, 'cssRules'):
+                continue
             for i, rule in enumerate(item.data.cssRules):
                 if rule.type != rule.STYLE_RULE:
                     continue
                 props = {k:v for k,v in
-                        self.get_font_properties(rule).iteritems() if v}
+                        get_font_properties(rule).iteritems() if v}
                 if not props:
                     continue
                 for sel in rule.selectorList:
@@ -172,41 +221,17 @@ class SubsetFonts(object):
 
     def find_font_usage(self):
         for item in self.oeb.manifest:
-            if not hasattr(item.data, 'xpath'): continue
+            if not hasattr(item.data, 'xpath'):
+                continue
             for body in item.data.xpath('//*[local-name()="body"]'):
                 base = {'font-family':['serif'], 'font-weight': '400',
                         'font-style':'normal', 'font-stretch':'normal'}
                 self.find_usage_in(body, base)
 
-    def elem_style(self, cls, inherited_style):
-        '''
-        Find the effective style for the given element.
-        '''
-        classes = cls.split()
-        style = inherited_style.copy()
-        for cls in classes:
-            style.update(self.style_rules.get(cls, {}))
-        wt = style.get('font-weight', None)
-        pwt = inherited_style.get('font-weight', '400')
-        if wt == 'bolder':
-            style['font-weight'] = {
-                    '100':'400',
-                    '200':'400',
-                    '300':'400',
-                    '400':'700',
-                    '500':'700',
-                    }.get(pwt, '900')
-        elif wt == 'lighter':
-            style['font-weight'] = {
-                    '600':'400', '700':'400',
-                    '800':'700', '900':'700'}.get(pwt, '100')
-
-        return style
-
     def used_font(self, style):
         '''
         Given a style find the embedded font that matches it. Returns None if
-        no match is found ( can happen if not family matches).
+        no match is found (can happen if no family matches).
         '''
         ff = style.get('font-family', [])
         lnames = {unicode(x).lower() for x in ff}
@@ -222,7 +247,7 @@ class SubsetFonts(object):
             return None
 
         # Filter on font-stretch
-        widths = {x:i for i, x in enumerate(( 'ultra-condensed',
+        widths = {x:i for i, x in enumerate(('ultra-condensed',
                 'extra-condensed', 'condensed', 'semi-condensed', 'normal',
                 'semi-expanded', 'expanded', 'extra-expanded', 'ultra-expanded'
                 ))}
@@ -280,7 +305,7 @@ class SubsetFonts(object):
         return ans
 
     def find_usage_in(self, elem, inherited_style):
-        style = self.elem_style(elem.get('class', '') or '', inherited_style)
+        style = elem_style(self.style_rules, elem.get('class', '') or '', inherited_style)
         for child in elem:
             self.find_usage_in(child, style)
         font = self.used_font(style)
@@ -290,3 +315,4 @@ class SubsetFonts(object):
                 font['chars'] |= chars
 
 
+
diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py
index 24ee288cc6..a3e364b9ca 100644
--- a/src/calibre/gui2/convert/look_and_feel.py
+++ b/src/calibre/gui2/convert/look_and_feel.py
@@ -32,7 +32,7 @@ class LookAndFeelWidget(Widget, Ui_Form):
         Widget.__init__(self, parent,
                 ['change_justification', 'extra_css', 'base_font_size',
                     'font_size_mapping', 'line_height', 'minimum_line_height',
-                    'embed_font_family', 'subset_embedded_fonts',
+                    'embed_font_family', 'embed_all_fonts', 'subset_embedded_fonts',
                     'smarten_punctuation', 'unsmarten_punctuation',
                     'disable_font_rescaling', 'insert_blank_line',
                     'remove_paragraph_spacing',
diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui
index 43736fb1f2..e9d9caeed7 100644
--- a/src/calibre/gui2/convert/look_and_feel.ui
+++ b/src/calibre/gui2/convert/look_and_feel.ui
@@ -14,6 +14,70 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="12" column="1" colspan="2">
+    <widget class="QCheckBox" name="opt_keep_ligatures">
+     <property name="text">
+      <string>Keep &amp;ligatures</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="3">
+    <widget class="QCheckBox" name="opt_linearize_tables">
+     <property name="text">
+      <string>&amp;Linearize tables</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_18">
+     <property name="text">
+      <string>Base &amp;font size:</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_base_font_size</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="3">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>&amp;Line size:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy">
+      <cstring>opt_insert_blank_line_size</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="2">
+    <widget class="EncodingComboBox" name="opt_input_encoding">
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="QCheckBox" name="opt_remove_paragraph_spacing">
+     <property name="text">
+      <string>Remove &amp;spacing between paragraphs</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="3">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>&amp;Indent size:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy">
+      <cstring>opt_remove_paragraph_spacing_indent_size</cstring>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="4">
     <widget class="QDoubleSpinBox" name="opt_line_height">
      <property name="suffix">
@@ -24,6 +88,57 @@
      </property>
     </widget>
    </item>
+   <item row="9" column="0" colspan="2">
+    <widget class="QCheckBox" name="opt_insert_blank_line">
+     <property name="text">
+      <string>Insert &amp;blank line between paragraphs</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="4">
+    <widget class="QDoubleSpinBox" name="opt_insert_blank_line_size">
+     <property name="suffix">
+      <string> em</string>
+     </property>
+     <property name="decimals">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Text &amp;justification:</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_change_justification</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="2" colspan="3">
+    <widget class="QComboBox" name="opt_change_justification"/>
+   </item>
+   <item row="11" column="0">
+    <widget class="QCheckBox" name="opt_smarten_punctuation">
+     <property name="text">
+      <string>Smarten &amp;punctuation</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1" colspan="4">
+    <widget class="QCheckBox" name="opt_asciiize">
+     <property name="text">
+      <string>&amp;Transliterate unicode characters to ASCII</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="0">
+    <widget class="QCheckBox" name="opt_unsmarten_punctuation">
+     <property name="text">
+      <string>&amp;UnSmarten punctuation</string>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="3">
     <widget class="QLabel" name="label">
      <property name="text">
@@ -44,51 +159,6 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QDoubleSpinBox" name="opt_minimum_line_height">
-     <property name="suffix">
-      <string> %</string>
-     </property>
-     <property name="decimals">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <double>900.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QDoubleSpinBox" name="opt_base_font_size">
-     <property name="suffix">
-      <string> pt</string>
-     </property>
-     <property name="decimals">
-      <number>1</number>
-     </property>
-     <property name="minimum">
-      <double>0.000000000000000</double>
-     </property>
-     <property name="maximum">
-      <double>50.000000000000000</double>
-     </property>
-     <property name="singleStep">
-      <double>1.000000000000000</double>
-     </property>
-     <property name="value">
-      <double>15.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Font size &amp;key:</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_font_size_mapping</cstring>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="1" colspan="3">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -133,56 +203,72 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="1" colspan="2">
-    <widget class="EncodingComboBox" name="opt_input_encoding">
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="QCheckBox" name="opt_remove_paragraph_spacing">
-     <property name="text">
-      <string>Remove &amp;spacing between paragraphs</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>&amp;Indent size:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="buddy">
-      <cstring>opt_remove_paragraph_spacing_indent_size</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="4">
-    <widget class="QDoubleSpinBox" name="opt_remove_paragraph_spacing_indent_size">
-     <property name="toolTip">
-      <string>&lt;p&gt;When calibre removes inter paragraph spacing, it automatically sets a paragraph indent, to ensure that paragraphs can be easily distinguished. This option controls the width of that indent.</string>
-     </property>
-     <property name="specialValueText">
-      <string>No change</string>
-     </property>
+   <item row="3" column="1">
+    <widget class="QDoubleSpinBox" name="opt_minimum_line_height">
      <property name="suffix">
-      <string> em</string>
+      <string> %</string>
+     </property>
+     <property name="decimals">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <double>900.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDoubleSpinBox" name="opt_base_font_size">
+     <property name="suffix">
+      <string> pt</string>
      </property>
      <property name="decimals">
       <number>1</number>
      </property>
      <property name="minimum">
-      <double>-0.100000000000000</double>
+      <double>0.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>50.000000000000000</double>
      </property>
      <property name="singleStep">
-      <double>0.100000000000000</double>
+      <double>1.000000000000000</double>
+     </property>
+     <property name="value">
+      <double>15.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="12" column="0" colspan="5">
+   <item row="0" column="0" colspan="5">
+    <widget class="QCheckBox" name="opt_disable_font_rescaling">
+     <property name="text">
+      <string>&amp;Disable font size rescaling</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1" colspan="2">
+    <widget class="FontFamilyChooser" name="opt_embed_font_family" native="true"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Font size &amp;key:</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_font_size_mapping</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_10">
+     <property name="text">
+      <string>&amp;Embed font family:</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_embed_font_family</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="0" colspan="5">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -300,121 +386,42 @@
      </widget>
     </widget>
    </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="QCheckBox" name="opt_insert_blank_line">
-     <property name="text">
-      <string>Insert &amp;blank line between paragraphs</string>
-     </property>
-    </widget>
-   </item>
    <item row="8" column="4">
-    <widget class="QDoubleSpinBox" name="opt_insert_blank_line_size">
+    <widget class="QDoubleSpinBox" name="opt_remove_paragraph_spacing_indent_size">
+     <property name="toolTip">
+      <string>&lt;p&gt;When calibre removes inter paragraph spacing, it automatically sets a paragraph indent, to ensure that paragraphs can be easily distinguished. This option controls the width of that indent.</string>
+     </property>
+     <property name="specialValueText">
+      <string>No change</string>
+     </property>
      <property name="suffix">
       <string> em</string>
      </property>
      <property name="decimals">
       <number>1</number>
      </property>
-    </widget>
-   </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Text &amp;justification:</string>
+     <property name="minimum">
+      <double>-0.100000000000000</double>
      </property>
-     <property name="buddy">
-      <cstring>opt_change_justification</cstring>
+     <property name="singleStep">
+      <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="9" column="2" colspan="3">
-    <widget class="QComboBox" name="opt_change_justification"/>
-   </item>
-   <item row="10" column="0">
-    <widget class="QCheckBox" name="opt_smarten_punctuation">
-     <property name="text">
-      <string>Smarten &amp;punctuation</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="1" colspan="4">
-    <widget class="QCheckBox" name="opt_asciiize">
-     <property name="text">
-      <string>&amp;Transliterate unicode characters to ASCII</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0">
-    <widget class="QCheckBox" name="opt_unsmarten_punctuation">
-     <property name="text">
-      <string>&amp;UnSmarten punctuation</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="1" colspan="2">
-    <widget class="QCheckBox" name="opt_keep_ligatures">
-     <property name="text">
-      <string>Keep &amp;ligatures</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="3">
-    <widget class="QCheckBox" name="opt_linearize_tables">
-     <property name="text">
-      <string>&amp;Linearize tables</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_18">
-     <property name="text">
-      <string>Base &amp;font size:</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_base_font_size</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="3">
-    <widget class="QLabel" name="label_7">
-     <property name="text">
-      <string>&amp;Line size:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="buddy">
-      <cstring>opt_insert_blank_line_size</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_10">
-     <property name="text">
-      <string>&amp;Embed font family:</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_embed_font_family</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="5">
-    <widget class="QCheckBox" name="opt_disable_font_rescaling">
-     <property name="text">
-      <string>&amp;Disable font size rescaling</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="2">
-    <widget class="FontFamilyChooser" name="opt_embed_font_family" native="true"/>
-   </item>
-   <item row="6" column="3" colspan="2">
+   <item row="7" column="3">
     <widget class="QCheckBox" name="opt_subset_embedded_fonts">
      <property name="text">
       <string>&amp;Subset all embedded fonts</string>
      </property>
     </widget>
    </item>
+   <item row="7" column="0" colspan="3">
+    <widget class="QCheckBox" name="opt_embed_all_fonts">
+     <property name="text">
+      <string>&amp;Embed referenced fonts</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

From 63d133ea5c1a3ee8d4949e95ce9cf8e9e9c9d644 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 26 Jun 2013 15:46:41 +0530
Subject: [PATCH 0045/1154] AZW3 Input: Add support for
 page-progression-direction

AZW3 Input: Add support for the page-progression-direction that is used
to indicate page turns should happen from right to left. The attribute
is passed into EPUB when converting. Fixes #1194766 [Incorrect conversion japanese MOBI](https://bugs.launchpad.net/calibre/+bug/1194766)
---
 src/calibre/ebooks/metadata/opf2.py     | 11 +++++++++++
 src/calibre/ebooks/mobi/reader/mobi8.py | 12 +++++++++---
 src/calibre/ebooks/mobi/utils.py        | 11 ++++++++++-
 src/calibre/ebooks/oeb/base.py          |  3 +++
 src/calibre/ebooks/oeb/reader.py        |  3 +++
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index fb80cc8bfe..77e334dd3e 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -1047,6 +1047,14 @@ class OPF(object):  # {{{
                     if raw:
                         return raw.rpartition(':')[-1]
 
+    @property
+    def page_progression_direction(self):
+        spine = self.XPath('descendant::*[re:match(name(), "spine", "i")][1]')(self.root)
+        if spine:
+            for k, v in spine[0].attrib.iteritems():
+                if k == 'page-progression-direction' or k.endswith('}page-progression-direction'):
+                    return v
+
     def guess_cover(self):
         '''
         Try to guess a cover. Needed for some old/badly formed OPF files.
@@ -1185,6 +1193,7 @@ class OPFCreator(Metadata):
         '''
         Metadata.__init__(self, title='', other=other)
         self.base_path = os.path.abspath(base_path)
+        self.page_progression_direction = None
         if self.application_id is None:
             self.application_id = str(uuid.uuid4())
         if not isinstance(self.toc, TOC):
@@ -1356,6 +1365,8 @@ class OPFCreator(Metadata):
         spine = E.spine()
         if self.toc is not None:
             spine.set('toc', 'ncx')
+        if self.page_progression_direction is not None:
+            spine.set('page-progression-direction', self.page_progression_direction)
         if self.spine is not None:
             for ref in self.spine:
                 if ref.id is not None:
diff --git a/src/calibre/ebooks/mobi/reader/mobi8.py b/src/calibre/ebooks/mobi/reader/mobi8.py
index aff79d65c2..97d38a9660 100644
--- a/src/calibre/ebooks/mobi/reader/mobi8.py
+++ b/src/calibre/ebooks/mobi/reader/mobi8.py
@@ -20,7 +20,7 @@ from calibre.ebooks.mobi.reader.ncx import read_ncx, build_toc
 from calibre.ebooks.mobi.reader.markup import expand_mobi8_markup
 from calibre.ebooks.metadata.opf2 import Guide, OPFCreator
 from calibre.ebooks.metadata.toc import TOC
-from calibre.ebooks.mobi.utils import read_font_record
+from calibre.ebooks.mobi.utils import read_font_record, read_resc_record
 from calibre.ebooks.oeb.parse_utils import parse_html
 from calibre.ebooks.oeb.base import XPath, XHTML, xml2text
 from calibre.utils.imghdr import what
@@ -65,6 +65,7 @@ class Mobi8Reader(object):
         self.mobi6_reader, self.log = mobi6_reader, log
         self.header = mobi6_reader.book_header
         self.encrypted_fonts = []
+        self.resc_data = {}
 
     def __call__(self):
         self.mobi6_reader.check_for_drm()
@@ -389,9 +390,11 @@ class Mobi8Reader(object):
             data = sec[0]
             typ = data[:4]
             href = None
-            if typ in {b'FLIS', b'FCIS', b'SRCS', b'\xe9\x8e\r\n',
-                    b'RESC', b'BOUN', b'FDST', b'DATP', b'AUDI', b'VIDE'}:
+            if typ in {b'FLIS', b'FCIS', b'SRCS', b'\xe9\x8e\r\n', b'BOUN',
+                       b'FDST', b'DATP', b'AUDI', b'VIDE'}:
                 pass  # Ignore these records
+            elif typ == b'RESC':
+                self.resc_data = read_resc_record(data)
             elif typ == b'FONT':
                 font = read_font_record(data)
                 href = "fonts/%05d.%s" % (fname_idx, font['ext'])
@@ -452,6 +455,9 @@ class Mobi8Reader(object):
         opf.create_manifest_from_files_in([os.getcwdu()], exclude=exclude)
         opf.create_spine(spine)
         opf.set_toc(toc)
+        ppd = self.resc_data.get('page-progression-direction', None)
+        if ppd:
+            opf.page_progression_direction = ppd
 
         with open('metadata.opf', 'wb') as of, open('toc.ncx', 'wb') as ncx:
             opf.render(of, ncx, 'toc.ncx')
diff --git a/src/calibre/ebooks/mobi/utils.py b/src/calibre/ebooks/mobi/utils.py
index e9bc4f669f..008b33a0ff 100644
--- a/src/calibre/ebooks/mobi/utils.py
+++ b/src/calibre/ebooks/mobi/utils.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import struct, string, zlib, os
+import struct, string, zlib, os, re
 from collections import OrderedDict
 from io import BytesIO
 
@@ -393,6 +393,15 @@ def mobify_image(data):
         data = im.export('gif')
     return data
 
+def read_resc_record(data):
+    ans = {}
+    match = re.search(br'''<spine [^>]*page-progression-direction=['"](.+?)['"]''', data)
+    if match is not None:
+        ppd = match.group(1).lower()
+        if ppd in {b'ltr', b'rtl'}:
+            ans['page-progression-direction'] = ppd.decode('ascii')
+    return ans
+
 # Font records {{{
 def read_font_record(data, extent=1040):
     '''
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index d4b3a2b7ab..29fc27ee3f 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -1210,6 +1210,7 @@ class Spine(object):
     def __init__(self, oeb):
         self.oeb = oeb
         self.items = []
+        self.page_progression_direction = None
 
     def _linear(self, linear):
         if isinstance(linear, basestring):
@@ -1896,4 +1897,6 @@ class OEBBook(object):
                              attrib={'media-type': PAGE_MAP_MIME})
             spine.attrib['page-map'] = id
             results[PAGE_MAP_MIME] = (href, self.pages.to_page_map())
+        if self.spine.page_progression_direction in {'ltr', 'rtl'}:
+            spine.attrib['page-progression-direction'] = self.spine.page_progression_direction
         return results
diff --git a/src/calibre/ebooks/oeb/reader.py b/src/calibre/ebooks/oeb/reader.py
index eb7e2eca4c..cb10b4ccce 100644
--- a/src/calibre/ebooks/oeb/reader.py
+++ b/src/calibre/ebooks/oeb/reader.py
@@ -330,6 +330,9 @@ class OEBReader(object):
         if len(spine) == 0:
             raise OEBError("Spine is empty")
         self._spine_add_extra()
+        for val in xpath(opf, '/o2:package/o2:spine/@page-progression-direction'):
+            if val in {'ltr', 'rtl'}:
+                spine.page_progression_direction = val
 
     def _guide_from_opf(self, opf):
         guide = self.oeb.guide

From f63f142618a503acd4d8597bc97117d69a93840b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 26 Jun 2013 16:55:12 +0530
Subject: [PATCH 0046/1154] PDF Output: Fix add ToC option not being used

PDF Output: Fix Table of Contents being added tot he end of the PDF even
without the Add Table of Contents option being enabled. Fixes #1194836 [When convert to PDF, it always create TOC at the end](https://bugs.launchpad.net/calibre/+bug/1194836)
---
 src/calibre/ebooks/pdf/render/from_html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/pdf/render/from_html.py b/src/calibre/ebooks/pdf/render/from_html.py
index 5b9f58e326..8ea1d8203e 100644
--- a/src/calibre/ebooks/pdf/render/from_html.py
+++ b/src/calibre/ebooks/pdf/render/from_html.py
@@ -253,7 +253,7 @@ class PDFWriter(QObject):
             return self.loop.exit(1)
         try:
             if not self.render_queue:
-                if self.toc is not None and len(self.toc) > 0 and not hasattr(self, 'rendered_inline_toc'):
+                if self.opts.pdf_add_toc and self.toc is not None and len(self.toc) > 0 and not hasattr(self, 'rendered_inline_toc'):
                     return self.render_inline_toc()
                 self.loop.exit()
             else:

From 3743d26d35badcc978a93db0d3d2aa53eae032ee Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 10:14:10 +0530
Subject: [PATCH 0047/1154] Save dist file sizes for bandwidth calculation

Also fix a typo in copying dist files to tdir and backup.
---
 setup/upload.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/setup/upload.py b/setup/upload.py
index 639a2e98d5..dd59067c0c 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -134,6 +134,8 @@ class UploadInstallers(Command):  # {{{
         available = set(glob.glob('dist/*'))
         files = {x:installer_description(x) for x in
                 all_possible.intersection(available)}
+        sizes = {os.path.basename(x):os.path.getsize(x) for x in files}
+        self.record_sizes(sizes)
         tdir = mkdtemp()
         backup = os.path.join('/mnt/external/calibre/%s' % __version__)
         if not os.path.exists(backup):
@@ -147,6 +149,11 @@ class UploadInstallers(Command):  # {{{
         finally:
             shutil.rmtree(tdir, ignore_errors=True)
 
+    def record_sizes(self, sizes):
+        print ('\nRecording dist sizes')
+        args = ['%s:%s:%s' % (__version__, fname, size) for fname, size in sizes.iteritems()]
+        check_call(['ssh', 'divok', 'dist_sizes'] + args)
+
     def upload_to_staging(self, tdir, backup, files):
         os.mkdir(tdir+'/dist')
         hosting = os.path.join(os.path.dirname(os.path.abspath(__file__)),
@@ -154,9 +161,9 @@ class UploadInstallers(Command):  # {{{
         shutil.copyfile(hosting, os.path.join(tdir, 'hosting.py'))
 
         for f in files:
-            for x in (tdir, backup):
-                dest = os.path.join(x, f)
-                shutil.copyfile(f, dest)
+            for x in (tdir+'/dist', backup):
+                dest = os.path.join(x, os.path.basename(f))
+                shutil.copy2(f, x)
                 os.chmod(dest, stat.S_IREAD|stat.S_IWRITE|stat.S_IRGRP|stat.S_IROTH)
 
         with open(os.path.join(tdir, 'fmap'), 'wb') as fo:

From 87dda89378e8a95663897eba720b0ae04d958d7d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 12:41:46 +0530
Subject: [PATCH 0048/1154] Add notes on provisioning a file hosting server

---
 setup/file_hosting_servers.rst | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 setup/file_hosting_servers.rst

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
new file mode 100644
index 0000000000..7121628744
--- /dev/null
+++ b/setup/file_hosting_servers.rst
@@ -0,0 +1,32 @@
+Provisioning a file hosting server
+====================================
+
+Create the ssh authorized keys file.
+
+Edit /etc/ssh/sshd_config and change PermitRootLogin to without-password.
+Restart sshd.
+
+apt-get install vim nginx zsh python-lxml python-mechanize iotop htop smartmontools
+chsh -s /bin/zsh
+
+mkdir -p /root/staging /root/work/vim /srv/download /srv/manual
+
+scp .zshrc .vimrc  server:
+scp -r ~/work/vim/zsh-syntax-highlighting server:work/vim
+
+If the server has a backup hard-disk, mount it at /mnt/backup and edit /etc/fstab so that it is auto-mounted.
+Then, add the following to crontab
+@daily     /usr/bin/rsync -ha /srv /mnt/backup
+@daily     /usr/bin/rsync -ha /etc /mnt/backup
+
+Nginx
+------
+
+Copy over /etc/nginx/sites-available/default from another file server. When
+copying, remember to use cat instead of cp to preserve hardlinks (the file is a
+hardlink to /etc/nginx/sites-enabled/default)
+
+rsync /srv from another file server
+
+service nginx start
+

From c3009256c498893370e0cc6f61bd018abe17a38e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 13:01:52 +0530
Subject: [PATCH 0049/1154] ToC Editor: Use filenames when generating from
 files

ToC Editor: When generating a ToC from files, if the file has no text,
do not skip it. Instead create an entry using the filename of the file.
---
 src/calibre/ebooks/oeb/polish/toc.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/toc.py b/src/calibre/ebooks/oeb/polish/toc.py
index 8be23bdc38..a364da58f5 100644
--- a/src/calibre/ebooks/oeb/polish/toc.py
+++ b/src/calibre/ebooks/oeb/polish/toc.py
@@ -281,15 +281,18 @@ def find_text(node):
 
 def from_files(container):
     toc = TOC()
-    for spinepath in container.spine_items:
+    for i, spinepath in enumerate(container.spine_items):
         name = container.abspath_to_name(spinepath)
         root = container.parsed(name)
         body = XPath('//h:body')(root)
         if not body:
             continue
         text = find_text(body[0])
-        if text:
-            toc.add(text, name)
+        if not text:
+            text = name.rpartition('/')[-1]
+            if i == 0 and text.rpartition('.')[0].lower() in {'titlepage', 'cover'}:
+                text = _('Cover')
+        toc.add(text, name)
     return toc
 
 def add_id(container, name, loc):

From f8509fe8260e409c6e9f21d309d7ce8b9fd6a529 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 13:27:31 +0530
Subject: [PATCH 0050/1154] Log the wait before sending email

When waiting before sending email, log the wait. Fixes #1195173 [Feature Request - Multiple books emailed to device](https://bugs.launchpad.net/calibre/+bug/1195173)
---
 src/calibre/gui2/email.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 9ebb94b00a..9b077fa39f 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -92,7 +92,11 @@ class Sendmail(object):
                 raise worker.exception
 
     def sendmail(self, attachment, aname, to, subject, text, log):
+        logged = False
         while time.time() - self.last_send_time <= self.rate_limit:
+            if not logged:
+                log('Waiting %s seconds before sending, to avoid being marked as spam.\nYou can control this delay via Preferences->Tweaks' % self.rate_limit)
+                logged = True
             time.sleep(1)
         try:
             opts = email_config().parse()

From 86691f22a24c96061b1a78f1c332d58b9b52b6db Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 13:28:06 +0530
Subject: [PATCH 0051/1154] ...

---
 src/calibre/gui2/email.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 9b077fa39f..52da1909fe 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -94,7 +94,7 @@ class Sendmail(object):
     def sendmail(self, attachment, aname, to, subject, text, log):
         logged = False
         while time.time() - self.last_send_time <= self.rate_limit:
-            if not logged:
+            if not logged and self.rate_limit > 0:
                 log('Waiting %s seconds before sending, to avoid being marked as spam.\nYou can control this delay via Preferences->Tweaks' % self.rate_limit)
                 logged = True
             time.sleep(1)

From 32fccdb9010d161f6e2acbb4b1d66cf99162f57b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 13:29:09 +0530
Subject: [PATCH 0052/1154] pep8

---
 src/calibre/gui2/email.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 52da1909fe..f8c7552437 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -32,7 +32,7 @@ class Worker(Thread):
         self.func, self.args = func, args
 
     def run(self):
-        #time.sleep(1000)
+        # time.sleep(1000)
         try:
             self.func(*self.args)
         except Exception as e:
@@ -46,7 +46,7 @@ class Worker(Thread):
 class Sendmail(object):
 
     MAX_RETRIES = 1
-    TIMEOUT = 15 * 60 # seconds
+    TIMEOUT = 15 * 60  # seconds
 
     def __init__(self):
         self.calculate_rate_limit()
@@ -166,7 +166,7 @@ def email_news(mi, remove, get_fmts, done, job_manager):
 plugboard_email_value = 'email'
 plugboard_email_formats = ['epub', 'mobi', 'azw3']
 
-class EmailMixin(object): # {{{
+class EmailMixin(object):  # {{{
 
     def send_by_mail(self, to, fmts, delete_from_library, subject='', send_ids=None,
             do_auto_convert=True, specific_format=None):
@@ -208,10 +208,10 @@ class EmailMixin(object): # {{{
                     if not components:
                         components = [mi.title]
                     subjects.append(os.path.join(*components))
-                a = authors_to_string(mi.authors if mi.authors else \
+                a = authors_to_string(mi.authors if mi.authors else
                         [_('Unknown')])
-                texts.append(_('Attached, you will find the e-book') + \
-                        '\n\n' + t + '\n\t' + _('by') + ' ' + a + '\n\n' + \
+                texts.append(_('Attached, you will find the e-book') +
+                        '\n\n' + t + '\n\t' + _('by') + ' ' + a + '\n\n' +
                         _('in the %s format.') %
                         os.path.splitext(f)[1][1:].upper())
                 prefix = ascii_filename(t+' - '+a)
@@ -231,7 +231,7 @@ class EmailMixin(object): # {{{
         auto = []
         if _auto_ids != []:
             for id in _auto_ids:
-                if specific_format == None:
+                if specific_format is None:
                     dbfmts = self.library_view.model().db.formats(id, index_is_id=True)
                     formats = [f.lower() for f in (dbfmts.split(',') if dbfmts else
                         [])]
@@ -302,8 +302,9 @@ class EmailMixin(object): # {{{
         sent_mails = email_news(mi, remove,
                 get_fmts, self.email_sent, self.job_manager)
         if sent_mails:
-            self.status_bar.show_message(_('Sent news to')+' '+\
+            self.status_bar.show_message(_('Sent news to')+' '+
                     ', '.join(sent_mails),  3000)
 
 # }}}
 
+

From 13f31c7839ca98b1663c34a5bf7daef359b21f61 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 17:11:23 +0530
Subject: [PATCH 0053/1154] ...

---
 setup/file_hosting_servers.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index 7121628744..563c7bc64a 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -6,6 +6,11 @@ Create the ssh authorized keys file.
 Edit /etc/ssh/sshd_config and change PermitRootLogin to without-password.
 Restart sshd.
 
+hostname whatever
+Edit /etc/hosts and put in FQDN in the appropriate places, for example::
+    27.0.1.1       download.calibre-ebook.com download
+    46.28.49.116 download.calibre-ebook.com download
+
 apt-get install vim nginx zsh python-lxml python-mechanize iotop htop smartmontools
 chsh -s /bin/zsh
 
@@ -15,9 +20,9 @@ scp .zshrc .vimrc  server:
 scp -r ~/work/vim/zsh-syntax-highlighting server:work/vim
 
 If the server has a backup hard-disk, mount it at /mnt/backup and edit /etc/fstab so that it is auto-mounted.
-Then, add the following to crontab
-@daily     /usr/bin/rsync -ha /srv /mnt/backup
-@daily     /usr/bin/rsync -ha /etc /mnt/backup
+Then, add the following to crontab::
+    @daily     /usr/bin/rsync -ha /srv /mnt/backup
+    @daily     /usr/bin/rsync -ha /etc /mnt/backup
 
 Nginx
 ------

From 836074e37d9b3780093b89548c035cdb29603349 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 17:15:52 +0530
Subject: [PATCH 0054/1154] ...

---
 setup/file_hosting_servers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index 563c7bc64a..8dd0afe098 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -11,7 +11,7 @@ Edit /etc/hosts and put in FQDN in the appropriate places, for example::
     27.0.1.1       download.calibre-ebook.com download
     46.28.49.116 download.calibre-ebook.com download
 
-apt-get install vim nginx zsh python-lxml python-mechanize iotop htop smartmontools
+apt-get install vim nginx zsh python-lxml python-mechanize iotop htop smartmontools mosh
 chsh -s /bin/zsh
 
 mkdir -p /root/staging /root/work/vim /srv/download /srv/manual

From 952b95d3ad566dca005863f9403e3a846b5e1e8e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jun 2013 17:34:01 +0530
Subject: [PATCH 0055/1154] pep8

---
 recipes/miradasalsur.recipe | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/recipes/miradasalsur.recipe b/recipes/miradasalsur.recipe
index 4794503384..b931fcb1d7 100644
--- a/recipes/miradasalsur.recipe
+++ b/recipes/miradasalsur.recipe
@@ -4,9 +4,7 @@ sur.infonews.com
 '''
 
 import datetime
-from calibre import strftime
 from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import Tag
 
 class MiradasAlSur(BasicNewsRecipe):
     title                 = 'Miradas al Sur'
@@ -25,7 +23,7 @@ class MiradasAlSur(BasicNewsRecipe):
     extra_css             = """
                              body{font-family: Arial,Helvetica,sans-serif}
                              h1{font-family: Georgia,Times,serif}
-                             .field-field-story-author{color: gray; font-size: small}                             
+                             .field-field-story-author{color: gray; font-size: small}
                             """
     conversion_options = {
                           'comment'   : description
@@ -34,22 +32,22 @@ class MiradasAlSur(BasicNewsRecipe):
                         , 'language'  : language
                         , 'series'    : title
                         }
-                            
+
     keep_only_tags = [dict(name='div', attrs={'id':['content-header', 'content-area']})]
-    remove_tags    = [ 
-                      dict(name=['link','meta','iframe','embed','object']), 
+    remove_tags    = [
+                      dict(name=['link','meta','iframe','embed','object']),
                       dict(name='form', attrs={'class':'fivestar-widget'}),
                       dict(attrs={'class':lambda x: x and 'terms-inline' in x.split()})
                      ]
 
     feeds = [
-             (u'Politica'           , u'http://sur.infonews.com/taxonomy/term/1/0/feed' ),
-             (u'Internacional'      , u'http://sur.infonews.com/taxonomy/term/2/0/feed' ),
+             (u'Politica'           , u'http://sur.infonews.com/taxonomy/term/1/0/feed'),
+             (u'Internacional'      , u'http://sur.infonews.com/taxonomy/term/2/0/feed'),
              (u'Informe Especial'   , u'http://sur.infonews.com/taxonomy/term/14/0/feed'),
-             (u'Delitos y pesquisas', u'http://sur.infonews.com/taxonomy/term/6/0/feed' ),
-             (u'Lesa Humanidad'     , u'http://sur.infonews.com/taxonomy/term/7/0/feed' ),
-             (u'Cultura'            , u'http://sur.infonews.com/taxonomy/term/8/0/feed' ),
-             (u'Deportes'           , u'http://sur.infonews.com/taxonomy/term/9/0/feed' ),
+             (u'Delitos y pesquisas', u'http://sur.infonews.com/taxonomy/term/6/0/feed'),
+             (u'Lesa Humanidad'     , u'http://sur.infonews.com/taxonomy/term/7/0/feed'),
+             (u'Cultura'            , u'http://sur.infonews.com/taxonomy/term/8/0/feed'),
+             (u'Deportes'           , u'http://sur.infonews.com/taxonomy/term/9/0/feed'),
              (u'Contratapa'         , u'http://sur.infonews.com/taxonomy/term/10/0/feed'),
             ]
 
@@ -60,10 +58,10 @@ class MiradasAlSur(BasicNewsRecipe):
         cdate = datetime.date.today()
         todayweekday = cdate.isoweekday()
         if (todayweekday != 7):
-            cdate -= datetime.timedelta(days=todayweekday)        
-        cover_page_url = cdate.strftime('http://sur.infonews.com/ediciones/%Y-%m-%d/tapa');
+            cdate -= datetime.timedelta(days=todayweekday)
+        cover_page_url = cdate.strftime('http://sur.infonews.com/ediciones/%Y-%m-%d/tapa')
         soup = self.index_to_soup(cover_page_url)
         cover_item = soup.find('img', attrs={'class':lambda x: x and 'imagecache-tapa_edicion_full' in x.split()})
         if cover_item:
-           cover_url = cover_item['src']
+            cover_url = cover_item['src']
         return cover_url

From 986ab2a0787a538bc5fe0c512da97f982e331dbc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 28 Jun 2013 08:14:25 +0530
Subject: [PATCH 0056/1154] ebook-convert: Add option to read metadata from OPF

---
 src/calibre/ebooks/conversion/cli.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index a0abebc5fe..f2795005d8 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -94,6 +94,8 @@ def option_recommendation_to_cli_option(add_option, rec):
     if opt.long_switch == 'verbose':
         attrs['action'] = 'count'
         attrs.pop('type', '')
+    if opt.name == 'read_metadata_from_opf':
+        switches.append('--from-opf')
     if opt.name in DEFAULT_TRUE_OPTIONS and rec.recommended_value is True:
         switches = ['--disable-'+opt.long_switch]
     add_option(Option(*switches, **attrs))
@@ -190,7 +192,7 @@ def add_pipeline_options(parser, plumber):
                   ),
 
               'METADATA' : (_('Options to set metadata in the output'),
-                            plumber.metadata_option_names,
+                            plumber.metadata_option_names + ['read_metadata_from_opf'],
                             ),
               'DEBUG': (_('Options to help with debugging the conversion'),
                         [

From 837adb4eabda66083840b3fb15b165946b31376a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 28 Jun 2013 08:50:14 +0530
Subject: [PATCH 0057/1154] version 0.9.37

---
 Changelog.yaml           | 44 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index f952b961e2..7439a02986 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,50 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.37
+  date: 2013-06-28
+
+  new features:
+    - title: "Conversion: Add option to embed all referenced fonts"
+      type: major
+      description: "Add an option to embed all fonts that are referenced in the input document but are not already embedded. This will search your system for the referenced font, and if found, the font will be embedded.  Only works if the output format supports font embedding (for example: EPUB or AZW3). The option is under the Look & Feel section of the conversion dialog."
+
+    - title: "ToC Editor: When generating a ToC from files, if the file has no text, do not skip it. Instead create an entry using the filename of the file."
+
+    - title: "AZW3 Input: Add support for the page-progression-direction that is used to indicate page turns should happen from right to left. The attribute is passed into EPUB when converting."
+      tickets: [1194766]
+
+    - title: "ebook-convert: Add a --from-opf option to read metadata from OPF files directly, instead of having to run ebook-meta --from-opf after conversion"
+ 
+  bug fixes:
+    - title: "PDF Output: Fix Table of Contents being added to the end of the PDF even without the Add Table of Contents option being enabled."
+      tickets: [1194836]
+
+    - title: "When auto-merging books on add, also merge identifiers."
+
+    - title: "Fix an error when using the Template Editor to create a template that uses custom columns."
+      tickets: [1193763]
+
+    - title: "LRF Output: Fix &quot; entities in attribute values causing problems"
+
+    - title: "News download: Apply the default page margin conversion settings. Also, when converting to PDF, apply the pdf conversion defaults."
+      tickets: [1193912]
+
+    - title: "Fix a regression that broke scanning for books on all devices that used the Aluratek Color driver."
+      tickets: [1192940]
+
+    - title: "fetch-ebbok-metadata: Fix --opf argument erroneously requiring a value"
+
+    - title: "When waiting before sending email, log the wait."
+      tickets: [1195173]
+
+  improved recipes:
+    - taz.de (RSS)
+    - Miradas al sur
+    - Frontline
+    - La Nacion (Costa Rica)
+
+
 - version: 0.9.36
   date: 2013-06-21
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 6834a4e66d..a4edca6bd5 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 36)
+numeric_version = (0, 9, 37)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 6579327a6d99635411ee8a7dcf1d143f5fb5a789 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 28 Jun 2013 12:26:56 +0530
Subject: [PATCH 0058/1154] Various minor fixes in the publish process

---
 setup/file_hosting_servers.rst | 10 ++++++++++
 setup/hosting.py               |  8 ++++++--
 setup/upload.py                |  2 --
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index 8dd0afe098..261241e24d 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -35,3 +35,13 @@ rsync /srv from another file server
 
 service nginx start
 
+Services
+---------
+
+SSH into sourceforge and downloadbestsoftware so that their host keys are
+stored.
+
+   ssh -oStrictHostKeyChecking=no kovid@www.downloadbestsoft-mirror1.com
+   ssh -oStrictHostKeyChecking=no kovidgoyal,calibre@frs.sourceforge.net
+   ssh -oStrictHostKeyChecking=no files.calibre-ebook.com (and whatever other mirrors are present)
+
diff --git a/setup/hosting.py b/setup/hosting.py
index 1e78f4694d..d97373cdbc 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -473,14 +473,18 @@ def upload_to_servers(files, version):  # {{{
         os.mkdir(dest)
     for src in files:
         shutil.copyfile(src, os.path.join(dest, os.path.basename(src)))
-    generate_index()
+    cwd = os.getcwd()
+    try:
+        generate_index()
+    finally:
+        os.chdir(cwd)
 
     for server, rdir in {'files':'/srv/download/'}.iteritems():
         print('Uploading to server:', server)
         server = '%s.calibre-ebook.com' % server
         # Copy the generated index files
         print ('Copying generated index')
-        check_call(['rsync', '-hzr', '-e', 'ssh -x', '--include', '*.html',
+        check_call(['rsync', '-hza', '-e', 'ssh -x', '--include', '*.html',
                     '--filter', '-! */', base, 'root@%s:%s' % (server, rdir)])
         # Copy the release files
         rdir = '%s%s/' % (rdir, version)
diff --git a/setup/upload.py b/setup/upload.py
index dd59067c0c..0475773e01 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -255,8 +255,6 @@ class UploadToServer(Command):  # {{{
     description = 'Upload miscellaneous data to calibre server'
 
     def run(self, opts):
-        check_call('ssh divok rm -f %s/calibre-\*.tar.xz'%DOWNLOADS, shell=True)
-        # check_call('scp dist/calibre-*.tar.xz divok:%s/'%DOWNLOADS, shell=True)
         check_call('gpg --armor --detach-sign dist/calibre-*.tar.xz',
                 shell=True)
         check_call('scp dist/calibre-*.tar.xz.asc divok:%s/signatures/'%DOWNLOADS,

From 54a9a7c98e7bbf995201fc6f323ad45cb0ca20f2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 28 Jun 2013 12:44:44 +0530
Subject: [PATCH 0059/1154] pep8 and small perf improvement for
 human_readable()

---
 src/calibre/__init__.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 5e940efcd9..07ad906247 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -310,9 +310,9 @@ def get_parsed_proxy(typ='http', debug=True):
     proxy = proxies.get(typ, None)
     if proxy:
         pattern = re.compile((
-            '(?:ptype://)?' \
-            '(?:(?P<user>\w+):(?P<pass>.*)@)?' \
-            '(?P<host>[\w\-\.]+)' \
+            '(?:ptype://)?'
+            '(?:(?P<user>\w+):(?P<pass>.*)@)?'
+            '(?P<host>[\w\-\.]+)'
             '(?::(?P<port>\d+))?').replace('ptype', typ)
         )
 
@@ -535,7 +535,7 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252',
     ent = match.group(1)
     if ent in exceptions:
         return '&'+ent+';'
-    if ent in {'apos', 'squot'}: # squot is generated by some broken CMS software
+    if ent in {'apos', 'squot'}:  # squot is generated by some broken CMS software
         return check("'")
     if ent == 'hellips':
         ent = 'hellip'
@@ -565,7 +565,7 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252',
         return '&'+ent+';'
 
 _ent_pat = re.compile(r'&(\S+?);')
-xml_entity_to_unicode = partial(entity_to_unicode, result_exceptions = {
+xml_entity_to_unicode = partial(entity_to_unicode, result_exceptions={
     '"' : '&quot;',
     "'" : '&apos;',
     '<' : '&lt;',
@@ -670,8 +670,8 @@ def human_readable(size, sep=' '):
     """ Convert a size in bytes into a human readable form """
     divisor, suffix = 1, "B"
     for i, candidate in enumerate(('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB')):
-        if size < 1024**(i+1):
-            divisor, suffix = 1024**(i), candidate
+        if size < (1 << ((i + 1) * 10)):
+            divisor, suffix = (1 << (i * 10)), candidate
             break
     size = str(float(size)/divisor)
     if size.find(".") > -1:

From 4b4b89bc6ebf58602ab2dfca1a3c076298b1deed Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 29 Jun 2013 00:15:38 +0530
Subject: [PATCH 0060/1154] Update iprofessional

Fixes #1195826 [Updated recipe for iprofessional](https://bugs.launchpad.net/calibre/+bug/1195826)
---
 recipes/iprofesional.recipe | 66 +++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/recipes/iprofesional.recipe b/recipes/iprofesional.recipe
index e8edbbc7a3..82d1b81674 100644
--- a/recipes/iprofesional.recipe
+++ b/recipes/iprofesional.recipe
@@ -1,5 +1,4 @@
-__license__   = 'GPL v3'
-__copyright__ = '2011, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2011-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
 www.iprofesional.com
 '''
@@ -19,13 +18,15 @@ class iProfesional(BasicNewsRecipe):
     use_embedded_content  = False
     language              = 'es_AR'
     remove_empty_feeds    = True
-    publication_type      = 'nesportal'
-    masthead_url          = 'http://www.iprofesional.com/img/logo-iprofesional.png'
+    publication_type      = 'newsportal'
+    masthead_url          = 'http://www.iprofesional.com/img/header/logoiprofesional.png'
     extra_css             = """
-                               body{font-family: Arial,Helvetica,sans-serif }
+                               body{font-family: 'Droid Sans',Arial,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
-                               .titulo-interior{font-family: Georgia,"Times New Roman",Times,serif}
-                               .autor-nota{font-size: small; font-weight: bold; font-style: italic; color: gray}
+                               .titulo{font-family: WhitneyBoldWhitneyBold,Arial,Helvetica,sans-serif; color: blue}
+                               .fecha-archivo{font-weight: bold; color: rgb(205, 150, 24)}
+                               .description{font-weight: bold; color: gray }
+                               .firma{font-size: small}
                             """
 
     conversion_options = {
@@ -35,27 +36,21 @@ class iProfesional(BasicNewsRecipe):
                         , 'language'  : language
                         }
 
-    keep_only_tags = [dict(attrs={'class':['fecha','interior-nota']})]
-
-    remove_tags = [
-                     dict(name=['meta','link','base','embed','object','iframe'])
-                    ,dict(attrs={'class':['menu-imprimir','guardarNota','IN-widget','fin','permalink']})
-                  ]
-    remove_attributes=['lang','xmlns:og','xmlns:fb']
-
+    keep_only_tags = [dict(attrs={'class':'desarrollo'})]
+    remove_tags = [dict(name=['meta','link','base','embed','object','iframe'])]
 
     feeds = [
               (u'Ultimas noticias'  , u'http://feeds.feedburner.com/iprofesional-principales-noticias')
-             ,(u'Finanzas'          , u'http://feeds.feedburner.com/iprofesional-finanzas'            )
-             ,(u'Impuestos'         , u'http://feeds.feedburner.com/iprofesional-impuestos'           )
-             ,(u'Negocios'          , u'http://feeds.feedburner.com/iprofesional-economia'            )
-             ,(u'Comercio Exterior' , u'http://feeds.feedburner.com/iprofesional-comercio-exterior'   )
-             ,(u'Tecnologia'        , u'http://feeds.feedburner.com/iprofesional-tecnologia'          )
-             ,(u'Management'        , u'http://feeds.feedburner.com/iprofesional-managment'           )
-             ,(u'Marketing'         , u'http://feeds.feedburner.com/iprofesional-marketing'           )
-             ,(u'Legales'           , u'http://feeds.feedburner.com/iprofesional-legales'             )
-             ,(u'Autos'             , u'http://feeds.feedburner.com/iprofesional-autos'               )
-             ,(u'Vinos'             , u'http://feeds.feedburner.com/iprofesional-vinos-bodegas'       )
+             ,(u'Finanzas'          , u'http://feeds.feedburner.com/iprofesional-finanzas')
+             ,(u'Impuestos'         , u'http://feeds.feedburner.com/iprofesional-impuestos')
+             ,(u'Negocios'          , u'http://feeds.feedburner.com/iprofesional-economia')
+             ,(u'Comercio Exterior' , u'http://feeds.feedburner.com/iprofesional-comercio-exterior')
+             ,(u'Tecnologia'        , u'http://feeds.feedburner.com/iprofesional-tecnologia')
+             ,(u'Management'        , u'http://feeds.feedburner.com/iprofesional-managment')
+             ,(u'Marketing'         , u'http://feeds.feedburner.com/iprofesional-marketing')
+             ,(u'Legales'           , u'http://feeds.feedburner.com/iprofesional-legales')
+             ,(u'Autos'             , u'http://feeds.feedburner.com/iprofesional-autos')
+             ,(u'Vinos'             , u'http://feeds.feedburner.com/iprofesional-vinos-bodegas')
             ]
 
     def preprocess_html(self, soup):
@@ -64,16 +59,17 @@ class iProfesional(BasicNewsRecipe):
         for item in soup.findAll('a'):
             limg = item.find('img')
             if item.string is not None:
-               str = item.string
-               item.replaceWith(str)
+                str = item.string
+                item.replaceWith(str)
             else:
-               if limg:
-                  item.name = 'div'
-                  item.attrs = []
-               else:
-                   str = self.tag_to_string(item)
-                   item.replaceWith(str)
+                if limg:
+                    item.name = 'div'
+                    item.attrs = []
+                else:
+                    str = self.tag_to_string(item)
+                    item.replaceWith(str)
         for item in soup.findAll('img'):
-            if not item.has_key('alt'):
-               item['alt'] = 'image'
+            if 'alt' not in item:
+                item['alt'] = 'image'
         return soup
+

From 9e857d1ed7a44bc6e56d125faae626486a0d6830 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 29 Jun 2013 09:39:36 +0530
Subject: [PATCH 0061/1154] DOCX Input: Support horizontal rules

DOCX Input: Add support for horizontal rules created by typing three
hyphens and pressing enter.
---
 src/calibre/ebooks/docx/cleanup.py | 13 +++++++++++++
 src/calibre/ebooks/docx/images.py  | 22 +++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/docx/cleanup.py b/src/calibre/ebooks/docx/cleanup.py
index a55f8449d8..10bfd9a78f 100644
--- a/src/calibre/ebooks/docx/cleanup.py
+++ b/src/calibre/ebooks/docx/cleanup.py
@@ -8,6 +8,8 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os
 
+from calibre.ebooks.docx.names import ancestor
+
 def mergeable(previous, current):
     if previous.tail or current.tail:
         return False
@@ -97,6 +99,16 @@ def before_count(root, tag, limit=10):
             return limit
 
 def cleanup_markup(log, root, styles, dest_dir, detect_cover):
+    # Move <hr>s outside paragraphs, if possible.
+    for hr in root.xpath('//span/hr'):
+        p = ancestor(hr, 'p')
+        descendants = tuple(p.iterdescendants())
+        if descendants[-1] is hr:
+            parent = p.getparent()
+            idx = parent.index(p)
+            parent.insert(idx+1, hr)
+            hr.tail = '\n\t'
+
     # Merge consecutive spans that have the same styling
     current_run = []
     for span in root.xpath('//span'):
@@ -165,3 +177,4 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
                     return path
 
 
+
diff --git a/src/calibre/ebooks/docx/images.py b/src/calibre/ebooks/docx/images.py
index 85e957a589..b0a5348d90 100644
--- a/src/calibre/ebooks/docx/images.py
+++ b/src/calibre/ebooks/docx/images.py
@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os
 
-from lxml.html.builder import IMG
+from lxml.html.builder import IMG, HR
 
 from calibre.ebooks.docx.names import XPath, get, barename
 from calibre.utils.filenames import ascii_filename
@@ -163,6 +163,26 @@ class Images(object):
                     yield ans
 
     def pict_to_html(self, pict, page):
+        # First see if we have an <hr>
+        is_hr = len(pict) == 1 and get(pict[0], 'o:hr') in {'t', 'true'}
+        if is_hr:
+            style = {}
+            hr = HR()
+            try:
+                pct = float(get(pict[0], 'o:hrpct'))
+            except (ValueError, TypeError, AttributeError):
+                pass
+            else:
+                if pct > 0:
+                    style['width'] = '%.3g%%' % pct
+            align = get(pict[0], 'o:hralign', 'center')
+            if align in {'left', 'right'}:
+                style['margin-left'] = '0' if align == 'left' else 'auto'
+                style['margin-right'] = 'auto' if align == 'left' else '0'
+            if style:
+                hr.set('style', '; '.join(('%s:%s' % (k, v) for k, v in style.iteritems())))
+            yield hr
+
         for imagedata in XPath('descendant::v:imagedata[@r:id]')(pict):
             rid = get(imagedata, 'r:id')
             if rid in self.rid_map:

From fa2f92e96cb17740e19630bd290c47cc3f902e47 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 29 Jun 2013 10:42:18 +0530
Subject: [PATCH 0062/1154] ...

---
 src/calibre/ebooks/conversion/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index f2795005d8..45b7841347 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -27,7 +27,7 @@ specified as the first two arguments to the command.
 The output ebook format is guessed from the file extension of \
 output_file. output_file can also be of the special format .EXT where \
 EXT is the output file extension. In this case, the name of the output \
-file is derived the name of the input file. Note that the filenames must \
+file is derived from the name of the input file. Note that the filenames must \
 not start with a hyphen. Finally, if output_file has no extension, then \
 it is treated as a directory and an "open ebook" (OEB) consisting of HTML \
 files is written to that directory. These files are the files that would \

From 373b3c7a222f11e59b40dee03327d8e0599f065c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 29 Jun 2013 12:30:56 +0530
Subject: [PATCH 0063/1154] Fix #22 (Remove double article entries which are
 already part in other rss feeds of the same recipe)

---
 recipes/taz_rss.recipe | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/recipes/taz_rss.recipe b/recipes/taz_rss.recipe
index 3ccbe2a4f1..0535b6ef3a 100644
--- a/recipes/taz_rss.recipe
+++ b/recipes/taz_rss.recipe
@@ -1,23 +1,43 @@
-__license__   = 'GPL v3'
-__copyright__ = '2010, Alexander Schremmer <alex@alexanderweb.de>'
+__license__ = 'GPL v3'
+__copyright__ = '2013, Alexander Schremmer <alex@alexanderweb.de>, Robert Riemann <robert@riemann.cc>'
 
+import re
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class TazRSSRecipe(BasicNewsRecipe):
-    title = u'Taz.de (die tageszeitung) RSS Feed - German'
-    __author__ = 'Alexander Schremmer'
+    title = u'Taz - die Tageszeitung'
+    description = u'Taz.de - die tageszeitung'
+    __author__ = 'Alexander Schremmer, Robert Riemann'
     language = 'de'
     lang = 'de-DE'
     oldest_article = 7
     max_articles_per_feed = 100
     publisher = 'taz Entwicklungs GmbH & Co. Medien KG'
+    # masthead_url = u'http://galeria-autonomica.de/wp-content/uploads/a_taz-logo.gif'
+    masthead_url = u'http://upload.wikimedia.org/wikipedia/de/thumb/1/15/Die-Tageszeitung-Logo.svg/500px-Die-Tageszeitung-Logo.svg.png'
 
     conversion_options = {'publisher': publisher,
                           'language': lang,
                         }
-
-    feeds          = [(u'TAZ main feed', u'http://www.taz.de/rss.xml')]
+    feeds = [
+             (u'Schlagzeilen', u'http://www.taz.de/!p3270;rss/'),
+             (u'Politik', u'http://www.taz.de/Politik/!p2;rss/'),
+             (u'Zukunft', u'http://www.taz.de/Zukunft/!p4;rss/'),
+             (u'Netz', u'http://www.taz.de/Netz/!p5;rss/'),
+             (u'Debatte', u'http://www.taz.de/Debatte/!p9;rss/'),
+             (u'Leben', u'http://www.taz.de/Leben/!p10;rss/'),
+             (u'Sport', u'http://www.taz.de/Sport/!p12;rss/'),
+             (u'Wahrheit', u'http://www.taz.de/Wahrheit/!p13;rss/'),
+             (u'Berlin', u'http://www.taz.de/Berlin/!p14;rss/'),
+             (u'Nord', u'http://www.taz.de/Nord/!p11;rss/')
+            ]
     keep_only_tags = [dict(name='div', attrs={'class': 'sect sect_article'})]
     remove_tags = [
-         dict(name=['div'], attrs={'class': 'artikelwerbung'}),
-         dict(name=['ul'], attrs={'class': 'toolbar'}),]
+                   dict(name=['div'], attrs={'class': 'artikelwerbung'}),
+                   dict(name=['ul'], attrs={'class': 'toolbar'}),
+                   # remove: taz paywall
+                   dict(name=['div'], attrs={'id': 'tzi_paywall'}),
+                   # remove: Artikel zum Thema (not working on Kindle)
+                   dict(name=['div'], attrs={'class': re.compile(r".*\bsect_seealso\b.*")}),
+                   dict(name=['div'], attrs={'class': 'sectfoot'})
+                  ]

From e8ada93ddad20094425cfd037a96f675a4f9e70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Sun, 30 Jun 2013 00:58:24 +0200
Subject: [PATCH 0064/1154] deduplicate code snippet

---
 recipes/gosc_niedzielny.recipe | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/recipes/gosc_niedzielny.recipe b/recipes/gosc_niedzielny.recipe
index ba2280c2a5..7ff2d48f84 100644
--- a/recipes/gosc_niedzielny.recipe
+++ b/recipes/gosc_niedzielny.recipe
@@ -47,13 +47,7 @@ class GN(BasicNewsRecipe):
                 return feeds
 
         def find_articles(self, main_block):
-                for a in main_block.findAll('div', attrs={'class':'prev_doc2'}):
-						art = a.find('a')
-						yield {
-                                'title' : self.tag_to_string(art),
-                                'url'   : 'http://www.gosc.pl' + art['href']
-                                }
-                for a in main_block.findAll('div', attrs={'class':'sr-document'}):
+                for a in main_block.findAll('div', attrs={'class':['prev_doc2', 'sr-document']}):
 						art = a.find('a')
 						yield {
                                 'title' : self.tag_to_string(art),

From 3db0f1895a2547d75d3015fcea54f1647b5f2afd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 30 Jun 2013 10:45:57 +0530
Subject: [PATCH 0065/1154] ...

---
 src/calibre/ebooks/oeb/transforms/embed_fonts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/transforms/embed_fonts.py b/src/calibre/ebooks/oeb/transforms/embed_fonts.py
index 027b8af1de..879e05da8f 100644
--- a/src/calibre/ebooks/oeb/transforms/embed_fonts.py
+++ b/src/calibre/ebooks/oeb/transforms/embed_fonts.py
@@ -197,7 +197,7 @@ class EmbedFonts(object):
         if not ff:
             return
         ff = ff[0]
-        if ff in self.warned:
+        if ff in self.warned or ff == 'inherit':
             return
         try:
             fonts = font_scanner.fonts_for_family(ff)

From 0223f60c9d28fc4433e63233e91230b8ddb6f708 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 30 Jun 2013 20:03:57 +0530
Subject: [PATCH 0066/1154] ...

---
 src/calibre/ebooks/conversion/plumber.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index a96574e904..14b5482a04 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -134,8 +134,7 @@ OptionRecommendation(name='output_profile',
             help=_('Specify the output profile. The output profile '
                    'tells the conversion system how to optimize the '
                    'created document for the specified device. In some cases, '
-                   'an output profile is required to produce documents that '
-                   'will work on a device. For example EPUB on the SONY reader. '
+                   'an output profile can be used to optimize the output for a particular device, but this is rarely necessary. '
                    'Choices are:') +
                            ', '.join([x.short_name for x in output_profiles()])
         ),

From 47626ee0cccb1ae7199b254ed01b7cea1f26f5b5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 1 Jul 2013 09:03:55 +0530
Subject: [PATCH 0067/1154] ...

---
 setup/file_hosting_servers.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index 261241e24d..c72998958e 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -11,6 +11,10 @@ Edit /etc/hosts and put in FQDN in the appropriate places, for example::
     27.0.1.1       download.calibre-ebook.com download
     46.28.49.116 download.calibre-ebook.com download
 
+dpkg-reconfigure tzdata
+set timezone to Asia/Kolkata
+service cron restart
+
 apt-get install vim nginx zsh python-lxml python-mechanize iotop htop smartmontools mosh
 chsh -s /bin/zsh
 

From 10c4c8f69f7b2904350e7f474ef14ce77da8b172 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 1 Jul 2013 12:05:28 +0530
Subject: [PATCH 0068/1154] ...

---
 src/calibre/gui2/tag_browser/ui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py
index 79d4a85f84..8760ccd23b 100644
--- a/src/calibre/gui2/tag_browser/ui.py
+++ b/src/calibre/gui2/tag_browser/ui.py
@@ -334,7 +334,7 @@ class TagBrowserWidget(QWidget):  # {{{
         search_layout = QHBoxLayout()
         self._layout.addLayout(search_layout)
         self.item_search = HistoryLineEdit(parent)
-        self.item_search.setMinimumContentsLength(10)
+        self.item_search.setMinimumContentsLength(5)
         self.item_search.setSizeAdjustPolicy(self.item_search.AdjustToMinimumContentsLengthWithIcon)
         try:
             self.item_search.lineEdit().setPlaceholderText(

From 59346348c5ab9db1510e6d022d36b8a19078aa44 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 1 Jul 2013 13:46:43 +0530
Subject: [PATCH 0069/1154] ...

---
 src/calibre/library/catalogs/epub_mobi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py
index 4984fbf9e2..673d764593 100644
--- a/src/calibre/library/catalogs/epub_mobi.py
+++ b/src/calibre/library/catalogs/epub_mobi.py
@@ -149,7 +149,7 @@ class EPUB_MOBI(CatalogPlugin):
                           default=None,
                           dest='output_profile',
                           action=None,
-                          help=_("Specifies the output profile.  In some cases, an output profile is required to optimize the catalog for the device.  For example, 'kindle' or 'kindle_dx' creates a structured Table of Contents with Sections and Articles.\n"
+                          help=_("Specifies the output profile. In some cases, an output profile is required to optimize the catalog for the device.  For example, 'kindle' or 'kindle_dx' creates a structured Table of Contents with Sections and Articles.\n"
                           "Default: '%default'\n"
                           "Applies to: AZW3, ePub, MOBI output formats")),
                    Option('--prefix-rules',

From 144f66c13b6e020dee1a6b225a728967d7dc21a1 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Mon, 1 Jul 2013 03:04:32 -0600
Subject: [PATCH 0070/1154] Added mkdir() to libiMobileDevice

---
 .../devices/idevice/libimobiledevice.py       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py
index ca6ed57a77..ba0f4d0f38 100644
--- a/src/calibre/devices/idevice/libimobiledevice.py
+++ b/src/calibre/devices/idevice/libimobiledevice.py
@@ -418,6 +418,14 @@ class libiMobileDevice():
         if False:
             self._idevice_set_debug_level(DEBUG)
 
+    def mkdir(self, path):
+        '''
+        Mimic mkdir(), creating a directory at path. Does not create
+        intermediate folders
+        '''
+        self._log_location("'%s'" % path)
+        return self._afc_make_directory(path)
+
     def mount_ios_app(self, app_name=None, app_id=None):
         '''
         Convenience method to get iDevice ready to talk to app_name or app_id
@@ -1007,6 +1015,27 @@ class libiMobileDevice():
                     self.log(" %s: %s" % (key, file_stats[key]))
         return file_stats
 
+    def _afc_make_directory(self, path):
+        '''
+        Creates a directory on the device. Does not create intermediate dirs.
+
+        Args:
+         client: (AFC_CLIENT_T) The client to use to make a directory
+         dir:    (const char *) The directory's fully-qualified path
+
+        Result:
+         error:  AFC_E_SUCCESS on success or an AFC_E_* error value
+        '''
+        self._log_location("%s" % repr(path))
+
+        error = self.lib.afc_make_directory(byref(self.afc),
+                                            str(path)) & 0xFFFF
+        if error:
+            if self.verbose:
+                self.log(" ERROR: %s" % self._afc_error(error))
+
+        return error
+
     def _afc_read_directory(self, directory=''):
         '''
         Gets a directory listing of the directory requested

From 9952abad4aa8a973a5ed06a3a9575ecda1a446e0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 1 Jul 2013 15:08:54 +0530
Subject: [PATCH 0071/1154] Polish: Add option to embed referenced fonts

Book polishing: Add option to embed all referenced fonts when polishing
books using the "Polish Books" tool. Fixes #1196038 [[enhancement] embed font without conversion](https://bugs.launchpad.net/calibre/+bug/1196038)
---
 resources/compiled_coffeescript.zip           | Bin 71177 -> 71881 bytes
 src/calibre/ebooks/oeb/polish/embed.py        | 158 ++++++++++++++++++
 .../ebooks/oeb/polish/font_stats.coffee       |  12 ++
 src/calibre/ebooks/oeb/polish/main.py         |  18 +-
 src/calibre/ebooks/oeb/polish/stats.py        |  70 ++++++--
 src/calibre/gui2/actions/polish.py            |   2 +
 6 files changed, 245 insertions(+), 15 deletions(-)
 create mode 100644 src/calibre/ebooks/oeb/polish/embed.py

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index cb48a58bd2714e22fdeb5e827bef753f51998001..e092b53157f3c30f95712db0b597358b744dc08a 100644
GIT binary patch
delta 454
zcmeBN!*X&Xi$s7oGm8iV2+S(D=k%>F=<5+a28JVi+qKvkr*co<CBP`lk(QX7nUk4X
zJlU{Qda^<$ivn1nQb!>#KP6R1p{O(mN*3!V6qi)yq)u<(W0dBy=28HI#JtH91>`25
zwG*3se=7H6PAi+~f<lavoFIM03bqO<lcQ_QCim8ePv%gQWCn^(J{Y7v*;|c!^4}VE
zj;vUSIg>eRRi?{vGRjS#z{MzK1~FPeAu~-u1L7P_g=(mUFuBCM;%JCmEYO;gqSDmK
z{)eR||49^{-0+=!^80f3=@SGPg{H3)Vq891w}q#XZz~@o8@n_klL#}mFkxVjpI#u$
zC^Oxfol#_ZurQ+*6C?k02T?}R=~ILmO_^@1KsXPC87-JL=z%$tAINh|Hx~gaHRyy0
zBvf%tZvqMEOoj-=v~Wy64HCG$VET6vMt3HK6(9*$W&=*f>5ig|B9jw-aft<Zv$BDr
Qi4zDHFflL)i!lOu0GHo?&j0`b

delta 229
zcmX@Pk)?ADOEV+?c1C_i5%$S?lQ{&1Joh_YdO7ta3l9SW2+L2m6Ju1`Xj{NN*-nLh
zatUAm^dvDxjp?>xjQrDU#ThxKFBD@mWx6Fgy+E8%boyH{Mhm9(@(_-VIHM7heiex0
z$)w!^5xf8ryftz1_XV=k6(tz8nB-?dB$6Z;4Vd(QK{zWV7<sfAnM9aH7(f8SRbWvV
cA;iu&-2v!I5mq*k5GN2WU}9hh7G?zU0H6RgW&i*H

diff --git a/src/calibre/ebooks/oeb/polish/embed.py b/src/calibre/ebooks/oeb/polish/embed.py
new file mode 100644
index 0000000000..1f5412bbc9
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/embed.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__   = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import sys
+
+from lxml import etree
+
+from calibre import prints
+from calibre.ebooks.oeb.base import XHTML
+from calibre.ebooks.oeb.polish.stats import normalize_font_properties
+from calibre.utils.filenames import ascii_filename
+
+props = {'font-family':None, 'font-weight':'normal', 'font-style':'normal', 'font-stretch':'normal'}
+
+def matching_rule(font, rules):
+    ff = font['font-family']
+    if not isinstance(ff, basestring):
+        ff = tuple(ff)[0]
+    family = icu_lower(ff)
+    wt = font['font-weight']
+    style = font['font-style']
+    stretch = font['font-stretch']
+
+    for rule in rules:
+        if rule['font-style'] == style and rule['font-stretch'] == stretch and rule['font-weight'] == wt:
+            ff = rule['font-family']
+            if not isinstance(ff, basestring):
+                ff = tuple(ff)[0]
+            if icu_lower(ff) == family:
+                return rule
+
+def embed_font(container, font, all_font_rules, report, warned):
+    rule = matching_rule(font, all_font_rules)
+    ff = font['font-family']
+    if not isinstance(ff, basestring):
+        ff = ff[0]
+    if rule is None:
+        from calibre.utils.fonts.scanner import font_scanner, NoFonts
+        if ff in warned:
+            return
+        try:
+            fonts = font_scanner.fonts_for_family(ff)
+        except NoFonts:
+            report(_('Failed to find fonts for family: %s, not embedding') % ff)
+            warned.add(ff)
+            return
+        wt = int(font.get('font-weight', '400'))
+        for f in fonts:
+            if f['weight'] == wt and f['font-style'] == font.get('font-style', 'normal') and f['font-stretch'] == font.get('font-stretch', 'normal'):
+                report('Embedding font %s from %s' % (f['full_name'], f['path']))
+                data = font_scanner.get_font_data(f)
+                fname = f['full_name']
+                ext = 'otf' if f['is_otf'] else 'ttf'
+                fname = ascii_filename(fname).replace(' ', '-').replace('(', '').replace(')', '')
+                item = container.generate_item('fonts/%s.%s'%(fname, ext), id_prefix='font')
+                name = container.href_to_name(item.get('href'), container.opf_name)
+                with container.open(name, 'wb') as out:
+                    out.write(data)
+                href = container.name_to_href(name)
+                rule = {k:f.get(k, v) for k, v in props.iteritems()}
+                rule['src'] = 'url(%s)' % href
+                rule['name'] = name
+                return rule
+        msg = _('Failed to find font matching: family: %s; weight: %s; style: %s; stretch: %s') % (
+            ff, font['font-weight'], font['font-style'], font['font-stretch'])
+        if msg not in warned:
+            warned.add(msg)
+            report(msg)
+    else:
+        name = rule['src']
+        href = container.name_to_href(name)
+        rule = {k:ff if k == 'font-family' else rule.get(k, v) for k, v in props.iteritems()}
+        rule['src'] = 'url(%s)' % href
+        rule['name'] = name
+        return rule
+
+def embed_all_fonts(container, stats, report):
+    all_font_rules = tuple(stats.all_font_rules.itervalues())
+    warned = set()
+    rules, nrules = [], []
+    modified = set()
+
+    for path in container.spine_items:
+        name = container.abspath_to_name(path)
+        fu = stats.font_usage_map.get(name, None)
+        fs = stats.font_spec_map.get(name, None)
+        fr = stats.font_rule_map.get(name, None)
+        if None in (fs, fu, fr):
+            continue
+        fs = {icu_lower(x) for x in fs}
+        for font in fu.itervalues():
+            if icu_lower(font['font-family']) not in fs:
+                continue
+            rule = matching_rule(font, fr)
+            if rule is None:
+                # This font was not already embedded in this HTML file, before
+                # processing started
+                rule = matching_rule(font, nrules)
+                if rule is None:
+                    rule = embed_font(container, font, all_font_rules, report, warned)
+                    if rule is not None:
+                        rules.append(rule)
+                        nrules.append(normalize_font_properties(rule.copy()))
+                        modified.add(name)
+                        stats.font_stats[rule['name']] = font['text']
+                else:
+                    # This font was previously embedded by this code, update its stats
+                    stats.font_stats[rule['name']] |= font['text']
+                    modified.add(name)
+
+    if not rules:
+        report(_('No embeddable fonts found'))
+        return
+
+    # Write out CSS
+    rules = [';\n\t'.join('%s: %s' % (
+        k, '"%s"' % v if k == 'font-family' else v) for k, v in rule.iteritems() if (k in props and props[k] != v and v != '400') or k == 'src')
+        for rule in rules]
+    css = '\n\n'.join(['@font-face {\n\t%s\n}' % r for r in rules])
+    item = container.generate_item('fonts.css', id_prefix='font_embed')
+    name = container.href_to_name(item.get('href'), container.opf_name)
+    with container.open(name, 'wb') as out:
+        out.write(css.encode('utf-8'))
+
+    # Add link to CSS in all files that need it
+    for spine_name in modified:
+        root = container.parsed(spine_name)
+        head = root.xpath('//*[local-name()="head"][1]')[0]
+        href = container.name_to_href(name, spine_name)
+        etree.SubElement(head, XHTML('link'), rel='stylesheet', type='text/css', href=href).tail = '\n'
+        container.dirty(spine_name)
+
+
+if __name__ == '__main__':
+    from calibre.ebooks.oeb.polish.container import get_container
+    from calibre.ebooks.oeb.polish.stats import StatsCollector
+    from calibre.utils.logging import default_log
+    default_log.filter_level = default_log.DEBUG
+    inbook = sys.argv[-1]
+    ebook = get_container(inbook, default_log)
+    report = []
+    stats = StatsCollector(ebook, do_embed=True)
+    embed_all_fonts(ebook, stats, report.append)
+    outbook, ext = inbook.rpartition('.')[0::2]
+    outbook += '_subset.'+ext
+    ebook.commit(outbook)
+    prints('\nReport:')
+    for msg in report:
+        prints(msg)
+    print()
+    prints('Output written to:', outbook)
+
diff --git a/src/calibre/ebooks/oeb/polish/font_stats.coffee b/src/calibre/ebooks/oeb/polish/font_stats.coffee
index ea99b65cea..e5e29becd1 100644
--- a/src/calibre/ebooks/oeb/polish/font_stats.coffee
+++ b/src/calibre/ebooks/oeb/polish/font_stats.coffee
@@ -67,6 +67,18 @@ class FontStats
                 ans.push(usage)
         py_bridge.value = ans
 
+    get_font_families: () ->
+        ans = {}
+        for node in document.getElementsByTagName('*')
+            rules = document.defaultView.getMatchedCSSRules(node, '')
+            if rules
+                for rule in rules
+                    style = rule.style
+                    family = style.getPropertyValue('font-family')
+                    if family
+                        ans[family] = true
+        py_bridge.value = ans
+
 if window?
     window.font_stats = new FontStats()
 
diff --git a/src/calibre/ebooks/oeb/polish/main.py b/src/calibre/ebooks/oeb/polish/main.py
index 08b5004c91..ff46288643 100644
--- a/src/calibre/ebooks/oeb/polish/main.py
+++ b/src/calibre/ebooks/oeb/polish/main.py
@@ -14,6 +14,7 @@ from functools import partial
 from calibre.ebooks.oeb.polish.container import get_container
 from calibre.ebooks.oeb.polish.stats import StatsCollector
 from calibre.ebooks.oeb.polish.subset import subset_all_fonts
+from calibre.ebooks.oeb.polish.embed import embed_all_fonts
 from calibre.ebooks.oeb.polish.cover import set_cover
 from calibre.ebooks.oeb.polish.replace import smarten_punctuation
 from calibre.ebooks.oeb.polish.jacket import (
@@ -21,6 +22,7 @@ from calibre.ebooks.oeb.polish.jacket import (
 from calibre.utils.logging import Log
 
 ALL_OPTS = {
+    'embed': False,
     'subset': False,
     'opf': None,
     'cover': None,
@@ -47,6 +49,12 @@ changes needed for the desired effect.</p>
 <p>Note that polishing only works on files in the %s formats.</p>\
 ''')%_(' or ').join('<b>%s</b>'%x for x in SUPPORTED),
 
+'embed': _('''\
+<p>Embed all fonts that are referenced in the document and are not already embedded.
+This will scan your computer for the fonts, and if they are found, they will be
+embedded into the document.</p>
+'''),
+
 'subset': _('''\
 <p>Subsetting fonts means reducing an embedded font to contain
 only the characters used from that font in the book. This
@@ -118,8 +126,8 @@ def polish(file_map, opts, log, report):
         ebook = get_container(inbook, log)
         jacket = None
 
-        if opts.subset:
-            stats = StatsCollector(ebook)
+        if opts.subset or opts.embed:
+            stats = StatsCollector(ebook, do_embed=opts.embed)
 
         if opts.opf:
             rt(_('Updating metadata'))
@@ -159,6 +167,11 @@ def polish(file_map, opts, log, report):
             smarten_punctuation(ebook, report)
             report('')
 
+        if opts.embed:
+            rt(_('Embedding referenced fonts'))
+            embed_all_fonts(ebook, stats, report)
+            report('')
+
         if opts.subset:
             rt(_('Subsetting embedded fonts'))
             subset_all_fonts(ebook, stats.font_stats, report)
@@ -197,6 +210,7 @@ def option_parser():
     parser = OptionParser(usage=USAGE)
     a = parser.add_option
     o = partial(a, default=False, action='store_true')
+    o('--embed-fonts', '-e', dest='embed', help=CLI_HELP['embed'])
     o('--subset-fonts', '-f', dest='subset', help=CLI_HELP['subset'])
     a('--cover', '-c', help=_(
         'Path to a cover image. Changes the cover specified in the ebook. '
diff --git a/src/calibre/ebooks/oeb/polish/stats.py b/src/calibre/ebooks/oeb/polish/stats.py
index d4a5c96111..77b99ff9b6 100644
--- a/src/calibre/ebooks/oeb/polish/stats.py
+++ b/src/calibre/ebooks/oeb/polish/stats.py
@@ -7,10 +7,11 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import json, sys, os
+import json, sys, os, logging
 from urllib import unquote
+from collections import defaultdict
 
-from cssutils import parseStyle
+from cssutils import CSSParser
 from PyQt4.Qt import (pyqtProperty, QString, QEventLoop, Qt, QSize, QTimer,
                       pyqtSlot)
 from PyQt4.QtWebKit import QWebPage, QWebView
@@ -41,14 +42,14 @@ def normalize_font_properties(font):
                    'extra-expanded', 'ultra-expanded'}:
         val = 'normal'
     font['font-stretch'] = val
+    return font
 
-widths = {x:i for i, x in enumerate(( 'ultra-condensed',
+widths = {x:i for i, x in enumerate(('ultra-condensed',
         'extra-condensed', 'condensed', 'semi-condensed', 'normal',
         'semi-expanded', 'expanded', 'extra-expanded', 'ultra-expanded'
         ))}
 
 def get_matching_rules(rules, font):
-    normalize_font_properties(font)
     matches = []
 
     # Filter on family
@@ -100,7 +101,7 @@ def get_matching_rules(rules, font):
             return m
     return []
 
-class Page(QWebPage): # {{{
+class Page(QWebPage):  # {{{
 
     def __init__(self, log):
         self.log = log
@@ -157,10 +158,12 @@ class Page(QWebPage): # {{{
 
 class StatsCollector(object):
 
-    def __init__(self, container):
+    def __init__(self, container, do_embed=False):
         self.container = container
         self.log = self.logger = container.log
+        self.do_embed = do_embed
         must_use_qt()
+        self.parser = CSSParser(loglevel=logging.CRITICAL, log=logging.getLogger('calibre.css'))
 
         self.loop = QEventLoop()
         self.view = QWebView()
@@ -173,6 +176,10 @@ class StatsCollector(object):
 
         self.render_queue = list(container.spine_items)
         self.font_stats = {}
+        self.font_usage_map = {}
+        self.font_spec_map = {}
+        self.font_rule_map = {}
+        self.all_font_rules = {}
 
         QTimer.singleShot(0, self.render_book)
 
@@ -235,27 +242,35 @@ class StatsCollector(object):
         rules = []
         for rule in font_face_rules:
             ff = rule.get('font-family', None)
-            if not ff: continue
-            style = parseStyle('font-family:%s'%ff, validate=False)
+            if not ff:
+                continue
+            style = self.parser.parseStyle('font-family:%s'%ff, validate=False)
             ff = [x.value for x in
                   style.getProperty('font-family').propertyValue]
             if not ff or ff[0] == 'inherit':
                 continue
             rule['font-family'] = frozenset(icu_lower(f) for f in ff)
             src = rule.get('src', None)
-            if not src: continue
-            style = parseStyle('background-image:%s'%src, validate=False)
+            if not src:
+                continue
+            style = self.parser.parseStyle('background-image:%s'%src, validate=False)
             src = style.getProperty('background-image').propertyValue[0].uri
             name = self.href_to_name(src, '@font-face rule')
+            if name is None:
+                continue
             rule['src'] = name
             normalize_font_properties(rule)
             rule['width'] = widths[rule['font-stretch']]
             rule['weight'] = int(rule['font-weight'])
             rules.append(rule)
 
-        if not rules:
+        if not rules and not self.do_embed:
             return
 
+        self.font_rule_map[self.container.abspath_to_name(self.current_item)] = rules
+        for rule in rules:
+            self.all_font_rules[rule['src']] = rule
+
         for rule in rules:
             if rule['src'] not in self.font_stats:
                 self.font_stats[rule['src']] = set()
@@ -265,19 +280,48 @@ class StatsCollector(object):
         if not isinstance(font_usage, list):
             raise Exception('Unknown error occurred while reading font usage')
         exclude = {'\n', '\r', '\t'}
+        self.font_usage_map[self.container.abspath_to_name(self.current_item)] = fu = defaultdict(dict)
+        bad_fonts = {'serif', 'sans-serif', 'monospace', 'cursive', 'fantasy', 'sansserif', 'inherit'}
         for font in font_usage:
             text = set()
             for t in font['text']:
                 text |= frozenset(t)
             text.difference_update(exclude)
-            if not text: continue
+            if not text:
+                continue
+            normalize_font_properties(font)
             for rule in get_matching_rules(rules, font):
                 self.font_stats[rule['src']] |= text
+            if self.do_embed:
+                ff = [icu_lower(x) for x in font.get('font-family', [])]
+                if ff and ff[0] not in bad_fonts:
+                    keys = {'font-weight', 'font-style', 'font-stretch', 'font-family'}
+                    key = frozenset(((k, ff[0] if k == 'font-family' else v) for k, v in font.iteritems() if k in keys))
+                    val = fu[key]
+                    if not val:
+                        val.update({k:(font[k][0] if k == 'font-family' else font[k]) for k in keys})
+                        val['text'] = set()
+                    val['text'] |= text
+        self.font_usage_map[self.container.abspath_to_name(self.current_item)] = dict(fu)
+
+        if self.do_embed:
+            self.page.evaljs('window.font_stats.get_font_families()')
+            font_families = self.page.bridge_value
+            if not isinstance(font_families, dict):
+                raise Exception('Unknown error occurred while reading font families')
+            self.font_spec_map[self.container.abspath_to_name(self.current_item)] = fs = set()
+            for raw in font_families.iterkeys():
+                style = self.parser.parseStyle('font-family:' + raw, validate=False).getProperty('font-family')
+                for x in style.propertyValue:
+                    x = x.value
+                    if x and x.lower() not in bad_fonts:
+                        fs.add(x)
 
 if __name__ == '__main__':
     from calibre.ebooks.oeb.polish.container import get_container
     from calibre.utils.logging import default_log
     default_log.filter_level = default_log.DEBUG
     ebook = get_container(sys.argv[-1], default_log)
-    print (StatsCollector(ebook).font_stats)
+    print (StatsCollector(ebook, do_embed=True).font_stats)
+
 
diff --git a/src/calibre/gui2/actions/polish.py b/src/calibre/gui2/actions/polish.py
index eb21fb2626..0f21807afb 100644
--- a/src/calibre/gui2/actions/polish.py
+++ b/src/calibre/gui2/actions/polish.py
@@ -45,6 +45,7 @@ class Polish(QDialog):  # {{{
                   ORIGINAL_* format before running it.</p>''')
             ),
 
+            'embed':_('<h3>Embed referenced fonts</h3>%s')%HELP['embed'],
             'subset':_('<h3>Subsetting fonts</h3>%s')%HELP['subset'],
 
             'smarten_punctuation':
@@ -75,6 +76,7 @@ class Polish(QDialog):  # {{{
 
         count = 0
         self.all_actions = OrderedDict([
+            ('embed', _('&Embed all referenced fonts')),
             ('subset', _('&Subset all embedded fonts')),
             ('smarten_punctuation', _('Smarten &punctuation')),
             ('metadata', _('Update &metadata in the book files')),

From c3cc6a2278facf35cfbc260e8b1e9fd978008913 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Mon, 1 Jul 2013 03:46:32 -0600
Subject: [PATCH 0072/1154] Revert "Fixed typo(?) in set_metadata() for touched
 files."

This reverts commit 8f30c17486701bf2cc29a84c98af5336de75fc56.
---
 src/calibre/utils/podofo/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/podofo/__init__.py b/src/calibre/utils/podofo/__init__.py
index a0b5d85331..13c12a9bb3 100644
--- a/src/calibre/utils/podofo/__init__.py
+++ b/src/calibre/utils/podofo/__init__.py
@@ -36,7 +36,7 @@ def set_metadata(stream, mi):
         except WorkerError as e:
             raise Exception('Failed to set PDF metadata: %s'%e.orig_tb)
         if touched:
-            with open(os.path.join(tdir, u'input.pdf'), 'rb') as f:
+            with open(os.path.join(tdir, u'output.pdf'), 'rb') as f:
                 f.seek(0, 2)
                 if f.tell() > 100:
                     f.seek(0)

From 6af87c05e31d886101feb065cd373021472ba888 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 1 Jul 2013 15:33:20 +0530
Subject: [PATCH 0073/1154] Driver for PocketBook Surfpad 2

Fixes #1182850 [Private bug](https://bugs.launchpad.net/calibre/+bug/1182850)
---
 src/calibre/devices/android/driver.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index a39c190d05..31b60389ad 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -96,7 +96,7 @@ class ANDROID(USBMS):
 
             # Google
             0x18d1 : {
-                0x0001 : [0x0223, 0x230, 0x9999],
+                0x0001 : [0x0222, 0x0223, 0x230, 0x9999],
                 0x0002 : [0x9999],
                 0x0003 : [0x0230, 0x9999],
                 0x4e11 : [0x0100, 0x226, 0x227],
@@ -219,7 +219,7 @@ class ANDROID(USBMS):
             'POCKET', 'ONDA_MID', 'ZENITHIN', 'INGENIC', 'PMID701C', 'PD',
             'PMP5097C', 'MASS', 'NOVO7', 'ZEKI', 'COBY', 'SXZ', 'USB_2.0',
             'COBY_MID', 'VS', 'AINOL', 'TOPWISE', 'PAD703', 'NEXT8D12',
-            'MEDIATEK', 'KEENHI', 'TECLAST', 'SURFTAB', 'XENTA',]
+            'MEDIATEK', 'KEENHI', 'TECLAST', 'SURFTAB', 'XENTA', 'OBREEY_S']
     WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'A953', 'INC.NEXUS_ONE',
             '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897',
             'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID',
@@ -241,7 +241,7 @@ class ANDROID(USBMS):
             'S5830I_CARD', 'MID7042', 'LINK-CREATE', '7035', 'VIEWPAD_7E',
             'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS',
             'ICS', 'E400', '__FILE-STOR_GADG', 'ST80208-1', 'GT-S5660M_CARD', 'XT894', '_USB',
-            'PROD_TAB13-201',
+            'PROD_TAB13-201', 'URFPAD2',
     ]
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
@@ -254,7 +254,7 @@ class ANDROID(USBMS):
             'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD', 'SGH-I727',
             'USB_FLASH_DRIVER', 'ANDROID', 'MID7042', '7035', 'VIEWPAD_7E',
             'NOVO7', 'ADVANCED', 'TABLET_PC', 'F', 'E400_SD_CARD', 'ST80208-1', 'XT894',
-            '_USB', 'PROD_TAB13-201',
+            '_USB', 'PROD_TAB13-201', 'URFPAD2'
     ]
 
     OSX_MAIN_MEM = 'Android Device Main Memory'

From e83738653ca3688569f37ef1b8f5bf3fe70060ad Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 2 Jul 2013 09:14:21 +0530
Subject: [PATCH 0074/1154] Fix #25 (bugfix: pass book_id to FileType plugins
 on postimport instead of __builtins__.id())

---
 src/calibre/library/database2.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 98e0190ecd..435d8edeeb 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -1500,8 +1500,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         format = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
         stream = lopen(npath, 'rb')
         format = check_ebook_format(stream, format)
-        retval = self.add_format(index, format, stream, replace=replace,
-                               index_is_id=index_is_id, path=path, notify=notify)
+        id = index if index_is_id else self.id(index)
+        retval = self.add_format(id, format, stream, replace=replace,
+                               index_is_id=True, path=path, notify=notify)
         run_plugins_on_postimport(self, id, format)
         return retval
 

From acbd785af90eaac58432bceae8e9fb9171b8d5c1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 2 Jul 2013 09:24:09 +0530
Subject: [PATCH 0075/1154] Fix docstring of is_image_collection

---
 src/calibre/customize/conversion.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/calibre/customize/conversion.py b/src/calibre/customize/conversion.py
index fe0d563206..38ffcef71f 100644
--- a/src/calibre/customize/conversion.py
+++ b/src/calibre/customize/conversion.py
@@ -77,7 +77,7 @@ class OptionRecommendation(object):
                                                     self.option.choices:
             raise ValueError('OpRec: %s: Recommended value not in choices'%
                              self.option.name)
-        if not (isinstance(self.recommended_value, (int, float, str, unicode))\
+        if not (isinstance(self.recommended_value, (int, float, str, unicode))
             or self.recommended_value is None):
             raise ValueError('OpRec: %s:'%self.option.name +
                              repr(self.recommended_value) +
@@ -139,8 +139,10 @@ class InputFormatPlugin(Plugin):
     file_types     = set([])
 
     #: If True, this input plugin generates a collection of images,
-    #: one per HTML file. You can obtain access to the images via
-    #: convenience method, :meth:`get_image_collection`.
+    #: one per HTML file. This can be set dynamically, in the convert method
+    #: if the input files can be both image collections and non-image collections.
+    #: If you set this to True, you must implement the get_images() method that returns
+    #: a list of images.
     is_image_collection = False
 
     #: Number of CPU cores used by this plugin
@@ -238,7 +240,6 @@ class InputFormatPlugin(Plugin):
             ret = self.convert(stream, options, file_ext,
                                log, accelerators)
 
-
         return ret
 
     def postprocess_book(self, oeb, opts, log):
@@ -313,7 +314,6 @@ class OutputFormatPlugin(Plugin):
         Plugin.__init__(self, *args)
         self.report_progress = DummyReporter()
 
-
     def convert(self, oeb_book, output, input_plugin, opts, log):
         '''
         Render the contents of `oeb_book` (which is an instance of
@@ -363,3 +363,4 @@ class OutputFormatPlugin(Plugin):
 
 
 
+

From 3c81080eadc76b5fd40a5320ee207e65f96017fb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 2 Jul 2013 11:17:08 +0530
Subject: [PATCH 0076/1154] Democracy Now by Antoine Beaupre

---
 recipes/democracy_now.recipe | 45 ++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 recipes/democracy_now.recipe

diff --git a/recipes/democracy_now.recipe b/recipes/democracy_now.recipe
new file mode 100644
index 0000000000..f7868c19dd
--- /dev/null
+++ b/recipes/democracy_now.recipe
@@ -0,0 +1,45 @@
+# vim:fileencoding=utf-8
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class DemocracyNowRecipe(BasicNewsRecipe):
+    title = u'Democracy now!'
+    __author__ = u'Antoine Beaupré'
+    description = 'A daily TV/radio news program, hosted by Amy Goodman and Juan Gonzalez, airing on over 1,100 stations, pioneering the largest community media collaboration in the United States.'  # noqa
+    language = 'en'
+    cover_url = 'http://www.democracynow.org/images/dn-logo-for-podcast.png'
+
+    oldest_article = 1
+    max_articles_per_feed = 10
+    publication_type = 'magazine'
+
+    auto_cleanup = False
+    use_embedded_content = False
+    no_stylesheets = True
+    remove_javascript = True
+
+    feeds = [
+        (u'Daily news', u'http://www.democracynow.org/democracynow.rss')]
+
+    keep_only_tags = [dict(name='div', attrs={'id': 'page'}), ]
+    remove_tags = [dict(name='div', attrs={'id': 'topics_list'}),
+                   dict(name='div', attrs={'id': 'header'}),
+                   dict(name='div', attrs={'id': 'footer'}),
+                   dict(name='div', attrs={'id': 'right'}),
+                   dict(name='div', attrs={'id': 'left-panel'}),
+                   dict(name='div', attrs={'id': 'top-video-content'}),
+                   dict(name='div', attrs={'id': 'google-news-date'}),
+                   dict(name='div', attrs={'id': 'story-donate'}),
+                   dict(
+                   name='div', attrs={'id': 'transcript-expand-collapse'}),
+                   dict(name='span', attrs={'class': 'show-links'}),
+                   dict(name='span', attrs={'class': 'storyNav'}),
+                   dict(name='div', attrs={'class': 'headline_share'}),
+                   dict(name='div', attrs={'class': 'mediaBar'}),
+                   dict(name='div', attrs={'class': 'shareAndPrinterBar'}),
+                   dict(name='div', attrs={'class': 'utility-navigation'}),
+                   dict(name='div', attrs={'class': 'bottomContentNav'}),
+                   dict(name='div', attrs={'class': 'recentShows'}),
+                   dict(
+                   name='div', attrs={'class': 'printer-and-transcript-links'}),
+                   ]
+

From 19016a109d651c93a50beee6a2743de5f24fe737 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 2 Jul 2013 11:22:53 +0530
Subject: [PATCH 0077/1154] Add warning about font licensing to embed options

---
 src/calibre/ebooks/conversion/plumber.py | 3 ++-
 src/calibre/ebooks/oeb/polish/main.py    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 14b5482a04..5778bbbabc 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -211,7 +211,8 @@ OptionRecommendation(name='embed_all_fonts',
             'but not already embedded. This will search your system for the '
             'fonts, and if found, they will be embedded. Embedding will only work '
             'if the format you are converting to supports embedded fonts, such as '
-            'EPUB, AZW3 or PDF.'
+            'EPUB, AZW3 or PDF. Please ensure that you have the proper license for embedding '
+            'the fonts used in this book.'
         )),
 
 OptionRecommendation(name='subset_embedded_fonts',
diff --git a/src/calibre/ebooks/oeb/polish/main.py b/src/calibre/ebooks/oeb/polish/main.py
index ff46288643..69d03098c7 100644
--- a/src/calibre/ebooks/oeb/polish/main.py
+++ b/src/calibre/ebooks/oeb/polish/main.py
@@ -53,6 +53,7 @@ changes needed for the desired effect.</p>
 <p>Embed all fonts that are referenced in the document and are not already embedded.
 This will scan your computer for the fonts, and if they are found, they will be
 embedded into the document.</p>
+<p>Please ensure that you have the proper license for embedding the fonts used in this book.</p>
 '''),
 
 'subset': _('''\

From 9394f87c14df4f866d50f32350863cafb145a96b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 2 Jul 2013 11:23:59 +0530
Subject: [PATCH 0078/1154] ...

---
 src/calibre/ebooks/conversion/plumber.py | 2 +-
 src/calibre/ebooks/oeb/polish/main.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 5778bbbabc..d4bdeb4562 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -212,7 +212,7 @@ OptionRecommendation(name='embed_all_fonts',
             'fonts, and if found, they will be embedded. Embedding will only work '
             'if the format you are converting to supports embedded fonts, such as '
             'EPUB, AZW3 or PDF. Please ensure that you have the proper license for embedding '
-            'the fonts used in this book.'
+            'the fonts used in this document.'
         )),
 
 OptionRecommendation(name='subset_embedded_fonts',
diff --git a/src/calibre/ebooks/oeb/polish/main.py b/src/calibre/ebooks/oeb/polish/main.py
index 69d03098c7..c5a7d4db6d 100644
--- a/src/calibre/ebooks/oeb/polish/main.py
+++ b/src/calibre/ebooks/oeb/polish/main.py
@@ -53,7 +53,7 @@ changes needed for the desired effect.</p>
 <p>Embed all fonts that are referenced in the document and are not already embedded.
 This will scan your computer for the fonts, and if they are found, they will be
 embedded into the document.</p>
-<p>Please ensure that you have the proper license for embedding the fonts used in this book.</p>
+<p>Please ensure that you have the proper license for embedding the fonts used in this document.</p>
 '''),
 
 'subset': _('''\

From f5db5d9c00fcbc47358d992b7e9d8b62ca7fbf76 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 2 Jul 2013 18:37:21 +0530
Subject: [PATCH 0079/1154] Driver for Trekstor Pyrus Maxi

Fixes #1196931 [Device not recogized](https://bugs.launchpad.net/calibre/+bug/1196931)
---
 src/calibre/devices/misc.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index b20ec3ca6e..e35db8f03d 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -227,16 +227,17 @@ class TREKSTOR(USBMS):
     VENDOR_ID   = [0x1e68]
     PRODUCT_ID  = [0x0041, 0x0042, 0x0052, 0x004e, 0x0056,
             0x0067,  # This is for the Pyrus Mini
+            0x006f,  # This is for the Pyrus Maxi
             0x003e,  # This is for the EBOOK_PLAYER_5M https://bugs.launchpad.net/bugs/792091
             0x5cL,  # This is for the 4ink http://www.mobileread.com/forums/showthread.php?t=191318
             ]
-    BCD         = [0x0002, 0x100]
+    BCD         = [0x0002, 0x100, 0x0222]
 
     EBOOK_DIR_MAIN = 'Ebooks'
 
     VENDOR_NAME = 'TREKSTOR'
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['EBOOK_PLAYER_7',
-            'EBOOK_PLAYER_5M', 'EBOOK-READER_3.0', 'EREADER_PYRUS', 'PYRUS_MINI']
+            'EBOOK_PLAYER_5M', 'EBOOK-READER_3.0', 'EREADER_PYRUS', 'PYRUS_MINI', 'PYRUS_MAXI']
     SUPPORTS_SUB_DIRS = True
     SUPPORTS_SUB_DIRS_DEFAULT = False
 

From e8839bc8dc5bbf96ead2c12bc303c99ed9447c88 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 08:12:33 +0530
Subject: [PATCH 0080/1154] Prefix version tags with v

---
 setup/publish.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/publish.py b/setup/publish.py
index ac56942273..40d002ee8a 100644
--- a/setup/publish.py
+++ b/setup/publish.py
@@ -113,6 +113,6 @@ class TagRelease(Command):
 
     def run(self, opts):
         self.info('Tagging release')
-        subprocess.check_call('git tag -a {0} -m "version-{0}"'.format(__version__).split())
-        subprocess.check_call('git push origin {0}'.format(__version__).split())
+        subprocess.check_call('git tag -a v{0} -m "version-{0}"'.format(__version__).split())
+        subprocess.check_call('git push origin v{0}'.format(__version__).split())
 

From 3b4094a890120df33b78d073bfa61b41261d30ff Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 10:58:48 +0530
Subject: [PATCH 0081/1154] DOCX: Handle hyperlinks created as fields

See https://bugs.launchpad.net/calibre/+bug/1196728 for an example.
---
 src/calibre/ebooks/docx/fields.py  | 106 +++++++++++++++++++++++++++++
 src/calibre/ebooks/docx/to_html.py |  22 ++++++
 2 files changed, 128 insertions(+)
 create mode 100644 src/calibre/ebooks/docx/fields.py

diff --git a/src/calibre/ebooks/docx/fields.py b/src/calibre/ebooks/docx/fields.py
new file mode 100644
index 0000000000..9b0d053cd0
--- /dev/null
+++ b/src/calibre/ebooks/docx/fields.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import re
+
+from calibre.ebooks.docx.names import XPath, get
+
+class Field(object):
+
+    def __init__(self, start):
+        self.start = start
+        self.end = None
+        self.contents = []
+        self.instructions = []
+
+    def add_instr(self, elem):
+        raw = elem.text
+        if not raw:
+            return
+        name, rest = raw.strip().partition(' ')[0::2]
+        self.instructions.append((name, rest.strip()))
+
+WORD, FLAG = 0, 1
+scanner = re.Scanner([
+    (r'\\\S{1}', lambda s, t: (t, FLAG)),  # A flag of the form \x
+    (r'"[^"]*"', lambda s, t: (t[1:-1], WORD)),  # Quoted word
+    (r'[^\s\\"]\S*', lambda s, t: (t, WORD)),  # A non-quoted word, must not start with a backslash or a space or a quote
+    (r'\s+', None),
+], flags=re.DOTALL)
+
+
+def parse_hyperlink(raw, log):
+    ans = {}
+    last_option = None
+    for token, token_type in scanner.scan(raw)[0]:
+        if not ans:
+            if token_type is not WORD:
+                log('Invalid hyperlink, first token is not a URL (%s)' % raw)
+                return ans
+            ans['url'] = token
+        if token_type is FLAG:
+            last_option = {'l':'anchor', 'm':'image-map', 'n':'target', 'o':'title', 't':'target'}.get(token[1], None)
+            if last_option is not None:
+                ans[last_option] = None
+        elif token_type is WORD:
+            if last_option is not None:
+                ans[last_option] = token
+    return ans
+
+
+class Fields(object):
+
+    def __init__(self):
+        self.fields = []
+
+    def __call__(self, doc, log):
+        stack = []
+        for elem in XPath(
+            '//*[name()="w:p" or name()="w:r" or name()="w:instrText" or (name()="w:fldChar" and (@w:fldCharType="begin" or @w:fldCharType="end"))]')(doc):
+            if elem.tag.endswith('}fldChar'):
+                typ = get(elem, 'w:fldCharType')
+                if typ == 'begin':
+                    stack.append(Field(elem))
+                    self.fields.append(stack[-1])
+                else:
+                    try:
+                        stack.pop().end = elem
+                    except IndexError:
+                        pass
+            elif elem.tag.endswith('}instrText'):
+                if stack:
+                    stack[-1].add_instr(elem)
+            else:
+                if stack:
+                    stack[-1].contents.append(elem)
+
+        # Parse hyperlink fields
+        self.hyperlink_fields = []
+        for field in self.fields:
+            if len(field.instructions) == 1 and field.instructions[0][0] == 'HYPERLINK':
+                hl = parse_hyperlink(field.instructions[0][1], log)
+                if hl:
+                    if 'target' in hl and hl['target'] is None:
+                        hl['target'] = '_blank'
+                    all_runs = []
+                    current_runs = []
+                    # We only handle spans in a single paragraph
+                    # being wrapped in <a>
+                    for x in field.contents:
+                        if x.tag.endswith('}p'):
+                            if current_runs:
+                                all_runs.append(current_runs)
+                            current_runs = []
+                        elif x.tag.endswith('}r'):
+                            current_runs.append(x)
+                    if current_runs:
+                        all_runs.append(current_runs)
+                    for runs in all_runs:
+                        self.hyperlink_fields.append((hl, runs))
+
+
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 79020d9c0a..647b021205 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -26,6 +26,7 @@ from calibre.ebooks.docx.footnotes import Footnotes
 from calibre.ebooks.docx.cleanup import cleanup_markup
 from calibre.ebooks.docx.theme import Theme
 from calibre.ebooks.docx.toc import create_toc
+from calibre.ebooks.docx.fields import Fields
 from calibre.ebooks.metadata.opf2 import OPFCreator
 from calibre.utils.localization import canonicalize_lang, lang_as_iso639_1
 
@@ -52,6 +53,7 @@ class Convert(object):
         self.body = BODY()
         self.theme = Theme()
         self.tables = Tables()
+        self.fields = Fields()
         self.styles = Styles(self.tables)
         self.images = Images()
         self.object_map = OrderedDict()
@@ -79,6 +81,7 @@ class Convert(object):
     def __call__(self):
         doc = self.docx.document
         relationships_by_id, relationships_by_type = self.docx.document_relationships
+        self.fields(doc, self.log)
         self.read_styles(relationships_by_type)
         self.images(relationships_by_id)
         self.layers = OrderedDict()
@@ -396,6 +399,25 @@ class Convert(object):
             # hrefs that point nowhere give epubcheck a hernia. The element
             # should be styled explicitly by Word anyway.
             # span.set('href', '#')
+        rmap = {v:k for k, v in self.object_map.iteritems()}
+        for hyperlink, runs in self.fields.hyperlink_fields:
+            spans = [rmap[r] for r in runs if r in rmap]
+            if not spans:
+                continue
+            if len(spans) > 1:
+                span = self.wrap_elems(spans, SPAN())
+            span.tag = 'a'
+            tgt = hyperlink.get('target', None)
+            if tgt:
+                span.set('target', tgt)
+            tt = hyperlink.get('title', None)
+            if tt:
+                span.set('title', tt)
+            url = hyperlink['url']
+            if url in self.anchor_map:
+                span.set('href', '#' + self.anchor_map[url])
+                continue
+            span.set('href', url)
 
     def convert_run(self, run):
         ans = SPAN()

From 80f3e7f8674a9069ca6894e033d9afe279c44e96 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 11:23:26 +0530
Subject: [PATCH 0082/1154] DOCX: Insert page breaks at the start of every new
 section

See https://bugs.launchpad.net/calibre/+bug/1196728 for an example
---
 src/calibre/ebooks/docx/styles.py  | 5 +++++
 src/calibre/ebooks/docx/to_html.py | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/docx/styles.py b/src/calibre/ebooks/docx/styles.py
index 21f45616fa..4572eb59f2 100644
--- a/src/calibre/ebooks/docx/styles.py
+++ b/src/calibre/ebooks/docx/styles.py
@@ -403,6 +403,11 @@ class Styles(object):
                         ps.margin_top = 0
             last_para = p
 
+    def apply_section_page_breaks(self, paras):
+        for p in paras:
+            ps = self.resolve_paragraph(p)
+            ps.pageBreakBefore = True
+
     def register(self, css, prefix):
         h = hash(frozenset(css.iteritems()))
         ans, _ = self.classes.get(h, (None, None))
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 647b021205..1fdd24267a 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -100,6 +100,9 @@ class Convert(object):
                 self.body.append(p)
                 paras.append(wp)
         self.styles.apply_contextual_spacing(paras)
+        # Apply page breaks at the start of every section, except the first
+        # section (since that will be the start of the file)
+        self.styles.apply_section_page_breaks(self.section_starts[1:])
 
         notes_header = None
         if self.footnotes.has_notes:
@@ -180,6 +183,7 @@ class Convert(object):
     def read_page_properties(self, doc):
         current = []
         self.page_map = OrderedDict()
+        self.section_starts = []
 
         for p in descendants(doc, 'w:p', 'w:tbl'):
             if p.tag.endswith('}tbl'):
@@ -189,8 +193,10 @@ class Convert(object):
             sect = tuple(descendants(p, 'w:sectPr'))
             if sect:
                 pr = PageProperties(sect)
-                for x in current + [p]:
+                paras = current + [p]
+                for x in paras:
                     self.page_map[x] = pr
+                self.section_starts.append(paras[0])
                 current = []
             else:
                 current.append(p)

From 584beceee347f2a18c70728bdd4830381fabe85c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 11:24:12 +0530
Subject: [PATCH 0083/1154] DOCX: handle bookmarks defined at the paragraph
 level

See https://bugs.launchpad.net/calibre/+bug/1196728 for an example.
---
 src/calibre/ebooks/docx/to_html.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 1fdd24267a..fae521d807 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -99,6 +99,7 @@ class Convert(object):
                 p = self.convert_p(wp)
                 self.body.append(p)
                 paras.append(wp)
+        self.read_block_anchors(doc)
         self.styles.apply_contextual_spacing(paras)
         # Apply page breaks at the start of every section, except the first
         # section (since that will be the start of the file)
@@ -296,6 +297,22 @@ class Convert(object):
             opf.render(of, ncx, 'toc.ncx')
         return os.path.join(self.dest_dir, 'metadata.opf')
 
+    def read_block_anchors(self, doc):
+        doc_anchors = frozenset(XPath('./w:body/w:bookmarkStart[@w:name]')(doc))
+        if doc_anchors:
+            current_bm = None
+            rmap = {v:k for k, v in self.object_map.iteritems()}
+            for p in descendants(doc, 'w:p', 'w:bookmarkStart[@w:name]'):
+                if p.tag.endswith('}p'):
+                    if current_bm and p in rmap:
+                        para = rmap[p]
+                        if 'id' not in para.attrib:
+                            para.set('id', generate_anchor(current_bm, frozenset(self.anchor_map.itervalues())))
+                        self.anchor_map[current_bm] = para.get('id')
+                        current_bm = None
+                elif p in doc_anchors:
+                    current_bm = get(p, 'w:name')
+
     def convert_p(self, p):
         dest = P()
         self.object_map[dest] = p

From 26e23ac7a6f793bde281517ea8ade1e4c878263f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 12:15:55 +0530
Subject: [PATCH 0084/1154] Splitting: Handle the tail of the split point
 correctly

EPUB/AZW3 Output: Fix splitting on page-break-after with plain text
immediately following the split point causing the text to be added
before rather than after the split point.
---
 src/calibre/ebooks/oeb/transforms/split.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/calibre/ebooks/oeb/transforms/split.py b/src/calibre/ebooks/oeb/transforms/split.py
index 605a58a31f..36fe6b3167 100644
--- a/src/calibre/ebooks/oeb/transforms/split.py
+++ b/src/calibre/ebooks/oeb/transforms/split.py
@@ -339,6 +339,8 @@ class FlowSplitter(object):
                     # We want to keep the descendants of the split point in
                     # Tree 1
                     keep_descendants = True
+                    # We want the split point element, but not its tail
+                    elem.tail = '\n'
 
                 continue
             if hit_split_point:
@@ -357,6 +359,18 @@ class FlowSplitter(object):
         for elem in tuple(body2.iterdescendants()):
             if elem is split_point2:
                 if not before:
+                    # Keep the split point element's tail, if it contains non-whitespace
+                    # text
+                    tail = elem.tail
+                    if tail and not tail.isspace():
+                        parent = elem.getparent()
+                        idx = parent.index(elem)
+                        if idx == 0:
+                            parent.text = (parent.text or '') + tail
+                        else:
+                            sib = parent[idx-1]
+                            sib.tail = (sib.tail or '') + tail
+                    # Remove the element itself
                     nix_element(elem)
                 break
             if elem in ancestors:

From bbaf2ff574d19981e79a6bd2fcd6bf147a44d4ac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 13:05:47 +0530
Subject: [PATCH 0085/1154] DOCX: Hyperlinked images

DOCX Input: Add support for clickable (hyperlinked) images
---
 src/calibre/ebooks/docx/container.py |  2 +-
 src/calibre/ebooks/docx/images.py    | 19 ++++++++++++++++---
 src/calibre/ebooks/docx/to_html.py   | 21 +++++++++++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/docx/container.py b/src/calibre/ebooks/docx/container.py
index 68f74a3c82..deaf5bd4d0 100644
--- a/src/calibre/ebooks/docx/container.py
+++ b/src/calibre/ebooks/docx/container.py
@@ -183,7 +183,7 @@ class DOCX(object):
             root = fromstring(raw)
             for item in root.xpath('//*[local-name()="Relationships"]/*[local-name()="Relationship" and @Type and @Target]'):
                 target = item.get('Target')
-                if item.get('TargetMode', None) != 'External':
+                if item.get('TargetMode', None) != 'External' and not target.startswith('#'):
                     target = '/'.join((base, target.lstrip('/')))
                 typ = item.get('Type')
                 Id = item.get('Id')
diff --git a/src/calibre/ebooks/docx/images.py b/src/calibre/ebooks/docx/images.py
index b0a5348d90..3be3d51c05 100644
--- a/src/calibre/ebooks/docx/images.py
+++ b/src/calibre/ebooks/docx/images.py
@@ -96,6 +96,7 @@ class Images(object):
         self.used = {}
         self.names = set()
         self.all_images = set()
+        self.links = []
 
     def __call__(self, relationships_by_id):
         self.rid_map = relationships_by_id
@@ -125,8 +126,18 @@ class Images(object):
         self.all_images.add('images/' + name)
         return name
 
-    def pic_to_img(self, pic, alt=None):
+    def pic_to_img(self, pic, alt, parent):
         name = None
+        link = None
+        for hl in XPath('descendant::a:hlinkClick[@r:id]')(parent):
+            link = {'id':get(hl, 'r:id')}
+            tgt = hl.get('tgtFrame', None)
+            if tgt:
+                link['target'] = tgt
+            title = hl.get('tooltip', None)
+            if title:
+                link['title'] = title
+
         for pr in XPath('descendant::pic:cNvPr')(pic):
             name = pr.get('name', None)
             if name:
@@ -138,6 +149,8 @@ class Images(object):
                     src = self.generate_filename(rid, name)
                     img = IMG(src='images/%s' % src)
                     img.set('alt', alt or 'Image')
+                    if link is not None:
+                        self.links.append((img, link))
                     return img
 
     def drawing_to_html(self, drawing, page):
@@ -145,7 +158,7 @@ class Images(object):
         for inline in XPath('./wp:inline')(drawing):
             style, alt = get_image_properties(inline)
             for pic in XPath('descendant::pic:pic')(inline):
-                ans = self.pic_to_img(pic, alt)
+                ans = self.pic_to_img(pic, alt, inline)
                 if ans is not None:
                     if style:
                         ans.set('style', '; '.join('%s: %s' % (k, v) for k, v in style.iteritems()))
@@ -156,7 +169,7 @@ class Images(object):
             style, alt = get_image_properties(anchor)
             self.get_float_properties(anchor, style, page)
             for pic in XPath('descendant::pic:pic')(anchor):
-                ans = self.pic_to_img(pic, alt)
+                ans = self.pic_to_img(pic, alt, anchor)
                 if ans is not None:
                     if style:
                         ans.set('style', '; '.join('%s: %s' % (k, v) for k, v in style.iteritems()))
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index fae521d807..26e50f9b9d 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -442,6 +442,27 @@ class Convert(object):
                 continue
             span.set('href', url)
 
+        for img, link in self.images.links:
+            parent = img.getparent()
+            idx = parent.index(img)
+            a = A(img)
+            a.tail, img.tail = img.tail, None
+            parent.insert(idx, a)
+            tgt = link.get('target', None)
+            if tgt:
+                a.set('target', tgt)
+            tt = link.get('title', None)
+            if tt:
+                a.set('title', tt)
+            rid = link['id']
+            if rid in relationships_by_id:
+                dest = relationships_by_id[rid]
+                if dest.startswith('#'):
+                    if dest[1:] in self.anchor_map:
+                        a.set('href', '#' + self.anchor_map[dest[1:]])
+                else:
+                    a.set('href', dest)
+
     def convert_run(self, run):
         ans = SPAN()
         self.object_map[ans] = run

From c8c3741d342cd644781137bc26811f08e1efcb0d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 13:36:30 +0530
Subject: [PATCH 0086/1154] DOCX: Handle redundant bookmarks

DOCX Input: Fix links pointing to locations in the same document that
contain multiple, redundant bookmarks not working.
---
 src/calibre/ebooks/docx/to_html.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 26e50f9b9d..01808657ea 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -342,7 +342,13 @@ class Convert(object):
             elif x.tag.endswith('}bookmarkStart'):
                 anchor = get(x, 'w:name')
                 if anchor and anchor not in self.anchor_map:
+                    old_anchor = current_anchor
                     self.anchor_map[anchor] = current_anchor = generate_anchor(anchor, frozenset(self.anchor_map.itervalues()))
+                    if old_anchor is not None:
+                        # The previous anchor was not applied to any element
+                        for a, t in tuple(self.anchor_map.iteritems()):
+                            if t == old_anchor:
+                                self.anchor_map[a] = current_anchor
             elif x.tag.endswith('}hyperlink'):
                 current_hyperlink = x
 

From 36386d06cc954909a173736f1e08a6460084ef0f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 14:42:08 +0530
Subject: [PATCH 0087/1154] PDF Output: Fix mangling of links

PDF Output: Fix links that point to URLs with query parameters being
mangled by the conversion process. Fixes #1197006 [Broken links in PDF in Adobe reader.](https://bugs.launchpad.net/calibre/+bug/1197006)
---
 src/calibre/ebooks/pdf/render/links.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/calibre/ebooks/pdf/render/links.py b/src/calibre/ebooks/pdf/render/links.py
index 500bbbf6c1..6ec7c500a8 100644
--- a/src/calibre/ebooks/pdf/render/links.py
+++ b/src/calibre/ebooks/pdf/render/links.py
@@ -8,9 +8,8 @@ __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import os
-from future_builtins import map
-from urlparse import urlparse, urlunparse
-from urllib2 import quote, unquote
+from urlparse import urlparse
+from urllib2 import unquote
 
 from calibre.ebooks.pdf.render.common import Array, Name, Dictionary, String
 
@@ -84,10 +83,6 @@ class Links(object):
                     action = Dictionary({
                         'Type':Name('Action'), 'S':Name('URI'),
                     })
-                    parts = (x.encode('utf-8') if isinstance(x, type(u'')) else
-                             x for x in purl)
-                    url = urlunparse(map(quote, map(unquote,
-                                                    parts))).decode('ascii')
                     action['URI'] = String(url)
                     annot['A'] = action
             if 'A' in annot or 'Dest' in annot:

From a149790b93f554038fb6b28a2dfe229d3ac9c9c5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 15:17:46 +0530
Subject: [PATCH 0088/1154] ...

---
 src/calibre/ebooks/pdf/render/links.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/ebooks/pdf/render/links.py b/src/calibre/ebooks/pdf/render/links.py
index 6ec7c500a8..4d0d588771 100644
--- a/src/calibre/ebooks/pdf/render/links.py
+++ b/src/calibre/ebooks/pdf/render/links.py
@@ -83,6 +83,8 @@ class Links(object):
                     action = Dictionary({
                         'Type':Name('Action'), 'S':Name('URI'),
                     })
+                    # Do not try to normalize/quote/unquote this URL as if it
+                    # has a query part, it will get corrupted
                     action['URI'] = String(url)
                     annot['A'] = action
             if 'A' in annot or 'Dest' in annot:

From a3adb69d944dc2535895eedf9d0159302a07e839 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 21:18:32 +0530
Subject: [PATCH 0089/1154] Metadata download dialog: Prevent the buttons from
 being re-ordered when the Next button is clicked.

---
 src/calibre/gui2/metadata/single_download.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index 3e9bb87687..ed378745a5 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -1006,7 +1006,7 @@ class FullFetch(QDialog):  # {{{
         l.addWidget(self.bb)
         self.bb.rejected.connect(self.reject)
         self.bb.accepted.connect(self.accept)
-        self.next_button = self.bb.addButton(_('Next'), self.bb.AcceptRole)
+        self.next_button = self.bb.addButton(_('Next'), self.bb.ActionRole)
         self.next_button.setDefault(True)
         self.next_button.setEnabled(False)
         self.next_button.setIcon(QIcon(I('ok.png')))
@@ -1019,7 +1019,7 @@ class FullFetch(QDialog):  # {{{
         self.log_button = self.bb.addButton(_('View log'), self.bb.ActionRole)
         self.log_button.clicked.connect(self.view_log)
         self.log_button.setIcon(QIcon(I('debug.png')))
-        self.ok_button.setVisible(False)
+        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
 
         self.identify_widget = IdentifyWidget(self.log, self)
@@ -1044,7 +1044,7 @@ class FullFetch(QDialog):  # {{{
 
     def book_selected(self, book, caches):
         self.next_button.setVisible(False)
-        self.ok_button.setVisible(True)
+        self.ok_button.setEnabled(True)
         self.prev_button.setVisible(True)
         self.book = book
         self.stack.setCurrentIndex(1)
@@ -1055,8 +1055,9 @@ class FullFetch(QDialog):  # {{{
 
     def back_clicked(self):
         self.next_button.setVisible(True)
-        self.ok_button.setVisible(False)
+        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
+        self.next_button.setFocus()
         self.stack.setCurrentIndex(0)
         self.covers_widget.cancel()
         self.covers_widget.reset_covers()
@@ -1081,6 +1082,7 @@ class FullFetch(QDialog):  # {{{
         self.next_button.setEnabled(True)
 
     def next_clicked(self, *args):
+        gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
         self.identify_widget.get_result()
 
     def ok_clicked(self, *args):

From 509cc82d805e7c49057ddba6aaf1109e982b7226 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 21:58:44 +0530
Subject: [PATCH 0090/1154] Allow running python setup.py develop froma  git
 checkout

---
 setup/install.py      | 2 +-
 setup/translations.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/setup/install.py b/setup/install.py
index b1698d88ed..d1bb2058f1 100644
--- a/setup/install.py
+++ b/setup/install.py
@@ -56,7 +56,7 @@ class Develop(Command):
     short_description = 'Setup a development environment for calibre'
     MODE = 0o755
 
-    sub_commands = ['build', 'resources', 'iso639', 'gui',]
+    sub_commands = ['build', 'resources', 'gui',]
 
     def add_postinstall_options(self, parser):
         parser.add_option('--make-errors-fatal', action='store_true', default=False,
diff --git a/setup/translations.py b/setup/translations.py
index 17c8d10018..e8b0fecdf1 100644
--- a/setup/translations.py
+++ b/setup/translations.py
@@ -21,7 +21,12 @@ def qt_sources():
 class POT(Command):  # {{{
 
     description = 'Update the .pot translation template and upload it'
-    LP_BASE = os.path.join(os.path.dirname(os.path.dirname(Command.SRC)), 'calibre-translations')
+    LP_BASE = os.path.join(os.path.dirname(Command.SRC))
+    if not os.path.exists(os.path.join(LP_BASE, 'setup', 'iso_639')):
+        # We are in a git checkout, translations are assumed to be in a
+        # directory called calibre-translations at the same level as the
+        # calibre directory.
+        LP_BASE = os.path.join(os.path.dirname(os.path.dirname(Command.SRC)), 'calibre-translations')
     LP_SRC = os.path.join(LP_BASE, 'src')
     LP_PATH = os.path.join(LP_SRC, os.path.join(__appname__, 'translations'))
     LP_ISO_PATH = os.path.join(LP_BASE, 'setup', 'iso_639')

From bd4e828668d2e76dae900ce3530db27482787dda Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 22:23:49 +0530
Subject: [PATCH 0091/1154] Restore building iso639 in develop as it is needed

---
 setup/install.py      |     2 +-
 setup/iso_639_3.xml   | 39178 ++++++++++++++++++++++++++++++++++++++++
 setup/translations.py |    11 +-
 3 files changed, 39186 insertions(+), 5 deletions(-)
 create mode 100644 setup/iso_639_3.xml

diff --git a/setup/install.py b/setup/install.py
index d1bb2058f1..b1698d88ed 100644
--- a/setup/install.py
+++ b/setup/install.py
@@ -56,7 +56,7 @@ class Develop(Command):
     short_description = 'Setup a development environment for calibre'
     MODE = 0o755
 
-    sub_commands = ['build', 'resources', 'gui',]
+    sub_commands = ['build', 'resources', 'iso639', 'gui',]
 
     def add_postinstall_options(self, parser):
         parser.add_option('--make-errors-fatal', action='store_true', default=False,
diff --git a/setup/iso_639_3.xml b/setup/iso_639_3.xml
new file mode 100644
index 0000000000..6b94a3850b
--- /dev/null
+++ b/setup/iso_639_3.xml
@@ -0,0 +1,39178 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+This file gives a list of all languages in the ISO 639-3
+standard, and is used to provide translations via gettext
+
+Copyright (C) 2005 Alastair McKinstry <mckinstry@computer.org>
+Copyright (C) 2008 Tobias Quathamer <toddy@debian.org>
+
+    This file 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 file 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 file; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Source: <http://www.sil.org/iso639-3/>
+-->
+
+<!DOCTYPE iso_639_3_entries [
+	<!ELEMENT iso_639_3_entries (iso_639_3_entry+)>
+	<!ELEMENT iso_639_3_entry EMPTY>
+	<!ATTLIST iso_639_3_entry
+		id		CDATA	#REQUIRED
+		name		CDATA	#REQUIRED
+		type		CDATA	#REQUIRED
+		scope 		CDATA   #REQUIRED
+		part1_code	CDATA	#IMPLIED
+		part2_code	CDATA	#IMPLIED
+	>
+]>
+
+<iso_639_3_entries>
+	<iso_639_3_entry
+		id="aaa"
+		scope="I"
+		type="L"
+		name="Ghotuo" />
+	<iso_639_3_entry
+		id="aab"
+		scope="I"
+		type="L"
+		name="Alumu-Tesu" />
+	<iso_639_3_entry
+		id="aac"
+		scope="I"
+		type="L"
+		name="Ari" />
+	<iso_639_3_entry
+		id="aad"
+		scope="I"
+		type="L"
+		name="Amal" />
+	<iso_639_3_entry
+		id="aae"
+		scope="I"
+		type="L"
+		name="Albanian; Arbëreshë" />
+	<iso_639_3_entry
+		id="aaf"
+		scope="I"
+		type="L"
+		name="Aranadan" />
+	<iso_639_3_entry
+		id="aag"
+		scope="I"
+		type="L"
+		name="Ambrak" />
+	<iso_639_3_entry
+		id="aah"
+		scope="I"
+		type="L"
+		name="Arapesh; Abu'" />
+	<iso_639_3_entry
+		id="aai"
+		scope="I"
+		type="L"
+		name="Arifama-Miniafia" />
+	<iso_639_3_entry
+		id="aak"
+		scope="I"
+		type="L"
+		name="Ankave" />
+	<iso_639_3_entry
+		id="aal"
+		scope="I"
+		type="L"
+		name="Afade" />
+	<iso_639_3_entry
+		id="aam"
+		scope="I"
+		type="L"
+		name="Aramanik" />
+	<iso_639_3_entry
+		id="aan"
+		scope="I"
+		type="L"
+		name="Anambé" />
+	<iso_639_3_entry
+		id="aao"
+		scope="I"
+		type="L"
+		name="Arabic; Algerian Saharan" />
+	<iso_639_3_entry
+		id="aap"
+		scope="I"
+		type="L"
+		name="Arára; Pará" />
+	<iso_639_3_entry
+		id="aaq"
+		scope="I"
+		type="E"
+		name="Abnaki; Eastern" />
+	<iso_639_3_entry
+		id="aar"
+		part1_code="aa"
+		part2_code="aar"
+		scope="I"
+		type="L"
+		name="Afar" />
+	<iso_639_3_entry
+		id="aas"
+		scope="I"
+		type="L"
+		name="Aasáx" />
+	<iso_639_3_entry
+		id="aat"
+		scope="I"
+		type="L"
+		name="Albanian; Arvanitika" />
+	<iso_639_3_entry
+		id="aau"
+		scope="I"
+		type="L"
+		name="Abau" />
+	<iso_639_3_entry
+		id="aaw"
+		scope="I"
+		type="L"
+		name="Solong" />
+	<iso_639_3_entry
+		id="aax"
+		scope="I"
+		type="L"
+		name="Mandobo Atas" />
+	<iso_639_3_entry
+		id="aaz"
+		scope="I"
+		type="L"
+		name="Amarasi" />
+	<iso_639_3_entry
+		id="aba"
+		scope="I"
+		type="L"
+		name="Abé" />
+	<iso_639_3_entry
+		id="abb"
+		scope="I"
+		type="L"
+		name="Bankon" />
+	<iso_639_3_entry
+		id="abc"
+		scope="I"
+		type="L"
+		name="Ayta; Ambala" />
+	<iso_639_3_entry
+		id="abd"
+		scope="I"
+		type="L"
+		name="Manide" />
+	<iso_639_3_entry
+		id="abe"
+		scope="I"
+		type="E"
+		name="Abnaki; Western" />
+	<iso_639_3_entry
+		id="abf"
+		scope="I"
+		type="L"
+		name="Abai Sungai" />
+	<iso_639_3_entry
+		id="abg"
+		scope="I"
+		type="L"
+		name="Abaga" />
+	<iso_639_3_entry
+		id="abh"
+		scope="I"
+		type="L"
+		name="Arabic; Tajiki" />
+	<iso_639_3_entry
+		id="abi"
+		scope="I"
+		type="L"
+		name="Abidji" />
+	<iso_639_3_entry
+		id="abj"
+		scope="I"
+		type="E"
+		name="Aka-Bea" />
+	<iso_639_3_entry
+		id="abk"
+		part1_code="ab"
+		part2_code="abk"
+		scope="I"
+		type="L"
+		name="Abkhazian" />
+	<iso_639_3_entry
+		id="abl"
+		scope="I"
+		type="L"
+		name="Lampung Nyo" />
+	<iso_639_3_entry
+		id="abm"
+		scope="I"
+		type="L"
+		name="Abanyom" />
+	<iso_639_3_entry
+		id="abn"
+		scope="I"
+		type="L"
+		name="Abua" />
+	<iso_639_3_entry
+		id="abo"
+		scope="I"
+		type="L"
+		name="Abon" />
+	<iso_639_3_entry
+		id="abp"
+		scope="I"
+		type="L"
+		name="Ayta; Abellen" />
+	<iso_639_3_entry
+		id="abq"
+		scope="I"
+		type="L"
+		name="Abaza" />
+	<iso_639_3_entry
+		id="abr"
+		scope="I"
+		type="L"
+		name="Abron" />
+	<iso_639_3_entry
+		id="abs"
+		scope="I"
+		type="L"
+		name="Malay; Ambonese" />
+	<iso_639_3_entry
+		id="abt"
+		scope="I"
+		type="L"
+		name="Ambulas" />
+	<iso_639_3_entry
+		id="abu"
+		scope="I"
+		type="L"
+		name="Abure" />
+	<iso_639_3_entry
+		id="abv"
+		scope="I"
+		type="L"
+		name="Arabic; Baharna" />
+	<iso_639_3_entry
+		id="abw"
+		scope="I"
+		type="L"
+		name="Pal" />
+	<iso_639_3_entry
+		id="abx"
+		scope="I"
+		type="L"
+		name="Inabaknon" />
+	<iso_639_3_entry
+		id="aby"
+		scope="I"
+		type="L"
+		name="Aneme Wake" />
+	<iso_639_3_entry
+		id="abz"
+		scope="I"
+		type="L"
+		name="Abui" />
+	<iso_639_3_entry
+		id="aca"
+		scope="I"
+		type="L"
+		name="Achagua" />
+	<iso_639_3_entry
+		id="acb"
+		scope="I"
+		type="L"
+		name="Áncá" />
+	<iso_639_3_entry
+		id="acd"
+		scope="I"
+		type="L"
+		name="Gikyode" />
+	<iso_639_3_entry
+		id="ace"
+		part2_code="ace"
+		scope="I"
+		type="L"
+		name="Achinese" />
+	<iso_639_3_entry
+		id="acf"
+		scope="I"
+		type="L"
+		name="Creole French; Saint Lucian" />
+	<iso_639_3_entry
+		id="ach"
+		part2_code="ach"
+		scope="I"
+		type="L"
+		name="Acoli" />
+	<iso_639_3_entry
+		id="aci"
+		scope="I"
+		type="E"
+		name="Aka-Cari" />
+	<iso_639_3_entry
+		id="ack"
+		scope="I"
+		type="E"
+		name="Aka-Kora" />
+	<iso_639_3_entry
+		id="acl"
+		scope="I"
+		type="E"
+		name="Akar-Bale" />
+	<iso_639_3_entry
+		id="acm"
+		scope="I"
+		type="L"
+		name="Arabic; Mesopotamian" />
+	<iso_639_3_entry
+		id="acn"
+		scope="I"
+		type="L"
+		name="Achang" />
+	<iso_639_3_entry
+		id="acp"
+		scope="I"
+		type="L"
+		name="Acipa; Eastern" />
+	<iso_639_3_entry
+		id="acq"
+		scope="I"
+		type="L"
+		name="Arabic; Ta'izzi-Adeni" />
+	<iso_639_3_entry
+		id="acr"
+		scope="I"
+		type="L"
+		name="Achi" />
+	<iso_639_3_entry
+		id="acs"
+		scope="I"
+		type="E"
+		name="Acroá" />
+	<iso_639_3_entry
+		id="act"
+		scope="I"
+		type="L"
+		name="Achterhoeks" />
+	<iso_639_3_entry
+		id="acu"
+		scope="I"
+		type="L"
+		name="Achuar-Shiwiar" />
+	<iso_639_3_entry
+		id="acv"
+		scope="I"
+		type="L"
+		name="Achumawi" />
+	<iso_639_3_entry
+		id="acw"
+		scope="I"
+		type="L"
+		name="Arabic; Hijazi" />
+	<iso_639_3_entry
+		id="acx"
+		scope="I"
+		type="L"
+		name="Arabic; Omani" />
+	<iso_639_3_entry
+		id="acy"
+		scope="I"
+		type="L"
+		name="Arabic; Cypriot" />
+	<iso_639_3_entry
+		id="acz"
+		scope="I"
+		type="L"
+		name="Acheron" />
+	<iso_639_3_entry
+		id="ada"
+		part2_code="ada"
+		scope="I"
+		type="L"
+		name="Adangme" />
+	<iso_639_3_entry
+		id="adb"
+		scope="I"
+		type="L"
+		name="Adabe" />
+	<iso_639_3_entry
+		id="add"
+		scope="I"
+		type="L"
+		name="Dzodinka" />
+	<iso_639_3_entry
+		id="ade"
+		scope="I"
+		type="L"
+		name="Adele" />
+	<iso_639_3_entry
+		id="adf"
+		scope="I"
+		type="L"
+		name="Arabic; Dhofari" />
+	<iso_639_3_entry
+		id="adg"
+		scope="I"
+		type="L"
+		name="Andegerebinha" />
+	<iso_639_3_entry
+		id="adh"
+		scope="I"
+		type="L"
+		name="Adhola" />
+	<iso_639_3_entry
+		id="adi"
+		scope="I"
+		type="L"
+		name="Adi" />
+	<iso_639_3_entry
+		id="adj"
+		scope="I"
+		type="L"
+		name="Adioukrou" />
+	<iso_639_3_entry
+		id="adl"
+		scope="I"
+		type="L"
+		name="Galo" />
+	<iso_639_3_entry
+		id="adn"
+		scope="I"
+		type="L"
+		name="Adang" />
+	<iso_639_3_entry
+		id="ado"
+		scope="I"
+		type="L"
+		name="Abu" />
+	<iso_639_3_entry
+		id="adp"
+		scope="I"
+		type="L"
+		name="Adap" />
+	<iso_639_3_entry
+		id="adq"
+		scope="I"
+		type="L"
+		name="Adangbe" />
+	<iso_639_3_entry
+		id="adr"
+		scope="I"
+		type="L"
+		name="Adonara" />
+	<iso_639_3_entry
+		id="ads"
+		scope="I"
+		type="L"
+		name="Adamorobe Sign Language" />
+	<iso_639_3_entry
+		id="adt"
+		scope="I"
+		type="L"
+		name="Adnyamathanha" />
+	<iso_639_3_entry
+		id="adu"
+		scope="I"
+		type="L"
+		name="Aduge" />
+	<iso_639_3_entry
+		id="adw"
+		scope="I"
+		type="L"
+		name="Amundava" />
+	<iso_639_3_entry
+		id="adx"
+		scope="I"
+		type="L"
+		name="Tibetan; Amdo" />
+	<iso_639_3_entry
+		id="ady"
+		part2_code="ady"
+		scope="I"
+		type="L"
+		name="Adyghe" />
+	<iso_639_3_entry
+		id="adz"
+		scope="I"
+		type="L"
+		name="Adzera" />
+	<iso_639_3_entry
+		id="aea"
+		scope="I"
+		type="E"
+		name="Areba" />
+	<iso_639_3_entry
+		id="aeb"
+		scope="I"
+		type="L"
+		name="Arabic; Tunisian" />
+	<iso_639_3_entry
+		id="aec"
+		scope="I"
+		type="L"
+		name="Arabic; Saidi" />
+	<iso_639_3_entry
+		id="aed"
+		scope="I"
+		type="L"
+		name="Argentine Sign Language" />
+	<iso_639_3_entry
+		id="aee"
+		scope="I"
+		type="L"
+		name="Pashayi; Northeast" />
+	<iso_639_3_entry
+		id="aek"
+		scope="I"
+		type="L"
+		name="Haeke" />
+	<iso_639_3_entry
+		id="ael"
+		scope="I"
+		type="L"
+		name="Ambele" />
+	<iso_639_3_entry
+		id="aem"
+		scope="I"
+		type="L"
+		name="Arem" />
+	<iso_639_3_entry
+		id="aen"
+		scope="I"
+		type="L"
+		name="Armenian Sign Language" />
+	<iso_639_3_entry
+		id="aeq"
+		scope="I"
+		type="L"
+		name="Aer" />
+	<iso_639_3_entry
+		id="aer"
+		scope="I"
+		type="L"
+		name="Arrernte; Eastern" />
+	<iso_639_3_entry
+		id="aes"
+		scope="I"
+		type="E"
+		name="Alsea" />
+	<iso_639_3_entry
+		id="aeu"
+		scope="I"
+		type="L"
+		name="Akeu" />
+	<iso_639_3_entry
+		id="aew"
+		scope="I"
+		type="L"
+		name="Ambakich" />
+	<iso_639_3_entry
+		id="aey"
+		scope="I"
+		type="L"
+		name="Amele" />
+	<iso_639_3_entry
+		id="aez"
+		scope="I"
+		type="L"
+		name="Aeka" />
+	<iso_639_3_entry
+		id="afb"
+		scope="I"
+		type="L"
+		name="Arabic; Gulf" />
+	<iso_639_3_entry
+		id="afd"
+		scope="I"
+		type="L"
+		name="Andai" />
+	<iso_639_3_entry
+		id="afe"
+		scope="I"
+		type="L"
+		name="Putukwam" />
+	<iso_639_3_entry
+		id="afg"
+		scope="I"
+		type="L"
+		name="Afghan Sign Language" />
+	<iso_639_3_entry
+		id="afh"
+		part2_code="afh"
+		scope="I"
+		type="C"
+		name="Afrihili" />
+	<iso_639_3_entry
+		id="afi"
+		scope="I"
+		type="L"
+		name="Akrukay" />
+	<iso_639_3_entry
+		id="afk"
+		scope="I"
+		type="L"
+		name="Nanubae" />
+	<iso_639_3_entry
+		id="afn"
+		scope="I"
+		type="L"
+		name="Defaka" />
+	<iso_639_3_entry
+		id="afo"
+		scope="I"
+		type="L"
+		name="Eloyi" />
+	<iso_639_3_entry
+		id="afp"
+		scope="I"
+		type="L"
+		name="Tapei" />
+	<iso_639_3_entry
+		id="afr"
+		part1_code="af"
+		part2_code="afr"
+		scope="I"
+		type="L"
+		name="Afrikaans" />
+	<iso_639_3_entry
+		id="afs"
+		scope="I"
+		type="L"
+		name="Creole; Afro-Seminole" />
+	<iso_639_3_entry
+		id="aft"
+		scope="I"
+		type="L"
+		name="Afitti" />
+	<iso_639_3_entry
+		id="afu"
+		scope="I"
+		type="L"
+		name="Awutu" />
+	<iso_639_3_entry
+		id="afz"
+		scope="I"
+		type="L"
+		name="Obokuitai" />
+	<iso_639_3_entry
+		id="aga"
+		scope="I"
+		type="E"
+		name="Aguano" />
+	<iso_639_3_entry
+		id="agb"
+		scope="I"
+		type="L"
+		name="Legbo" />
+	<iso_639_3_entry
+		id="agc"
+		scope="I"
+		type="L"
+		name="Agatu" />
+	<iso_639_3_entry
+		id="agd"
+		scope="I"
+		type="L"
+		name="Agarabi" />
+	<iso_639_3_entry
+		id="age"
+		scope="I"
+		type="L"
+		name="Angal" />
+	<iso_639_3_entry
+		id="agf"
+		scope="I"
+		type="L"
+		name="Arguni" />
+	<iso_639_3_entry
+		id="agg"
+		scope="I"
+		type="L"
+		name="Angor" />
+	<iso_639_3_entry
+		id="agh"
+		scope="I"
+		type="L"
+		name="Ngelima" />
+	<iso_639_3_entry
+		id="agi"
+		scope="I"
+		type="L"
+		name="Agariya" />
+	<iso_639_3_entry
+		id="agj"
+		scope="I"
+		type="L"
+		name="Argobba" />
+	<iso_639_3_entry
+		id="agk"
+		scope="I"
+		type="L"
+		name="Agta; Isarog" />
+	<iso_639_3_entry
+		id="agl"
+		scope="I"
+		type="L"
+		name="Fembe" />
+	<iso_639_3_entry
+		id="agm"
+		scope="I"
+		type="L"
+		name="Angaataha" />
+	<iso_639_3_entry
+		id="agn"
+		scope="I"
+		type="L"
+		name="Agutaynen" />
+	<iso_639_3_entry
+		id="ago"
+		scope="I"
+		type="L"
+		name="Tainae" />
+	<iso_639_3_entry
+		id="agq"
+		scope="I"
+		type="L"
+		name="Aghem" />
+	<iso_639_3_entry
+		id="agr"
+		scope="I"
+		type="L"
+		name="Aguaruna" />
+	<iso_639_3_entry
+		id="ags"
+		scope="I"
+		type="L"
+		name="Esimbi" />
+	<iso_639_3_entry
+		id="agt"
+		scope="I"
+		type="L"
+		name="Agta; Central Cagayan" />
+	<iso_639_3_entry
+		id="agu"
+		scope="I"
+		type="L"
+		name="Aguacateco" />
+	<iso_639_3_entry
+		id="agv"
+		scope="I"
+		type="L"
+		name="Dumagat; Remontado" />
+	<iso_639_3_entry
+		id="agw"
+		scope="I"
+		type="L"
+		name="Kahua" />
+	<iso_639_3_entry
+		id="agx"
+		scope="I"
+		type="L"
+		name="Aghul" />
+	<iso_639_3_entry
+		id="agy"
+		scope="I"
+		type="L"
+		name="Alta; Southern" />
+	<iso_639_3_entry
+		id="agz"
+		scope="I"
+		type="L"
+		name="Agta; Mt. Iriga" />
+	<iso_639_3_entry
+		id="aha"
+		scope="I"
+		type="L"
+		name="Ahanta" />
+	<iso_639_3_entry
+		id="ahb"
+		scope="I"
+		type="L"
+		name="Axamb" />
+	<iso_639_3_entry
+		id="ahg"
+		scope="I"
+		type="L"
+		name="Qimant" />
+	<iso_639_3_entry
+		id="ahh"
+		scope="I"
+		type="L"
+		name="Aghu" />
+	<iso_639_3_entry
+		id="ahi"
+		scope="I"
+		type="L"
+		name="Aizi; Tiagbamrin" />
+	<iso_639_3_entry
+		id="ahk"
+		scope="I"
+		type="L"
+		name="Akha" />
+	<iso_639_3_entry
+		id="ahl"
+		scope="I"
+		type="L"
+		name="Igo" />
+	<iso_639_3_entry
+		id="ahm"
+		scope="I"
+		type="L"
+		name="Aizi; Mobumrin" />
+	<iso_639_3_entry
+		id="ahn"
+		scope="I"
+		type="L"
+		name="Àhàn" />
+	<iso_639_3_entry
+		id="aho"
+		scope="I"
+		type="E"
+		name="Ahom" />
+	<iso_639_3_entry
+		id="ahp"
+		scope="I"
+		type="L"
+		name="Aizi; Aproumu" />
+	<iso_639_3_entry
+		id="ahr"
+		scope="I"
+		type="L"
+		name="Ahirani" />
+	<iso_639_3_entry
+		id="ahs"
+		scope="I"
+		type="L"
+		name="Ashe" />
+	<iso_639_3_entry
+		id="aht"
+		scope="I"
+		type="L"
+		name="Ahtena" />
+	<iso_639_3_entry
+		id="aia"
+		scope="I"
+		type="L"
+		name="Arosi" />
+	<iso_639_3_entry
+		id="aib"
+		scope="I"
+		type="L"
+		name="Ainu (China)" />
+	<iso_639_3_entry
+		id="aic"
+		scope="I"
+		type="L"
+		name="Ainbai" />
+	<iso_639_3_entry
+		id="aid"
+		scope="I"
+		type="E"
+		name="Alngith" />
+	<iso_639_3_entry
+		id="aie"
+		scope="I"
+		type="L"
+		name="Amara" />
+	<iso_639_3_entry
+		id="aif"
+		scope="I"
+		type="L"
+		name="Agi" />
+	<iso_639_3_entry
+		id="aig"
+		scope="I"
+		type="L"
+		name="Creole English; Antigua and Barbuda" />
+	<iso_639_3_entry
+		id="aih"
+		scope="I"
+		type="L"
+		name="Ai-Cham" />
+	<iso_639_3_entry
+		id="aii"
+		scope="I"
+		type="L"
+		name="Neo-Aramaic; Assyrian" />
+	<iso_639_3_entry
+		id="aij"
+		scope="I"
+		type="L"
+		name="Lishanid Noshan" />
+	<iso_639_3_entry
+		id="aik"
+		scope="I"
+		type="L"
+		name="Ake" />
+	<iso_639_3_entry
+		id="ail"
+		scope="I"
+		type="L"
+		name="Aimele" />
+	<iso_639_3_entry
+		id="aim"
+		scope="I"
+		type="L"
+		name="Aimol" />
+	<iso_639_3_entry
+		id="ain"
+		part2_code="ain"
+		scope="I"
+		type="L"
+		name="Ainu (Japan)" />
+	<iso_639_3_entry
+		id="aio"
+		scope="I"
+		type="L"
+		name="Aiton" />
+	<iso_639_3_entry
+		id="aip"
+		scope="I"
+		type="L"
+		name="Burumakok" />
+	<iso_639_3_entry
+		id="aiq"
+		scope="I"
+		type="L"
+		name="Aimaq" />
+	<iso_639_3_entry
+		id="air"
+		scope="I"
+		type="L"
+		name="Airoran" />
+	<iso_639_3_entry
+		id="ais"
+		scope="I"
+		type="L"
+		name="Amis; Nataoran" />
+	<iso_639_3_entry
+		id="ait"
+		scope="I"
+		type="E"
+		name="Arikem" />
+	<iso_639_3_entry
+		id="aiw"
+		scope="I"
+		type="L"
+		name="Aari" />
+	<iso_639_3_entry
+		id="aix"
+		scope="I"
+		type="L"
+		name="Aighon" />
+	<iso_639_3_entry
+		id="aiy"
+		scope="I"
+		type="L"
+		name="Ali" />
+	<iso_639_3_entry
+		id="aja"
+		scope="I"
+		type="L"
+		name="Aja (Sudan)" />
+	<iso_639_3_entry
+		id="ajg"
+		scope="I"
+		type="L"
+		name="Aja (Benin)" />
+	<iso_639_3_entry
+		id="aji"
+		scope="I"
+		type="L"
+		name="Ajië" />
+	<iso_639_3_entry
+		id="ajp"
+		scope="I"
+		type="L"
+		name="Arabic; South Levantine" />
+	<iso_639_3_entry
+		id="ajt"
+		scope="I"
+		type="L"
+		name="Arabic; Judeo-Tunisian" />
+	<iso_639_3_entry
+		id="aju"
+		scope="I"
+		type="L"
+		name="Arabic; Judeo-Moroccan" />
+	<iso_639_3_entry
+		id="ajw"
+		scope="I"
+		type="E"
+		name="Ajawa" />
+	<iso_639_3_entry
+		id="ajz"
+		scope="I"
+		type="L"
+		name="Karbi; Amri" />
+	<iso_639_3_entry
+		id="aka"
+		part1_code="ak"
+		part2_code="aka"
+		scope="M"
+		type="L"
+		name="Akan" />
+	<iso_639_3_entry
+		id="akb"
+		scope="I"
+		type="L"
+		name="Batak Angkola" />
+	<iso_639_3_entry
+		id="akc"
+		scope="I"
+		type="L"
+		name="Mpur" />
+	<iso_639_3_entry
+		id="akd"
+		scope="I"
+		type="L"
+		name="Ukpet-Ehom" />
+	<iso_639_3_entry
+		id="ake"
+		scope="I"
+		type="L"
+		name="Akawaio" />
+	<iso_639_3_entry
+		id="akf"
+		scope="I"
+		type="L"
+		name="Akpa" />
+	<iso_639_3_entry
+		id="akg"
+		scope="I"
+		type="L"
+		name="Anakalangu" />
+	<iso_639_3_entry
+		id="akh"
+		scope="I"
+		type="L"
+		name="Angal Heneng" />
+	<iso_639_3_entry
+		id="aki"
+		scope="I"
+		type="L"
+		name="Aiome" />
+	<iso_639_3_entry
+		id="akj"
+		scope="I"
+		type="E"
+		name="Aka-Jeru" />
+	<iso_639_3_entry
+		id="akk"
+		part2_code="akk"
+		scope="I"
+		type="A"
+		name="Akkadian" />
+	<iso_639_3_entry
+		id="akl"
+		scope="I"
+		type="L"
+		name="Aklanon" />
+	<iso_639_3_entry
+		id="akm"
+		scope="I"
+		type="E"
+		name="Aka-Bo" />
+	<iso_639_3_entry
+		id="ako"
+		scope="I"
+		type="L"
+		name="Akurio" />
+	<iso_639_3_entry
+		id="akp"
+		scope="I"
+		type="L"
+		name="Siwu" />
+	<iso_639_3_entry
+		id="akq"
+		scope="I"
+		type="L"
+		name="Ak" />
+	<iso_639_3_entry
+		id="akr"
+		scope="I"
+		type="L"
+		name="Araki" />
+	<iso_639_3_entry
+		id="aks"
+		scope="I"
+		type="L"
+		name="Akaselem" />
+	<iso_639_3_entry
+		id="akt"
+		scope="I"
+		type="L"
+		name="Akolet" />
+	<iso_639_3_entry
+		id="aku"
+		scope="I"
+		type="L"
+		name="Akum" />
+	<iso_639_3_entry
+		id="akv"
+		scope="I"
+		type="L"
+		name="Akhvakh" />
+	<iso_639_3_entry
+		id="akw"
+		scope="I"
+		type="L"
+		name="Akwa" />
+	<iso_639_3_entry
+		id="akx"
+		scope="I"
+		type="E"
+		name="Aka-Kede" />
+	<iso_639_3_entry
+		id="aky"
+		scope="I"
+		type="E"
+		name="Aka-Kol" />
+	<iso_639_3_entry
+		id="akz"
+		scope="I"
+		type="L"
+		name="Alabama" />
+	<iso_639_3_entry
+		id="ala"
+		scope="I"
+		type="L"
+		name="Alago" />
+	<iso_639_3_entry
+		id="alc"
+		scope="I"
+		type="L"
+		name="Qawasqar" />
+	<iso_639_3_entry
+		id="ald"
+		scope="I"
+		type="L"
+		name="Alladian" />
+	<iso_639_3_entry
+		id="ale"
+		part2_code="ale"
+		scope="I"
+		type="L"
+		name="Aleut" />
+	<iso_639_3_entry
+		id="alf"
+		scope="I"
+		type="L"
+		name="Alege" />
+	<iso_639_3_entry
+		id="alh"
+		scope="I"
+		type="L"
+		name="Alawa" />
+	<iso_639_3_entry
+		id="ali"
+		scope="I"
+		type="L"
+		name="Amaimon" />
+	<iso_639_3_entry
+		id="alj"
+		scope="I"
+		type="L"
+		name="Alangan" />
+	<iso_639_3_entry
+		id="alk"
+		scope="I"
+		type="L"
+		name="Alak" />
+	<iso_639_3_entry
+		id="all"
+		scope="I"
+		type="L"
+		name="Allar" />
+	<iso_639_3_entry
+		id="alm"
+		scope="I"
+		type="L"
+		name="Amblong" />
+	<iso_639_3_entry
+		id="aln"
+		scope="I"
+		type="L"
+		name="Albanian; Gheg" />
+	<iso_639_3_entry
+		id="alo"
+		scope="I"
+		type="L"
+		name="Larike-Wakasihu" />
+	<iso_639_3_entry
+		id="alp"
+		scope="I"
+		type="L"
+		name="Alune" />
+	<iso_639_3_entry
+		id="alq"
+		scope="I"
+		type="L"
+		name="Algonquin" />
+	<iso_639_3_entry
+		id="alr"
+		scope="I"
+		type="L"
+		name="Alutor" />
+	<iso_639_3_entry
+		id="als"
+		scope="I"
+		type="L"
+		name="Albanian; Tosk" />
+	<iso_639_3_entry
+		id="alt"
+		part2_code="alt"
+		scope="I"
+		type="L"
+		name="Altai; Southern" />
+	<iso_639_3_entry
+		id="alu"
+		scope="I"
+		type="L"
+		name="'Are'are" />
+	<iso_639_3_entry
+		id="alw"
+		scope="I"
+		type="L"
+		name="Alaba-K’abeena" />
+	<iso_639_3_entry
+		id="alx"
+		scope="I"
+		type="L"
+		name="Amol" />
+	<iso_639_3_entry
+		id="aly"
+		scope="I"
+		type="L"
+		name="Alyawarr" />
+	<iso_639_3_entry
+		id="alz"
+		scope="I"
+		type="L"
+		name="Alur" />
+	<iso_639_3_entry
+		id="ama"
+		scope="I"
+		type="E"
+		name="Amanayé" />
+	<iso_639_3_entry
+		id="amb"
+		scope="I"
+		type="L"
+		name="Ambo" />
+	<iso_639_3_entry
+		id="amc"
+		scope="I"
+		type="L"
+		name="Amahuaca" />
+	<iso_639_3_entry
+		id="ame"
+		scope="I"
+		type="L"
+		name="Yanesha'" />
+	<iso_639_3_entry
+		id="amf"
+		scope="I"
+		type="L"
+		name="Hamer-Banna" />
+	<iso_639_3_entry
+		id="amg"
+		scope="I"
+		type="L"
+		name="Amarag" />
+	<iso_639_3_entry
+		id="amh"
+		part1_code="am"
+		part2_code="amh"
+		scope="I"
+		type="L"
+		name="Amharic" />
+	<iso_639_3_entry
+		id="ami"
+		scope="I"
+		type="L"
+		name="Amis" />
+	<iso_639_3_entry
+		id="amj"
+		scope="I"
+		type="L"
+		name="Amdang" />
+	<iso_639_3_entry
+		id="amk"
+		scope="I"
+		type="L"
+		name="Ambai" />
+	<iso_639_3_entry
+		id="aml"
+		scope="I"
+		type="L"
+		name="War-Jaintia" />
+	<iso_639_3_entry
+		id="amm"
+		scope="I"
+		type="L"
+		name="Ama (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="amn"
+		scope="I"
+		type="L"
+		name="Amanab" />
+	<iso_639_3_entry
+		id="amo"
+		scope="I"
+		type="L"
+		name="Amo" />
+	<iso_639_3_entry
+		id="amp"
+		scope="I"
+		type="L"
+		name="Alamblak" />
+	<iso_639_3_entry
+		id="amq"
+		scope="I"
+		type="L"
+		name="Amahai" />
+	<iso_639_3_entry
+		id="amr"
+		scope="I"
+		type="L"
+		name="Amarakaeri" />
+	<iso_639_3_entry
+		id="ams"
+		scope="I"
+		type="L"
+		name="Amami-Oshima; Southern" />
+	<iso_639_3_entry
+		id="amt"
+		scope="I"
+		type="L"
+		name="Amto" />
+	<iso_639_3_entry
+		id="amu"
+		scope="I"
+		type="L"
+		name="Amuzgo; Guerrero" />
+	<iso_639_3_entry
+		id="amv"
+		scope="I"
+		type="L"
+		name="Ambelau" />
+	<iso_639_3_entry
+		id="amw"
+		scope="I"
+		type="L"
+		name="Neo-Aramaic; Western" />
+	<iso_639_3_entry
+		id="amx"
+		scope="I"
+		type="L"
+		name="Anmatyerre" />
+	<iso_639_3_entry
+		id="amy"
+		scope="I"
+		type="L"
+		name="Ami" />
+	<iso_639_3_entry
+		id="amz"
+		scope="I"
+		type="E"
+		name="Atampaya" />
+	<iso_639_3_entry
+		id="ana"
+		scope="I"
+		type="E"
+		name="Andaqui" />
+	<iso_639_3_entry
+		id="anb"
+		scope="I"
+		type="E"
+		name="Andoa" />
+	<iso_639_3_entry
+		id="anc"
+		scope="I"
+		type="L"
+		name="Ngas" />
+	<iso_639_3_entry
+		id="and"
+		scope="I"
+		type="L"
+		name="Ansus" />
+	<iso_639_3_entry
+		id="ane"
+		scope="I"
+		type="L"
+		name="Xârâcùù" />
+	<iso_639_3_entry
+		id="anf"
+		scope="I"
+		type="L"
+		name="Animere" />
+	<iso_639_3_entry
+		id="ang"
+		part2_code="ang"
+		scope="I"
+		type="H"
+		name="English; Old (ca. 450-1100)" />
+	<iso_639_3_entry
+		id="anh"
+		scope="I"
+		type="L"
+		name="Nend" />
+	<iso_639_3_entry
+		id="ani"
+		scope="I"
+		type="L"
+		name="Andi" />
+	<iso_639_3_entry
+		id="anj"
+		scope="I"
+		type="L"
+		name="Anor" />
+	<iso_639_3_entry
+		id="ank"
+		scope="I"
+		type="L"
+		name="Goemai" />
+	<iso_639_3_entry
+		id="anl"
+		scope="I"
+		type="L"
+		name="Anu" />
+	<iso_639_3_entry
+		id="anm"
+		scope="I"
+		type="L"
+		name="Anal" />
+	<iso_639_3_entry
+		id="ann"
+		scope="I"
+		type="L"
+		name="Obolo" />
+	<iso_639_3_entry
+		id="ano"
+		scope="I"
+		type="L"
+		name="Andoque" />
+	<iso_639_3_entry
+		id="anp"
+		part2_code="anp"
+		scope="I"
+		type="L"
+		name="Angika" />
+	<iso_639_3_entry
+		id="anq"
+		scope="I"
+		type="L"
+		name="Jarawa (India)" />
+	<iso_639_3_entry
+		id="anr"
+		scope="I"
+		type="L"
+		name="Andh" />
+	<iso_639_3_entry
+		id="ans"
+		scope="I"
+		type="E"
+		name="Anserma" />
+	<iso_639_3_entry
+		id="ant"
+		scope="I"
+		type="L"
+		name="Antakarinya" />
+	<iso_639_3_entry
+		id="anu"
+		scope="I"
+		type="L"
+		name="Anuak" />
+	<iso_639_3_entry
+		id="anv"
+		scope="I"
+		type="L"
+		name="Denya" />
+	<iso_639_3_entry
+		id="anw"
+		scope="I"
+		type="L"
+		name="Anaang" />
+	<iso_639_3_entry
+		id="anx"
+		scope="I"
+		type="L"
+		name="Andra-Hus" />
+	<iso_639_3_entry
+		id="any"
+		scope="I"
+		type="L"
+		name="Anyin" />
+	<iso_639_3_entry
+		id="anz"
+		scope="I"
+		type="L"
+		name="Anem" />
+	<iso_639_3_entry
+		id="aoa"
+		scope="I"
+		type="L"
+		name="Angolar" />
+	<iso_639_3_entry
+		id="aob"
+		scope="I"
+		type="L"
+		name="Abom" />
+	<iso_639_3_entry
+		id="aoc"
+		scope="I"
+		type="L"
+		name="Pemon" />
+	<iso_639_3_entry
+		id="aod"
+		scope="I"
+		type="L"
+		name="Andarum" />
+	<iso_639_3_entry
+		id="aoe"
+		scope="I"
+		type="L"
+		name="Angal Enen" />
+	<iso_639_3_entry
+		id="aof"
+		scope="I"
+		type="L"
+		name="Bragat" />
+	<iso_639_3_entry
+		id="aog"
+		scope="I"
+		type="L"
+		name="Angoram" />
+	<iso_639_3_entry
+		id="aoh"
+		scope="I"
+		type="E"
+		name="Arma" />
+	<iso_639_3_entry
+		id="aoi"
+		scope="I"
+		type="L"
+		name="Anindilyakwa" />
+	<iso_639_3_entry
+		id="aoj"
+		scope="I"
+		type="L"
+		name="Mufian" />
+	<iso_639_3_entry
+		id="aok"
+		scope="I"
+		type="L"
+		name="Arhö" />
+	<iso_639_3_entry
+		id="aol"
+		scope="I"
+		type="L"
+		name="Alor" />
+	<iso_639_3_entry
+		id="aom"
+		scope="I"
+		type="L"
+		name="Ömie" />
+	<iso_639_3_entry
+		id="aon"
+		scope="I"
+		type="L"
+		name="Arapesh; Bumbita" />
+	<iso_639_3_entry
+		id="aor"
+		scope="I"
+		type="E"
+		name="Aore" />
+	<iso_639_3_entry
+		id="aos"
+		scope="I"
+		type="L"
+		name="Taikat" />
+	<iso_639_3_entry
+		id="aot"
+		scope="I"
+		type="L"
+		name="A'tong" />
+	<iso_639_3_entry
+		id="aox"
+		scope="I"
+		type="L"
+		name="Atorada" />
+	<iso_639_3_entry
+		id="aoz"
+		scope="I"
+		type="L"
+		name="Uab Meto" />
+	<iso_639_3_entry
+		id="apb"
+		scope="I"
+		type="L"
+		name="Sa'a" />
+	<iso_639_3_entry
+		id="apc"
+		scope="I"
+		type="L"
+		name="Arabic; North Levantine" />
+	<iso_639_3_entry
+		id="apd"
+		scope="I"
+		type="L"
+		name="Arabic; Sudanese" />
+	<iso_639_3_entry
+		id="ape"
+		scope="I"
+		type="L"
+		name="Bukiyip" />
+	<iso_639_3_entry
+		id="apf"
+		scope="I"
+		type="L"
+		name="Agta; Pahanan" />
+	<iso_639_3_entry
+		id="apg"
+		scope="I"
+		type="L"
+		name="Ampanang" />
+	<iso_639_3_entry
+		id="aph"
+		scope="I"
+		type="L"
+		name="Athpariya" />
+	<iso_639_3_entry
+		id="api"
+		scope="I"
+		type="L"
+		name="Apiaká" />
+	<iso_639_3_entry
+		id="apj"
+		scope="I"
+		type="L"
+		name="Apache; Jicarilla" />
+	<iso_639_3_entry
+		id="apk"
+		scope="I"
+		type="L"
+		name="Apache; Kiowa" />
+	<iso_639_3_entry
+		id="apl"
+		scope="I"
+		type="L"
+		name="Apache; Lipan" />
+	<iso_639_3_entry
+		id="apm"
+		scope="I"
+		type="L"
+		name="Apache; Mescalero-Chiricahua" />
+	<iso_639_3_entry
+		id="apn"
+		scope="I"
+		type="L"
+		name="Apinayé" />
+	<iso_639_3_entry
+		id="apo"
+		scope="I"
+		type="L"
+		name="Ambul" />
+	<iso_639_3_entry
+		id="app"
+		scope="I"
+		type="L"
+		name="Apma" />
+	<iso_639_3_entry
+		id="apq"
+		scope="I"
+		type="L"
+		name="A-Pucikwar" />
+	<iso_639_3_entry
+		id="apr"
+		scope="I"
+		type="L"
+		name="Arop-Lokep" />
+	<iso_639_3_entry
+		id="aps"
+		scope="I"
+		type="L"
+		name="Arop-Sissano" />
+	<iso_639_3_entry
+		id="apt"
+		scope="I"
+		type="L"
+		name="Apatani" />
+	<iso_639_3_entry
+		id="apu"
+		scope="I"
+		type="L"
+		name="Apurinã" />
+	<iso_639_3_entry
+		id="apv"
+		scope="I"
+		type="E"
+		name="Alapmunte" />
+	<iso_639_3_entry
+		id="apw"
+		scope="I"
+		type="L"
+		name="Apache; Western" />
+	<iso_639_3_entry
+		id="apx"
+		scope="I"
+		type="L"
+		name="Aputai" />
+	<iso_639_3_entry
+		id="apy"
+		scope="I"
+		type="L"
+		name="Apalaí" />
+	<iso_639_3_entry
+		id="apz"
+		scope="I"
+		type="L"
+		name="Safeyoka" />
+	<iso_639_3_entry
+		id="aqc"
+		scope="I"
+		type="L"
+		name="Archi" />
+	<iso_639_3_entry
+		id="aqd"
+		scope="I"
+		type="L"
+		name="Dogon; Ampari" />
+	<iso_639_3_entry
+		id="aqg"
+		scope="I"
+		type="L"
+		name="Arigidi" />
+	<iso_639_3_entry
+		id="aqm"
+		scope="I"
+		type="L"
+		name="Atohwaim" />
+	<iso_639_3_entry
+		id="aqn"
+		scope="I"
+		type="L"
+		name="Alta; Northern" />
+	<iso_639_3_entry
+		id="aqp"
+		scope="I"
+		type="E"
+		name="Atakapa" />
+	<iso_639_3_entry
+		id="aqr"
+		scope="I"
+		type="L"
+		name="Arhâ" />
+	<iso_639_3_entry
+		id="aqz"
+		scope="I"
+		type="L"
+		name="Akuntsu" />
+	<iso_639_3_entry
+		id="ara"
+		part1_code="ar"
+		part2_code="ara"
+		scope="M"
+		type="L"
+		name="Arabic" />
+	<iso_639_3_entry
+		id="arb"
+		scope="I"
+		type="L"
+		name="Arabic; Standard" />
+	<iso_639_3_entry
+		id="arc"
+		part2_code="arc"
+		scope="I"
+		type="A"
+		name="Aramaic; Official (700-300 BCE)" />
+	<iso_639_3_entry
+		id="ard"
+		scope="I"
+		type="E"
+		name="Arabana" />
+	<iso_639_3_entry
+		id="are"
+		scope="I"
+		type="L"
+		name="Arrarnta; Western" />
+	<iso_639_3_entry
+		id="arg"
+		part1_code="an"
+		part2_code="arg"
+		scope="I"
+		type="L"
+		name="Aragonese" />
+	<iso_639_3_entry
+		id="arh"
+		scope="I"
+		type="L"
+		name="Arhuaco" />
+	<iso_639_3_entry
+		id="ari"
+		scope="I"
+		type="L"
+		name="Arikara" />
+	<iso_639_3_entry
+		id="arj"
+		scope="I"
+		type="E"
+		name="Arapaso" />
+	<iso_639_3_entry
+		id="ark"
+		scope="I"
+		type="L"
+		name="Arikapú" />
+	<iso_639_3_entry
+		id="arl"
+		scope="I"
+		type="L"
+		name="Arabela" />
+	<iso_639_3_entry
+		id="arn"
+		part2_code="arn"
+		scope="I"
+		type="L"
+		name="Mapudungun" />
+	<iso_639_3_entry
+		id="aro"
+		scope="I"
+		type="L"
+		name="Araona" />
+	<iso_639_3_entry
+		id="arp"
+		part2_code="arp"
+		scope="I"
+		type="L"
+		name="Arapaho" />
+	<iso_639_3_entry
+		id="arq"
+		scope="I"
+		type="L"
+		name="Arabic; Algerian" />
+	<iso_639_3_entry
+		id="arr"
+		scope="I"
+		type="L"
+		name="Karo (Brazil)" />
+	<iso_639_3_entry
+		id="ars"
+		scope="I"
+		type="L"
+		name="Arabic; Najdi" />
+	<iso_639_3_entry
+		id="aru"
+		scope="I"
+		type="E"
+		name="Aruá (Amazonas State)" />
+	<iso_639_3_entry
+		id="arv"
+		scope="I"
+		type="L"
+		name="Arbore" />
+	<iso_639_3_entry
+		id="arw"
+		part2_code="arw"
+		scope="I"
+		type="L"
+		name="Arawak" />
+	<iso_639_3_entry
+		id="arx"
+		scope="I"
+		type="L"
+		name="Aruá (Rodonia State)" />
+	<iso_639_3_entry
+		id="ary"
+		scope="I"
+		type="L"
+		name="Arabic; Moroccan" />
+	<iso_639_3_entry
+		id="arz"
+		scope="I"
+		type="L"
+		name="Arabic; Egyptian" />
+	<iso_639_3_entry
+		id="asa"
+		scope="I"
+		type="L"
+		name="Asu (Tanzania)" />
+	<iso_639_3_entry
+		id="asb"
+		scope="I"
+		type="L"
+		name="Assiniboine" />
+	<iso_639_3_entry
+		id="asc"
+		scope="I"
+		type="L"
+		name="Asmat; Casuarina Coast" />
+	<iso_639_3_entry
+		id="asd"
+		scope="I"
+		type="L"
+		name="Asas" />
+	<iso_639_3_entry
+		id="ase"
+		scope="I"
+		type="L"
+		name="American Sign Language" />
+	<iso_639_3_entry
+		id="asf"
+		scope="I"
+		type="L"
+		name="Australian Sign Language" />
+	<iso_639_3_entry
+		id="asg"
+		scope="I"
+		type="L"
+		name="Cishingini" />
+	<iso_639_3_entry
+		id="ash"
+		scope="I"
+		type="E"
+		name="Abishira" />
+	<iso_639_3_entry
+		id="asi"
+		scope="I"
+		type="L"
+		name="Buruwai" />
+	<iso_639_3_entry
+		id="asj"
+		scope="I"
+		type="L"
+		name="Nsari" />
+	<iso_639_3_entry
+		id="ask"
+		scope="I"
+		type="L"
+		name="Ashkun" />
+	<iso_639_3_entry
+		id="asl"
+		scope="I"
+		type="L"
+		name="Asilulu" />
+	<iso_639_3_entry
+		id="asm"
+		part1_code="as"
+		part2_code="asm"
+		scope="I"
+		type="L"
+		name="Assamese" />
+	<iso_639_3_entry
+		id="asn"
+		scope="I"
+		type="L"
+		name="Asuriní; Xingú" />
+	<iso_639_3_entry
+		id="aso"
+		scope="I"
+		type="L"
+		name="Dano" />
+	<iso_639_3_entry
+		id="asp"
+		scope="I"
+		type="L"
+		name="Algerian Sign Language" />
+	<iso_639_3_entry
+		id="asq"
+		scope="I"
+		type="L"
+		name="Austrian Sign Language" />
+	<iso_639_3_entry
+		id="asr"
+		scope="I"
+		type="L"
+		name="Asuri" />
+	<iso_639_3_entry
+		id="ass"
+		scope="I"
+		type="L"
+		name="Ipulo" />
+	<iso_639_3_entry
+		id="ast"
+		part2_code="ast"
+		scope="I"
+		type="L"
+		name="Asturian" />
+	<iso_639_3_entry
+		id="asu"
+		scope="I"
+		type="L"
+		name="Asurini; Tocantins" />
+	<iso_639_3_entry
+		id="asv"
+		scope="I"
+		type="L"
+		name="Asoa" />
+	<iso_639_3_entry
+		id="asw"
+		scope="I"
+		type="L"
+		name="Australian Aborigines Sign Language" />
+	<iso_639_3_entry
+		id="asx"
+		scope="I"
+		type="L"
+		name="Muratayak" />
+	<iso_639_3_entry
+		id="asy"
+		scope="I"
+		type="L"
+		name="Asmat; Yaosakor" />
+	<iso_639_3_entry
+		id="asz"
+		scope="I"
+		type="L"
+		name="As" />
+	<iso_639_3_entry
+		id="ata"
+		scope="I"
+		type="L"
+		name="Pele-Ata" />
+	<iso_639_3_entry
+		id="atb"
+		scope="I"
+		type="L"
+		name="Zaiwa" />
+	<iso_639_3_entry
+		id="atc"
+		scope="I"
+		type="E"
+		name="Atsahuaca" />
+	<iso_639_3_entry
+		id="atd"
+		scope="I"
+		type="L"
+		name="Manobo; Ata" />
+	<iso_639_3_entry
+		id="ate"
+		scope="I"
+		type="L"
+		name="Atemble" />
+	<iso_639_3_entry
+		id="atg"
+		scope="I"
+		type="L"
+		name="Ivbie North-Okpela-Arhe" />
+	<iso_639_3_entry
+		id="ati"
+		scope="I"
+		type="L"
+		name="Attié" />
+	<iso_639_3_entry
+		id="atj"
+		scope="I"
+		type="L"
+		name="Atikamekw" />
+	<iso_639_3_entry
+		id="atk"
+		scope="I"
+		type="L"
+		name="Ati" />
+	<iso_639_3_entry
+		id="atl"
+		scope="I"
+		type="L"
+		name="Agta; Mt. Iraya" />
+	<iso_639_3_entry
+		id="atm"
+		scope="I"
+		type="L"
+		name="Ata" />
+	<iso_639_3_entry
+		id="atn"
+		scope="I"
+		type="L"
+		name="Ashtiani" />
+	<iso_639_3_entry
+		id="ato"
+		scope="I"
+		type="L"
+		name="Atong" />
+	<iso_639_3_entry
+		id="atp"
+		scope="I"
+		type="L"
+		name="Atta; Pudtol" />
+	<iso_639_3_entry
+		id="atq"
+		scope="I"
+		type="L"
+		name="Aralle-Tabulahan" />
+	<iso_639_3_entry
+		id="atr"
+		scope="I"
+		type="L"
+		name="Waimiri-Atroari" />
+	<iso_639_3_entry
+		id="ats"
+		scope="I"
+		type="L"
+		name="Gros Ventre" />
+	<iso_639_3_entry
+		id="att"
+		scope="I"
+		type="L"
+		name="Atta; Pamplona" />
+	<iso_639_3_entry
+		id="atu"
+		scope="I"
+		type="L"
+		name="Reel" />
+	<iso_639_3_entry
+		id="atv"
+		scope="I"
+		type="L"
+		name="Altai; Northern" />
+	<iso_639_3_entry
+		id="atw"
+		scope="I"
+		type="L"
+		name="Atsugewi" />
+	<iso_639_3_entry
+		id="atx"
+		scope="I"
+		type="L"
+		name="Arutani" />
+	<iso_639_3_entry
+		id="aty"
+		scope="I"
+		type="L"
+		name="Aneityum" />
+	<iso_639_3_entry
+		id="atz"
+		scope="I"
+		type="L"
+		name="Arta" />
+	<iso_639_3_entry
+		id="aua"
+		scope="I"
+		type="L"
+		name="Asumboa" />
+	<iso_639_3_entry
+		id="aub"
+		scope="I"
+		type="L"
+		name="Alugu" />
+	<iso_639_3_entry
+		id="auc"
+		scope="I"
+		type="L"
+		name="Waorani" />
+	<iso_639_3_entry
+		id="aud"
+		scope="I"
+		type="L"
+		name="Anuta" />
+	<iso_639_3_entry
+		id="aue"
+		scope="I"
+		type="L"
+		name="=/Kx'au//'ein" />
+	<iso_639_3_entry
+		id="aug"
+		scope="I"
+		type="L"
+		name="Aguna" />
+	<iso_639_3_entry
+		id="auh"
+		scope="I"
+		type="L"
+		name="Aushi" />
+	<iso_639_3_entry
+		id="aui"
+		scope="I"
+		type="L"
+		name="Anuki" />
+	<iso_639_3_entry
+		id="auj"
+		scope="I"
+		type="L"
+		name="Awjilah" />
+	<iso_639_3_entry
+		id="auk"
+		scope="I"
+		type="L"
+		name="Heyo" />
+	<iso_639_3_entry
+		id="aul"
+		scope="I"
+		type="L"
+		name="Aulua" />
+	<iso_639_3_entry
+		id="aum"
+		scope="I"
+		type="L"
+		name="Asu (Nigeria)" />
+	<iso_639_3_entry
+		id="aun"
+		scope="I"
+		type="L"
+		name="One; Molmo" />
+	<iso_639_3_entry
+		id="auo"
+		scope="I"
+		type="E"
+		name="Auyokawa" />
+	<iso_639_3_entry
+		id="aup"
+		scope="I"
+		type="L"
+		name="Makayam" />
+	<iso_639_3_entry
+		id="auq"
+		scope="I"
+		type="L"
+		name="Anus" />
+	<iso_639_3_entry
+		id="aur"
+		scope="I"
+		type="L"
+		name="Aruek" />
+	<iso_639_3_entry
+		id="aut"
+		scope="I"
+		type="L"
+		name="Austral" />
+	<iso_639_3_entry
+		id="auu"
+		scope="I"
+		type="L"
+		name="Auye" />
+	<iso_639_3_entry
+		id="auw"
+		scope="I"
+		type="L"
+		name="Awyi" />
+	<iso_639_3_entry
+		id="aux"
+		scope="I"
+		type="E"
+		name="Aurá" />
+	<iso_639_3_entry
+		id="auy"
+		scope="I"
+		type="L"
+		name="Awiyaana" />
+	<iso_639_3_entry
+		id="auz"
+		scope="I"
+		type="L"
+		name="Arabic; Uzbeki" />
+	<iso_639_3_entry
+		id="ava"
+		part1_code="av"
+		part2_code="ava"
+		scope="I"
+		type="L"
+		name="Avaric" />
+	<iso_639_3_entry
+		id="avb"
+		scope="I"
+		type="L"
+		name="Avau" />
+	<iso_639_3_entry
+		id="avd"
+		scope="I"
+		type="L"
+		name="Alviri-Vidari" />
+	<iso_639_3_entry
+		id="ave"
+		part1_code="ae"
+		part2_code="ave"
+		scope="I"
+		type="A"
+		name="Avestan" />
+	<iso_639_3_entry
+		id="avi"
+		scope="I"
+		type="L"
+		name="Avikam" />
+	<iso_639_3_entry
+		id="avk"
+		scope="I"
+		type="C"
+		name="Kotava" />
+	<iso_639_3_entry
+		id="avl"
+		scope="I"
+		type="L"
+		name="Arabic; Eastern Egyptian Bedawi" />
+	<iso_639_3_entry
+		id="avn"
+		scope="I"
+		type="L"
+		name="Avatime" />
+	<iso_639_3_entry
+		id="avo"
+		scope="I"
+		type="E"
+		name="Agavotaguerra" />
+	<iso_639_3_entry
+		id="avs"
+		scope="I"
+		type="E"
+		name="Aushiri" />
+	<iso_639_3_entry
+		id="avt"
+		scope="I"
+		type="L"
+		name="Au" />
+	<iso_639_3_entry
+		id="avu"
+		scope="I"
+		type="L"
+		name="Avokaya" />
+	<iso_639_3_entry
+		id="avv"
+		scope="I"
+		type="L"
+		name="Avá-Canoeiro" />
+	<iso_639_3_entry
+		id="awa"
+		part2_code="awa"
+		scope="I"
+		type="L"
+		name="Awadhi" />
+	<iso_639_3_entry
+		id="awb"
+		scope="I"
+		type="L"
+		name="Awa (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="awc"
+		scope="I"
+		type="L"
+		name="Cicipu" />
+	<iso_639_3_entry
+		id="awe"
+		scope="I"
+		type="L"
+		name="Awetí" />
+	<iso_639_3_entry
+		id="awh"
+		scope="I"
+		type="L"
+		name="Awbono" />
+	<iso_639_3_entry
+		id="awi"
+		scope="I"
+		type="L"
+		name="Aekyom" />
+	<iso_639_3_entry
+		id="awk"
+		scope="I"
+		type="E"
+		name="Awabakal" />
+	<iso_639_3_entry
+		id="awm"
+		scope="I"
+		type="L"
+		name="Arawum" />
+	<iso_639_3_entry
+		id="awn"
+		scope="I"
+		type="L"
+		name="Awngi" />
+	<iso_639_3_entry
+		id="awo"
+		scope="I"
+		type="L"
+		name="Awak" />
+	<iso_639_3_entry
+		id="awr"
+		scope="I"
+		type="L"
+		name="Awera" />
+	<iso_639_3_entry
+		id="aws"
+		scope="I"
+		type="L"
+		name="Awyu; South" />
+	<iso_639_3_entry
+		id="awt"
+		scope="I"
+		type="L"
+		name="Araweté" />
+	<iso_639_3_entry
+		id="awu"
+		scope="I"
+		type="L"
+		name="Awyu; Central" />
+	<iso_639_3_entry
+		id="awv"
+		scope="I"
+		type="L"
+		name="Awyu; Jair" />
+	<iso_639_3_entry
+		id="aww"
+		scope="I"
+		type="L"
+		name="Awun" />
+	<iso_639_3_entry
+		id="awx"
+		scope="I"
+		type="L"
+		name="Awara" />
+	<iso_639_3_entry
+		id="awy"
+		scope="I"
+		type="L"
+		name="Awyu; Edera" />
+	<iso_639_3_entry
+		id="axb"
+		scope="I"
+		type="E"
+		name="Abipon" />
+	<iso_639_3_entry
+		id="axg"
+		scope="I"
+		type="E"
+		name="Arára; Mato Grosso" />
+	<iso_639_3_entry
+		id="axk"
+		scope="I"
+		type="L"
+		name="Yaka (Central African Republic)" />
+	<iso_639_3_entry
+		id="axm"
+		scope="I"
+		type="H"
+		name="Armenian; Middle" />
+	<iso_639_3_entry
+		id="axx"
+		scope="I"
+		type="L"
+		name="Xaragure" />
+	<iso_639_3_entry
+		id="aya"
+		scope="I"
+		type="L"
+		name="Awar" />
+	<iso_639_3_entry
+		id="ayb"
+		scope="I"
+		type="L"
+		name="Gbe; Ayizo" />
+	<iso_639_3_entry
+		id="ayc"
+		scope="I"
+		type="L"
+		name="Aymara; Southern" />
+	<iso_639_3_entry
+		id="ayd"
+		scope="I"
+		type="E"
+		name="Ayabadhu" />
+	<iso_639_3_entry
+		id="aye"
+		scope="I"
+		type="L"
+		name="Ayere" />
+	<iso_639_3_entry
+		id="ayg"
+		scope="I"
+		type="L"
+		name="Ginyanga" />
+	<iso_639_3_entry
+		id="ayh"
+		scope="I"
+		type="L"
+		name="Arabic; Hadrami" />
+	<iso_639_3_entry
+		id="ayi"
+		scope="I"
+		type="L"
+		name="Leyigha" />
+	<iso_639_3_entry
+		id="ayk"
+		scope="I"
+		type="L"
+		name="Akuku" />
+	<iso_639_3_entry
+		id="ayl"
+		scope="I"
+		type="L"
+		name="Arabic; Libyan" />
+	<iso_639_3_entry
+		id="aym"
+		part1_code="ay"
+		part2_code="aym"
+		scope="M"
+		type="L"
+		name="Aymara" />
+	<iso_639_3_entry
+		id="ayn"
+		scope="I"
+		type="L"
+		name="Arabic; Sanaani" />
+	<iso_639_3_entry
+		id="ayo"
+		scope="I"
+		type="L"
+		name="Ayoreo" />
+	<iso_639_3_entry
+		id="ayp"
+		scope="I"
+		type="L"
+		name="Arabic; North Mesopotamian" />
+	<iso_639_3_entry
+		id="ayq"
+		scope="I"
+		type="L"
+		name="Ayi (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="ayr"
+		scope="I"
+		type="L"
+		name="Aymara; Central" />
+	<iso_639_3_entry
+		id="ays"
+		scope="I"
+		type="L"
+		name="Ayta; Sorsogon" />
+	<iso_639_3_entry
+		id="ayt"
+		scope="I"
+		type="L"
+		name="Ayta; Magbukun" />
+	<iso_639_3_entry
+		id="ayu"
+		scope="I"
+		type="L"
+		name="Ayu" />
+	<iso_639_3_entry
+		id="ayy"
+		scope="I"
+		type="E"
+		name="Ayta; Tayabas" />
+	<iso_639_3_entry
+		id="ayz"
+		scope="I"
+		type="L"
+		name="Mai Brat" />
+	<iso_639_3_entry
+		id="aza"
+		scope="I"
+		type="L"
+		name="Azha" />
+	<iso_639_3_entry
+		id="azb"
+		scope="I"
+		type="L"
+		name="Azerbaijani; South" />
+	<iso_639_3_entry
+		id="aze"
+		part1_code="az"
+		part2_code="aze"
+		scope="M"
+		type="L"
+		name="Azerbaijani" />
+	<iso_639_3_entry
+		id="azg"
+		scope="I"
+		type="L"
+		name="Amuzgo; San Pedro Amuzgos" />
+	<iso_639_3_entry
+		id="azj"
+		scope="I"
+		type="L"
+		name="Azerbaijani; North" />
+	<iso_639_3_entry
+		id="azm"
+		scope="I"
+		type="L"
+		name="Amuzgo; Ipalapa" />
+	<iso_639_3_entry
+		id="azo"
+		scope="I"
+		type="L"
+		name="Awing" />
+	<iso_639_3_entry
+		id="azt"
+		scope="I"
+		type="L"
+		name="Atta; Faire" />
+	<iso_639_3_entry
+		id="azz"
+		scope="I"
+		type="L"
+		name="Nahuatl; Highland Puebla" />
+	<iso_639_3_entry
+		id="baa"
+		scope="I"
+		type="L"
+		name="Babatana" />
+	<iso_639_3_entry
+		id="bab"
+		scope="I"
+		type="L"
+		name="Bainouk-Gunyuño" />
+	<iso_639_3_entry
+		id="bac"
+		scope="I"
+		type="L"
+		name="Badui" />
+	<iso_639_3_entry
+		id="bae"
+		scope="I"
+		type="E"
+		name="Baré" />
+	<iso_639_3_entry
+		id="baf"
+		scope="I"
+		type="L"
+		name="Nubaca" />
+	<iso_639_3_entry
+		id="bag"
+		scope="I"
+		type="L"
+		name="Tuki" />
+	<iso_639_3_entry
+		id="bah"
+		scope="I"
+		type="L"
+		name="Creole English; Bahamas" />
+	<iso_639_3_entry
+		id="baj"
+		scope="I"
+		type="L"
+		name="Barakai" />
+	<iso_639_3_entry
+		id="bak"
+		part1_code="ba"
+		part2_code="bak"
+		scope="I"
+		type="L"
+		name="Bashkir" />
+	<iso_639_3_entry
+		id="bal"
+		part2_code="bal"
+		scope="M"
+		type="L"
+		name="Baluchi" />
+	<iso_639_3_entry
+		id="bam"
+		part1_code="bm"
+		part2_code="bam"
+		scope="I"
+		type="L"
+		name="Bambara" />
+	<iso_639_3_entry
+		id="ban"
+		part2_code="ban"
+		scope="I"
+		type="L"
+		name="Balinese" />
+	<iso_639_3_entry
+		id="bao"
+		scope="I"
+		type="L"
+		name="Waimaha" />
+	<iso_639_3_entry
+		id="bap"
+		scope="I"
+		type="L"
+		name="Bantawa" />
+	<iso_639_3_entry
+		id="bar"
+		scope="I"
+		type="L"
+		name="Bavarian" />
+	<iso_639_3_entry
+		id="bas"
+		part2_code="bas"
+		scope="I"
+		type="L"
+		name="Basa (Cameroon)" />
+	<iso_639_3_entry
+		id="bau"
+		scope="I"
+		type="L"
+		name="Bada (Nigeria)" />
+	<iso_639_3_entry
+		id="bav"
+		scope="I"
+		type="L"
+		name="Vengo" />
+	<iso_639_3_entry
+		id="baw"
+		scope="I"
+		type="L"
+		name="Bambili-Bambui" />
+	<iso_639_3_entry
+		id="bax"
+		scope="I"
+		type="L"
+		name="Bamun" />
+	<iso_639_3_entry
+		id="bay"
+		scope="I"
+		type="L"
+		name="Batuley" />
+	<iso_639_3_entry
+		id="baz"
+		scope="I"
+		type="L"
+		name="Tunen" />
+	<iso_639_3_entry
+		id="bba"
+		scope="I"
+		type="L"
+		name="Baatonum" />
+	<iso_639_3_entry
+		id="bbb"
+		scope="I"
+		type="L"
+		name="Barai" />
+	<iso_639_3_entry
+		id="bbc"
+		scope="I"
+		type="L"
+		name="Batak Toba" />
+	<iso_639_3_entry
+		id="bbd"
+		scope="I"
+		type="L"
+		name="Bau" />
+	<iso_639_3_entry
+		id="bbe"
+		scope="I"
+		type="L"
+		name="Bangba" />
+	<iso_639_3_entry
+		id="bbf"
+		scope="I"
+		type="L"
+		name="Baibai" />
+	<iso_639_3_entry
+		id="bbg"
+		scope="I"
+		type="L"
+		name="Barama" />
+	<iso_639_3_entry
+		id="bbh"
+		scope="I"
+		type="L"
+		name="Bugan" />
+	<iso_639_3_entry
+		id="bbi"
+		scope="I"
+		type="L"
+		name="Barombi" />
+	<iso_639_3_entry
+		id="bbj"
+		scope="I"
+		type="L"
+		name="Ghomálá'" />
+	<iso_639_3_entry
+		id="bbk"
+		scope="I"
+		type="L"
+		name="Babanki" />
+	<iso_639_3_entry
+		id="bbl"
+		scope="I"
+		type="L"
+		name="Bats" />
+	<iso_639_3_entry
+		id="bbm"
+		scope="I"
+		type="L"
+		name="Babango" />
+	<iso_639_3_entry
+		id="bbn"
+		scope="I"
+		type="L"
+		name="Uneapa" />
+	<iso_639_3_entry
+		id="bbo"
+		scope="I"
+		type="L"
+		name="Bobo Madaré; Northern" />
+	<iso_639_3_entry
+		id="bbp"
+		scope="I"
+		type="L"
+		name="Banda; West Central" />
+	<iso_639_3_entry
+		id="bbq"
+		scope="I"
+		type="L"
+		name="Bamali" />
+	<iso_639_3_entry
+		id="bbr"
+		scope="I"
+		type="L"
+		name="Girawa" />
+	<iso_639_3_entry
+		id="bbs"
+		scope="I"
+		type="L"
+		name="Bakpinka" />
+	<iso_639_3_entry
+		id="bbt"
+		scope="I"
+		type="L"
+		name="Mburku" />
+	<iso_639_3_entry
+		id="bbu"
+		scope="I"
+		type="L"
+		name="Kulung (Nigeria)" />
+	<iso_639_3_entry
+		id="bbv"
+		scope="I"
+		type="L"
+		name="Karnai" />
+	<iso_639_3_entry
+		id="bbw"
+		scope="I"
+		type="L"
+		name="Baba" />
+	<iso_639_3_entry
+		id="bbx"
+		scope="I"
+		type="L"
+		name="Bubia" />
+	<iso_639_3_entry
+		id="bby"
+		scope="I"
+		type="L"
+		name="Befang" />
+	<iso_639_3_entry
+		id="bbz"
+		scope="I"
+		type="L"
+		name="Creole Arabic; Babalia" />
+	<iso_639_3_entry
+		id="bca"
+		scope="I"
+		type="L"
+		name="Bai; Central" />
+	<iso_639_3_entry
+		id="bcb"
+		scope="I"
+		type="L"
+		name="Bainouk-Samik" />
+	<iso_639_3_entry
+		id="bcc"
+		scope="I"
+		type="L"
+		name="Balochi; Southern" />
+	<iso_639_3_entry
+		id="bcd"
+		scope="I"
+		type="L"
+		name="Babar; North" />
+	<iso_639_3_entry
+		id="bce"
+		scope="I"
+		type="L"
+		name="Bamenyam" />
+	<iso_639_3_entry
+		id="bcf"
+		scope="I"
+		type="L"
+		name="Bamu" />
+	<iso_639_3_entry
+		id="bcg"
+		scope="I"
+		type="L"
+		name="Baga Binari" />
+	<iso_639_3_entry
+		id="bch"
+		scope="I"
+		type="L"
+		name="Bariai" />
+	<iso_639_3_entry
+		id="bci"
+		scope="I"
+		type="L"
+		name="Baoulé" />
+	<iso_639_3_entry
+		id="bcj"
+		scope="I"
+		type="L"
+		name="Bardi" />
+	<iso_639_3_entry
+		id="bck"
+		scope="I"
+		type="L"
+		name="Bunaba" />
+	<iso_639_3_entry
+		id="bcl"
+		scope="I"
+		type="L"
+		name="Bicolano; Central" />
+	<iso_639_3_entry
+		id="bcm"
+		scope="I"
+		type="L"
+		name="Bannoni" />
+	<iso_639_3_entry
+		id="bcn"
+		scope="I"
+		type="L"
+		name="Bali (Nigeria)" />
+	<iso_639_3_entry
+		id="bco"
+		scope="I"
+		type="L"
+		name="Kaluli" />
+	<iso_639_3_entry
+		id="bcp"
+		scope="I"
+		type="L"
+		name="Bali (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="bcq"
+		scope="I"
+		type="L"
+		name="Bench" />
+	<iso_639_3_entry
+		id="bcr"
+		scope="I"
+		type="L"
+		name="Babine" />
+	<iso_639_3_entry
+		id="bcs"
+		scope="I"
+		type="L"
+		name="Kohumono" />
+	<iso_639_3_entry
+		id="bct"
+		scope="I"
+		type="L"
+		name="Bendi" />
+	<iso_639_3_entry
+		id="bcu"
+		scope="I"
+		type="L"
+		name="Awad Bing" />
+	<iso_639_3_entry
+		id="bcv"
+		scope="I"
+		type="L"
+		name="Shoo-Minda-Nye" />
+	<iso_639_3_entry
+		id="bcw"
+		scope="I"
+		type="L"
+		name="Bana" />
+	<iso_639_3_entry
+		id="bcy"
+		scope="I"
+		type="L"
+		name="Bacama" />
+	<iso_639_3_entry
+		id="bcz"
+		scope="I"
+		type="L"
+		name="Bainouk-Gunyaamolo" />
+	<iso_639_3_entry
+		id="bda"
+		scope="I"
+		type="L"
+		name="Bayot" />
+	<iso_639_3_entry
+		id="bdb"
+		scope="I"
+		type="L"
+		name="Basap" />
+	<iso_639_3_entry
+		id="bdc"
+		scope="I"
+		type="L"
+		name="Emberá-Baudó" />
+	<iso_639_3_entry
+		id="bdd"
+		scope="I"
+		type="L"
+		name="Bunama" />
+	<iso_639_3_entry
+		id="bde"
+		scope="I"
+		type="L"
+		name="Bade" />
+	<iso_639_3_entry
+		id="bdf"
+		scope="I"
+		type="L"
+		name="Biage" />
+	<iso_639_3_entry
+		id="bdg"
+		scope="I"
+		type="L"
+		name="Bonggi" />
+	<iso_639_3_entry
+		id="bdh"
+		scope="I"
+		type="L"
+		name="Baka (Sudan)" />
+	<iso_639_3_entry
+		id="bdi"
+		scope="I"
+		type="L"
+		name="Burun" />
+	<iso_639_3_entry
+		id="bdj"
+		scope="I"
+		type="L"
+		name="Bai" />
+	<iso_639_3_entry
+		id="bdk"
+		scope="I"
+		type="L"
+		name="Budukh" />
+	<iso_639_3_entry
+		id="bdl"
+		scope="I"
+		type="L"
+		name="Bajau; Indonesian" />
+	<iso_639_3_entry
+		id="bdm"
+		scope="I"
+		type="L"
+		name="Buduma" />
+	<iso_639_3_entry
+		id="bdn"
+		scope="I"
+		type="L"
+		name="Baldemu" />
+	<iso_639_3_entry
+		id="bdo"
+		scope="I"
+		type="L"
+		name="Morom" />
+	<iso_639_3_entry
+		id="bdp"
+		scope="I"
+		type="L"
+		name="Bende" />
+	<iso_639_3_entry
+		id="bdq"
+		scope="I"
+		type="L"
+		name="Bahnar" />
+	<iso_639_3_entry
+		id="bdr"
+		scope="I"
+		type="L"
+		name="Bajau; West Coast" />
+	<iso_639_3_entry
+		id="bds"
+		scope="I"
+		type="L"
+		name="Burunge" />
+	<iso_639_3_entry
+		id="bdt"
+		scope="I"
+		type="L"
+		name="Bokoto" />
+	<iso_639_3_entry
+		id="bdu"
+		scope="I"
+		type="L"
+		name="Oroko" />
+	<iso_639_3_entry
+		id="bdv"
+		scope="I"
+		type="L"
+		name="Bodo Parja" />
+	<iso_639_3_entry
+		id="bdw"
+		scope="I"
+		type="L"
+		name="Baham" />
+	<iso_639_3_entry
+		id="bdx"
+		scope="I"
+		type="L"
+		name="Budong-Budong" />
+	<iso_639_3_entry
+		id="bdy"
+		scope="I"
+		type="L"
+		name="Bandjalang" />
+	<iso_639_3_entry
+		id="bdz"
+		scope="I"
+		type="L"
+		name="Badeshi" />
+	<iso_639_3_entry
+		id="bea"
+		scope="I"
+		type="L"
+		name="Beaver" />
+	<iso_639_3_entry
+		id="beb"
+		scope="I"
+		type="L"
+		name="Bebele" />
+	<iso_639_3_entry
+		id="bec"
+		scope="I"
+		type="L"
+		name="Iceve-Maci" />
+	<iso_639_3_entry
+		id="bed"
+		scope="I"
+		type="L"
+		name="Bedoanas" />
+	<iso_639_3_entry
+		id="bee"
+		scope="I"
+		type="L"
+		name="Byangsi" />
+	<iso_639_3_entry
+		id="bef"
+		scope="I"
+		type="L"
+		name="Benabena" />
+	<iso_639_3_entry
+		id="beg"
+		scope="I"
+		type="L"
+		name="Belait" />
+	<iso_639_3_entry
+		id="beh"
+		scope="I"
+		type="L"
+		name="Biali" />
+	<iso_639_3_entry
+		id="bei"
+		scope="I"
+		type="L"
+		name="Bekati'" />
+	<iso_639_3_entry
+		id="bej"
+		part2_code="bej"
+		scope="I"
+		type="L"
+		name="Beja" />
+	<iso_639_3_entry
+		id="bek"
+		scope="I"
+		type="L"
+		name="Bebeli" />
+	<iso_639_3_entry
+		id="bel"
+		part1_code="be"
+		part2_code="bel"
+		scope="I"
+		type="L"
+		name="Belarusian" />
+	<iso_639_3_entry
+		id="bem"
+		part2_code="bem"
+		scope="I"
+		type="L"
+		name="Bemba (Zambia)" />
+	<iso_639_3_entry
+		id="ben"
+		part1_code="bn"
+		part2_code="ben"
+		scope="I"
+		type="L"
+		name="Bengali" />
+	<iso_639_3_entry
+		id="beo"
+		scope="I"
+		type="L"
+		name="Beami" />
+	<iso_639_3_entry
+		id="bep"
+		scope="I"
+		type="L"
+		name="Besoa" />
+	<iso_639_3_entry
+		id="beq"
+		scope="I"
+		type="L"
+		name="Beembe" />
+	<iso_639_3_entry
+		id="bes"
+		scope="I"
+		type="L"
+		name="Besme" />
+	<iso_639_3_entry
+		id="bet"
+		scope="I"
+		type="L"
+		name="Béte; Guiberoua" />
+	<iso_639_3_entry
+		id="beu"
+		scope="I"
+		type="L"
+		name="Blagar" />
+	<iso_639_3_entry
+		id="bev"
+		scope="I"
+		type="L"
+		name="Bété; Daloa" />
+	<iso_639_3_entry
+		id="bew"
+		scope="I"
+		type="L"
+		name="Betawi" />
+	<iso_639_3_entry
+		id="bex"
+		scope="I"
+		type="L"
+		name="Jur Modo" />
+	<iso_639_3_entry
+		id="bey"
+		scope="I"
+		type="L"
+		name="Beli (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="bez"
+		scope="I"
+		type="L"
+		name="Bena (Tanzania)" />
+	<iso_639_3_entry
+		id="bfa"
+		scope="I"
+		type="L"
+		name="Bari" />
+	<iso_639_3_entry
+		id="bfb"
+		scope="I"
+		type="L"
+		name="Bareli; Pauri" />
+	<iso_639_3_entry
+		id="bfc"
+		scope="I"
+		type="L"
+		name="Bai; Northern" />
+	<iso_639_3_entry
+		id="bfd"
+		scope="I"
+		type="L"
+		name="Bafut" />
+	<iso_639_3_entry
+		id="bfe"
+		scope="I"
+		type="L"
+		name="Betaf" />
+	<iso_639_3_entry
+		id="bff"
+		scope="I"
+		type="L"
+		name="Bofi" />
+	<iso_639_3_entry
+		id="bfg"
+		scope="I"
+		type="L"
+		name="Kayan; Busang" />
+	<iso_639_3_entry
+		id="bfh"
+		scope="I"
+		type="L"
+		name="Blafe" />
+	<iso_639_3_entry
+		id="bfi"
+		scope="I"
+		type="L"
+		name="British Sign Language" />
+	<iso_639_3_entry
+		id="bfj"
+		scope="I"
+		type="L"
+		name="Bafanji" />
+	<iso_639_3_entry
+		id="bfk"
+		scope="I"
+		type="L"
+		name="Ban Khor Sign Language" />
+	<iso_639_3_entry
+		id="bfl"
+		scope="I"
+		type="L"
+		name="Banda-Ndélé" />
+	<iso_639_3_entry
+		id="bfm"
+		scope="I"
+		type="L"
+		name="Mmen" />
+	<iso_639_3_entry
+		id="bfn"
+		scope="I"
+		type="L"
+		name="Bunak" />
+	<iso_639_3_entry
+		id="bfo"
+		scope="I"
+		type="L"
+		name="Birifor; Malba" />
+	<iso_639_3_entry
+		id="bfp"
+		scope="I"
+		type="L"
+		name="Beba" />
+	<iso_639_3_entry
+		id="bfq"
+		scope="I"
+		type="L"
+		name="Badaga" />
+	<iso_639_3_entry
+		id="bfr"
+		scope="I"
+		type="L"
+		name="Bazigar" />
+	<iso_639_3_entry
+		id="bfs"
+		scope="I"
+		type="L"
+		name="Bai; Southern" />
+	<iso_639_3_entry
+		id="bft"
+		scope="I"
+		type="L"
+		name="Balti" />
+	<iso_639_3_entry
+		id="bfu"
+		scope="I"
+		type="L"
+		name="Gahri" />
+	<iso_639_3_entry
+		id="bfw"
+		scope="I"
+		type="L"
+		name="Bondo" />
+	<iso_639_3_entry
+		id="bfx"
+		scope="I"
+		type="L"
+		name="Bantayanon" />
+	<iso_639_3_entry
+		id="bfy"
+		scope="I"
+		type="L"
+		name="Bagheli" />
+	<iso_639_3_entry
+		id="bfz"
+		scope="I"
+		type="L"
+		name="Pahari; Mahasu" />
+	<iso_639_3_entry
+		id="bga"
+		scope="I"
+		type="L"
+		name="Gwamhi-Wuri" />
+	<iso_639_3_entry
+		id="bgb"
+		scope="I"
+		type="L"
+		name="Bobongko" />
+	<iso_639_3_entry
+		id="bgc"
+		scope="I"
+		type="L"
+		name="Haryanvi" />
+	<iso_639_3_entry
+		id="bgd"
+		scope="I"
+		type="L"
+		name="Bareli; Rathwi" />
+	<iso_639_3_entry
+		id="bge"
+		scope="I"
+		type="L"
+		name="Bauria" />
+	<iso_639_3_entry
+		id="bgf"
+		scope="I"
+		type="L"
+		name="Bangandu" />
+	<iso_639_3_entry
+		id="bgg"
+		scope="I"
+		type="L"
+		name="Bugun" />
+	<iso_639_3_entry
+		id="bgi"
+		scope="I"
+		type="L"
+		name="Giangan" />
+	<iso_639_3_entry
+		id="bgj"
+		scope="I"
+		type="L"
+		name="Bangolan" />
+	<iso_639_3_entry
+		id="bgk"
+		scope="I"
+		type="L"
+		name="Bit" />
+	<iso_639_3_entry
+		id="bgl"
+		scope="I"
+		type="L"
+		name="Bo (Laos)" />
+	<iso_639_3_entry
+		id="bgm"
+		scope="I"
+		type="L"
+		name="Baga Mboteni" />
+	<iso_639_3_entry
+		id="bgn"
+		scope="I"
+		type="L"
+		name="Balochi; Western" />
+	<iso_639_3_entry
+		id="bgo"
+		scope="I"
+		type="L"
+		name="Baga Koga" />
+	<iso_639_3_entry
+		id="bgp"
+		scope="I"
+		type="L"
+		name="Balochi; Eastern" />
+	<iso_639_3_entry
+		id="bgq"
+		scope="I"
+		type="L"
+		name="Bagri" />
+	<iso_639_3_entry
+		id="bgr"
+		scope="I"
+		type="L"
+		name="Chin; Bawm" />
+	<iso_639_3_entry
+		id="bgs"
+		scope="I"
+		type="L"
+		name="Tagabawa" />
+	<iso_639_3_entry
+		id="bgt"
+		scope="I"
+		type="L"
+		name="Bughotu" />
+	<iso_639_3_entry
+		id="bgu"
+		scope="I"
+		type="L"
+		name="Mbongno" />
+	<iso_639_3_entry
+		id="bgv"
+		scope="I"
+		type="L"
+		name="Warkay-Bipim" />
+	<iso_639_3_entry
+		id="bgw"
+		scope="I"
+		type="L"
+		name="Bhatri" />
+	<iso_639_3_entry
+		id="bgx"
+		scope="I"
+		type="L"
+		name="Turkish; Balkan Gagauz" />
+	<iso_639_3_entry
+		id="bgy"
+		scope="I"
+		type="L"
+		name="Benggoi" />
+	<iso_639_3_entry
+		id="bgz"
+		scope="I"
+		type="L"
+		name="Banggai" />
+	<iso_639_3_entry
+		id="bha"
+		scope="I"
+		type="L"
+		name="Bharia" />
+	<iso_639_3_entry
+		id="bhb"
+		scope="I"
+		type="L"
+		name="Bhili" />
+	<iso_639_3_entry
+		id="bhc"
+		scope="I"
+		type="L"
+		name="Biga" />
+	<iso_639_3_entry
+		id="bhd"
+		scope="I"
+		type="L"
+		name="Bhadrawahi" />
+	<iso_639_3_entry
+		id="bhe"
+		scope="I"
+		type="L"
+		name="Bhaya" />
+	<iso_639_3_entry
+		id="bhf"
+		scope="I"
+		type="L"
+		name="Odiai" />
+	<iso_639_3_entry
+		id="bhg"
+		scope="I"
+		type="L"
+		name="Binandere" />
+	<iso_639_3_entry
+		id="bhh"
+		scope="I"
+		type="L"
+		name="Bukharic" />
+	<iso_639_3_entry
+		id="bhi"
+		scope="I"
+		type="L"
+		name="Bhilali" />
+	<iso_639_3_entry
+		id="bhj"
+		scope="I"
+		type="L"
+		name="Bahing" />
+	<iso_639_3_entry
+		id="bhl"
+		scope="I"
+		type="L"
+		name="Bimin" />
+	<iso_639_3_entry
+		id="bhm"
+		scope="I"
+		type="L"
+		name="Bathari" />
+	<iso_639_3_entry
+		id="bhn"
+		scope="I"
+		type="L"
+		name="Neo-Aramaic; Bohtan" />
+	<iso_639_3_entry
+		id="bho"
+		part2_code="bho"
+		scope="I"
+		type="L"
+		name="Bhojpuri" />
+	<iso_639_3_entry
+		id="bhp"
+		scope="I"
+		type="L"
+		name="Bima" />
+	<iso_639_3_entry
+		id="bhq"
+		scope="I"
+		type="L"
+		name="Tukang Besi South" />
+	<iso_639_3_entry
+		id="bhr"
+		scope="I"
+		type="L"
+		name="Malagasy; Bara" />
+	<iso_639_3_entry
+		id="bhs"
+		scope="I"
+		type="L"
+		name="Buwal" />
+	<iso_639_3_entry
+		id="bht"
+		scope="I"
+		type="L"
+		name="Bhattiyali" />
+	<iso_639_3_entry
+		id="bhu"
+		scope="I"
+		type="L"
+		name="Bhunjia" />
+	<iso_639_3_entry
+		id="bhv"
+		scope="I"
+		type="L"
+		name="Bahau" />
+	<iso_639_3_entry
+		id="bhw"
+		scope="I"
+		type="L"
+		name="Biak" />
+	<iso_639_3_entry
+		id="bhx"
+		scope="I"
+		type="L"
+		name="Bhalay" />
+	<iso_639_3_entry
+		id="bhy"
+		scope="I"
+		type="L"
+		name="Bhele" />
+	<iso_639_3_entry
+		id="bhz"
+		scope="I"
+		type="L"
+		name="Bada (Indonesia)" />
+	<iso_639_3_entry
+		id="bia"
+		scope="I"
+		type="L"
+		name="Badimaya" />
+	<iso_639_3_entry
+		id="bib"
+		scope="I"
+		type="L"
+		name="Bissa" />
+	<iso_639_3_entry
+		id="bic"
+		scope="I"
+		type="L"
+		name="Bikaru" />
+	<iso_639_3_entry
+		id="bid"
+		scope="I"
+		type="L"
+		name="Bidiyo" />
+	<iso_639_3_entry
+		id="bie"
+		scope="I"
+		type="L"
+		name="Bepour" />
+	<iso_639_3_entry
+		id="bif"
+		scope="I"
+		type="L"
+		name="Biafada" />
+	<iso_639_3_entry
+		id="big"
+		scope="I"
+		type="L"
+		name="Biangai" />
+	<iso_639_3_entry
+		id="bij"
+		scope="I"
+		type="L"
+		name="Vaghat-Ya-Bijim-Legeri" />
+	<iso_639_3_entry
+		id="bik"
+		part2_code="bik"
+		scope="M"
+		type="L"
+		name="Bikol" />
+	<iso_639_3_entry
+		id="bil"
+		scope="I"
+		type="L"
+		name="Bile" />
+	<iso_639_3_entry
+		id="bim"
+		scope="I"
+		type="L"
+		name="Bimoba" />
+	<iso_639_3_entry
+		id="bin"
+		part2_code="bin"
+		scope="I"
+		type="L"
+		name="Bini" />
+	<iso_639_3_entry
+		id="bio"
+		scope="I"
+		type="L"
+		name="Nai" />
+	<iso_639_3_entry
+		id="bip"
+		scope="I"
+		type="L"
+		name="Bila" />
+	<iso_639_3_entry
+		id="biq"
+		scope="I"
+		type="L"
+		name="Bipi" />
+	<iso_639_3_entry
+		id="bir"
+		scope="I"
+		type="L"
+		name="Bisorio" />
+	<iso_639_3_entry
+		id="bis"
+		part1_code="bi"
+		part2_code="bis"
+		scope="I"
+		type="L"
+		name="Bislama" />
+	<iso_639_3_entry
+		id="bit"
+		scope="I"
+		type="L"
+		name="Berinomo" />
+	<iso_639_3_entry
+		id="biu"
+		scope="I"
+		type="L"
+		name="Biete" />
+	<iso_639_3_entry
+		id="biv"
+		scope="I"
+		type="L"
+		name="Birifor; Southern" />
+	<iso_639_3_entry
+		id="biw"
+		scope="I"
+		type="L"
+		name="Kol (Cameroon)" />
+	<iso_639_3_entry
+		id="bix"
+		scope="I"
+		type="L"
+		name="Bijori" />
+	<iso_639_3_entry
+		id="biy"
+		scope="I"
+		type="L"
+		name="Birhor" />
+	<iso_639_3_entry
+		id="biz"
+		scope="I"
+		type="L"
+		name="Baloi" />
+	<iso_639_3_entry
+		id="bja"
+		scope="I"
+		type="L"
+		name="Budza" />
+	<iso_639_3_entry
+		id="bjb"
+		scope="I"
+		type="E"
+		name="Banggarla" />
+	<iso_639_3_entry
+		id="bjc"
+		scope="I"
+		type="L"
+		name="Bariji" />
+	<iso_639_3_entry
+		id="bjd"
+		scope="I"
+		type="L"
+		name="Bandjigali" />
+	<iso_639_3_entry
+		id="bje"
+		scope="I"
+		type="L"
+		name="Mien; Biao-Jiao" />
+	<iso_639_3_entry
+		id="bjf"
+		scope="I"
+		type="L"
+		name="Neo-Aramaic; Barzani Jewish" />
+	<iso_639_3_entry
+		id="bjg"
+		scope="I"
+		type="L"
+		name="Bidyogo" />
+	<iso_639_3_entry
+		id="bjh"
+		scope="I"
+		type="L"
+		name="Bahinemo" />
+	<iso_639_3_entry
+		id="bji"
+		scope="I"
+		type="L"
+		name="Burji" />
+	<iso_639_3_entry
+		id="bjj"
+		scope="I"
+		type="L"
+		name="Kanauji" />
+	<iso_639_3_entry
+		id="bjk"
+		scope="I"
+		type="L"
+		name="Barok" />
+	<iso_639_3_entry
+		id="bjl"
+		scope="I"
+		type="L"
+		name="Bulu (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="bjm"
+		scope="I"
+		type="L"
+		name="Bajelani" />
+	<iso_639_3_entry
+		id="bjn"
+		scope="I"
+		type="L"
+		name="Banjar" />
+	<iso_639_3_entry
+		id="bjo"
+		scope="I"
+		type="L"
+		name="Banda; Mid-Southern" />
+	<iso_639_3_entry
+		id="bjr"
+		scope="I"
+		type="L"
+		name="Binumarien" />
+	<iso_639_3_entry
+		id="bjs"
+		scope="I"
+		type="L"
+		name="Bajan" />
+	<iso_639_3_entry
+		id="bjt"
+		scope="I"
+		type="L"
+		name="Balanta-Ganja" />
+	<iso_639_3_entry
+		id="bju"
+		scope="I"
+		type="L"
+		name="Busuu" />
+	<iso_639_3_entry
+		id="bjv"
+		scope="I"
+		type="L"
+		name="Bedjond" />
+	<iso_639_3_entry
+		id="bjw"
+		scope="I"
+		type="L"
+		name="Bakwé" />
+	<iso_639_3_entry
+		id="bjx"
+		scope="I"
+		type="L"
+		name="Itneg; Banao" />
+	<iso_639_3_entry
+		id="bjy"
+		scope="I"
+		type="E"
+		name="Bayali" />
+	<iso_639_3_entry
+		id="bjz"
+		scope="I"
+		type="L"
+		name="Baruga" />
+	<iso_639_3_entry
+		id="bka"
+		scope="I"
+		type="L"
+		name="Kyak" />
+	<iso_639_3_entry
+		id="bkc"
+		scope="I"
+		type="L"
+		name="Baka (Cameroon)" />
+	<iso_639_3_entry
+		id="bkd"
+		scope="I"
+		type="L"
+		name="Binukid" />
+	<iso_639_3_entry
+		id="bkf"
+		scope="I"
+		type="L"
+		name="Beeke" />
+	<iso_639_3_entry
+		id="bkg"
+		scope="I"
+		type="L"
+		name="Buraka" />
+	<iso_639_3_entry
+		id="bkh"
+		scope="I"
+		type="L"
+		name="Bakoko" />
+	<iso_639_3_entry
+		id="bki"
+		scope="I"
+		type="L"
+		name="Baki" />
+	<iso_639_3_entry
+		id="bkj"
+		scope="I"
+		type="L"
+		name="Pande" />
+	<iso_639_3_entry
+		id="bkk"
+		scope="I"
+		type="L"
+		name="Brokskat" />
+	<iso_639_3_entry
+		id="bkl"
+		scope="I"
+		type="L"
+		name="Berik" />
+	<iso_639_3_entry
+		id="bkm"
+		scope="I"
+		type="L"
+		name="Kom (Cameroon)" />
+	<iso_639_3_entry
+		id="bkn"
+		scope="I"
+		type="L"
+		name="Bukitan" />
+	<iso_639_3_entry
+		id="bko"
+		scope="I"
+		type="L"
+		name="Kwa'" />
+	<iso_639_3_entry
+		id="bkp"
+		scope="I"
+		type="L"
+		name="Boko (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="bkq"
+		scope="I"
+		type="L"
+		name="Bakairí" />
+	<iso_639_3_entry
+		id="bkr"
+		scope="I"
+		type="L"
+		name="Bakumpai" />
+	<iso_639_3_entry
+		id="bks"
+		scope="I"
+		type="L"
+		name="Sorsoganon; Northern" />
+	<iso_639_3_entry
+		id="bkt"
+		scope="I"
+		type="L"
+		name="Boloki" />
+	<iso_639_3_entry
+		id="bku"
+		scope="I"
+		type="L"
+		name="Buhid" />
+	<iso_639_3_entry
+		id="bkv"
+		scope="I"
+		type="L"
+		name="Bekwarra" />
+	<iso_639_3_entry
+		id="bkw"
+		scope="I"
+		type="L"
+		name="Bekwel" />
+	<iso_639_3_entry
+		id="bkx"
+		scope="I"
+		type="L"
+		name="Baikeno" />
+	<iso_639_3_entry
+		id="bky"
+		scope="I"
+		type="L"
+		name="Bokyi" />
+	<iso_639_3_entry
+		id="bkz"
+		scope="I"
+		type="L"
+		name="Bungku" />
+	<iso_639_3_entry
+		id="bla"
+		part2_code="bla"
+		scope="I"
+		type="L"
+		name="Siksika" />
+	<iso_639_3_entry
+		id="blb"
+		scope="I"
+		type="L"
+		name="Bilua" />
+	<iso_639_3_entry
+		id="blc"
+		scope="I"
+		type="L"
+		name="Bella Coola" />
+	<iso_639_3_entry
+		id="bld"
+		scope="I"
+		type="L"
+		name="Bolango" />
+	<iso_639_3_entry
+		id="ble"
+		scope="I"
+		type="L"
+		name="Balanta-Kentohe" />
+	<iso_639_3_entry
+		id="blf"
+		scope="I"
+		type="L"
+		name="Buol" />
+	<iso_639_3_entry
+		id="blg"
+		scope="I"
+		type="L"
+		name="Balau" />
+	<iso_639_3_entry
+		id="blh"
+		scope="I"
+		type="L"
+		name="Kuwaa" />
+	<iso_639_3_entry
+		id="bli"
+		scope="I"
+		type="L"
+		name="Bolia" />
+	<iso_639_3_entry
+		id="blj"
+		scope="I"
+		type="L"
+		name="Bolongan" />
+	<iso_639_3_entry
+		id="blk"
+		scope="I"
+		type="L"
+		name="Karen; Pa'o" />
+	<iso_639_3_entry
+		id="bll"
+		scope="I"
+		type="E"
+		name="Biloxi" />
+	<iso_639_3_entry
+		id="blm"
+		scope="I"
+		type="L"
+		name="Beli (Sudan)" />
+	<iso_639_3_entry
+		id="bln"
+		scope="I"
+		type="L"
+		name="Bicolano; Southern Catanduanes" />
+	<iso_639_3_entry
+		id="blo"
+		scope="I"
+		type="L"
+		name="Anii" />
+	<iso_639_3_entry
+		id="blp"
+		scope="I"
+		type="L"
+		name="Blablanga" />
+	<iso_639_3_entry
+		id="blq"
+		scope="I"
+		type="L"
+		name="Baluan-Pam" />
+	<iso_639_3_entry
+		id="blr"
+		scope="I"
+		type="L"
+		name="Blang" />
+	<iso_639_3_entry
+		id="bls"
+		scope="I"
+		type="L"
+		name="Balaesang" />
+	<iso_639_3_entry
+		id="blt"
+		scope="I"
+		type="L"
+		name="Tai Dam" />
+	<iso_639_3_entry
+		id="blv"
+		scope="I"
+		type="L"
+		name="Bolo" />
+	<iso_639_3_entry
+		id="blw"
+		scope="I"
+		type="L"
+		name="Balangao" />
+	<iso_639_3_entry
+		id="blx"
+		scope="I"
+		type="L"
+		name="Ayta; Mag-Indi" />
+	<iso_639_3_entry
+		id="bly"
+		scope="I"
+		type="L"
+		name="Notre" />
+	<iso_639_3_entry
+		id="blz"
+		scope="I"
+		type="L"
+		name="Balantak" />
+	<iso_639_3_entry
+		id="bma"
+		scope="I"
+		type="L"
+		name="Lame" />
+	<iso_639_3_entry
+		id="bmb"
+		scope="I"
+		type="L"
+		name="Bembe" />
+	<iso_639_3_entry
+		id="bmc"
+		scope="I"
+		type="L"
+		name="Biem" />
+	<iso_639_3_entry
+		id="bmd"
+		scope="I"
+		type="L"
+		name="Manduri; Baga" />
+	<iso_639_3_entry
+		id="bme"
+		scope="I"
+		type="L"
+		name="Limassa" />
+	<iso_639_3_entry
+		id="bmf"
+		scope="I"
+		type="L"
+		name="Bom" />
+	<iso_639_3_entry
+		id="bmg"
+		scope="I"
+		type="L"
+		name="Bamwe" />
+	<iso_639_3_entry
+		id="bmh"
+		scope="I"
+		type="L"
+		name="Kein" />
+	<iso_639_3_entry
+		id="bmi"
+		scope="I"
+		type="L"
+		name="Bagirmi" />
+	<iso_639_3_entry
+		id="bmj"
+		scope="I"
+		type="L"
+		name="Bote-Majhi" />
+	<iso_639_3_entry
+		id="bmk"
+		scope="I"
+		type="L"
+		name="Ghayavi" />
+	<iso_639_3_entry
+		id="bml"
+		scope="I"
+		type="L"
+		name="Bomboli" />
+	<iso_639_3_entry
+		id="bmm"
+		scope="I"
+		type="L"
+		name="Malagasy; Northern Betsimisaraka" />
+	<iso_639_3_entry
+		id="bmn"
+		scope="I"
+		type="E"
+		name="Bina (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="bmo"
+		scope="I"
+		type="L"
+		name="Bambalang" />
+	<iso_639_3_entry
+		id="bmp"
+		scope="I"
+		type="L"
+		name="Bulgebi" />
+	<iso_639_3_entry
+		id="bmq"
+		scope="I"
+		type="L"
+		name="Bomu" />
+	<iso_639_3_entry
+		id="bmr"
+		scope="I"
+		type="L"
+		name="Muinane" />
+	<iso_639_3_entry
+		id="bms"
+		scope="I"
+		type="L"
+		name="Kanuri; Bilma" />
+	<iso_639_3_entry
+		id="bmt"
+		scope="I"
+		type="L"
+		name="Biao Mon" />
+	<iso_639_3_entry
+		id="bmu"
+		scope="I"
+		type="L"
+		name="Somba-Siawari" />
+	<iso_639_3_entry
+		id="bmv"
+		scope="I"
+		type="L"
+		name="Bum" />
+	<iso_639_3_entry
+		id="bmw"
+		scope="I"
+		type="L"
+		name="Bomwali" />
+	<iso_639_3_entry
+		id="bmx"
+		scope="I"
+		type="L"
+		name="Baimak" />
+	<iso_639_3_entry
+		id="bmy"
+		scope="I"
+		type="L"
+		name="Bemba (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="bmz"
+		scope="I"
+		type="L"
+		name="Baramu" />
+	<iso_639_3_entry
+		id="bna"
+		scope="I"
+		type="L"
+		name="Bonerate" />
+	<iso_639_3_entry
+		id="bnb"
+		scope="I"
+		type="L"
+		name="Bookan" />
+	<iso_639_3_entry
+		id="bnc"
+		scope="M"
+		type="L"
+		name="Bontok" />
+	<iso_639_3_entry
+		id="bnd"
+		scope="I"
+		type="L"
+		name="Banda (Indonesia)" />
+	<iso_639_3_entry
+		id="bne"
+		scope="I"
+		type="L"
+		name="Bintauna" />
+	<iso_639_3_entry
+		id="bnf"
+		scope="I"
+		type="L"
+		name="Masiwang" />
+	<iso_639_3_entry
+		id="bng"
+		scope="I"
+		type="L"
+		name="Benga" />
+	<iso_639_3_entry
+		id="bni"
+		scope="I"
+		type="L"
+		name="Bangi" />
+	<iso_639_3_entry
+		id="bnj"
+		scope="I"
+		type="L"
+		name="Tawbuid; Eastern" />
+	<iso_639_3_entry
+		id="bnk"
+		scope="I"
+		type="L"
+		name="Bierebo" />
+	<iso_639_3_entry
+		id="bnl"
+		scope="I"
+		type="L"
+		name="Boon" />
+	<iso_639_3_entry
+		id="bnm"
+		scope="I"
+		type="L"
+		name="Batanga" />
+	<iso_639_3_entry
+		id="bnn"
+		scope="I"
+		type="L"
+		name="Bunun" />
+	<iso_639_3_entry
+		id="bno"
+		scope="I"
+		type="L"
+		name="Bantoanon" />
+	<iso_639_3_entry
+		id="bnp"
+		scope="I"
+		type="L"
+		name="Bola" />
+	<iso_639_3_entry
+		id="bnq"
+		scope="I"
+		type="L"
+		name="Bantik" />
+	<iso_639_3_entry
+		id="bnr"
+		scope="I"
+		type="L"
+		name="Butmas-Tur" />
+	<iso_639_3_entry
+		id="bns"
+		scope="I"
+		type="L"
+		name="Bundeli" />
+	<iso_639_3_entry
+		id="bnu"
+		scope="I"
+		type="L"
+		name="Bentong" />
+	<iso_639_3_entry
+		id="bnv"
+		scope="I"
+		type="L"
+		name="Bonerif" />
+	<iso_639_3_entry
+		id="bnw"
+		scope="I"
+		type="L"
+		name="Bisis" />
+	<iso_639_3_entry
+		id="bnx"
+		scope="I"
+		type="L"
+		name="Bangubangu" />
+	<iso_639_3_entry
+		id="bny"
+		scope="I"
+		type="L"
+		name="Bintulu" />
+	<iso_639_3_entry
+		id="bnz"
+		scope="I"
+		type="L"
+		name="Beezen" />
+	<iso_639_3_entry
+		id="boa"
+		scope="I"
+		type="L"
+		name="Bora" />
+	<iso_639_3_entry
+		id="bob"
+		scope="I"
+		type="L"
+		name="Aweer" />
+	<iso_639_3_entry
+		id="bod"
+		part1_code="bo"
+		part2_code="tib"
+		scope="I"
+		type="L"
+		name="Tibetan" />
+	<iso_639_3_entry
+		id="boe"
+		scope="I"
+		type="L"
+		name="Mundabli" />
+	<iso_639_3_entry
+		id="bof"
+		scope="I"
+		type="L"
+		name="Bolon" />
+	<iso_639_3_entry
+		id="bog"
+		scope="I"
+		type="L"
+		name="Bamako Sign Language" />
+	<iso_639_3_entry
+		id="boh"
+		scope="I"
+		type="L"
+		name="Boma" />
+	<iso_639_3_entry
+		id="boi"
+		scope="I"
+		type="E"
+		name="Barbareño" />
+	<iso_639_3_entry
+		id="boj"
+		scope="I"
+		type="L"
+		name="Anjam" />
+	<iso_639_3_entry
+		id="bok"
+		scope="I"
+		type="L"
+		name="Bonjo" />
+	<iso_639_3_entry
+		id="bol"
+		scope="I"
+		type="L"
+		name="Bole" />
+	<iso_639_3_entry
+		id="bom"
+		scope="I"
+		type="L"
+		name="Berom" />
+	<iso_639_3_entry
+		id="bon"
+		scope="I"
+		type="L"
+		name="Bine" />
+	<iso_639_3_entry
+		id="boo"
+		scope="I"
+		type="L"
+		name="Bozo; Tiemacèwè" />
+	<iso_639_3_entry
+		id="bop"
+		scope="I"
+		type="L"
+		name="Bonkiman" />
+	<iso_639_3_entry
+		id="boq"
+		scope="I"
+		type="L"
+		name="Bogaya" />
+	<iso_639_3_entry
+		id="bor"
+		scope="I"
+		type="L"
+		name="Borôro" />
+	<iso_639_3_entry
+		id="bos"
+		part1_code="bs"
+		part2_code="bos"
+		scope="I"
+		type="L"
+		name="Bosnian" />
+	<iso_639_3_entry
+		id="bot"
+		scope="I"
+		type="L"
+		name="Bongo" />
+	<iso_639_3_entry
+		id="bou"
+		scope="I"
+		type="L"
+		name="Bondei" />
+	<iso_639_3_entry
+		id="bov"
+		scope="I"
+		type="L"
+		name="Tuwuli" />
+	<iso_639_3_entry
+		id="bow"
+		scope="I"
+		type="E"
+		name="Rema" />
+	<iso_639_3_entry
+		id="box"
+		scope="I"
+		type="L"
+		name="Buamu" />
+	<iso_639_3_entry
+		id="boy"
+		scope="I"
+		type="L"
+		name="Bodo (Central African Republic)" />
+	<iso_639_3_entry
+		id="boz"
+		scope="I"
+		type="L"
+		name="Bozo; Tiéyaxo" />
+	<iso_639_3_entry
+		id="bpa"
+		scope="I"
+		type="L"
+		name="Dakaka" />
+	<iso_639_3_entry
+		id="bpb"
+		scope="I"
+		type="E"
+		name="Barbacoas" />
+	<iso_639_3_entry
+		id="bpd"
+		scope="I"
+		type="L"
+		name="Banda-Banda" />
+	<iso_639_3_entry
+		id="bpg"
+		scope="I"
+		type="L"
+		name="Bonggo" />
+	<iso_639_3_entry
+		id="bph"
+		scope="I"
+		type="L"
+		name="Botlikh" />
+	<iso_639_3_entry
+		id="bpi"
+		scope="I"
+		type="L"
+		name="Bagupi" />
+	<iso_639_3_entry
+		id="bpj"
+		scope="I"
+		type="L"
+		name="Binji" />
+	<iso_639_3_entry
+		id="bpk"
+		scope="I"
+		type="L"
+		name="Orowe" />
+	<iso_639_3_entry
+		id="bpl"
+		scope="I"
+		type="L"
+		name="Broome Pearling Lugger Pidgin" />
+	<iso_639_3_entry
+		id="bpm"
+		scope="I"
+		type="L"
+		name="Biyom" />
+	<iso_639_3_entry
+		id="bpn"
+		scope="I"
+		type="L"
+		name="Dzao Min" />
+	<iso_639_3_entry
+		id="bpo"
+		scope="I"
+		type="L"
+		name="Anasi" />
+	<iso_639_3_entry
+		id="bpp"
+		scope="I"
+		type="L"
+		name="Kaure" />
+	<iso_639_3_entry
+		id="bpq"
+		scope="I"
+		type="L"
+		name="Malay; Banda" />
+	<iso_639_3_entry
+		id="bpr"
+		scope="I"
+		type="L"
+		name="Blaan; Koronadal" />
+	<iso_639_3_entry
+		id="bps"
+		scope="I"
+		type="L"
+		name="Blaan; Sarangani" />
+	<iso_639_3_entry
+		id="bpt"
+		scope="I"
+		type="E"
+		name="Barrow Point" />
+	<iso_639_3_entry
+		id="bpu"
+		scope="I"
+		type="L"
+		name="Bongu" />
+	<iso_639_3_entry
+		id="bpv"
+		scope="I"
+		type="L"
+		name="Marind; Bian" />
+	<iso_639_3_entry
+		id="bpw"
+		scope="I"
+		type="L"
+		name="Bo (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="bpx"
+		scope="I"
+		type="L"
+		name="Bareli; Palya" />
+	<iso_639_3_entry
+		id="bpy"
+		scope="I"
+		type="L"
+		name="Bishnupriya" />
+	<iso_639_3_entry
+		id="bpz"
+		scope="I"
+		type="L"
+		name="Bilba" />
+	<iso_639_3_entry
+		id="bqa"
+		scope="I"
+		type="L"
+		name="Tchumbuli" />
+	<iso_639_3_entry
+		id="bqb"
+		scope="I"
+		type="L"
+		name="Bagusa" />
+	<iso_639_3_entry
+		id="bqc"
+		scope="I"
+		type="L"
+		name="Boko (Benin)" />
+	<iso_639_3_entry
+		id="bqd"
+		scope="I"
+		type="L"
+		name="Bung" />
+	<iso_639_3_entry
+		id="bqf"
+		scope="I"
+		type="E"
+		name="Baga Kaloum" />
+	<iso_639_3_entry
+		id="bqg"
+		scope="I"
+		type="L"
+		name="Bago-Kusuntu" />
+	<iso_639_3_entry
+		id="bqh"
+		scope="I"
+		type="L"
+		name="Baima" />
+	<iso_639_3_entry
+		id="bqi"
+		scope="I"
+		type="L"
+		name="Bakhtiari" />
+	<iso_639_3_entry
+		id="bqj"
+		scope="I"
+		type="L"
+		name="Bandial" />
+	<iso_639_3_entry
+		id="bqk"
+		scope="I"
+		type="L"
+		name="Banda-Mbrès" />
+	<iso_639_3_entry
+		id="bql"
+		scope="I"
+		type="L"
+		name="Bilakura" />
+	<iso_639_3_entry
+		id="bqm"
+		scope="I"
+		type="L"
+		name="Wumboko" />
+	<iso_639_3_entry
+		id="bqn"
+		scope="I"
+		type="L"
+		name="Bulgarian Sign Language" />
+	<iso_639_3_entry
+		id="bqo"
+		scope="I"
+		type="L"
+		name="Balo" />
+	<iso_639_3_entry
+		id="bqp"
+		scope="I"
+		type="L"
+		name="Busa" />
+	<iso_639_3_entry
+		id="bqq"
+		scope="I"
+		type="L"
+		name="Biritai" />
+	<iso_639_3_entry
+		id="bqr"
+		scope="I"
+		type="L"
+		name="Burusu" />
+	<iso_639_3_entry
+		id="bqs"
+		scope="I"
+		type="L"
+		name="Bosngun" />
+	<iso_639_3_entry
+		id="bqt"
+		scope="I"
+		type="L"
+		name="Bamukumbit" />
+	<iso_639_3_entry
+		id="bqu"
+		scope="I"
+		type="L"
+		name="Boguru" />
+	<iso_639_3_entry
+		id="bqv"
+		scope="I"
+		type="L"
+		name="Begbere-Ejar" />
+	<iso_639_3_entry
+		id="bqw"
+		scope="I"
+		type="L"
+		name="Buru (Nigeria)" />
+	<iso_639_3_entry
+		id="bqx"
+		scope="I"
+		type="L"
+		name="Baangi" />
+	<iso_639_3_entry
+		id="bqy"
+		scope="I"
+		type="L"
+		name="Bengkala Sign Language" />
+	<iso_639_3_entry
+		id="bqz"
+		scope="I"
+		type="L"
+		name="Bakaka" />
+	<iso_639_3_entry
+		id="bra"
+		part2_code="bra"
+		scope="I"
+		type="L"
+		name="Braj" />
+	<iso_639_3_entry
+		id="brb"
+		scope="I"
+		type="L"
+		name="Lave" />
+	<iso_639_3_entry
+		id="brc"
+		scope="I"
+		type="E"
+		name="Creole Dutch; Berbice" />
+	<iso_639_3_entry
+		id="brd"
+		scope="I"
+		type="L"
+		name="Baraamu" />
+	<iso_639_3_entry
+		id="bre"
+		part1_code="br"
+		part2_code="bre"
+		scope="I"
+		type="L"
+		name="Breton" />
+	<iso_639_3_entry
+		id="brf"
+		scope="I"
+		type="L"
+		name="Bera" />
+	<iso_639_3_entry
+		id="brg"
+		scope="I"
+		type="L"
+		name="Baure" />
+	<iso_639_3_entry
+		id="brh"
+		scope="I"
+		type="L"
+		name="Brahui" />
+	<iso_639_3_entry
+		id="bri"
+		scope="I"
+		type="L"
+		name="Mokpwe" />
+	<iso_639_3_entry
+		id="brj"
+		scope="I"
+		type="L"
+		name="Bieria" />
+	<iso_639_3_entry
+		id="brk"
+		scope="I"
+		type="E"
+		name="Birked" />
+	<iso_639_3_entry
+		id="brl"
+		scope="I"
+		type="L"
+		name="Birwa" />
+	<iso_639_3_entry
+		id="brm"
+		scope="I"
+		type="L"
+		name="Barambu" />
+	<iso_639_3_entry
+		id="brn"
+		scope="I"
+		type="L"
+		name="Boruca" />
+	<iso_639_3_entry
+		id="bro"
+		scope="I"
+		type="L"
+		name="Brokkat" />
+	<iso_639_3_entry
+		id="brp"
+		scope="I"
+		type="L"
+		name="Barapasi" />
+	<iso_639_3_entry
+		id="brq"
+		scope="I"
+		type="L"
+		name="Breri" />
+	<iso_639_3_entry
+		id="brr"
+		scope="I"
+		type="L"
+		name="Birao" />
+	<iso_639_3_entry
+		id="brs"
+		scope="I"
+		type="L"
+		name="Baras" />
+	<iso_639_3_entry
+		id="brt"
+		scope="I"
+		type="L"
+		name="Bitare" />
+	<iso_639_3_entry
+		id="bru"
+		scope="I"
+		type="L"
+		name="Bru; Eastern" />
+	<iso_639_3_entry
+		id="brv"
+		scope="I"
+		type="L"
+		name="Bru; Western" />
+	<iso_639_3_entry
+		id="brw"
+		scope="I"
+		type="L"
+		name="Bellari" />
+	<iso_639_3_entry
+		id="brx"
+		scope="I"
+		type="L"
+		name="Bodo (India)" />
+	<iso_639_3_entry
+		id="bry"
+		scope="I"
+		type="L"
+		name="Burui" />
+	<iso_639_3_entry
+		id="brz"
+		scope="I"
+		type="L"
+		name="Bilbil" />
+	<iso_639_3_entry
+		id="bsa"
+		scope="I"
+		type="L"
+		name="Abinomn" />
+	<iso_639_3_entry
+		id="bsb"
+		scope="I"
+		type="L"
+		name="Bisaya; Brunei" />
+	<iso_639_3_entry
+		id="bsc"
+		scope="I"
+		type="L"
+		name="Bassari" />
+	<iso_639_3_entry
+		id="bse"
+		scope="I"
+		type="L"
+		name="Wushi" />
+	<iso_639_3_entry
+		id="bsf"
+		scope="I"
+		type="L"
+		name="Bauchi" />
+	<iso_639_3_entry
+		id="bsg"
+		scope="I"
+		type="L"
+		name="Bashkardi" />
+	<iso_639_3_entry
+		id="bsh"
+		scope="I"
+		type="L"
+		name="Kati" />
+	<iso_639_3_entry
+		id="bsi"
+		scope="I"
+		type="L"
+		name="Bassossi" />
+	<iso_639_3_entry
+		id="bsj"
+		scope="I"
+		type="L"
+		name="Bangwinji" />
+	<iso_639_3_entry
+		id="bsk"
+		scope="I"
+		type="L"
+		name="Burushaski" />
+	<iso_639_3_entry
+		id="bsl"
+		scope="I"
+		type="E"
+		name="Basa-Gumna" />
+	<iso_639_3_entry
+		id="bsm"
+		scope="I"
+		type="L"
+		name="Busami" />
+	<iso_639_3_entry
+		id="bsn"
+		scope="I"
+		type="L"
+		name="Barasana-Eduria" />
+	<iso_639_3_entry
+		id="bso"
+		scope="I"
+		type="L"
+		name="Buso" />
+	<iso_639_3_entry
+		id="bsp"
+		scope="I"
+		type="L"
+		name="Baga Sitemu" />
+	<iso_639_3_entry
+		id="bsq"
+		scope="I"
+		type="L"
+		name="Bassa" />
+	<iso_639_3_entry
+		id="bsr"
+		scope="I"
+		type="L"
+		name="Bassa-Kontagora" />
+	<iso_639_3_entry
+		id="bss"
+		scope="I"
+		type="L"
+		name="Akoose" />
+	<iso_639_3_entry
+		id="bst"
+		scope="I"
+		type="L"
+		name="Basketo" />
+	<iso_639_3_entry
+		id="bsu"
+		scope="I"
+		type="L"
+		name="Bahonsuai" />
+	<iso_639_3_entry
+		id="bsv"
+		scope="I"
+		type="E"
+		name="Baga Sobané" />
+	<iso_639_3_entry
+		id="bsw"
+		scope="I"
+		type="L"
+		name="Baiso" />
+	<iso_639_3_entry
+		id="bsx"
+		scope="I"
+		type="L"
+		name="Yangkam" />
+	<iso_639_3_entry
+		id="bsy"
+		scope="I"
+		type="L"
+		name="Bisaya; Sabah" />
+	<iso_639_3_entry
+		id="bta"
+		scope="I"
+		type="L"
+		name="Bata" />
+	<iso_639_3_entry
+		id="btc"
+		scope="I"
+		type="L"
+		name="Bati (Cameroon)" />
+	<iso_639_3_entry
+		id="btd"
+		scope="I"
+		type="L"
+		name="Batak Dairi" />
+	<iso_639_3_entry
+		id="bte"
+		scope="I"
+		type="E"
+		name="Gamo-Ningi" />
+	<iso_639_3_entry
+		id="btf"
+		scope="I"
+		type="L"
+		name="Birgit" />
+	<iso_639_3_entry
+		id="btg"
+		scope="I"
+		type="L"
+		name="Bété; Gagnoa" />
+	<iso_639_3_entry
+		id="bth"
+		scope="I"
+		type="L"
+		name="Bidayuh; Biatah" />
+	<iso_639_3_entry
+		id="bti"
+		scope="I"
+		type="L"
+		name="Burate" />
+	<iso_639_3_entry
+		id="btj"
+		scope="I"
+		type="L"
+		name="Malay; Bacanese" />
+	<iso_639_3_entry
+		id="btl"
+		scope="I"
+		type="L"
+		name="Bhatola" />
+	<iso_639_3_entry
+		id="btm"
+		scope="I"
+		type="L"
+		name="Batak Mandailing" />
+	<iso_639_3_entry
+		id="btn"
+		scope="I"
+		type="L"
+		name="Ratagnon" />
+	<iso_639_3_entry
+		id="bto"
+		scope="I"
+		type="L"
+		name="Bikol; Rinconada" />
+	<iso_639_3_entry
+		id="btp"
+		scope="I"
+		type="L"
+		name="Budibud" />
+	<iso_639_3_entry
+		id="btq"
+		scope="I"
+		type="L"
+		name="Batek" />
+	<iso_639_3_entry
+		id="btr"
+		scope="I"
+		type="L"
+		name="Baetora" />
+	<iso_639_3_entry
+		id="bts"
+		scope="I"
+		type="L"
+		name="Batak Simalungun" />
+	<iso_639_3_entry
+		id="btt"
+		scope="I"
+		type="L"
+		name="Bete-Bendi" />
+	<iso_639_3_entry
+		id="btu"
+		scope="I"
+		type="L"
+		name="Batu" />
+	<iso_639_3_entry
+		id="btv"
+		scope="I"
+		type="L"
+		name="Bateri" />
+	<iso_639_3_entry
+		id="btw"
+		scope="I"
+		type="L"
+		name="Butuanon" />
+	<iso_639_3_entry
+		id="btx"
+		scope="I"
+		type="L"
+		name="Batak Karo" />
+	<iso_639_3_entry
+		id="bty"
+		scope="I"
+		type="L"
+		name="Bobot" />
+	<iso_639_3_entry
+		id="btz"
+		scope="I"
+		type="L"
+		name="Batak Alas-Kluet" />
+	<iso_639_3_entry
+		id="bua"
+		part2_code="bua"
+		scope="M"
+		type="L"
+		name="Buriat" />
+	<iso_639_3_entry
+		id="bub"
+		scope="I"
+		type="L"
+		name="Bua" />
+	<iso_639_3_entry
+		id="buc"
+		scope="I"
+		type="L"
+		name="Bushi" />
+	<iso_639_3_entry
+		id="bud"
+		scope="I"
+		type="L"
+		name="Ntcham" />
+	<iso_639_3_entry
+		id="bue"
+		scope="I"
+		type="E"
+		name="Beothuk" />
+	<iso_639_3_entry
+		id="buf"
+		scope="I"
+		type="L"
+		name="Bushoong" />
+	<iso_639_3_entry
+		id="bug"
+		part2_code="bug"
+		scope="I"
+		type="L"
+		name="Buginese" />
+	<iso_639_3_entry
+		id="buh"
+		scope="I"
+		type="L"
+		name="Bunu; Younuo" />
+	<iso_639_3_entry
+		id="bui"
+		scope="I"
+		type="L"
+		name="Bongili" />
+	<iso_639_3_entry
+		id="buj"
+		scope="I"
+		type="L"
+		name="Basa-Gurmana" />
+	<iso_639_3_entry
+		id="buk"
+		scope="I"
+		type="L"
+		name="Bugawac" />
+	<iso_639_3_entry
+		id="bul"
+		part1_code="bg"
+		part2_code="bul"
+		scope="I"
+		type="L"
+		name="Bulgarian" />
+	<iso_639_3_entry
+		id="bum"
+		scope="I"
+		type="L"
+		name="Bulu (Cameroon)" />
+	<iso_639_3_entry
+		id="bun"
+		scope="I"
+		type="L"
+		name="Sherbro" />
+	<iso_639_3_entry
+		id="buo"
+		scope="I"
+		type="L"
+		name="Terei" />
+	<iso_639_3_entry
+		id="bup"
+		scope="I"
+		type="L"
+		name="Busoa" />
+	<iso_639_3_entry
+		id="buq"
+		scope="I"
+		type="L"
+		name="Brem" />
+	<iso_639_3_entry
+		id="bus"
+		scope="I"
+		type="L"
+		name="Bokobaru" />
+	<iso_639_3_entry
+		id="but"
+		scope="I"
+		type="L"
+		name="Bungain" />
+	<iso_639_3_entry
+		id="buu"
+		scope="I"
+		type="L"
+		name="Budu" />
+	<iso_639_3_entry
+		id="buv"
+		scope="I"
+		type="L"
+		name="Bun" />
+	<iso_639_3_entry
+		id="buw"
+		scope="I"
+		type="L"
+		name="Bubi" />
+	<iso_639_3_entry
+		id="bux"
+		scope="I"
+		type="L"
+		name="Boghom" />
+	<iso_639_3_entry
+		id="buy"
+		scope="I"
+		type="L"
+		name="Bullom So" />
+	<iso_639_3_entry
+		id="buz"
+		scope="I"
+		type="L"
+		name="Bukwen" />
+	<iso_639_3_entry
+		id="bva"
+		scope="I"
+		type="L"
+		name="Barein" />
+	<iso_639_3_entry
+		id="bvb"
+		scope="I"
+		type="L"
+		name="Bube" />
+	<iso_639_3_entry
+		id="bvc"
+		scope="I"
+		type="L"
+		name="Baelelea" />
+	<iso_639_3_entry
+		id="bvd"
+		scope="I"
+		type="L"
+		name="Baeggu" />
+	<iso_639_3_entry
+		id="bve"
+		scope="I"
+		type="L"
+		name="Malay; Berau" />
+	<iso_639_3_entry
+		id="bvf"
+		scope="I"
+		type="L"
+		name="Boor" />
+	<iso_639_3_entry
+		id="bvg"
+		scope="I"
+		type="L"
+		name="Bonkeng" />
+	<iso_639_3_entry
+		id="bvh"
+		scope="I"
+		type="L"
+		name="Bure" />
+	<iso_639_3_entry
+		id="bvi"
+		scope="I"
+		type="L"
+		name="Belanda Viri" />
+	<iso_639_3_entry
+		id="bvj"
+		scope="I"
+		type="L"
+		name="Baan" />
+	<iso_639_3_entry
+		id="bvk"
+		scope="I"
+		type="L"
+		name="Bukat" />
+	<iso_639_3_entry
+		id="bvl"
+		scope="I"
+		type="L"
+		name="Bolivian Sign Language" />
+	<iso_639_3_entry
+		id="bvm"
+		scope="I"
+		type="L"
+		name="Bamunka" />
+	<iso_639_3_entry
+		id="bvn"
+		scope="I"
+		type="L"
+		name="Buna" />
+	<iso_639_3_entry
+		id="bvo"
+		scope="I"
+		type="L"
+		name="Bolgo" />
+	<iso_639_3_entry
+		id="bvq"
+		scope="I"
+		type="L"
+		name="Birri" />
+	<iso_639_3_entry
+		id="bvr"
+		scope="I"
+		type="L"
+		name="Burarra" />
+	<iso_639_3_entry
+		id="bvt"
+		scope="I"
+		type="L"
+		name="Bati (Indonesia)" />
+	<iso_639_3_entry
+		id="bvu"
+		scope="I"
+		type="L"
+		name="Malay; Bukit" />
+	<iso_639_3_entry
+		id="bvv"
+		scope="I"
+		type="E"
+		name="Baniva" />
+	<iso_639_3_entry
+		id="bvw"
+		scope="I"
+		type="L"
+		name="Boga" />
+	<iso_639_3_entry
+		id="bvx"
+		scope="I"
+		type="L"
+		name="Dibole" />
+	<iso_639_3_entry
+		id="bvy"
+		scope="I"
+		type="L"
+		name="Baybayanon" />
+	<iso_639_3_entry
+		id="bvz"
+		scope="I"
+		type="L"
+		name="Bauzi" />
+	<iso_639_3_entry
+		id="bwa"
+		scope="I"
+		type="L"
+		name="Bwatoo" />
+	<iso_639_3_entry
+		id="bwb"
+		scope="I"
+		type="L"
+		name="Namosi-Naitasiri-Serua" />
+	<iso_639_3_entry
+		id="bwc"
+		scope="I"
+		type="L"
+		name="Bwile" />
+	<iso_639_3_entry
+		id="bwd"
+		scope="I"
+		type="L"
+		name="Bwaidoka" />
+	<iso_639_3_entry
+		id="bwe"
+		scope="I"
+		type="L"
+		name="Karen; Bwe" />
+	<iso_639_3_entry
+		id="bwf"
+		scope="I"
+		type="L"
+		name="Boselewa" />
+	<iso_639_3_entry
+		id="bwg"
+		scope="I"
+		type="L"
+		name="Barwe" />
+	<iso_639_3_entry
+		id="bwh"
+		scope="I"
+		type="L"
+		name="Bishuo" />
+	<iso_639_3_entry
+		id="bwi"
+		scope="I"
+		type="L"
+		name="Baniwa" />
+	<iso_639_3_entry
+		id="bwj"
+		scope="I"
+		type="L"
+		name="Bwamu; Láá Láá" />
+	<iso_639_3_entry
+		id="bwk"
+		scope="I"
+		type="L"
+		name="Bauwaki" />
+	<iso_639_3_entry
+		id="bwl"
+		scope="I"
+		type="L"
+		name="Bwela" />
+	<iso_639_3_entry
+		id="bwm"
+		scope="I"
+		type="L"
+		name="Biwat" />
+	<iso_639_3_entry
+		id="bwn"
+		scope="I"
+		type="L"
+		name="Bunu; Wunai" />
+	<iso_639_3_entry
+		id="bwo"
+		scope="I"
+		type="L"
+		name="Boro (Ethiopia)" />
+	<iso_639_3_entry
+		id="bwp"
+		scope="I"
+		type="L"
+		name="Mandobo Bawah" />
+	<iso_639_3_entry
+		id="bwq"
+		scope="I"
+		type="L"
+		name="Bobo Madaré; Southern" />
+	<iso_639_3_entry
+		id="bwr"
+		scope="I"
+		type="L"
+		name="Bura-Pabir" />
+	<iso_639_3_entry
+		id="bws"
+		scope="I"
+		type="L"
+		name="Bomboma" />
+	<iso_639_3_entry
+		id="bwt"
+		scope="I"
+		type="L"
+		name="Bafaw-Balong" />
+	<iso_639_3_entry
+		id="bwu"
+		scope="I"
+		type="L"
+		name="Buli (Ghana)" />
+	<iso_639_3_entry
+		id="bww"
+		scope="I"
+		type="L"
+		name="Bwa" />
+	<iso_639_3_entry
+		id="bwx"
+		scope="I"
+		type="L"
+		name="Bunu; Bu-Nao" />
+	<iso_639_3_entry
+		id="bwy"
+		scope="I"
+		type="L"
+		name="Bwamu; Cwi" />
+	<iso_639_3_entry
+		id="bwz"
+		scope="I"
+		type="L"
+		name="Bwisi" />
+	<iso_639_3_entry
+		id="bxa"
+		scope="I"
+		type="L"
+		name="Bauro" />
+	<iso_639_3_entry
+		id="bxb"
+		scope="I"
+		type="L"
+		name="Bor; Belanda" />
+	<iso_639_3_entry
+		id="bxc"
+		scope="I"
+		type="L"
+		name="Molengue" />
+	<iso_639_3_entry
+		id="bxd"
+		scope="I"
+		type="L"
+		name="Pela" />
+	<iso_639_3_entry
+		id="bxe"
+		scope="I"
+		type="L"
+		name="Birale" />
+	<iso_639_3_entry
+		id="bxf"
+		scope="I"
+		type="L"
+		name="Bilur" />
+	<iso_639_3_entry
+		id="bxg"
+		scope="I"
+		type="L"
+		name="Bangala" />
+	<iso_639_3_entry
+		id="bxh"
+		scope="I"
+		type="L"
+		name="Buhutu" />
+	<iso_639_3_entry
+		id="bxi"
+		scope="I"
+		type="E"
+		name="Pirlatapa" />
+	<iso_639_3_entry
+		id="bxj"
+		scope="I"
+		type="L"
+		name="Bayungu" />
+	<iso_639_3_entry
+		id="bxk"
+		scope="I"
+		type="L"
+		name="Bukusu" />
+	<iso_639_3_entry
+		id="bxl"
+		scope="I"
+		type="L"
+		name="Jalkunan" />
+	<iso_639_3_entry
+		id="bxm"
+		scope="I"
+		type="L"
+		name="Buriat; Mongolia" />
+	<iso_639_3_entry
+		id="bxn"
+		scope="I"
+		type="L"
+		name="Burduna" />
+	<iso_639_3_entry
+		id="bxo"
+		scope="I"
+		type="L"
+		name="Barikanchi" />
+	<iso_639_3_entry
+		id="bxp"
+		scope="I"
+		type="L"
+		name="Bebil" />
+	<iso_639_3_entry
+		id="bxq"
+		scope="I"
+		type="L"
+		name="Beele" />
+	<iso_639_3_entry
+		id="bxr"
+		scope="I"
+		type="L"
+		name="Buriat; Russia" />
+	<iso_639_3_entry
+		id="bxs"
+		scope="I"
+		type="L"
+		name="Busam" />
+	<iso_639_3_entry
+		id="bxu"
+		scope="I"
+		type="L"
+		name="Buriat; China" />
+	<iso_639_3_entry
+		id="bxv"
+		scope="I"
+		type="L"
+		name="Berakou" />
+	<iso_639_3_entry
+		id="bxw"
+		scope="I"
+		type="L"
+		name="Bankagooma" />
+	<iso_639_3_entry
+		id="bxx"
+		scope="I"
+		type="L"
+		name="Borna (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="bxz"
+		scope="I"
+		type="L"
+		name="Binahari" />
+	<iso_639_3_entry
+		id="bya"
+		scope="I"
+		type="L"
+		name="Batak" />
+	<iso_639_3_entry
+		id="byb"
+		scope="I"
+		type="L"
+		name="Bikya" />
+	<iso_639_3_entry
+		id="byc"
+		scope="I"
+		type="L"
+		name="Ubaghara" />
+	<iso_639_3_entry
+		id="byd"
+		scope="I"
+		type="L"
+		name="Benyadu'" />
+	<iso_639_3_entry
+		id="bye"
+		scope="I"
+		type="L"
+		name="Pouye" />
+	<iso_639_3_entry
+		id="byf"
+		scope="I"
+		type="L"
+		name="Bete" />
+	<iso_639_3_entry
+		id="byg"
+		scope="I"
+		type="E"
+		name="Baygo" />
+	<iso_639_3_entry
+		id="byh"
+		scope="I"
+		type="L"
+		name="Bhujel" />
+	<iso_639_3_entry
+		id="byi"
+		scope="I"
+		type="L"
+		name="Buyu" />
+	<iso_639_3_entry
+		id="byj"
+		scope="I"
+		type="L"
+		name="Bina (Nigeria)" />
+	<iso_639_3_entry
+		id="byk"
+		scope="I"
+		type="L"
+		name="Biao" />
+	<iso_639_3_entry
+		id="byl"
+		scope="I"
+		type="L"
+		name="Bayono" />
+	<iso_639_3_entry
+		id="bym"
+		scope="I"
+		type="L"
+		name="Bidyara" />
+	<iso_639_3_entry
+		id="byn"
+		part2_code="byn"
+		scope="I"
+		type="L"
+		name="Bilin" />
+	<iso_639_3_entry
+		id="byo"
+		scope="I"
+		type="L"
+		name="Biyo" />
+	<iso_639_3_entry
+		id="byp"
+		scope="I"
+		type="L"
+		name="Bumaji" />
+	<iso_639_3_entry
+		id="byq"
+		scope="I"
+		type="E"
+		name="Basay" />
+	<iso_639_3_entry
+		id="byr"
+		scope="I"
+		type="L"
+		name="Baruya" />
+	<iso_639_3_entry
+		id="bys"
+		scope="I"
+		type="L"
+		name="Burak" />
+	<iso_639_3_entry
+		id="byt"
+		scope="I"
+		type="E"
+		name="Berti" />
+	<iso_639_3_entry
+		id="byv"
+		scope="I"
+		type="L"
+		name="Medumba" />
+	<iso_639_3_entry
+		id="byw"
+		scope="I"
+		type="L"
+		name="Belhariya" />
+	<iso_639_3_entry
+		id="byx"
+		scope="I"
+		type="L"
+		name="Qaqet" />
+	<iso_639_3_entry
+		id="byy"
+		scope="I"
+		type="L"
+		name="Buya" />
+	<iso_639_3_entry
+		id="byz"
+		scope="I"
+		type="L"
+		name="Banaro" />
+	<iso_639_3_entry
+		id="bza"
+		scope="I"
+		type="L"
+		name="Bandi" />
+	<iso_639_3_entry
+		id="bzb"
+		scope="I"
+		type="L"
+		name="Andio" />
+	<iso_639_3_entry
+		id="bzc"
+		scope="I"
+		type="L"
+		name="Malagasy; Southern Betsimisaraka" />
+	<iso_639_3_entry
+		id="bzd"
+		scope="I"
+		type="L"
+		name="Bribri" />
+	<iso_639_3_entry
+		id="bze"
+		scope="I"
+		type="L"
+		name="Bozo; Jenaama" />
+	<iso_639_3_entry
+		id="bzf"
+		scope="I"
+		type="L"
+		name="Boikin" />
+	<iso_639_3_entry
+		id="bzg"
+		scope="I"
+		type="L"
+		name="Babuza" />
+	<iso_639_3_entry
+		id="bzh"
+		scope="I"
+		type="L"
+		name="Buang; Mapos" />
+	<iso_639_3_entry
+		id="bzi"
+		scope="I"
+		type="L"
+		name="Bisu" />
+	<iso_639_3_entry
+		id="bzj"
+		scope="I"
+		type="L"
+		name="Kriol English; Belize" />
+	<iso_639_3_entry
+		id="bzk"
+		scope="I"
+		type="L"
+		name="Creole English; Nicaragua" />
+	<iso_639_3_entry
+		id="bzl"
+		scope="I"
+		type="L"
+		name="Boano (Sulawesi)" />
+	<iso_639_3_entry
+		id="bzm"
+		scope="I"
+		type="L"
+		name="Bolondo" />
+	<iso_639_3_entry
+		id="bzn"
+		scope="I"
+		type="L"
+		name="Boano (Maluku)" />
+	<iso_639_3_entry
+		id="bzo"
+		scope="I"
+		type="L"
+		name="Bozaba" />
+	<iso_639_3_entry
+		id="bzp"
+		scope="I"
+		type="L"
+		name="Kemberano" />
+	<iso_639_3_entry
+		id="bzq"
+		scope="I"
+		type="L"
+		name="Buli (Indonesia)" />
+	<iso_639_3_entry
+		id="bzr"
+		scope="I"
+		type="E"
+		name="Biri" />
+	<iso_639_3_entry
+		id="bzs"
+		scope="I"
+		type="L"
+		name="Brazilian Sign Language" />
+	<iso_639_3_entry
+		id="bzt"
+		scope="I"
+		type="C"
+		name="Brithenig" />
+	<iso_639_3_entry
+		id="bzu"
+		scope="I"
+		type="L"
+		name="Burmeso" />
+	<iso_639_3_entry
+		id="bzv"
+		scope="I"
+		type="L"
+		name="Bebe" />
+	<iso_639_3_entry
+		id="bzw"
+		scope="I"
+		type="L"
+		name="Basa (Nigeria)" />
+	<iso_639_3_entry
+		id="bzx"
+		scope="I"
+		type="L"
+		name="Bozo; Kɛlɛngaxo" />
+	<iso_639_3_entry
+		id="bzy"
+		scope="I"
+		type="L"
+		name="Obanliku" />
+	<iso_639_3_entry
+		id="bzz"
+		scope="I"
+		type="L"
+		name="Evant" />
+	<iso_639_3_entry
+		id="caa"
+		scope="I"
+		type="L"
+		name="Chortí" />
+	<iso_639_3_entry
+		id="cab"
+		scope="I"
+		type="L"
+		name="Garifuna" />
+	<iso_639_3_entry
+		id="cac"
+		scope="I"
+		type="L"
+		name="Chuj" />
+	<iso_639_3_entry
+		id="cad"
+		part2_code="cad"
+		scope="I"
+		type="L"
+		name="Caddo" />
+	<iso_639_3_entry
+		id="cae"
+		scope="I"
+		type="L"
+		name="Lehar" />
+	<iso_639_3_entry
+		id="caf"
+		scope="I"
+		type="L"
+		name="Carrier; Southern" />
+	<iso_639_3_entry
+		id="cag"
+		scope="I"
+		type="L"
+		name="Nivaclé" />
+	<iso_639_3_entry
+		id="cah"
+		scope="I"
+		type="L"
+		name="Cahuarano" />
+	<iso_639_3_entry
+		id="caj"
+		scope="I"
+		type="E"
+		name="Chané" />
+	<iso_639_3_entry
+		id="cak"
+		scope="I"
+		type="L"
+		name="Kaqchikel" />
+	<iso_639_3_entry
+		id="cal"
+		scope="I"
+		type="L"
+		name="Carolinian" />
+	<iso_639_3_entry
+		id="cam"
+		scope="I"
+		type="L"
+		name="Cemuhî" />
+	<iso_639_3_entry
+		id="can"
+		scope="I"
+		type="L"
+		name="Chambri" />
+	<iso_639_3_entry
+		id="cao"
+		scope="I"
+		type="L"
+		name="Chácobo" />
+	<iso_639_3_entry
+		id="cap"
+		scope="I"
+		type="L"
+		name="Chipaya" />
+	<iso_639_3_entry
+		id="caq"
+		scope="I"
+		type="L"
+		name="Nicobarese; Car" />
+	<iso_639_3_entry
+		id="car"
+		part2_code="car"
+		scope="I"
+		type="L"
+		name="Carib; Galibi" />
+	<iso_639_3_entry
+		id="cas"
+		scope="I"
+		type="L"
+		name="Tsimané" />
+	<iso_639_3_entry
+		id="cat"
+		part1_code="ca"
+		part2_code="cat"
+		scope="I"
+		type="L"
+		name="Catalan" />
+	<iso_639_3_entry
+		id="cav"
+		scope="I"
+		type="L"
+		name="Cavineña" />
+	<iso_639_3_entry
+		id="caw"
+		scope="I"
+		type="L"
+		name="Callawalla" />
+	<iso_639_3_entry
+		id="cax"
+		scope="I"
+		type="L"
+		name="Chiquitano" />
+	<iso_639_3_entry
+		id="cay"
+		scope="I"
+		type="L"
+		name="Cayuga" />
+	<iso_639_3_entry
+		id="caz"
+		scope="I"
+		type="E"
+		name="Canichana" />
+	<iso_639_3_entry
+		id="cbb"
+		scope="I"
+		type="L"
+		name="Cabiyarí" />
+	<iso_639_3_entry
+		id="cbc"
+		scope="I"
+		type="L"
+		name="Carapana" />
+	<iso_639_3_entry
+		id="cbd"
+		scope="I"
+		type="L"
+		name="Carijona" />
+	<iso_639_3_entry
+		id="cbe"
+		scope="I"
+		type="E"
+		name="Chipiajes" />
+	<iso_639_3_entry
+		id="cbg"
+		scope="I"
+		type="L"
+		name="Chimila" />
+	<iso_639_3_entry
+		id="cbh"
+		scope="I"
+		type="E"
+		name="Cagua" />
+	<iso_639_3_entry
+		id="cbi"
+		scope="I"
+		type="L"
+		name="Chachi" />
+	<iso_639_3_entry
+		id="cbj"
+		scope="I"
+		type="L"
+		name="Ede Cabe" />
+	<iso_639_3_entry
+		id="cbk"
+		scope="I"
+		type="L"
+		name="Chavacano" />
+	<iso_639_3_entry
+		id="cbl"
+		scope="I"
+		type="L"
+		name="Chin; Bualkhaw" />
+	<iso_639_3_entry
+		id="cbn"
+		scope="I"
+		type="L"
+		name="Nyahkur" />
+	<iso_639_3_entry
+		id="cbo"
+		scope="I"
+		type="L"
+		name="Izora" />
+	<iso_639_3_entry
+		id="cbr"
+		scope="I"
+		type="L"
+		name="Cashibo-Cacataibo" />
+	<iso_639_3_entry
+		id="cbs"
+		scope="I"
+		type="L"
+		name="Cashinahua" />
+	<iso_639_3_entry
+		id="cbt"
+		scope="I"
+		type="L"
+		name="Chayahuita" />
+	<iso_639_3_entry
+		id="cbu"
+		scope="I"
+		type="L"
+		name="Candoshi-Shapra" />
+	<iso_639_3_entry
+		id="cbv"
+		scope="I"
+		type="L"
+		name="Cacua" />
+	<iso_639_3_entry
+		id="cbw"
+		scope="I"
+		type="L"
+		name="Kinabalian" />
+	<iso_639_3_entry
+		id="cby"
+		scope="I"
+		type="L"
+		name="Carabayo" />
+	<iso_639_3_entry
+		id="cca"
+		scope="I"
+		type="E"
+		name="Cauca" />
+	<iso_639_3_entry
+		id="ccc"
+		scope="I"
+		type="L"
+		name="Chamicuro" />
+	<iso_639_3_entry
+		id="ccd"
+		scope="I"
+		type="L"
+		name="Creole; Cafundo" />
+	<iso_639_3_entry
+		id="cce"
+		scope="I"
+		type="L"
+		name="Chopi" />
+	<iso_639_3_entry
+		id="ccg"
+		scope="I"
+		type="L"
+		name="Daka; Samba" />
+	<iso_639_3_entry
+		id="cch"
+		scope="I"
+		type="L"
+		name="Atsam" />
+	<iso_639_3_entry
+		id="ccj"
+		scope="I"
+		type="L"
+		name="Kasanga" />
+	<iso_639_3_entry
+		id="ccl"
+		scope="I"
+		type="L"
+		name="Cutchi-Swahili" />
+	<iso_639_3_entry
+		id="ccm"
+		scope="I"
+		type="L"
+		name="Creole Malay; Malaccan" />
+	<iso_639_3_entry
+		id="cco"
+		scope="I"
+		type="L"
+		name="Chinantec; Comaltepec" />
+	<iso_639_3_entry
+		id="ccp"
+		scope="I"
+		type="L"
+		name="Chakma" />
+	<iso_639_3_entry
+		id="ccq"
+		scope="I"
+		type="L"
+		name="Chaungtha" />
+	<iso_639_3_entry
+		id="ccr"
+		scope="I"
+		type="E"
+		name="Cacaopera" />
+	<iso_639_3_entry
+		id="cda"
+		scope="I"
+		type="L"
+		name="Choni" />
+	<iso_639_3_entry
+		id="cde"
+		scope="I"
+		type="L"
+		name="Chenchu" />
+	<iso_639_3_entry
+		id="cdf"
+		scope="I"
+		type="L"
+		name="Chiru" />
+	<iso_639_3_entry
+		id="cdg"
+		scope="I"
+		type="L"
+		name="Chamari" />
+	<iso_639_3_entry
+		id="cdh"
+		scope="I"
+		type="L"
+		name="Chambeali" />
+	<iso_639_3_entry
+		id="cdi"
+		scope="I"
+		type="L"
+		name="Chodri" />
+	<iso_639_3_entry
+		id="cdj"
+		scope="I"
+		type="L"
+		name="Churahi" />
+	<iso_639_3_entry
+		id="cdm"
+		scope="I"
+		type="L"
+		name="Chepang" />
+	<iso_639_3_entry
+		id="cdn"
+		scope="I"
+		type="L"
+		name="Chaudangsi" />
+	<iso_639_3_entry
+		id="cdo"
+		scope="I"
+		type="L"
+		name="Chinese; Min Dong" />
+	<iso_639_3_entry
+		id="cdr"
+		scope="I"
+		type="L"
+		name="Cinda-Regi-Tiyal" />
+	<iso_639_3_entry
+		id="cds"
+		scope="I"
+		type="L"
+		name="Chadian Sign Language" />
+	<iso_639_3_entry
+		id="cdy"
+		scope="I"
+		type="L"
+		name="Chadong" />
+	<iso_639_3_entry
+		id="cdz"
+		scope="I"
+		type="L"
+		name="Koda" />
+	<iso_639_3_entry
+		id="cea"
+		scope="I"
+		type="E"
+		name="Chehalis; Lower" />
+	<iso_639_3_entry
+		id="ceb"
+		part2_code="ceb"
+		scope="I"
+		type="L"
+		name="Cebuano" />
+	<iso_639_3_entry
+		id="ceg"
+		scope="I"
+		type="L"
+		name="Chamacoco" />
+	<iso_639_3_entry
+		id="cen"
+		scope="I"
+		type="L"
+		name="Cen" />
+	<iso_639_3_entry
+		id="ces"
+		part1_code="cs"
+		part2_code="cze"
+		scope="I"
+		type="L"
+		name="Czech" />
+	<iso_639_3_entry
+		id="cet"
+		scope="I"
+		type="L"
+		name="Centúúm" />
+	<iso_639_3_entry
+		id="cfa"
+		scope="I"
+		type="L"
+		name="Dijim-Bwilim" />
+	<iso_639_3_entry
+		id="cfd"
+		scope="I"
+		type="L"
+		name="Cara" />
+	<iso_639_3_entry
+		id="cfg"
+		scope="I"
+		type="L"
+		name="Como Karim" />
+	<iso_639_3_entry
+		id="cfm"
+		scope="I"
+		type="L"
+		name="Chin; Falam" />
+	<iso_639_3_entry
+		id="cga"
+		scope="I"
+		type="L"
+		name="Changriwa" />
+	<iso_639_3_entry
+		id="cgc"
+		scope="I"
+		type="L"
+		name="Kagayanen" />
+	<iso_639_3_entry
+		id="cgg"
+		scope="I"
+		type="L"
+		name="Chiga" />
+	<iso_639_3_entry
+		id="cgk"
+		scope="I"
+		type="L"
+		name="Chocangacakha" />
+	<iso_639_3_entry
+		id="cha"
+		part1_code="ch"
+		part2_code="cha"
+		scope="I"
+		type="L"
+		name="Chamorro" />
+	<iso_639_3_entry
+		id="chb"
+		part2_code="chb"
+		scope="I"
+		type="E"
+		name="Chibcha" />
+	<iso_639_3_entry
+		id="chc"
+		scope="I"
+		type="E"
+		name="Catawba" />
+	<iso_639_3_entry
+		id="chd"
+		scope="I"
+		type="L"
+		name="Chontal; Highland Oaxaca" />
+	<iso_639_3_entry
+		id="che"
+		part1_code="ce"
+		part2_code="che"
+		scope="I"
+		type="L"
+		name="Chechen" />
+	<iso_639_3_entry
+		id="chf"
+		scope="I"
+		type="L"
+		name="Chontal; Tabasco" />
+	<iso_639_3_entry
+		id="chg"
+		part2_code="chg"
+		scope="I"
+		type="E"
+		name="Chagatai" />
+	<iso_639_3_entry
+		id="chh"
+		scope="I"
+		type="L"
+		name="Chinook" />
+	<iso_639_3_entry
+		id="chj"
+		scope="I"
+		type="L"
+		name="Chinantec; Ojitlán" />
+	<iso_639_3_entry
+		id="chk"
+		part2_code="chk"
+		scope="I"
+		type="L"
+		name="Chuukese" />
+	<iso_639_3_entry
+		id="chl"
+		scope="I"
+		type="L"
+		name="Cahuilla" />
+	<iso_639_3_entry
+		id="chm"
+		part2_code="chm"
+		scope="M"
+		type="L"
+		name="Mari (Russia)" />
+	<iso_639_3_entry
+		id="chn"
+		part2_code="chn"
+		scope="I"
+		type="L"
+		name="Chinook jargon" />
+	<iso_639_3_entry
+		id="cho"
+		part2_code="cho"
+		scope="I"
+		type="L"
+		name="Choctaw" />
+	<iso_639_3_entry
+		id="chp"
+		part2_code="chp"
+		scope="I"
+		type="L"
+		name="Chipewyan" />
+	<iso_639_3_entry
+		id="chq"
+		scope="I"
+		type="L"
+		name="Chinantec; Quiotepec" />
+	<iso_639_3_entry
+		id="chr"
+		part2_code="chr"
+		scope="I"
+		type="L"
+		name="Cherokee" />
+	<iso_639_3_entry
+		id="cht"
+		scope="I"
+		type="E"
+		name="Cholón" />
+	<iso_639_3_entry
+		id="chu"
+		part1_code="cu"
+		part2_code="chu"
+		scope="I"
+		type="A"
+		name="Slavonic; Old" />
+	<iso_639_3_entry
+		id="chv"
+		part1_code="cv"
+		part2_code="chv"
+		scope="I"
+		type="L"
+		name="Chuvash" />
+	<iso_639_3_entry
+		id="chw"
+		scope="I"
+		type="L"
+		name="Chuwabu" />
+	<iso_639_3_entry
+		id="chx"
+		scope="I"
+		type="L"
+		name="Chantyal" />
+	<iso_639_3_entry
+		id="chy"
+		part2_code="chy"
+		scope="I"
+		type="L"
+		name="Cheyenne" />
+	<iso_639_3_entry
+		id="chz"
+		scope="I"
+		type="L"
+		name="Chinantec; Ozumacín" />
+	<iso_639_3_entry
+		id="cia"
+		scope="I"
+		type="L"
+		name="Cia-Cia" />
+	<iso_639_3_entry
+		id="cib"
+		scope="I"
+		type="L"
+		name="Gbe; Ci" />
+	<iso_639_3_entry
+		id="cic"
+		scope="I"
+		type="L"
+		name="Chickasaw" />
+	<iso_639_3_entry
+		id="cid"
+		scope="I"
+		type="E"
+		name="Chimariko" />
+	<iso_639_3_entry
+		id="cie"
+		scope="I"
+		type="L"
+		name="Cineni" />
+	<iso_639_3_entry
+		id="cih"
+		scope="I"
+		type="L"
+		name="Chinali" />
+	<iso_639_3_entry
+		id="cik"
+		scope="I"
+		type="L"
+		name="Kinnauri; Chitkuli" />
+	<iso_639_3_entry
+		id="cim"
+		scope="I"
+		type="L"
+		name="Cimbrian" />
+	<iso_639_3_entry
+		id="cin"
+		scope="I"
+		type="L"
+		name="Cinta Larga" />
+	<iso_639_3_entry
+		id="cip"
+		scope="I"
+		type="L"
+		name="Chiapanec" />
+	<iso_639_3_entry
+		id="cir"
+		scope="I"
+		type="L"
+		name="Tiri" />
+	<iso_639_3_entry
+		id="ciw"
+		scope="I"
+		type="L"
+		name="Chippewa" />
+	<iso_639_3_entry
+		id="ciy"
+		scope="I"
+		type="L"
+		name="Chaima" />
+	<iso_639_3_entry
+		id="cja"
+		scope="I"
+		type="L"
+		name="Cham; Western" />
+	<iso_639_3_entry
+		id="cje"
+		scope="I"
+		type="L"
+		name="Chru" />
+	<iso_639_3_entry
+		id="cjh"
+		scope="I"
+		type="E"
+		name="Chehalis; Upper" />
+	<iso_639_3_entry
+		id="cji"
+		scope="I"
+		type="L"
+		name="Chamalal" />
+	<iso_639_3_entry
+		id="cjk"
+		scope="I"
+		type="L"
+		name="Chokwe" />
+	<iso_639_3_entry
+		id="cjm"
+		scope="I"
+		type="L"
+		name="Cham; Eastern" />
+	<iso_639_3_entry
+		id="cjn"
+		scope="I"
+		type="L"
+		name="Chenapian" />
+	<iso_639_3_entry
+		id="cjo"
+		scope="I"
+		type="L"
+		name="Ashéninka Pajonal" />
+	<iso_639_3_entry
+		id="cjp"
+		scope="I"
+		type="L"
+		name="Cabécar" />
+	<iso_639_3_entry
+		id="cjs"
+		scope="I"
+		type="L"
+		name="Shor" />
+	<iso_639_3_entry
+		id="cjv"
+		scope="I"
+		type="L"
+		name="Chuave" />
+	<iso_639_3_entry
+		id="cjy"
+		scope="I"
+		type="L"
+		name="Chinese; Jinyu" />
+	<iso_639_3_entry
+		id="cka"
+		scope="I"
+		type="L"
+		name="Chin; Khumi Awa" />
+	<iso_639_3_entry
+		id="ckb"
+		scope="I"
+		type="L"
+		name="Kurdish; Central" />
+	<iso_639_3_entry
+		id="ckh"
+		scope="I"
+		type="L"
+		name="Chak" />
+	<iso_639_3_entry
+		id="ckl"
+		scope="I"
+		type="L"
+		name="Cibak" />
+	<iso_639_3_entry
+		id="cko"
+		scope="I"
+		type="L"
+		name="Anufo" />
+	<iso_639_3_entry
+		id="ckq"
+		scope="I"
+		type="L"
+		name="Kajakse" />
+	<iso_639_3_entry
+		id="ckr"
+		scope="I"
+		type="L"
+		name="Kairak" />
+	<iso_639_3_entry
+		id="cks"
+		scope="I"
+		type="L"
+		name="Tayo" />
+	<iso_639_3_entry
+		id="ckt"
+		scope="I"
+		type="L"
+		name="Chukot" />
+	<iso_639_3_entry
+		id="cku"
+		scope="I"
+		type="L"
+		name="Koasati" />
+	<iso_639_3_entry
+		id="ckv"
+		scope="I"
+		type="L"
+		name="Kavalan" />
+	<iso_639_3_entry
+		id="ckx"
+		scope="I"
+		type="L"
+		name="Caka" />
+	<iso_639_3_entry
+		id="cky"
+		scope="I"
+		type="L"
+		name="Cakfem-Mushere" />
+	<iso_639_3_entry
+		id="ckz"
+		scope="I"
+		type="L"
+		name="Cakchiquel-Quiché Mixed Language" />
+	<iso_639_3_entry
+		id="cla"
+		scope="I"
+		type="L"
+		name="Ron" />
+	<iso_639_3_entry
+		id="clc"
+		scope="I"
+		type="L"
+		name="Chilcotin" />
+	<iso_639_3_entry
+		id="cld"
+		scope="I"
+		type="L"
+		name="Neo-Aramaic; Chaldean" />
+	<iso_639_3_entry
+		id="cle"
+		scope="I"
+		type="L"
+		name="Chinantec; Lealao" />
+	<iso_639_3_entry
+		id="clh"
+		scope="I"
+		type="L"
+		name="Chilisso" />
+	<iso_639_3_entry
+		id="cli"
+		scope="I"
+		type="L"
+		name="Chakali" />
+	<iso_639_3_entry
+		id="clk"
+		scope="I"
+		type="L"
+		name="Idu-Mishmi" />
+	<iso_639_3_entry
+		id="cll"
+		scope="I"
+		type="L"
+		name="Chala" />
+	<iso_639_3_entry
+		id="clm"
+		scope="I"
+		type="L"
+		name="Clallam" />
+	<iso_639_3_entry
+		id="clo"
+		scope="I"
+		type="L"
+		name="Chontal; Lowland Oaxaca" />
+	<iso_639_3_entry
+		id="clu"
+		scope="I"
+		type="L"
+		name="Caluyanun" />
+	<iso_639_3_entry
+		id="clw"
+		scope="I"
+		type="L"
+		name="Chulym" />
+	<iso_639_3_entry
+		id="cly"
+		scope="I"
+		type="L"
+		name="Chatino; Eastern Highland" />
+	<iso_639_3_entry
+		id="cma"
+		scope="I"
+		type="L"
+		name="Maa" />
+	<iso_639_3_entry
+		id="cme"
+		scope="I"
+		type="L"
+		name="Cerma" />
+	<iso_639_3_entry
+		id="cmg"
+		scope="I"
+		type="H"
+		name="Mongolian; Classical" />
+	<iso_639_3_entry
+		id="cmi"
+		scope="I"
+		type="L"
+		name="Emberá-Chamí" />
+	<iso_639_3_entry
+		id="cml"
+		scope="I"
+		type="L"
+		name="Campalagian" />
+	<iso_639_3_entry
+		id="cmm"
+		scope="I"
+		type="E"
+		name="Michigamea" />
+	<iso_639_3_entry
+		id="cmn"
+		scope="I"
+		type="L"
+		name="Chinese; Mandarin" />
+	<iso_639_3_entry
+		id="cmo"
+		scope="I"
+		type="L"
+		name="Mnong; Central" />
+	<iso_639_3_entry
+		id="cmr"
+		scope="I"
+		type="L"
+		name="Chin; Mro" />
+	<iso_639_3_entry
+		id="cms"
+		scope="I"
+		type="A"
+		name="Messapic" />
+	<iso_639_3_entry
+		id="cmt"
+		scope="I"
+		type="L"
+		name="Camtho" />
+	<iso_639_3_entry
+		id="cna"
+		scope="I"
+		type="L"
+		name="Changthang" />
+	<iso_639_3_entry
+		id="cnb"
+		scope="I"
+		type="L"
+		name="Chin; Chinbon" />
+	<iso_639_3_entry
+		id="cnc"
+		scope="I"
+		type="L"
+		name="Côông" />
+	<iso_639_3_entry
+		id="cng"
+		scope="I"
+		type="L"
+		name="Qiang; Northern" />
+	<iso_639_3_entry
+		id="cnh"
+		scope="I"
+		type="L"
+		name="Chin; Haka" />
+	<iso_639_3_entry
+		id="cni"
+		scope="I"
+		type="L"
+		name="Asháninka" />
+	<iso_639_3_entry
+		id="cnk"
+		scope="I"
+		type="L"
+		name="Chin; Khumi" />
+	<iso_639_3_entry
+		id="cnl"
+		scope="I"
+		type="L"
+		name="Chinantec; Lalana" />
+	<iso_639_3_entry
+		id="cno"
+		scope="I"
+		type="L"
+		name="Con" />
+	<iso_639_3_entry
+		id="cns"
+		scope="I"
+		type="L"
+		name="Asmat; Central" />
+	<iso_639_3_entry
+		id="cnt"
+		scope="I"
+		type="L"
+		name="Chinantec; Tepetotutla" />
+	<iso_639_3_entry
+		id="cnu"
+		scope="I"
+		type="L"
+		name="Chenoua" />
+	<iso_639_3_entry
+		id="cnw"
+		scope="I"
+		type="L"
+		name="Chin; Ngawn" />
+	<iso_639_3_entry
+		id="cnx"
+		scope="I"
+		type="H"
+		name="Cornish; Middle" />
+	<iso_639_3_entry
+		id="coa"
+		scope="I"
+		type="L"
+		name="Malay; Cocos Islands" />
+	<iso_639_3_entry
+		id="cob"
+		scope="I"
+		type="E"
+		name="Chicomuceltec" />
+	<iso_639_3_entry
+		id="coc"
+		scope="I"
+		type="L"
+		name="Cocopa" />
+	<iso_639_3_entry
+		id="cod"
+		scope="I"
+		type="L"
+		name="Cocama-Cocamilla" />
+	<iso_639_3_entry
+		id="coe"
+		scope="I"
+		type="L"
+		name="Koreguaje" />
+	<iso_639_3_entry
+		id="cof"
+		scope="I"
+		type="L"
+		name="Colorado" />
+	<iso_639_3_entry
+		id="cog"
+		scope="I"
+		type="L"
+		name="Chong" />
+	<iso_639_3_entry
+		id="coh"
+		scope="I"
+		type="L"
+		name="Chonyi-Dzihana-Kauma" />
+	<iso_639_3_entry
+		id="coj"
+		scope="I"
+		type="E"
+		name="Cochimi" />
+	<iso_639_3_entry
+		id="cok"
+		scope="I"
+		type="L"
+		name="Cora; Santa Teresa" />
+	<iso_639_3_entry
+		id="col"
+		scope="I"
+		type="L"
+		name="Columbia-Wenatchi" />
+	<iso_639_3_entry
+		id="com"
+		scope="I"
+		type="L"
+		name="Comanche" />
+	<iso_639_3_entry
+		id="con"
+		scope="I"
+		type="L"
+		name="Cofán" />
+	<iso_639_3_entry
+		id="coo"
+		scope="I"
+		type="L"
+		name="Comox" />
+	<iso_639_3_entry
+		id="cop"
+		part2_code="cop"
+		scope="I"
+		type="E"
+		name="Coptic" />
+	<iso_639_3_entry
+		id="coq"
+		scope="I"
+		type="E"
+		name="Coquille" />
+	<iso_639_3_entry
+		id="cor"
+		part1_code="kw"
+		part2_code="cor"
+		scope="I"
+		type="L"
+		name="Cornish" />
+	<iso_639_3_entry
+		id="cos"
+		part1_code="co"
+		part2_code="cos"
+		scope="I"
+		type="L"
+		name="Corsican" />
+	<iso_639_3_entry
+		id="cot"
+		scope="I"
+		type="L"
+		name="Caquinte" />
+	<iso_639_3_entry
+		id="cou"
+		scope="I"
+		type="L"
+		name="Wamey" />
+	<iso_639_3_entry
+		id="cov"
+		scope="I"
+		type="L"
+		name="Cao Miao" />
+	<iso_639_3_entry
+		id="cow"
+		scope="I"
+		type="E"
+		name="Cowlitz" />
+	<iso_639_3_entry
+		id="cox"
+		scope="I"
+		type="L"
+		name="Nanti" />
+	<iso_639_3_entry
+		id="coy"
+		scope="I"
+		type="E"
+		name="Coyaima" />
+	<iso_639_3_entry
+		id="coz"
+		scope="I"
+		type="L"
+		name="Chochotec" />
+	<iso_639_3_entry
+		id="cpa"
+		scope="I"
+		type="L"
+		name="Chinantec; Palantla" />
+	<iso_639_3_entry
+		id="cpb"
+		scope="I"
+		type="L"
+		name="Ashéninka; Ucayali-Yurúa" />
+	<iso_639_3_entry
+		id="cpc"
+		scope="I"
+		type="L"
+		name="Ajyíninka Apurucayali" />
+	<iso_639_3_entry
+		id="cpg"
+		scope="I"
+		type="E"
+		name="Greek; Cappadocian" />
+	<iso_639_3_entry
+		id="cpi"
+		scope="I"
+		type="L"
+		name="Pidgin English; Chinese" />
+	<iso_639_3_entry
+		id="cpn"
+		scope="I"
+		type="L"
+		name="Cherepon" />
+	<iso_639_3_entry
+		id="cps"
+		scope="I"
+		type="L"
+		name="Capiznon" />
+	<iso_639_3_entry
+		id="cpu"
+		scope="I"
+		type="L"
+		name="Ashéninka; Pichis" />
+	<iso_639_3_entry
+		id="cpx"
+		scope="I"
+		type="L"
+		name="Chinese; Pu-Xian" />
+	<iso_639_3_entry
+		id="cpy"
+		scope="I"
+		type="L"
+		name="Ashéninka; South Ucayali" />
+	<iso_639_3_entry
+		id="cqd"
+		scope="I"
+		type="L"
+		name="Miao; Chuanqiandian Cluster" />
+	<iso_639_3_entry
+		id="cqu"
+		scope="I"
+		type="L"
+		name="Quechua; Chilean" />
+	<iso_639_3_entry
+		id="cra"
+		scope="I"
+		type="L"
+		name="Chara" />
+	<iso_639_3_entry
+		id="crb"
+		scope="I"
+		type="E"
+		name="Carib; Island" />
+	<iso_639_3_entry
+		id="crc"
+		scope="I"
+		type="L"
+		name="Lonwolwol" />
+	<iso_639_3_entry
+		id="crd"
+		scope="I"
+		type="L"
+		name="Coeur d'Alene" />
+	<iso_639_3_entry
+		id="cre"
+		part1_code="cr"
+		part2_code="cre"
+		scope="M"
+		type="L"
+		name="Cree" />
+	<iso_639_3_entry
+		id="crf"
+		scope="I"
+		type="E"
+		name="Caramanta" />
+	<iso_639_3_entry
+		id="crg"
+		scope="I"
+		type="L"
+		name="Michif" />
+	<iso_639_3_entry
+		id="crh"
+		part2_code="crh"
+		scope="I"
+		type="L"
+		name="Turkish; Crimean" />
+	<iso_639_3_entry
+		id="cri"
+		scope="I"
+		type="L"
+		name="Sãotomense" />
+	<iso_639_3_entry
+		id="crj"
+		scope="I"
+		type="L"
+		name="Cree; Southern East" />
+	<iso_639_3_entry
+		id="crk"
+		scope="I"
+		type="L"
+		name="Cree; Plains" />
+	<iso_639_3_entry
+		id="crl"
+		scope="I"
+		type="L"
+		name="Cree; Northern East" />
+	<iso_639_3_entry
+		id="crm"
+		scope="I"
+		type="L"
+		name="Cree; Moose" />
+	<iso_639_3_entry
+		id="crn"
+		scope="I"
+		type="L"
+		name="Cora; El Nayar" />
+	<iso_639_3_entry
+		id="cro"
+		scope="I"
+		type="L"
+		name="Crow" />
+	<iso_639_3_entry
+		id="crq"
+		scope="I"
+		type="L"
+		name="Chorote; Iyo'wujwa" />
+	<iso_639_3_entry
+		id="crr"
+		scope="I"
+		type="E"
+		name="Algonquian; Carolina" />
+	<iso_639_3_entry
+		id="crs"
+		scope="I"
+		type="L"
+		name="Creole French; Seselwa" />
+	<iso_639_3_entry
+		id="crt"
+		scope="I"
+		type="L"
+		name="Chorote; Iyojwa'ja" />
+	<iso_639_3_entry
+		id="crv"
+		scope="I"
+		type="L"
+		name="Chaura" />
+	<iso_639_3_entry
+		id="crw"
+		scope="I"
+		type="L"
+		name="Chrau" />
+	<iso_639_3_entry
+		id="crx"
+		scope="I"
+		type="L"
+		name="Carrier" />
+	<iso_639_3_entry
+		id="cry"
+		scope="I"
+		type="L"
+		name="Cori" />
+	<iso_639_3_entry
+		id="crz"
+		scope="I"
+		type="E"
+		name="Cruzeño" />
+	<iso_639_3_entry
+		id="csa"
+		scope="I"
+		type="L"
+		name="Chinantec; Chiltepec" />
+	<iso_639_3_entry
+		id="csb"
+		part2_code="csb"
+		scope="I"
+		type="L"
+		name="Kashubian" />
+	<iso_639_3_entry
+		id="csc"
+		scope="I"
+		type="L"
+		name="Catalan Sign Language" />
+	<iso_639_3_entry
+		id="csd"
+		scope="I"
+		type="L"
+		name="Chiangmai Sign Language" />
+	<iso_639_3_entry
+		id="cse"
+		scope="I"
+		type="L"
+		name="Czech Sign Language" />
+	<iso_639_3_entry
+		id="csf"
+		scope="I"
+		type="L"
+		name="Cuba Sign Language" />
+	<iso_639_3_entry
+		id="csg"
+		scope="I"
+		type="L"
+		name="Chilean Sign Language" />
+	<iso_639_3_entry
+		id="csh"
+		scope="I"
+		type="L"
+		name="Chin; Asho" />
+	<iso_639_3_entry
+		id="csi"
+		scope="I"
+		type="E"
+		name="Miwok; Coast" />
+	<iso_639_3_entry
+		id="csk"
+		scope="I"
+		type="L"
+		name="Jola-Kasa" />
+	<iso_639_3_entry
+		id="csl"
+		scope="I"
+		type="L"
+		name="Chinese Sign Language" />
+	<iso_639_3_entry
+		id="csm"
+		scope="I"
+		type="L"
+		name="Miwok; Central Sierra" />
+	<iso_639_3_entry
+		id="csn"
+		scope="I"
+		type="L"
+		name="Colombian Sign Language" />
+	<iso_639_3_entry
+		id="cso"
+		scope="I"
+		type="L"
+		name="Chinantec; Sochiapan" />
+	<iso_639_3_entry
+		id="csq"
+		scope="I"
+		type="L"
+		name="Croatia Sign Language" />
+	<iso_639_3_entry
+		id="csr"
+		scope="I"
+		type="L"
+		name="Costa Rican Sign Language" />
+	<iso_639_3_entry
+		id="css"
+		scope="I"
+		type="E"
+		name="Ohlone; Southern" />
+	<iso_639_3_entry
+		id="cst"
+		scope="I"
+		type="L"
+		name="Ohlone; Northern" />
+	<iso_639_3_entry
+		id="csw"
+		scope="I"
+		type="L"
+		name="Cree; Swampy" />
+	<iso_639_3_entry
+		id="csy"
+		scope="I"
+		type="L"
+		name="Chin; Siyin" />
+	<iso_639_3_entry
+		id="csz"
+		scope="I"
+		type="L"
+		name="Coos" />
+	<iso_639_3_entry
+		id="cta"
+		scope="I"
+		type="L"
+		name="Chatino; Tataltepec" />
+	<iso_639_3_entry
+		id="ctc"
+		scope="I"
+		type="L"
+		name="Chetco" />
+	<iso_639_3_entry
+		id="ctd"
+		scope="I"
+		type="L"
+		name="Chin; Tedim" />
+	<iso_639_3_entry
+		id="cte"
+		scope="I"
+		type="L"
+		name="Chinantec; Tepinapa" />
+	<iso_639_3_entry
+		id="ctg"
+		scope="I"
+		type="L"
+		name="Chittagonian" />
+	<iso_639_3_entry
+		id="ctl"
+		scope="I"
+		type="L"
+		name="Chinantec; Tlacoatzintepec" />
+	<iso_639_3_entry
+		id="ctm"
+		scope="I"
+		type="E"
+		name="Chitimacha" />
+	<iso_639_3_entry
+		id="ctn"
+		scope="I"
+		type="L"
+		name="Chhintange" />
+	<iso_639_3_entry
+		id="cto"
+		scope="I"
+		type="L"
+		name="Emberá-Catío" />
+	<iso_639_3_entry
+		id="ctp"
+		scope="I"
+		type="L"
+		name="Chatino; Western Highland" />
+	<iso_639_3_entry
+		id="cts"
+		scope="I"
+		type="L"
+		name="Bicolano; Northern Catanduanes" />
+	<iso_639_3_entry
+		id="ctt"
+		scope="I"
+		type="L"
+		name="Chetti; Wayanad" />
+	<iso_639_3_entry
+		id="ctu"
+		scope="I"
+		type="L"
+		name="Chol" />
+	<iso_639_3_entry
+		id="ctz"
+		scope="I"
+		type="L"
+		name="Chatino; Zacatepec" />
+	<iso_639_3_entry
+		id="cua"
+		scope="I"
+		type="L"
+		name="Cua" />
+	<iso_639_3_entry
+		id="cub"
+		scope="I"
+		type="L"
+		name="Cubeo" />
+	<iso_639_3_entry
+		id="cuc"
+		scope="I"
+		type="L"
+		name="Chinantec; Usila" />
+	<iso_639_3_entry
+		id="cug"
+		scope="I"
+		type="L"
+		name="Cung" />
+	<iso_639_3_entry
+		id="cuh"
+		scope="I"
+		type="L"
+		name="Chuka" />
+	<iso_639_3_entry
+		id="cui"
+		scope="I"
+		type="L"
+		name="Cuiba" />
+	<iso_639_3_entry
+		id="cuj"
+		scope="I"
+		type="L"
+		name="Mashco Piro" />
+	<iso_639_3_entry
+		id="cuk"
+		scope="I"
+		type="L"
+		name="Kuna; San Blas" />
+	<iso_639_3_entry
+		id="cul"
+		scope="I"
+		type="L"
+		name="Culina" />
+	<iso_639_3_entry
+		id="cum"
+		scope="I"
+		type="E"
+		name="Cumeral" />
+	<iso_639_3_entry
+		id="cuo"
+		scope="I"
+		type="E"
+		name="Cumanagoto" />
+	<iso_639_3_entry
+		id="cup"
+		scope="I"
+		type="E"
+		name="Cupeño" />
+	<iso_639_3_entry
+		id="cuq"
+		scope="I"
+		type="L"
+		name="Cun" />
+	<iso_639_3_entry
+		id="cur"
+		scope="I"
+		type="L"
+		name="Chhulung" />
+	<iso_639_3_entry
+		id="cut"
+		scope="I"
+		type="L"
+		name="Cuicatec; Teutila" />
+	<iso_639_3_entry
+		id="cuu"
+		scope="I"
+		type="L"
+		name="Tai Ya" />
+	<iso_639_3_entry
+		id="cuv"
+		scope="I"
+		type="L"
+		name="Cuvok" />
+	<iso_639_3_entry
+		id="cuw"
+		scope="I"
+		type="L"
+		name="Chukwa" />
+	<iso_639_3_entry
+		id="cux"
+		scope="I"
+		type="L"
+		name="Cuicatec; Tepeuxila" />
+	<iso_639_3_entry
+		id="cvg"
+		scope="I"
+		type="L"
+		name="Chug" />
+	<iso_639_3_entry
+		id="cvn"
+		scope="I"
+		type="L"
+		name="Chinantec; Valle Nacional" />
+	<iso_639_3_entry
+		id="cwa"
+		scope="I"
+		type="L"
+		name="Kabwa" />
+	<iso_639_3_entry
+		id="cwb"
+		scope="I"
+		type="L"
+		name="Maindo" />
+	<iso_639_3_entry
+		id="cwd"
+		scope="I"
+		type="L"
+		name="Cree; Woods" />
+	<iso_639_3_entry
+		id="cwe"
+		scope="I"
+		type="L"
+		name="Kwere" />
+	<iso_639_3_entry
+		id="cwg"
+		scope="I"
+		type="L"
+		name="Chewong" />
+	<iso_639_3_entry
+		id="cwt"
+		scope="I"
+		type="L"
+		name="Kuwaataay" />
+	<iso_639_3_entry
+		id="cya"
+		scope="I"
+		type="L"
+		name="Chatino; Nopala" />
+	<iso_639_3_entry
+		id="cyb"
+		scope="I"
+		type="E"
+		name="Cayubaba" />
+	<iso_639_3_entry
+		id="cym"
+		part1_code="cy"
+		part2_code="wel"
+		scope="I"
+		type="L"
+		name="Welsh" />
+	<iso_639_3_entry
+		id="cyo"
+		scope="I"
+		type="L"
+		name="Cuyonon" />
+	<iso_639_3_entry
+		id="czh"
+		scope="I"
+		type="L"
+		name="Chinese; Huizhou" />
+	<iso_639_3_entry
+		id="czk"
+		scope="I"
+		type="E"
+		name="Knaanic" />
+	<iso_639_3_entry
+		id="czn"
+		scope="I"
+		type="L"
+		name="Chatino; Zenzontepec" />
+	<iso_639_3_entry
+		id="czo"
+		scope="I"
+		type="L"
+		name="Chinese; Min Zhong" />
+	<iso_639_3_entry
+		id="czt"
+		scope="I"
+		type="L"
+		name="Chin; Zotung" />
+	<iso_639_3_entry
+		id="daa"
+		scope="I"
+		type="L"
+		name="Dangaléat" />
+	<iso_639_3_entry
+		id="dac"
+		scope="I"
+		type="L"
+		name="Dambi" />
+	<iso_639_3_entry
+		id="dad"
+		scope="I"
+		type="L"
+		name="Marik" />
+	<iso_639_3_entry
+		id="dae"
+		scope="I"
+		type="L"
+		name="Duupa" />
+	<iso_639_3_entry
+		id="daf"
+		scope="I"
+		type="L"
+		name="Dan" />
+	<iso_639_3_entry
+		id="dag"
+		scope="I"
+		type="L"
+		name="Dagbani" />
+	<iso_639_3_entry
+		id="dah"
+		scope="I"
+		type="L"
+		name="Gwahatike" />
+	<iso_639_3_entry
+		id="dai"
+		scope="I"
+		type="L"
+		name="Day" />
+	<iso_639_3_entry
+		id="daj"
+		scope="I"
+		type="L"
+		name="Daju; Dar Fur" />
+	<iso_639_3_entry
+		id="dak"
+		part2_code="dak"
+		scope="I"
+		type="L"
+		name="Dakota" />
+	<iso_639_3_entry
+		id="dal"
+		scope="I"
+		type="L"
+		name="Dahalo" />
+	<iso_639_3_entry
+		id="dam"
+		scope="I"
+		type="L"
+		name="Damakawa" />
+	<iso_639_3_entry
+		id="dan"
+		part1_code="da"
+		part2_code="dan"
+		scope="I"
+		type="L"
+		name="Danish" />
+	<iso_639_3_entry
+		id="dao"
+		scope="I"
+		type="L"
+		name="Chin; Daai" />
+	<iso_639_3_entry
+		id="dap"
+		scope="I"
+		type="L"
+		name="Nisi (India)" />
+	<iso_639_3_entry
+		id="daq"
+		scope="I"
+		type="L"
+		name="Maria; Dandami" />
+	<iso_639_3_entry
+		id="dar"
+		part2_code="dar"
+		scope="I"
+		type="L"
+		name="Dargwa" />
+	<iso_639_3_entry
+		id="das"
+		scope="I"
+		type="L"
+		name="Daho-Doo" />
+	<iso_639_3_entry
+		id="dau"
+		scope="I"
+		type="L"
+		name="Daju; Dar Sila" />
+	<iso_639_3_entry
+		id="dav"
+		scope="I"
+		type="L"
+		name="Taita" />
+	<iso_639_3_entry
+		id="daw"
+		scope="I"
+		type="L"
+		name="Davawenyo" />
+	<iso_639_3_entry
+		id="dax"
+		scope="I"
+		type="L"
+		name="Dayi" />
+	<iso_639_3_entry
+		id="daz"
+		scope="I"
+		type="L"
+		name="Dao" />
+	<iso_639_3_entry
+		id="dba"
+		scope="I"
+		type="L"
+		name="Bangi Me" />
+	<iso_639_3_entry
+		id="dbb"
+		scope="I"
+		type="L"
+		name="Deno" />
+	<iso_639_3_entry
+		id="dbd"
+		scope="I"
+		type="L"
+		name="Dadiya" />
+	<iso_639_3_entry
+		id="dbe"
+		scope="I"
+		type="L"
+		name="Dabe" />
+	<iso_639_3_entry
+		id="dbf"
+		scope="I"
+		type="L"
+		name="Edopi" />
+	<iso_639_3_entry
+		id="dbg"
+		scope="I"
+		type="L"
+		name="Dogon; Dogul Dom" />
+	<iso_639_3_entry
+		id="dbi"
+		scope="I"
+		type="L"
+		name="Doka" />
+	<iso_639_3_entry
+		id="dbj"
+		scope="I"
+		type="L"
+		name="Ida'an" />
+	<iso_639_3_entry
+		id="dbl"
+		scope="I"
+		type="L"
+		name="Dyirbal" />
+	<iso_639_3_entry
+		id="dbm"
+		scope="I"
+		type="L"
+		name="Duguri" />
+	<iso_639_3_entry
+		id="dbn"
+		scope="I"
+		type="L"
+		name="Duriankere" />
+	<iso_639_3_entry
+		id="dbo"
+		scope="I"
+		type="L"
+		name="Dulbu" />
+	<iso_639_3_entry
+		id="dbp"
+		scope="I"
+		type="L"
+		name="Duwai" />
+	<iso_639_3_entry
+		id="dbq"
+		scope="I"
+		type="L"
+		name="Daba" />
+	<iso_639_3_entry
+		id="dbr"
+		scope="I"
+		type="L"
+		name="Dabarre" />
+	<iso_639_3_entry
+		id="dbu"
+		scope="I"
+		type="L"
+		name="Dogon; Bondum Dom" />
+	<iso_639_3_entry
+		id="dbv"
+		scope="I"
+		type="L"
+		name="Dungu" />
+	<iso_639_3_entry
+		id="dby"
+		scope="I"
+		type="L"
+		name="Dibiyaso" />
+	<iso_639_3_entry
+		id="dcc"
+		scope="I"
+		type="L"
+		name="Deccan" />
+	<iso_639_3_entry
+		id="dcr"
+		scope="I"
+		type="E"
+		name="Negerhollands" />
+	<iso_639_3_entry
+		id="ddd"
+		scope="I"
+		type="L"
+		name="Dongotono" />
+	<iso_639_3_entry
+		id="dde"
+		scope="I"
+		type="L"
+		name="Doondo" />
+	<iso_639_3_entry
+		id="ddg"
+		scope="I"
+		type="L"
+		name="Fataluku" />
+	<iso_639_3_entry
+		id="ddi"
+		scope="I"
+		type="L"
+		name="Goodenough; West" />
+	<iso_639_3_entry
+		id="ddj"
+		scope="I"
+		type="L"
+		name="Jaru" />
+	<iso_639_3_entry
+		id="ddn"
+		scope="I"
+		type="L"
+		name="Dendi (Benin)" />
+	<iso_639_3_entry
+		id="ddo"
+		scope="I"
+		type="L"
+		name="Dido" />
+	<iso_639_3_entry
+		id="dds"
+		scope="I"
+		type="L"
+		name="Dogon; Donno So" />
+	<iso_639_3_entry
+		id="ddw"
+		scope="I"
+		type="L"
+		name="Dawera-Daweloor" />
+	<iso_639_3_entry
+		id="dec"
+		scope="I"
+		type="L"
+		name="Dagik" />
+	<iso_639_3_entry
+		id="ded"
+		scope="I"
+		type="L"
+		name="Dedua" />
+	<iso_639_3_entry
+		id="dee"
+		scope="I"
+		type="L"
+		name="Dewoin" />
+	<iso_639_3_entry
+		id="def"
+		scope="I"
+		type="L"
+		name="Dezfuli" />
+	<iso_639_3_entry
+		id="deg"
+		scope="I"
+		type="L"
+		name="Degema" />
+	<iso_639_3_entry
+		id="deh"
+		scope="I"
+		type="L"
+		name="Dehwari" />
+	<iso_639_3_entry
+		id="dei"
+		scope="I"
+		type="L"
+		name="Demisa" />
+	<iso_639_3_entry
+		id="dek"
+		scope="I"
+		type="L"
+		name="Dek" />
+	<iso_639_3_entry
+		id="del"
+		part2_code="del"
+		scope="M"
+		type="L"
+		name="Delaware" />
+	<iso_639_3_entry
+		id="dem"
+		scope="I"
+		type="L"
+		name="Dem" />
+	<iso_639_3_entry
+		id="den"
+		part2_code="den"
+		scope="M"
+		type="L"
+		name="Slave (Athapascan)" />
+	<iso_639_3_entry
+		id="dep"
+		scope="I"
+		type="E"
+		name="Delaware; Pidgin" />
+	<iso_639_3_entry
+		id="deq"
+		scope="I"
+		type="L"
+		name="Dendi (Central African Republic)" />
+	<iso_639_3_entry
+		id="der"
+		scope="I"
+		type="L"
+		name="Deori" />
+	<iso_639_3_entry
+		id="des"
+		scope="I"
+		type="L"
+		name="Desano" />
+	<iso_639_3_entry
+		id="deu"
+		part1_code="de"
+		part2_code="ger"
+		scope="I"
+		type="L"
+		name="German" />
+	<iso_639_3_entry
+		id="dev"
+		scope="I"
+		type="L"
+		name="Domung" />
+	<iso_639_3_entry
+		id="dez"
+		scope="I"
+		type="L"
+		name="Dengese" />
+	<iso_639_3_entry
+		id="dga"
+		scope="I"
+		type="L"
+		name="Dagaare; Southern" />
+	<iso_639_3_entry
+		id="dgb"
+		scope="I"
+		type="L"
+		name="Dogon; Bunoge" />
+	<iso_639_3_entry
+		id="dgc"
+		scope="I"
+		type="L"
+		name="Agta; Casiguran Dumagat" />
+	<iso_639_3_entry
+		id="dgd"
+		scope="I"
+		type="L"
+		name="Dagaari Dioula" />
+	<iso_639_3_entry
+		id="dge"
+		scope="I"
+		type="L"
+		name="Degenan" />
+	<iso_639_3_entry
+		id="dgg"
+		scope="I"
+		type="L"
+		name="Doga" />
+	<iso_639_3_entry
+		id="dgh"
+		scope="I"
+		type="L"
+		name="Dghwede" />
+	<iso_639_3_entry
+		id="dgi"
+		scope="I"
+		type="L"
+		name="Dagara; Northern" />
+	<iso_639_3_entry
+		id="dgk"
+		scope="I"
+		type="L"
+		name="Dagba" />
+	<iso_639_3_entry
+		id="dgn"
+		scope="I"
+		type="E"
+		name="Dagoman" />
+	<iso_639_3_entry
+		id="dgo"
+		scope="I"
+		type="L"
+		name="Dogri (individual language)" />
+	<iso_639_3_entry
+		id="dgr"
+		part2_code="dgr"
+		scope="I"
+		type="L"
+		name="Dogrib" />
+	<iso_639_3_entry
+		id="dgs"
+		scope="I"
+		type="L"
+		name="Dogoso" />
+	<iso_639_3_entry
+		id="dgu"
+		scope="I"
+		type="L"
+		name="Degaru" />
+	<iso_639_3_entry
+		id="dgx"
+		scope="I"
+		type="L"
+		name="Doghoro" />
+	<iso_639_3_entry
+		id="dgz"
+		scope="I"
+		type="L"
+		name="Daga" />
+	<iso_639_3_entry
+		id="dhd"
+		scope="I"
+		type="L"
+		name="Dhundari" />
+	<iso_639_3_entry
+		id="dhg"
+		scope="I"
+		type="L"
+		name="Dhangu" />
+	<iso_639_3_entry
+		id="dhi"
+		scope="I"
+		type="L"
+		name="Dhimal" />
+	<iso_639_3_entry
+		id="dhl"
+		scope="I"
+		type="L"
+		name="Dhalandji" />
+	<iso_639_3_entry
+		id="dhm"
+		scope="I"
+		type="L"
+		name="Zemba" />
+	<iso_639_3_entry
+		id="dhn"
+		scope="I"
+		type="L"
+		name="Dhanki" />
+	<iso_639_3_entry
+		id="dho"
+		scope="I"
+		type="L"
+		name="Dhodia" />
+	<iso_639_3_entry
+		id="dhr"
+		scope="I"
+		type="L"
+		name="Dhargari" />
+	<iso_639_3_entry
+		id="dhs"
+		scope="I"
+		type="L"
+		name="Dhaiso" />
+	<iso_639_3_entry
+		id="dhu"
+		scope="I"
+		type="E"
+		name="Dhurga" />
+	<iso_639_3_entry
+		id="dhv"
+		scope="I"
+		type="L"
+		name="Dehu" />
+	<iso_639_3_entry
+		id="dhw"
+		scope="I"
+		type="L"
+		name="Dhanwar (Nepal)" />
+	<iso_639_3_entry
+		id="dia"
+		scope="I"
+		type="L"
+		name="Dia" />
+	<iso_639_3_entry
+		id="dib"
+		scope="I"
+		type="L"
+		name="Dinka; South Central" />
+	<iso_639_3_entry
+		id="dic"
+		scope="I"
+		type="L"
+		name="Dida; Lakota" />
+	<iso_639_3_entry
+		id="did"
+		scope="I"
+		type="L"
+		name="Didinga" />
+	<iso_639_3_entry
+		id="dif"
+		scope="I"
+		type="E"
+		name="Dieri" />
+	<iso_639_3_entry
+		id="dig"
+		scope="I"
+		type="L"
+		name="Digo" />
+	<iso_639_3_entry
+		id="dih"
+		scope="I"
+		type="L"
+		name="Kumiai" />
+	<iso_639_3_entry
+		id="dii"
+		scope="I"
+		type="L"
+		name="Dimbong" />
+	<iso_639_3_entry
+		id="dij"
+		scope="I"
+		type="L"
+		name="Dai" />
+	<iso_639_3_entry
+		id="dik"
+		scope="I"
+		type="L"
+		name="Dinka; Southwestern" />
+	<iso_639_3_entry
+		id="dil"
+		scope="I"
+		type="L"
+		name="Dilling" />
+	<iso_639_3_entry
+		id="dim"
+		scope="I"
+		type="L"
+		name="Dime" />
+	<iso_639_3_entry
+		id="din"
+		part2_code="din"
+		scope="M"
+		type="L"
+		name="Dinka" />
+	<iso_639_3_entry
+		id="dio"
+		scope="I"
+		type="L"
+		name="Dibo" />
+	<iso_639_3_entry
+		id="dip"
+		scope="I"
+		type="L"
+		name="Dinka; Northeastern" />
+	<iso_639_3_entry
+		id="diq"
+		scope="I"
+		type="L"
+		name="Dimli (individual language)" />
+	<iso_639_3_entry
+		id="dir"
+		scope="I"
+		type="L"
+		name="Dirim" />
+	<iso_639_3_entry
+		id="dis"
+		scope="I"
+		type="L"
+		name="Dimasa" />
+	<iso_639_3_entry
+		id="dit"
+		scope="I"
+		type="E"
+		name="Dirari" />
+	<iso_639_3_entry
+		id="diu"
+		scope="I"
+		type="L"
+		name="Diriku" />
+	<iso_639_3_entry
+		id="div"
+		part1_code="dv"
+		part2_code="div"
+		scope="I"
+		type="L"
+		name="Dhivehi" />
+	<iso_639_3_entry
+		id="diw"
+		scope="I"
+		type="L"
+		name="Dinka; Northwestern" />
+	<iso_639_3_entry
+		id="dix"
+		scope="I"
+		type="L"
+		name="Dixon Reef" />
+	<iso_639_3_entry
+		id="diy"
+		scope="I"
+		type="L"
+		name="Diuwe" />
+	<iso_639_3_entry
+		id="diz"
+		scope="I"
+		type="L"
+		name="Ding" />
+	<iso_639_3_entry
+		id="djb"
+		scope="I"
+		type="L"
+		name="Djinba" />
+	<iso_639_3_entry
+		id="djc"
+		scope="I"
+		type="L"
+		name="Daju; Dar Daju" />
+	<iso_639_3_entry
+		id="djd"
+		scope="I"
+		type="L"
+		name="Djamindjung" />
+	<iso_639_3_entry
+		id="dje"
+		scope="I"
+		type="L"
+		name="Zarma" />
+	<iso_639_3_entry
+		id="djf"
+		scope="I"
+		type="E"
+		name="Djangun" />
+	<iso_639_3_entry
+		id="dji"
+		scope="I"
+		type="L"
+		name="Djinang" />
+	<iso_639_3_entry
+		id="djj"
+		scope="I"
+		type="L"
+		name="Djeebbana" />
+	<iso_639_3_entry
+		id="djk"
+		scope="I"
+		type="L"
+		name="Eastern Maroon Creole" />
+	<iso_639_3_entry
+		id="djl"
+		scope="I"
+		type="E"
+		name="Djiwarli" />
+	<iso_639_3_entry
+		id="djm"
+		scope="I"
+		type="L"
+		name="Dogon; Jamsay" />
+	<iso_639_3_entry
+		id="djn"
+		scope="I"
+		type="L"
+		name="Djauan" />
+	<iso_639_3_entry
+		id="djo"
+		scope="I"
+		type="L"
+		name="Jangkang" />
+	<iso_639_3_entry
+		id="djr"
+		scope="I"
+		type="L"
+		name="Djambarrpuyngu" />
+	<iso_639_3_entry
+		id="dju"
+		scope="I"
+		type="L"
+		name="Kapriman" />
+	<iso_639_3_entry
+		id="djw"
+		scope="I"
+		type="E"
+		name="Djawi" />
+	<iso_639_3_entry
+		id="dka"
+		scope="I"
+		type="L"
+		name="Dakpakha" />
+	<iso_639_3_entry
+		id="dkk"
+		scope="I"
+		type="L"
+		name="Dakka" />
+	<iso_639_3_entry
+		id="dkr"
+		scope="I"
+		type="L"
+		name="Kuijau" />
+	<iso_639_3_entry
+		id="dks"
+		scope="I"
+		type="L"
+		name="Dinka; Southeastern" />
+	<iso_639_3_entry
+		id="dkx"
+		scope="I"
+		type="L"
+		name="Mazagway" />
+	<iso_639_3_entry
+		id="dlg"
+		scope="I"
+		type="L"
+		name="Dolgan" />
+	<iso_639_3_entry
+		id="dlm"
+		scope="I"
+		type="E"
+		name="Dalmatian" />
+	<iso_639_3_entry
+		id="dln"
+		scope="I"
+		type="L"
+		name="Darlong" />
+	<iso_639_3_entry
+		id="dma"
+		scope="I"
+		type="L"
+		name="Duma" />
+	<iso_639_3_entry
+		id="dmb"
+		scope="I"
+		type="L"
+		name="Dogon; Mombo" />
+	<iso_639_3_entry
+		id="dmc"
+		scope="I"
+		type="L"
+		name="Dimir" />
+	<iso_639_3_entry
+		id="dme"
+		scope="I"
+		type="L"
+		name="Dugwor" />
+	<iso_639_3_entry
+		id="dmg"
+		scope="I"
+		type="L"
+		name="Kinabatangan; Upper" />
+	<iso_639_3_entry
+		id="dmk"
+		scope="I"
+		type="L"
+		name="Domaaki" />
+	<iso_639_3_entry
+		id="dml"
+		scope="I"
+		type="L"
+		name="Dameli" />
+	<iso_639_3_entry
+		id="dmm"
+		scope="I"
+		type="L"
+		name="Dama" />
+	<iso_639_3_entry
+		id="dmo"
+		scope="I"
+		type="L"
+		name="Kemezung" />
+	<iso_639_3_entry
+		id="dmr"
+		scope="I"
+		type="L"
+		name="Damar; East" />
+	<iso_639_3_entry
+		id="dms"
+		scope="I"
+		type="L"
+		name="Dampelas" />
+	<iso_639_3_entry
+		id="dmu"
+		scope="I"
+		type="L"
+		name="Dubu" />
+	<iso_639_3_entry
+		id="dmv"
+		scope="I"
+		type="L"
+		name="Dumpas" />
+	<iso_639_3_entry
+		id="dmx"
+		scope="I"
+		type="L"
+		name="Dema" />
+	<iso_639_3_entry
+		id="dmy"
+		scope="I"
+		type="L"
+		name="Demta" />
+	<iso_639_3_entry
+		id="dna"
+		scope="I"
+		type="L"
+		name="Dani; Upper Grand Valley" />
+	<iso_639_3_entry
+		id="dnd"
+		scope="I"
+		type="L"
+		name="Daonda" />
+	<iso_639_3_entry
+		id="dne"
+		scope="I"
+		type="L"
+		name="Ndendeule" />
+	<iso_639_3_entry
+		id="dng"
+		scope="I"
+		type="L"
+		name="Dungan" />
+	<iso_639_3_entry
+		id="dni"
+		scope="I"
+		type="L"
+		name="Dani; Lower Grand Valley" />
+	<iso_639_3_entry
+		id="dnk"
+		scope="I"
+		type="L"
+		name="Dengka" />
+	<iso_639_3_entry
+		id="dnn"
+		scope="I"
+		type="L"
+		name="Dzùùngoo" />
+	<iso_639_3_entry
+		id="dnr"
+		scope="I"
+		type="L"
+		name="Danaru" />
+	<iso_639_3_entry
+		id="dnt"
+		scope="I"
+		type="L"
+		name="Dani; Mid Grand Valley" />
+	<iso_639_3_entry
+		id="dnu"
+		scope="I"
+		type="L"
+		name="Danau" />
+	<iso_639_3_entry
+		id="dnw"
+		scope="I"
+		type="L"
+		name="Dani; Western" />
+	<iso_639_3_entry
+		id="dny"
+		scope="I"
+		type="L"
+		name="Dení" />
+	<iso_639_3_entry
+		id="doa"
+		scope="I"
+		type="L"
+		name="Dom" />
+	<iso_639_3_entry
+		id="dob"
+		scope="I"
+		type="L"
+		name="Dobu" />
+	<iso_639_3_entry
+		id="doc"
+		scope="I"
+		type="L"
+		name="Dong; Northern" />
+	<iso_639_3_entry
+		id="doe"
+		scope="I"
+		type="L"
+		name="Doe" />
+	<iso_639_3_entry
+		id="dof"
+		scope="I"
+		type="L"
+		name="Domu" />
+	<iso_639_3_entry
+		id="doh"
+		scope="I"
+		type="L"
+		name="Dong" />
+	<iso_639_3_entry
+		id="doi"
+		part2_code="doi"
+		scope="M"
+		type="L"
+		name="Dogri (macrolanguage)" />
+	<iso_639_3_entry
+		id="dok"
+		scope="I"
+		type="L"
+		name="Dondo" />
+	<iso_639_3_entry
+		id="dol"
+		scope="I"
+		type="L"
+		name="Doso" />
+	<iso_639_3_entry
+		id="don"
+		scope="I"
+		type="L"
+		name="Toura (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="doo"
+		scope="I"
+		type="L"
+		name="Dongo" />
+	<iso_639_3_entry
+		id="dop"
+		scope="I"
+		type="L"
+		name="Lukpa" />
+	<iso_639_3_entry
+		id="doq"
+		scope="I"
+		type="L"
+		name="Dominican Sign Language" />
+	<iso_639_3_entry
+		id="dor"
+		scope="I"
+		type="L"
+		name="Dori'o" />
+	<iso_639_3_entry
+		id="dos"
+		scope="I"
+		type="L"
+		name="Dogosé" />
+	<iso_639_3_entry
+		id="dot"
+		scope="I"
+		type="L"
+		name="Dass" />
+	<iso_639_3_entry
+		id="dov"
+		scope="I"
+		type="L"
+		name="Dombe" />
+	<iso_639_3_entry
+		id="dow"
+		scope="I"
+		type="L"
+		name="Doyayo" />
+	<iso_639_3_entry
+		id="dox"
+		scope="I"
+		type="L"
+		name="Bussa" />
+	<iso_639_3_entry
+		id="doy"
+		scope="I"
+		type="L"
+		name="Dompo" />
+	<iso_639_3_entry
+		id="doz"
+		scope="I"
+		type="L"
+		name="Dorze" />
+	<iso_639_3_entry
+		id="dpp"
+		scope="I"
+		type="L"
+		name="Papar" />
+	<iso_639_3_entry
+		id="drb"
+		scope="I"
+		type="L"
+		name="Dair" />
+	<iso_639_3_entry
+		id="drc"
+		scope="I"
+		type="L"
+		name="Minderico" />
+	<iso_639_3_entry
+		id="drd"
+		scope="I"
+		type="L"
+		name="Darmiya" />
+	<iso_639_3_entry
+		id="dre"
+		scope="I"
+		type="L"
+		name="Dolpo" />
+	<iso_639_3_entry
+		id="drg"
+		scope="I"
+		type="L"
+		name="Rungus" />
+	<iso_639_3_entry
+		id="dri"
+		scope="I"
+		type="L"
+		name="C'lela" />
+	<iso_639_3_entry
+		id="drl"
+		scope="I"
+		type="L"
+		name="Darling" />
+	<iso_639_3_entry
+		id="drn"
+		scope="I"
+		type="L"
+		name="Damar; West" />
+	<iso_639_3_entry
+		id="dro"
+		scope="I"
+		type="L"
+		name="Melanau; Daro-Matu" />
+	<iso_639_3_entry
+		id="drq"
+		scope="I"
+		type="E"
+		name="Dura" />
+	<iso_639_3_entry
+		id="drr"
+		scope="I"
+		type="E"
+		name="Dororo" />
+	<iso_639_3_entry
+		id="drs"
+		scope="I"
+		type="L"
+		name="Gedeo" />
+	<iso_639_3_entry
+		id="drt"
+		scope="I"
+		type="L"
+		name="Drents" />
+	<iso_639_3_entry
+		id="dru"
+		scope="I"
+		type="L"
+		name="Rukai" />
+	<iso_639_3_entry
+		id="dry"
+		scope="I"
+		type="L"
+		name="Darai" />
+	<iso_639_3_entry
+		id="dsb"
+		part2_code="dsb"
+		scope="I"
+		type="L"
+		name="Sorbian; Lower" />
+	<iso_639_3_entry
+		id="dse"
+		scope="I"
+		type="L"
+		name="Dutch Sign Language" />
+	<iso_639_3_entry
+		id="dsh"
+		scope="I"
+		type="L"
+		name="Daasanach" />
+	<iso_639_3_entry
+		id="dsi"
+		scope="I"
+		type="L"
+		name="Disa" />
+	<iso_639_3_entry
+		id="dsl"
+		scope="I"
+		type="L"
+		name="Danish Sign Language" />
+	<iso_639_3_entry
+		id="dsn"
+		scope="I"
+		type="L"
+		name="Dusner" />
+	<iso_639_3_entry
+		id="dso"
+		scope="I"
+		type="L"
+		name="Desiya" />
+	<iso_639_3_entry
+		id="dsq"
+		scope="I"
+		type="L"
+		name="Tadaksahak" />
+	<iso_639_3_entry
+		id="dta"
+		scope="I"
+		type="L"
+		name="Daur" />
+	<iso_639_3_entry
+		id="dtb"
+		scope="I"
+		type="L"
+		name="Kadazan; Labuk-Kinabatangan" />
+	<iso_639_3_entry
+		id="dtd"
+		scope="I"
+		type="L"
+		name="Ditidaht" />
+	<iso_639_3_entry
+		id="dti"
+		scope="I"
+		type="L"
+		name="Dogon; Ana Tinga" />
+	<iso_639_3_entry
+		id="dtk"
+		scope="I"
+		type="L"
+		name="Dogon; Tene Kan" />
+	<iso_639_3_entry
+		id="dtm"
+		scope="I"
+		type="L"
+		name="Dogon; Tomo Kan" />
+	<iso_639_3_entry
+		id="dtp"
+		scope="I"
+		type="L"
+		name="Dusun; Central" />
+	<iso_639_3_entry
+		id="dtr"
+		scope="I"
+		type="L"
+		name="Lotud" />
+	<iso_639_3_entry
+		id="dts"
+		scope="I"
+		type="L"
+		name="Dogon; Toro So" />
+	<iso_639_3_entry
+		id="dtt"
+		scope="I"
+		type="L"
+		name="Dogon; Toro Tegu" />
+	<iso_639_3_entry
+		id="dtu"
+		scope="I"
+		type="L"
+		name="Dogon; Tebul Ure" />
+	<iso_639_3_entry
+		id="dua"
+		part2_code="dua"
+		scope="I"
+		type="L"
+		name="Duala" />
+	<iso_639_3_entry
+		id="dub"
+		scope="I"
+		type="L"
+		name="Dubli" />
+	<iso_639_3_entry
+		id="duc"
+		scope="I"
+		type="L"
+		name="Duna" />
+	<iso_639_3_entry
+		id="dud"
+		scope="I"
+		type="L"
+		name="Hun-Saare" />
+	<iso_639_3_entry
+		id="due"
+		scope="I"
+		type="L"
+		name="Agta; Umiray Dumaget" />
+	<iso_639_3_entry
+		id="duf"
+		scope="I"
+		type="L"
+		name="Dumbea" />
+	<iso_639_3_entry
+		id="dug"
+		scope="I"
+		type="L"
+		name="Duruma" />
+	<iso_639_3_entry
+		id="duh"
+		scope="I"
+		type="L"
+		name="Dungra Bhil" />
+	<iso_639_3_entry
+		id="dui"
+		scope="I"
+		type="L"
+		name="Dumun" />
+	<iso_639_3_entry
+		id="duj"
+		scope="I"
+		type="L"
+		name="Dhuwal" />
+	<iso_639_3_entry
+		id="duk"
+		scope="I"
+		type="L"
+		name="Uyajitaya" />
+	<iso_639_3_entry
+		id="dul"
+		scope="I"
+		type="L"
+		name="Agta; Alabat Island" />
+	<iso_639_3_entry
+		id="dum"
+		part2_code="dum"
+		scope="I"
+		type="H"
+		name="Dutch; Middle (ca. 1050-1350)" />
+	<iso_639_3_entry
+		id="dun"
+		scope="I"
+		type="L"
+		name="Dusun Deyah" />
+	<iso_639_3_entry
+		id="duo"
+		scope="I"
+		type="L"
+		name="Agta; Dupaninan" />
+	<iso_639_3_entry
+		id="dup"
+		scope="I"
+		type="L"
+		name="Duano" />
+	<iso_639_3_entry
+		id="duq"
+		scope="I"
+		type="L"
+		name="Dusun Malang" />
+	<iso_639_3_entry
+		id="dur"
+		scope="I"
+		type="L"
+		name="Dii" />
+	<iso_639_3_entry
+		id="dus"
+		scope="I"
+		type="L"
+		name="Dumi" />
+	<iso_639_3_entry
+		id="duu"
+		scope="I"
+		type="L"
+		name="Drung" />
+	<iso_639_3_entry
+		id="duv"
+		scope="I"
+		type="L"
+		name="Duvle" />
+	<iso_639_3_entry
+		id="duw"
+		scope="I"
+		type="L"
+		name="Dusun Witu" />
+	<iso_639_3_entry
+		id="dux"
+		scope="I"
+		type="L"
+		name="Duungooma" />
+	<iso_639_3_entry
+		id="duy"
+		scope="I"
+		type="E"
+		name="Agta; Dicamay" />
+	<iso_639_3_entry
+		id="duz"
+		scope="I"
+		type="E"
+		name="Duli" />
+	<iso_639_3_entry
+		id="dva"
+		scope="I"
+		type="L"
+		name="Duau" />
+	<iso_639_3_entry
+		id="dwa"
+		scope="I"
+		type="L"
+		name="Diri" />
+	<iso_639_3_entry
+		id="dwl"
+		scope="I"
+		type="L"
+		name="Dogon; Walo Kumbe" />
+	<iso_639_3_entry
+		id="dwr"
+		scope="I"
+		type="L"
+		name="Dawro" />
+	<iso_639_3_entry
+		id="dws"
+		scope="I"
+		type="C"
+		name="Dutton World Speedwords" />
+	<iso_639_3_entry
+		id="dww"
+		scope="I"
+		type="L"
+		name="Dawawa" />
+	<iso_639_3_entry
+		id="dya"
+		scope="I"
+		type="L"
+		name="Dyan" />
+	<iso_639_3_entry
+		id="dyb"
+		scope="I"
+		type="E"
+		name="Dyaberdyaber" />
+	<iso_639_3_entry
+		id="dyd"
+		scope="I"
+		type="E"
+		name="Dyugun" />
+	<iso_639_3_entry
+		id="dyg"
+		scope="I"
+		type="E"
+		name="Agta; Villa Viciosa" />
+	<iso_639_3_entry
+		id="dyi"
+		scope="I"
+		type="L"
+		name="Senoufo; Djimini" />
+	<iso_639_3_entry
+		id="dym"
+		scope="I"
+		type="L"
+		name="Dogon; Yanda Dom" />
+	<iso_639_3_entry
+		id="dyn"
+		scope="I"
+		type="L"
+		name="Dyangadi" />
+	<iso_639_3_entry
+		id="dyo"
+		scope="I"
+		type="L"
+		name="Jola-Fonyi" />
+	<iso_639_3_entry
+		id="dyu"
+		part2_code="dyu"
+		scope="I"
+		type="L"
+		name="Dyula" />
+	<iso_639_3_entry
+		id="dyy"
+		scope="I"
+		type="L"
+		name="Dyaabugay" />
+	<iso_639_3_entry
+		id="dza"
+		scope="I"
+		type="L"
+		name="Tunzu" />
+	<iso_639_3_entry
+		id="dzd"
+		scope="I"
+		type="L"
+		name="Daza" />
+	<iso_639_3_entry
+		id="dzg"
+		scope="I"
+		type="L"
+		name="Dazaga" />
+	<iso_639_3_entry
+		id="dzl"
+		scope="I"
+		type="L"
+		name="Dzalakha" />
+	<iso_639_3_entry
+		id="dzn"
+		scope="I"
+		type="L"
+		name="Dzando" />
+	<iso_639_3_entry
+		id="dzo"
+		part1_code="dz"
+		part2_code="dzo"
+		scope="I"
+		type="L"
+		name="Dzongkha" />
+	<iso_639_3_entry
+		id="ebg"
+		scope="I"
+		type="L"
+		name="Ebughu" />
+	<iso_639_3_entry
+		id="ebk"
+		scope="I"
+		type="L"
+		name="Bontok; Eastern" />
+	<iso_639_3_entry
+		id="ebo"
+		scope="I"
+		type="L"
+		name="Teke-Ebo" />
+	<iso_639_3_entry
+		id="ebr"
+		scope="I"
+		type="L"
+		name="Ebrié" />
+	<iso_639_3_entry
+		id="ebu"
+		scope="I"
+		type="L"
+		name="Embu" />
+	<iso_639_3_entry
+		id="ecr"
+		scope="I"
+		type="A"
+		name="Eteocretan" />
+	<iso_639_3_entry
+		id="ecs"
+		scope="I"
+		type="L"
+		name="Ecuadorian Sign Language" />
+	<iso_639_3_entry
+		id="ecy"
+		scope="I"
+		type="A"
+		name="Eteocypriot" />
+	<iso_639_3_entry
+		id="eee"
+		scope="I"
+		type="L"
+		name="E" />
+	<iso_639_3_entry
+		id="efa"
+		scope="I"
+		type="L"
+		name="Efai" />
+	<iso_639_3_entry
+		id="efe"
+		scope="I"
+		type="L"
+		name="Efe" />
+	<iso_639_3_entry
+		id="efi"
+		part2_code="efi"
+		scope="I"
+		type="L"
+		name="Efik" />
+	<iso_639_3_entry
+		id="ega"
+		scope="I"
+		type="L"
+		name="Ega" />
+	<iso_639_3_entry
+		id="egl"
+		scope="I"
+		type="L"
+		name="Emilian" />
+	<iso_639_3_entry
+		id="ego"
+		scope="I"
+		type="L"
+		name="Eggon" />
+	<iso_639_3_entry
+		id="egy"
+		part2_code="egy"
+		scope="I"
+		type="A"
+		name="Egyptian (Ancient)" />
+	<iso_639_3_entry
+		id="ehu"
+		scope="I"
+		type="L"
+		name="Ehueun" />
+	<iso_639_3_entry
+		id="eip"
+		scope="I"
+		type="L"
+		name="Eipomek" />
+	<iso_639_3_entry
+		id="eit"
+		scope="I"
+		type="L"
+		name="Eitiep" />
+	<iso_639_3_entry
+		id="eiv"
+		scope="I"
+		type="L"
+		name="Askopan" />
+	<iso_639_3_entry
+		id="eja"
+		scope="I"
+		type="L"
+		name="Ejamat" />
+	<iso_639_3_entry
+		id="eka"
+		part2_code="eka"
+		scope="I"
+		type="L"
+		name="Ekajuk" />
+	<iso_639_3_entry
+		id="eke"
+		scope="I"
+		type="L"
+		name="Ekit" />
+	<iso_639_3_entry
+		id="ekg"
+		scope="I"
+		type="L"
+		name="Ekari" />
+	<iso_639_3_entry
+		id="eki"
+		scope="I"
+		type="L"
+		name="Eki" />
+	<iso_639_3_entry
+		id="ekk"
+		scope="I"
+		type="L"
+		name="Estonian; Standard" />
+	<iso_639_3_entry
+		id="ekl"
+		scope="I"
+		type="L"
+		name="Kol" />
+	<iso_639_3_entry
+		id="ekm"
+		scope="I"
+		type="L"
+		name="Elip" />
+	<iso_639_3_entry
+		id="eko"
+		scope="I"
+		type="L"
+		name="Koti" />
+	<iso_639_3_entry
+		id="ekp"
+		scope="I"
+		type="L"
+		name="Ekpeye" />
+	<iso_639_3_entry
+		id="ekr"
+		scope="I"
+		type="L"
+		name="Yace" />
+	<iso_639_3_entry
+		id="eky"
+		scope="I"
+		type="L"
+		name="Kayah; Eastern" />
+	<iso_639_3_entry
+		id="ele"
+		scope="I"
+		type="L"
+		name="Elepi" />
+	<iso_639_3_entry
+		id="elh"
+		scope="I"
+		type="L"
+		name="El Hugeirat" />
+	<iso_639_3_entry
+		id="eli"
+		scope="I"
+		type="E"
+		name="Nding" />
+	<iso_639_3_entry
+		id="elk"
+		scope="I"
+		type="L"
+		name="Elkei" />
+	<iso_639_3_entry
+		id="ell"
+		part1_code="el"
+		part2_code="gre"
+		scope="I"
+		type="L"
+		name="Greek; Modern (1453-)" />
+	<iso_639_3_entry
+		id="elm"
+		scope="I"
+		type="L"
+		name="Eleme" />
+	<iso_639_3_entry
+		id="elo"
+		scope="I"
+		type="L"
+		name="El Molo" />
+	<iso_639_3_entry
+		id="elp"
+		scope="I"
+		type="L"
+		name="Elpaputih" />
+	<iso_639_3_entry
+		id="elu"
+		scope="I"
+		type="L"
+		name="Elu" />
+	<iso_639_3_entry
+		id="elx"
+		part2_code="elx"
+		scope="I"
+		type="A"
+		name="Elamite" />
+	<iso_639_3_entry
+		id="ema"
+		scope="I"
+		type="L"
+		name="Emai-Iuleha-Ora" />
+	<iso_639_3_entry
+		id="emb"
+		scope="I"
+		type="L"
+		name="Embaloh" />
+	<iso_639_3_entry
+		id="eme"
+		scope="I"
+		type="L"
+		name="Emerillon" />
+	<iso_639_3_entry
+		id="emg"
+		scope="I"
+		type="L"
+		name="Meohang; Eastern" />
+	<iso_639_3_entry
+		id="emi"
+		scope="I"
+		type="L"
+		name="Mussau-Emira" />
+	<iso_639_3_entry
+		id="emk"
+		scope="I"
+		type="L"
+		name="Maninkakan; Eastern" />
+	<iso_639_3_entry
+		id="emm"
+		scope="I"
+		type="E"
+		name="Mamulique" />
+	<iso_639_3_entry
+		id="emn"
+		scope="I"
+		type="L"
+		name="Eman" />
+	<iso_639_3_entry
+		id="emo"
+		scope="I"
+		type="E"
+		name="Emok" />
+	<iso_639_3_entry
+		id="emp"
+		scope="I"
+		type="L"
+		name="Emberá; Northern" />
+	<iso_639_3_entry
+		id="ems"
+		scope="I"
+		type="L"
+		name="Yupik; Pacific Gulf" />
+	<iso_639_3_entry
+		id="emu"
+		scope="I"
+		type="L"
+		name="Muria; Eastern" />
+	<iso_639_3_entry
+		id="emw"
+		scope="I"
+		type="L"
+		name="Emplawas" />
+	<iso_639_3_entry
+		id="emx"
+		scope="I"
+		type="L"
+		name="Erromintxela" />
+	<iso_639_3_entry
+		id="emy"
+		scope="I"
+		type="E"
+		name="Mayan; Epigraphic" />
+	<iso_639_3_entry
+		id="ena"
+		scope="I"
+		type="L"
+		name="Apali" />
+	<iso_639_3_entry
+		id="enb"
+		scope="I"
+		type="L"
+		name="Markweeta" />
+	<iso_639_3_entry
+		id="enc"
+		scope="I"
+		type="L"
+		name="En" />
+	<iso_639_3_entry
+		id="end"
+		scope="I"
+		type="L"
+		name="Ende" />
+	<iso_639_3_entry
+		id="enf"
+		scope="I"
+		type="L"
+		name="Enets; Forest" />
+	<iso_639_3_entry
+		id="eng"
+		part1_code="en"
+		part2_code="eng"
+		scope="I"
+		type="L"
+		name="English" />
+	<iso_639_3_entry
+		id="enh"
+		scope="I"
+		type="L"
+		name="Enets; Tundra" />
+	<iso_639_3_entry
+		id="enm"
+		part2_code="enm"
+		scope="I"
+		type="H"
+		name="English; Middle (1100-1500)" />
+	<iso_639_3_entry
+		id="enn"
+		scope="I"
+		type="L"
+		name="Engenni" />
+	<iso_639_3_entry
+		id="eno"
+		scope="I"
+		type="L"
+		name="Enggano" />
+	<iso_639_3_entry
+		id="enq"
+		scope="I"
+		type="L"
+		name="Enga" />
+	<iso_639_3_entry
+		id="enr"
+		scope="I"
+		type="L"
+		name="Emumu" />
+	<iso_639_3_entry
+		id="enu"
+		scope="I"
+		type="L"
+		name="Enu" />
+	<iso_639_3_entry
+		id="env"
+		scope="I"
+		type="L"
+		name="Enwan (Edu State)" />
+	<iso_639_3_entry
+		id="enw"
+		scope="I"
+		type="L"
+		name="Enwan (Akwa Ibom State)" />
+	<iso_639_3_entry
+		id="eot"
+		scope="I"
+		type="L"
+		name="Beti (Côte d'Ivoire)" />
+	<iso_639_3_entry
+		id="epi"
+		scope="I"
+		type="L"
+		name="Epie" />
+	<iso_639_3_entry
+		id="epo"
+		part1_code="eo"
+		part2_code="epo"
+		scope="I"
+		type="C"
+		name="Esperanto" />
+	<iso_639_3_entry
+		id="era"
+		scope="I"
+		type="L"
+		name="Eravallan" />
+	<iso_639_3_entry
+		id="erg"
+		scope="I"
+		type="L"
+		name="Sie" />
+	<iso_639_3_entry
+		id="erh"
+		scope="I"
+		type="L"
+		name="Eruwa" />
+	<iso_639_3_entry
+		id="eri"
+		scope="I"
+		type="L"
+		name="Ogea" />
+	<iso_639_3_entry
+		id="erk"
+		scope="I"
+		type="L"
+		name="Efate; South" />
+	<iso_639_3_entry
+		id="ero"
+		scope="I"
+		type="L"
+		name="Horpa" />
+	<iso_639_3_entry
+		id="err"
+		scope="I"
+		type="E"
+		name="Erre" />
+	<iso_639_3_entry
+		id="ers"
+		scope="I"
+		type="L"
+		name="Ersu" />
+	<iso_639_3_entry
+		id="ert"
+		scope="I"
+		type="L"
+		name="Eritai" />
+	<iso_639_3_entry
+		id="erw"
+		scope="I"
+		type="L"
+		name="Erokwanas" />
+	<iso_639_3_entry
+		id="ese"
+		scope="I"
+		type="L"
+		name="Ese Ejja" />
+	<iso_639_3_entry
+		id="esh"
+		scope="I"
+		type="L"
+		name="Eshtehardi" />
+	<iso_639_3_entry
+		id="esi"
+		scope="I"
+		type="L"
+		name="Inupiatun; North Alaskan" />
+	<iso_639_3_entry
+		id="esk"
+		scope="I"
+		type="L"
+		name="Inupiatun; Northwest Alaska" />
+	<iso_639_3_entry
+		id="esl"
+		scope="I"
+		type="L"
+		name="Egypt Sign Language" />
+	<iso_639_3_entry
+		id="esm"
+		scope="I"
+		type="E"
+		name="Esuma" />
+	<iso_639_3_entry
+		id="esn"
+		scope="I"
+		type="L"
+		name="Salvadoran Sign Language" />
+	<iso_639_3_entry
+		id="eso"
+		scope="I"
+		type="L"
+		name="Estonian Sign Language" />
+	<iso_639_3_entry
+		id="esq"
+		scope="I"
+		type="E"
+		name="Esselen" />
+	<iso_639_3_entry
+		id="ess"
+		scope="I"
+		type="L"
+		name="Yupik; Central Siberian" />
+	<iso_639_3_entry
+		id="est"
+		part1_code="et"
+		part2_code="est"
+		scope="M"
+		type="L"
+		name="Estonian" />
+	<iso_639_3_entry
+		id="esu"
+		scope="I"
+		type="L"
+		name="Yupik; Central" />
+	<iso_639_3_entry
+		id="etb"
+		scope="I"
+		type="L"
+		name="Etebi" />
+	<iso_639_3_entry
+		id="etc"
+		scope="I"
+		type="E"
+		name="Etchemin" />
+	<iso_639_3_entry
+		id="eth"
+		scope="I"
+		type="L"
+		name="Ethiopian Sign Language" />
+	<iso_639_3_entry
+		id="etn"
+		scope="I"
+		type="L"
+		name="Eton (Vanuatu)" />
+	<iso_639_3_entry
+		id="eto"
+		scope="I"
+		type="L"
+		name="Eton (Cameroon)" />
+	<iso_639_3_entry
+		id="etr"
+		scope="I"
+		type="L"
+		name="Edolo" />
+	<iso_639_3_entry
+		id="ets"
+		scope="I"
+		type="L"
+		name="Yekhee" />
+	<iso_639_3_entry
+		id="ett"
+		scope="I"
+		type="A"
+		name="Etruscan" />
+	<iso_639_3_entry
+		id="etu"
+		scope="I"
+		type="L"
+		name="Ejagham" />
+	<iso_639_3_entry
+		id="etx"
+		scope="I"
+		type="L"
+		name="Eten" />
+	<iso_639_3_entry
+		id="etz"
+		scope="I"
+		type="L"
+		name="Semimi" />
+	<iso_639_3_entry
+		id="eus"
+		part1_code="eu"
+		part2_code="baq"
+		scope="I"
+		type="L"
+		name="Basque" />
+	<iso_639_3_entry
+		id="eve"
+		scope="I"
+		type="L"
+		name="Even" />
+	<iso_639_3_entry
+		id="evh"
+		scope="I"
+		type="L"
+		name="Uvbie" />
+	<iso_639_3_entry
+		id="evn"
+		scope="I"
+		type="L"
+		name="Evenki" />
+	<iso_639_3_entry
+		id="ewe"
+		part1_code="ee"
+		part2_code="ewe"
+		scope="I"
+		type="L"
+		name="Ewe" />
+	<iso_639_3_entry
+		id="ewo"
+		part2_code="ewo"
+		scope="I"
+		type="L"
+		name="Ewondo" />
+	<iso_639_3_entry
+		id="ext"
+		scope="I"
+		type="L"
+		name="Extremaduran" />
+	<iso_639_3_entry
+		id="eya"
+		scope="I"
+		type="E"
+		name="Eyak" />
+	<iso_639_3_entry
+		id="eyo"
+		scope="I"
+		type="L"
+		name="Keiyo" />
+	<iso_639_3_entry
+		id="eze"
+		scope="I"
+		type="L"
+		name="Uzekwe" />
+	<iso_639_3_entry
+		id="faa"
+		scope="I"
+		type="L"
+		name="Fasu" />
+	<iso_639_3_entry
+		id="fab"
+		scope="I"
+		type="L"
+		name="Fa D'ambu" />
+	<iso_639_3_entry
+		id="fad"
+		scope="I"
+		type="L"
+		name="Wagi" />
+	<iso_639_3_entry
+		id="faf"
+		scope="I"
+		type="L"
+		name="Fagani" />
+	<iso_639_3_entry
+		id="fag"
+		scope="I"
+		type="L"
+		name="Finongan" />
+	<iso_639_3_entry
+		id="fah"
+		scope="I"
+		type="L"
+		name="Fali; Baissa" />
+	<iso_639_3_entry
+		id="fai"
+		scope="I"
+		type="L"
+		name="Faiwol" />
+	<iso_639_3_entry
+		id="faj"
+		scope="I"
+		type="L"
+		name="Faita" />
+	<iso_639_3_entry
+		id="fak"
+		scope="I"
+		type="L"
+		name="Fang (Cameroon)" />
+	<iso_639_3_entry
+		id="fal"
+		scope="I"
+		type="L"
+		name="Fali; South" />
+	<iso_639_3_entry
+		id="fam"
+		scope="I"
+		type="L"
+		name="Fam" />
+	<iso_639_3_entry
+		id="fan"
+		part2_code="fan"
+		scope="I"
+		type="L"
+		name="Fang (Equatorial Guinea)" />
+	<iso_639_3_entry
+		id="fao"
+		part1_code="fo"
+		part2_code="fao"
+		scope="I"
+		type="L"
+		name="Faroese" />
+	<iso_639_3_entry
+		id="fap"
+		scope="I"
+		type="L"
+		name="Palor" />
+	<iso_639_3_entry
+		id="far"
+		scope="I"
+		type="L"
+		name="Fataleka" />
+	<iso_639_3_entry
+		id="fas"
+		part1_code="fa"
+		part2_code="per"
+		scope="M"
+		type="L"
+		name="Persian" />
+	<iso_639_3_entry
+		id="fat"
+		part2_code="fat"
+		scope="I"
+		type="L"
+		name="Fanti" />
+	<iso_639_3_entry
+		id="fau"
+		scope="I"
+		type="L"
+		name="Fayu" />
+	<iso_639_3_entry
+		id="fax"
+		scope="I"
+		type="L"
+		name="Fala" />
+	<iso_639_3_entry
+		id="fay"
+		scope="I"
+		type="L"
+		name="Fars; Southwestern" />
+	<iso_639_3_entry
+		id="faz"
+		scope="I"
+		type="L"
+		name="Fars; Northwestern" />
+	<iso_639_3_entry
+		id="fbl"
+		scope="I"
+		type="L"
+		name="Bikol; West Albay" />
+	<iso_639_3_entry
+		id="fcs"
+		scope="I"
+		type="L"
+		name="Quebec Sign Language" />
+	<iso_639_3_entry
+		id="fer"
+		scope="I"
+		type="L"
+		name="Feroge" />
+	<iso_639_3_entry
+		id="ffi"
+		scope="I"
+		type="L"
+		name="Foia Foia" />
+	<iso_639_3_entry
+		id="ffm"
+		scope="I"
+		type="L"
+		name="Fulfulde; Maasina" />
+	<iso_639_3_entry
+		id="fgr"
+		scope="I"
+		type="L"
+		name="Fongoro" />
+	<iso_639_3_entry
+		id="fia"
+		scope="I"
+		type="L"
+		name="Nobiin" />
+	<iso_639_3_entry
+		id="fie"
+		scope="I"
+		type="L"
+		name="Fyer" />
+	<iso_639_3_entry
+		id="fij"
+		part1_code="fj"
+		part2_code="fij"
+		scope="I"
+		type="L"
+		name="Fijian" />
+	<iso_639_3_entry
+		id="fil"
+		part2_code="fil"
+		scope="I"
+		type="L"
+		name="Filipino" />
+	<iso_639_3_entry
+		id="fin"
+		part1_code="fi"
+		part2_code="fin"
+		scope="I"
+		type="L"
+		name="Finnish" />
+	<iso_639_3_entry
+		id="fip"
+		scope="I"
+		type="L"
+		name="Fipa" />
+	<iso_639_3_entry
+		id="fir"
+		scope="I"
+		type="L"
+		name="Firan" />
+	<iso_639_3_entry
+		id="fit"
+		scope="I"
+		type="L"
+		name="Finnish; Tornedalen" />
+	<iso_639_3_entry
+		id="fiw"
+		scope="I"
+		type="L"
+		name="Fiwaga" />
+	<iso_639_3_entry
+		id="fkv"
+		scope="I"
+		type="L"
+		name="Finnish; Kven" />
+	<iso_639_3_entry
+		id="fla"
+		scope="I"
+		type="L"
+		name="Kalispel-Pend d'Oreille" />
+	<iso_639_3_entry
+		id="flh"
+		scope="I"
+		type="L"
+		name="Foau" />
+	<iso_639_3_entry
+		id="fli"
+		scope="I"
+		type="L"
+		name="Fali" />
+	<iso_639_3_entry
+		id="fll"
+		scope="I"
+		type="L"
+		name="Fali; North" />
+	<iso_639_3_entry
+		id="fln"
+		scope="I"
+		type="E"
+		name="Flinders Island" />
+	<iso_639_3_entry
+		id="flr"
+		scope="I"
+		type="L"
+		name="Fuliiru" />
+	<iso_639_3_entry
+		id="fly"
+		scope="I"
+		type="L"
+		name="Tsotsitaal" />
+	<iso_639_3_entry
+		id="fmp"
+		scope="I"
+		type="L"
+		name="Fe'fe'" />
+	<iso_639_3_entry
+		id="fmu"
+		scope="I"
+		type="L"
+		name="Muria; Far Western" />
+	<iso_639_3_entry
+		id="fng"
+		scope="I"
+		type="L"
+		name="Fanagalo" />
+	<iso_639_3_entry
+		id="fni"
+		scope="I"
+		type="L"
+		name="Fania" />
+	<iso_639_3_entry
+		id="fod"
+		scope="I"
+		type="L"
+		name="Foodo" />
+	<iso_639_3_entry
+		id="foi"
+		scope="I"
+		type="L"
+		name="Foi" />
+	<iso_639_3_entry
+		id="fom"
+		scope="I"
+		type="L"
+		name="Foma" />
+	<iso_639_3_entry
+		id="fon"
+		part2_code="fon"
+		scope="I"
+		type="L"
+		name="Fon" />
+	<iso_639_3_entry
+		id="for"
+		scope="I"
+		type="L"
+		name="Fore" />
+	<iso_639_3_entry
+		id="fos"
+		scope="I"
+		type="E"
+		name="Siraya" />
+	<iso_639_3_entry
+		id="fpe"
+		scope="I"
+		type="L"
+		name="Creole English; Fernando Po" />
+	<iso_639_3_entry
+		id="fqs"
+		scope="I"
+		type="L"
+		name="Fas" />
+	<iso_639_3_entry
+		id="fra"
+		part1_code="fr"
+		part2_code="fre"
+		scope="I"
+		type="L"
+		name="French" />
+	<iso_639_3_entry
+		id="frc"
+		scope="I"
+		type="L"
+		name="French; Cajun" />
+	<iso_639_3_entry
+		id="frd"
+		scope="I"
+		type="L"
+		name="Fordata" />
+	<iso_639_3_entry
+		id="frk"
+		scope="I"
+		type="E"
+		name="Frankish" />
+	<iso_639_3_entry
+		id="frm"
+		part2_code="frm"
+		scope="I"
+		type="H"
+		name="French; Middle (ca. 1400-1600)" />
+	<iso_639_3_entry
+		id="fro"
+		part2_code="fro"
+		scope="I"
+		type="H"
+		name="French; Old (842-ca. 1400)" />
+	<iso_639_3_entry
+		id="frp"
+		scope="I"
+		type="L"
+		name="Arpitan" />
+	<iso_639_3_entry
+		id="frq"
+		scope="I"
+		type="L"
+		name="Forak" />
+	<iso_639_3_entry
+		id="frr"
+		part2_code="frr"
+		scope="I"
+		type="L"
+		name="Frisian; Northern" />
+	<iso_639_3_entry
+		id="frs"
+		part2_code="frs"
+		scope="I"
+		type="L"
+		name="Frisian; Eastern" />
+	<iso_639_3_entry
+		id="frt"
+		scope="I"
+		type="L"
+		name="Fortsenal" />
+	<iso_639_3_entry
+		id="fry"
+		part1_code="fy"
+		part2_code="fry"
+		scope="I"
+		type="L"
+		name="Frisian; Western" />
+	<iso_639_3_entry
+		id="fse"
+		scope="I"
+		type="L"
+		name="Finnish Sign Language" />
+	<iso_639_3_entry
+		id="fsl"
+		scope="I"
+		type="L"
+		name="French Sign Language" />
+	<iso_639_3_entry
+		id="fss"
+		scope="I"
+		type="L"
+		name="Finland-Swedish Sign Language" />
+	<iso_639_3_entry
+		id="fub"
+		scope="I"
+		type="L"
+		name="Fulfulde; Adamawa" />
+	<iso_639_3_entry
+		id="fuc"
+		scope="I"
+		type="L"
+		name="Pulaar" />
+	<iso_639_3_entry
+		id="fud"
+		scope="I"
+		type="L"
+		name="Futuna; East" />
+	<iso_639_3_entry
+		id="fue"
+		scope="I"
+		type="L"
+		name="Fulfulde; Borgu" />
+	<iso_639_3_entry
+		id="fuf"
+		scope="I"
+		type="L"
+		name="Pular" />
+	<iso_639_3_entry
+		id="fuh"
+		scope="I"
+		type="L"
+		name="Fulfulde; Western Niger" />
+	<iso_639_3_entry
+		id="fui"
+		scope="I"
+		type="L"
+		name="Fulfulde; Bagirmi" />
+	<iso_639_3_entry
+		id="fuj"
+		scope="I"
+		type="L"
+		name="Ko" />
+	<iso_639_3_entry
+		id="ful"
+		part1_code="ff"
+		part2_code="ful"
+		scope="M"
+		type="L"
+		name="Fulah" />
+	<iso_639_3_entry
+		id="fum"
+		scope="I"
+		type="L"
+		name="Fum" />
+	<iso_639_3_entry
+		id="fun"
+		scope="I"
+		type="L"
+		name="Fulniô" />
+	<iso_639_3_entry
+		id="fuq"
+		scope="I"
+		type="L"
+		name="Fulfulde; Central-Eastern Niger" />
+	<iso_639_3_entry
+		id="fur"
+		part2_code="fur"
+		scope="I"
+		type="L"
+		name="Friulian" />
+	<iso_639_3_entry
+		id="fut"
+		scope="I"
+		type="L"
+		name="Futuna-Aniwa" />
+	<iso_639_3_entry
+		id="fuu"
+		scope="I"
+		type="L"
+		name="Furu" />
+	<iso_639_3_entry
+		id="fuv"
+		scope="I"
+		type="L"
+		name="Fulfulde; Nigerian" />
+	<iso_639_3_entry
+		id="fuy"
+		scope="I"
+		type="L"
+		name="Fuyug" />
+	<iso_639_3_entry
+		id="fvr"
+		scope="I"
+		type="L"
+		name="Fur" />
+	<iso_639_3_entry
+		id="fwa"
+		scope="I"
+		type="L"
+		name="Fwâi" />
+	<iso_639_3_entry
+		id="fwe"
+		scope="I"
+		type="L"
+		name="Fwe" />
+	<iso_639_3_entry
+		id="gaa"
+		part2_code="gaa"
+		scope="I"
+		type="L"
+		name="Ga" />
+	<iso_639_3_entry
+		id="gab"
+		scope="I"
+		type="L"
+		name="Gabri" />
+	<iso_639_3_entry
+		id="gac"
+		scope="I"
+		type="L"
+		name="Great Andamanese; Mixed" />
+	<iso_639_3_entry
+		id="gad"
+		scope="I"
+		type="L"
+		name="Gaddang" />
+	<iso_639_3_entry
+		id="gae"
+		scope="I"
+		type="L"
+		name="Guarequena" />
+	<iso_639_3_entry
+		id="gaf"
+		scope="I"
+		type="L"
+		name="Gende" />
+	<iso_639_3_entry
+		id="gag"
+		scope="I"
+		type="L"
+		name="Gagauz" />
+	<iso_639_3_entry
+		id="gah"
+		scope="I"
+		type="L"
+		name="Alekano" />
+	<iso_639_3_entry
+		id="gai"
+		scope="I"
+		type="L"
+		name="Borei" />
+	<iso_639_3_entry
+		id="gaj"
+		scope="I"
+		type="L"
+		name="Gadsup" />
+	<iso_639_3_entry
+		id="gak"
+		scope="I"
+		type="L"
+		name="Gamkonora" />
+	<iso_639_3_entry
+		id="gal"
+		scope="I"
+		type="L"
+		name="Galoli" />
+	<iso_639_3_entry
+		id="gam"
+		scope="I"
+		type="L"
+		name="Kandawo" />
+	<iso_639_3_entry
+		id="gan"
+		scope="I"
+		type="L"
+		name="Chinese; Gan" />
+	<iso_639_3_entry
+		id="gao"
+		scope="I"
+		type="L"
+		name="Gants" />
+	<iso_639_3_entry
+		id="gap"
+		scope="I"
+		type="L"
+		name="Gal" />
+	<iso_639_3_entry
+		id="gaq"
+		scope="I"
+		type="L"
+		name="Gata'" />
+	<iso_639_3_entry
+		id="gar"
+		scope="I"
+		type="L"
+		name="Galeya" />
+	<iso_639_3_entry
+		id="gas"
+		scope="I"
+		type="L"
+		name="Garasia; Adiwasi" />
+	<iso_639_3_entry
+		id="gat"
+		scope="I"
+		type="L"
+		name="Kenati" />
+	<iso_639_3_entry
+		id="gau"
+		scope="I"
+		type="L"
+		name="Gadaba; Mudhili" />
+	<iso_639_3_entry
+		id="gaw"
+		scope="I"
+		type="L"
+		name="Nobonob" />
+	<iso_639_3_entry
+		id="gax"
+		scope="I"
+		type="L"
+		name="Oromo; Borana-Arsi-Guji" />
+	<iso_639_3_entry
+		id="gay"
+		part2_code="gay"
+		scope="I"
+		type="L"
+		name="Gayo" />
+	<iso_639_3_entry
+		id="gaz"
+		scope="I"
+		type="L"
+		name="Oromo; West Central" />
+	<iso_639_3_entry
+		id="gba"
+		part2_code="gba"
+		scope="M"
+		type="L"
+		name="Gbaya (Central African Republic)" />
+	<iso_639_3_entry
+		id="gbb"
+		scope="I"
+		type="L"
+		name="Kaytetye" />
+	<iso_639_3_entry
+		id="gbc"
+		scope="I"
+		type="L"
+		name="Garawa" />
+	<iso_639_3_entry
+		id="gbd"
+		scope="I"
+		type="L"
+		name="Karadjeri" />
+	<iso_639_3_entry
+		id="gbe"
+		scope="I"
+		type="L"
+		name="Niksek" />
+	<iso_639_3_entry
+		id="gbf"
+		scope="I"
+		type="L"
+		name="Gaikundi" />
+	<iso_639_3_entry
+		id="gbg"
+		scope="I"
+		type="L"
+		name="Gbanziri" />
+	<iso_639_3_entry
+		id="gbh"
+		scope="I"
+		type="L"
+		name="Gbe; Defi" />
+	<iso_639_3_entry
+		id="gbi"
+		scope="I"
+		type="L"
+		name="Galela" />
+	<iso_639_3_entry
+		id="gbj"
+		scope="I"
+		type="L"
+		name="Gadaba; Bodo" />
+	<iso_639_3_entry
+		id="gbk"
+		scope="I"
+		type="L"
+		name="Gaddi" />
+	<iso_639_3_entry
+		id="gbl"
+		scope="I"
+		type="L"
+		name="Gamit" />
+	<iso_639_3_entry
+		id="gbm"
+		scope="I"
+		type="L"
+		name="Garhwali" />
+	<iso_639_3_entry
+		id="gbn"
+		scope="I"
+		type="L"
+		name="Mo'da" />
+	<iso_639_3_entry
+		id="gbo"
+		scope="I"
+		type="L"
+		name="Grebo; Northern" />
+	<iso_639_3_entry
+		id="gbp"
+		scope="I"
+		type="L"
+		name="Gbaya-Bossangoa" />
+	<iso_639_3_entry
+		id="gbq"
+		scope="I"
+		type="L"
+		name="Gbaya-Bozoum" />
+	<iso_639_3_entry
+		id="gbr"
+		scope="I"
+		type="L"
+		name="Gbagyi" />
+	<iso_639_3_entry
+		id="gbs"
+		scope="I"
+		type="L"
+		name="Gbe; Gbesi" />
+	<iso_639_3_entry
+		id="gbu"
+		scope="I"
+		type="L"
+		name="Gagadu" />
+	<iso_639_3_entry
+		id="gbv"
+		scope="I"
+		type="L"
+		name="Gbanu" />
+	<iso_639_3_entry
+		id="gbx"
+		scope="I"
+		type="L"
+		name="Gbe; Eastern Xwla" />
+	<iso_639_3_entry
+		id="gby"
+		scope="I"
+		type="L"
+		name="Gbari" />
+	<iso_639_3_entry
+		id="gbz"
+		scope="I"
+		type="L"
+		name="Dari; Zoroastrian" />
+	<iso_639_3_entry
+		id="gcc"
+		scope="I"
+		type="L"
+		name="Mali" />
+	<iso_639_3_entry
+		id="gcd"
+		scope="I"
+		type="E"
+		name="Ganggalida" />
+	<iso_639_3_entry
+		id="gce"
+		scope="I"
+		type="E"
+		name="Galice" />
+	<iso_639_3_entry
+		id="gcf"
+		scope="I"
+		type="L"
+		name="Creole French; Guadeloupean" />
+	<iso_639_3_entry
+		id="gcl"
+		scope="I"
+		type="L"
+		name="Creole English; Grenadian" />
+	<iso_639_3_entry
+		id="gcn"
+		scope="I"
+		type="L"
+		name="Gaina" />
+	<iso_639_3_entry
+		id="gcr"
+		scope="I"
+		type="L"
+		name="Creole French; Guianese" />
+	<iso_639_3_entry
+		id="gct"
+		scope="I"
+		type="L"
+		name="German; Colonia Tovar" />
+	<iso_639_3_entry
+		id="gda"
+		scope="I"
+		type="L"
+		name="Lohar; Gade" />
+	<iso_639_3_entry
+		id="gdb"
+		scope="I"
+		type="L"
+		name="Gadaba; Pottangi Ollar" />
+	<iso_639_3_entry
+		id="gdc"
+		scope="I"
+		type="E"
+		name="Gugu Badhun" />
+	<iso_639_3_entry
+		id="gdd"
+		scope="I"
+		type="L"
+		name="Gedaged" />
+	<iso_639_3_entry
+		id="gde"
+		scope="I"
+		type="L"
+		name="Gude" />
+	<iso_639_3_entry
+		id="gdf"
+		scope="I"
+		type="L"
+		name="Guduf-Gava" />
+	<iso_639_3_entry
+		id="gdg"
+		scope="I"
+		type="L"
+		name="Ga'dang" />
+	<iso_639_3_entry
+		id="gdh"
+		scope="I"
+		type="L"
+		name="Gadjerawang" />
+	<iso_639_3_entry
+		id="gdi"
+		scope="I"
+		type="L"
+		name="Gundi" />
+	<iso_639_3_entry
+		id="gdj"
+		scope="I"
+		type="L"
+		name="Gurdjar" />
+	<iso_639_3_entry
+		id="gdk"
+		scope="I"
+		type="L"
+		name="Gadang" />
+	<iso_639_3_entry
+		id="gdl"
+		scope="I"
+		type="L"
+		name="Dirasha" />
+	<iso_639_3_entry
+		id="gdm"
+		scope="I"
+		type="L"
+		name="Laal" />
+	<iso_639_3_entry
+		id="gdn"
+		scope="I"
+		type="L"
+		name="Umanakaina" />
+	<iso_639_3_entry
+		id="gdo"
+		scope="I"
+		type="L"
+		name="Ghodoberi" />
+	<iso_639_3_entry
+		id="gdq"
+		scope="I"
+		type="L"
+		name="Mehri" />
+	<iso_639_3_entry
+		id="gdr"
+		scope="I"
+		type="L"
+		name="Wipi" />
+	<iso_639_3_entry
+		id="gdu"
+		scope="I"
+		type="L"
+		name="Gudu" />
+	<iso_639_3_entry
+		id="gdx"
+		scope="I"
+		type="L"
+		name="Godwari" />
+	<iso_639_3_entry
+		id="gea"
+		scope="I"
+		type="L"
+		name="Geruma" />
+	<iso_639_3_entry
+		id="geb"
+		scope="I"
+		type="L"
+		name="Kire" />
+	<iso_639_3_entry
+		id="gec"
+		scope="I"
+		type="L"
+		name="Grebo; Gboloo" />
+	<iso_639_3_entry
+		id="ged"
+		scope="I"
+		type="L"
+		name="Gade" />
+	<iso_639_3_entry
+		id="geg"
+		scope="I"
+		type="L"
+		name="Gengle" />
+	<iso_639_3_entry
+		id="geh"
+		scope="I"
+		type="L"
+		name="German; Hutterite" />
+	<iso_639_3_entry
+		id="gei"
+		scope="I"
+		type="L"
+		name="Gebe" />
+	<iso_639_3_entry
+		id="gej"
+		scope="I"
+		type="L"
+		name="Gen" />
+	<iso_639_3_entry
+		id="gek"
+		scope="I"
+		type="L"
+		name="Yiwom" />
+	<iso_639_3_entry
+		id="gel"
+		scope="I"
+		type="L"
+		name="ut-Ma'in" />
+	<iso_639_3_entry
+		id="geq"
+		scope="I"
+		type="L"
+		name="Geme" />
+	<iso_639_3_entry
+		id="ges"
+		scope="I"
+		type="L"
+		name="Geser-Gorom" />
+	<iso_639_3_entry
+		id="gew"
+		scope="I"
+		type="L"
+		name="Gera" />
+	<iso_639_3_entry
+		id="gex"
+		scope="I"
+		type="L"
+		name="Garre" />
+	<iso_639_3_entry
+		id="gey"
+		scope="I"
+		type="L"
+		name="Enya" />
+	<iso_639_3_entry
+		id="gez"
+		part2_code="gez"
+		scope="I"
+		type="A"
+		name="Geez" />
+	<iso_639_3_entry
+		id="gfk"
+		scope="I"
+		type="L"
+		name="Patpatar" />
+	<iso_639_3_entry
+		id="gft"
+		scope="I"
+		type="E"
+		name="Gafat" />
+	<iso_639_3_entry
+		id="gga"
+		scope="I"
+		type="L"
+		name="Gao" />
+	<iso_639_3_entry
+		id="ggb"
+		scope="I"
+		type="L"
+		name="Gbii" />
+	<iso_639_3_entry
+		id="ggd"
+		scope="I"
+		type="E"
+		name="Gugadj" />
+	<iso_639_3_entry
+		id="gge"
+		scope="I"
+		type="L"
+		name="Guragone" />
+	<iso_639_3_entry
+		id="ggg"
+		scope="I"
+		type="L"
+		name="Gurgula" />
+	<iso_639_3_entry
+		id="ggk"
+		scope="I"
+		type="E"
+		name="Kungarakany" />
+	<iso_639_3_entry
+		id="ggl"
+		scope="I"
+		type="L"
+		name="Ganglau" />
+	<iso_639_3_entry
+		id="ggn"
+		scope="I"
+		type="L"
+		name="Gurung; Eastern" />
+	<iso_639_3_entry
+		id="ggo"
+		scope="I"
+		type="L"
+		name="Gondi; Southern" />
+	<iso_639_3_entry
+		id="ggr"
+		scope="I"
+		type="E"
+		name="Aghu Tharnggalu" />
+	<iso_639_3_entry
+		id="ggt"
+		scope="I"
+		type="L"
+		name="Gitua" />
+	<iso_639_3_entry
+		id="ggu"
+		scope="I"
+		type="L"
+		name="Gagu" />
+	<iso_639_3_entry
+		id="ggw"
+		scope="I"
+		type="L"
+		name="Gogodala" />
+	<iso_639_3_entry
+		id="gha"
+		scope="I"
+		type="L"
+		name="Ghadamès" />
+	<iso_639_3_entry
+		id="ghc"
+		scope="I"
+		type="E"
+		name="Gaelic; Hiberno-Scottish" />
+	<iso_639_3_entry
+		id="ghe"
+		scope="I"
+		type="L"
+		name="Ghale; Southern" />
+	<iso_639_3_entry
+		id="ghh"
+		scope="I"
+		type="L"
+		name="Ghale; Northern" />
+	<iso_639_3_entry
+		id="ghk"
+		scope="I"
+		type="L"
+		name="Karen; Geko" />
+	<iso_639_3_entry
+		id="ghl"
+		scope="I"
+		type="L"
+		name="Ghulfan" />
+	<iso_639_3_entry
+		id="ghn"
+		scope="I"
+		type="L"
+		name="Ghanongga" />
+	<iso_639_3_entry
+		id="gho"
+		scope="I"
+		type="E"
+		name="Ghomara" />
+	<iso_639_3_entry
+		id="ghr"
+		scope="I"
+		type="L"
+		name="Ghera" />
+	<iso_639_3_entry
+		id="ghs"
+		scope="I"
+		type="L"
+		name="Guhu-Samane" />
+	<iso_639_3_entry
+		id="ght"
+		scope="I"
+		type="L"
+		name="Ghale; Kutang" />
+	<iso_639_3_entry
+		id="gia"
+		scope="I"
+		type="L"
+		name="Kitja" />
+	<iso_639_3_entry
+		id="gib"
+		scope="I"
+		type="L"
+		name="Gibanawa" />
+	<iso_639_3_entry
+		id="gic"
+		scope="I"
+		type="L"
+		name="Gail" />
+	<iso_639_3_entry
+		id="gid"
+		scope="I"
+		type="L"
+		name="Gidar" />
+	<iso_639_3_entry
+		id="gig"
+		scope="I"
+		type="L"
+		name="Goaria" />
+	<iso_639_3_entry
+		id="gil"
+		part2_code="gil"
+		scope="I"
+		type="L"
+		name="Gilbertese" />
+	<iso_639_3_entry
+		id="gim"
+		scope="I"
+		type="L"
+		name="Gimi (Eastern Highlands)" />
+	<iso_639_3_entry
+		id="gin"
+		scope="I"
+		type="L"
+		name="Hinukh" />
+	<iso_639_3_entry
+		id="gio"
+		scope="I"
+		type="L"
+		name="Gelao" />
+	<iso_639_3_entry
+		id="gip"
+		scope="I"
+		type="L"
+		name="Gimi (West New Britain)" />
+	<iso_639_3_entry
+		id="giq"
+		scope="I"
+		type="L"
+		name="Gelao; Green" />
+	<iso_639_3_entry
+		id="gir"
+		scope="I"
+		type="L"
+		name="Gelao; Red" />
+	<iso_639_3_entry
+		id="gis"
+		scope="I"
+		type="L"
+		name="Giziga; North" />
+	<iso_639_3_entry
+		id="git"
+		scope="I"
+		type="L"
+		name="Gitxsan" />
+	<iso_639_3_entry
+		id="giw"
+		scope="I"
+		type="L"
+		name="Gelao; White" />
+	<iso_639_3_entry
+		id="gix"
+		scope="I"
+		type="L"
+		name="Gilima" />
+	<iso_639_3_entry
+		id="giy"
+		scope="I"
+		type="L"
+		name="Giyug" />
+	<iso_639_3_entry
+		id="giz"
+		scope="I"
+		type="L"
+		name="Giziga; South" />
+	<iso_639_3_entry
+		id="gji"
+		scope="I"
+		type="L"
+		name="Geji" />
+	<iso_639_3_entry
+		id="gjk"
+		scope="I"
+		type="L"
+		name="Koli; Kachi" />
+	<iso_639_3_entry
+		id="gjn"
+		scope="I"
+		type="L"
+		name="Gonja" />
+	<iso_639_3_entry
+		id="gju"
+		scope="I"
+		type="L"
+		name="Gujari" />
+	<iso_639_3_entry
+		id="gka"
+		scope="I"
+		type="L"
+		name="Guya" />
+	<iso_639_3_entry
+		id="gke"
+		scope="I"
+		type="L"
+		name="Ndai" />
+	<iso_639_3_entry
+		id="gkn"
+		scope="I"
+		type="L"
+		name="Gokana" />
+	<iso_639_3_entry
+		id="gkp"
+		scope="I"
+		type="L"
+		name="Kpelle; Guinea" />
+	<iso_639_3_entry
+		id="gla"
+		part1_code="gd"
+		part2_code="gla"
+		scope="I"
+		type="L"
+		name="Gaelic; Scottish" />
+	<iso_639_3_entry
+		id="glc"
+		scope="I"
+		type="L"
+		name="Bon Gula" />
+	<iso_639_3_entry
+		id="gld"
+		scope="I"
+		type="L"
+		name="Nanai" />
+	<iso_639_3_entry
+		id="gle"
+		part1_code="ga"
+		part2_code="gle"
+		scope="I"
+		type="L"
+		name="Irish" />
+	<iso_639_3_entry
+		id="glg"
+		part1_code="gl"
+		part2_code="glg"
+		scope="I"
+		type="L"
+		name="Galician" />
+	<iso_639_3_entry
+		id="glh"
+		scope="I"
+		type="L"
+		name="Pashayi; Northwest" />
+	<iso_639_3_entry
+		id="gli"
+		scope="I"
+		type="E"
+		name="Guliguli" />
+	<iso_639_3_entry
+		id="glj"
+		scope="I"
+		type="L"
+		name="Gula Iro" />
+	<iso_639_3_entry
+		id="glk"
+		scope="I"
+		type="L"
+		name="Gilaki" />
+	<iso_639_3_entry
+		id="glo"
+		scope="I"
+		type="L"
+		name="Galambu" />
+	<iso_639_3_entry
+		id="glr"
+		scope="I"
+		type="L"
+		name="Glaro-Twabo" />
+	<iso_639_3_entry
+		id="glu"
+		scope="I"
+		type="L"
+		name="Gula (Chad)" />
+	<iso_639_3_entry
+		id="glv"
+		part1_code="gv"
+		part2_code="glv"
+		scope="I"
+		type="L"
+		name="Manx" />
+	<iso_639_3_entry
+		id="glw"
+		scope="I"
+		type="L"
+		name="Glavda" />
+	<iso_639_3_entry
+		id="gly"
+		scope="I"
+		type="E"
+		name="Gule" />
+	<iso_639_3_entry
+		id="gma"
+		scope="I"
+		type="E"
+		name="Gambera" />
+	<iso_639_3_entry
+		id="gmb"
+		scope="I"
+		type="L"
+		name="Gula'alaa" />
+	<iso_639_3_entry
+		id="gmd"
+		scope="I"
+		type="L"
+		name="Mághdì" />
+	<iso_639_3_entry
+		id="gmh"
+		part2_code="gmh"
+		scope="I"
+		type="H"
+		name="German; Middle High (ca. 1050-1500)" />
+	<iso_639_3_entry
+		id="gml"
+		scope="I"
+		type="H"
+		name="German; Middle Low" />
+	<iso_639_3_entry
+		id="gmm"
+		scope="I"
+		type="L"
+		name="Gbaya-Mbodomo" />
+	<iso_639_3_entry
+		id="gmn"
+		scope="I"
+		type="L"
+		name="Gimnime" />
+	<iso_639_3_entry
+		id="gmu"
+		scope="I"
+		type="L"
+		name="Gumalu" />
+	<iso_639_3_entry
+		id="gmv"
+		scope="I"
+		type="L"
+		name="Gamo" />
+	<iso_639_3_entry
+		id="gmx"
+		scope="I"
+		type="L"
+		name="Magoma" />
+	<iso_639_3_entry
+		id="gmy"
+		scope="I"
+		type="A"
+		name="Greek; Mycenaean" />
+	<iso_639_3_entry
+		id="gna"
+		scope="I"
+		type="L"
+		name="Kaansa" />
+	<iso_639_3_entry
+		id="gnb"
+		scope="I"
+		type="L"
+		name="Gangte" />
+	<iso_639_3_entry
+		id="gnc"
+		scope="I"
+		type="E"
+		name="Guanche" />
+	<iso_639_3_entry
+		id="gnd"
+		scope="I"
+		type="L"
+		name="Zulgo-Gemzek" />
+	<iso_639_3_entry
+		id="gne"
+		scope="I"
+		type="L"
+		name="Ganang" />
+	<iso_639_3_entry
+		id="gng"
+		scope="I"
+		type="L"
+		name="Ngangam" />
+	<iso_639_3_entry
+		id="gnh"
+		scope="I"
+		type="L"
+		name="Lere" />
+	<iso_639_3_entry
+		id="gni"
+		scope="I"
+		type="L"
+		name="Gooniyandi" />
+	<iso_639_3_entry
+		id="gnk"
+		scope="I"
+		type="L"
+		name="//Gana" />
+	<iso_639_3_entry
+		id="gnl"
+		scope="I"
+		type="E"
+		name="Gangulu" />
+	<iso_639_3_entry
+		id="gnm"
+		scope="I"
+		type="L"
+		name="Ginuman" />
+	<iso_639_3_entry
+		id="gnn"
+		scope="I"
+		type="L"
+		name="Gumatj" />
+	<iso_639_3_entry
+		id="gno"
+		scope="I"
+		type="L"
+		name="Gondi; Northern" />
+	<iso_639_3_entry
+		id="gnq"
+		scope="I"
+		type="L"
+		name="Gana" />
+	<iso_639_3_entry
+		id="gnr"
+		scope="I"
+		type="E"
+		name="Gureng Gureng" />
+	<iso_639_3_entry
+		id="gnt"
+		scope="I"
+		type="L"
+		name="Guntai" />
+	<iso_639_3_entry
+		id="gnu"
+		scope="I"
+		type="L"
+		name="Gnau" />
+	<iso_639_3_entry
+		id="gnw"
+		scope="I"
+		type="L"
+		name="Guaraní; Western Bolivian" />
+	<iso_639_3_entry
+		id="gnz"
+		scope="I"
+		type="L"
+		name="Ganzi" />
+	<iso_639_3_entry
+		id="goa"
+		scope="I"
+		type="L"
+		name="Guro" />
+	<iso_639_3_entry
+		id="gob"
+		scope="I"
+		type="L"
+		name="Playero" />
+	<iso_639_3_entry
+		id="goc"
+		scope="I"
+		type="L"
+		name="Gorakor" />
+	<iso_639_3_entry
+		id="god"
+		scope="I"
+		type="L"
+		name="Godié" />
+	<iso_639_3_entry
+		id="goe"
+		scope="I"
+		type="L"
+		name="Gongduk" />
+	<iso_639_3_entry
+		id="gof"
+		scope="I"
+		type="L"
+		name="Gofa" />
+	<iso_639_3_entry
+		id="gog"
+		scope="I"
+		type="L"
+		name="Gogo" />
+	<iso_639_3_entry
+		id="goh"
+		part2_code="goh"
+		scope="I"
+		type="H"
+		name="German; Old High (ca. 750-1050)" />
+	<iso_639_3_entry
+		id="goi"
+		scope="I"
+		type="L"
+		name="Gobasi" />
+	<iso_639_3_entry
+		id="goj"
+		scope="I"
+		type="L"
+		name="Gowlan" />
+	<iso_639_3_entry
+		id="gok"
+		scope="I"
+		type="L"
+		name="Gowli" />
+	<iso_639_3_entry
+		id="gol"
+		scope="I"
+		type="L"
+		name="Gola" />
+	<iso_639_3_entry
+		id="gom"
+		scope="I"
+		type="L"
+		name="Konkani; Goan" />
+	<iso_639_3_entry
+		id="gon"
+		part2_code="gon"
+		scope="M"
+		type="L"
+		name="Gondi" />
+	<iso_639_3_entry
+		id="goo"
+		scope="I"
+		type="L"
+		name="Gone Dau" />
+	<iso_639_3_entry
+		id="gop"
+		scope="I"
+		type="L"
+		name="Yeretuar" />
+	<iso_639_3_entry
+		id="goq"
+		scope="I"
+		type="L"
+		name="Gorap" />
+	<iso_639_3_entry
+		id="gor"
+		part2_code="gor"
+		scope="I"
+		type="L"
+		name="Gorontalo" />
+	<iso_639_3_entry
+		id="gos"
+		scope="I"
+		type="L"
+		name="Gronings" />
+	<iso_639_3_entry
+		id="got"
+		part2_code="got"
+		scope="I"
+		type="A"
+		name="Gothic" />
+	<iso_639_3_entry
+		id="gou"
+		scope="I"
+		type="L"
+		name="Gavar" />
+	<iso_639_3_entry
+		id="gow"
+		scope="I"
+		type="L"
+		name="Gorowa" />
+	<iso_639_3_entry
+		id="gox"
+		scope="I"
+		type="L"
+		name="Gobu" />
+	<iso_639_3_entry
+		id="goy"
+		scope="I"
+		type="L"
+		name="Goundo" />
+	<iso_639_3_entry
+		id="goz"
+		scope="I"
+		type="L"
+		name="Gozarkhani" />
+	<iso_639_3_entry
+		id="gpa"
+		scope="I"
+		type="L"
+		name="Gupa-Abawa" />
+	<iso_639_3_entry
+		id="gpn"
+		scope="I"
+		type="L"
+		name="Taiap" />
+	<iso_639_3_entry
+		id="gqa"
+		scope="I"
+		type="L"
+		name="Ga'anda" />
+	<iso_639_3_entry
+		id="gqi"
+		scope="I"
+		type="L"
+		name="Guiqiong" />
+	<iso_639_3_entry
+		id="gqn"
+		scope="I"
+		type="E"
+		name="Guana (Brazil)" />
+	<iso_639_3_entry
+		id="gqr"
+		scope="I"
+		type="L"
+		name="Gor" />
+	<iso_639_3_entry
+		id="gra"
+		scope="I"
+		type="L"
+		name="Garasia; Rajput" />
+	<iso_639_3_entry
+		id="grb"
+		part2_code="grb"
+		scope="M"
+		type="L"
+		name="Grebo" />
+	<iso_639_3_entry
+		id="grc"
+		part2_code="grc"
+		scope="I"
+		type="H"
+		name="Greek; Ancient (to 1453)" />
+	<iso_639_3_entry
+		id="grd"
+		scope="I"
+		type="L"
+		name="Guruntum-Mbaaru" />
+	<iso_639_3_entry
+		id="grg"
+		scope="I"
+		type="L"
+		name="Madi" />
+	<iso_639_3_entry
+		id="grh"
+		scope="I"
+		type="L"
+		name="Gbiri-Niragu" />
+	<iso_639_3_entry
+		id="gri"
+		scope="I"
+		type="L"
+		name="Ghari" />
+	<iso_639_3_entry
+		id="grj"
+		scope="I"
+		type="L"
+		name="Grebo; Southern" />
+	<iso_639_3_entry
+		id="grm"
+		scope="I"
+		type="L"
+		name="Kota Marudu Talantang" />
+	<iso_639_3_entry
+		id="grn"
+		part1_code="gn"
+		part2_code="grn"
+		scope="M"
+		type="L"
+		name="Guarani" />
+	<iso_639_3_entry
+		id="gro"
+		scope="I"
+		type="L"
+		name="Groma" />
+	<iso_639_3_entry
+		id="grq"
+		scope="I"
+		type="L"
+		name="Gorovu" />
+	<iso_639_3_entry
+		id="grr"
+		scope="I"
+		type="L"
+		name="Taznatit" />
+	<iso_639_3_entry
+		id="grs"
+		scope="I"
+		type="L"
+		name="Gresi" />
+	<iso_639_3_entry
+		id="grt"
+		scope="I"
+		type="L"
+		name="Garo" />
+	<iso_639_3_entry
+		id="gru"
+		scope="I"
+		type="L"
+		name="Kistane" />
+	<iso_639_3_entry
+		id="grv"
+		scope="I"
+		type="L"
+		name="Grebo; Central" />
+	<iso_639_3_entry
+		id="grw"
+		scope="I"
+		type="L"
+		name="Gweda" />
+	<iso_639_3_entry
+		id="grx"
+		scope="I"
+		type="L"
+		name="Guriaso" />
+	<iso_639_3_entry
+		id="gry"
+		scope="I"
+		type="L"
+		name="Grebo; Barclayville" />
+	<iso_639_3_entry
+		id="grz"
+		scope="I"
+		type="L"
+		name="Guramalum" />
+	<iso_639_3_entry
+		id="gse"
+		scope="I"
+		type="L"
+		name="Ghanaian Sign Language" />
+	<iso_639_3_entry
+		id="gsg"
+		scope="I"
+		type="L"
+		name="German Sign Language" />
+	<iso_639_3_entry
+		id="gsl"
+		scope="I"
+		type="L"
+		name="Gusilay" />
+	<iso_639_3_entry
+		id="gsm"
+		scope="I"
+		type="L"
+		name="Guatemalan Sign Language" />
+	<iso_639_3_entry
+		id="gsn"
+		scope="I"
+		type="L"
+		name="Gusan" />
+	<iso_639_3_entry
+		id="gso"
+		scope="I"
+		type="L"
+		name="Gbaya; Southwest" />
+	<iso_639_3_entry
+		id="gsp"
+		scope="I"
+		type="L"
+		name="Wasembo" />
+	<iso_639_3_entry
+		id="gss"
+		scope="I"
+		type="L"
+		name="Greek Sign Language" />
+	<iso_639_3_entry
+		id="gsw"
+		part2_code="gsw"
+		scope="I"
+		type="L"
+		name="German; Swiss" />
+	<iso_639_3_entry
+		id="gta"
+		scope="I"
+		type="L"
+		name="Guató" />
+	<iso_639_3_entry
+		id="gti"
+		scope="I"
+		type="L"
+		name="Gbati-ri" />
+	<iso_639_3_entry
+		id="gua"
+		scope="I"
+		type="L"
+		name="Shiki" />
+	<iso_639_3_entry
+		id="gub"
+		scope="I"
+		type="L"
+		name="Guajajára" />
+	<iso_639_3_entry
+		id="guc"
+		scope="I"
+		type="L"
+		name="Wayuu" />
+	<iso_639_3_entry
+		id="gud"
+		scope="I"
+		type="L"
+		name="Dida; Yocoboué" />
+	<iso_639_3_entry
+		id="gue"
+		scope="I"
+		type="L"
+		name="Gurinji" />
+	<iso_639_3_entry
+		id="guf"
+		scope="I"
+		type="L"
+		name="Gupapuyngu" />
+	<iso_639_3_entry
+		id="gug"
+		scope="I"
+		type="L"
+		name="Guaraní; Paraguayan" />
+	<iso_639_3_entry
+		id="guh"
+		scope="I"
+		type="L"
+		name="Guahibo" />
+	<iso_639_3_entry
+		id="gui"
+		scope="I"
+		type="L"
+		name="Guaraní; Eastern Bolivian" />
+	<iso_639_3_entry
+		id="guj"
+		part1_code="gu"
+		part2_code="guj"
+		scope="I"
+		type="L"
+		name="Gujarati" />
+	<iso_639_3_entry
+		id="guk"
+		scope="I"
+		type="L"
+		name="Gumuz" />
+	<iso_639_3_entry
+		id="gul"
+		scope="I"
+		type="L"
+		name="Creole English; Sea Island" />
+	<iso_639_3_entry
+		id="gum"
+		scope="I"
+		type="L"
+		name="Guambiano" />
+	<iso_639_3_entry
+		id="gun"
+		scope="I"
+		type="L"
+		name="Guaraní; Mbyá" />
+	<iso_639_3_entry
+		id="guo"
+		scope="I"
+		type="L"
+		name="Guayabero" />
+	<iso_639_3_entry
+		id="gup"
+		scope="I"
+		type="L"
+		name="Gunwinggu" />
+	<iso_639_3_entry
+		id="guq"
+		scope="I"
+		type="L"
+		name="Aché" />
+	<iso_639_3_entry
+		id="gur"
+		scope="I"
+		type="L"
+		name="Farefare" />
+	<iso_639_3_entry
+		id="gus"
+		scope="I"
+		type="L"
+		name="Guinean Sign Language" />
+	<iso_639_3_entry
+		id="gut"
+		scope="I"
+		type="L"
+		name="Maléku Jaíka" />
+	<iso_639_3_entry
+		id="guu"
+		scope="I"
+		type="L"
+		name="Yanomamö" />
+	<iso_639_3_entry
+		id="guv"
+		scope="I"
+		type="E"
+		name="Gey" />
+	<iso_639_3_entry
+		id="guw"
+		scope="I"
+		type="L"
+		name="Gun" />
+	<iso_639_3_entry
+		id="gux"
+		scope="I"
+		type="L"
+		name="Gourmanchéma" />
+	<iso_639_3_entry
+		id="guz"
+		scope="I"
+		type="L"
+		name="Gusii" />
+	<iso_639_3_entry
+		id="gva"
+		scope="I"
+		type="L"
+		name="Guana (Paraguay)" />
+	<iso_639_3_entry
+		id="gvc"
+		scope="I"
+		type="L"
+		name="Guanano" />
+	<iso_639_3_entry
+		id="gve"
+		scope="I"
+		type="L"
+		name="Duwet" />
+	<iso_639_3_entry
+		id="gvf"
+		scope="I"
+		type="L"
+		name="Golin" />
+	<iso_639_3_entry
+		id="gvj"
+		scope="I"
+		type="L"
+		name="Guajá" />
+	<iso_639_3_entry
+		id="gvl"
+		scope="I"
+		type="L"
+		name="Gulay" />
+	<iso_639_3_entry
+		id="gvm"
+		scope="I"
+		type="L"
+		name="Gurmana" />
+	<iso_639_3_entry
+		id="gvn"
+		scope="I"
+		type="L"
+		name="Kuku-Yalanji" />
+	<iso_639_3_entry
+		id="gvo"
+		scope="I"
+		type="L"
+		name="Gavião Do Jiparaná" />
+	<iso_639_3_entry
+		id="gvp"
+		scope="I"
+		type="L"
+		name="Gavião; Pará" />
+	<iso_639_3_entry
+		id="gvr"
+		scope="I"
+		type="L"
+		name="Gurung; Western" />
+	<iso_639_3_entry
+		id="gvs"
+		scope="I"
+		type="L"
+		name="Gumawana" />
+	<iso_639_3_entry
+		id="gvy"
+		scope="I"
+		type="E"
+		name="Guyani" />
+	<iso_639_3_entry
+		id="gwa"
+		scope="I"
+		type="L"
+		name="Mbato" />
+	<iso_639_3_entry
+		id="gwb"
+		scope="I"
+		type="L"
+		name="Gwa" />
+	<iso_639_3_entry
+		id="gwc"
+		scope="I"
+		type="L"
+		name="Kalami" />
+	<iso_639_3_entry
+		id="gwd"
+		scope="I"
+		type="L"
+		name="Gawwada" />
+	<iso_639_3_entry
+		id="gwe"
+		scope="I"
+		type="L"
+		name="Gweno" />
+	<iso_639_3_entry
+		id="gwf"
+		scope="I"
+		type="L"
+		name="Gowro" />
+	<iso_639_3_entry
+		id="gwg"
+		scope="I"
+		type="L"
+		name="Moo" />
+	<iso_639_3_entry
+		id="gwi"
+		part2_code="gwi"
+		scope="I"
+		type="L"
+		name="Gwichʼin" />
+	<iso_639_3_entry
+		id="gwj"
+		scope="I"
+		type="L"
+		name="/Gwi" />
+	<iso_639_3_entry
+		id="gwn"
+		scope="I"
+		type="L"
+		name="Gwandara" />
+	<iso_639_3_entry
+		id="gwr"
+		scope="I"
+		type="L"
+		name="Gwere" />
+	<iso_639_3_entry
+		id="gwt"
+		scope="I"
+		type="L"
+		name="Gawar-Bati" />
+	<iso_639_3_entry
+		id="gwu"
+		scope="I"
+		type="E"
+		name="Guwamu" />
+	<iso_639_3_entry
+		id="gww"
+		scope="I"
+		type="L"
+		name="Kwini" />
+	<iso_639_3_entry
+		id="gwx"
+		scope="I"
+		type="L"
+		name="Gua" />
+	<iso_639_3_entry
+		id="gxx"
+		scope="I"
+		type="L"
+		name="Wè Southern" />
+	<iso_639_3_entry
+		id="gya"
+		scope="I"
+		type="L"
+		name="Gbaya; Northwest" />
+	<iso_639_3_entry
+		id="gyb"
+		scope="I"
+		type="L"
+		name="Garus" />
+	<iso_639_3_entry
+		id="gyd"
+		scope="I"
+		type="L"
+		name="Kayardild" />
+	<iso_639_3_entry
+		id="gye"
+		scope="I"
+		type="L"
+		name="Gyem" />
+	<iso_639_3_entry
+		id="gyf"
+		scope="I"
+		type="E"
+		name="Gungabula" />
+	<iso_639_3_entry
+		id="gyg"
+		scope="I"
+		type="L"
+		name="Gbayi" />
+	<iso_639_3_entry
+		id="gyi"
+		scope="I"
+		type="L"
+		name="Gyele" />
+	<iso_639_3_entry
+		id="gyl"
+		scope="I"
+		type="L"
+		name="Gayil" />
+	<iso_639_3_entry
+		id="gym"
+		scope="I"
+		type="L"
+		name="Ngäbere" />
+	<iso_639_3_entry
+		id="gyn"
+		scope="I"
+		type="L"
+		name="Creole English; Guyanese" />
+	<iso_639_3_entry
+		id="gyr"
+		scope="I"
+		type="L"
+		name="Guarayu" />
+	<iso_639_3_entry
+		id="gyy"
+		scope="I"
+		type="E"
+		name="Gunya" />
+	<iso_639_3_entry
+		id="gza"
+		scope="I"
+		type="L"
+		name="Ganza" />
+	<iso_639_3_entry
+		id="gzi"
+		scope="I"
+		type="L"
+		name="Gazi" />
+	<iso_639_3_entry
+		id="gzn"
+		scope="I"
+		type="L"
+		name="Gane" />
+	<iso_639_3_entry
+		id="haa"
+		scope="I"
+		type="L"
+		name="Han" />
+	<iso_639_3_entry
+		id="hab"
+		scope="I"
+		type="L"
+		name="Hanoi Sign Language" />
+	<iso_639_3_entry
+		id="hac"
+		scope="I"
+		type="L"
+		name="Gurani" />
+	<iso_639_3_entry
+		id="had"
+		scope="I"
+		type="L"
+		name="Hatam" />
+	<iso_639_3_entry
+		id="hae"
+		scope="I"
+		type="L"
+		name="Oromo; Eastern" />
+	<iso_639_3_entry
+		id="haf"
+		scope="I"
+		type="L"
+		name="Haiphong Sign Language" />
+	<iso_639_3_entry
+		id="hag"
+		scope="I"
+		type="L"
+		name="Hanga" />
+	<iso_639_3_entry
+		id="hah"
+		scope="I"
+		type="L"
+		name="Hahon" />
+	<iso_639_3_entry
+		id="hai"
+		part2_code="hai"
+		scope="M"
+		type="L"
+		name="Haida" />
+	<iso_639_3_entry
+		id="haj"
+		scope="I"
+		type="L"
+		name="Hajong" />
+	<iso_639_3_entry
+		id="hak"
+		scope="I"
+		type="L"
+		name="Chinese; Hakka" />
+	<iso_639_3_entry
+		id="hal"
+		scope="I"
+		type="L"
+		name="Halang" />
+	<iso_639_3_entry
+		id="ham"
+		scope="I"
+		type="L"
+		name="Hewa" />
+	<iso_639_3_entry
+		id="han"
+		scope="I"
+		type="L"
+		name="Hangaza" />
+	<iso_639_3_entry
+		id="hao"
+		scope="I"
+		type="L"
+		name="Hakö" />
+	<iso_639_3_entry
+		id="hap"
+		scope="I"
+		type="L"
+		name="Hupla" />
+	<iso_639_3_entry
+		id="haq"
+		scope="I"
+		type="L"
+		name="Ha" />
+	<iso_639_3_entry
+		id="har"
+		scope="I"
+		type="L"
+		name="Harari" />
+	<iso_639_3_entry
+		id="has"
+		scope="I"
+		type="L"
+		name="Haisla" />
+	<iso_639_3_entry
+		id="hat"
+		part1_code="ht"
+		part2_code="hat"
+		scope="I"
+		type="L"
+		name="Creole; Haitian" />
+	<iso_639_3_entry
+		id="hau"
+		part1_code="ha"
+		part2_code="hau"
+		scope="I"
+		type="L"
+		name="Hausa" />
+	<iso_639_3_entry
+		id="hav"
+		scope="I"
+		type="L"
+		name="Havu" />
+	<iso_639_3_entry
+		id="haw"
+		part2_code="haw"
+		scope="I"
+		type="L"
+		name="Hawaiian" />
+	<iso_639_3_entry
+		id="hax"
+		scope="I"
+		type="L"
+		name="Haida; Southern" />
+	<iso_639_3_entry
+		id="hay"
+		scope="I"
+		type="L"
+		name="Haya" />
+	<iso_639_3_entry
+		id="haz"
+		scope="I"
+		type="L"
+		name="Hazaragi" />
+	<iso_639_3_entry
+		id="hba"
+		scope="I"
+		type="L"
+		name="Hamba" />
+	<iso_639_3_entry
+		id="hbb"
+		scope="I"
+		type="L"
+		name="Huba" />
+	<iso_639_3_entry
+		id="hbn"
+		scope="I"
+		type="L"
+		name="Heiban" />
+	<iso_639_3_entry
+		id="hbo"
+		scope="I"
+		type="H"
+		name="Hebrew; Ancient" />
+	<iso_639_3_entry
+		id="hbs"
+		part1_code="sh"
+		scope="M"
+		type="L"
+		name="Serbo-Croatian" />
+	<iso_639_3_entry
+		id="hbu"
+		scope="I"
+		type="L"
+		name="Habu" />
+	<iso_639_3_entry
+		id="hca"
+		scope="I"
+		type="L"
+		name="Creole Hindi; Andaman" />
+	<iso_639_3_entry
+		id="hch"
+		scope="I"
+		type="L"
+		name="Huichol" />
+	<iso_639_3_entry
+		id="hdn"
+		scope="I"
+		type="L"
+		name="Haida; Northern" />
+	<iso_639_3_entry
+		id="hds"
+		scope="I"
+		type="L"
+		name="Honduras Sign Language" />
+	<iso_639_3_entry
+		id="hdy"
+		scope="I"
+		type="L"
+		name="Hadiyya" />
+	<iso_639_3_entry
+		id="hea"
+		scope="I"
+		type="L"
+		name="Miao; Northern Qiandong" />
+	<iso_639_3_entry
+		id="heb"
+		part1_code="he"
+		part2_code="heb"
+		scope="I"
+		type="L"
+		name="Hebrew" />
+	<iso_639_3_entry
+		id="hed"
+		scope="I"
+		type="L"
+		name="Herdé" />
+	<iso_639_3_entry
+		id="heg"
+		scope="I"
+		type="L"
+		name="Helong" />
+	<iso_639_3_entry
+		id="heh"
+		scope="I"
+		type="L"
+		name="Hehe" />
+	<iso_639_3_entry
+		id="hei"
+		scope="I"
+		type="L"
+		name="Heiltsuk" />
+	<iso_639_3_entry
+		id="hem"
+		scope="I"
+		type="L"
+		name="Hemba" />
+	<iso_639_3_entry
+		id="her"
+		part1_code="hz"
+		part2_code="her"
+		scope="I"
+		type="L"
+		name="Herero" />
+	<iso_639_3_entry
+		id="hgm"
+		scope="I"
+		type="L"
+		name="Hai//om" />
+	<iso_639_3_entry
+		id="hgw"
+		scope="I"
+		type="L"
+		name="Haigwai" />
+	<iso_639_3_entry
+		id="hhi"
+		scope="I"
+		type="L"
+		name="Hoia Hoia" />
+	<iso_639_3_entry
+		id="hhr"
+		scope="I"
+		type="L"
+		name="Kerak" />
+	<iso_639_3_entry
+		id="hhy"
+		scope="I"
+		type="L"
+		name="Hoyahoya" />
+	<iso_639_3_entry
+		id="hia"
+		scope="I"
+		type="L"
+		name="Lamang" />
+	<iso_639_3_entry
+		id="hib"
+		scope="I"
+		type="E"
+		name="Hibito" />
+	<iso_639_3_entry
+		id="hid"
+		scope="I"
+		type="L"
+		name="Hidatsa" />
+	<iso_639_3_entry
+		id="hif"
+		scope="I"
+		type="L"
+		name="Hindi; Fiji" />
+	<iso_639_3_entry
+		id="hig"
+		scope="I"
+		type="L"
+		name="Kamwe" />
+	<iso_639_3_entry
+		id="hih"
+		scope="I"
+		type="L"
+		name="Pamosu" />
+	<iso_639_3_entry
+		id="hii"
+		scope="I"
+		type="L"
+		name="Hinduri" />
+	<iso_639_3_entry
+		id="hij"
+		scope="I"
+		type="L"
+		name="Hijuk" />
+	<iso_639_3_entry
+		id="hik"
+		scope="I"
+		type="L"
+		name="Seit-Kaitetu" />
+	<iso_639_3_entry
+		id="hil"
+		part2_code="hil"
+		scope="I"
+		type="L"
+		name="Hiligaynon" />
+	<iso_639_3_entry
+		id="hin"
+		part1_code="hi"
+		part2_code="hin"
+		scope="I"
+		type="L"
+		name="Hindi" />
+	<iso_639_3_entry
+		id="hio"
+		scope="I"
+		type="L"
+		name="Tsoa" />
+	<iso_639_3_entry
+		id="hir"
+		scope="I"
+		type="L"
+		name="Himarimã" />
+	<iso_639_3_entry
+		id="hit"
+		part2_code="hit"
+		scope="I"
+		type="A"
+		name="Hittite" />
+	<iso_639_3_entry
+		id="hiw"
+		scope="I"
+		type="L"
+		name="Hiw" />
+	<iso_639_3_entry
+		id="hix"
+		scope="I"
+		type="L"
+		name="Hixkaryána" />
+	<iso_639_3_entry
+		id="hji"
+		scope="I"
+		type="L"
+		name="Haji" />
+	<iso_639_3_entry
+		id="hka"
+		scope="I"
+		type="L"
+		name="Kahe" />
+	<iso_639_3_entry
+		id="hke"
+		scope="I"
+		type="L"
+		name="Hunde" />
+	<iso_639_3_entry
+		id="hkk"
+		scope="I"
+		type="L"
+		name="Hunjara-Kaina Ke" />
+	<iso_639_3_entry
+		id="hks"
+		scope="I"
+		type="L"
+		name="Hong Kong Sign Language" />
+	<iso_639_3_entry
+		id="hla"
+		scope="I"
+		type="L"
+		name="Halia" />
+	<iso_639_3_entry
+		id="hlb"
+		scope="I"
+		type="L"
+		name="Halbi" />
+	<iso_639_3_entry
+		id="hld"
+		scope="I"
+		type="L"
+		name="Halang Doan" />
+	<iso_639_3_entry
+		id="hle"
+		scope="I"
+		type="L"
+		name="Hlersu" />
+	<iso_639_3_entry
+		id="hlt"
+		scope="I"
+		type="L"
+		name="Nga La" />
+	<iso_639_3_entry
+		id="hlu"
+		scope="I"
+		type="A"
+		name="Luwian; Hieroglyphic" />
+	<iso_639_3_entry
+		id="hma"
+		scope="I"
+		type="L"
+		name="Miao; Southern Mashan" />
+	<iso_639_3_entry
+		id="hmb"
+		scope="I"
+		type="L"
+		name="Songhay; Humburi Senni" />
+	<iso_639_3_entry
+		id="hmc"
+		scope="I"
+		type="L"
+		name="Miao; Central Huishui" />
+	<iso_639_3_entry
+		id="hmd"
+		scope="I"
+		type="L"
+		name="Miao; Large Flowery" />
+	<iso_639_3_entry
+		id="hme"
+		scope="I"
+		type="L"
+		name="Miao; Eastern Huishui" />
+	<iso_639_3_entry
+		id="hmf"
+		scope="I"
+		type="L"
+		name="Hmong Don" />
+	<iso_639_3_entry
+		id="hmg"
+		scope="I"
+		type="L"
+		name="Hmong; Southwestern Guiyang" />
+	<iso_639_3_entry
+		id="hmh"
+		scope="I"
+		type="L"
+		name="Miao; Southwestern Huishui" />
+	<iso_639_3_entry
+		id="hmi"
+		scope="I"
+		type="L"
+		name="Miao; Northern Huishui" />
+	<iso_639_3_entry
+		id="hmj"
+		scope="I"
+		type="L"
+		name="Ge" />
+	<iso_639_3_entry
+		id="hmk"
+		scope="I"
+		type="E"
+		name="Maek" />
+	<iso_639_3_entry
+		id="hml"
+		scope="I"
+		type="L"
+		name="Miao; Luopohe" />
+	<iso_639_3_entry
+		id="hmm"
+		scope="I"
+		type="L"
+		name="Miao; Central Mashan" />
+	<iso_639_3_entry
+		id="hmn"
+		part2_code="hmn"
+		scope="M"
+		type="L"
+		name="Hmong" />
+	<iso_639_3_entry
+		id="hmo"
+		part1_code="ho"
+		part2_code="hmo"
+		scope="I"
+		type="L"
+		name="Hiri Motu" />
+	<iso_639_3_entry
+		id="hmp"
+		scope="I"
+		type="L"
+		name="Miao; Northern Mashan" />
+	<iso_639_3_entry
+		id="hmq"
+		scope="I"
+		type="L"
+		name="Miao; Eastern Qiandong" />
+	<iso_639_3_entry
+		id="hmr"
+		scope="I"
+		type="L"
+		name="Hmar" />
+	<iso_639_3_entry
+		id="hms"
+		scope="I"
+		type="L"
+		name="Miao; Southern Qiandong" />
+	<iso_639_3_entry
+		id="hmt"
+		scope="I"
+		type="L"
+		name="Hamtai" />
+	<iso_639_3_entry
+		id="hmu"
+		scope="I"
+		type="L"
+		name="Hamap" />
+	<iso_639_3_entry
+		id="hmv"
+		scope="I"
+		type="L"
+		name="Hmong Dô" />
+	<iso_639_3_entry
+		id="hmw"
+		scope="I"
+		type="L"
+		name="Miao; Western Mashan" />
+	<iso_639_3_entry
+		id="hmy"
+		scope="I"
+		type="L"
+		name="Miao; Southern Guiyang" />
+	<iso_639_3_entry
+		id="hmz"
+		scope="I"
+		type="L"
+		name="Miao; Sinicized" />
+	<iso_639_3_entry
+		id="hna"
+		scope="I"
+		type="L"
+		name="Mina (Cameroon)" />
+	<iso_639_3_entry
+		id="hnd"
+		scope="I"
+		type="L"
+		name="Hindko; Southern" />
+	<iso_639_3_entry
+		id="hne"
+		scope="I"
+		type="L"
+		name="Chhattisgarhi" />
+	<iso_639_3_entry
+		id="hnh"
+		scope="I"
+		type="L"
+		name="//Ani" />
+	<iso_639_3_entry
+		id="hni"
+		scope="I"
+		type="L"
+		name="Hani" />
+	<iso_639_3_entry
+		id="hnj"
+		scope="I"
+		type="L"
+		name="Hmong Njua" />
+	<iso_639_3_entry
+		id="hnn"
+		scope="I"
+		type="L"
+		name="Hanunoo" />
+	<iso_639_3_entry
+		id="hno"
+		scope="I"
+		type="L"
+		name="Hindko; Northern" />
+	<iso_639_3_entry
+		id="hns"
+		scope="I"
+		type="L"
+		name="Hindustani; Caribbean" />
+	<iso_639_3_entry
+		id="hnu"
+		scope="I"
+		type="L"
+		name="Hung" />
+	<iso_639_3_entry
+		id="hoa"
+		scope="I"
+		type="L"
+		name="Hoava" />
+	<iso_639_3_entry
+		id="hob"
+		scope="I"
+		type="L"
+		name="Mari (Madang Province)" />
+	<iso_639_3_entry
+		id="hoc"
+		scope="I"
+		type="L"
+		name="Ho" />
+	<iso_639_3_entry
+		id="hod"
+		scope="I"
+		type="E"
+		name="Holma" />
+	<iso_639_3_entry
+		id="hoe"
+		scope="I"
+		type="L"
+		name="Horom" />
+	<iso_639_3_entry
+		id="hoh"
+		scope="I"
+		type="L"
+		name="Hobyót" />
+	<iso_639_3_entry
+		id="hoi"
+		scope="I"
+		type="L"
+		name="Holikachuk" />
+	<iso_639_3_entry
+		id="hoj"
+		scope="I"
+		type="L"
+		name="Hadothi" />
+	<iso_639_3_entry
+		id="hol"
+		scope="I"
+		type="L"
+		name="Holu" />
+	<iso_639_3_entry
+		id="hom"
+		scope="I"
+		type="E"
+		name="Homa" />
+	<iso_639_3_entry
+		id="hoo"
+		scope="I"
+		type="L"
+		name="Holoholo" />
+	<iso_639_3_entry
+		id="hop"
+		scope="I"
+		type="L"
+		name="Hopi" />
+	<iso_639_3_entry
+		id="hor"
+		scope="I"
+		type="E"
+		name="Horo" />
+	<iso_639_3_entry
+		id="hos"
+		scope="I"
+		type="L"
+		name="Ho Chi Minh City Sign Language" />
+	<iso_639_3_entry
+		id="hot"
+		scope="I"
+		type="L"
+		name="Hote" />
+	<iso_639_3_entry
+		id="hov"
+		scope="I"
+		type="L"
+		name="Hovongan" />
+	<iso_639_3_entry
+		id="how"
+		scope="I"
+		type="L"
+		name="Honi" />
+	<iso_639_3_entry
+		id="hoy"
+		scope="I"
+		type="L"
+		name="Holiya" />
+	<iso_639_3_entry
+		id="hoz"
+		scope="I"
+		type="L"
+		name="Hozo" />
+	<iso_639_3_entry
+		id="hpo"
+		scope="I"
+		type="L"
+		name="Hpon" />
+	<iso_639_3_entry
+		id="hps"
+		scope="I"
+		type="L"
+		name="Hawai'i Pidgin Sign Language" />
+	<iso_639_3_entry
+		id="hra"
+		scope="I"
+		type="L"
+		name="Hrangkhol" />
+	<iso_639_3_entry
+		id="hre"
+		scope="I"
+		type="L"
+		name="Hre" />
+	<iso_639_3_entry
+		id="hrk"
+		scope="I"
+		type="L"
+		name="Haruku" />
+	<iso_639_3_entry
+		id="hrm"
+		scope="I"
+		type="L"
+		name="Miao; Horned" />
+	<iso_639_3_entry
+		id="hro"
+		scope="I"
+		type="L"
+		name="Haroi" />
+	<iso_639_3_entry
+		id="hrr"
+		scope="I"
+		type="L"
+		name="Horuru" />
+	<iso_639_3_entry
+		id="hrt"
+		scope="I"
+		type="L"
+		name="Hértevin" />
+	<iso_639_3_entry
+		id="hru"
+		scope="I"
+		type="L"
+		name="Hruso" />
+	<iso_639_3_entry
+		id="hrv"
+		part1_code="hr"
+		part2_code="hrv"
+		scope="I"
+		type="L"
+		name="Croatian" />
+	<iso_639_3_entry
+		id="hrx"
+		scope="I"
+		type="L"
+		name="Hunsrik" />
+	<iso_639_3_entry
+		id="hrz"
+		scope="I"
+		type="L"
+		name="Harzani" />
+	<iso_639_3_entry
+		id="hsb"
+		part2_code="hsb"
+		scope="I"
+		type="L"
+		name="Sorbian; Upper" />
+	<iso_639_3_entry
+		id="hsh"
+		scope="I"
+		type="L"
+		name="Hungarian Sign Language" />
+	<iso_639_3_entry
+		id="hsl"
+		scope="I"
+		type="L"
+		name="Hausa Sign Language" />
+	<iso_639_3_entry
+		id="hsn"
+		scope="I"
+		type="L"
+		name="Chinese; Xiang" />
+	<iso_639_3_entry
+		id="hss"
+		scope="I"
+		type="L"
+		name="Harsusi" />
+	<iso_639_3_entry
+		id="hti"
+		scope="I"
+		type="L"
+		name="Hoti" />
+	<iso_639_3_entry
+		id="hto"
+		scope="I"
+		type="L"
+		name="Huitoto; Minica" />
+	<iso_639_3_entry
+		id="hts"
+		scope="I"
+		type="L"
+		name="Hadza" />
+	<iso_639_3_entry
+		id="htu"
+		scope="I"
+		type="L"
+		name="Hitu" />
+	<iso_639_3_entry
+		id="htx"
+		scope="I"
+		type="A"
+		name="Hittite; Middle" />
+	<iso_639_3_entry
+		id="hub"
+		scope="I"
+		type="L"
+		name="Huambisa" />
+	<iso_639_3_entry
+		id="huc"
+		scope="I"
+		type="L"
+		name="=/Hua" />
+	<iso_639_3_entry
+		id="hud"
+		scope="I"
+		type="L"
+		name="Huaulu" />
+	<iso_639_3_entry
+		id="hue"
+		scope="I"
+		type="L"
+		name="Huave; San Francisco Del Mar" />
+	<iso_639_3_entry
+		id="huf"
+		scope="I"
+		type="L"
+		name="Humene" />
+	<iso_639_3_entry
+		id="hug"
+		scope="I"
+		type="L"
+		name="Huachipaeri" />
+	<iso_639_3_entry
+		id="huh"
+		scope="I"
+		type="L"
+		name="Huilliche" />
+	<iso_639_3_entry
+		id="hui"
+		scope="I"
+		type="L"
+		name="Huli" />
+	<iso_639_3_entry
+		id="huj"
+		scope="I"
+		type="L"
+		name="Miao; Northern Guiyang" />
+	<iso_639_3_entry
+		id="huk"
+		scope="I"
+		type="L"
+		name="Hulung" />
+	<iso_639_3_entry
+		id="hul"
+		scope="I"
+		type="L"
+		name="Hula" />
+	<iso_639_3_entry
+		id="hum"
+		scope="I"
+		type="L"
+		name="Hungana" />
+	<iso_639_3_entry
+		id="hun"
+		part1_code="hu"
+		part2_code="hun"
+		scope="I"
+		type="L"
+		name="Hungarian" />
+	<iso_639_3_entry
+		id="huo"
+		scope="I"
+		type="L"
+		name="Hu" />
+	<iso_639_3_entry
+		id="hup"
+		part2_code="hup"
+		scope="I"
+		type="L"
+		name="Hupa" />
+	<iso_639_3_entry
+		id="huq"
+		scope="I"
+		type="L"
+		name="Tsat" />
+	<iso_639_3_entry
+		id="hur"
+		scope="I"
+		type="L"
+		name="Halkomelem" />
+	<iso_639_3_entry
+		id="hus"
+		scope="I"
+		type="L"
+		name="Huastec" />
+	<iso_639_3_entry
+		id="hut"
+		scope="I"
+		type="L"
+		name="Humla" />
+	<iso_639_3_entry
+		id="huu"
+		scope="I"
+		type="L"
+		name="Huitoto; Murui" />
+	<iso_639_3_entry
+		id="huv"
+		scope="I"
+		type="L"
+		name="Huave; San Mateo Del Mar" />
+	<iso_639_3_entry
+		id="huw"
+		scope="I"
+		type="E"
+		name="Hukumina" />
+	<iso_639_3_entry
+		id="hux"
+		scope="I"
+		type="L"
+		name="Huitoto; Nüpode" />
+	<iso_639_3_entry
+		id="huy"
+		scope="I"
+		type="L"
+		name="Hulaulá" />
+	<iso_639_3_entry
+		id="huz"
+		scope="I"
+		type="L"
+		name="Hunzib" />
+	<iso_639_3_entry
+		id="hvc"
+		scope="I"
+		type="L"
+		name="Haitian Vodoun Culture Language" />
+	<iso_639_3_entry
+		id="hve"
+		scope="I"
+		type="L"
+		name="Huave; San Dionisio Del Mar" />
+	<iso_639_3_entry
+		id="hvk"
+		scope="I"
+		type="L"
+		name="Haveke" />
+	<iso_639_3_entry
+		id="hvn"
+		scope="I"
+		type="L"
+		name="Sabu" />
+	<iso_639_3_entry
+		id="hvv"
+		scope="I"
+		type="L"
+		name="Huave; Santa María Del Mar" />
+	<iso_639_3_entry
+		id="hwa"
+		scope="I"
+		type="L"
+		name="Wané" />
+	<iso_639_3_entry
+		id="hwc"
+		scope="I"
+		type="L"
+		name="Creole English; Hawai'i" />
+	<iso_639_3_entry
+		id="hwo"
+		scope="I"
+		type="L"
+		name="Hwana" />
+	<iso_639_3_entry
+		id="hya"
+		scope="I"
+		type="L"
+		name="Hya" />
+	<iso_639_3_entry
+		id="hye"
+		part1_code="hy"
+		part2_code="arm"
+		scope="I"
+		type="L"
+		name="Armenian" />
+	<iso_639_3_entry
+		id="iai"
+		scope="I"
+		type="L"
+		name="Iaai" />
+	<iso_639_3_entry
+		id="ian"
+		scope="I"
+		type="L"
+		name="Iatmul" />
+	<iso_639_3_entry
+		id="iap"
+		scope="I"
+		type="L"
+		name="Iapama" />
+	<iso_639_3_entry
+		id="iar"
+		scope="I"
+		type="L"
+		name="Purari" />
+	<iso_639_3_entry
+		id="iba"
+		part2_code="iba"
+		scope="I"
+		type="L"
+		name="Iban" />
+	<iso_639_3_entry
+		id="ibb"
+		scope="I"
+		type="L"
+		name="Ibibio" />
+	<iso_639_3_entry
+		id="ibd"
+		scope="I"
+		type="L"
+		name="Iwaidja" />
+	<iso_639_3_entry
+		id="ibe"
+		scope="I"
+		type="L"
+		name="Akpes" />
+	<iso_639_3_entry
+		id="ibg"
+		scope="I"
+		type="L"
+		name="Ibanag" />
+	<iso_639_3_entry
+		id="ibi"
+		scope="I"
+		type="L"
+		name="Ibilo" />
+	<iso_639_3_entry
+		id="ibl"
+		scope="I"
+		type="L"
+		name="Ibaloi" />
+	<iso_639_3_entry
+		id="ibm"
+		scope="I"
+		type="L"
+		name="Agoi" />
+	<iso_639_3_entry
+		id="ibn"
+		scope="I"
+		type="L"
+		name="Ibino" />
+	<iso_639_3_entry
+		id="ibo"
+		part1_code="ig"
+		part2_code="ibo"
+		scope="I"
+		type="L"
+		name="Igbo" />
+	<iso_639_3_entry
+		id="ibr"
+		scope="I"
+		type="L"
+		name="Ibuoro" />
+	<iso_639_3_entry
+		id="ibu"
+		scope="I"
+		type="L"
+		name="Ibu" />
+	<iso_639_3_entry
+		id="iby"
+		scope="I"
+		type="L"
+		name="Ibani" />
+	<iso_639_3_entry
+		id="ica"
+		scope="I"
+		type="L"
+		name="Ede Ica" />
+	<iso_639_3_entry
+		id="ich"
+		scope="I"
+		type="L"
+		name="Etkywan" />
+	<iso_639_3_entry
+		id="icl"
+		scope="I"
+		type="L"
+		name="Icelandic Sign Language" />
+	<iso_639_3_entry
+		id="icr"
+		scope="I"
+		type="L"
+		name="Creole English; Islander" />
+	<iso_639_3_entry
+		id="ida"
+		scope="I"
+		type="L"
+		name="Idakho-Isukha-Tiriki" />
+	<iso_639_3_entry
+		id="idb"
+		scope="I"
+		type="L"
+		name="Indo-Portuguese" />
+	<iso_639_3_entry
+		id="idc"
+		scope="I"
+		type="L"
+		name="Idon" />
+	<iso_639_3_entry
+		id="idd"
+		scope="I"
+		type="L"
+		name="Ede Idaca" />
+	<iso_639_3_entry
+		id="ide"
+		scope="I"
+		type="L"
+		name="Idere" />
+	<iso_639_3_entry
+		id="idi"
+		scope="I"
+		type="L"
+		name="Idi" />
+	<iso_639_3_entry
+		id="ido"
+		part1_code="io"
+		part2_code="ido"
+		scope="I"
+		type="C"
+		name="Ido" />
+	<iso_639_3_entry
+		id="idr"
+		scope="I"
+		type="L"
+		name="Indri" />
+	<iso_639_3_entry
+		id="ids"
+		scope="I"
+		type="L"
+		name="Idesa" />
+	<iso_639_3_entry
+		id="idt"
+		scope="I"
+		type="L"
+		name="Idaté" />
+	<iso_639_3_entry
+		id="idu"
+		scope="I"
+		type="L"
+		name="Idoma" />
+	<iso_639_3_entry
+		id="ifa"
+		scope="I"
+		type="L"
+		name="Ifugao; Amganad" />
+	<iso_639_3_entry
+		id="ifb"
+		scope="I"
+		type="L"
+		name="Ifugao; Batad" />
+	<iso_639_3_entry
+		id="ife"
+		scope="I"
+		type="L"
+		name="Ifè" />
+	<iso_639_3_entry
+		id="iff"
+		scope="I"
+		type="E"
+		name="Ifo" />
+	<iso_639_3_entry
+		id="ifk"
+		scope="I"
+		type="L"
+		name="Ifugao; Tuwali" />
+	<iso_639_3_entry
+		id="ifm"
+		scope="I"
+		type="L"
+		name="Teke-Fuumu" />
+	<iso_639_3_entry
+		id="ifu"
+		scope="I"
+		type="L"
+		name="Ifugao; Mayoyao" />
+	<iso_639_3_entry
+		id="ify"
+		scope="I"
+		type="L"
+		name="Kallahan; Keley-I" />
+	<iso_639_3_entry
+		id="igb"
+		scope="I"
+		type="L"
+		name="Ebira" />
+	<iso_639_3_entry
+		id="ige"
+		scope="I"
+		type="L"
+		name="Igede" />
+	<iso_639_3_entry
+		id="igg"
+		scope="I"
+		type="L"
+		name="Igana" />
+	<iso_639_3_entry
+		id="igl"
+		scope="I"
+		type="L"
+		name="Igala" />
+	<iso_639_3_entry
+		id="igm"
+		scope="I"
+		type="L"
+		name="Kanggape" />
+	<iso_639_3_entry
+		id="ign"
+		scope="I"
+		type="L"
+		name="Ignaciano" />
+	<iso_639_3_entry
+		id="igo"
+		scope="I"
+		type="L"
+		name="Isebe" />
+	<iso_639_3_entry
+		id="igs"
+		scope="I"
+		type="C"
+		name="Interglossa" />
+	<iso_639_3_entry
+		id="igw"
+		scope="I"
+		type="L"
+		name="Igwe" />
+	<iso_639_3_entry
+		id="ihb"
+		scope="I"
+		type="L"
+		name="Iha Based Pidgin" />
+	<iso_639_3_entry
+		id="ihi"
+		scope="I"
+		type="L"
+		name="Ihievbe" />
+	<iso_639_3_entry
+		id="ihp"
+		scope="I"
+		type="L"
+		name="Iha" />
+	<iso_639_3_entry
+		id="iii"
+		part1_code="ii"
+		part2_code="iii"
+		scope="I"
+		type="L"
+		name="Yi; Sichuan" />
+	<iso_639_3_entry
+		id="ijc"
+		scope="I"
+		type="L"
+		name="Izon" />
+	<iso_639_3_entry
+		id="ije"
+		scope="I"
+		type="L"
+		name="Biseni" />
+	<iso_639_3_entry
+		id="ijj"
+		scope="I"
+		type="L"
+		name="Ede Ije" />
+	<iso_639_3_entry
+		id="ijn"
+		scope="I"
+		type="L"
+		name="Kalabari" />
+	<iso_639_3_entry
+		id="ijs"
+		scope="I"
+		type="L"
+		name="Ijo; Southeast" />
+	<iso_639_3_entry
+		id="ike"
+		scope="I"
+		type="L"
+		name="Inuktitut; Eastern Canadian" />
+	<iso_639_3_entry
+		id="iki"
+		scope="I"
+		type="L"
+		name="Iko" />
+	<iso_639_3_entry
+		id="ikk"
+		scope="I"
+		type="L"
+		name="Ika" />
+	<iso_639_3_entry
+		id="ikl"
+		scope="I"
+		type="L"
+		name="Ikulu" />
+	<iso_639_3_entry
+		id="iko"
+		scope="I"
+		type="L"
+		name="Olulumo-Ikom" />
+	<iso_639_3_entry
+		id="ikp"
+		scope="I"
+		type="L"
+		name="Ikpeshi" />
+	<iso_639_3_entry
+		id="ikt"
+		scope="I"
+		type="L"
+		name="Inuktitut; Western Canadian" />
+	<iso_639_3_entry
+		id="iku"
+		part1_code="iu"
+		part2_code="iku"
+		scope="M"
+		type="L"
+		name="Inuktitut" />
+	<iso_639_3_entry
+		id="ikv"
+		scope="I"
+		type="L"
+		name="Iku-Gora-Ankwa" />
+	<iso_639_3_entry
+		id="ikw"
+		scope="I"
+		type="L"
+		name="Ikwere" />
+	<iso_639_3_entry
+		id="ikx"
+		scope="I"
+		type="L"
+		name="Ik" />
+	<iso_639_3_entry
+		id="ikz"
+		scope="I"
+		type="L"
+		name="Ikizu" />
+	<iso_639_3_entry
+		id="ila"
+		scope="I"
+		type="L"
+		name="Ile Ape" />
+	<iso_639_3_entry
+		id="ilb"
+		scope="I"
+		type="L"
+		name="Ila" />
+	<iso_639_3_entry
+		id="ile"
+		part1_code="ie"
+		part2_code="ile"
+		scope="I"
+		type="C"
+		name="Interlingue" />
+	<iso_639_3_entry
+		id="ilg"
+		scope="I"
+		type="E"
+		name="Garig-Ilgar" />
+	<iso_639_3_entry
+		id="ili"
+		scope="I"
+		type="L"
+		name="Ili Turki" />
+	<iso_639_3_entry
+		id="ilk"
+		scope="I"
+		type="L"
+		name="Ilongot" />
+	<iso_639_3_entry
+		id="ill"
+		scope="I"
+		type="L"
+		name="Iranun" />
+	<iso_639_3_entry
+		id="ilo"
+		part2_code="ilo"
+		scope="I"
+		type="L"
+		name="Iloko" />
+	<iso_639_3_entry
+		id="ils"
+		scope="I"
+		type="L"
+		name="International Sign" />
+	<iso_639_3_entry
+		id="ilu"
+		scope="I"
+		type="L"
+		name="Ili'uun" />
+	<iso_639_3_entry
+		id="ilv"
+		scope="I"
+		type="L"
+		name="Ilue" />
+	<iso_639_3_entry
+		id="ilw"
+		scope="I"
+		type="L"
+		name="Talur" />
+	<iso_639_3_entry
+		id="ima"
+		scope="I"
+		type="L"
+		name="Malasar; Mala" />
+	<iso_639_3_entry
+		id="ime"
+		scope="I"
+		type="L"
+		name="Imeraguen" />
+	<iso_639_3_entry
+		id="imi"
+		scope="I"
+		type="L"
+		name="Anamgura" />
+	<iso_639_3_entry
+		id="iml"
+		scope="I"
+		type="E"
+		name="Miluk" />
+	<iso_639_3_entry
+		id="imn"
+		scope="I"
+		type="L"
+		name="Imonda" />
+	<iso_639_3_entry
+		id="imo"
+		scope="I"
+		type="L"
+		name="Imbongu" />
+	<iso_639_3_entry
+		id="imr"
+		scope="I"
+		type="L"
+		name="Imroing" />
+	<iso_639_3_entry
+		id="ims"
+		scope="I"
+		type="A"
+		name="Marsian" />
+	<iso_639_3_entry
+		id="imy"
+		scope="I"
+		type="A"
+		name="Milyan" />
+	<iso_639_3_entry
+		id="ina"
+		part1_code="ia"
+		part2_code="ina"
+		scope="I"
+		type="C"
+		name="Interlingua (International Auxiliary Language Association)" />
+	<iso_639_3_entry
+		id="inb"
+		scope="I"
+		type="L"
+		name="Inga" />
+	<iso_639_3_entry
+		id="ind"
+		part1_code="id"
+		part2_code="ind"
+		scope="I"
+		type="L"
+		name="Indonesian" />
+	<iso_639_3_entry
+		id="ing"
+		scope="I"
+		type="L"
+		name="Degexit'an" />
+	<iso_639_3_entry
+		id="inh"
+		part2_code="inh"
+		scope="I"
+		type="L"
+		name="Ingush" />
+	<iso_639_3_entry
+		id="inj"
+		scope="I"
+		type="L"
+		name="Inga; Jungle" />
+	<iso_639_3_entry
+		id="inl"
+		scope="I"
+		type="L"
+		name="Indonesian Sign Language" />
+	<iso_639_3_entry
+		id="inm"
+		scope="I"
+		type="A"
+		name="Minaean" />
+	<iso_639_3_entry
+		id="inn"
+		scope="I"
+		type="L"
+		name="Isinai" />
+	<iso_639_3_entry
+		id="ino"
+		scope="I"
+		type="L"
+		name="Inoke-Yate" />
+	<iso_639_3_entry
+		id="inp"
+		scope="I"
+		type="L"
+		name="Iñapari" />
+	<iso_639_3_entry
+		id="ins"
+		scope="I"
+		type="L"
+		name="Indian Sign Language" />
+	<iso_639_3_entry
+		id="int"
+		scope="I"
+		type="L"
+		name="Intha" />
+	<iso_639_3_entry
+		id="inz"
+		scope="I"
+		type="E"
+		name="Ineseño" />
+	<iso_639_3_entry
+		id="ior"
+		scope="I"
+		type="L"
+		name="Inor" />
+	<iso_639_3_entry
+		id="iou"
+		scope="I"
+		type="L"
+		name="Tuma-Irumu" />
+	<iso_639_3_entry
+		id="iow"
+		scope="I"
+		type="E"
+		name="Iowa-Oto" />
+	<iso_639_3_entry
+		id="ipi"
+		scope="I"
+		type="L"
+		name="Ipili" />
+	<iso_639_3_entry
+		id="ipk"
+		part1_code="ik"
+		part2_code="ipk"
+		scope="M"
+		type="L"
+		name="Inupiaq" />
+	<iso_639_3_entry
+		id="ipo"
+		scope="I"
+		type="L"
+		name="Ipiko" />
+	<iso_639_3_entry
+		id="iqu"
+		scope="I"
+		type="L"
+		name="Iquito" />
+	<iso_639_3_entry
+		id="ire"
+		scope="I"
+		type="L"
+		name="Iresim" />
+	<iso_639_3_entry
+		id="irh"
+		scope="I"
+		type="L"
+		name="Irarutu" />
+	<iso_639_3_entry
+		id="iri"
+		scope="I"
+		type="L"
+		name="Irigwe" />
+	<iso_639_3_entry
+		id="irk"
+		scope="I"
+		type="L"
+		name="Iraqw" />
+	<iso_639_3_entry
+		id="irn"
+		scope="I"
+		type="L"
+		name="Irántxe" />
+	<iso_639_3_entry
+		id="irr"
+		scope="I"
+		type="L"
+		name="Ir" />
+	<iso_639_3_entry
+		id="iru"
+		scope="I"
+		type="L"
+		name="Irula" />
+	<iso_639_3_entry
+		id="irx"
+		scope="I"
+		type="L"
+		name="Kamberau" />
+	<iso_639_3_entry
+		id="iry"
+		scope="I"
+		type="L"
+		name="Iraya" />
+	<iso_639_3_entry
+		id="isa"
+		scope="I"
+		type="L"
+		name="Isabi" />
+	<iso_639_3_entry
+		id="isc"
+		scope="I"
+		type="L"
+		name="Isconahua" />
+	<iso_639_3_entry
+		id="isd"
+		scope="I"
+		type="L"
+		name="Isnag" />
+	<iso_639_3_entry
+		id="ise"
+		scope="I"
+		type="L"
+		name="Italian Sign Language" />
+	<iso_639_3_entry
+		id="isg"
+		scope="I"
+		type="L"
+		name="Irish Sign Language" />
+	<iso_639_3_entry
+		id="ish"
+		scope="I"
+		type="L"
+		name="Esan" />
+	<iso_639_3_entry
+		id="isi"
+		scope="I"
+		type="L"
+		name="Nkem-Nkum" />
+	<iso_639_3_entry
+		id="isk"
+		scope="I"
+		type="L"
+		name="Ishkashimi" />
+	<iso_639_3_entry
+		id="isl"
+		part1_code="is"
+		part2_code="ice"
+		scope="I"
+		type="L"
+		name="Icelandic" />
+	<iso_639_3_entry
+		id="ism"
+		scope="I"
+		type="L"
+		name="Masimasi" />
+	<iso_639_3_entry
+		id="isn"
+		scope="I"
+		type="L"
+		name="Isanzu" />
+	<iso_639_3_entry
+		id="iso"
+		scope="I"
+		type="L"
+		name="Isoko" />
+	<iso_639_3_entry
+		id="isr"
+		scope="I"
+		type="L"
+		name="Israeli Sign Language" />
+	<iso_639_3_entry
+		id="ist"
+		scope="I"
+		type="L"
+		name="Istriot" />
+	<iso_639_3_entry
+		id="isu"
+		scope="I"
+		type="L"
+		name="Isu (Menchum Division)" />
+	<iso_639_3_entry
+		id="ita"
+		part1_code="it"
+		part2_code="ita"
+		scope="I"
+		type="L"
+		name="Italian" />
+	<iso_639_3_entry
+		id="itb"
+		scope="I"
+		type="L"
+		name="Itneg; Binongan" />
+	<iso_639_3_entry
+		id="ite"
+		scope="I"
+		type="E"
+		name="Itene" />
+	<iso_639_3_entry
+		id="iti"
+		scope="I"
+		type="L"
+		name="Itneg; Inlaod" />
+	<iso_639_3_entry
+		id="itk"
+		scope="I"
+		type="L"
+		name="Judeo-Italian" />
+	<iso_639_3_entry
+		id="itl"
+		scope="I"
+		type="L"
+		name="Itelmen" />
+	<iso_639_3_entry
+		id="itm"
+		scope="I"
+		type="L"
+		name="Itu Mbon Uzo" />
+	<iso_639_3_entry
+		id="ito"
+		scope="I"
+		type="L"
+		name="Itonama" />
+	<iso_639_3_entry
+		id="itr"
+		scope="I"
+		type="L"
+		name="Iteri" />
+	<iso_639_3_entry
+		id="its"
+		scope="I"
+		type="L"
+		name="Isekiri" />
+	<iso_639_3_entry
+		id="itt"
+		scope="I"
+		type="L"
+		name="Itneg; Maeng" />
+	<iso_639_3_entry
+		id="itv"
+		scope="I"
+		type="L"
+		name="Itawit" />
+	<iso_639_3_entry
+		id="itw"
+		scope="I"
+		type="L"
+		name="Ito" />
+	<iso_639_3_entry
+		id="itx"
+		scope="I"
+		type="L"
+		name="Itik" />
+	<iso_639_3_entry
+		id="ity"
+		scope="I"
+		type="L"
+		name="Itneg; Moyadan" />
+	<iso_639_3_entry
+		id="itz"
+		scope="I"
+		type="L"
+		name="Itzá" />
+	<iso_639_3_entry
+		id="ium"
+		scope="I"
+		type="L"
+		name="Mien; Iu" />
+	<iso_639_3_entry
+		id="ivb"
+		scope="I"
+		type="L"
+		name="Ibatan" />
+	<iso_639_3_entry
+		id="ivv"
+		scope="I"
+		type="L"
+		name="Ivatan" />
+	<iso_639_3_entry
+		id="iwk"
+		scope="I"
+		type="L"
+		name="I-Wak" />
+	<iso_639_3_entry
+		id="iwm"
+		scope="I"
+		type="L"
+		name="Iwam" />
+	<iso_639_3_entry
+		id="iwo"
+		scope="I"
+		type="L"
+		name="Iwur" />
+	<iso_639_3_entry
+		id="iws"
+		scope="I"
+		type="L"
+		name="Iwam; Sepik" />
+	<iso_639_3_entry
+		id="ixc"
+		scope="I"
+		type="L"
+		name="Ixcatec" />
+	<iso_639_3_entry
+		id="ixl"
+		scope="I"
+		type="L"
+		name="Ixil" />
+	<iso_639_3_entry
+		id="iya"
+		scope="I"
+		type="L"
+		name="Iyayu" />
+	<iso_639_3_entry
+		id="iyo"
+		scope="I"
+		type="L"
+		name="Mesaka" />
+	<iso_639_3_entry
+		id="iyx"
+		scope="I"
+		type="L"
+		name="Yaka (Congo)" />
+	<iso_639_3_entry
+		id="izh"
+		scope="I"
+		type="L"
+		name="Ingrian" />
+	<iso_639_3_entry
+		id="izi"
+		scope="I"
+		type="L"
+		name="Izi-Ezaa-Ikwo-Mgbo" />
+	<iso_639_3_entry
+		id="izr"
+		scope="I"
+		type="L"
+		name="Izere" />
+	<iso_639_3_entry
+		id="jaa"
+		scope="I"
+		type="L"
+		name="Jamamadí" />
+	<iso_639_3_entry
+		id="jab"
+		scope="I"
+		type="L"
+		name="Hyam" />
+	<iso_639_3_entry
+		id="jac"
+		scope="I"
+		type="L"
+		name="Popti'" />
+	<iso_639_3_entry
+		id="jad"
+		scope="I"
+		type="L"
+		name="Jahanka" />
+	<iso_639_3_entry
+		id="jae"
+		scope="I"
+		type="L"
+		name="Yabem" />
+	<iso_639_3_entry
+		id="jaf"
+		scope="I"
+		type="L"
+		name="Jara" />
+	<iso_639_3_entry
+		id="jah"
+		scope="I"
+		type="L"
+		name="Jah Hut" />
+	<iso_639_3_entry
+		id="jaj"
+		scope="I"
+		type="L"
+		name="Zazao" />
+	<iso_639_3_entry
+		id="jak"
+		scope="I"
+		type="L"
+		name="Jakun" />
+	<iso_639_3_entry
+		id="jal"
+		scope="I"
+		type="L"
+		name="Yalahatan" />
+	<iso_639_3_entry
+		id="jam"
+		scope="I"
+		type="L"
+		name="Creole English; Jamaican" />
+	<iso_639_3_entry
+		id="jao"
+		scope="I"
+		type="L"
+		name="Yanyuwa" />
+	<iso_639_3_entry
+		id="jaq"
+		scope="I"
+		type="L"
+		name="Yaqay" />
+	<iso_639_3_entry
+		id="jar"
+		scope="I"
+		type="L"
+		name="Jarawa (Nigeria)" />
+	<iso_639_3_entry
+		id="jas"
+		scope="I"
+		type="L"
+		name="Javanese; New Caledonian" />
+	<iso_639_3_entry
+		id="jat"
+		scope="I"
+		type="L"
+		name="Jakati" />
+	<iso_639_3_entry
+		id="jau"
+		scope="I"
+		type="L"
+		name="Yaur" />
+	<iso_639_3_entry
+		id="jav"
+		part1_code="jv"
+		part2_code="jav"
+		scope="I"
+		type="L"
+		name="Javanese" />
+	<iso_639_3_entry
+		id="jax"
+		scope="I"
+		type="L"
+		name="Malay; Jambi" />
+	<iso_639_3_entry
+		id="jay"
+		scope="I"
+		type="L"
+		name="Yan-nhangu" />
+	<iso_639_3_entry
+		id="jaz"
+		scope="I"
+		type="L"
+		name="Jawe" />
+	<iso_639_3_entry
+		id="jbe"
+		scope="I"
+		type="L"
+		name="Judeo-Berber" />
+	<iso_639_3_entry
+		id="jbj"
+		scope="I"
+		type="L"
+		name="Arandai" />
+	<iso_639_3_entry
+		id="jbn"
+		scope="I"
+		type="L"
+		name="Nafusi" />
+	<iso_639_3_entry
+		id="jbo"
+		part2_code="jbo"
+		scope="I"
+		type="C"
+		name="Lojban" />
+	<iso_639_3_entry
+		id="jbr"
+		scope="I"
+		type="L"
+		name="Jofotek-Bromnya" />
+	<iso_639_3_entry
+		id="jbt"
+		scope="I"
+		type="L"
+		name="Jabutí" />
+	<iso_639_3_entry
+		id="jbu"
+		scope="I"
+		type="L"
+		name="Jukun Takum" />
+	<iso_639_3_entry
+		id="jcs"
+		scope="I"
+		type="L"
+		name="Jamaican Country Sign Language" />
+	<iso_639_3_entry
+		id="jct"
+		scope="I"
+		type="L"
+		name="Krymchak" />
+	<iso_639_3_entry
+		id="jda"
+		scope="I"
+		type="L"
+		name="Jad" />
+	<iso_639_3_entry
+		id="jdg"
+		scope="I"
+		type="L"
+		name="Jadgali" />
+	<iso_639_3_entry
+		id="jdt"
+		scope="I"
+		type="L"
+		name="Judeo-Tat" />
+	<iso_639_3_entry
+		id="jeb"
+		scope="I"
+		type="L"
+		name="Jebero" />
+	<iso_639_3_entry
+		id="jee"
+		scope="I"
+		type="L"
+		name="Jerung" />
+	<iso_639_3_entry
+		id="jeg"
+		scope="I"
+		type="L"
+		name="Jeng" />
+	<iso_639_3_entry
+		id="jeh"
+		scope="I"
+		type="L"
+		name="Jeh" />
+	<iso_639_3_entry
+		id="jei"
+		scope="I"
+		type="L"
+		name="Yei" />
+	<iso_639_3_entry
+		id="jek"
+		scope="I"
+		type="L"
+		name="Jeri Kuo" />
+	<iso_639_3_entry
+		id="jel"
+		scope="I"
+		type="L"
+		name="Yelmek" />
+	<iso_639_3_entry
+		id="jen"
+		scope="I"
+		type="L"
+		name="Dza" />
+	<iso_639_3_entry
+		id="jer"
+		scope="I"
+		type="L"
+		name="Jere" />
+	<iso_639_3_entry
+		id="jet"
+		scope="I"
+		type="L"
+		name="Manem" />
+	<iso_639_3_entry
+		id="jeu"
+		scope="I"
+		type="L"
+		name="Jonkor Bourmataguil" />
+	<iso_639_3_entry
+		id="jgb"
+		scope="I"
+		type="E"
+		name="Ngbee" />
+	<iso_639_3_entry
+		id="jge"
+		scope="I"
+		type="L"
+		name="Judeo-Georgian" />
+	<iso_639_3_entry
+		id="jgo"
+		scope="I"
+		type="L"
+		name="Ngomba" />
+	<iso_639_3_entry
+		id="jhi"
+		scope="I"
+		type="L"
+		name="Jehai" />
+	<iso_639_3_entry
+		id="jhs"
+		scope="I"
+		type="L"
+		name="Jhankot Sign Language" />
+	<iso_639_3_entry
+		id="jia"
+		scope="I"
+		type="L"
+		name="Jina" />
+	<iso_639_3_entry
+		id="jib"
+		scope="I"
+		type="L"
+		name="Jibu" />
+	<iso_639_3_entry
+		id="jic"
+		scope="I"
+		type="L"
+		name="Tol" />
+	<iso_639_3_entry
+		id="jid"
+		scope="I"
+		type="L"
+		name="Bu" />
+	<iso_639_3_entry
+		id="jie"
+		scope="I"
+		type="L"
+		name="Jilbe" />
+	<iso_639_3_entry
+		id="jig"
+		scope="I"
+		type="L"
+		name="Djingili" />
+	<iso_639_3_entry
+		id="jih"
+		scope="I"
+		type="L"
+		name="Shangzhai" />
+	<iso_639_3_entry
+		id="jii"
+		scope="I"
+		type="L"
+		name="Jiiddu" />
+	<iso_639_3_entry
+		id="jil"
+		scope="I"
+		type="L"
+		name="Jilim" />
+	<iso_639_3_entry
+		id="jim"
+		scope="I"
+		type="L"
+		name="Jimi (Cameroon)" />
+	<iso_639_3_entry
+		id="jio"
+		scope="I"
+		type="L"
+		name="Jiamao" />
+	<iso_639_3_entry
+		id="jiq"
+		scope="I"
+		type="L"
+		name="Guanyinqiao" />
+	<iso_639_3_entry
+		id="jit"
+		scope="I"
+		type="L"
+		name="Jita" />
+	<iso_639_3_entry
+		id="jiu"
+		scope="I"
+		type="L"
+		name="Jinuo; Youle" />
+	<iso_639_3_entry
+		id="jiv"
+		scope="I"
+		type="L"
+		name="Shuar" />
+	<iso_639_3_entry
+		id="jiy"
+		scope="I"
+		type="L"
+		name="Jinuo; Buyuan" />
+	<iso_639_3_entry
+		id="jko"
+		scope="I"
+		type="L"
+		name="Kubo" />
+	<iso_639_3_entry
+		id="jku"
+		scope="I"
+		type="L"
+		name="Labir" />
+	<iso_639_3_entry
+		id="jle"
+		scope="I"
+		type="L"
+		name="Ngile" />
+	<iso_639_3_entry
+		id="jls"
+		scope="I"
+		type="L"
+		name="Jamaican Sign Language" />
+	<iso_639_3_entry
+		id="jma"
+		scope="I"
+		type="L"
+		name="Dima" />
+	<iso_639_3_entry
+		id="jmb"
+		scope="I"
+		type="L"
+		name="Zumbun" />
+	<iso_639_3_entry
+		id="jmc"
+		scope="I"
+		type="L"
+		name="Machame" />
+	<iso_639_3_entry
+		id="jmd"
+		scope="I"
+		type="L"
+		name="Yamdena" />
+	<iso_639_3_entry
+		id="jmi"
+		scope="I"
+		type="L"
+		name="Jimi (Nigeria)" />
+	<iso_639_3_entry
+		id="jml"
+		scope="I"
+		type="L"
+		name="Jumli" />
+	<iso_639_3_entry
+		id="jmn"
+		scope="I"
+		type="L"
+		name="Naga; Makuri" />
+	<iso_639_3_entry
+		id="jmr"
+		scope="I"
+		type="L"
+		name="Kamara" />
+	<iso_639_3_entry
+		id="jms"
+		scope="I"
+		type="L"
+		name="Mashi (Nigeria)" />
+	<iso_639_3_entry
+		id="jmx"
+		scope="I"
+		type="L"
+		name="Mixtec; Western Juxtlahuaca" />
+	<iso_639_3_entry
+		id="jna"
+		scope="I"
+		type="L"
+		name="Jangshung" />
+	<iso_639_3_entry
+		id="jnd"
+		scope="I"
+		type="L"
+		name="Jandavra" />
+	<iso_639_3_entry
+		id="jng"
+		scope="I"
+		type="E"
+		name="Yangman" />
+	<iso_639_3_entry
+		id="jni"
+		scope="I"
+		type="L"
+		name="Janji" />
+	<iso_639_3_entry
+		id="jnj"
+		scope="I"
+		type="L"
+		name="Yemsa" />
+	<iso_639_3_entry
+		id="jnl"
+		scope="I"
+		type="L"
+		name="Rawat" />
+	<iso_639_3_entry
+		id="jns"
+		scope="I"
+		type="L"
+		name="Jaunsari" />
+	<iso_639_3_entry
+		id="job"
+		scope="I"
+		type="L"
+		name="Joba" />
+	<iso_639_3_entry
+		id="jod"
+		scope="I"
+		type="L"
+		name="Wojenaka" />
+	<iso_639_3_entry
+		id="jor"
+		scope="I"
+		type="E"
+		name="Jorá" />
+	<iso_639_3_entry
+		id="jos"
+		scope="I"
+		type="L"
+		name="Jordanian Sign Language" />
+	<iso_639_3_entry
+		id="jow"
+		scope="I"
+		type="L"
+		name="Jowulu" />
+	<iso_639_3_entry
+		id="jpa"
+		scope="I"
+		type="H"
+		name="Aramaic; Jewish Palestinian" />
+	<iso_639_3_entry
+		id="jpn"
+		part1_code="ja"
+		part2_code="jpn"
+		scope="I"
+		type="L"
+		name="Japanese" />
+	<iso_639_3_entry
+		id="jpr"
+		part2_code="jpr"
+		scope="I"
+		type="L"
+		name="Judeo-Persian" />
+	<iso_639_3_entry
+		id="jqr"
+		scope="I"
+		type="L"
+		name="Jaqaru" />
+	<iso_639_3_entry
+		id="jra"
+		scope="I"
+		type="L"
+		name="Jarai" />
+	<iso_639_3_entry
+		id="jrb"
+		part2_code="jrb"
+		scope="M"
+		type="L"
+		name="Judeo-Arabic" />
+	<iso_639_3_entry
+		id="jrr"
+		scope="I"
+		type="L"
+		name="Jiru" />
+	<iso_639_3_entry
+		id="jrt"
+		scope="I"
+		type="L"
+		name="Jorto" />
+	<iso_639_3_entry
+		id="jru"
+		scope="I"
+		type="L"
+		name="Japrería" />
+	<iso_639_3_entry
+		id="jsl"
+		scope="I"
+		type="L"
+		name="Japanese Sign Language" />
+	<iso_639_3_entry
+		id="jua"
+		scope="I"
+		type="L"
+		name="Júma" />
+	<iso_639_3_entry
+		id="jub"
+		scope="I"
+		type="L"
+		name="Wannu" />
+	<iso_639_3_entry
+		id="juc"
+		scope="I"
+		type="E"
+		name="Jurchen" />
+	<iso_639_3_entry
+		id="jud"
+		scope="I"
+		type="L"
+		name="Worodougou" />
+	<iso_639_3_entry
+		id="juh"
+		scope="I"
+		type="L"
+		name="Hõne" />
+	<iso_639_3_entry
+		id="juk"
+		scope="I"
+		type="L"
+		name="Wapan" />
+	<iso_639_3_entry
+		id="jul"
+		scope="I"
+		type="L"
+		name="Jirel" />
+	<iso_639_3_entry
+		id="jum"
+		scope="I"
+		type="L"
+		name="Jumjum" />
+	<iso_639_3_entry
+		id="jun"
+		scope="I"
+		type="L"
+		name="Juang" />
+	<iso_639_3_entry
+		id="juo"
+		scope="I"
+		type="L"
+		name="Jiba" />
+	<iso_639_3_entry
+		id="jup"
+		scope="I"
+		type="L"
+		name="Hupdë" />
+	<iso_639_3_entry
+		id="jur"
+		scope="I"
+		type="L"
+		name="Jurúna" />
+	<iso_639_3_entry
+		id="jus"
+		scope="I"
+		type="L"
+		name="Jumla Sign Language" />
+	<iso_639_3_entry
+		id="jut"
+		scope="I"
+		type="L"
+		name="Jutish" />
+	<iso_639_3_entry
+		id="juu"
+		scope="I"
+		type="L"
+		name="Ju" />
+	<iso_639_3_entry
+		id="juw"
+		scope="I"
+		type="L"
+		name="Wãpha" />
+	<iso_639_3_entry
+		id="juy"
+		scope="I"
+		type="L"
+		name="Juray" />
+	<iso_639_3_entry
+		id="jvd"
+		scope="I"
+		type="E"
+		name="Javindo" />
+	<iso_639_3_entry
+		id="jvn"
+		scope="I"
+		type="L"
+		name="Javanese; Caribbean" />
+	<iso_639_3_entry
+		id="jwi"
+		scope="I"
+		type="L"
+		name="Jwira-Pepesa" />
+	<iso_639_3_entry
+		id="jya"
+		scope="I"
+		type="L"
+		name="Jiarong" />
+	<iso_639_3_entry
+		id="jye"
+		scope="I"
+		type="L"
+		name="Arabic; Judeo-Yemeni" />
+	<iso_639_3_entry
+		id="jyy"
+		scope="I"
+		type="L"
+		name="Jaya" />
+	<iso_639_3_entry
+		id="kaa"
+		part2_code="kaa"
+		scope="I"
+		type="L"
+		name="Kara-Kalpak" />
+	<iso_639_3_entry
+		id="kab"
+		part2_code="kab"
+		scope="I"
+		type="L"
+		name="Kabyle" />
+	<iso_639_3_entry
+		id="kac"
+		part2_code="kac"
+		scope="I"
+		type="L"
+		name="Kachin" />
+	<iso_639_3_entry
+		id="kad"
+		scope="I"
+		type="L"
+		name="Kadara" />
+	<iso_639_3_entry
+		id="kae"
+		scope="I"
+		type="E"
+		name="Ketangalan" />
+	<iso_639_3_entry
+		id="kaf"
+		scope="I"
+		type="L"
+		name="Katso" />
+	<iso_639_3_entry
+		id="kag"
+		scope="I"
+		type="L"
+		name="Kajaman" />
+	<iso_639_3_entry
+		id="kah"
+		scope="I"
+		type="L"
+		name="Kara (Central African Republic)" />
+	<iso_639_3_entry
+		id="kai"
+		scope="I"
+		type="L"
+		name="Karekare" />
+	<iso_639_3_entry
+		id="kaj"
+		scope="I"
+		type="L"
+		name="Jju" />
+	<iso_639_3_entry
+		id="kak"
+		scope="I"
+		type="L"
+		name="Kallahan; Kayapa" />
+	<iso_639_3_entry
+		id="kal"
+		part1_code="kl"
+		part2_code="kal"
+		scope="I"
+		type="L"
+		name="Kalaallisut" />
+	<iso_639_3_entry
+		id="kam"
+		part2_code="kam"
+		scope="I"
+		type="L"
+		name="Kamba (Kenya)" />
+	<iso_639_3_entry
+		id="kan"
+		part1_code="kn"
+		part2_code="kan"
+		scope="I"
+		type="L"
+		name="Kannada" />
+	<iso_639_3_entry
+		id="kao"
+		scope="I"
+		type="L"
+		name="Xaasongaxango" />
+	<iso_639_3_entry
+		id="kap"
+		scope="I"
+		type="L"
+		name="Bezhta" />
+	<iso_639_3_entry
+		id="kaq"
+		scope="I"
+		type="L"
+		name="Capanahua" />
+	<iso_639_3_entry
+		id="kas"
+		part1_code="ks"
+		part2_code="kas"
+		scope="I"
+		type="L"
+		name="Kashmiri" />
+	<iso_639_3_entry
+		id="kat"
+		part1_code="ka"
+		part2_code="geo"
+		scope="I"
+		type="L"
+		name="Georgian" />
+	<iso_639_3_entry
+		id="kau"
+		part1_code="kr"
+		part2_code="kau"
+		scope="M"
+		type="L"
+		name="Kanuri" />
+	<iso_639_3_entry
+		id="kav"
+		scope="I"
+		type="L"
+		name="Katukína" />
+	<iso_639_3_entry
+		id="kaw"
+		part2_code="kaw"
+		scope="I"
+		type="A"
+		name="Kawi" />
+	<iso_639_3_entry
+		id="kax"
+		scope="I"
+		type="L"
+		name="Kao" />
+	<iso_639_3_entry
+		id="kay"
+		scope="I"
+		type="L"
+		name="Kamayurá" />
+	<iso_639_3_entry
+		id="kaz"
+		part1_code="kk"
+		part2_code="kaz"
+		scope="I"
+		type="L"
+		name="Kazakh" />
+	<iso_639_3_entry
+		id="kba"
+		scope="I"
+		type="E"
+		name="Kalarko" />
+	<iso_639_3_entry
+		id="kbb"
+		scope="I"
+		type="E"
+		name="Kaxuiâna" />
+	<iso_639_3_entry
+		id="kbc"
+		scope="I"
+		type="L"
+		name="Kadiwéu" />
+	<iso_639_3_entry
+		id="kbd"
+		part2_code="kbd"
+		scope="I"
+		type="L"
+		name="Kabardian" />
+	<iso_639_3_entry
+		id="kbe"
+		scope="I"
+		type="L"
+		name="Kanju" />
+	<iso_639_3_entry
+		id="kbf"
+		scope="I"
+		type="E"
+		name="Kakauhua" />
+	<iso_639_3_entry
+		id="kbg"
+		scope="I"
+		type="L"
+		name="Khamba" />
+	<iso_639_3_entry
+		id="kbh"
+		scope="I"
+		type="L"
+		name="Camsá" />
+	<iso_639_3_entry
+		id="kbi"
+		scope="I"
+		type="L"
+		name="Kaptiau" />
+	<iso_639_3_entry
+		id="kbj"
+		scope="I"
+		type="L"
+		name="Kari" />
+	<iso_639_3_entry
+		id="kbk"
+		scope="I"
+		type="L"
+		name="Koiari; Grass" />
+	<iso_639_3_entry
+		id="kbl"
+		scope="I"
+		type="L"
+		name="Kanembu" />
+	<iso_639_3_entry
+		id="kbm"
+		scope="I"
+		type="L"
+		name="Iwal" />
+	<iso_639_3_entry
+		id="kbn"
+		scope="I"
+		type="L"
+		name="Kare (Central African Republic)" />
+	<iso_639_3_entry
+		id="kbo"
+		scope="I"
+		type="L"
+		name="Keliko" />
+	<iso_639_3_entry
+		id="kbp"
+		scope="I"
+		type="L"
+		name="Kabiyè" />
+	<iso_639_3_entry
+		id="kbq"
+		scope="I"
+		type="L"
+		name="Kamano" />
+	<iso_639_3_entry
+		id="kbr"
+		scope="I"
+		type="L"
+		name="Kafa" />
+	<iso_639_3_entry
+		id="kbs"
+		scope="I"
+		type="L"
+		name="Kande" />
+	<iso_639_3_entry
+		id="kbt"
+		scope="I"
+		type="L"
+		name="Abadi" />
+	<iso_639_3_entry
+		id="kbu"
+		scope="I"
+		type="L"
+		name="Kabutra" />
+	<iso_639_3_entry
+		id="kbv"
+		scope="I"
+		type="L"
+		name="Dera (Indonesia)" />
+	<iso_639_3_entry
+		id="kbw"
+		scope="I"
+		type="L"
+		name="Kaiep" />
+	<iso_639_3_entry
+		id="kbx"
+		scope="I"
+		type="L"
+		name="Ap Ma" />
+	<iso_639_3_entry
+		id="kby"
+		scope="I"
+		type="L"
+		name="Kanuri; Manga" />
+	<iso_639_3_entry
+		id="kbz"
+		scope="I"
+		type="L"
+		name="Duhwa" />
+	<iso_639_3_entry
+		id="kca"
+		scope="I"
+		type="L"
+		name="Khanty" />
+	<iso_639_3_entry
+		id="kcb"
+		scope="I"
+		type="L"
+		name="Kawacha" />
+	<iso_639_3_entry
+		id="kcc"
+		scope="I"
+		type="L"
+		name="Lubila" />
+	<iso_639_3_entry
+		id="kcd"
+		scope="I"
+		type="L"
+		name="Kanum; Ngkâlmpw" />
+	<iso_639_3_entry
+		id="kce"
+		scope="I"
+		type="L"
+		name="Kaivi" />
+	<iso_639_3_entry
+		id="kcf"
+		scope="I"
+		type="L"
+		name="Ukaan" />
+	<iso_639_3_entry
+		id="kcg"
+		scope="I"
+		type="L"
+		name="Tyap" />
+	<iso_639_3_entry
+		id="kch"
+		scope="I"
+		type="L"
+		name="Vono" />
+	<iso_639_3_entry
+		id="kci"
+		scope="I"
+		type="L"
+		name="Kamantan" />
+	<iso_639_3_entry
+		id="kcj"
+		scope="I"
+		type="L"
+		name="Kobiana" />
+	<iso_639_3_entry
+		id="kck"
+		scope="I"
+		type="L"
+		name="Kalanga" />
+	<iso_639_3_entry
+		id="kcl"
+		scope="I"
+		type="L"
+		name="Kela (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="kcm"
+		scope="I"
+		type="L"
+		name="Gula (Central African Republic)" />
+	<iso_639_3_entry
+		id="kcn"
+		scope="I"
+		type="L"
+		name="Nubi" />
+	<iso_639_3_entry
+		id="kco"
+		scope="I"
+		type="L"
+		name="Kinalakna" />
+	<iso_639_3_entry
+		id="kcp"
+		scope="I"
+		type="L"
+		name="Kanga" />
+	<iso_639_3_entry
+		id="kcq"
+		scope="I"
+		type="L"
+		name="Kamo" />
+	<iso_639_3_entry
+		id="kcr"
+		scope="I"
+		type="L"
+		name="Katla" />
+	<iso_639_3_entry
+		id="kcs"
+		scope="I"
+		type="L"
+		name="Koenoem" />
+	<iso_639_3_entry
+		id="kct"
+		scope="I"
+		type="L"
+		name="Kaian" />
+	<iso_639_3_entry
+		id="kcu"
+		scope="I"
+		type="L"
+		name="Kami (Tanzania)" />
+	<iso_639_3_entry
+		id="kcv"
+		scope="I"
+		type="L"
+		name="Kete" />
+	<iso_639_3_entry
+		id="kcw"
+		scope="I"
+		type="L"
+		name="Kabwari" />
+	<iso_639_3_entry
+		id="kcx"
+		scope="I"
+		type="L"
+		name="Kachama-Ganjule" />
+	<iso_639_3_entry
+		id="kcy"
+		scope="I"
+		type="L"
+		name="Korandje" />
+	<iso_639_3_entry
+		id="kcz"
+		scope="I"
+		type="L"
+		name="Konongo" />
+	<iso_639_3_entry
+		id="kda"
+		scope="I"
+		type="E"
+		name="Worimi" />
+	<iso_639_3_entry
+		id="kdc"
+		scope="I"
+		type="L"
+		name="Kutu" />
+	<iso_639_3_entry
+		id="kdd"
+		scope="I"
+		type="L"
+		name="Yankunytjatjara" />
+	<iso_639_3_entry
+		id="kde"
+		scope="I"
+		type="L"
+		name="Makonde" />
+	<iso_639_3_entry
+		id="kdf"
+		scope="I"
+		type="L"
+		name="Mamusi" />
+	<iso_639_3_entry
+		id="kdg"
+		scope="I"
+		type="L"
+		name="Seba" />
+	<iso_639_3_entry
+		id="kdh"
+		scope="I"
+		type="L"
+		name="Tem" />
+	<iso_639_3_entry
+		id="kdi"
+		scope="I"
+		type="L"
+		name="Kumam" />
+	<iso_639_3_entry
+		id="kdj"
+		scope="I"
+		type="L"
+		name="Karamojong" />
+	<iso_639_3_entry
+		id="kdk"
+		scope="I"
+		type="L"
+		name="Numee" />
+	<iso_639_3_entry
+		id="kdl"
+		scope="I"
+		type="L"
+		name="Tsikimba" />
+	<iso_639_3_entry
+		id="kdm"
+		scope="I"
+		type="L"
+		name="Kagoma" />
+	<iso_639_3_entry
+		id="kdn"
+		scope="I"
+		type="L"
+		name="Kunda" />
+	<iso_639_3_entry
+		id="kdp"
+		scope="I"
+		type="L"
+		name="Kaningdon-Nindem" />
+	<iso_639_3_entry
+		id="kdq"
+		scope="I"
+		type="L"
+		name="Koch" />
+	<iso_639_3_entry
+		id="kdr"
+		scope="I"
+		type="L"
+		name="Karaim" />
+	<iso_639_3_entry
+		id="kdt"
+		scope="I"
+		type="L"
+		name="Kuy" />
+	<iso_639_3_entry
+		id="kdu"
+		scope="I"
+		type="L"
+		name="Kadaru" />
+	<iso_639_3_entry
+		id="kdv"
+		scope="I"
+		type="L"
+		name="Kado" />
+	<iso_639_3_entry
+		id="kdw"
+		scope="I"
+		type="L"
+		name="Koneraw" />
+	<iso_639_3_entry
+		id="kdx"
+		scope="I"
+		type="L"
+		name="Kam" />
+	<iso_639_3_entry
+		id="kdy"
+		scope="I"
+		type="L"
+		name="Keder" />
+	<iso_639_3_entry
+		id="kdz"
+		scope="I"
+		type="L"
+		name="Kwaja" />
+	<iso_639_3_entry
+		id="kea"
+		scope="I"
+		type="L"
+		name="Kabuverdianu" />
+	<iso_639_3_entry
+		id="keb"
+		scope="I"
+		type="L"
+		name="Kélé" />
+	<iso_639_3_entry
+		id="kec"
+		scope="I"
+		type="L"
+		name="Keiga" />
+	<iso_639_3_entry
+		id="ked"
+		scope="I"
+		type="L"
+		name="Kerewe" />
+	<iso_639_3_entry
+		id="kee"
+		scope="I"
+		type="L"
+		name="Keres; Eastern" />
+	<iso_639_3_entry
+		id="kef"
+		scope="I"
+		type="L"
+		name="Kpessi" />
+	<iso_639_3_entry
+		id="keg"
+		scope="I"
+		type="L"
+		name="Tese" />
+	<iso_639_3_entry
+		id="keh"
+		scope="I"
+		type="L"
+		name="Keak" />
+	<iso_639_3_entry
+		id="kei"
+		scope="I"
+		type="L"
+		name="Kei" />
+	<iso_639_3_entry
+		id="kej"
+		scope="I"
+		type="L"
+		name="Kadar" />
+	<iso_639_3_entry
+		id="kek"
+		scope="I"
+		type="L"
+		name="Kekchí" />
+	<iso_639_3_entry
+		id="kel"
+		scope="I"
+		type="L"
+		name="Kela (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="kem"
+		scope="I"
+		type="L"
+		name="Kemak" />
+	<iso_639_3_entry
+		id="ken"
+		scope="I"
+		type="L"
+		name="Kenyang" />
+	<iso_639_3_entry
+		id="keo"
+		scope="I"
+		type="L"
+		name="Kakwa" />
+	<iso_639_3_entry
+		id="kep"
+		scope="I"
+		type="L"
+		name="Kaikadi" />
+	<iso_639_3_entry
+		id="keq"
+		scope="I"
+		type="L"
+		name="Kamar" />
+	<iso_639_3_entry
+		id="ker"
+		scope="I"
+		type="L"
+		name="Kera" />
+	<iso_639_3_entry
+		id="kes"
+		scope="I"
+		type="L"
+		name="Kugbo" />
+	<iso_639_3_entry
+		id="ket"
+		scope="I"
+		type="L"
+		name="Ket" />
+	<iso_639_3_entry
+		id="keu"
+		scope="I"
+		type="L"
+		name="Akebu" />
+	<iso_639_3_entry
+		id="kev"
+		scope="I"
+		type="L"
+		name="Kanikkaran" />
+	<iso_639_3_entry
+		id="kew"
+		scope="I"
+		type="L"
+		name="Kewa; West" />
+	<iso_639_3_entry
+		id="kex"
+		scope="I"
+		type="L"
+		name="Kukna" />
+	<iso_639_3_entry
+		id="key"
+		scope="I"
+		type="L"
+		name="Kupia" />
+	<iso_639_3_entry
+		id="kez"
+		scope="I"
+		type="L"
+		name="Kukele" />
+	<iso_639_3_entry
+		id="kfa"
+		scope="I"
+		type="L"
+		name="Kodava" />
+	<iso_639_3_entry
+		id="kfb"
+		scope="I"
+		type="L"
+		name="Kolami; Northwestern" />
+	<iso_639_3_entry
+		id="kfc"
+		scope="I"
+		type="L"
+		name="Konda-Dora" />
+	<iso_639_3_entry
+		id="kfd"
+		scope="I"
+		type="L"
+		name="Koraga; Korra" />
+	<iso_639_3_entry
+		id="kfe"
+		scope="I"
+		type="L"
+		name="Kota (India)" />
+	<iso_639_3_entry
+		id="kff"
+		scope="I"
+		type="L"
+		name="Koya" />
+	<iso_639_3_entry
+		id="kfg"
+		scope="I"
+		type="L"
+		name="Kudiya" />
+	<iso_639_3_entry
+		id="kfh"
+		scope="I"
+		type="L"
+		name="Kurichiya" />
+	<iso_639_3_entry
+		id="kfi"
+		scope="I"
+		type="L"
+		name="Kurumba; Kannada" />
+	<iso_639_3_entry
+		id="kfj"
+		scope="I"
+		type="L"
+		name="Kemiehua" />
+	<iso_639_3_entry
+		id="kfk"
+		scope="I"
+		type="L"
+		name="Kinnauri" />
+	<iso_639_3_entry
+		id="kfl"
+		scope="I"
+		type="L"
+		name="Kung" />
+	<iso_639_3_entry
+		id="kfm"
+		scope="I"
+		type="L"
+		name="Khunsari" />
+	<iso_639_3_entry
+		id="kfn"
+		scope="I"
+		type="L"
+		name="Kuk" />
+	<iso_639_3_entry
+		id="kfo"
+		scope="I"
+		type="L"
+		name="Koro (Côte d'Ivoire)" />
+	<iso_639_3_entry
+		id="kfp"
+		scope="I"
+		type="L"
+		name="Korwa" />
+	<iso_639_3_entry
+		id="kfq"
+		scope="I"
+		type="L"
+		name="Korku" />
+	<iso_639_3_entry
+		id="kfr"
+		scope="I"
+		type="L"
+		name="Kachchi" />
+	<iso_639_3_entry
+		id="kfs"
+		scope="I"
+		type="L"
+		name="Bilaspuri" />
+	<iso_639_3_entry
+		id="kft"
+		scope="I"
+		type="L"
+		name="Kanjari" />
+	<iso_639_3_entry
+		id="kfu"
+		scope="I"
+		type="L"
+		name="Katkari" />
+	<iso_639_3_entry
+		id="kfv"
+		scope="I"
+		type="L"
+		name="Kurmukar" />
+	<iso_639_3_entry
+		id="kfw"
+		scope="I"
+		type="L"
+		name="Naga; Kharam" />
+	<iso_639_3_entry
+		id="kfx"
+		scope="I"
+		type="L"
+		name="Pahari; Kullu" />
+	<iso_639_3_entry
+		id="kfy"
+		scope="I"
+		type="L"
+		name="Kumaoni" />
+	<iso_639_3_entry
+		id="kfz"
+		scope="I"
+		type="L"
+		name="Koromfé" />
+	<iso_639_3_entry
+		id="kga"
+		scope="I"
+		type="L"
+		name="Koyaga" />
+	<iso_639_3_entry
+		id="kgb"
+		scope="I"
+		type="L"
+		name="Kawe" />
+	<iso_639_3_entry
+		id="kgc"
+		scope="I"
+		type="L"
+		name="Kasseng" />
+	<iso_639_3_entry
+		id="kgd"
+		scope="I"
+		type="L"
+		name="Kataang" />
+	<iso_639_3_entry
+		id="kge"
+		scope="I"
+		type="L"
+		name="Komering" />
+	<iso_639_3_entry
+		id="kgf"
+		scope="I"
+		type="L"
+		name="Kube" />
+	<iso_639_3_entry
+		id="kgg"
+		scope="I"
+		type="L"
+		name="Kusunda" />
+	<iso_639_3_entry
+		id="kgh"
+		scope="I"
+		type="L"
+		name="Kalinga; Upper Tanudan" />
+	<iso_639_3_entry
+		id="kgi"
+		scope="I"
+		type="L"
+		name="Selangor Sign Language" />
+	<iso_639_3_entry
+		id="kgj"
+		scope="I"
+		type="L"
+		name="Kham; Gamale" />
+	<iso_639_3_entry
+		id="kgk"
+		scope="I"
+		type="L"
+		name="Kaiwá" />
+	<iso_639_3_entry
+		id="kgl"
+		scope="I"
+		type="E"
+		name="Kunggari" />
+	<iso_639_3_entry
+		id="kgm"
+		scope="I"
+		type="E"
+		name="Karipúna" />
+	<iso_639_3_entry
+		id="kgn"
+		scope="I"
+		type="L"
+		name="Karingani" />
+	<iso_639_3_entry
+		id="kgo"
+		scope="I"
+		type="L"
+		name="Krongo" />
+	<iso_639_3_entry
+		id="kgp"
+		scope="I"
+		type="L"
+		name="Kaingang" />
+	<iso_639_3_entry
+		id="kgq"
+		scope="I"
+		type="L"
+		name="Kamoro" />
+	<iso_639_3_entry
+		id="kgr"
+		scope="I"
+		type="L"
+		name="Abun" />
+	<iso_639_3_entry
+		id="kgs"
+		scope="I"
+		type="L"
+		name="Kumbainggar" />
+	<iso_639_3_entry
+		id="kgt"
+		scope="I"
+		type="L"
+		name="Somyev" />
+	<iso_639_3_entry
+		id="kgu"
+		scope="I"
+		type="L"
+		name="Kobol" />
+	<iso_639_3_entry
+		id="kgv"
+		scope="I"
+		type="L"
+		name="Karas" />
+	<iso_639_3_entry
+		id="kgw"
+		scope="I"
+		type="L"
+		name="Karon Dori" />
+	<iso_639_3_entry
+		id="kgx"
+		scope="I"
+		type="L"
+		name="Kamaru" />
+	<iso_639_3_entry
+		id="kgy"
+		scope="I"
+		type="L"
+		name="Kyerung" />
+	<iso_639_3_entry
+		id="kha"
+		part2_code="kha"
+		scope="I"
+		type="L"
+		name="Khasi" />
+	<iso_639_3_entry
+		id="khb"
+		scope="I"
+		type="L"
+		name="Lü" />
+	<iso_639_3_entry
+		id="khc"
+		scope="I"
+		type="L"
+		name="Tukang Besi North" />
+	<iso_639_3_entry
+		id="khd"
+		scope="I"
+		type="L"
+		name="Kanum; Bädi" />
+	<iso_639_3_entry
+		id="khe"
+		scope="I"
+		type="L"
+		name="Korowai" />
+	<iso_639_3_entry
+		id="khf"
+		scope="I"
+		type="L"
+		name="Khuen" />
+	<iso_639_3_entry
+		id="khg"
+		scope="I"
+		type="L"
+		name="Tibetan; Khams" />
+	<iso_639_3_entry
+		id="khh"
+		scope="I"
+		type="L"
+		name="Kehu" />
+	<iso_639_3_entry
+		id="khj"
+		scope="I"
+		type="L"
+		name="Kuturmi" />
+	<iso_639_3_entry
+		id="khk"
+		scope="I"
+		type="L"
+		name="Mongolian; Halh" />
+	<iso_639_3_entry
+		id="khl"
+		scope="I"
+		type="L"
+		name="Lusi" />
+	<iso_639_3_entry
+		id="khm"
+		part1_code="km"
+		part2_code="khm"
+		scope="I"
+		type="L"
+		name="Khmer; Central" />
+	<iso_639_3_entry
+		id="khn"
+		scope="I"
+		type="L"
+		name="Khandesi" />
+	<iso_639_3_entry
+		id="kho"
+		part2_code="kho"
+		scope="I"
+		type="A"
+		name="Khotanese" />
+	<iso_639_3_entry
+		id="khp"
+		scope="I"
+		type="L"
+		name="Kapori" />
+	<iso_639_3_entry
+		id="khq"
+		scope="I"
+		type="L"
+		name="Songhay; Koyra Chiini" />
+	<iso_639_3_entry
+		id="khr"
+		scope="I"
+		type="L"
+		name="Kharia" />
+	<iso_639_3_entry
+		id="khs"
+		scope="I"
+		type="L"
+		name="Kasua" />
+	<iso_639_3_entry
+		id="kht"
+		scope="I"
+		type="L"
+		name="Khamti" />
+	<iso_639_3_entry
+		id="khu"
+		scope="I"
+		type="L"
+		name="Nkhumbi" />
+	<iso_639_3_entry
+		id="khv"
+		scope="I"
+		type="L"
+		name="Khvarshi" />
+	<iso_639_3_entry
+		id="khw"
+		scope="I"
+		type="L"
+		name="Khowar" />
+	<iso_639_3_entry
+		id="khx"
+		scope="I"
+		type="L"
+		name="Kanu" />
+	<iso_639_3_entry
+		id="khy"
+		scope="I"
+		type="L"
+		name="Kele (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="khz"
+		scope="I"
+		type="L"
+		name="Keapara" />
+	<iso_639_3_entry
+		id="kia"
+		scope="I"
+		type="L"
+		name="Kim" />
+	<iso_639_3_entry
+		id="kib"
+		scope="I"
+		type="L"
+		name="Koalib" />
+	<iso_639_3_entry
+		id="kic"
+		scope="I"
+		type="L"
+		name="Kickapoo" />
+	<iso_639_3_entry
+		id="kid"
+		scope="I"
+		type="L"
+		name="Koshin" />
+	<iso_639_3_entry
+		id="kie"
+		scope="I"
+		type="L"
+		name="Kibet" />
+	<iso_639_3_entry
+		id="kif"
+		scope="I"
+		type="L"
+		name="Kham; Eastern Parbate" />
+	<iso_639_3_entry
+		id="kig"
+		scope="I"
+		type="L"
+		name="Kimaama" />
+	<iso_639_3_entry
+		id="kih"
+		scope="I"
+		type="L"
+		name="Kilmeri" />
+	<iso_639_3_entry
+		id="kii"
+		scope="I"
+		type="E"
+		name="Kitsai" />
+	<iso_639_3_entry
+		id="kij"
+		scope="I"
+		type="L"
+		name="Kilivila" />
+	<iso_639_3_entry
+		id="kik"
+		part1_code="ki"
+		part2_code="kik"
+		scope="I"
+		type="L"
+		name="Kikuyu" />
+	<iso_639_3_entry
+		id="kil"
+		scope="I"
+		type="L"
+		name="Kariya" />
+	<iso_639_3_entry
+		id="kim"
+		scope="I"
+		type="L"
+		name="Karagas" />
+	<iso_639_3_entry
+		id="kin"
+		part1_code="rw"
+		part2_code="kin"
+		scope="I"
+		type="L"
+		name="Kinyarwanda" />
+	<iso_639_3_entry
+		id="kio"
+		scope="I"
+		type="L"
+		name="Kiowa" />
+	<iso_639_3_entry
+		id="kip"
+		scope="I"
+		type="L"
+		name="Kham; Sheshi" />
+	<iso_639_3_entry
+		id="kiq"
+		scope="I"
+		type="L"
+		name="Kosadle" />
+	<iso_639_3_entry
+		id="kir"
+		part1_code="ky"
+		part2_code="kir"
+		scope="I"
+		type="L"
+		name="Kirghiz" />
+	<iso_639_3_entry
+		id="kis"
+		scope="I"
+		type="L"
+		name="Kis" />
+	<iso_639_3_entry
+		id="kit"
+		scope="I"
+		type="L"
+		name="Agob" />
+	<iso_639_3_entry
+		id="kiu"
+		scope="I"
+		type="L"
+		name="Kirmanjki (individual language)" />
+	<iso_639_3_entry
+		id="kiv"
+		scope="I"
+		type="L"
+		name="Kimbu" />
+	<iso_639_3_entry
+		id="kiw"
+		scope="I"
+		type="L"
+		name="Kiwai; Northeast" />
+	<iso_639_3_entry
+		id="kix"
+		scope="I"
+		type="L"
+		name="Naga; Khiamniungan" />
+	<iso_639_3_entry
+		id="kiy"
+		scope="I"
+		type="L"
+		name="Kirikiri" />
+	<iso_639_3_entry
+		id="kiz"
+		scope="I"
+		type="L"
+		name="Kisi" />
+	<iso_639_3_entry
+		id="kja"
+		scope="I"
+		type="L"
+		name="Mlap" />
+	<iso_639_3_entry
+		id="kjb"
+		scope="I"
+		type="L"
+		name="Q'anjob'al" />
+	<iso_639_3_entry
+		id="kjc"
+		scope="I"
+		type="L"
+		name="Konjo; Coastal" />
+	<iso_639_3_entry
+		id="kjd"
+		scope="I"
+		type="L"
+		name="Kiwai; Southern" />
+	<iso_639_3_entry
+		id="kje"
+		scope="I"
+		type="L"
+		name="Kisar" />
+	<iso_639_3_entry
+		id="kjf"
+		scope="I"
+		type="L"
+		name="Khalaj" />
+	<iso_639_3_entry
+		id="kjg"
+		scope="I"
+		type="L"
+		name="Khmu" />
+	<iso_639_3_entry
+		id="kjh"
+		scope="I"
+		type="L"
+		name="Khakas" />
+	<iso_639_3_entry
+		id="kji"
+		scope="I"
+		type="L"
+		name="Zabana" />
+	<iso_639_3_entry
+		id="kjj"
+		scope="I"
+		type="L"
+		name="Khinalugh" />
+	<iso_639_3_entry
+		id="kjk"
+		scope="I"
+		type="L"
+		name="Konjo; Highland" />
+	<iso_639_3_entry
+		id="kjl"
+		scope="I"
+		type="L"
+		name="Kham; Western Parbate" />
+	<iso_639_3_entry
+		id="kjm"
+		scope="I"
+		type="L"
+		name="Kháng" />
+	<iso_639_3_entry
+		id="kjn"
+		scope="I"
+		type="L"
+		name="Kunjen" />
+	<iso_639_3_entry
+		id="kjo"
+		scope="I"
+		type="L"
+		name="Kinnauri; Harijan" />
+	<iso_639_3_entry
+		id="kjp"
+		scope="I"
+		type="L"
+		name="Karen; Pwo Eastern" />
+	<iso_639_3_entry
+		id="kjq"
+		scope="I"
+		type="L"
+		name="Keres; Western" />
+	<iso_639_3_entry
+		id="kjr"
+		scope="I"
+		type="L"
+		name="Kurudu" />
+	<iso_639_3_entry
+		id="kjs"
+		scope="I"
+		type="L"
+		name="Kewa; East" />
+	<iso_639_3_entry
+		id="kjt"
+		scope="I"
+		type="L"
+		name="Karen; Phrae Pwo" />
+	<iso_639_3_entry
+		id="kju"
+		scope="I"
+		type="L"
+		name="Kashaya" />
+	<iso_639_3_entry
+		id="kjx"
+		scope="I"
+		type="L"
+		name="Ramopa" />
+	<iso_639_3_entry
+		id="kjy"
+		scope="I"
+		type="L"
+		name="Erave" />
+	<iso_639_3_entry
+		id="kjz"
+		scope="I"
+		type="L"
+		name="Bumthangkha" />
+	<iso_639_3_entry
+		id="kka"
+		scope="I"
+		type="L"
+		name="Kakanda" />
+	<iso_639_3_entry
+		id="kkb"
+		scope="I"
+		type="L"
+		name="Kwerisa" />
+	<iso_639_3_entry
+		id="kkc"
+		scope="I"
+		type="L"
+		name="Odoodee" />
+	<iso_639_3_entry
+		id="kkd"
+		scope="I"
+		type="L"
+		name="Kinuku" />
+	<iso_639_3_entry
+		id="kke"
+		scope="I"
+		type="L"
+		name="Kakabe" />
+	<iso_639_3_entry
+		id="kkf"
+		scope="I"
+		type="L"
+		name="Monpa; Kalaktang" />
+	<iso_639_3_entry
+		id="kkg"
+		scope="I"
+		type="L"
+		name="Kalinga; Mabaka Valley" />
+	<iso_639_3_entry
+		id="kkh"
+		scope="I"
+		type="L"
+		name="Khün" />
+	<iso_639_3_entry
+		id="kki"
+		scope="I"
+		type="L"
+		name="Kagulu" />
+	<iso_639_3_entry
+		id="kkj"
+		scope="I"
+		type="L"
+		name="Kako" />
+	<iso_639_3_entry
+		id="kkk"
+		scope="I"
+		type="L"
+		name="Kokota" />
+	<iso_639_3_entry
+		id="kkl"
+		scope="I"
+		type="L"
+		name="Yale; Kosarek" />
+	<iso_639_3_entry
+		id="kkm"
+		scope="I"
+		type="L"
+		name="Kiong" />
+	<iso_639_3_entry
+		id="kkn"
+		scope="I"
+		type="L"
+		name="Kon Keu" />
+	<iso_639_3_entry
+		id="kko"
+		scope="I"
+		type="L"
+		name="Karko" />
+	<iso_639_3_entry
+		id="kkp"
+		scope="I"
+		type="L"
+		name="Gugubera" />
+	<iso_639_3_entry
+		id="kkq"
+		scope="I"
+		type="L"
+		name="Kaiku" />
+	<iso_639_3_entry
+		id="kkr"
+		scope="I"
+		type="L"
+		name="Kir-Balar" />
+	<iso_639_3_entry
+		id="kks"
+		scope="I"
+		type="L"
+		name="Giiwo" />
+	<iso_639_3_entry
+		id="kkt"
+		scope="I"
+		type="L"
+		name="Koi" />
+	<iso_639_3_entry
+		id="kku"
+		scope="I"
+		type="L"
+		name="Tumi" />
+	<iso_639_3_entry
+		id="kkv"
+		scope="I"
+		type="L"
+		name="Kangean" />
+	<iso_639_3_entry
+		id="kkw"
+		scope="I"
+		type="L"
+		name="Teke-Kukuya" />
+	<iso_639_3_entry
+		id="kkx"
+		scope="I"
+		type="L"
+		name="Kohin" />
+	<iso_639_3_entry
+		id="kky"
+		scope="I"
+		type="L"
+		name="Guguyimidjir" />
+	<iso_639_3_entry
+		id="kkz"
+		scope="I"
+		type="L"
+		name="Kaska" />
+	<iso_639_3_entry
+		id="kla"
+		scope="I"
+		type="E"
+		name="Klamath-Modoc" />
+	<iso_639_3_entry
+		id="klb"
+		scope="I"
+		type="L"
+		name="Kiliwa" />
+	<iso_639_3_entry
+		id="klc"
+		scope="I"
+		type="L"
+		name="Kolbila" />
+	<iso_639_3_entry
+		id="kld"
+		scope="I"
+		type="L"
+		name="Gamilaraay" />
+	<iso_639_3_entry
+		id="kle"
+		scope="I"
+		type="L"
+		name="Kulung (Nepal)" />
+	<iso_639_3_entry
+		id="klf"
+		scope="I"
+		type="L"
+		name="Kendeje" />
+	<iso_639_3_entry
+		id="klg"
+		scope="I"
+		type="L"
+		name="Tagakaulo" />
+	<iso_639_3_entry
+		id="klh"
+		scope="I"
+		type="L"
+		name="Weliki" />
+	<iso_639_3_entry
+		id="kli"
+		scope="I"
+		type="L"
+		name="Kalumpang" />
+	<iso_639_3_entry
+		id="klj"
+		scope="I"
+		type="L"
+		name="Khalaj; Turkic" />
+	<iso_639_3_entry
+		id="klk"
+		scope="I"
+		type="L"
+		name="Kono (Nigeria)" />
+	<iso_639_3_entry
+		id="kll"
+		scope="I"
+		type="L"
+		name="Kalagan; Kagan" />
+	<iso_639_3_entry
+		id="klm"
+		scope="I"
+		type="L"
+		name="Migum" />
+	<iso_639_3_entry
+		id="kln"
+		scope="M"
+		type="L"
+		name="Kalenjin" />
+	<iso_639_3_entry
+		id="klo"
+		scope="I"
+		type="L"
+		name="Kapya" />
+	<iso_639_3_entry
+		id="klp"
+		scope="I"
+		type="L"
+		name="Kamasa" />
+	<iso_639_3_entry
+		id="klq"
+		scope="I"
+		type="L"
+		name="Rumu" />
+	<iso_639_3_entry
+		id="klr"
+		scope="I"
+		type="L"
+		name="Khaling" />
+	<iso_639_3_entry
+		id="kls"
+		scope="I"
+		type="L"
+		name="Kalasha" />
+	<iso_639_3_entry
+		id="klt"
+		scope="I"
+		type="L"
+		name="Nukna" />
+	<iso_639_3_entry
+		id="klu"
+		scope="I"
+		type="L"
+		name="Klao" />
+	<iso_639_3_entry
+		id="klv"
+		scope="I"
+		type="L"
+		name="Maskelynes" />
+	<iso_639_3_entry
+		id="klw"
+		scope="I"
+		type="L"
+		name="Lindu" />
+	<iso_639_3_entry
+		id="klx"
+		scope="I"
+		type="L"
+		name="Koluwawa" />
+	<iso_639_3_entry
+		id="kly"
+		scope="I"
+		type="L"
+		name="Kalao" />
+	<iso_639_3_entry
+		id="klz"
+		scope="I"
+		type="L"
+		name="Kabola" />
+	<iso_639_3_entry
+		id="kma"
+		scope="I"
+		type="L"
+		name="Konni" />
+	<iso_639_3_entry
+		id="kmb"
+		part2_code="kmb"
+		scope="I"
+		type="L"
+		name="Kimbundu" />
+	<iso_639_3_entry
+		id="kmc"
+		scope="I"
+		type="L"
+		name="Dong; Southern" />
+	<iso_639_3_entry
+		id="kmd"
+		scope="I"
+		type="L"
+		name="Kalinga; Majukayang" />
+	<iso_639_3_entry
+		id="kme"
+		scope="I"
+		type="L"
+		name="Bakole" />
+	<iso_639_3_entry
+		id="kmf"
+		scope="I"
+		type="L"
+		name="Kare (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="kmg"
+		scope="I"
+		type="L"
+		name="Kâte" />
+	<iso_639_3_entry
+		id="kmh"
+		scope="I"
+		type="L"
+		name="Kalam" />
+	<iso_639_3_entry
+		id="kmi"
+		scope="I"
+		type="L"
+		name="Kami (Nigeria)" />
+	<iso_639_3_entry
+		id="kmj"
+		scope="I"
+		type="L"
+		name="Kumarbhag Paharia" />
+	<iso_639_3_entry
+		id="kmk"
+		scope="I"
+		type="L"
+		name="Kalinga; Limos" />
+	<iso_639_3_entry
+		id="kml"
+		scope="I"
+		type="L"
+		name="Kalinga; Lower Tanudan" />
+	<iso_639_3_entry
+		id="kmm"
+		scope="I"
+		type="L"
+		name="Kom (India)" />
+	<iso_639_3_entry
+		id="kmn"
+		scope="I"
+		type="L"
+		name="Awtuw" />
+	<iso_639_3_entry
+		id="kmo"
+		scope="I"
+		type="L"
+		name="Kwoma" />
+	<iso_639_3_entry
+		id="kmp"
+		scope="I"
+		type="L"
+		name="Gimme" />
+	<iso_639_3_entry
+		id="kmq"
+		scope="I"
+		type="L"
+		name="Kwama" />
+	<iso_639_3_entry
+		id="kmr"
+		scope="I"
+		type="L"
+		name="Kurdish; Northern" />
+	<iso_639_3_entry
+		id="kms"
+		scope="I"
+		type="L"
+		name="Kamasau" />
+	<iso_639_3_entry
+		id="kmt"
+		scope="I"
+		type="L"
+		name="Kemtuik" />
+	<iso_639_3_entry
+		id="kmu"
+		scope="I"
+		type="L"
+		name="Kanite" />
+	<iso_639_3_entry
+		id="kmv"
+		scope="I"
+		type="L"
+		name="Creole French; Karipúna" />
+	<iso_639_3_entry
+		id="kmw"
+		scope="I"
+		type="L"
+		name="Komo (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="kmx"
+		scope="I"
+		type="L"
+		name="Waboda" />
+	<iso_639_3_entry
+		id="kmy"
+		scope="I"
+		type="L"
+		name="Koma" />
+	<iso_639_3_entry
+		id="kmz"
+		scope="I"
+		type="L"
+		name="Khorasani Turkish" />
+	<iso_639_3_entry
+		id="kna"
+		scope="I"
+		type="L"
+		name="Dera (Nigeria)" />
+	<iso_639_3_entry
+		id="knb"
+		scope="I"
+		type="L"
+		name="Kalinga; Lubuagan" />
+	<iso_639_3_entry
+		id="knc"
+		scope="I"
+		type="L"
+		name="Kanuri; Central" />
+	<iso_639_3_entry
+		id="knd"
+		scope="I"
+		type="L"
+		name="Konda" />
+	<iso_639_3_entry
+		id="kne"
+		scope="I"
+		type="L"
+		name="Kankanaey" />
+	<iso_639_3_entry
+		id="knf"
+		scope="I"
+		type="L"
+		name="Mankanya" />
+	<iso_639_3_entry
+		id="kng"
+		scope="I"
+		type="L"
+		name="Koongo" />
+	<iso_639_3_entry
+		id="kni"
+		scope="I"
+		type="L"
+		name="Kanufi" />
+	<iso_639_3_entry
+		id="knj"
+		scope="I"
+		type="L"
+		name="Kanjobal; Western" />
+	<iso_639_3_entry
+		id="knk"
+		scope="I"
+		type="L"
+		name="Kuranko" />
+	<iso_639_3_entry
+		id="knl"
+		scope="I"
+		type="L"
+		name="Keninjal" />
+	<iso_639_3_entry
+		id="knm"
+		scope="I"
+		type="L"
+		name="Kanamarí" />
+	<iso_639_3_entry
+		id="knn"
+		scope="I"
+		type="L"
+		name="Konkani (individual language)" />
+	<iso_639_3_entry
+		id="kno"
+		scope="I"
+		type="L"
+		name="Kono (Sierra Leone)" />
+	<iso_639_3_entry
+		id="knp"
+		scope="I"
+		type="L"
+		name="Kwanja" />
+	<iso_639_3_entry
+		id="knq"
+		scope="I"
+		type="L"
+		name="Kintaq" />
+	<iso_639_3_entry
+		id="knr"
+		scope="I"
+		type="L"
+		name="Kaningra" />
+	<iso_639_3_entry
+		id="kns"
+		scope="I"
+		type="L"
+		name="Kensiu" />
+	<iso_639_3_entry
+		id="knt"
+		scope="I"
+		type="L"
+		name="Katukína; Panoan" />
+	<iso_639_3_entry
+		id="knu"
+		scope="I"
+		type="L"
+		name="Kono (Guinea)" />
+	<iso_639_3_entry
+		id="knv"
+		scope="I"
+		type="L"
+		name="Tabo" />
+	<iso_639_3_entry
+		id="knw"
+		scope="I"
+		type="L"
+		name="Kung-Ekoka" />
+	<iso_639_3_entry
+		id="knx"
+		scope="I"
+		type="L"
+		name="Kendayan" />
+	<iso_639_3_entry
+		id="kny"
+		scope="I"
+		type="L"
+		name="Kanyok" />
+	<iso_639_3_entry
+		id="knz"
+		scope="I"
+		type="L"
+		name="Kalamsé" />
+	<iso_639_3_entry
+		id="koa"
+		scope="I"
+		type="L"
+		name="Konomala" />
+	<iso_639_3_entry
+		id="koc"
+		scope="I"
+		type="E"
+		name="Kpati" />
+	<iso_639_3_entry
+		id="kod"
+		scope="I"
+		type="L"
+		name="Kodi" />
+	<iso_639_3_entry
+		id="koe"
+		scope="I"
+		type="L"
+		name="Kacipo-Balesi" />
+	<iso_639_3_entry
+		id="kof"
+		scope="I"
+		type="E"
+		name="Kubi" />
+	<iso_639_3_entry
+		id="kog"
+		scope="I"
+		type="L"
+		name="Cogui" />
+	<iso_639_3_entry
+		id="koh"
+		scope="I"
+		type="L"
+		name="Koyo" />
+	<iso_639_3_entry
+		id="koi"
+		scope="I"
+		type="L"
+		name="Komi-Permyak" />
+	<iso_639_3_entry
+		id="koj"
+		scope="I"
+		type="L"
+		name="Sara Dunjo" />
+	<iso_639_3_entry
+		id="kok"
+		part2_code="kok"
+		scope="M"
+		type="L"
+		name="Konkani (macrolanguage)" />
+	<iso_639_3_entry
+		id="kol"
+		scope="I"
+		type="L"
+		name="Kol (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="kom"
+		part1_code="kv"
+		part2_code="kom"
+		scope="M"
+		type="L"
+		name="Komi" />
+	<iso_639_3_entry
+		id="kon"
+		part1_code="kg"
+		part2_code="kon"
+		scope="M"
+		type="L"
+		name="Kongo" />
+	<iso_639_3_entry
+		id="koo"
+		scope="I"
+		type="L"
+		name="Konzo" />
+	<iso_639_3_entry
+		id="kop"
+		scope="I"
+		type="L"
+		name="Waube" />
+	<iso_639_3_entry
+		id="koq"
+		scope="I"
+		type="L"
+		name="Kota (Gabon)" />
+	<iso_639_3_entry
+		id="kor"
+		part1_code="ko"
+		part2_code="kor"
+		scope="I"
+		type="L"
+		name="Korean" />
+	<iso_639_3_entry
+		id="kos"
+		part2_code="kos"
+		scope="I"
+		type="L"
+		name="Kosraean" />
+	<iso_639_3_entry
+		id="kot"
+		scope="I"
+		type="L"
+		name="Lagwan" />
+	<iso_639_3_entry
+		id="kou"
+		scope="I"
+		type="L"
+		name="Koke" />
+	<iso_639_3_entry
+		id="kov"
+		scope="I"
+		type="L"
+		name="Kudu-Camo" />
+	<iso_639_3_entry
+		id="kow"
+		scope="I"
+		type="L"
+		name="Kugama" />
+	<iso_639_3_entry
+		id="kox"
+		scope="I"
+		type="E"
+		name="Coxima" />
+	<iso_639_3_entry
+		id="koy"
+		scope="I"
+		type="L"
+		name="Koyukon" />
+	<iso_639_3_entry
+		id="koz"
+		scope="I"
+		type="L"
+		name="Korak" />
+	<iso_639_3_entry
+		id="kpa"
+		scope="I"
+		type="L"
+		name="Kutto" />
+	<iso_639_3_entry
+		id="kpb"
+		scope="I"
+		type="L"
+		name="Kurumba; Mullu" />
+	<iso_639_3_entry
+		id="kpc"
+		scope="I"
+		type="L"
+		name="Curripaco" />
+	<iso_639_3_entry
+		id="kpd"
+		scope="I"
+		type="L"
+		name="Koba" />
+	<iso_639_3_entry
+		id="kpe"
+		part2_code="kpe"
+		scope="M"
+		type="L"
+		name="Kpelle" />
+	<iso_639_3_entry
+		id="kpf"
+		scope="I"
+		type="L"
+		name="Komba" />
+	<iso_639_3_entry
+		id="kpg"
+		scope="I"
+		type="L"
+		name="Kapingamarangi" />
+	<iso_639_3_entry
+		id="kph"
+		scope="I"
+		type="L"
+		name="Kplang" />
+	<iso_639_3_entry
+		id="kpi"
+		scope="I"
+		type="L"
+		name="Kofei" />
+	<iso_639_3_entry
+		id="kpj"
+		scope="I"
+		type="L"
+		name="Karajá" />
+	<iso_639_3_entry
+		id="kpk"
+		scope="I"
+		type="L"
+		name="Kpan" />
+	<iso_639_3_entry
+		id="kpl"
+		scope="I"
+		type="L"
+		name="Kpala" />
+	<iso_639_3_entry
+		id="kpm"
+		scope="I"
+		type="L"
+		name="Koho" />
+	<iso_639_3_entry
+		id="kpn"
+		scope="I"
+		type="E"
+		name="Kepkiriwát" />
+	<iso_639_3_entry
+		id="kpo"
+		scope="I"
+		type="L"
+		name="Ikposo" />
+	<iso_639_3_entry
+		id="kpp"
+		scope="I"
+		type="L"
+		name="Karen; Paku" />
+	<iso_639_3_entry
+		id="kpq"
+		scope="I"
+		type="L"
+		name="Korupun-Sela" />
+	<iso_639_3_entry
+		id="kpr"
+		scope="I"
+		type="L"
+		name="Korafe-Yegha" />
+	<iso_639_3_entry
+		id="kps"
+		scope="I"
+		type="L"
+		name="Tehit" />
+	<iso_639_3_entry
+		id="kpt"
+		scope="I"
+		type="L"
+		name="Karata" />
+	<iso_639_3_entry
+		id="kpu"
+		scope="I"
+		type="L"
+		name="Kafoa" />
+	<iso_639_3_entry
+		id="kpv"
+		scope="I"
+		type="L"
+		name="Komi-Zyrian" />
+	<iso_639_3_entry
+		id="kpw"
+		scope="I"
+		type="L"
+		name="Kobon" />
+	<iso_639_3_entry
+		id="kpx"
+		scope="I"
+		type="L"
+		name="Koiali; Mountain" />
+	<iso_639_3_entry
+		id="kpy"
+		scope="I"
+		type="L"
+		name="Koryak" />
+	<iso_639_3_entry
+		id="kpz"
+		scope="I"
+		type="L"
+		name="Kupsabiny" />
+	<iso_639_3_entry
+		id="kqa"
+		scope="I"
+		type="L"
+		name="Mum" />
+	<iso_639_3_entry
+		id="kqb"
+		scope="I"
+		type="L"
+		name="Kovai" />
+	<iso_639_3_entry
+		id="kqc"
+		scope="I"
+		type="L"
+		name="Doromu-Koki" />
+	<iso_639_3_entry
+		id="kqd"
+		scope="I"
+		type="L"
+		name="Koy Sanjaq Surat" />
+	<iso_639_3_entry
+		id="kqe"
+		scope="I"
+		type="L"
+		name="Kalagan" />
+	<iso_639_3_entry
+		id="kqf"
+		scope="I"
+		type="L"
+		name="Kakabai" />
+	<iso_639_3_entry
+		id="kqg"
+		scope="I"
+		type="L"
+		name="Khe" />
+	<iso_639_3_entry
+		id="kqh"
+		scope="I"
+		type="L"
+		name="Kisankasa" />
+	<iso_639_3_entry
+		id="kqi"
+		scope="I"
+		type="L"
+		name="Koitabu" />
+	<iso_639_3_entry
+		id="kqj"
+		scope="I"
+		type="L"
+		name="Koromira" />
+	<iso_639_3_entry
+		id="kqk"
+		scope="I"
+		type="L"
+		name="Gbe; Kotafon" />
+	<iso_639_3_entry
+		id="kql"
+		scope="I"
+		type="L"
+		name="Kyenele" />
+	<iso_639_3_entry
+		id="kqm"
+		scope="I"
+		type="L"
+		name="Khisa" />
+	<iso_639_3_entry
+		id="kqn"
+		scope="I"
+		type="L"
+		name="Kaonde" />
+	<iso_639_3_entry
+		id="kqo"
+		scope="I"
+		type="L"
+		name="Krahn; Eastern" />
+	<iso_639_3_entry
+		id="kqp"
+		scope="I"
+		type="L"
+		name="Kimré" />
+	<iso_639_3_entry
+		id="kqq"
+		scope="I"
+		type="L"
+		name="Krenak" />
+	<iso_639_3_entry
+		id="kqr"
+		scope="I"
+		type="L"
+		name="Kimaragang" />
+	<iso_639_3_entry
+		id="kqs"
+		scope="I"
+		type="L"
+		name="Kissi; Northern" />
+	<iso_639_3_entry
+		id="kqt"
+		scope="I"
+		type="L"
+		name="Kadazan; Klias River" />
+	<iso_639_3_entry
+		id="kqu"
+		scope="I"
+		type="E"
+		name="Seroa" />
+	<iso_639_3_entry
+		id="kqv"
+		scope="I"
+		type="L"
+		name="Okolod" />
+	<iso_639_3_entry
+		id="kqw"
+		scope="I"
+		type="L"
+		name="Kandas" />
+	<iso_639_3_entry
+		id="kqx"
+		scope="I"
+		type="L"
+		name="Mser" />
+	<iso_639_3_entry
+		id="kqy"
+		scope="I"
+		type="L"
+		name="Koorete" />
+	<iso_639_3_entry
+		id="kqz"
+		scope="I"
+		type="E"
+		name="Korana" />
+	<iso_639_3_entry
+		id="kra"
+		scope="I"
+		type="L"
+		name="Kumhali" />
+	<iso_639_3_entry
+		id="krb"
+		scope="I"
+		type="E"
+		name="Karkin" />
+	<iso_639_3_entry
+		id="krc"
+		part2_code="krc"
+		scope="I"
+		type="L"
+		name="Karachay-Balkar" />
+	<iso_639_3_entry
+		id="krd"
+		scope="I"
+		type="L"
+		name="Kairui-Midiki" />
+	<iso_639_3_entry
+		id="kre"
+		scope="I"
+		type="L"
+		name="Panará" />
+	<iso_639_3_entry
+		id="krf"
+		scope="I"
+		type="L"
+		name="Koro (Vanuatu)" />
+	<iso_639_3_entry
+		id="krh"
+		scope="I"
+		type="L"
+		name="Kurama" />
+	<iso_639_3_entry
+		id="kri"
+		scope="I"
+		type="L"
+		name="Krio" />
+	<iso_639_3_entry
+		id="krj"
+		scope="I"
+		type="L"
+		name="Kinaray-A" />
+	<iso_639_3_entry
+		id="krk"
+		scope="I"
+		type="E"
+		name="Kerek" />
+	<iso_639_3_entry
+		id="krl"
+		part2_code="krl"
+		scope="I"
+		type="L"
+		name="Karelian" />
+	<iso_639_3_entry
+		id="krm"
+		scope="I"
+		type="L"
+		name="Krim" />
+	<iso_639_3_entry
+		id="krn"
+		scope="I"
+		type="L"
+		name="Sapo" />
+	<iso_639_3_entry
+		id="krp"
+		scope="I"
+		type="L"
+		name="Korop" />
+	<iso_639_3_entry
+		id="krr"
+		scope="I"
+		type="L"
+		name="Kru'ng 2" />
+	<iso_639_3_entry
+		id="krs"
+		scope="I"
+		type="L"
+		name="Gbaya (Sudan)" />
+	<iso_639_3_entry
+		id="krt"
+		scope="I"
+		type="L"
+		name="Kanuri; Tumari" />
+	<iso_639_3_entry
+		id="kru"
+		part2_code="kru"
+		scope="I"
+		type="L"
+		name="Kurukh" />
+	<iso_639_3_entry
+		id="krv"
+		scope="I"
+		type="L"
+		name="Kavet" />
+	<iso_639_3_entry
+		id="krw"
+		scope="I"
+		type="L"
+		name="Krahn; Western" />
+	<iso_639_3_entry
+		id="krx"
+		scope="I"
+		type="L"
+		name="Karon" />
+	<iso_639_3_entry
+		id="kry"
+		scope="I"
+		type="L"
+		name="Kryts" />
+	<iso_639_3_entry
+		id="krz"
+		scope="I"
+		type="L"
+		name="Kanum; Sota" />
+	<iso_639_3_entry
+		id="ksa"
+		scope="I"
+		type="L"
+		name="Shuwa-Zamani" />
+	<iso_639_3_entry
+		id="ksb"
+		scope="I"
+		type="L"
+		name="Shambala" />
+	<iso_639_3_entry
+		id="ksc"
+		scope="I"
+		type="L"
+		name="Kalinga; Southern" />
+	<iso_639_3_entry
+		id="ksd"
+		scope="I"
+		type="L"
+		name="Kuanua" />
+	<iso_639_3_entry
+		id="kse"
+		scope="I"
+		type="L"
+		name="Kuni" />
+	<iso_639_3_entry
+		id="ksf"
+		scope="I"
+		type="L"
+		name="Bafia" />
+	<iso_639_3_entry
+		id="ksg"
+		scope="I"
+		type="L"
+		name="Kusaghe" />
+	<iso_639_3_entry
+		id="ksh"
+		scope="I"
+		type="L"
+		name="Kölsch" />
+	<iso_639_3_entry
+		id="ksi"
+		scope="I"
+		type="L"
+		name="Krisa" />
+	<iso_639_3_entry
+		id="ksj"
+		scope="I"
+		type="L"
+		name="Uare" />
+	<iso_639_3_entry
+		id="ksk"
+		scope="I"
+		type="L"
+		name="Kansa" />
+	<iso_639_3_entry
+		id="ksl"
+		scope="I"
+		type="L"
+		name="Kumalu" />
+	<iso_639_3_entry
+		id="ksm"
+		scope="I"
+		type="L"
+		name="Kumba" />
+	<iso_639_3_entry
+		id="ksn"
+		scope="I"
+		type="L"
+		name="Kasiguranin" />
+	<iso_639_3_entry
+		id="kso"
+		scope="I"
+		type="L"
+		name="Kofa" />
+	<iso_639_3_entry
+		id="ksp"
+		scope="I"
+		type="L"
+		name="Kaba" />
+	<iso_639_3_entry
+		id="ksq"
+		scope="I"
+		type="L"
+		name="Kwaami" />
+	<iso_639_3_entry
+		id="ksr"
+		scope="I"
+		type="L"
+		name="Borong" />
+	<iso_639_3_entry
+		id="kss"
+		scope="I"
+		type="L"
+		name="Kisi; Southern" />
+	<iso_639_3_entry
+		id="kst"
+		scope="I"
+		type="L"
+		name="Winyé" />
+	<iso_639_3_entry
+		id="ksu"
+		scope="I"
+		type="L"
+		name="Khamyang" />
+	<iso_639_3_entry
+		id="ksv"
+		scope="I"
+		type="L"
+		name="Kusu" />
+	<iso_639_3_entry
+		id="ksw"
+		scope="I"
+		type="L"
+		name="Karen; S'gaw" />
+	<iso_639_3_entry
+		id="ksx"
+		scope="I"
+		type="L"
+		name="Kedang" />
+	<iso_639_3_entry
+		id="ksy"
+		scope="I"
+		type="L"
+		name="Kharia Thar" />
+	<iso_639_3_entry
+		id="ksz"
+		scope="I"
+		type="L"
+		name="Kodaku" />
+	<iso_639_3_entry
+		id="kta"
+		scope="I"
+		type="L"
+		name="Katua" />
+	<iso_639_3_entry
+		id="ktb"
+		scope="I"
+		type="L"
+		name="Kambaata" />
+	<iso_639_3_entry
+		id="ktc"
+		scope="I"
+		type="L"
+		name="Kholok" />
+	<iso_639_3_entry
+		id="ktd"
+		scope="I"
+		type="L"
+		name="Kokata" />
+	<iso_639_3_entry
+		id="kte"
+		scope="I"
+		type="L"
+		name="Nubri" />
+	<iso_639_3_entry
+		id="ktf"
+		scope="I"
+		type="L"
+		name="Kwami" />
+	<iso_639_3_entry
+		id="ktg"
+		scope="I"
+		type="E"
+		name="Kalkutung" />
+	<iso_639_3_entry
+		id="kth"
+		scope="I"
+		type="L"
+		name="Karanga" />
+	<iso_639_3_entry
+		id="kti"
+		scope="I"
+		type="L"
+		name="Muyu; North" />
+	<iso_639_3_entry
+		id="ktj"
+		scope="I"
+		type="L"
+		name="Krumen; Plapo" />
+	<iso_639_3_entry
+		id="ktk"
+		scope="I"
+		type="E"
+		name="Kaniet" />
+	<iso_639_3_entry
+		id="ktl"
+		scope="I"
+		type="L"
+		name="Koroshi" />
+	<iso_639_3_entry
+		id="ktm"
+		scope="I"
+		type="L"
+		name="Kurti" />
+	<iso_639_3_entry
+		id="ktn"
+		scope="I"
+		type="L"
+		name="Karitiâna" />
+	<iso_639_3_entry
+		id="kto"
+		scope="I"
+		type="L"
+		name="Kuot" />
+	<iso_639_3_entry
+		id="ktp"
+		scope="I"
+		type="L"
+		name="Kaduo" />
+	<iso_639_3_entry
+		id="ktq"
+		scope="I"
+		type="E"
+		name="Katabaga" />
+	<iso_639_3_entry
+		id="ktr"
+		scope="I"
+		type="L"
+		name="Kota Marudu Tinagas" />
+	<iso_639_3_entry
+		id="kts"
+		scope="I"
+		type="L"
+		name="Muyu; South" />
+	<iso_639_3_entry
+		id="ktt"
+		scope="I"
+		type="L"
+		name="Ketum" />
+	<iso_639_3_entry
+		id="ktu"
+		scope="I"
+		type="L"
+		name="Kituba (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="ktv"
+		scope="I"
+		type="L"
+		name="Katu; Eastern" />
+	<iso_639_3_entry
+		id="ktw"
+		scope="I"
+		type="E"
+		name="Kato" />
+	<iso_639_3_entry
+		id="ktx"
+		scope="I"
+		type="L"
+		name="Kaxararí" />
+	<iso_639_3_entry
+		id="kty"
+		scope="I"
+		type="L"
+		name="Kango (Bas-Uélé District)" />
+	<iso_639_3_entry
+		id="ktz"
+		scope="I"
+		type="L"
+		name="Ju/'hoan" />
+	<iso_639_3_entry
+		id="kua"
+		part1_code="kj"
+		part2_code="kua"
+		scope="I"
+		type="L"
+		name="Kuanyama" />
+	<iso_639_3_entry
+		id="kub"
+		scope="I"
+		type="L"
+		name="Kutep" />
+	<iso_639_3_entry
+		id="kuc"
+		scope="I"
+		type="L"
+		name="Kwinsu" />
+	<iso_639_3_entry
+		id="kud"
+		scope="I"
+		type="L"
+		name="'Auhelawa" />
+	<iso_639_3_entry
+		id="kue"
+		scope="I"
+		type="L"
+		name="Kuman" />
+	<iso_639_3_entry
+		id="kuf"
+		scope="I"
+		type="L"
+		name="Katu; Western" />
+	<iso_639_3_entry
+		id="kug"
+		scope="I"
+		type="L"
+		name="Kupa" />
+	<iso_639_3_entry
+		id="kuh"
+		scope="I"
+		type="L"
+		name="Kushi" />
+	<iso_639_3_entry
+		id="kui"
+		scope="I"
+		type="L"
+		name="Kuikúro-Kalapálo" />
+	<iso_639_3_entry
+		id="kuj"
+		scope="I"
+		type="L"
+		name="Kuria" />
+	<iso_639_3_entry
+		id="kuk"
+		scope="I"
+		type="L"
+		name="Kepo'" />
+	<iso_639_3_entry
+		id="kul"
+		scope="I"
+		type="L"
+		name="Kulere" />
+	<iso_639_3_entry
+		id="kum"
+		part2_code="kum"
+		scope="I"
+		type="L"
+		name="Kumyk" />
+	<iso_639_3_entry
+		id="kun"
+		scope="I"
+		type="L"
+		name="Kunama" />
+	<iso_639_3_entry
+		id="kuo"
+		scope="I"
+		type="L"
+		name="Kumukio" />
+	<iso_639_3_entry
+		id="kup"
+		scope="I"
+		type="L"
+		name="Kunimaipa" />
+	<iso_639_3_entry
+		id="kuq"
+		scope="I"
+		type="L"
+		name="Karipuna" />
+	<iso_639_3_entry
+		id="kur"
+		part1_code="ku"
+		part2_code="kur"
+		scope="M"
+		type="L"
+		name="Kurdish" />
+	<iso_639_3_entry
+		id="kus"
+		scope="I"
+		type="L"
+		name="Kusaal" />
+	<iso_639_3_entry
+		id="kut"
+		part2_code="kut"
+		scope="I"
+		type="L"
+		name="Kutenai" />
+	<iso_639_3_entry
+		id="kuu"
+		scope="I"
+		type="L"
+		name="Kuskokwim; Upper" />
+	<iso_639_3_entry
+		id="kuv"
+		scope="I"
+		type="L"
+		name="Kur" />
+	<iso_639_3_entry
+		id="kuw"
+		scope="I"
+		type="L"
+		name="Kpagua" />
+	<iso_639_3_entry
+		id="kux"
+		scope="I"
+		type="L"
+		name="Kukatja" />
+	<iso_639_3_entry
+		id="kuy"
+		scope="I"
+		type="L"
+		name="Kuuku-Ya'u" />
+	<iso_639_3_entry
+		id="kuz"
+		scope="I"
+		type="E"
+		name="Kunza" />
+	<iso_639_3_entry
+		id="kva"
+		scope="I"
+		type="L"
+		name="Bagvalal" />
+	<iso_639_3_entry
+		id="kvb"
+		scope="I"
+		type="L"
+		name="Kubu" />
+	<iso_639_3_entry
+		id="kvc"
+		scope="I"
+		type="L"
+		name="Kove" />
+	<iso_639_3_entry
+		id="kvd"
+		scope="I"
+		type="L"
+		name="Kui (Indonesia)" />
+	<iso_639_3_entry
+		id="kve"
+		scope="I"
+		type="L"
+		name="Kalabakan" />
+	<iso_639_3_entry
+		id="kvf"
+		scope="I"
+		type="L"
+		name="Kabalai" />
+	<iso_639_3_entry
+		id="kvg"
+		scope="I"
+		type="L"
+		name="Kuni-Boazi" />
+	<iso_639_3_entry
+		id="kvh"
+		scope="I"
+		type="L"
+		name="Komodo" />
+	<iso_639_3_entry
+		id="kvi"
+		scope="I"
+		type="L"
+		name="Kwang" />
+	<iso_639_3_entry
+		id="kvj"
+		scope="I"
+		type="L"
+		name="Psikye" />
+	<iso_639_3_entry
+		id="kvk"
+		scope="I"
+		type="L"
+		name="Korean Sign Language" />
+	<iso_639_3_entry
+		id="kvl"
+		scope="I"
+		type="L"
+		name="Karen; Brek" />
+	<iso_639_3_entry
+		id="kvm"
+		scope="I"
+		type="L"
+		name="Kendem" />
+	<iso_639_3_entry
+		id="kvn"
+		scope="I"
+		type="L"
+		name="Kuna; Border" />
+	<iso_639_3_entry
+		id="kvo"
+		scope="I"
+		type="L"
+		name="Dobel" />
+	<iso_639_3_entry
+		id="kvp"
+		scope="I"
+		type="L"
+		name="Kompane" />
+	<iso_639_3_entry
+		id="kvq"
+		scope="I"
+		type="L"
+		name="Karen; Geba" />
+	<iso_639_3_entry
+		id="kvr"
+		scope="I"
+		type="L"
+		name="Kerinci" />
+	<iso_639_3_entry
+		id="kvs"
+		scope="I"
+		type="L"
+		name="Kunggara" />
+	<iso_639_3_entry
+		id="kvt"
+		scope="I"
+		type="L"
+		name="Karen; Lahta" />
+	<iso_639_3_entry
+		id="kvu"
+		scope="I"
+		type="L"
+		name="Karen; Yinbaw" />
+	<iso_639_3_entry
+		id="kvv"
+		scope="I"
+		type="L"
+		name="Kola" />
+	<iso_639_3_entry
+		id="kvw"
+		scope="I"
+		type="L"
+		name="Wersing" />
+	<iso_639_3_entry
+		id="kvx"
+		scope="I"
+		type="L"
+		name="Koli; Parkari" />
+	<iso_639_3_entry
+		id="kvy"
+		scope="I"
+		type="L"
+		name="Karen; Yintale" />
+	<iso_639_3_entry
+		id="kvz"
+		scope="I"
+		type="L"
+		name="Tsakwambo" />
+	<iso_639_3_entry
+		id="kwa"
+		scope="I"
+		type="L"
+		name="Dâw" />
+	<iso_639_3_entry
+		id="kwb"
+		scope="I"
+		type="L"
+		name="Kwa" />
+	<iso_639_3_entry
+		id="kwc"
+		scope="I"
+		type="L"
+		name="Likwala" />
+	<iso_639_3_entry
+		id="kwd"
+		scope="I"
+		type="L"
+		name="Kwaio" />
+	<iso_639_3_entry
+		id="kwe"
+		scope="I"
+		type="L"
+		name="Kwerba" />
+	<iso_639_3_entry
+		id="kwf"
+		scope="I"
+		type="L"
+		name="Kwara'ae" />
+	<iso_639_3_entry
+		id="kwg"
+		scope="I"
+		type="L"
+		name="Sara Kaba Deme" />
+	<iso_639_3_entry
+		id="kwh"
+		scope="I"
+		type="L"
+		name="Kowiai" />
+	<iso_639_3_entry
+		id="kwi"
+		scope="I"
+		type="L"
+		name="Awa-Cuaiquer" />
+	<iso_639_3_entry
+		id="kwj"
+		scope="I"
+		type="L"
+		name="Kwanga" />
+	<iso_639_3_entry
+		id="kwk"
+		scope="I"
+		type="L"
+		name="Kwakiutl" />
+	<iso_639_3_entry
+		id="kwl"
+		scope="I"
+		type="L"
+		name="Kofyar" />
+	<iso_639_3_entry
+		id="kwm"
+		scope="I"
+		type="L"
+		name="Kwambi" />
+	<iso_639_3_entry
+		id="kwn"
+		scope="I"
+		type="L"
+		name="Kwangali" />
+	<iso_639_3_entry
+		id="kwo"
+		scope="I"
+		type="L"
+		name="Kwomtari" />
+	<iso_639_3_entry
+		id="kwp"
+		scope="I"
+		type="L"
+		name="Kodia" />
+	<iso_639_3_entry
+		id="kwq"
+		scope="I"
+		type="L"
+		name="Kwak" />
+	<iso_639_3_entry
+		id="kwr"
+		scope="I"
+		type="L"
+		name="Kwer" />
+	<iso_639_3_entry
+		id="kws"
+		scope="I"
+		type="L"
+		name="Kwese" />
+	<iso_639_3_entry
+		id="kwt"
+		scope="I"
+		type="L"
+		name="Kwesten" />
+	<iso_639_3_entry
+		id="kwu"
+		scope="I"
+		type="L"
+		name="Kwakum" />
+	<iso_639_3_entry
+		id="kwv"
+		scope="I"
+		type="L"
+		name="Sara Kaba Náà" />
+	<iso_639_3_entry
+		id="kww"
+		scope="I"
+		type="L"
+		name="Kwinti" />
+	<iso_639_3_entry
+		id="kwx"
+		scope="I"
+		type="L"
+		name="Khirwar" />
+	<iso_639_3_entry
+		id="kwy"
+		scope="I"
+		type="L"
+		name="Kongo; San Salvador" />
+	<iso_639_3_entry
+		id="kwz"
+		scope="I"
+		type="E"
+		name="Kwadi" />
+	<iso_639_3_entry
+		id="kxa"
+		scope="I"
+		type="L"
+		name="Kairiru" />
+	<iso_639_3_entry
+		id="kxb"
+		scope="I"
+		type="L"
+		name="Krobu" />
+	<iso_639_3_entry
+		id="kxc"
+		scope="I"
+		type="L"
+		name="Konso" />
+	<iso_639_3_entry
+		id="kxd"
+		scope="I"
+		type="L"
+		name="Brunei" />
+	<iso_639_3_entry
+		id="kxe"
+		scope="I"
+		type="L"
+		name="Kakihum" />
+	<iso_639_3_entry
+		id="kxf"
+		scope="I"
+		type="L"
+		name="Karen; Manumanaw" />
+	<iso_639_3_entry
+		id="kxh"
+		scope="I"
+		type="L"
+		name="Karo (Ethiopia)" />
+	<iso_639_3_entry
+		id="kxi"
+		scope="I"
+		type="L"
+		name="Murut; Keningau" />
+	<iso_639_3_entry
+		id="kxj"
+		scope="I"
+		type="L"
+		name="Kulfa" />
+	<iso_639_3_entry
+		id="kxk"
+		scope="I"
+		type="L"
+		name="Karen; Zayein" />
+	<iso_639_3_entry
+		id="kxl"
+		scope="I"
+		type="L"
+		name="Kurux; Nepali" />
+	<iso_639_3_entry
+		id="kxm"
+		scope="I"
+		type="L"
+		name="Khmer; Northern" />
+	<iso_639_3_entry
+		id="kxn"
+		scope="I"
+		type="L"
+		name="Melanau; Kanowit-Tanjong" />
+	<iso_639_3_entry
+		id="kxo"
+		scope="I"
+		type="E"
+		name="Kanoé" />
+	<iso_639_3_entry
+		id="kxp"
+		scope="I"
+		type="L"
+		name="Koli; Wadiyara" />
+	<iso_639_3_entry
+		id="kxq"
+		scope="I"
+		type="L"
+		name="Kanum; Smärky" />
+	<iso_639_3_entry
+		id="kxr"
+		scope="I"
+		type="L"
+		name="Koro (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="kxs"
+		scope="I"
+		type="L"
+		name="Kangjia" />
+	<iso_639_3_entry
+		id="kxt"
+		scope="I"
+		type="L"
+		name="Koiwat" />
+	<iso_639_3_entry
+		id="kxu"
+		scope="I"
+		type="L"
+		name="Kui (India)" />
+	<iso_639_3_entry
+		id="kxv"
+		scope="I"
+		type="L"
+		name="Kuvi" />
+	<iso_639_3_entry
+		id="kxw"
+		scope="I"
+		type="L"
+		name="Konai" />
+	<iso_639_3_entry
+		id="kxx"
+		scope="I"
+		type="L"
+		name="Likuba" />
+	<iso_639_3_entry
+		id="kxy"
+		scope="I"
+		type="L"
+		name="Kayong" />
+	<iso_639_3_entry
+		id="kxz"
+		scope="I"
+		type="L"
+		name="Kerewo" />
+	<iso_639_3_entry
+		id="kya"
+		scope="I"
+		type="L"
+		name="Kwaya" />
+	<iso_639_3_entry
+		id="kyb"
+		scope="I"
+		type="L"
+		name="Kalinga; Butbut" />
+	<iso_639_3_entry
+		id="kyc"
+		scope="I"
+		type="L"
+		name="Kyaka" />
+	<iso_639_3_entry
+		id="kyd"
+		scope="I"
+		type="L"
+		name="Karey" />
+	<iso_639_3_entry
+		id="kye"
+		scope="I"
+		type="L"
+		name="Krache" />
+	<iso_639_3_entry
+		id="kyf"
+		scope="I"
+		type="L"
+		name="Kouya" />
+	<iso_639_3_entry
+		id="kyg"
+		scope="I"
+		type="L"
+		name="Keyagana" />
+	<iso_639_3_entry
+		id="kyh"
+		scope="I"
+		type="L"
+		name="Karok" />
+	<iso_639_3_entry
+		id="kyi"
+		scope="I"
+		type="L"
+		name="Kiput" />
+	<iso_639_3_entry
+		id="kyj"
+		scope="I"
+		type="L"
+		name="Karao" />
+	<iso_639_3_entry
+		id="kyk"
+		scope="I"
+		type="L"
+		name="Kamayo" />
+	<iso_639_3_entry
+		id="kyl"
+		scope="I"
+		type="L"
+		name="Kalapuya" />
+	<iso_639_3_entry
+		id="kym"
+		scope="I"
+		type="L"
+		name="Kpatili" />
+	<iso_639_3_entry
+		id="kyn"
+		scope="I"
+		type="L"
+		name="Binukidnon; Northern" />
+	<iso_639_3_entry
+		id="kyo"
+		scope="I"
+		type="L"
+		name="Kelon" />
+	<iso_639_3_entry
+		id="kyp"
+		scope="I"
+		type="L"
+		name="Kang" />
+	<iso_639_3_entry
+		id="kyq"
+		scope="I"
+		type="L"
+		name="Kenga" />
+	<iso_639_3_entry
+		id="kyr"
+		scope="I"
+		type="L"
+		name="Kuruáya" />
+	<iso_639_3_entry
+		id="kys"
+		scope="I"
+		type="L"
+		name="Kayan; Baram" />
+	<iso_639_3_entry
+		id="kyt"
+		scope="I"
+		type="L"
+		name="Kayagar" />
+	<iso_639_3_entry
+		id="kyu"
+		scope="I"
+		type="L"
+		name="Kayah; Western" />
+	<iso_639_3_entry
+		id="kyv"
+		scope="I"
+		type="L"
+		name="Kayort" />
+	<iso_639_3_entry
+		id="kyw"
+		scope="I"
+		type="L"
+		name="Kudmali" />
+	<iso_639_3_entry
+		id="kyx"
+		scope="I"
+		type="L"
+		name="Rapoisi" />
+	<iso_639_3_entry
+		id="kyy"
+		scope="I"
+		type="L"
+		name="Kambaira" />
+	<iso_639_3_entry
+		id="kyz"
+		scope="I"
+		type="L"
+		name="Kayabí" />
+	<iso_639_3_entry
+		id="kza"
+		scope="I"
+		type="L"
+		name="Karaboro; Western" />
+	<iso_639_3_entry
+		id="kzb"
+		scope="I"
+		type="L"
+		name="Kaibobo" />
+	<iso_639_3_entry
+		id="kzc"
+		scope="I"
+		type="L"
+		name="Kulango; Bondoukou" />
+	<iso_639_3_entry
+		id="kzd"
+		scope="I"
+		type="L"
+		name="Kadai" />
+	<iso_639_3_entry
+		id="kze"
+		scope="I"
+		type="L"
+		name="Kosena" />
+	<iso_639_3_entry
+		id="kzf"
+		scope="I"
+		type="L"
+		name="Kaili; Da'a" />
+	<iso_639_3_entry
+		id="kzg"
+		scope="I"
+		type="L"
+		name="Kikai" />
+	<iso_639_3_entry
+		id="kzh"
+		scope="I"
+		type="L"
+		name="Kenuzi-Dongola" />
+	<iso_639_3_entry
+		id="kzi"
+		scope="I"
+		type="L"
+		name="Kelabit" />
+	<iso_639_3_entry
+		id="kzj"
+		scope="I"
+		type="L"
+		name="Kadazan; Coastal" />
+	<iso_639_3_entry
+		id="kzk"
+		scope="I"
+		type="E"
+		name="Kazukuru" />
+	<iso_639_3_entry
+		id="kzl"
+		scope="I"
+		type="L"
+		name="Kayeli" />
+	<iso_639_3_entry
+		id="kzm"
+		scope="I"
+		type="L"
+		name="Kais" />
+	<iso_639_3_entry
+		id="kzn"
+		scope="I"
+		type="L"
+		name="Kokola" />
+	<iso_639_3_entry
+		id="kzo"
+		scope="I"
+		type="L"
+		name="Kaningi" />
+	<iso_639_3_entry
+		id="kzp"
+		scope="I"
+		type="L"
+		name="Kaidipang" />
+	<iso_639_3_entry
+		id="kzq"
+		scope="I"
+		type="L"
+		name="Kaike" />
+	<iso_639_3_entry
+		id="kzr"
+		scope="I"
+		type="L"
+		name="Karang" />
+	<iso_639_3_entry
+		id="kzs"
+		scope="I"
+		type="L"
+		name="Dusun; Sugut" />
+	<iso_639_3_entry
+		id="kzt"
+		scope="I"
+		type="L"
+		name="Dusun; Tambunan" />
+	<iso_639_3_entry
+		id="kzu"
+		scope="I"
+		type="L"
+		name="Kayupulau" />
+	<iso_639_3_entry
+		id="kzv"
+		scope="I"
+		type="L"
+		name="Komyandaret" />
+	<iso_639_3_entry
+		id="kzw"
+		scope="I"
+		type="E"
+		name="Karirí-Xocó" />
+	<iso_639_3_entry
+		id="kzx"
+		scope="I"
+		type="L"
+		name="Kamarian" />
+	<iso_639_3_entry
+		id="kzy"
+		scope="I"
+		type="L"
+		name="Kango (Tshopo District)" />
+	<iso_639_3_entry
+		id="kzz"
+		scope="I"
+		type="L"
+		name="Kalabra" />
+	<iso_639_3_entry
+		id="laa"
+		scope="I"
+		type="L"
+		name="Subanen; Southern" />
+	<iso_639_3_entry
+		id="lab"
+		scope="I"
+		type="A"
+		name="Linear A" />
+	<iso_639_3_entry
+		id="lac"
+		scope="I"
+		type="L"
+		name="Lacandon" />
+	<iso_639_3_entry
+		id="lad"
+		part2_code="lad"
+		scope="I"
+		type="L"
+		name="Ladino" />
+	<iso_639_3_entry
+		id="lae"
+		scope="I"
+		type="L"
+		name="Pattani" />
+	<iso_639_3_entry
+		id="laf"
+		scope="I"
+		type="L"
+		name="Lafofa" />
+	<iso_639_3_entry
+		id="lag"
+		scope="I"
+		type="L"
+		name="Langi" />
+	<iso_639_3_entry
+		id="lah"
+		part2_code="lah"
+		scope="M"
+		type="L"
+		name="Lahnda" />
+	<iso_639_3_entry
+		id="lai"
+		scope="I"
+		type="L"
+		name="Lambya" />
+	<iso_639_3_entry
+		id="laj"
+		scope="I"
+		type="L"
+		name="Lango (Uganda)" />
+	<iso_639_3_entry
+		id="lak"
+		scope="I"
+		type="L"
+		name="Laka (Nigeria)" />
+	<iso_639_3_entry
+		id="lal"
+		scope="I"
+		type="L"
+		name="Lalia" />
+	<iso_639_3_entry
+		id="lam"
+		part2_code="lam"
+		scope="I"
+		type="L"
+		name="Lamba" />
+	<iso_639_3_entry
+		id="lan"
+		scope="I"
+		type="L"
+		name="Laru" />
+	<iso_639_3_entry
+		id="lao"
+		part1_code="lo"
+		part2_code="lao"
+		scope="I"
+		type="L"
+		name="Lao" />
+	<iso_639_3_entry
+		id="lap"
+		scope="I"
+		type="L"
+		name="Laka (Chad)" />
+	<iso_639_3_entry
+		id="laq"
+		scope="I"
+		type="L"
+		name="Qabiao" />
+	<iso_639_3_entry
+		id="lar"
+		scope="I"
+		type="L"
+		name="Larteh" />
+	<iso_639_3_entry
+		id="las"
+		scope="I"
+		type="L"
+		name="Lama (Togo)" />
+	<iso_639_3_entry
+		id="lat"
+		part1_code="la"
+		part2_code="lat"
+		scope="I"
+		type="A"
+		name="Latin" />
+	<iso_639_3_entry
+		id="lau"
+		scope="I"
+		type="L"
+		name="Laba" />
+	<iso_639_3_entry
+		id="lav"
+		part1_code="lv"
+		part2_code="lav"
+		scope="M"
+		type="L"
+		name="Latvian" />
+	<iso_639_3_entry
+		id="law"
+		scope="I"
+		type="L"
+		name="Lauje" />
+	<iso_639_3_entry
+		id="lax"
+		scope="I"
+		type="L"
+		name="Tiwa" />
+	<iso_639_3_entry
+		id="lay"
+		scope="I"
+		type="L"
+		name="Lama (Myanmar)" />
+	<iso_639_3_entry
+		id="laz"
+		scope="I"
+		type="E"
+		name="Aribwatsa" />
+	<iso_639_3_entry
+		id="lba"
+		scope="I"
+		type="L"
+		name="Lui" />
+	<iso_639_3_entry
+		id="lbb"
+		scope="I"
+		type="L"
+		name="Label" />
+	<iso_639_3_entry
+		id="lbc"
+		scope="I"
+		type="L"
+		name="Lakkia" />
+	<iso_639_3_entry
+		id="lbe"
+		scope="I"
+		type="L"
+		name="Lak" />
+	<iso_639_3_entry
+		id="lbf"
+		scope="I"
+		type="L"
+		name="Tinani" />
+	<iso_639_3_entry
+		id="lbg"
+		scope="I"
+		type="L"
+		name="Laopang" />
+	<iso_639_3_entry
+		id="lbi"
+		scope="I"
+		type="L"
+		name="La'bi" />
+	<iso_639_3_entry
+		id="lbj"
+		scope="I"
+		type="L"
+		name="Ladakhi" />
+	<iso_639_3_entry
+		id="lbk"
+		scope="I"
+		type="L"
+		name="Bontok; Central" />
+	<iso_639_3_entry
+		id="lbl"
+		scope="I"
+		type="L"
+		name="Bikol; Libon" />
+	<iso_639_3_entry
+		id="lbm"
+		scope="I"
+		type="L"
+		name="Lodhi" />
+	<iso_639_3_entry
+		id="lbn"
+		scope="I"
+		type="L"
+		name="Lamet" />
+	<iso_639_3_entry
+		id="lbo"
+		scope="I"
+		type="L"
+		name="Laven" />
+	<iso_639_3_entry
+		id="lbq"
+		scope="I"
+		type="L"
+		name="Wampar" />
+	<iso_639_3_entry
+		id="lbr"
+		scope="I"
+		type="L"
+		name="Lorung; Northern" />
+	<iso_639_3_entry
+		id="lbs"
+		scope="I"
+		type="L"
+		name="Libyan Sign Language" />
+	<iso_639_3_entry
+		id="lbt"
+		scope="I"
+		type="L"
+		name="Lachi" />
+	<iso_639_3_entry
+		id="lbu"
+		scope="I"
+		type="L"
+		name="Labu" />
+	<iso_639_3_entry
+		id="lbv"
+		scope="I"
+		type="L"
+		name="Lavatbura-Lamusong" />
+	<iso_639_3_entry
+		id="lbw"
+		scope="I"
+		type="L"
+		name="Tolaki" />
+	<iso_639_3_entry
+		id="lbx"
+		scope="I"
+		type="L"
+		name="Lawangan" />
+	<iso_639_3_entry
+		id="lby"
+		scope="I"
+		type="E"
+		name="Lamu-Lamu" />
+	<iso_639_3_entry
+		id="lbz"
+		scope="I"
+		type="L"
+		name="Lardil" />
+	<iso_639_3_entry
+		id="lcc"
+		scope="I"
+		type="L"
+		name="Legenyem" />
+	<iso_639_3_entry
+		id="lcd"
+		scope="I"
+		type="L"
+		name="Lola" />
+	<iso_639_3_entry
+		id="lce"
+		scope="I"
+		type="L"
+		name="Loncong" />
+	<iso_639_3_entry
+		id="lcf"
+		scope="I"
+		type="L"
+		name="Lubu" />
+	<iso_639_3_entry
+		id="lch"
+		scope="I"
+		type="L"
+		name="Luchazi" />
+	<iso_639_3_entry
+		id="lcl"
+		scope="I"
+		type="L"
+		name="Lisela" />
+	<iso_639_3_entry
+		id="lcm"
+		scope="I"
+		type="L"
+		name="Tungag" />
+	<iso_639_3_entry
+		id="lcp"
+		scope="I"
+		type="L"
+		name="Lawa; Western" />
+	<iso_639_3_entry
+		id="lcq"
+		scope="I"
+		type="L"
+		name="Luhu" />
+	<iso_639_3_entry
+		id="lcs"
+		scope="I"
+		type="L"
+		name="Lisabata-Nuniali" />
+	<iso_639_3_entry
+		id="ldb"
+		scope="I"
+		type="L"
+		name="Idun" />
+	<iso_639_3_entry
+		id="ldd"
+		scope="I"
+		type="L"
+		name="Luri" />
+	<iso_639_3_entry
+		id="ldg"
+		scope="I"
+		type="L"
+		name="Lenyima" />
+	<iso_639_3_entry
+		id="ldh"
+		scope="I"
+		type="L"
+		name="Lamja-Dengsa-Tola" />
+	<iso_639_3_entry
+		id="ldi"
+		scope="I"
+		type="L"
+		name="Laari" />
+	<iso_639_3_entry
+		id="ldj"
+		scope="I"
+		type="L"
+		name="Lemoro" />
+	<iso_639_3_entry
+		id="ldk"
+		scope="I"
+		type="L"
+		name="Leelau" />
+	<iso_639_3_entry
+		id="ldl"
+		scope="I"
+		type="L"
+		name="Kaan" />
+	<iso_639_3_entry
+		id="ldm"
+		scope="I"
+		type="L"
+		name="Landoma" />
+	<iso_639_3_entry
+		id="ldn"
+		scope="I"
+		type="C"
+		name="Láadan" />
+	<iso_639_3_entry
+		id="ldo"
+		scope="I"
+		type="L"
+		name="Loo" />
+	<iso_639_3_entry
+		id="ldp"
+		scope="I"
+		type="L"
+		name="Tso" />
+	<iso_639_3_entry
+		id="ldq"
+		scope="I"
+		type="L"
+		name="Lufu" />
+	<iso_639_3_entry
+		id="lea"
+		scope="I"
+		type="L"
+		name="Lega-Shabunda" />
+	<iso_639_3_entry
+		id="leb"
+		scope="I"
+		type="L"
+		name="Lala-Bisa" />
+	<iso_639_3_entry
+		id="lec"
+		scope="I"
+		type="L"
+		name="Leco" />
+	<iso_639_3_entry
+		id="led"
+		scope="I"
+		type="L"
+		name="Lendu" />
+	<iso_639_3_entry
+		id="lee"
+		scope="I"
+		type="L"
+		name="Lyélé" />
+	<iso_639_3_entry
+		id="lef"
+		scope="I"
+		type="L"
+		name="Lelemi" />
+	<iso_639_3_entry
+		id="leg"
+		scope="I"
+		type="L"
+		name="Lengua" />
+	<iso_639_3_entry
+		id="leh"
+		scope="I"
+		type="L"
+		name="Lenje" />
+	<iso_639_3_entry
+		id="lei"
+		scope="I"
+		type="L"
+		name="Lemio" />
+	<iso_639_3_entry
+		id="lej"
+		scope="I"
+		type="L"
+		name="Lengola" />
+	<iso_639_3_entry
+		id="lek"
+		scope="I"
+		type="L"
+		name="Leipon" />
+	<iso_639_3_entry
+		id="lel"
+		scope="I"
+		type="L"
+		name="Lele (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="lem"
+		scope="I"
+		type="L"
+		name="Nomaande" />
+	<iso_639_3_entry
+		id="len"
+		scope="I"
+		type="E"
+		name="Lenca" />
+	<iso_639_3_entry
+		id="leo"
+		scope="I"
+		type="L"
+		name="Leti (Cameroon)" />
+	<iso_639_3_entry
+		id="lep"
+		scope="I"
+		type="L"
+		name="Lepcha" />
+	<iso_639_3_entry
+		id="leq"
+		scope="I"
+		type="L"
+		name="Lembena" />
+	<iso_639_3_entry
+		id="ler"
+		scope="I"
+		type="L"
+		name="Lenkau" />
+	<iso_639_3_entry
+		id="les"
+		scope="I"
+		type="L"
+		name="Lese" />
+	<iso_639_3_entry
+		id="let"
+		scope="I"
+		type="L"
+		name="Lesing-Gelimi" />
+	<iso_639_3_entry
+		id="leu"
+		scope="I"
+		type="L"
+		name="Kara (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="lev"
+		scope="I"
+		type="L"
+		name="Lamma" />
+	<iso_639_3_entry
+		id="lew"
+		scope="I"
+		type="L"
+		name="Kaili; Ledo" />
+	<iso_639_3_entry
+		id="lex"
+		scope="I"
+		type="L"
+		name="Luang" />
+	<iso_639_3_entry
+		id="ley"
+		scope="I"
+		type="L"
+		name="Lemolang" />
+	<iso_639_3_entry
+		id="lez"
+		part2_code="lez"
+		scope="I"
+		type="L"
+		name="Lezghian" />
+	<iso_639_3_entry
+		id="lfa"
+		scope="I"
+		type="L"
+		name="Lefa" />
+	<iso_639_3_entry
+		id="lfn"
+		scope="I"
+		type="C"
+		name="Lingua Franca Nova" />
+	<iso_639_3_entry
+		id="lga"
+		scope="I"
+		type="L"
+		name="Lungga" />
+	<iso_639_3_entry
+		id="lgb"
+		scope="I"
+		type="L"
+		name="Laghu" />
+	<iso_639_3_entry
+		id="lgg"
+		scope="I"
+		type="L"
+		name="Lugbara" />
+	<iso_639_3_entry
+		id="lgh"
+		scope="I"
+		type="L"
+		name="Laghuu" />
+	<iso_639_3_entry
+		id="lgi"
+		scope="I"
+		type="L"
+		name="Lengilu" />
+	<iso_639_3_entry
+		id="lgk"
+		scope="I"
+		type="L"
+		name="Lingarak" />
+	<iso_639_3_entry
+		id="lgl"
+		scope="I"
+		type="L"
+		name="Wala" />
+	<iso_639_3_entry
+		id="lgm"
+		scope="I"
+		type="L"
+		name="Lega-Mwenga" />
+	<iso_639_3_entry
+		id="lgn"
+		scope="I"
+		type="L"
+		name="Opuuo" />
+	<iso_639_3_entry
+		id="lgq"
+		scope="I"
+		type="L"
+		name="Logba" />
+	<iso_639_3_entry
+		id="lgr"
+		scope="I"
+		type="L"
+		name="Lengo" />
+	<iso_639_3_entry
+		id="lgt"
+		scope="I"
+		type="L"
+		name="Pahi" />
+	<iso_639_3_entry
+		id="lgu"
+		scope="I"
+		type="L"
+		name="Longgu" />
+	<iso_639_3_entry
+		id="lgz"
+		scope="I"
+		type="L"
+		name="Ligenza" />
+	<iso_639_3_entry
+		id="lha"
+		scope="I"
+		type="L"
+		name="Laha (Viet Nam)" />
+	<iso_639_3_entry
+		id="lhh"
+		scope="I"
+		type="L"
+		name="Laha (Indonesia)" />
+	<iso_639_3_entry
+		id="lhi"
+		scope="I"
+		type="L"
+		name="Lahu Shi" />
+	<iso_639_3_entry
+		id="lhl"
+		scope="I"
+		type="L"
+		name="Lohar; Lahul" />
+	<iso_639_3_entry
+		id="lhm"
+		scope="I"
+		type="L"
+		name="Lhomi" />
+	<iso_639_3_entry
+		id="lhn"
+		scope="I"
+		type="L"
+		name="Lahanan" />
+	<iso_639_3_entry
+		id="lhp"
+		scope="I"
+		type="L"
+		name="Lhokpu" />
+	<iso_639_3_entry
+		id="lhs"
+		scope="I"
+		type="E"
+		name="Mlahsö" />
+	<iso_639_3_entry
+		id="lht"
+		scope="I"
+		type="L"
+		name="Lo-Toga" />
+	<iso_639_3_entry
+		id="lhu"
+		scope="I"
+		type="L"
+		name="Lahu" />
+	<iso_639_3_entry
+		id="lia"
+		scope="I"
+		type="L"
+		name="Limba; West-Central" />
+	<iso_639_3_entry
+		id="lib"
+		scope="I"
+		type="L"
+		name="Likum" />
+	<iso_639_3_entry
+		id="lic"
+		scope="I"
+		type="L"
+		name="Hlai" />
+	<iso_639_3_entry
+		id="lid"
+		scope="I"
+		type="L"
+		name="Nyindrou" />
+	<iso_639_3_entry
+		id="lie"
+		scope="I"
+		type="L"
+		name="Likila" />
+	<iso_639_3_entry
+		id="lif"
+		scope="I"
+		type="L"
+		name="Limbu" />
+	<iso_639_3_entry
+		id="lig"
+		scope="I"
+		type="L"
+		name="Ligbi" />
+	<iso_639_3_entry
+		id="lih"
+		scope="I"
+		type="L"
+		name="Lihir" />
+	<iso_639_3_entry
+		id="lii"
+		scope="I"
+		type="L"
+		name="Lingkhim" />
+	<iso_639_3_entry
+		id="lij"
+		scope="I"
+		type="L"
+		name="Ligurian" />
+	<iso_639_3_entry
+		id="lik"
+		scope="I"
+		type="L"
+		name="Lika" />
+	<iso_639_3_entry
+		id="lil"
+		scope="I"
+		type="L"
+		name="Lillooet" />
+	<iso_639_3_entry
+		id="lim"
+		part1_code="li"
+		part2_code="lim"
+		scope="I"
+		type="L"
+		name="Limburgan" />
+	<iso_639_3_entry
+		id="lin"
+		part1_code="ln"
+		part2_code="lin"
+		scope="I"
+		type="L"
+		name="Lingala" />
+	<iso_639_3_entry
+		id="lio"
+		scope="I"
+		type="L"
+		name="Liki" />
+	<iso_639_3_entry
+		id="lip"
+		scope="I"
+		type="L"
+		name="Sekpele" />
+	<iso_639_3_entry
+		id="liq"
+		scope="I"
+		type="L"
+		name="Libido" />
+	<iso_639_3_entry
+		id="lir"
+		scope="I"
+		type="L"
+		name="English; Liberian" />
+	<iso_639_3_entry
+		id="lis"
+		scope="I"
+		type="L"
+		name="Lisu" />
+	<iso_639_3_entry
+		id="lit"
+		part1_code="lt"
+		part2_code="lit"
+		scope="I"
+		type="L"
+		name="Lithuanian" />
+	<iso_639_3_entry
+		id="liu"
+		scope="I"
+		type="L"
+		name="Logorik" />
+	<iso_639_3_entry
+		id="liv"
+		scope="I"
+		type="L"
+		name="Liv" />
+	<iso_639_3_entry
+		id="liw"
+		scope="I"
+		type="L"
+		name="Col" />
+	<iso_639_3_entry
+		id="lix"
+		scope="I"
+		type="L"
+		name="Liabuku" />
+	<iso_639_3_entry
+		id="liy"
+		scope="I"
+		type="L"
+		name="Banda-Bambari" />
+	<iso_639_3_entry
+		id="liz"
+		scope="I"
+		type="L"
+		name="Libinza" />
+	<iso_639_3_entry
+		id="lje"
+		scope="I"
+		type="L"
+		name="Rampi" />
+	<iso_639_3_entry
+		id="lji"
+		scope="I"
+		type="L"
+		name="Laiyolo" />
+	<iso_639_3_entry
+		id="ljl"
+		scope="I"
+		type="L"
+		name="Li'o" />
+	<iso_639_3_entry
+		id="ljp"
+		scope="I"
+		type="L"
+		name="Lampung Api" />
+	<iso_639_3_entry
+		id="lka"
+		scope="I"
+		type="L"
+		name="Lakalei" />
+	<iso_639_3_entry
+		id="lkb"
+		scope="I"
+		type="L"
+		name="Kabras" />
+	<iso_639_3_entry
+		id="lkc"
+		scope="I"
+		type="L"
+		name="Kucong" />
+	<iso_639_3_entry
+		id="lkd"
+		scope="I"
+		type="L"
+		name="Lakondê" />
+	<iso_639_3_entry
+		id="lke"
+		scope="I"
+		type="L"
+		name="Kenyi" />
+	<iso_639_3_entry
+		id="lkh"
+		scope="I"
+		type="L"
+		name="Lakha" />
+	<iso_639_3_entry
+		id="lki"
+		scope="I"
+		type="L"
+		name="Laki" />
+	<iso_639_3_entry
+		id="lkj"
+		scope="I"
+		type="L"
+		name="Remun" />
+	<iso_639_3_entry
+		id="lkl"
+		scope="I"
+		type="L"
+		name="Laeko-Libuat" />
+	<iso_639_3_entry
+		id="lkn"
+		scope="I"
+		type="L"
+		name="Lakon" />
+	<iso_639_3_entry
+		id="lko"
+		scope="I"
+		type="L"
+		name="Khayo" />
+	<iso_639_3_entry
+		id="lkr"
+		scope="I"
+		type="L"
+		name="Päri" />
+	<iso_639_3_entry
+		id="lks"
+		scope="I"
+		type="L"
+		name="Kisa" />
+	<iso_639_3_entry
+		id="lkt"
+		scope="I"
+		type="L"
+		name="Lakota" />
+	<iso_639_3_entry
+		id="lky"
+		scope="I"
+		type="L"
+		name="Lokoya" />
+	<iso_639_3_entry
+		id="lla"
+		scope="I"
+		type="L"
+		name="Lala-Roba" />
+	<iso_639_3_entry
+		id="llb"
+		scope="I"
+		type="L"
+		name="Lolo" />
+	<iso_639_3_entry
+		id="llc"
+		scope="I"
+		type="L"
+		name="Lele (Guinea)" />
+	<iso_639_3_entry
+		id="lld"
+		scope="I"
+		type="L"
+		name="Ladin" />
+	<iso_639_3_entry
+		id="lle"
+		scope="I"
+		type="L"
+		name="Lele (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="llf"
+		scope="I"
+		type="E"
+		name="Hermit" />
+	<iso_639_3_entry
+		id="llg"
+		scope="I"
+		type="L"
+		name="Lole" />
+	<iso_639_3_entry
+		id="llh"
+		scope="I"
+		type="L"
+		name="Lamu" />
+	<iso_639_3_entry
+		id="lli"
+		scope="I"
+		type="L"
+		name="Teke-Laali" />
+	<iso_639_3_entry
+		id="llk"
+		scope="I"
+		type="E"
+		name="Lelak" />
+	<iso_639_3_entry
+		id="lll"
+		scope="I"
+		type="L"
+		name="Lilau" />
+	<iso_639_3_entry
+		id="llm"
+		scope="I"
+		type="L"
+		name="Lasalimu" />
+	<iso_639_3_entry
+		id="lln"
+		scope="I"
+		type="L"
+		name="Lele (Chad)" />
+	<iso_639_3_entry
+		id="llo"
+		scope="I"
+		type="L"
+		name="Khlor" />
+	<iso_639_3_entry
+		id="llp"
+		scope="I"
+		type="L"
+		name="Efate; North" />
+	<iso_639_3_entry
+		id="llq"
+		scope="I"
+		type="L"
+		name="Lolak" />
+	<iso_639_3_entry
+		id="lls"
+		scope="I"
+		type="L"
+		name="Lithuanian Sign Language" />
+	<iso_639_3_entry
+		id="llu"
+		scope="I"
+		type="L"
+		name="Lau" />
+	<iso_639_3_entry
+		id="llx"
+		scope="I"
+		type="L"
+		name="Lauan" />
+	<iso_639_3_entry
+		id="lma"
+		scope="I"
+		type="L"
+		name="Limba; East" />
+	<iso_639_3_entry
+		id="lmb"
+		scope="I"
+		type="L"
+		name="Merei" />
+	<iso_639_3_entry
+		id="lmc"
+		scope="I"
+		type="E"
+		name="Limilngan" />
+	<iso_639_3_entry
+		id="lmd"
+		scope="I"
+		type="L"
+		name="Lumun" />
+	<iso_639_3_entry
+		id="lme"
+		scope="I"
+		type="L"
+		name="Pévé" />
+	<iso_639_3_entry
+		id="lmf"
+		scope="I"
+		type="L"
+		name="Lembata; South" />
+	<iso_639_3_entry
+		id="lmg"
+		scope="I"
+		type="L"
+		name="Lamogai" />
+	<iso_639_3_entry
+		id="lmh"
+		scope="I"
+		type="L"
+		name="Lambichhong" />
+	<iso_639_3_entry
+		id="lmi"
+		scope="I"
+		type="L"
+		name="Lombi" />
+	<iso_639_3_entry
+		id="lmj"
+		scope="I"
+		type="L"
+		name="Lembata; West" />
+	<iso_639_3_entry
+		id="lmk"
+		scope="I"
+		type="L"
+		name="Lamkang" />
+	<iso_639_3_entry
+		id="lml"
+		scope="I"
+		type="L"
+		name="Hano" />
+	<iso_639_3_entry
+		id="lmm"
+		scope="I"
+		type="L"
+		name="Lamam" />
+	<iso_639_3_entry
+		id="lmn"
+		scope="I"
+		type="L"
+		name="Lambadi" />
+	<iso_639_3_entry
+		id="lmo"
+		scope="I"
+		type="L"
+		name="Lombard" />
+	<iso_639_3_entry
+		id="lmp"
+		scope="I"
+		type="L"
+		name="Limbum" />
+	<iso_639_3_entry
+		id="lmq"
+		scope="I"
+		type="L"
+		name="Lamatuka" />
+	<iso_639_3_entry
+		id="lmr"
+		scope="I"
+		type="L"
+		name="Lamalera" />
+	<iso_639_3_entry
+		id="lmu"
+		scope="I"
+		type="L"
+		name="Lamenu" />
+	<iso_639_3_entry
+		id="lmv"
+		scope="I"
+		type="L"
+		name="Lomaiviti" />
+	<iso_639_3_entry
+		id="lmw"
+		scope="I"
+		type="L"
+		name="Miwok; Lake" />
+	<iso_639_3_entry
+		id="lmx"
+		scope="I"
+		type="L"
+		name="Laimbue" />
+	<iso_639_3_entry
+		id="lmy"
+		scope="I"
+		type="L"
+		name="Lamboya" />
+	<iso_639_3_entry
+		id="lmz"
+		scope="I"
+		type="E"
+		name="Lumbee" />
+	<iso_639_3_entry
+		id="lna"
+		scope="I"
+		type="L"
+		name="Langbashe" />
+	<iso_639_3_entry
+		id="lnb"
+		scope="I"
+		type="L"
+		name="Mbalanhu" />
+	<iso_639_3_entry
+		id="lnd"
+		scope="I"
+		type="L"
+		name="Lundayeh" />
+	<iso_639_3_entry
+		id="lng"
+		scope="I"
+		type="A"
+		name="Langobardic" />
+	<iso_639_3_entry
+		id="lnh"
+		scope="I"
+		type="L"
+		name="Lanoh" />
+	<iso_639_3_entry
+		id="lni"
+		scope="I"
+		type="L"
+		name="Daantanai'" />
+	<iso_639_3_entry
+		id="lnj"
+		scope="I"
+		type="E"
+		name="Leningitij" />
+	<iso_639_3_entry
+		id="lnl"
+		scope="I"
+		type="L"
+		name="Banda; South Central" />
+	<iso_639_3_entry
+		id="lnm"
+		scope="I"
+		type="L"
+		name="Langam" />
+	<iso_639_3_entry
+		id="lnn"
+		scope="I"
+		type="L"
+		name="Lorediakarkar" />
+	<iso_639_3_entry
+		id="lno"
+		scope="I"
+		type="L"
+		name="Lango (Sudan)" />
+	<iso_639_3_entry
+		id="lns"
+		scope="I"
+		type="L"
+		name="Lamnso'" />
+	<iso_639_3_entry
+		id="lnu"
+		scope="I"
+		type="L"
+		name="Longuda" />
+	<iso_639_3_entry
+		id="lnz"
+		scope="I"
+		type="L"
+		name="Lonzo" />
+	<iso_639_3_entry
+		id="loa"
+		scope="I"
+		type="L"
+		name="Loloda" />
+	<iso_639_3_entry
+		id="lob"
+		scope="I"
+		type="L"
+		name="Lobi" />
+	<iso_639_3_entry
+		id="loc"
+		scope="I"
+		type="L"
+		name="Inonhan" />
+	<iso_639_3_entry
+		id="loe"
+		scope="I"
+		type="L"
+		name="Coastal" />
+	<iso_639_3_entry
+		id="lof"
+		scope="I"
+		type="L"
+		name="Logol" />
+	<iso_639_3_entry
+		id="log"
+		scope="I"
+		type="L"
+		name="Logo" />
+	<iso_639_3_entry
+		id="loh"
+		scope="I"
+		type="L"
+		name="Narim" />
+	<iso_639_3_entry
+		id="loi"
+		scope="I"
+		type="L"
+		name="Loma (Côte d'Ivoire)" />
+	<iso_639_3_entry
+		id="loj"
+		scope="I"
+		type="L"
+		name="Lou" />
+	<iso_639_3_entry
+		id="lok"
+		scope="I"
+		type="L"
+		name="Loko" />
+	<iso_639_3_entry
+		id="lol"
+		part2_code="lol"
+		scope="I"
+		type="L"
+		name="Mongo" />
+	<iso_639_3_entry
+		id="lom"
+		scope="I"
+		type="L"
+		name="Loma (Liberia)" />
+	<iso_639_3_entry
+		id="lon"
+		scope="I"
+		type="L"
+		name="Lomwe; Malawi" />
+	<iso_639_3_entry
+		id="loo"
+		scope="I"
+		type="L"
+		name="Lombo" />
+	<iso_639_3_entry
+		id="lop"
+		scope="I"
+		type="L"
+		name="Lopa" />
+	<iso_639_3_entry
+		id="loq"
+		scope="I"
+		type="L"
+		name="Lobala" />
+	<iso_639_3_entry
+		id="lor"
+		scope="I"
+		type="L"
+		name="Téén" />
+	<iso_639_3_entry
+		id="los"
+		scope="I"
+		type="L"
+		name="Loniu" />
+	<iso_639_3_entry
+		id="lot"
+		scope="I"
+		type="L"
+		name="Otuho" />
+	<iso_639_3_entry
+		id="lou"
+		scope="I"
+		type="L"
+		name="Creole French; Louisiana" />
+	<iso_639_3_entry
+		id="lov"
+		scope="I"
+		type="L"
+		name="Lopi" />
+	<iso_639_3_entry
+		id="low"
+		scope="I"
+		type="L"
+		name="Lobu; Tampias" />
+	<iso_639_3_entry
+		id="lox"
+		scope="I"
+		type="L"
+		name="Loun" />
+	<iso_639_3_entry
+		id="loy"
+		scope="I"
+		type="L"
+		name="Lowa" />
+	<iso_639_3_entry
+		id="loz"
+		part2_code="loz"
+		scope="I"
+		type="L"
+		name="Lozi" />
+	<iso_639_3_entry
+		id="lpa"
+		scope="I"
+		type="L"
+		name="Lelepa" />
+	<iso_639_3_entry
+		id="lpe"
+		scope="I"
+		type="L"
+		name="Lepki" />
+	<iso_639_3_entry
+		id="lpn"
+		scope="I"
+		type="L"
+		name="Naga; Long Phuri" />
+	<iso_639_3_entry
+		id="lpo"
+		scope="I"
+		type="L"
+		name="Lipo" />
+	<iso_639_3_entry
+		id="lpx"
+		scope="I"
+		type="L"
+		name="Lopit" />
+	<iso_639_3_entry
+		id="lra"
+		scope="I"
+		type="L"
+		name="Rara Bakati'" />
+	<iso_639_3_entry
+		id="lrc"
+		scope="I"
+		type="L"
+		name="Luri; Northern" />
+	<iso_639_3_entry
+		id="lre"
+		scope="I"
+		type="E"
+		name="Laurentian" />
+	<iso_639_3_entry
+		id="lrg"
+		scope="I"
+		type="E"
+		name="Laragia" />
+	<iso_639_3_entry
+		id="lri"
+		scope="I"
+		type="L"
+		name="Marachi" />
+	<iso_639_3_entry
+		id="lrk"
+		scope="I"
+		type="L"
+		name="Loarki" />
+	<iso_639_3_entry
+		id="lrl"
+		scope="I"
+		type="L"
+		name="Lari" />
+	<iso_639_3_entry
+		id="lrm"
+		scope="I"
+		type="L"
+		name="Marama" />
+	<iso_639_3_entry
+		id="lrn"
+		scope="I"
+		type="L"
+		name="Lorang" />
+	<iso_639_3_entry
+		id="lro"
+		scope="I"
+		type="L"
+		name="Laro" />
+	<iso_639_3_entry
+		id="lrr"
+		scope="I"
+		type="L"
+		name="Lorung; Southern" />
+	<iso_639_3_entry
+		id="lrt"
+		scope="I"
+		type="L"
+		name="Malay; Larantuka" />
+	<iso_639_3_entry
+		id="lrv"
+		scope="I"
+		type="L"
+		name="Larevat" />
+	<iso_639_3_entry
+		id="lrz"
+		scope="I"
+		type="L"
+		name="Lemerig" />
+	<iso_639_3_entry
+		id="lsa"
+		scope="I"
+		type="L"
+		name="Lasgerdi" />
+	<iso_639_3_entry
+		id="lsd"
+		scope="I"
+		type="L"
+		name="Lishana Deni" />
+	<iso_639_3_entry
+		id="lse"
+		scope="I"
+		type="L"
+		name="Lusengo" />
+	<iso_639_3_entry
+		id="lsg"
+		scope="I"
+		type="L"
+		name="Lyons Sign Language" />
+	<iso_639_3_entry
+		id="lsh"
+		scope="I"
+		type="L"
+		name="Lish" />
+	<iso_639_3_entry
+		id="lsi"
+		scope="I"
+		type="L"
+		name="Lashi" />
+	<iso_639_3_entry
+		id="lsl"
+		scope="I"
+		type="L"
+		name="Latvian Sign Language" />
+	<iso_639_3_entry
+		id="lsm"
+		scope="I"
+		type="L"
+		name="Saamia" />
+	<iso_639_3_entry
+		id="lso"
+		scope="I"
+		type="L"
+		name="Laos Sign Language" />
+	<iso_639_3_entry
+		id="lsp"
+		scope="I"
+		type="L"
+		name="Panamanian Sign Language" />
+	<iso_639_3_entry
+		id="lsr"
+		scope="I"
+		type="L"
+		name="Aruop" />
+	<iso_639_3_entry
+		id="lss"
+		scope="I"
+		type="L"
+		name="Lasi" />
+	<iso_639_3_entry
+		id="lst"
+		scope="I"
+		type="L"
+		name="Trinidad and Tobago Sign Language" />
+	<iso_639_3_entry
+		id="lsy"
+		scope="I"
+		type="L"
+		name="Mauritian Sign Language" />
+	<iso_639_3_entry
+		id="ltc"
+		scope="I"
+		type="H"
+		name="Chinese; Late Middle" />
+	<iso_639_3_entry
+		id="ltg"
+		scope="I"
+		type="L"
+		name="Latgalian" />
+	<iso_639_3_entry
+		id="lti"
+		scope="I"
+		type="L"
+		name="Leti (Indonesia)" />
+	<iso_639_3_entry
+		id="ltn"
+		scope="I"
+		type="L"
+		name="Latundê" />
+	<iso_639_3_entry
+		id="lto"
+		scope="I"
+		type="L"
+		name="Tsotso" />
+	<iso_639_3_entry
+		id="lts"
+		scope="I"
+		type="L"
+		name="Tachoni" />
+	<iso_639_3_entry
+		id="ltu"
+		scope="I"
+		type="L"
+		name="Latu" />
+	<iso_639_3_entry
+		id="ltz"
+		part1_code="lb"
+		part2_code="ltz"
+		scope="I"
+		type="L"
+		name="Luxembourgish" />
+	<iso_639_3_entry
+		id="lua"
+		part2_code="lua"
+		scope="I"
+		type="L"
+		name="Luba-Lulua" />
+	<iso_639_3_entry
+		id="lub"
+		part1_code="lu"
+		part2_code="lub"
+		scope="I"
+		type="L"
+		name="Luba-Katanga" />
+	<iso_639_3_entry
+		id="luc"
+		scope="I"
+		type="L"
+		name="Aringa" />
+	<iso_639_3_entry
+		id="lud"
+		scope="I"
+		type="L"
+		name="Ludian" />
+	<iso_639_3_entry
+		id="lue"
+		scope="I"
+		type="L"
+		name="Luvale" />
+	<iso_639_3_entry
+		id="luf"
+		scope="I"
+		type="L"
+		name="Laua" />
+	<iso_639_3_entry
+		id="lug"
+		part1_code="lg"
+		part2_code="lug"
+		scope="I"
+		type="L"
+		name="Ganda" />
+	<iso_639_3_entry
+		id="lui"
+		part2_code="lui"
+		scope="I"
+		type="L"
+		name="Luiseno" />
+	<iso_639_3_entry
+		id="luj"
+		scope="I"
+		type="L"
+		name="Luna" />
+	<iso_639_3_entry
+		id="luk"
+		scope="I"
+		type="L"
+		name="Lunanakha" />
+	<iso_639_3_entry
+		id="lul"
+		scope="I"
+		type="L"
+		name="Olu'bo" />
+	<iso_639_3_entry
+		id="lum"
+		scope="I"
+		type="L"
+		name="Luimbi" />
+	<iso_639_3_entry
+		id="lun"
+		part2_code="lun"
+		scope="I"
+		type="L"
+		name="Lunda" />
+	<iso_639_3_entry
+		id="luo"
+		part2_code="luo"
+		scope="I"
+		type="L"
+		name="Luo (Kenya and Tanzania)" />
+	<iso_639_3_entry
+		id="lup"
+		scope="I"
+		type="L"
+		name="Lumbu" />
+	<iso_639_3_entry
+		id="luq"
+		scope="I"
+		type="L"
+		name="Lucumi" />
+	<iso_639_3_entry
+		id="lur"
+		scope="I"
+		type="L"
+		name="Laura" />
+	<iso_639_3_entry
+		id="lus"
+		part2_code="lus"
+		scope="I"
+		type="L"
+		name="Lushai" />
+	<iso_639_3_entry
+		id="lut"
+		scope="I"
+		type="L"
+		name="Lushootseed" />
+	<iso_639_3_entry
+		id="luu"
+		scope="I"
+		type="L"
+		name="Lumba-Yakkha" />
+	<iso_639_3_entry
+		id="luv"
+		scope="I"
+		type="L"
+		name="Luwati" />
+	<iso_639_3_entry
+		id="luw"
+		scope="I"
+		type="L"
+		name="Luo (Cameroon)" />
+	<iso_639_3_entry
+		id="luy"
+		scope="M"
+		type="L"
+		name="Luyia" />
+	<iso_639_3_entry
+		id="luz"
+		scope="I"
+		type="L"
+		name="Luri; Southern" />
+	<iso_639_3_entry
+		id="lva"
+		scope="I"
+		type="L"
+		name="Maku'a" />
+	<iso_639_3_entry
+		id="lvk"
+		scope="I"
+		type="L"
+		name="Lavukaleve" />
+	<iso_639_3_entry
+		id="lvs"
+		scope="I"
+		type="L"
+		name="Latvian; Standard" />
+	<iso_639_3_entry
+		id="lvu"
+		scope="I"
+		type="L"
+		name="Levuka" />
+	<iso_639_3_entry
+		id="lwa"
+		scope="I"
+		type="L"
+		name="Lwalu" />
+	<iso_639_3_entry
+		id="lwe"
+		scope="I"
+		type="L"
+		name="Lewo Eleng" />
+	<iso_639_3_entry
+		id="lwg"
+		scope="I"
+		type="L"
+		name="Wanga" />
+	<iso_639_3_entry
+		id="lwh"
+		scope="I"
+		type="L"
+		name="Lachi; White" />
+	<iso_639_3_entry
+		id="lwl"
+		scope="I"
+		type="L"
+		name="Lawa; Eastern" />
+	<iso_639_3_entry
+		id="lwm"
+		scope="I"
+		type="L"
+		name="Laomian" />
+	<iso_639_3_entry
+		id="lwo"
+		scope="I"
+		type="L"
+		name="Luwo" />
+	<iso_639_3_entry
+		id="lwt"
+		scope="I"
+		type="L"
+		name="Lewotobi" />
+	<iso_639_3_entry
+		id="lww"
+		scope="I"
+		type="L"
+		name="Lewo" />
+	<iso_639_3_entry
+		id="lya"
+		scope="I"
+		type="L"
+		name="Layakha" />
+	<iso_639_3_entry
+		id="lyg"
+		scope="I"
+		type="L"
+		name="Lyngngam" />
+	<iso_639_3_entry
+		id="lyn"
+		scope="I"
+		type="L"
+		name="Luyana" />
+	<iso_639_3_entry
+		id="lzh"
+		scope="I"
+		type="H"
+		name="Chinese; Literary" />
+	<iso_639_3_entry
+		id="lzl"
+		scope="I"
+		type="L"
+		name="Litzlitz" />
+	<iso_639_3_entry
+		id="lzn"
+		scope="I"
+		type="L"
+		name="Naga; Leinong" />
+	<iso_639_3_entry
+		id="lzz"
+		scope="I"
+		type="L"
+		name="Laz" />
+	<iso_639_3_entry
+		id="maa"
+		scope="I"
+		type="L"
+		name="Mazatec; San Jerónimo Tecóatl" />
+	<iso_639_3_entry
+		id="mab"
+		scope="I"
+		type="L"
+		name="Mixtec; Yutanduchi" />
+	<iso_639_3_entry
+		id="mad"
+		part2_code="mad"
+		scope="I"
+		type="L"
+		name="Madurese" />
+	<iso_639_3_entry
+		id="mae"
+		scope="I"
+		type="L"
+		name="Bo-Rukul" />
+	<iso_639_3_entry
+		id="maf"
+		scope="I"
+		type="L"
+		name="Mafa" />
+	<iso_639_3_entry
+		id="mag"
+		part2_code="mag"
+		scope="I"
+		type="L"
+		name="Magahi" />
+	<iso_639_3_entry
+		id="mah"
+		part1_code="mh"
+		part2_code="mah"
+		scope="I"
+		type="L"
+		name="Marshallese" />
+	<iso_639_3_entry
+		id="mai"
+		part2_code="mai"
+		scope="I"
+		type="L"
+		name="Maithili" />
+	<iso_639_3_entry
+		id="maj"
+		scope="I"
+		type="L"
+		name="Mazatec; Jalapa De Díaz" />
+	<iso_639_3_entry
+		id="mak"
+		part2_code="mak"
+		scope="I"
+		type="L"
+		name="Makasar" />
+	<iso_639_3_entry
+		id="mal"
+		part1_code="ml"
+		part2_code="mal"
+		scope="I"
+		type="L"
+		name="Malayalam" />
+	<iso_639_3_entry
+		id="mam"
+		scope="I"
+		type="L"
+		name="Mam" />
+	<iso_639_3_entry
+		id="man"
+		part2_code="man"
+		scope="M"
+		type="L"
+		name="Mandingo" />
+	<iso_639_3_entry
+		id="maq"
+		scope="I"
+		type="L"
+		name="Mazatec; Chiquihuitlán" />
+	<iso_639_3_entry
+		id="mar"
+		part1_code="mr"
+		part2_code="mar"
+		scope="I"
+		type="L"
+		name="Marathi" />
+	<iso_639_3_entry
+		id="mas"
+		part2_code="mas"
+		scope="I"
+		type="L"
+		name="Masai" />
+	<iso_639_3_entry
+		id="mat"
+		scope="I"
+		type="L"
+		name="Matlatzinca; San Francisco" />
+	<iso_639_3_entry
+		id="mau"
+		scope="I"
+		type="L"
+		name="Mazatec; Huautla" />
+	<iso_639_3_entry
+		id="mav"
+		scope="I"
+		type="L"
+		name="Sateré-Mawé" />
+	<iso_639_3_entry
+		id="maw"
+		scope="I"
+		type="L"
+		name="Mampruli" />
+	<iso_639_3_entry
+		id="max"
+		scope="I"
+		type="L"
+		name="Malay; North Moluccan" />
+	<iso_639_3_entry
+		id="maz"
+		scope="I"
+		type="L"
+		name="Mazahua; Central" />
+	<iso_639_3_entry
+		id="mba"
+		scope="I"
+		type="L"
+		name="Higaonon" />
+	<iso_639_3_entry
+		id="mbb"
+		scope="I"
+		type="L"
+		name="Manobo; Western Bukidnon" />
+	<iso_639_3_entry
+		id="mbc"
+		scope="I"
+		type="L"
+		name="Macushi" />
+	<iso_639_3_entry
+		id="mbd"
+		scope="I"
+		type="L"
+		name="Manobo; Dibabawon" />
+	<iso_639_3_entry
+		id="mbe"
+		scope="I"
+		type="E"
+		name="Molale" />
+	<iso_639_3_entry
+		id="mbf"
+		scope="I"
+		type="L"
+		name="Malay; Baba" />
+	<iso_639_3_entry
+		id="mbh"
+		scope="I"
+		type="L"
+		name="Mangseng" />
+	<iso_639_3_entry
+		id="mbi"
+		scope="I"
+		type="L"
+		name="Manobo; Ilianen" />
+	<iso_639_3_entry
+		id="mbj"
+		scope="I"
+		type="L"
+		name="Nadëb" />
+	<iso_639_3_entry
+		id="mbk"
+		scope="I"
+		type="L"
+		name="Malol" />
+	<iso_639_3_entry
+		id="mbl"
+		scope="I"
+		type="L"
+		name="Maxakalí" />
+	<iso_639_3_entry
+		id="mbm"
+		scope="I"
+		type="L"
+		name="Ombamba" />
+	<iso_639_3_entry
+		id="mbn"
+		scope="I"
+		type="L"
+		name="Macaguán" />
+	<iso_639_3_entry
+		id="mbo"
+		scope="I"
+		type="L"
+		name="Mbo (Cameroon)" />
+	<iso_639_3_entry
+		id="mbp"
+		scope="I"
+		type="L"
+		name="Malayo" />
+	<iso_639_3_entry
+		id="mbq"
+		scope="I"
+		type="L"
+		name="Maisin" />
+	<iso_639_3_entry
+		id="mbr"
+		scope="I"
+		type="L"
+		name="Nukak Makú" />
+	<iso_639_3_entry
+		id="mbs"
+		scope="I"
+		type="L"
+		name="Manobo; Sarangani" />
+	<iso_639_3_entry
+		id="mbt"
+		scope="I"
+		type="L"
+		name="Manobo; Matigsalug" />
+	<iso_639_3_entry
+		id="mbu"
+		scope="I"
+		type="L"
+		name="Mbula-Bwazza" />
+	<iso_639_3_entry
+		id="mbv"
+		scope="I"
+		type="L"
+		name="Mbulungish" />
+	<iso_639_3_entry
+		id="mbw"
+		scope="I"
+		type="L"
+		name="Maring" />
+	<iso_639_3_entry
+		id="mbx"
+		scope="I"
+		type="L"
+		name="Mari (East Sepik Province)" />
+	<iso_639_3_entry
+		id="mby"
+		scope="I"
+		type="L"
+		name="Memoni" />
+	<iso_639_3_entry
+		id="mbz"
+		scope="I"
+		type="L"
+		name="Mixtec; Amoltepec" />
+	<iso_639_3_entry
+		id="mca"
+		scope="I"
+		type="L"
+		name="Maca" />
+	<iso_639_3_entry
+		id="mcb"
+		scope="I"
+		type="L"
+		name="Machiguenga" />
+	<iso_639_3_entry
+		id="mcc"
+		scope="I"
+		type="L"
+		name="Bitur" />
+	<iso_639_3_entry
+		id="mcd"
+		scope="I"
+		type="L"
+		name="Sharanahua" />
+	<iso_639_3_entry
+		id="mce"
+		scope="I"
+		type="L"
+		name="Mixtec; Itundujia" />
+	<iso_639_3_entry
+		id="mcf"
+		scope="I"
+		type="L"
+		name="Matsés" />
+	<iso_639_3_entry
+		id="mcg"
+		scope="I"
+		type="L"
+		name="Mapoyo" />
+	<iso_639_3_entry
+		id="mch"
+		scope="I"
+		type="L"
+		name="Maquiritari" />
+	<iso_639_3_entry
+		id="mci"
+		scope="I"
+		type="L"
+		name="Mese" />
+	<iso_639_3_entry
+		id="mcj"
+		scope="I"
+		type="L"
+		name="Mvanip" />
+	<iso_639_3_entry
+		id="mck"
+		scope="I"
+		type="L"
+		name="Mbunda" />
+	<iso_639_3_entry
+		id="mcl"
+		scope="I"
+		type="E"
+		name="Macaguaje" />
+	<iso_639_3_entry
+		id="mcm"
+		scope="I"
+		type="L"
+		name="Creole Portuguese; Malaccan" />
+	<iso_639_3_entry
+		id="mcn"
+		scope="I"
+		type="L"
+		name="Masana" />
+	<iso_639_3_entry
+		id="mco"
+		scope="I"
+		type="L"
+		name="Mixe; Coatlán" />
+	<iso_639_3_entry
+		id="mcp"
+		scope="I"
+		type="L"
+		name="Makaa" />
+	<iso_639_3_entry
+		id="mcq"
+		scope="I"
+		type="L"
+		name="Ese" />
+	<iso_639_3_entry
+		id="mcr"
+		scope="I"
+		type="L"
+		name="Menya" />
+	<iso_639_3_entry
+		id="mcs"
+		scope="I"
+		type="L"
+		name="Mambai" />
+	<iso_639_3_entry
+		id="mct"
+		scope="I"
+		type="L"
+		name="Mengisa" />
+	<iso_639_3_entry
+		id="mcu"
+		scope="I"
+		type="L"
+		name="Mambila; Cameroon" />
+	<iso_639_3_entry
+		id="mcv"
+		scope="I"
+		type="L"
+		name="Minanibai" />
+	<iso_639_3_entry
+		id="mcw"
+		scope="I"
+		type="L"
+		name="Mawa (Chad)" />
+	<iso_639_3_entry
+		id="mcx"
+		scope="I"
+		type="L"
+		name="Mpiemo" />
+	<iso_639_3_entry
+		id="mcy"
+		scope="I"
+		type="L"
+		name="Watut; South" />
+	<iso_639_3_entry
+		id="mcz"
+		scope="I"
+		type="L"
+		name="Mawan" />
+	<iso_639_3_entry
+		id="mda"
+		scope="I"
+		type="L"
+		name="Mada (Nigeria)" />
+	<iso_639_3_entry
+		id="mdb"
+		scope="I"
+		type="L"
+		name="Morigi" />
+	<iso_639_3_entry
+		id="mdc"
+		scope="I"
+		type="L"
+		name="Male (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="mdd"
+		scope="I"
+		type="L"
+		name="Mbum" />
+	<iso_639_3_entry
+		id="mde"
+		scope="I"
+		type="L"
+		name="Maba (Chad)" />
+	<iso_639_3_entry
+		id="mdf"
+		part2_code="mdf"
+		scope="I"
+		type="L"
+		name="Moksha" />
+	<iso_639_3_entry
+		id="mdg"
+		scope="I"
+		type="L"
+		name="Massalat" />
+	<iso_639_3_entry
+		id="mdh"
+		scope="I"
+		type="L"
+		name="Maguindanaon" />
+	<iso_639_3_entry
+		id="mdi"
+		scope="I"
+		type="L"
+		name="Mamvu" />
+	<iso_639_3_entry
+		id="mdj"
+		scope="I"
+		type="L"
+		name="Mangbetu" />
+	<iso_639_3_entry
+		id="mdk"
+		scope="I"
+		type="L"
+		name="Mangbutu" />
+	<iso_639_3_entry
+		id="mdl"
+		scope="I"
+		type="L"
+		name="Maltese Sign Language" />
+	<iso_639_3_entry
+		id="mdm"
+		scope="I"
+		type="L"
+		name="Mayogo" />
+	<iso_639_3_entry
+		id="mdn"
+		scope="I"
+		type="L"
+		name="Mbati" />
+	<iso_639_3_entry
+		id="mdp"
+		scope="I"
+		type="L"
+		name="Mbala" />
+	<iso_639_3_entry
+		id="mdq"
+		scope="I"
+		type="L"
+		name="Mbole" />
+	<iso_639_3_entry
+		id="mdr"
+		part2_code="mdr"
+		scope="I"
+		type="L"
+		name="Mandar" />
+	<iso_639_3_entry
+		id="mds"
+		scope="I"
+		type="L"
+		name="Maria (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="mdt"
+		scope="I"
+		type="L"
+		name="Mbere" />
+	<iso_639_3_entry
+		id="mdu"
+		scope="I"
+		type="L"
+		name="Mboko" />
+	<iso_639_3_entry
+		id="mdv"
+		scope="I"
+		type="L"
+		name="Mixtec; Santa Lucía Monteverde" />
+	<iso_639_3_entry
+		id="mdw"
+		scope="I"
+		type="L"
+		name="Mbosi" />
+	<iso_639_3_entry
+		id="mdx"
+		scope="I"
+		type="L"
+		name="Dizin" />
+	<iso_639_3_entry
+		id="mdy"
+		scope="I"
+		type="L"
+		name="Male (Ethiopia)" />
+	<iso_639_3_entry
+		id="mdz"
+		scope="I"
+		type="L"
+		name="Suruí Do Pará" />
+	<iso_639_3_entry
+		id="mea"
+		scope="I"
+		type="L"
+		name="Menka" />
+	<iso_639_3_entry
+		id="meb"
+		scope="I"
+		type="L"
+		name="Ikobi-Mena" />
+	<iso_639_3_entry
+		id="mec"
+		scope="I"
+		type="L"
+		name="Mara" />
+	<iso_639_3_entry
+		id="med"
+		scope="I"
+		type="L"
+		name="Melpa" />
+	<iso_639_3_entry
+		id="mee"
+		scope="I"
+		type="L"
+		name="Mengen" />
+	<iso_639_3_entry
+		id="mef"
+		scope="I"
+		type="L"
+		name="Megam" />
+	<iso_639_3_entry
+		id="meg"
+		scope="I"
+		type="L"
+		name="Mea" />
+	<iso_639_3_entry
+		id="meh"
+		scope="I"
+		type="L"
+		name="Mixtec; Southwestern Tlaxiaco" />
+	<iso_639_3_entry
+		id="mei"
+		scope="I"
+		type="L"
+		name="Midob" />
+	<iso_639_3_entry
+		id="mej"
+		scope="I"
+		type="L"
+		name="Meyah" />
+	<iso_639_3_entry
+		id="mek"
+		scope="I"
+		type="L"
+		name="Mekeo" />
+	<iso_639_3_entry
+		id="mel"
+		scope="I"
+		type="L"
+		name="Melanau; Central" />
+	<iso_639_3_entry
+		id="mem"
+		scope="I"
+		type="E"
+		name="Mangala" />
+	<iso_639_3_entry
+		id="men"
+		part2_code="men"
+		scope="I"
+		type="L"
+		name="Mende (Sierra Leone)" />
+	<iso_639_3_entry
+		id="meo"
+		scope="I"
+		type="L"
+		name="Malay; Kedah" />
+	<iso_639_3_entry
+		id="mep"
+		scope="I"
+		type="L"
+		name="Miriwung" />
+	<iso_639_3_entry
+		id="meq"
+		scope="I"
+		type="L"
+		name="Merey" />
+	<iso_639_3_entry
+		id="mer"
+		scope="I"
+		type="L"
+		name="Meru" />
+	<iso_639_3_entry
+		id="mes"
+		scope="I"
+		type="L"
+		name="Masmaje" />
+	<iso_639_3_entry
+		id="met"
+		scope="I"
+		type="L"
+		name="Mato" />
+	<iso_639_3_entry
+		id="meu"
+		scope="I"
+		type="L"
+		name="Motu" />
+	<iso_639_3_entry
+		id="mev"
+		scope="I"
+		type="L"
+		name="Mann" />
+	<iso_639_3_entry
+		id="mew"
+		scope="I"
+		type="L"
+		name="Maaka" />
+	<iso_639_3_entry
+		id="mey"
+		scope="I"
+		type="L"
+		name="Hassaniyya" />
+	<iso_639_3_entry
+		id="mez"
+		scope="I"
+		type="L"
+		name="Menominee" />
+	<iso_639_3_entry
+		id="mfa"
+		scope="I"
+		type="L"
+		name="Malay; Pattani" />
+	<iso_639_3_entry
+		id="mfb"
+		scope="I"
+		type="L"
+		name="Bangka" />
+	<iso_639_3_entry
+		id="mfc"
+		scope="I"
+		type="L"
+		name="Mba" />
+	<iso_639_3_entry
+		id="mfd"
+		scope="I"
+		type="L"
+		name="Mendankwe-Nkwen" />
+	<iso_639_3_entry
+		id="mfe"
+		scope="I"
+		type="L"
+		name="Morisyen" />
+	<iso_639_3_entry
+		id="mff"
+		scope="I"
+		type="L"
+		name="Naki" />
+	<iso_639_3_entry
+		id="mfg"
+		scope="I"
+		type="L"
+		name="Mixifore" />
+	<iso_639_3_entry
+		id="mfh"
+		scope="I"
+		type="L"
+		name="Matal" />
+	<iso_639_3_entry
+		id="mfi"
+		scope="I"
+		type="L"
+		name="Wandala" />
+	<iso_639_3_entry
+		id="mfj"
+		scope="I"
+		type="L"
+		name="Mefele" />
+	<iso_639_3_entry
+		id="mfk"
+		scope="I"
+		type="L"
+		name="Mofu; North" />
+	<iso_639_3_entry
+		id="mfl"
+		scope="I"
+		type="L"
+		name="Putai" />
+	<iso_639_3_entry
+		id="mfm"
+		scope="I"
+		type="L"
+		name="Marghi South" />
+	<iso_639_3_entry
+		id="mfn"
+		scope="I"
+		type="L"
+		name="Mbembe; Cross River" />
+	<iso_639_3_entry
+		id="mfo"
+		scope="I"
+		type="L"
+		name="Mbe" />
+	<iso_639_3_entry
+		id="mfp"
+		scope="I"
+		type="L"
+		name="Malay; Makassar" />
+	<iso_639_3_entry
+		id="mfq"
+		scope="I"
+		type="L"
+		name="Moba" />
+	<iso_639_3_entry
+		id="mfr"
+		scope="I"
+		type="L"
+		name="Marithiel" />
+	<iso_639_3_entry
+		id="mfs"
+		scope="I"
+		type="L"
+		name="Mexican Sign Language" />
+	<iso_639_3_entry
+		id="mft"
+		scope="I"
+		type="L"
+		name="Mokerang" />
+	<iso_639_3_entry
+		id="mfu"
+		scope="I"
+		type="L"
+		name="Mbwela" />
+	<iso_639_3_entry
+		id="mfv"
+		scope="I"
+		type="L"
+		name="Mandjak" />
+	<iso_639_3_entry
+		id="mfw"
+		scope="I"
+		type="E"
+		name="Mulaha" />
+	<iso_639_3_entry
+		id="mfx"
+		scope="I"
+		type="L"
+		name="Melo" />
+	<iso_639_3_entry
+		id="mfy"
+		scope="I"
+		type="L"
+		name="Mayo" />
+	<iso_639_3_entry
+		id="mfz"
+		scope="I"
+		type="L"
+		name="Mabaan" />
+	<iso_639_3_entry
+		id="mga"
+		part2_code="mga"
+		scope="I"
+		type="H"
+		name="Irish; Middle (900-1200)" />
+	<iso_639_3_entry
+		id="mgb"
+		scope="I"
+		type="L"
+		name="Mararit" />
+	<iso_639_3_entry
+		id="mgc"
+		scope="I"
+		type="L"
+		name="Morokodo" />
+	<iso_639_3_entry
+		id="mgd"
+		scope="I"
+		type="L"
+		name="Moru" />
+	<iso_639_3_entry
+		id="mge"
+		scope="I"
+		type="L"
+		name="Mango" />
+	<iso_639_3_entry
+		id="mgf"
+		scope="I"
+		type="L"
+		name="Maklew" />
+	<iso_639_3_entry
+		id="mgg"
+		scope="I"
+		type="L"
+		name="Mpongmpong" />
+	<iso_639_3_entry
+		id="mgh"
+		scope="I"
+		type="L"
+		name="Makhuwa-Meetto" />
+	<iso_639_3_entry
+		id="mgi"
+		scope="I"
+		type="L"
+		name="Lijili" />
+	<iso_639_3_entry
+		id="mgj"
+		scope="I"
+		type="L"
+		name="Abureni" />
+	<iso_639_3_entry
+		id="mgk"
+		scope="I"
+		type="L"
+		name="Mawes" />
+	<iso_639_3_entry
+		id="mgl"
+		scope="I"
+		type="L"
+		name="Maleu-Kilenge" />
+	<iso_639_3_entry
+		id="mgm"
+		scope="I"
+		type="L"
+		name="Mambae" />
+	<iso_639_3_entry
+		id="mgn"
+		scope="I"
+		type="L"
+		name="Mbangi" />
+	<iso_639_3_entry
+		id="mgo"
+		scope="I"
+		type="L"
+		name="Meta'" />
+	<iso_639_3_entry
+		id="mgp"
+		scope="I"
+		type="L"
+		name="Magar; Eastern" />
+	<iso_639_3_entry
+		id="mgq"
+		scope="I"
+		type="L"
+		name="Malila" />
+	<iso_639_3_entry
+		id="mgr"
+		scope="I"
+		type="L"
+		name="Mambwe-Lungu" />
+	<iso_639_3_entry
+		id="mgs"
+		scope="I"
+		type="L"
+		name="Manda (Tanzania)" />
+	<iso_639_3_entry
+		id="mgt"
+		scope="I"
+		type="L"
+		name="Mongol" />
+	<iso_639_3_entry
+		id="mgu"
+		scope="I"
+		type="L"
+		name="Mailu" />
+	<iso_639_3_entry
+		id="mgv"
+		scope="I"
+		type="L"
+		name="Matengo" />
+	<iso_639_3_entry
+		id="mgw"
+		scope="I"
+		type="L"
+		name="Matumbi" />
+	<iso_639_3_entry
+		id="mgx"
+		scope="I"
+		type="L"
+		name="Omati" />
+	<iso_639_3_entry
+		id="mgy"
+		scope="I"
+		type="L"
+		name="Mbunga" />
+	<iso_639_3_entry
+		id="mgz"
+		scope="I"
+		type="L"
+		name="Mbugwe" />
+	<iso_639_3_entry
+		id="mha"
+		scope="I"
+		type="L"
+		name="Manda (India)" />
+	<iso_639_3_entry
+		id="mhb"
+		scope="I"
+		type="L"
+		name="Mahongwe" />
+	<iso_639_3_entry
+		id="mhc"
+		scope="I"
+		type="L"
+		name="Mocho" />
+	<iso_639_3_entry
+		id="mhd"
+		scope="I"
+		type="L"
+		name="Mbugu" />
+	<iso_639_3_entry
+		id="mhe"
+		scope="I"
+		type="L"
+		name="Besisi" />
+	<iso_639_3_entry
+		id="mhf"
+		scope="I"
+		type="L"
+		name="Mamaa" />
+	<iso_639_3_entry
+		id="mhg"
+		scope="I"
+		type="L"
+		name="Margu" />
+	<iso_639_3_entry
+		id="mhh"
+		scope="I"
+		type="L"
+		name="Maskoy Pidgin" />
+	<iso_639_3_entry
+		id="mhi"
+		scope="I"
+		type="L"
+		name="Ma'di" />
+	<iso_639_3_entry
+		id="mhj"
+		scope="I"
+		type="L"
+		name="Mogholi" />
+	<iso_639_3_entry
+		id="mhk"
+		scope="I"
+		type="L"
+		name="Mungaka" />
+	<iso_639_3_entry
+		id="mhl"
+		scope="I"
+		type="L"
+		name="Mauwake" />
+	<iso_639_3_entry
+		id="mhm"
+		scope="I"
+		type="L"
+		name="Makhuwa-Moniga" />
+	<iso_639_3_entry
+		id="mhn"
+		scope="I"
+		type="L"
+		name="Mócheno" />
+	<iso_639_3_entry
+		id="mho"
+		scope="I"
+		type="L"
+		name="Mashi (Zambia)" />
+	<iso_639_3_entry
+		id="mhp"
+		scope="I"
+		type="L"
+		name="Malay; Balinese" />
+	<iso_639_3_entry
+		id="mhq"
+		scope="I"
+		type="L"
+		name="Mandan" />
+	<iso_639_3_entry
+		id="mhr"
+		scope="I"
+		type="L"
+		name="Mari; Eastern" />
+	<iso_639_3_entry
+		id="mhs"
+		scope="I"
+		type="L"
+		name="Buru (Indonesia)" />
+	<iso_639_3_entry
+		id="mht"
+		scope="I"
+		type="L"
+		name="Mandahuaca" />
+	<iso_639_3_entry
+		id="mhu"
+		scope="I"
+		type="L"
+		name="Deng; Darang" />
+	<iso_639_3_entry
+		id="mhw"
+		scope="I"
+		type="L"
+		name="Mbukushu" />
+	<iso_639_3_entry
+		id="mhx"
+		scope="I"
+		type="L"
+		name="Maru" />
+	<iso_639_3_entry
+		id="mhy"
+		scope="I"
+		type="L"
+		name="Ma'anyan" />
+	<iso_639_3_entry
+		id="mhz"
+		scope="I"
+		type="L"
+		name="Mor (Mor Islands)" />
+	<iso_639_3_entry
+		id="mia"
+		scope="I"
+		type="L"
+		name="Miami" />
+	<iso_639_3_entry
+		id="mib"
+		scope="I"
+		type="L"
+		name="Mixtec; Atatláhuca" />
+	<iso_639_3_entry
+		id="mic"
+		part2_code="mic"
+		scope="I"
+		type="L"
+		name="Mi'kmaq" />
+	<iso_639_3_entry
+		id="mid"
+		scope="I"
+		type="L"
+		name="Mandaic" />
+	<iso_639_3_entry
+		id="mie"
+		scope="I"
+		type="L"
+		name="Mixtec; Ocotepec" />
+	<iso_639_3_entry
+		id="mif"
+		scope="I"
+		type="L"
+		name="Mofu-Gudur" />
+	<iso_639_3_entry
+		id="mig"
+		scope="I"
+		type="L"
+		name="Mixtec; San Miguel El Grande" />
+	<iso_639_3_entry
+		id="mih"
+		scope="I"
+		type="L"
+		name="Mixtec; Chayuco" />
+	<iso_639_3_entry
+		id="mii"
+		scope="I"
+		type="L"
+		name="Mixtec; Chigmecatitlán" />
+	<iso_639_3_entry
+		id="mij"
+		scope="I"
+		type="L"
+		name="Abar" />
+	<iso_639_3_entry
+		id="mik"
+		scope="I"
+		type="L"
+		name="Mikasuki" />
+	<iso_639_3_entry
+		id="mil"
+		scope="I"
+		type="L"
+		name="Mixtec; Peñoles" />
+	<iso_639_3_entry
+		id="mim"
+		scope="I"
+		type="L"
+		name="Mixtec; Alacatlatzala" />
+	<iso_639_3_entry
+		id="min"
+		part2_code="min"
+		scope="I"
+		type="L"
+		name="Minangkabau" />
+	<iso_639_3_entry
+		id="mio"
+		scope="I"
+		type="L"
+		name="Mixtec; Pinotepa Nacional" />
+	<iso_639_3_entry
+		id="mip"
+		scope="I"
+		type="L"
+		name="Mixtec; Apasco-Apoala" />
+	<iso_639_3_entry
+		id="miq"
+		scope="I"
+		type="L"
+		name="Mískito" />
+	<iso_639_3_entry
+		id="mir"
+		scope="I"
+		type="L"
+		name="Mixe; Isthmus" />
+	<iso_639_3_entry
+		id="mis"
+		part2_code="mis"
+		scope="S"
+		type="S"
+		name="Uncoded languages" />
+	<iso_639_3_entry
+		id="mit"
+		scope="I"
+		type="L"
+		name="Mixtec; Southern Puebla" />
+	<iso_639_3_entry
+		id="miu"
+		scope="I"
+		type="L"
+		name="Mixtec; Cacaloxtepec" />
+	<iso_639_3_entry
+		id="miw"
+		scope="I"
+		type="L"
+		name="Akoye" />
+	<iso_639_3_entry
+		id="mix"
+		scope="I"
+		type="L"
+		name="Mixtec; Mixtepec" />
+	<iso_639_3_entry
+		id="miy"
+		scope="I"
+		type="L"
+		name="Mixtec; Ayutla" />
+	<iso_639_3_entry
+		id="miz"
+		scope="I"
+		type="L"
+		name="Mixtec; Coatzospan" />
+	<iso_639_3_entry
+		id="mjc"
+		scope="I"
+		type="L"
+		name="Mixtec; San Juan Colorado" />
+	<iso_639_3_entry
+		id="mjd"
+		scope="I"
+		type="L"
+		name="Maidu; Northwest" />
+	<iso_639_3_entry
+		id="mje"
+		scope="I"
+		type="E"
+		name="Muskum" />
+	<iso_639_3_entry
+		id="mjg"
+		scope="I"
+		type="L"
+		name="Tu" />
+	<iso_639_3_entry
+		id="mjh"
+		scope="I"
+		type="L"
+		name="Mwera (Nyasa)" />
+	<iso_639_3_entry
+		id="mji"
+		scope="I"
+		type="L"
+		name="Kim Mun" />
+	<iso_639_3_entry
+		id="mjj"
+		scope="I"
+		type="L"
+		name="Mawak" />
+	<iso_639_3_entry
+		id="mjk"
+		scope="I"
+		type="L"
+		name="Matukar" />
+	<iso_639_3_entry
+		id="mjl"
+		scope="I"
+		type="L"
+		name="Mandeali" />
+	<iso_639_3_entry
+		id="mjm"
+		scope="I"
+		type="L"
+		name="Medebur" />
+	<iso_639_3_entry
+		id="mjn"
+		scope="I"
+		type="L"
+		name="Ma (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="mjo"
+		scope="I"
+		type="L"
+		name="Malankuravan" />
+	<iso_639_3_entry
+		id="mjp"
+		scope="I"
+		type="L"
+		name="Malapandaram" />
+	<iso_639_3_entry
+		id="mjq"
+		scope="I"
+		type="E"
+		name="Malaryan" />
+	<iso_639_3_entry
+		id="mjr"
+		scope="I"
+		type="L"
+		name="Malavedan" />
+	<iso_639_3_entry
+		id="mjs"
+		scope="I"
+		type="L"
+		name="Miship" />
+	<iso_639_3_entry
+		id="mjt"
+		scope="I"
+		type="L"
+		name="Sauria Paharia" />
+	<iso_639_3_entry
+		id="mju"
+		scope="I"
+		type="L"
+		name="Manna-Dora" />
+	<iso_639_3_entry
+		id="mjv"
+		scope="I"
+		type="L"
+		name="Mannan" />
+	<iso_639_3_entry
+		id="mjw"
+		scope="I"
+		type="L"
+		name="Karbi" />
+	<iso_639_3_entry
+		id="mjx"
+		scope="I"
+		type="L"
+		name="Mahali" />
+	<iso_639_3_entry
+		id="mjy"
+		scope="I"
+		type="E"
+		name="Mahican" />
+	<iso_639_3_entry
+		id="mjz"
+		scope="I"
+		type="L"
+		name="Majhi" />
+	<iso_639_3_entry
+		id="mka"
+		scope="I"
+		type="L"
+		name="Mbre" />
+	<iso_639_3_entry
+		id="mkb"
+		scope="I"
+		type="L"
+		name="Mal Paharia" />
+	<iso_639_3_entry
+		id="mkc"
+		scope="I"
+		type="L"
+		name="Siliput" />
+	<iso_639_3_entry
+		id="mkd"
+		part1_code="mk"
+		part2_code="mac"
+		scope="I"
+		type="L"
+		name="Macedonian" />
+	<iso_639_3_entry
+		id="mke"
+		scope="I"
+		type="L"
+		name="Mawchi" />
+	<iso_639_3_entry
+		id="mkf"
+		scope="I"
+		type="L"
+		name="Miya" />
+	<iso_639_3_entry
+		id="mkg"
+		scope="I"
+		type="L"
+		name="Mak (China)" />
+	<iso_639_3_entry
+		id="mki"
+		scope="I"
+		type="L"
+		name="Dhatki" />
+	<iso_639_3_entry
+		id="mkj"
+		scope="I"
+		type="L"
+		name="Mokilese" />
+	<iso_639_3_entry
+		id="mkk"
+		scope="I"
+		type="L"
+		name="Byep" />
+	<iso_639_3_entry
+		id="mkl"
+		scope="I"
+		type="L"
+		name="Mokole" />
+	<iso_639_3_entry
+		id="mkm"
+		scope="I"
+		type="L"
+		name="Moklen" />
+	<iso_639_3_entry
+		id="mkn"
+		scope="I"
+		type="L"
+		name="Malay; Kupang" />
+	<iso_639_3_entry
+		id="mko"
+		scope="I"
+		type="L"
+		name="Mingang Doso" />
+	<iso_639_3_entry
+		id="mkp"
+		scope="I"
+		type="L"
+		name="Moikodi" />
+	<iso_639_3_entry
+		id="mkq"
+		scope="I"
+		type="E"
+		name="Miwok; Bay" />
+	<iso_639_3_entry
+		id="mkr"
+		scope="I"
+		type="L"
+		name="Malas" />
+	<iso_639_3_entry
+		id="mks"
+		scope="I"
+		type="L"
+		name="Mixtec; Silacayoapan" />
+	<iso_639_3_entry
+		id="mkt"
+		scope="I"
+		type="L"
+		name="Vamale" />
+	<iso_639_3_entry
+		id="mku"
+		scope="I"
+		type="L"
+		name="Maninka; Konyanka" />
+	<iso_639_3_entry
+		id="mkv"
+		scope="I"
+		type="L"
+		name="Mafea" />
+	<iso_639_3_entry
+		id="mkw"
+		scope="I"
+		type="L"
+		name="Kituba (Congo)" />
+	<iso_639_3_entry
+		id="mkx"
+		scope="I"
+		type="L"
+		name="Manobo; Kinamiging" />
+	<iso_639_3_entry
+		id="mky"
+		scope="I"
+		type="L"
+		name="Makian; East" />
+	<iso_639_3_entry
+		id="mkz"
+		scope="I"
+		type="L"
+		name="Makasae" />
+	<iso_639_3_entry
+		id="mla"
+		scope="I"
+		type="L"
+		name="Malo" />
+	<iso_639_3_entry
+		id="mlb"
+		scope="I"
+		type="L"
+		name="Mbule" />
+	<iso_639_3_entry
+		id="mlc"
+		scope="I"
+		type="L"
+		name="Cao Lan" />
+	<iso_639_3_entry
+		id="mld"
+		scope="I"
+		type="L"
+		name="Malakhel" />
+	<iso_639_3_entry
+		id="mle"
+		scope="I"
+		type="L"
+		name="Manambu" />
+	<iso_639_3_entry
+		id="mlf"
+		scope="I"
+		type="L"
+		name="Mal" />
+	<iso_639_3_entry
+		id="mlg"
+		part1_code="mg"
+		part2_code="mlg"
+		scope="M"
+		type="L"
+		name="Malagasy" />
+	<iso_639_3_entry
+		id="mlh"
+		scope="I"
+		type="L"
+		name="Mape" />
+	<iso_639_3_entry
+		id="mli"
+		scope="I"
+		type="L"
+		name="Malimpung" />
+	<iso_639_3_entry
+		id="mlj"
+		scope="I"
+		type="L"
+		name="Miltu" />
+	<iso_639_3_entry
+		id="mlk"
+		scope="I"
+		type="L"
+		name="Ilwana" />
+	<iso_639_3_entry
+		id="mll"
+		scope="I"
+		type="L"
+		name="Malua Bay" />
+	<iso_639_3_entry
+		id="mlm"
+		scope="I"
+		type="L"
+		name="Mulam" />
+	<iso_639_3_entry
+		id="mln"
+		scope="I"
+		type="L"
+		name="Malango" />
+	<iso_639_3_entry
+		id="mlo"
+		scope="I"
+		type="L"
+		name="Mlomp" />
+	<iso_639_3_entry
+		id="mlp"
+		scope="I"
+		type="L"
+		name="Bargam" />
+	<iso_639_3_entry
+		id="mlq"
+		scope="I"
+		type="L"
+		name="Maninkakan; Western" />
+	<iso_639_3_entry
+		id="mlr"
+		scope="I"
+		type="L"
+		name="Vame" />
+	<iso_639_3_entry
+		id="mls"
+		scope="I"
+		type="L"
+		name="Masalit" />
+	<iso_639_3_entry
+		id="mlt"
+		part1_code="mt"
+		part2_code="mlt"
+		scope="I"
+		type="L"
+		name="Maltese" />
+	<iso_639_3_entry
+		id="mlu"
+		scope="I"
+		type="L"
+		name="To'abaita" />
+	<iso_639_3_entry
+		id="mlv"
+		scope="I"
+		type="L"
+		name="Motlav" />
+	<iso_639_3_entry
+		id="mlw"
+		scope="I"
+		type="L"
+		name="Moloko" />
+	<iso_639_3_entry
+		id="mlx"
+		scope="I"
+		type="L"
+		name="Malfaxal" />
+	<iso_639_3_entry
+		id="mlz"
+		scope="I"
+		type="L"
+		name="Malaynon" />
+	<iso_639_3_entry
+		id="mma"
+		scope="I"
+		type="L"
+		name="Mama" />
+	<iso_639_3_entry
+		id="mmb"
+		scope="I"
+		type="L"
+		name="Momina" />
+	<iso_639_3_entry
+		id="mmc"
+		scope="I"
+		type="L"
+		name="Mazahua; Michoacán" />
+	<iso_639_3_entry
+		id="mmd"
+		scope="I"
+		type="L"
+		name="Maonan" />
+	<iso_639_3_entry
+		id="mme"
+		scope="I"
+		type="L"
+		name="Mae" />
+	<iso_639_3_entry
+		id="mmf"
+		scope="I"
+		type="L"
+		name="Mundat" />
+	<iso_639_3_entry
+		id="mmg"
+		scope="I"
+		type="L"
+		name="Ambrym; North" />
+	<iso_639_3_entry
+		id="mmh"
+		scope="I"
+		type="L"
+		name="Mehináku" />
+	<iso_639_3_entry
+		id="mmi"
+		scope="I"
+		type="L"
+		name="Musar" />
+	<iso_639_3_entry
+		id="mmj"
+		scope="I"
+		type="L"
+		name="Majhwar" />
+	<iso_639_3_entry
+		id="mmk"
+		scope="I"
+		type="L"
+		name="Mukha-Dora" />
+	<iso_639_3_entry
+		id="mml"
+		scope="I"
+		type="L"
+		name="Man Met" />
+	<iso_639_3_entry
+		id="mmm"
+		scope="I"
+		type="L"
+		name="Maii" />
+	<iso_639_3_entry
+		id="mmn"
+		scope="I"
+		type="L"
+		name="Mamanwa" />
+	<iso_639_3_entry
+		id="mmo"
+		scope="I"
+		type="L"
+		name="Buang; Mangga" />
+	<iso_639_3_entry
+		id="mmp"
+		scope="I"
+		type="L"
+		name="Siawi" />
+	<iso_639_3_entry
+		id="mmq"
+		scope="I"
+		type="L"
+		name="Musak" />
+	<iso_639_3_entry
+		id="mmr"
+		scope="I"
+		type="L"
+		name="Miao; Western Xiangxi" />
+	<iso_639_3_entry
+		id="mmt"
+		scope="I"
+		type="L"
+		name="Malalamai" />
+	<iso_639_3_entry
+		id="mmu"
+		scope="I"
+		type="L"
+		name="Mmaala" />
+	<iso_639_3_entry
+		id="mmv"
+		scope="I"
+		type="E"
+		name="Miriti" />
+	<iso_639_3_entry
+		id="mmw"
+		scope="I"
+		type="L"
+		name="Emae" />
+	<iso_639_3_entry
+		id="mmx"
+		scope="I"
+		type="L"
+		name="Madak" />
+	<iso_639_3_entry
+		id="mmy"
+		scope="I"
+		type="L"
+		name="Migaama" />
+	<iso_639_3_entry
+		id="mmz"
+		scope="I"
+		type="L"
+		name="Mabaale" />
+	<iso_639_3_entry
+		id="mna"
+		scope="I"
+		type="L"
+		name="Mbula" />
+	<iso_639_3_entry
+		id="mnb"
+		scope="I"
+		type="L"
+		name="Muna" />
+	<iso_639_3_entry
+		id="mnc"
+		part2_code="mnc"
+		scope="I"
+		type="L"
+		name="Manchu" />
+	<iso_639_3_entry
+		id="mnd"
+		scope="I"
+		type="L"
+		name="Mondé" />
+	<iso_639_3_entry
+		id="mne"
+		scope="I"
+		type="L"
+		name="Naba" />
+	<iso_639_3_entry
+		id="mnf"
+		scope="I"
+		type="L"
+		name="Mundani" />
+	<iso_639_3_entry
+		id="mng"
+		scope="I"
+		type="L"
+		name="Mnong; Eastern" />
+	<iso_639_3_entry
+		id="mnh"
+		scope="I"
+		type="L"
+		name="Mono (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="mni"
+		part2_code="mni"
+		scope="I"
+		type="L"
+		name="Manipuri" />
+	<iso_639_3_entry
+		id="mnj"
+		scope="I"
+		type="L"
+		name="Munji" />
+	<iso_639_3_entry
+		id="mnk"
+		scope="I"
+		type="L"
+		name="Mandinka" />
+	<iso_639_3_entry
+		id="mnl"
+		scope="I"
+		type="L"
+		name="Tiale" />
+	<iso_639_3_entry
+		id="mnm"
+		scope="I"
+		type="L"
+		name="Mapena" />
+	<iso_639_3_entry
+		id="mnn"
+		scope="I"
+		type="L"
+		name="Mnong; Southern" />
+	<iso_639_3_entry
+		id="mnp"
+		scope="I"
+		type="L"
+		name="Chinese; Min Bei" />
+	<iso_639_3_entry
+		id="mnq"
+		scope="I"
+		type="L"
+		name="Minriq" />
+	<iso_639_3_entry
+		id="mnr"
+		scope="I"
+		type="L"
+		name="Mono (USA)" />
+	<iso_639_3_entry
+		id="mns"
+		scope="I"
+		type="L"
+		name="Mansi" />
+	<iso_639_3_entry
+		id="mnt"
+		scope="I"
+		type="E"
+		name="Maykulan" />
+	<iso_639_3_entry
+		id="mnu"
+		scope="I"
+		type="L"
+		name="Mer" />
+	<iso_639_3_entry
+		id="mnv"
+		scope="I"
+		type="L"
+		name="Rennell-Bellona" />
+	<iso_639_3_entry
+		id="mnw"
+		scope="I"
+		type="L"
+		name="Mon" />
+	<iso_639_3_entry
+		id="mnx"
+		scope="I"
+		type="L"
+		name="Manikion" />
+	<iso_639_3_entry
+		id="mny"
+		scope="I"
+		type="L"
+		name="Manyawa" />
+	<iso_639_3_entry
+		id="mnz"
+		scope="I"
+		type="L"
+		name="Moni" />
+	<iso_639_3_entry
+		id="moa"
+		scope="I"
+		type="L"
+		name="Mwan" />
+	<iso_639_3_entry
+		id="moc"
+		scope="I"
+		type="L"
+		name="Mocoví" />
+	<iso_639_3_entry
+		id="mod"
+		scope="I"
+		type="E"
+		name="Mobilian" />
+	<iso_639_3_entry
+		id="moe"
+		scope="I"
+		type="L"
+		name="Montagnais" />
+	<iso_639_3_entry
+		id="mog"
+		scope="I"
+		type="L"
+		name="Mongondow" />
+	<iso_639_3_entry
+		id="moh"
+		part2_code="moh"
+		scope="I"
+		type="L"
+		name="Mohawk" />
+	<iso_639_3_entry
+		id="moi"
+		scope="I"
+		type="L"
+		name="Mboi" />
+	<iso_639_3_entry
+		id="moj"
+		scope="I"
+		type="L"
+		name="Monzombo" />
+	<iso_639_3_entry
+		id="mok"
+		scope="I"
+		type="L"
+		name="Morori" />
+	<iso_639_3_entry
+		id="mom"
+		scope="I"
+		type="E"
+		name="Mangue" />
+	<iso_639_3_entry
+		id="mon"
+		part1_code="mn"
+		part2_code="mon"
+		scope="M"
+		type="L"
+		name="Mongolian" />
+	<iso_639_3_entry
+		id="moo"
+		scope="I"
+		type="L"
+		name="Monom" />
+	<iso_639_3_entry
+		id="mop"
+		scope="I"
+		type="L"
+		name="Mopán Maya" />
+	<iso_639_3_entry
+		id="moq"
+		scope="I"
+		type="L"
+		name="Mor (Bomberai Peninsula)" />
+	<iso_639_3_entry
+		id="mor"
+		scope="I"
+		type="L"
+		name="Moro" />
+	<iso_639_3_entry
+		id="mos"
+		part2_code="mos"
+		scope="I"
+		type="L"
+		name="Mossi" />
+	<iso_639_3_entry
+		id="mot"
+		scope="I"
+		type="L"
+		name="Barí" />
+	<iso_639_3_entry
+		id="mou"
+		scope="I"
+		type="L"
+		name="Mogum" />
+	<iso_639_3_entry
+		id="mov"
+		scope="I"
+		type="L"
+		name="Mohave" />
+	<iso_639_3_entry
+		id="mow"
+		scope="I"
+		type="L"
+		name="Moi (Congo)" />
+	<iso_639_3_entry
+		id="mox"
+		scope="I"
+		type="L"
+		name="Molima" />
+	<iso_639_3_entry
+		id="moy"
+		scope="I"
+		type="L"
+		name="Shekkacho" />
+	<iso_639_3_entry
+		id="moz"
+		scope="I"
+		type="L"
+		name="Mukulu" />
+	<iso_639_3_entry
+		id="mpa"
+		scope="I"
+		type="L"
+		name="Mpoto" />
+	<iso_639_3_entry
+		id="mpb"
+		scope="I"
+		type="L"
+		name="Mullukmulluk" />
+	<iso_639_3_entry
+		id="mpc"
+		scope="I"
+		type="L"
+		name="Mangarayi" />
+	<iso_639_3_entry
+		id="mpd"
+		scope="I"
+		type="L"
+		name="Machinere" />
+	<iso_639_3_entry
+		id="mpe"
+		scope="I"
+		type="L"
+		name="Majang" />
+	<iso_639_3_entry
+		id="mpg"
+		scope="I"
+		type="L"
+		name="Marba" />
+	<iso_639_3_entry
+		id="mph"
+		scope="I"
+		type="L"
+		name="Maung" />
+	<iso_639_3_entry
+		id="mpi"
+		scope="I"
+		type="L"
+		name="Mpade" />
+	<iso_639_3_entry
+		id="mpj"
+		scope="I"
+		type="L"
+		name="Martu Wangka" />
+	<iso_639_3_entry
+		id="mpk"
+		scope="I"
+		type="L"
+		name="Mbara (Chad)" />
+	<iso_639_3_entry
+		id="mpl"
+		scope="I"
+		type="L"
+		name="Watut; Middle" />
+	<iso_639_3_entry
+		id="mpm"
+		scope="I"
+		type="L"
+		name="Mixtec; Yosondúa" />
+	<iso_639_3_entry
+		id="mpn"
+		scope="I"
+		type="L"
+		name="Mindiri" />
+	<iso_639_3_entry
+		id="mpo"
+		scope="I"
+		type="L"
+		name="Miu" />
+	<iso_639_3_entry
+		id="mpp"
+		scope="I"
+		type="L"
+		name="Migabac" />
+	<iso_639_3_entry
+		id="mpq"
+		scope="I"
+		type="L"
+		name="Matís" />
+	<iso_639_3_entry
+		id="mpr"
+		scope="I"
+		type="L"
+		name="Vangunu" />
+	<iso_639_3_entry
+		id="mps"
+		scope="I"
+		type="L"
+		name="Dadibi" />
+	<iso_639_3_entry
+		id="mpt"
+		scope="I"
+		type="L"
+		name="Mian" />
+	<iso_639_3_entry
+		id="mpu"
+		scope="I"
+		type="L"
+		name="Makuráp" />
+	<iso_639_3_entry
+		id="mpv"
+		scope="I"
+		type="L"
+		name="Mungkip" />
+	<iso_639_3_entry
+		id="mpw"
+		scope="I"
+		type="L"
+		name="Mapidian" />
+	<iso_639_3_entry
+		id="mpx"
+		scope="I"
+		type="L"
+		name="Misima-Paneati" />
+	<iso_639_3_entry
+		id="mpy"
+		scope="I"
+		type="L"
+		name="Mapia" />
+	<iso_639_3_entry
+		id="mpz"
+		scope="I"
+		type="L"
+		name="Mpi" />
+	<iso_639_3_entry
+		id="mqa"
+		scope="I"
+		type="L"
+		name="Maba (Indonesia)" />
+	<iso_639_3_entry
+		id="mqb"
+		scope="I"
+		type="L"
+		name="Mbuko" />
+	<iso_639_3_entry
+		id="mqc"
+		scope="I"
+		type="L"
+		name="Mangole" />
+	<iso_639_3_entry
+		id="mqe"
+		scope="I"
+		type="L"
+		name="Matepi" />
+	<iso_639_3_entry
+		id="mqf"
+		scope="I"
+		type="L"
+		name="Momuna" />
+	<iso_639_3_entry
+		id="mqg"
+		scope="I"
+		type="L"
+		name="Malay; Kota Bangun Kutai" />
+	<iso_639_3_entry
+		id="mqh"
+		scope="I"
+		type="L"
+		name="Mixtec; Tlazoyaltepec" />
+	<iso_639_3_entry
+		id="mqi"
+		scope="I"
+		type="L"
+		name="Mariri" />
+	<iso_639_3_entry
+		id="mqj"
+		scope="I"
+		type="L"
+		name="Mamasa" />
+	<iso_639_3_entry
+		id="mqk"
+		scope="I"
+		type="L"
+		name="Manobo; Rajah Kabunsuwan" />
+	<iso_639_3_entry
+		id="mql"
+		scope="I"
+		type="L"
+		name="Mbelime" />
+	<iso_639_3_entry
+		id="mqm"
+		scope="I"
+		type="L"
+		name="Marquesan; South" />
+	<iso_639_3_entry
+		id="mqn"
+		scope="I"
+		type="L"
+		name="Moronene" />
+	<iso_639_3_entry
+		id="mqo"
+		scope="I"
+		type="L"
+		name="Modole" />
+	<iso_639_3_entry
+		id="mqp"
+		scope="I"
+		type="L"
+		name="Manipa" />
+	<iso_639_3_entry
+		id="mqq"
+		scope="I"
+		type="L"
+		name="Minokok" />
+	<iso_639_3_entry
+		id="mqr"
+		scope="I"
+		type="L"
+		name="Mander" />
+	<iso_639_3_entry
+		id="mqs"
+		scope="I"
+		type="L"
+		name="Makian; West" />
+	<iso_639_3_entry
+		id="mqt"
+		scope="I"
+		type="L"
+		name="Mok" />
+	<iso_639_3_entry
+		id="mqu"
+		scope="I"
+		type="L"
+		name="Mandari" />
+	<iso_639_3_entry
+		id="mqv"
+		scope="I"
+		type="L"
+		name="Mosimo" />
+	<iso_639_3_entry
+		id="mqw"
+		scope="I"
+		type="L"
+		name="Murupi" />
+	<iso_639_3_entry
+		id="mqx"
+		scope="I"
+		type="L"
+		name="Mamuju" />
+	<iso_639_3_entry
+		id="mqy"
+		scope="I"
+		type="L"
+		name="Manggarai" />
+	<iso_639_3_entry
+		id="mqz"
+		scope="I"
+		type="L"
+		name="Malasanga" />
+	<iso_639_3_entry
+		id="mra"
+		scope="I"
+		type="L"
+		name="Mlabri" />
+	<iso_639_3_entry
+		id="mrb"
+		scope="I"
+		type="L"
+		name="Marino" />
+	<iso_639_3_entry
+		id="mrc"
+		scope="I"
+		type="L"
+		name="Maricopa" />
+	<iso_639_3_entry
+		id="mrd"
+		scope="I"
+		type="L"
+		name="Magar; Western" />
+	<iso_639_3_entry
+		id="mre"
+		scope="I"
+		type="E"
+		name="Martha's Vineyard Sign Language" />
+	<iso_639_3_entry
+		id="mrf"
+		scope="I"
+		type="L"
+		name="Elseng" />
+	<iso_639_3_entry
+		id="mrg"
+		scope="I"
+		type="L"
+		name="Mising" />
+	<iso_639_3_entry
+		id="mrh"
+		scope="I"
+		type="L"
+		name="Chin; Mara" />
+	<iso_639_3_entry
+		id="mri"
+		part1_code="mi"
+		part2_code="mao"
+		scope="I"
+		type="L"
+		name="Maori" />
+	<iso_639_3_entry
+		id="mrj"
+		scope="I"
+		type="L"
+		name="Mari; Western" />
+	<iso_639_3_entry
+		id="mrk"
+		scope="I"
+		type="L"
+		name="Hmwaveke" />
+	<iso_639_3_entry
+		id="mrl"
+		scope="I"
+		type="L"
+		name="Mortlockese" />
+	<iso_639_3_entry
+		id="mrm"
+		scope="I"
+		type="L"
+		name="Merlav" />
+	<iso_639_3_entry
+		id="mrn"
+		scope="I"
+		type="L"
+		name="Cheke Holo" />
+	<iso_639_3_entry
+		id="mro"
+		scope="I"
+		type="L"
+		name="Mru" />
+	<iso_639_3_entry
+		id="mrp"
+		scope="I"
+		type="L"
+		name="Morouas" />
+	<iso_639_3_entry
+		id="mrq"
+		scope="I"
+		type="L"
+		name="Marquesan; North" />
+	<iso_639_3_entry
+		id="mrr"
+		scope="I"
+		type="L"
+		name="Maria (India)" />
+	<iso_639_3_entry
+		id="mrs"
+		scope="I"
+		type="L"
+		name="Maragus" />
+	<iso_639_3_entry
+		id="mrt"
+		scope="I"
+		type="L"
+		name="Marghi Central" />
+	<iso_639_3_entry
+		id="mru"
+		scope="I"
+		type="L"
+		name="Mono (Cameroon)" />
+	<iso_639_3_entry
+		id="mrv"
+		scope="I"
+		type="L"
+		name="Mangareva" />
+	<iso_639_3_entry
+		id="mrw"
+		scope="I"
+		type="L"
+		name="Maranao" />
+	<iso_639_3_entry
+		id="mrx"
+		scope="I"
+		type="L"
+		name="Maremgi" />
+	<iso_639_3_entry
+		id="mry"
+		scope="I"
+		type="L"
+		name="Mandaya" />
+	<iso_639_3_entry
+		id="mrz"
+		scope="I"
+		type="L"
+		name="Marind" />
+	<iso_639_3_entry
+		id="msa"
+		part1_code="ms"
+		part2_code="may"
+		scope="M"
+		type="L"
+		name="Malay (macrolanguage)" />
+	<iso_639_3_entry
+		id="msb"
+		scope="I"
+		type="L"
+		name="Masbatenyo" />
+	<iso_639_3_entry
+		id="msc"
+		scope="I"
+		type="L"
+		name="Maninka; Sankaran" />
+	<iso_639_3_entry
+		id="msd"
+		scope="I"
+		type="L"
+		name="Yucatec Maya Sign Language" />
+	<iso_639_3_entry
+		id="mse"
+		scope="I"
+		type="L"
+		name="Musey" />
+	<iso_639_3_entry
+		id="msf"
+		scope="I"
+		type="L"
+		name="Mekwei" />
+	<iso_639_3_entry
+		id="msg"
+		scope="I"
+		type="L"
+		name="Moraid" />
+	<iso_639_3_entry
+		id="msh"
+		scope="I"
+		type="L"
+		name="Malagasy; Masikoro" />
+	<iso_639_3_entry
+		id="msi"
+		scope="I"
+		type="L"
+		name="Malay; Sabah" />
+	<iso_639_3_entry
+		id="msj"
+		scope="I"
+		type="L"
+		name="Ma (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="msk"
+		scope="I"
+		type="L"
+		name="Mansaka" />
+	<iso_639_3_entry
+		id="msl"
+		scope="I"
+		type="L"
+		name="Molof" />
+	<iso_639_3_entry
+		id="msm"
+		scope="I"
+		type="L"
+		name="Manobo; Agusan" />
+	<iso_639_3_entry
+		id="msn"
+		scope="I"
+		type="L"
+		name="Vurës" />
+	<iso_639_3_entry
+		id="mso"
+		scope="I"
+		type="L"
+		name="Mombum" />
+	<iso_639_3_entry
+		id="msp"
+		scope="I"
+		type="E"
+		name="Maritsauá" />
+	<iso_639_3_entry
+		id="msq"
+		scope="I"
+		type="L"
+		name="Caac" />
+	<iso_639_3_entry
+		id="msr"
+		scope="I"
+		type="L"
+		name="Mongolian Sign Language" />
+	<iso_639_3_entry
+		id="mss"
+		scope="I"
+		type="L"
+		name="Masela; West" />
+	<iso_639_3_entry
+		id="msu"
+		scope="I"
+		type="L"
+		name="Musom" />
+	<iso_639_3_entry
+		id="msv"
+		scope="I"
+		type="L"
+		name="Maslam" />
+	<iso_639_3_entry
+		id="msw"
+		scope="I"
+		type="L"
+		name="Mansoanka" />
+	<iso_639_3_entry
+		id="msx"
+		scope="I"
+		type="L"
+		name="Moresada" />
+	<iso_639_3_entry
+		id="msy"
+		scope="I"
+		type="L"
+		name="Aruamu" />
+	<iso_639_3_entry
+		id="msz"
+		scope="I"
+		type="L"
+		name="Momare" />
+	<iso_639_3_entry
+		id="mta"
+		scope="I"
+		type="L"
+		name="Manobo; Cotabato" />
+	<iso_639_3_entry
+		id="mtb"
+		scope="I"
+		type="L"
+		name="Anyin Morofo" />
+	<iso_639_3_entry
+		id="mtc"
+		scope="I"
+		type="L"
+		name="Munit" />
+	<iso_639_3_entry
+		id="mtd"
+		scope="I"
+		type="L"
+		name="Mualang" />
+	<iso_639_3_entry
+		id="mte"
+		scope="I"
+		type="L"
+		name="Mono (Solomon Islands)" />
+	<iso_639_3_entry
+		id="mtf"
+		scope="I"
+		type="L"
+		name="Murik (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="mtg"
+		scope="I"
+		type="L"
+		name="Una" />
+	<iso_639_3_entry
+		id="mth"
+		scope="I"
+		type="L"
+		name="Munggui" />
+	<iso_639_3_entry
+		id="mti"
+		scope="I"
+		type="L"
+		name="Maiwa (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="mtj"
+		scope="I"
+		type="L"
+		name="Moskona" />
+	<iso_639_3_entry
+		id="mtk"
+		scope="I"
+		type="L"
+		name="Mbe'" />
+	<iso_639_3_entry
+		id="mtl"
+		scope="I"
+		type="L"
+		name="Montol" />
+	<iso_639_3_entry
+		id="mtm"
+		scope="I"
+		type="E"
+		name="Mator" />
+	<iso_639_3_entry
+		id="mtn"
+		scope="I"
+		type="E"
+		name="Matagalpa" />
+	<iso_639_3_entry
+		id="mto"
+		scope="I"
+		type="L"
+		name="Mixe; Totontepec" />
+	<iso_639_3_entry
+		id="mtp"
+		scope="I"
+		type="L"
+		name="Wichí Lhamtés Nocten" />
+	<iso_639_3_entry
+		id="mtq"
+		scope="I"
+		type="L"
+		name="Muong" />
+	<iso_639_3_entry
+		id="mtr"
+		scope="I"
+		type="L"
+		name="Mewari" />
+	<iso_639_3_entry
+		id="mts"
+		scope="I"
+		type="L"
+		name="Yora" />
+	<iso_639_3_entry
+		id="mtt"
+		scope="I"
+		type="L"
+		name="Mota" />
+	<iso_639_3_entry
+		id="mtu"
+		scope="I"
+		type="L"
+		name="Mixtec; Tututepec" />
+	<iso_639_3_entry
+		id="mtv"
+		scope="I"
+		type="L"
+		name="Asaro'o" />
+	<iso_639_3_entry
+		id="mtw"
+		scope="I"
+		type="L"
+		name="Binukidnon; Southern" />
+	<iso_639_3_entry
+		id="mtx"
+		scope="I"
+		type="L"
+		name="Mixtec; Tidaá" />
+	<iso_639_3_entry
+		id="mty"
+		scope="I"
+		type="L"
+		name="Nabi" />
+	<iso_639_3_entry
+		id="mua"
+		scope="I"
+		type="L"
+		name="Mundang" />
+	<iso_639_3_entry
+		id="mub"
+		scope="I"
+		type="L"
+		name="Mubi" />
+	<iso_639_3_entry
+		id="muc"
+		scope="I"
+		type="L"
+		name="Mbu'" />
+	<iso_639_3_entry
+		id="mud"
+		scope="I"
+		type="L"
+		name="Aleut; Mednyj" />
+	<iso_639_3_entry
+		id="mue"
+		scope="I"
+		type="L"
+		name="Media Lengua" />
+	<iso_639_3_entry
+		id="mug"
+		scope="I"
+		type="L"
+		name="Musgu" />
+	<iso_639_3_entry
+		id="muh"
+		scope="I"
+		type="L"
+		name="Mündü" />
+	<iso_639_3_entry
+		id="mui"
+		scope="I"
+		type="L"
+		name="Musi" />
+	<iso_639_3_entry
+		id="muj"
+		scope="I"
+		type="L"
+		name="Mabire" />
+	<iso_639_3_entry
+		id="muk"
+		scope="I"
+		type="L"
+		name="Mugom" />
+	<iso_639_3_entry
+		id="mul"
+		part2_code="mul"
+		scope="S"
+		type="S"
+		name="Multiple languages" />
+	<iso_639_3_entry
+		id="mum"
+		scope="I"
+		type="L"
+		name="Maiwala" />
+	<iso_639_3_entry
+		id="muo"
+		scope="I"
+		type="L"
+		name="Nyong" />
+	<iso_639_3_entry
+		id="mup"
+		scope="I"
+		type="L"
+		name="Malvi" />
+	<iso_639_3_entry
+		id="muq"
+		scope="I"
+		type="L"
+		name="Miao; Eastern Xiangxi" />
+	<iso_639_3_entry
+		id="mur"
+		scope="I"
+		type="L"
+		name="Murle" />
+	<iso_639_3_entry
+		id="mus"
+		part2_code="mus"
+		scope="I"
+		type="L"
+		name="Creek" />
+	<iso_639_3_entry
+		id="mut"
+		scope="I"
+		type="L"
+		name="Muria; Western" />
+	<iso_639_3_entry
+		id="muu"
+		scope="I"
+		type="L"
+		name="Yaaku" />
+	<iso_639_3_entry
+		id="muv"
+		scope="I"
+		type="L"
+		name="Muthuvan" />
+	<iso_639_3_entry
+		id="mux"
+		scope="I"
+		type="L"
+		name="Bo-Ung" />
+	<iso_639_3_entry
+		id="muy"
+		scope="I"
+		type="L"
+		name="Muyang" />
+	<iso_639_3_entry
+		id="muz"
+		scope="I"
+		type="L"
+		name="Mursi" />
+	<iso_639_3_entry
+		id="mva"
+		scope="I"
+		type="L"
+		name="Manam" />
+	<iso_639_3_entry
+		id="mvb"
+		scope="I"
+		type="E"
+		name="Mattole" />
+	<iso_639_3_entry
+		id="mvd"
+		scope="I"
+		type="L"
+		name="Mamboru" />
+	<iso_639_3_entry
+		id="mve"
+		scope="I"
+		type="L"
+		name="Marwari (Pakistan)" />
+	<iso_639_3_entry
+		id="mvf"
+		scope="I"
+		type="L"
+		name="Mongolian; Peripheral" />
+	<iso_639_3_entry
+		id="mvg"
+		scope="I"
+		type="L"
+		name="Mixtec; Yucuañe" />
+	<iso_639_3_entry
+		id="mvh"
+		scope="I"
+		type="L"
+		name="Mire" />
+	<iso_639_3_entry
+		id="mvi"
+		scope="I"
+		type="L"
+		name="Miyako" />
+	<iso_639_3_entry
+		id="mvk"
+		scope="I"
+		type="L"
+		name="Mekmek" />
+	<iso_639_3_entry
+		id="mvl"
+		scope="I"
+		type="E"
+		name="Mbara (Australia)" />
+	<iso_639_3_entry
+		id="mvm"
+		scope="I"
+		type="L"
+		name="Muya" />
+	<iso_639_3_entry
+		id="mvn"
+		scope="I"
+		type="L"
+		name="Minaveha" />
+	<iso_639_3_entry
+		id="mvo"
+		scope="I"
+		type="L"
+		name="Marovo" />
+	<iso_639_3_entry
+		id="mvp"
+		scope="I"
+		type="L"
+		name="Duri" />
+	<iso_639_3_entry
+		id="mvq"
+		scope="I"
+		type="L"
+		name="Moere" />
+	<iso_639_3_entry
+		id="mvr"
+		scope="I"
+		type="L"
+		name="Marau" />
+	<iso_639_3_entry
+		id="mvs"
+		scope="I"
+		type="L"
+		name="Massep" />
+	<iso_639_3_entry
+		id="mvt"
+		scope="I"
+		type="L"
+		name="Mpotovoro" />
+	<iso_639_3_entry
+		id="mvu"
+		scope="I"
+		type="L"
+		name="Marfa" />
+	<iso_639_3_entry
+		id="mvv"
+		scope="I"
+		type="L"
+		name="Murut; Tagal" />
+	<iso_639_3_entry
+		id="mvw"
+		scope="I"
+		type="L"
+		name="Machinga" />
+	<iso_639_3_entry
+		id="mvx"
+		scope="I"
+		type="L"
+		name="Meoswar" />
+	<iso_639_3_entry
+		id="mvy"
+		scope="I"
+		type="L"
+		name="Kohistani; Indus" />
+	<iso_639_3_entry
+		id="mvz"
+		scope="I"
+		type="L"
+		name="Mesqan" />
+	<iso_639_3_entry
+		id="mwa"
+		scope="I"
+		type="L"
+		name="Mwatebu" />
+	<iso_639_3_entry
+		id="mwb"
+		scope="I"
+		type="L"
+		name="Juwal" />
+	<iso_639_3_entry
+		id="mwc"
+		scope="I"
+		type="L"
+		name="Are" />
+	<iso_639_3_entry
+		id="mwd"
+		scope="I"
+		type="L"
+		name="Mudbura" />
+	<iso_639_3_entry
+		id="mwe"
+		scope="I"
+		type="L"
+		name="Mwera (Chimwera)" />
+	<iso_639_3_entry
+		id="mwf"
+		scope="I"
+		type="L"
+		name="Murrinh-Patha" />
+	<iso_639_3_entry
+		id="mwg"
+		scope="I"
+		type="L"
+		name="Aiklep" />
+	<iso_639_3_entry
+		id="mwh"
+		scope="I"
+		type="L"
+		name="Mouk-Aria" />
+	<iso_639_3_entry
+		id="mwi"
+		scope="I"
+		type="L"
+		name="Labo" />
+	<iso_639_3_entry
+		id="mwj"
+		scope="I"
+		type="L"
+		name="Maligo" />
+	<iso_639_3_entry
+		id="mwk"
+		scope="I"
+		type="L"
+		name="Maninkakan; Kita" />
+	<iso_639_3_entry
+		id="mwl"
+		part2_code="mwl"
+		scope="I"
+		type="L"
+		name="Mirandese" />
+	<iso_639_3_entry
+		id="mwm"
+		scope="I"
+		type="L"
+		name="Sar" />
+	<iso_639_3_entry
+		id="mwn"
+		scope="I"
+		type="L"
+		name="Nyamwanga" />
+	<iso_639_3_entry
+		id="mwo"
+		scope="I"
+		type="L"
+		name="Maewo; Central" />
+	<iso_639_3_entry
+		id="mwp"
+		scope="I"
+		type="L"
+		name="Kala Lagaw Ya" />
+	<iso_639_3_entry
+		id="mwq"
+		scope="I"
+		type="L"
+		name="Chin; Mün" />
+	<iso_639_3_entry
+		id="mwr"
+		part2_code="mwr"
+		scope="M"
+		type="L"
+		name="Marwari" />
+	<iso_639_3_entry
+		id="mws"
+		scope="I"
+		type="L"
+		name="Mwimbi-Muthambi" />
+	<iso_639_3_entry
+		id="mwt"
+		scope="I"
+		type="L"
+		name="Moken" />
+	<iso_639_3_entry
+		id="mwu"
+		scope="I"
+		type="E"
+		name="Mittu" />
+	<iso_639_3_entry
+		id="mwv"
+		scope="I"
+		type="L"
+		name="Mentawai" />
+	<iso_639_3_entry
+		id="mww"
+		scope="I"
+		type="L"
+		name="Hmong Daw" />
+	<iso_639_3_entry
+		id="mwx"
+		scope="I"
+		type="L"
+		name="Mediak" />
+	<iso_639_3_entry
+		id="mwy"
+		scope="I"
+		type="L"
+		name="Mosiro" />
+	<iso_639_3_entry
+		id="mwz"
+		scope="I"
+		type="L"
+		name="Moingi" />
+	<iso_639_3_entry
+		id="mxa"
+		scope="I"
+		type="L"
+		name="Mixtec; Northwest Oaxaca" />
+	<iso_639_3_entry
+		id="mxb"
+		scope="I"
+		type="L"
+		name="Mixtec; Tezoatlán" />
+	<iso_639_3_entry
+		id="mxc"
+		scope="I"
+		type="L"
+		name="Manyika" />
+	<iso_639_3_entry
+		id="mxd"
+		scope="I"
+		type="L"
+		name="Modang" />
+	<iso_639_3_entry
+		id="mxe"
+		scope="I"
+		type="L"
+		name="Mele-Fila" />
+	<iso_639_3_entry
+		id="mxf"
+		scope="I"
+		type="L"
+		name="Malgbe" />
+	<iso_639_3_entry
+		id="mxg"
+		scope="I"
+		type="L"
+		name="Mbangala" />
+	<iso_639_3_entry
+		id="mxh"
+		scope="I"
+		type="L"
+		name="Mvuba" />
+	<iso_639_3_entry
+		id="mxi"
+		scope="I"
+		type="E"
+		name="Mozarabic" />
+	<iso_639_3_entry
+		id="mxj"
+		scope="I"
+		type="L"
+		name="Deng; Geman" />
+	<iso_639_3_entry
+		id="mxk"
+		scope="I"
+		type="L"
+		name="Monumbo" />
+	<iso_639_3_entry
+		id="mxl"
+		scope="I"
+		type="L"
+		name="Gbe; Maxi" />
+	<iso_639_3_entry
+		id="mxm"
+		scope="I"
+		type="L"
+		name="Meramera" />
+	<iso_639_3_entry
+		id="mxn"
+		scope="I"
+		type="L"
+		name="Moi (Indonesia)" />
+	<iso_639_3_entry
+		id="mxo"
+		scope="I"
+		type="L"
+		name="Mbowe" />
+	<iso_639_3_entry
+		id="mxp"
+		scope="I"
+		type="L"
+		name="Mixe; Tlahuitoltepec" />
+	<iso_639_3_entry
+		id="mxq"
+		scope="I"
+		type="L"
+		name="Mixe; Juquila" />
+	<iso_639_3_entry
+		id="mxr"
+		scope="I"
+		type="L"
+		name="Murik (Malaysia)" />
+	<iso_639_3_entry
+		id="mxs"
+		scope="I"
+		type="L"
+		name="Mixtec; Huitepec" />
+	<iso_639_3_entry
+		id="mxt"
+		scope="I"
+		type="L"
+		name="Mixtec; Jamiltepec" />
+	<iso_639_3_entry
+		id="mxu"
+		scope="I"
+		type="L"
+		name="Mada (Cameroon)" />
+	<iso_639_3_entry
+		id="mxv"
+		scope="I"
+		type="L"
+		name="Mixtec; Metlatónoc" />
+	<iso_639_3_entry
+		id="mxw"
+		scope="I"
+		type="L"
+		name="Namo" />
+	<iso_639_3_entry
+		id="mxx"
+		scope="I"
+		type="L"
+		name="Mahou" />
+	<iso_639_3_entry
+		id="mxy"
+		scope="I"
+		type="L"
+		name="Mixtec; Southeastern Nochixtlán" />
+	<iso_639_3_entry
+		id="mxz"
+		scope="I"
+		type="L"
+		name="Masela; Central" />
+	<iso_639_3_entry
+		id="mya"
+		part1_code="my"
+		part2_code="bur"
+		scope="I"
+		type="L"
+		name="Burmese" />
+	<iso_639_3_entry
+		id="myb"
+		scope="I"
+		type="L"
+		name="Mbay" />
+	<iso_639_3_entry
+		id="myc"
+		scope="I"
+		type="L"
+		name="Mayeka" />
+	<iso_639_3_entry
+		id="myd"
+		scope="I"
+		type="L"
+		name="Maramba" />
+	<iso_639_3_entry
+		id="mye"
+		scope="I"
+		type="L"
+		name="Myene" />
+	<iso_639_3_entry
+		id="myf"
+		scope="I"
+		type="L"
+		name="Bambassi" />
+	<iso_639_3_entry
+		id="myg"
+		scope="I"
+		type="L"
+		name="Manta" />
+	<iso_639_3_entry
+		id="myh"
+		scope="I"
+		type="L"
+		name="Makah" />
+	<iso_639_3_entry
+		id="myi"
+		scope="I"
+		type="L"
+		name="Mina (India)" />
+	<iso_639_3_entry
+		id="myj"
+		scope="I"
+		type="L"
+		name="Mangayat" />
+	<iso_639_3_entry
+		id="myk"
+		scope="I"
+		type="L"
+		name="Senoufo; Mamara" />
+	<iso_639_3_entry
+		id="myl"
+		scope="I"
+		type="L"
+		name="Moma" />
+	<iso_639_3_entry
+		id="mym"
+		scope="I"
+		type="L"
+		name="Me'en" />
+	<iso_639_3_entry
+		id="myo"
+		scope="I"
+		type="L"
+		name="Anfillo" />
+	<iso_639_3_entry
+		id="myp"
+		scope="I"
+		type="L"
+		name="Pirahã" />
+	<iso_639_3_entry
+		id="myq"
+		scope="I"
+		type="L"
+		name="Maninka; Forest" />
+	<iso_639_3_entry
+		id="myr"
+		scope="I"
+		type="L"
+		name="Muniche" />
+	<iso_639_3_entry
+		id="mys"
+		scope="I"
+		type="E"
+		name="Mesmes" />
+	<iso_639_3_entry
+		id="myu"
+		scope="I"
+		type="L"
+		name="Mundurukú" />
+	<iso_639_3_entry
+		id="myv"
+		part2_code="myv"
+		scope="I"
+		type="L"
+		name="Erzya" />
+	<iso_639_3_entry
+		id="myw"
+		scope="I"
+		type="L"
+		name="Muyuw" />
+	<iso_639_3_entry
+		id="myx"
+		scope="I"
+		type="L"
+		name="Masaaba" />
+	<iso_639_3_entry
+		id="myy"
+		scope="I"
+		type="L"
+		name="Macuna" />
+	<iso_639_3_entry
+		id="myz"
+		scope="I"
+		type="H"
+		name="Mandaic; Classical" />
+	<iso_639_3_entry
+		id="mza"
+		scope="I"
+		type="L"
+		name="Mixtec; Santa María Zacatepec" />
+	<iso_639_3_entry
+		id="mzb"
+		scope="I"
+		type="L"
+		name="Tumzabt" />
+	<iso_639_3_entry
+		id="mzc"
+		scope="I"
+		type="L"
+		name="Madagascar Sign Language" />
+	<iso_639_3_entry
+		id="mzd"
+		scope="I"
+		type="L"
+		name="Malimba" />
+	<iso_639_3_entry
+		id="mze"
+		scope="I"
+		type="L"
+		name="Morawa" />
+	<iso_639_3_entry
+		id="mzg"
+		scope="I"
+		type="L"
+		name="Monastic Sign Language" />
+	<iso_639_3_entry
+		id="mzh"
+		scope="I"
+		type="L"
+		name="Wichí Lhamtés Güisnay" />
+	<iso_639_3_entry
+		id="mzi"
+		scope="I"
+		type="L"
+		name="Mazatec; Ixcatlán" />
+	<iso_639_3_entry
+		id="mzj"
+		scope="I"
+		type="L"
+		name="Manya" />
+	<iso_639_3_entry
+		id="mzk"
+		scope="I"
+		type="L"
+		name="Mambila; Nigeria" />
+	<iso_639_3_entry
+		id="mzl"
+		scope="I"
+		type="L"
+		name="Mixe; Mazatlán" />
+	<iso_639_3_entry
+		id="mzm"
+		scope="I"
+		type="L"
+		name="Mumuye" />
+	<iso_639_3_entry
+		id="mzn"
+		scope="I"
+		type="L"
+		name="Mazanderani" />
+	<iso_639_3_entry
+		id="mzo"
+		scope="I"
+		type="E"
+		name="Matipuhy" />
+	<iso_639_3_entry
+		id="mzp"
+		scope="I"
+		type="L"
+		name="Movima" />
+	<iso_639_3_entry
+		id="mzq"
+		scope="I"
+		type="L"
+		name="Mori Atas" />
+	<iso_639_3_entry
+		id="mzr"
+		scope="I"
+		type="L"
+		name="Marúbo" />
+	<iso_639_3_entry
+		id="mzs"
+		scope="I"
+		type="L"
+		name="Macanese" />
+	<iso_639_3_entry
+		id="mzt"
+		scope="I"
+		type="L"
+		name="Mintil" />
+	<iso_639_3_entry
+		id="mzu"
+		scope="I"
+		type="L"
+		name="Inapang" />
+	<iso_639_3_entry
+		id="mzv"
+		scope="I"
+		type="L"
+		name="Manza" />
+	<iso_639_3_entry
+		id="mzw"
+		scope="I"
+		type="L"
+		name="Deg" />
+	<iso_639_3_entry
+		id="mzx"
+		scope="I"
+		type="L"
+		name="Mawayana" />
+	<iso_639_3_entry
+		id="mzy"
+		scope="I"
+		type="L"
+		name="Mozambican Sign Language" />
+	<iso_639_3_entry
+		id="mzz"
+		scope="I"
+		type="L"
+		name="Maiadomu" />
+	<iso_639_3_entry
+		id="naa"
+		scope="I"
+		type="L"
+		name="Namla" />
+	<iso_639_3_entry
+		id="nab"
+		scope="I"
+		type="L"
+		name="Nambikuára; Southern" />
+	<iso_639_3_entry
+		id="nac"
+		scope="I"
+		type="L"
+		name="Narak" />
+	<iso_639_3_entry
+		id="nad"
+		scope="I"
+		type="L"
+		name="Nijadali" />
+	<iso_639_3_entry
+		id="nae"
+		scope="I"
+		type="L"
+		name="Naka'ela" />
+	<iso_639_3_entry
+		id="naf"
+		scope="I"
+		type="L"
+		name="Nabak" />
+	<iso_639_3_entry
+		id="nag"
+		scope="I"
+		type="L"
+		name="Naga Pidgin" />
+	<iso_639_3_entry
+		id="naj"
+		scope="I"
+		type="L"
+		name="Nalu" />
+	<iso_639_3_entry
+		id="nak"
+		scope="I"
+		type="L"
+		name="Nakanai" />
+	<iso_639_3_entry
+		id="nal"
+		scope="I"
+		type="L"
+		name="Nalik" />
+	<iso_639_3_entry
+		id="nam"
+		scope="I"
+		type="L"
+		name="Nangikurrunggurr" />
+	<iso_639_3_entry
+		id="nan"
+		scope="I"
+		type="L"
+		name="Chinese; Min Nan" />
+	<iso_639_3_entry
+		id="nao"
+		scope="I"
+		type="L"
+		name="Naaba" />
+	<iso_639_3_entry
+		id="nap"
+		part2_code="nap"
+		scope="I"
+		type="L"
+		name="Neapolitan" />
+	<iso_639_3_entry
+		id="naq"
+		scope="I"
+		type="L"
+		name="Nama (Namibia)" />
+	<iso_639_3_entry
+		id="nar"
+		scope="I"
+		type="L"
+		name="Iguta" />
+	<iso_639_3_entry
+		id="nas"
+		scope="I"
+		type="L"
+		name="Naasioi" />
+	<iso_639_3_entry
+		id="nat"
+		scope="I"
+		type="L"
+		name="Hungworo" />
+	<iso_639_3_entry
+		id="nau"
+		part1_code="na"
+		part2_code="nau"
+		scope="I"
+		type="L"
+		name="Nauru" />
+	<iso_639_3_entry
+		id="nav"
+		part1_code="nv"
+		part2_code="nav"
+		scope="I"
+		type="L"
+		name="Navajo" />
+	<iso_639_3_entry
+		id="naw"
+		scope="I"
+		type="L"
+		name="Nawuri" />
+	<iso_639_3_entry
+		id="nax"
+		scope="I"
+		type="L"
+		name="Nakwi" />
+	<iso_639_3_entry
+		id="nay"
+		scope="I"
+		type="E"
+		name="Narrinyeri" />
+	<iso_639_3_entry
+		id="naz"
+		scope="I"
+		type="L"
+		name="Nahuatl; Coatepec" />
+	<iso_639_3_entry
+		id="nba"
+		scope="I"
+		type="L"
+		name="Nyemba" />
+	<iso_639_3_entry
+		id="nbb"
+		scope="I"
+		type="L"
+		name="Ndoe" />
+	<iso_639_3_entry
+		id="nbc"
+		scope="I"
+		type="L"
+		name="Naga; Chang" />
+	<iso_639_3_entry
+		id="nbd"
+		scope="I"
+		type="L"
+		name="Ngbinda" />
+	<iso_639_3_entry
+		id="nbe"
+		scope="I"
+		type="L"
+		name="Naga; Konyak" />
+	<iso_639_3_entry
+		id="nbg"
+		scope="I"
+		type="L"
+		name="Nagarchal" />
+	<iso_639_3_entry
+		id="nbh"
+		scope="I"
+		type="L"
+		name="Ngamo" />
+	<iso_639_3_entry
+		id="nbi"
+		scope="I"
+		type="L"
+		name="Naga; Mao" />
+	<iso_639_3_entry
+		id="nbj"
+		scope="I"
+		type="L"
+		name="Ngarinman" />
+	<iso_639_3_entry
+		id="nbk"
+		scope="I"
+		type="L"
+		name="Nake" />
+	<iso_639_3_entry
+		id="nbl"
+		part1_code="nr"
+		part2_code="nbl"
+		scope="I"
+		type="L"
+		name="Ndebele; South" />
+	<iso_639_3_entry
+		id="nbm"
+		scope="I"
+		type="L"
+		name="Ngbaka Ma'bo" />
+	<iso_639_3_entry
+		id="nbn"
+		scope="I"
+		type="L"
+		name="Kuri" />
+	<iso_639_3_entry
+		id="nbo"
+		scope="I"
+		type="L"
+		name="Nkukoli" />
+	<iso_639_3_entry
+		id="nbp"
+		scope="I"
+		type="L"
+		name="Nnam" />
+	<iso_639_3_entry
+		id="nbq"
+		scope="I"
+		type="L"
+		name="Nggem" />
+	<iso_639_3_entry
+		id="nbr"
+		scope="I"
+		type="L"
+		name="Numana-Nunku-Gbantu-Numbu" />
+	<iso_639_3_entry
+		id="nbs"
+		scope="I"
+		type="L"
+		name="Namibian Sign Language" />
+	<iso_639_3_entry
+		id="nbt"
+		scope="I"
+		type="L"
+		name="Na" />
+	<iso_639_3_entry
+		id="nbu"
+		scope="I"
+		type="L"
+		name="Naga; Rongmei" />
+	<iso_639_3_entry
+		id="nbv"
+		scope="I"
+		type="L"
+		name="Ngamambo" />
+	<iso_639_3_entry
+		id="nbw"
+		scope="I"
+		type="L"
+		name="Ngbandi; Southern" />
+	<iso_639_3_entry
+		id="nbx"
+		scope="I"
+		type="E"
+		name="Ngura" />
+	<iso_639_3_entry
+		id="nby"
+		scope="I"
+		type="L"
+		name="Ningera" />
+	<iso_639_3_entry
+		id="nca"
+		scope="I"
+		type="L"
+		name="Iyo" />
+	<iso_639_3_entry
+		id="ncb"
+		scope="I"
+		type="L"
+		name="Nicobarese; Central" />
+	<iso_639_3_entry
+		id="ncc"
+		scope="I"
+		type="L"
+		name="Ponam" />
+	<iso_639_3_entry
+		id="ncd"
+		scope="I"
+		type="L"
+		name="Nachering" />
+	<iso_639_3_entry
+		id="nce"
+		scope="I"
+		type="L"
+		name="Yale" />
+	<iso_639_3_entry
+		id="ncf"
+		scope="I"
+		type="L"
+		name="Notsi" />
+	<iso_639_3_entry
+		id="ncg"
+		scope="I"
+		type="L"
+		name="Nisga'a" />
+	<iso_639_3_entry
+		id="nch"
+		scope="I"
+		type="L"
+		name="Nahuatl; Central Huasteca" />
+	<iso_639_3_entry
+		id="nci"
+		scope="I"
+		type="H"
+		name="Nahuatl; Classical" />
+	<iso_639_3_entry
+		id="ncj"
+		scope="I"
+		type="L"
+		name="Nahuatl; Northern Puebla" />
+	<iso_639_3_entry
+		id="nck"
+		scope="I"
+		type="L"
+		name="Nakara" />
+	<iso_639_3_entry
+		id="ncl"
+		scope="I"
+		type="L"
+		name="Nahuatl; Michoacán" />
+	<iso_639_3_entry
+		id="ncm"
+		scope="I"
+		type="L"
+		name="Nambo" />
+	<iso_639_3_entry
+		id="ncn"
+		scope="I"
+		type="L"
+		name="Nauna" />
+	<iso_639_3_entry
+		id="nco"
+		scope="I"
+		type="L"
+		name="Sibe" />
+	<iso_639_3_entry
+		id="ncp"
+		scope="I"
+		type="L"
+		name="Ndaktup" />
+	<iso_639_3_entry
+		id="ncr"
+		scope="I"
+		type="L"
+		name="Ncane" />
+	<iso_639_3_entry
+		id="ncs"
+		scope="I"
+		type="L"
+		name="Nicaraguan Sign Language" />
+	<iso_639_3_entry
+		id="nct"
+		scope="I"
+		type="L"
+		name="Naga; Chothe" />
+	<iso_639_3_entry
+		id="ncu"
+		scope="I"
+		type="L"
+		name="Chumburung" />
+	<iso_639_3_entry
+		id="ncx"
+		scope="I"
+		type="L"
+		name="Nahuatl; Central Puebla" />
+	<iso_639_3_entry
+		id="ncz"
+		scope="I"
+		type="E"
+		name="Natchez" />
+	<iso_639_3_entry
+		id="nda"
+		scope="I"
+		type="L"
+		name="Ndasa" />
+	<iso_639_3_entry
+		id="ndb"
+		scope="I"
+		type="L"
+		name="Kenswei Nsei" />
+	<iso_639_3_entry
+		id="ndc"
+		scope="I"
+		type="L"
+		name="Ndau" />
+	<iso_639_3_entry
+		id="ndd"
+		scope="I"
+		type="L"
+		name="Nde-Nsele-Nta" />
+	<iso_639_3_entry
+		id="nde"
+		part1_code="nd"
+		part2_code="nde"
+		scope="I"
+		type="L"
+		name="Ndebele; North" />
+	<iso_639_3_entry
+		id="ndf"
+		scope="I"
+		type="E"
+		name="Nadruvian" />
+	<iso_639_3_entry
+		id="ndg"
+		scope="I"
+		type="L"
+		name="Ndengereko" />
+	<iso_639_3_entry
+		id="ndh"
+		scope="I"
+		type="L"
+		name="Ndali" />
+	<iso_639_3_entry
+		id="ndi"
+		scope="I"
+		type="L"
+		name="Samba Leko" />
+	<iso_639_3_entry
+		id="ndj"
+		scope="I"
+		type="L"
+		name="Ndamba" />
+	<iso_639_3_entry
+		id="ndk"
+		scope="I"
+		type="L"
+		name="Ndaka" />
+	<iso_639_3_entry
+		id="ndl"
+		scope="I"
+		type="L"
+		name="Ndolo" />
+	<iso_639_3_entry
+		id="ndm"
+		scope="I"
+		type="L"
+		name="Ndam" />
+	<iso_639_3_entry
+		id="ndn"
+		scope="I"
+		type="L"
+		name="Ngundi" />
+	<iso_639_3_entry
+		id="ndo"
+		part1_code="ng"
+		part2_code="ndo"
+		scope="I"
+		type="L"
+		name="Ndonga" />
+	<iso_639_3_entry
+		id="ndp"
+		scope="I"
+		type="L"
+		name="Ndo" />
+	<iso_639_3_entry
+		id="ndq"
+		scope="I"
+		type="L"
+		name="Ndombe" />
+	<iso_639_3_entry
+		id="ndr"
+		scope="I"
+		type="L"
+		name="Ndoola" />
+	<iso_639_3_entry
+		id="nds"
+		part2_code="nds"
+		scope="I"
+		type="L"
+		name="German; Low" />
+	<iso_639_3_entry
+		id="ndt"
+		scope="I"
+		type="L"
+		name="Ndunga" />
+	<iso_639_3_entry
+		id="ndu"
+		scope="I"
+		type="L"
+		name="Dugun" />
+	<iso_639_3_entry
+		id="ndv"
+		scope="I"
+		type="L"
+		name="Ndut" />
+	<iso_639_3_entry
+		id="ndw"
+		scope="I"
+		type="L"
+		name="Ndobo" />
+	<iso_639_3_entry
+		id="ndx"
+		scope="I"
+		type="L"
+		name="Nduga" />
+	<iso_639_3_entry
+		id="ndy"
+		scope="I"
+		type="L"
+		name="Lutos" />
+	<iso_639_3_entry
+		id="ndz"
+		scope="I"
+		type="L"
+		name="Ndogo" />
+	<iso_639_3_entry
+		id="nea"
+		scope="I"
+		type="L"
+		name="Ngad'a; Eastern" />
+	<iso_639_3_entry
+		id="neb"
+		scope="I"
+		type="L"
+		name="Toura (Côte d'Ivoire)" />
+	<iso_639_3_entry
+		id="nec"
+		scope="I"
+		type="L"
+		name="Nedebang" />
+	<iso_639_3_entry
+		id="ned"
+		scope="I"
+		type="L"
+		name="Nde-Gbite" />
+	<iso_639_3_entry
+		id="nee"
+		scope="I"
+		type="L"
+		name="Nêlêmwa-Nixumwak" />
+	<iso_639_3_entry
+		id="nef"
+		scope="I"
+		type="L"
+		name="Nefamese" />
+	<iso_639_3_entry
+		id="neg"
+		scope="I"
+		type="L"
+		name="Negidal" />
+	<iso_639_3_entry
+		id="neh"
+		scope="I"
+		type="L"
+		name="Nyenkha" />
+	<iso_639_3_entry
+		id="nei"
+		scope="I"
+		type="A"
+		name="Hittite; Neo-" />
+	<iso_639_3_entry
+		id="nej"
+		scope="I"
+		type="L"
+		name="Neko" />
+	<iso_639_3_entry
+		id="nek"
+		scope="I"
+		type="L"
+		name="Neku" />
+	<iso_639_3_entry
+		id="nem"
+		scope="I"
+		type="L"
+		name="Nemi" />
+	<iso_639_3_entry
+		id="nen"
+		scope="I"
+		type="L"
+		name="Nengone" />
+	<iso_639_3_entry
+		id="neo"
+		scope="I"
+		type="L"
+		name="Ná-Meo" />
+	<iso_639_3_entry
+		id="nep"
+		part1_code="ne"
+		part2_code="nep"
+		scope="I"
+		type="L"
+		name="Nepali" />
+	<iso_639_3_entry
+		id="neq"
+		scope="I"
+		type="L"
+		name="Mixe; North Central" />
+	<iso_639_3_entry
+		id="ner"
+		scope="I"
+		type="L"
+		name="Yahadian" />
+	<iso_639_3_entry
+		id="nes"
+		scope="I"
+		type="L"
+		name="Kinnauri; Bhoti" />
+	<iso_639_3_entry
+		id="net"
+		scope="I"
+		type="L"
+		name="Nete" />
+	<iso_639_3_entry
+		id="nev"
+		scope="I"
+		type="L"
+		name="Nyaheun" />
+	<iso_639_3_entry
+		id="new"
+		part2_code="new"
+		scope="I"
+		type="L"
+		name="Bhasa; Nepal" />
+	<iso_639_3_entry
+		id="nex"
+		scope="I"
+		type="L"
+		name="Neme" />
+	<iso_639_3_entry
+		id="ney"
+		scope="I"
+		type="L"
+		name="Neyo" />
+	<iso_639_3_entry
+		id="nez"
+		scope="I"
+		type="L"
+		name="Nez Perce" />
+	<iso_639_3_entry
+		id="nfa"
+		scope="I"
+		type="L"
+		name="Dhao" />
+	<iso_639_3_entry
+		id="nfd"
+		scope="I"
+		type="L"
+		name="Ahwai" />
+	<iso_639_3_entry
+		id="nfl"
+		scope="I"
+		type="L"
+		name="Ayiwo" />
+	<iso_639_3_entry
+		id="nfr"
+		scope="I"
+		type="L"
+		name="Nafaanra" />
+	<iso_639_3_entry
+		id="nfu"
+		scope="I"
+		type="L"
+		name="Mfumte" />
+	<iso_639_3_entry
+		id="nga"
+		scope="I"
+		type="L"
+		name="Ngbaka" />
+	<iso_639_3_entry
+		id="ngb"
+		scope="I"
+		type="L"
+		name="Ngbandi; Northern" />
+	<iso_639_3_entry
+		id="ngc"
+		scope="I"
+		type="L"
+		name="Ngombe (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="ngd"
+		scope="I"
+		type="L"
+		name="Ngando (Central African Republic)" />
+	<iso_639_3_entry
+		id="nge"
+		scope="I"
+		type="L"
+		name="Ngemba" />
+	<iso_639_3_entry
+		id="ngg"
+		scope="I"
+		type="L"
+		name="Ngbaka Manza" />
+	<iso_639_3_entry
+		id="ngh"
+		scope="I"
+		type="L"
+		name="N/u" />
+	<iso_639_3_entry
+		id="ngi"
+		scope="I"
+		type="L"
+		name="Ngizim" />
+	<iso_639_3_entry
+		id="ngj"
+		scope="I"
+		type="L"
+		name="Ngie" />
+	<iso_639_3_entry
+		id="ngk"
+		scope="I"
+		type="L"
+		name="Ngalkbun" />
+	<iso_639_3_entry
+		id="ngl"
+		scope="I"
+		type="L"
+		name="Lomwe" />
+	<iso_639_3_entry
+		id="ngm"
+		scope="I"
+		type="L"
+		name="Ngatik Men's Creole" />
+	<iso_639_3_entry
+		id="ngn"
+		scope="I"
+		type="L"
+		name="Ngwo" />
+	<iso_639_3_entry
+		id="ngo"
+		scope="I"
+		type="L"
+		name="Ngoni" />
+	<iso_639_3_entry
+		id="ngp"
+		scope="I"
+		type="L"
+		name="Ngulu" />
+	<iso_639_3_entry
+		id="ngq"
+		scope="I"
+		type="L"
+		name="Ngurimi" />
+	<iso_639_3_entry
+		id="ngr"
+		scope="I"
+		type="L"
+		name="Nanggu" />
+	<iso_639_3_entry
+		id="ngs"
+		scope="I"
+		type="L"
+		name="Gvoko" />
+	<iso_639_3_entry
+		id="ngt"
+		scope="I"
+		type="L"
+		name="Ngeq" />
+	<iso_639_3_entry
+		id="ngu"
+		scope="I"
+		type="L"
+		name="Nahuatl; Guerrero" />
+	<iso_639_3_entry
+		id="ngv"
+		scope="I"
+		type="E"
+		name="Nagumi" />
+	<iso_639_3_entry
+		id="ngw"
+		scope="I"
+		type="L"
+		name="Ngwaba" />
+	<iso_639_3_entry
+		id="ngx"
+		scope="I"
+		type="L"
+		name="Nggwahyi" />
+	<iso_639_3_entry
+		id="ngy"
+		scope="I"
+		type="L"
+		name="Tibea" />
+	<iso_639_3_entry
+		id="ngz"
+		scope="I"
+		type="L"
+		name="Ngungwel" />
+	<iso_639_3_entry
+		id="nha"
+		scope="I"
+		type="L"
+		name="Nhanda" />
+	<iso_639_3_entry
+		id="nhb"
+		scope="I"
+		type="L"
+		name="Beng" />
+	<iso_639_3_entry
+		id="nhc"
+		scope="I"
+		type="E"
+		name="Nahuatl; Tabasco" />
+	<iso_639_3_entry
+		id="nhd"
+		scope="I"
+		type="L"
+		name="Guaraní; Ava" />
+	<iso_639_3_entry
+		id="nhe"
+		scope="I"
+		type="L"
+		name="Nahuatl; Eastern Huasteca" />
+	<iso_639_3_entry
+		id="nhf"
+		scope="I"
+		type="L"
+		name="Nhuwala" />
+	<iso_639_3_entry
+		id="nhg"
+		scope="I"
+		type="L"
+		name="Nahuatl; Tetelcingo" />
+	<iso_639_3_entry
+		id="nhh"
+		scope="I"
+		type="L"
+		name="Nahari" />
+	<iso_639_3_entry
+		id="nhi"
+		scope="I"
+		type="L"
+		name="Nahuatl; Zacatlán-Ahuacatlán-Tepetzintla" />
+	<iso_639_3_entry
+		id="nhk"
+		scope="I"
+		type="L"
+		name="Nahuatl; Isthmus-Cosoleacaque" />
+	<iso_639_3_entry
+		id="nhm"
+		scope="I"
+		type="L"
+		name="Nahuatl; Morelos" />
+	<iso_639_3_entry
+		id="nhn"
+		scope="I"
+		type="L"
+		name="Nahuatl; Central" />
+	<iso_639_3_entry
+		id="nho"
+		scope="I"
+		type="L"
+		name="Takuu" />
+	<iso_639_3_entry
+		id="nhp"
+		scope="I"
+		type="L"
+		name="Nahuatl; Isthmus-Pajapan" />
+	<iso_639_3_entry
+		id="nhq"
+		scope="I"
+		type="L"
+		name="Nahuatl; Huaxcaleca" />
+	<iso_639_3_entry
+		id="nhr"
+		scope="I"
+		type="L"
+		name="Naro" />
+	<iso_639_3_entry
+		id="nht"
+		scope="I"
+		type="L"
+		name="Nahuatl; Ometepec" />
+	<iso_639_3_entry
+		id="nhu"
+		scope="I"
+		type="L"
+		name="Noone" />
+	<iso_639_3_entry
+		id="nhv"
+		scope="I"
+		type="L"
+		name="Nahuatl; Temascaltepec" />
+	<iso_639_3_entry
+		id="nhw"
+		scope="I"
+		type="L"
+		name="Nahuatl; Western Huasteca" />
+	<iso_639_3_entry
+		id="nhx"
+		scope="I"
+		type="L"
+		name="Nahuatl; Isthmus-Mecayapan" />
+	<iso_639_3_entry
+		id="nhy"
+		scope="I"
+		type="L"
+		name="Nahuatl; Northern Oaxaca" />
+	<iso_639_3_entry
+		id="nhz"
+		scope="I"
+		type="L"
+		name="Nahuatl; Santa María La Alta" />
+	<iso_639_3_entry
+		id="nia"
+		part2_code="nia"
+		scope="I"
+		type="L"
+		name="Nias" />
+	<iso_639_3_entry
+		id="nib"
+		scope="I"
+		type="L"
+		name="Nakame" />
+	<iso_639_3_entry
+		id="nid"
+		scope="I"
+		type="E"
+		name="Ngandi" />
+	<iso_639_3_entry
+		id="nie"
+		scope="I"
+		type="L"
+		name="Niellim" />
+	<iso_639_3_entry
+		id="nif"
+		scope="I"
+		type="L"
+		name="Nek" />
+	<iso_639_3_entry
+		id="nig"
+		scope="I"
+		type="E"
+		name="Ngalakan" />
+	<iso_639_3_entry
+		id="nih"
+		scope="I"
+		type="L"
+		name="Nyiha (Tanzania)" />
+	<iso_639_3_entry
+		id="nii"
+		scope="I"
+		type="L"
+		name="Nii" />
+	<iso_639_3_entry
+		id="nij"
+		scope="I"
+		type="L"
+		name="Ngaju" />
+	<iso_639_3_entry
+		id="nik"
+		scope="I"
+		type="L"
+		name="Nicobarese; Southern" />
+	<iso_639_3_entry
+		id="nil"
+		scope="I"
+		type="L"
+		name="Nila" />
+	<iso_639_3_entry
+		id="nim"
+		scope="I"
+		type="L"
+		name="Nilamba" />
+	<iso_639_3_entry
+		id="nin"
+		scope="I"
+		type="L"
+		name="Ninzo" />
+	<iso_639_3_entry
+		id="nio"
+		scope="I"
+		type="L"
+		name="Nganasan" />
+	<iso_639_3_entry
+		id="niq"
+		scope="I"
+		type="L"
+		name="Nandi" />
+	<iso_639_3_entry
+		id="nir"
+		scope="I"
+		type="L"
+		name="Nimboran" />
+	<iso_639_3_entry
+		id="nis"
+		scope="I"
+		type="L"
+		name="Nimi" />
+	<iso_639_3_entry
+		id="nit"
+		scope="I"
+		type="L"
+		name="Kolami; Southeastern" />
+	<iso_639_3_entry
+		id="niu"
+		part2_code="niu"
+		scope="I"
+		type="L"
+		name="Niuean" />
+	<iso_639_3_entry
+		id="niv"
+		scope="I"
+		type="L"
+		name="Gilyak" />
+	<iso_639_3_entry
+		id="niw"
+		scope="I"
+		type="L"
+		name="Nimo" />
+	<iso_639_3_entry
+		id="nix"
+		scope="I"
+		type="L"
+		name="Hema" />
+	<iso_639_3_entry
+		id="niy"
+		scope="I"
+		type="L"
+		name="Ngiti" />
+	<iso_639_3_entry
+		id="niz"
+		scope="I"
+		type="L"
+		name="Ningil" />
+	<iso_639_3_entry
+		id="nja"
+		scope="I"
+		type="L"
+		name="Nzanyi" />
+	<iso_639_3_entry
+		id="njb"
+		scope="I"
+		type="L"
+		name="Naga; Nocte" />
+	<iso_639_3_entry
+		id="njd"
+		scope="I"
+		type="L"
+		name="Ndonde Hamba" />
+	<iso_639_3_entry
+		id="njh"
+		scope="I"
+		type="L"
+		name="Naga; Lotha" />
+	<iso_639_3_entry
+		id="nji"
+		scope="I"
+		type="L"
+		name="Gudanji" />
+	<iso_639_3_entry
+		id="njj"
+		scope="I"
+		type="L"
+		name="Njen" />
+	<iso_639_3_entry
+		id="njl"
+		scope="I"
+		type="L"
+		name="Njalgulgule" />
+	<iso_639_3_entry
+		id="njm"
+		scope="I"
+		type="L"
+		name="Naga; Angami" />
+	<iso_639_3_entry
+		id="njn"
+		scope="I"
+		type="L"
+		name="Naga; Liangmai" />
+	<iso_639_3_entry
+		id="njo"
+		scope="I"
+		type="L"
+		name="Naga; Ao" />
+	<iso_639_3_entry
+		id="njr"
+		scope="I"
+		type="L"
+		name="Njerep" />
+	<iso_639_3_entry
+		id="njs"
+		scope="I"
+		type="L"
+		name="Nisa" />
+	<iso_639_3_entry
+		id="njt"
+		scope="I"
+		type="L"
+		name="Ndyuka-Trio Pidgin" />
+	<iso_639_3_entry
+		id="nju"
+		scope="I"
+		type="L"
+		name="Ngadjunmaya" />
+	<iso_639_3_entry
+		id="njx"
+		scope="I"
+		type="L"
+		name="Kunyi" />
+	<iso_639_3_entry
+		id="njy"
+		scope="I"
+		type="L"
+		name="Njyem" />
+	<iso_639_3_entry
+		id="nka"
+		scope="I"
+		type="L"
+		name="Nkoya" />
+	<iso_639_3_entry
+		id="nkb"
+		scope="I"
+		type="L"
+		name="Naga; Khoibu" />
+	<iso_639_3_entry
+		id="nkc"
+		scope="I"
+		type="L"
+		name="Nkongho" />
+	<iso_639_3_entry
+		id="nkd"
+		scope="I"
+		type="L"
+		name="Koireng" />
+	<iso_639_3_entry
+		id="nke"
+		scope="I"
+		type="L"
+		name="Duke" />
+	<iso_639_3_entry
+		id="nkf"
+		scope="I"
+		type="L"
+		name="Naga; Inpui" />
+	<iso_639_3_entry
+		id="nkg"
+		scope="I"
+		type="L"
+		name="Nekgini" />
+	<iso_639_3_entry
+		id="nkh"
+		scope="I"
+		type="L"
+		name="Naga; Khezha" />
+	<iso_639_3_entry
+		id="nki"
+		scope="I"
+		type="L"
+		name="Naga; Thangal" />
+	<iso_639_3_entry
+		id="nkj"
+		scope="I"
+		type="L"
+		name="Nakai" />
+	<iso_639_3_entry
+		id="nkk"
+		scope="I"
+		type="L"
+		name="Nokuku" />
+	<iso_639_3_entry
+		id="nkm"
+		scope="I"
+		type="L"
+		name="Namat" />
+	<iso_639_3_entry
+		id="nkn"
+		scope="I"
+		type="L"
+		name="Nkangala" />
+	<iso_639_3_entry
+		id="nko"
+		scope="I"
+		type="L"
+		name="Nkonya" />
+	<iso_639_3_entry
+		id="nkp"
+		scope="I"
+		type="E"
+		name="Niuatoputapu" />
+	<iso_639_3_entry
+		id="nkq"
+		scope="I"
+		type="L"
+		name="Nkami" />
+	<iso_639_3_entry
+		id="nkr"
+		scope="I"
+		type="L"
+		name="Nukuoro" />
+	<iso_639_3_entry
+		id="nks"
+		scope="I"
+		type="L"
+		name="Asmat; North" />
+	<iso_639_3_entry
+		id="nkt"
+		scope="I"
+		type="L"
+		name="Nyika (Tanzania)" />
+	<iso_639_3_entry
+		id="nku"
+		scope="I"
+		type="L"
+		name="Kulango; Bouna" />
+	<iso_639_3_entry
+		id="nkv"
+		scope="I"
+		type="L"
+		name="Nyika (Malawi and Zambia)" />
+	<iso_639_3_entry
+		id="nkw"
+		scope="I"
+		type="L"
+		name="Nkutu" />
+	<iso_639_3_entry
+		id="nkx"
+		scope="I"
+		type="L"
+		name="Nkoroo" />
+	<iso_639_3_entry
+		id="nkz"
+		scope="I"
+		type="L"
+		name="Nkari" />
+	<iso_639_3_entry
+		id="nla"
+		scope="I"
+		type="L"
+		name="Ngombale" />
+	<iso_639_3_entry
+		id="nlc"
+		scope="I"
+		type="L"
+		name="Nalca" />
+	<iso_639_3_entry
+		id="nld"
+		part1_code="nl"
+		part2_code="dut"
+		scope="I"
+		type="L"
+		name="Dutch" />
+	<iso_639_3_entry
+		id="nle"
+		scope="I"
+		type="L"
+		name="Nyala; East" />
+	<iso_639_3_entry
+		id="nlg"
+		scope="I"
+		type="L"
+		name="Gela" />
+	<iso_639_3_entry
+		id="nli"
+		scope="I"
+		type="L"
+		name="Grangali" />
+	<iso_639_3_entry
+		id="nlj"
+		scope="I"
+		type="L"
+		name="Nyali" />
+	<iso_639_3_entry
+		id="nlk"
+		scope="I"
+		type="L"
+		name="Yali; Ninia" />
+	<iso_639_3_entry
+		id="nll"
+		scope="I"
+		type="L"
+		name="Nihali" />
+	<iso_639_3_entry
+		id="nln"
+		scope="I"
+		type="L"
+		name="Nahuatl; Durango" />
+	<iso_639_3_entry
+		id="nlo"
+		scope="I"
+		type="L"
+		name="Ngul" />
+	<iso_639_3_entry
+		id="nlr"
+		scope="I"
+		type="L"
+		name="Ngarla" />
+	<iso_639_3_entry
+		id="nlu"
+		scope="I"
+		type="L"
+		name="Nchumbulu" />
+	<iso_639_3_entry
+		id="nlv"
+		scope="I"
+		type="L"
+		name="Nahuatl; Orizaba" />
+	<iso_639_3_entry
+		id="nlx"
+		scope="I"
+		type="L"
+		name="Nahali" />
+	<iso_639_3_entry
+		id="nly"
+		scope="I"
+		type="L"
+		name="Nyamal" />
+	<iso_639_3_entry
+		id="nlz"
+		scope="I"
+		type="L"
+		name="Nalögo" />
+	<iso_639_3_entry
+		id="nma"
+		scope="I"
+		type="L"
+		name="Naga; Maram" />
+	<iso_639_3_entry
+		id="nmb"
+		scope="I"
+		type="L"
+		name="Nambas; Big" />
+	<iso_639_3_entry
+		id="nmc"
+		scope="I"
+		type="L"
+		name="Ngam" />
+	<iso_639_3_entry
+		id="nmd"
+		scope="I"
+		type="L"
+		name="Ndumu" />
+	<iso_639_3_entry
+		id="nme"
+		scope="I"
+		type="L"
+		name="Naga; Mzieme" />
+	<iso_639_3_entry
+		id="nmf"
+		scope="I"
+		type="L"
+		name="Naga; Tangkhul" />
+	<iso_639_3_entry
+		id="nmg"
+		scope="I"
+		type="L"
+		name="Kwasio" />
+	<iso_639_3_entry
+		id="nmh"
+		scope="I"
+		type="L"
+		name="Naga; Monsang" />
+	<iso_639_3_entry
+		id="nmi"
+		scope="I"
+		type="L"
+		name="Nyam" />
+	<iso_639_3_entry
+		id="nmj"
+		scope="I"
+		type="L"
+		name="Ngombe (Central African Republic)" />
+	<iso_639_3_entry
+		id="nmk"
+		scope="I"
+		type="L"
+		name="Namakura" />
+	<iso_639_3_entry
+		id="nml"
+		scope="I"
+		type="L"
+		name="Ndemli" />
+	<iso_639_3_entry
+		id="nmm"
+		scope="I"
+		type="L"
+		name="Manangba" />
+	<iso_639_3_entry
+		id="nmn"
+		scope="I"
+		type="L"
+		name="!Xóõ" />
+	<iso_639_3_entry
+		id="nmo"
+		scope="I"
+		type="L"
+		name="Naga; Moyon" />
+	<iso_639_3_entry
+		id="nmp"
+		scope="I"
+		type="E"
+		name="Nimanbur" />
+	<iso_639_3_entry
+		id="nmq"
+		scope="I"
+		type="L"
+		name="Nambya" />
+	<iso_639_3_entry
+		id="nmr"
+		scope="I"
+		type="E"
+		name="Nimbari" />
+	<iso_639_3_entry
+		id="nms"
+		scope="I"
+		type="L"
+		name="Letemboi" />
+	<iso_639_3_entry
+		id="nmt"
+		scope="I"
+		type="L"
+		name="Namonuito" />
+	<iso_639_3_entry
+		id="nmu"
+		scope="I"
+		type="L"
+		name="Maidu; Northeast" />
+	<iso_639_3_entry
+		id="nmv"
+		scope="I"
+		type="E"
+		name="Ngamini" />
+	<iso_639_3_entry
+		id="nmw"
+		scope="I"
+		type="L"
+		name="Nimoa" />
+	<iso_639_3_entry
+		id="nmx"
+		scope="I"
+		type="L"
+		name="Nama (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="nmy"
+		scope="I"
+		type="L"
+		name="Namuyi" />
+	<iso_639_3_entry
+		id="nmz"
+		scope="I"
+		type="L"
+		name="Nawdm" />
+	<iso_639_3_entry
+		id="nna"
+		scope="I"
+		type="L"
+		name="Nyangumarta" />
+	<iso_639_3_entry
+		id="nnb"
+		scope="I"
+		type="L"
+		name="Nande" />
+	<iso_639_3_entry
+		id="nnc"
+		scope="I"
+		type="L"
+		name="Nancere" />
+	<iso_639_3_entry
+		id="nnd"
+		scope="I"
+		type="L"
+		name="Ambae; West" />
+	<iso_639_3_entry
+		id="nne"
+		scope="I"
+		type="L"
+		name="Ngandyera" />
+	<iso_639_3_entry
+		id="nnf"
+		scope="I"
+		type="L"
+		name="Ngaing" />
+	<iso_639_3_entry
+		id="nng"
+		scope="I"
+		type="L"
+		name="Naga; Maring" />
+	<iso_639_3_entry
+		id="nnh"
+		scope="I"
+		type="L"
+		name="Ngiemboon" />
+	<iso_639_3_entry
+		id="nni"
+		scope="I"
+		type="L"
+		name="Nuaulu; North" />
+	<iso_639_3_entry
+		id="nnj"
+		scope="I"
+		type="L"
+		name="Nyangatom" />
+	<iso_639_3_entry
+		id="nnk"
+		scope="I"
+		type="L"
+		name="Nankina" />
+	<iso_639_3_entry
+		id="nnl"
+		scope="I"
+		type="L"
+		name="Naga; Northern Rengma" />
+	<iso_639_3_entry
+		id="nnm"
+		scope="I"
+		type="L"
+		name="Namia" />
+	<iso_639_3_entry
+		id="nnn"
+		scope="I"
+		type="L"
+		name="Ngete" />
+	<iso_639_3_entry
+		id="nno"
+		part1_code="nn"
+		part2_code="nno"
+		scope="I"
+		type="L"
+		name="Norwegian Nynorsk" />
+	<iso_639_3_entry
+		id="nnp"
+		scope="I"
+		type="L"
+		name="Naga; Wancho" />
+	<iso_639_3_entry
+		id="nnq"
+		scope="I"
+		type="L"
+		name="Ngindo" />
+	<iso_639_3_entry
+		id="nnr"
+		scope="I"
+		type="E"
+		name="Narungga" />
+	<iso_639_3_entry
+		id="nns"
+		scope="I"
+		type="L"
+		name="Ningye" />
+	<iso_639_3_entry
+		id="nnt"
+		scope="I"
+		type="E"
+		name="Nanticoke" />
+	<iso_639_3_entry
+		id="nnu"
+		scope="I"
+		type="L"
+		name="Dwang" />
+	<iso_639_3_entry
+		id="nnv"
+		scope="I"
+		type="E"
+		name="Nugunu (Australia)" />
+	<iso_639_3_entry
+		id="nnw"
+		scope="I"
+		type="L"
+		name="Nuni; Southern" />
+	<iso_639_3_entry
+		id="nnx"
+		scope="I"
+		type="L"
+		name="Ngong" />
+	<iso_639_3_entry
+		id="nny"
+		scope="I"
+		type="E"
+		name="Nyangga" />
+	<iso_639_3_entry
+		id="nnz"
+		scope="I"
+		type="L"
+		name="Nda'nda'" />
+	<iso_639_3_entry
+		id="noa"
+		scope="I"
+		type="L"
+		name="Woun Meu" />
+	<iso_639_3_entry
+		id="nob"
+		part1_code="nb"
+		part2_code="nob"
+		scope="I"
+		type="L"
+		name="Norwegian Bokmål" />
+	<iso_639_3_entry
+		id="noc"
+		scope="I"
+		type="L"
+		name="Nuk" />
+	<iso_639_3_entry
+		id="nod"
+		scope="I"
+		type="L"
+		name="Thai; Northern" />
+	<iso_639_3_entry
+		id="noe"
+		scope="I"
+		type="L"
+		name="Nimadi" />
+	<iso_639_3_entry
+		id="nof"
+		scope="I"
+		type="L"
+		name="Nomane" />
+	<iso_639_3_entry
+		id="nog"
+		part2_code="nog"
+		scope="I"
+		type="L"
+		name="Nogai" />
+	<iso_639_3_entry
+		id="noh"
+		scope="I"
+		type="L"
+		name="Nomu" />
+	<iso_639_3_entry
+		id="noi"
+		scope="I"
+		type="L"
+		name="Noiri" />
+	<iso_639_3_entry
+		id="noj"
+		scope="I"
+		type="L"
+		name="Nonuya" />
+	<iso_639_3_entry
+		id="nok"
+		scope="I"
+		type="E"
+		name="Nooksack" />
+	<iso_639_3_entry
+		id="nom"
+		scope="I"
+		type="E"
+		name="Nocamán" />
+	<iso_639_3_entry
+		id="non"
+		part2_code="non"
+		scope="I"
+		type="H"
+		name="Norse; Old" />
+	<iso_639_3_entry
+		id="nop"
+		scope="I"
+		type="L"
+		name="Numanggang" />
+	<iso_639_3_entry
+		id="noq"
+		scope="I"
+		type="L"
+		name="Ngongo" />
+	<iso_639_3_entry
+		id="nor"
+		part1_code="no"
+		part2_code="nor"
+		scope="M"
+		type="L"
+		name="Norwegian" />
+	<iso_639_3_entry
+		id="nos"
+		scope="I"
+		type="L"
+		name="Nisu; Eastern" />
+	<iso_639_3_entry
+		id="not"
+		scope="I"
+		type="L"
+		name="Nomatsiguenga" />
+	<iso_639_3_entry
+		id="nou"
+		scope="I"
+		type="L"
+		name="Ewage-Notu" />
+	<iso_639_3_entry
+		id="nov"
+		scope="I"
+		type="C"
+		name="Novial" />
+	<iso_639_3_entry
+		id="now"
+		scope="I"
+		type="L"
+		name="Nyambo" />
+	<iso_639_3_entry
+		id="noy"
+		scope="I"
+		type="L"
+		name="Noy" />
+	<iso_639_3_entry
+		id="noz"
+		scope="I"
+		type="L"
+		name="Nayi" />
+	<iso_639_3_entry
+		id="npa"
+		scope="I"
+		type="L"
+		name="Nar Phu" />
+	<iso_639_3_entry
+		id="npb"
+		scope="I"
+		type="L"
+		name="Nupbikha" />
+	<iso_639_3_entry
+		id="nph"
+		scope="I"
+		type="L"
+		name="Naga; Phom" />
+	<iso_639_3_entry
+		id="npl"
+		scope="I"
+		type="L"
+		name="Nahuatl; Southeastern Puebla" />
+	<iso_639_3_entry
+		id="npn"
+		scope="I"
+		type="L"
+		name="Mondropolon" />
+	<iso_639_3_entry
+		id="npo"
+		scope="I"
+		type="L"
+		name="Naga; Pochuri" />
+	<iso_639_3_entry
+		id="nps"
+		scope="I"
+		type="L"
+		name="Nipsan" />
+	<iso_639_3_entry
+		id="npu"
+		scope="I"
+		type="L"
+		name="Naga; Puimei" />
+	<iso_639_3_entry
+		id="npy"
+		scope="I"
+		type="L"
+		name="Napu" />
+	<iso_639_3_entry
+		id="nqg"
+		scope="I"
+		type="L"
+		name="Nago; Southern" />
+	<iso_639_3_entry
+		id="nqk"
+		scope="I"
+		type="L"
+		name="Ede Nago; Kura" />
+	<iso_639_3_entry
+		id="nqm"
+		scope="I"
+		type="L"
+		name="Ndom" />
+	<iso_639_3_entry
+		id="nqn"
+		scope="I"
+		type="L"
+		name="Nen" />
+	<iso_639_3_entry
+		id="nqo"
+		part2_code="nqo"
+		scope="I"
+		type="L"
+		name="N'Ko" />
+	<iso_639_3_entry
+		id="nra"
+		scope="I"
+		type="L"
+		name="Ngom" />
+	<iso_639_3_entry
+		id="nrb"
+		scope="I"
+		type="L"
+		name="Nara" />
+	<iso_639_3_entry
+		id="nrc"
+		scope="I"
+		type="A"
+		name="Noric" />
+	<iso_639_3_entry
+		id="nre"
+		scope="I"
+		type="L"
+		name="Naga; Southern Rengma" />
+	<iso_639_3_entry
+		id="nrg"
+		scope="I"
+		type="L"
+		name="Narango" />
+	<iso_639_3_entry
+		id="nri"
+		scope="I"
+		type="L"
+		name="Naga; Chokri" />
+	<iso_639_3_entry
+		id="nrl"
+		scope="I"
+		type="L"
+		name="Ngarluma" />
+	<iso_639_3_entry
+		id="nrm"
+		scope="I"
+		type="L"
+		name="Narom" />
+	<iso_639_3_entry
+		id="nrn"
+		scope="I"
+		type="E"
+		name="Norn" />
+	<iso_639_3_entry
+		id="nrp"
+		scope="I"
+		type="A"
+		name="Picene; North" />
+	<iso_639_3_entry
+		id="nrr"
+		scope="I"
+		type="L"
+		name="Norra" />
+	<iso_639_3_entry
+		id="nrt"
+		scope="I"
+		type="E"
+		name="Kalapuya; Northern" />
+	<iso_639_3_entry
+		id="nru"
+		scope="I"
+		type="L"
+		name="Narua" />
+	<iso_639_3_entry
+		id="nrx"
+		scope="I"
+		type="E"
+		name="Ngurmbur" />
+	<iso_639_3_entry
+		id="nrz"
+		scope="I"
+		type="L"
+		name="Lala" />
+	<iso_639_3_entry
+		id="nsa"
+		scope="I"
+		type="L"
+		name="Naga; Sangtam" />
+	<iso_639_3_entry
+		id="nsc"
+		scope="I"
+		type="L"
+		name="Nshi" />
+	<iso_639_3_entry
+		id="nsd"
+		scope="I"
+		type="L"
+		name="Nisu; Southern" />
+	<iso_639_3_entry
+		id="nse"
+		scope="I"
+		type="L"
+		name="Nsenga" />
+	<iso_639_3_entry
+		id="nsg"
+		scope="I"
+		type="L"
+		name="Ngasa" />
+	<iso_639_3_entry
+		id="nsh"
+		scope="I"
+		type="L"
+		name="Ngoshie" />
+	<iso_639_3_entry
+		id="nsi"
+		scope="I"
+		type="L"
+		name="Nigerian Sign Language" />
+	<iso_639_3_entry
+		id="nsk"
+		scope="I"
+		type="L"
+		name="Naskapi" />
+	<iso_639_3_entry
+		id="nsl"
+		scope="I"
+		type="L"
+		name="Norwegian Sign Language" />
+	<iso_639_3_entry
+		id="nsm"
+		scope="I"
+		type="L"
+		name="Naga; Sumi" />
+	<iso_639_3_entry
+		id="nsn"
+		scope="I"
+		type="L"
+		name="Nehan" />
+	<iso_639_3_entry
+		id="nso"
+		part2_code="nso"
+		scope="I"
+		type="L"
+		name="Sotho; Northern" />
+	<iso_639_3_entry
+		id="nsp"
+		scope="I"
+		type="L"
+		name="Nepalese Sign Language" />
+	<iso_639_3_entry
+		id="nsq"
+		scope="I"
+		type="L"
+		name="Miwok; Northern Sierra" />
+	<iso_639_3_entry
+		id="nsr"
+		scope="I"
+		type="L"
+		name="Maritime Sign Language" />
+	<iso_639_3_entry
+		id="nss"
+		scope="I"
+		type="L"
+		name="Nali" />
+	<iso_639_3_entry
+		id="nst"
+		scope="I"
+		type="L"
+		name="Naga; Tase" />
+	<iso_639_3_entry
+		id="nsu"
+		scope="I"
+		type="L"
+		name="Nahuatl; Sierra Negra" />
+	<iso_639_3_entry
+		id="nsv"
+		scope="I"
+		type="L"
+		name="Nisu; Southwestern" />
+	<iso_639_3_entry
+		id="nsw"
+		scope="I"
+		type="L"
+		name="Navut" />
+	<iso_639_3_entry
+		id="nsx"
+		scope="I"
+		type="L"
+		name="Nsongo" />
+	<iso_639_3_entry
+		id="nsy"
+		scope="I"
+		type="L"
+		name="Nasal" />
+	<iso_639_3_entry
+		id="nsz"
+		scope="I"
+		type="L"
+		name="Nisenan" />
+	<iso_639_3_entry
+		id="nte"
+		scope="I"
+		type="L"
+		name="Nathembo" />
+	<iso_639_3_entry
+		id="nti"
+		scope="I"
+		type="L"
+		name="Natioro" />
+	<iso_639_3_entry
+		id="ntj"
+		scope="I"
+		type="L"
+		name="Ngaanyatjarra" />
+	<iso_639_3_entry
+		id="ntk"
+		scope="I"
+		type="L"
+		name="Ikoma-Nata-Isenye" />
+	<iso_639_3_entry
+		id="ntm"
+		scope="I"
+		type="L"
+		name="Nateni" />
+	<iso_639_3_entry
+		id="nto"
+		scope="I"
+		type="L"
+		name="Ntomba" />
+	<iso_639_3_entry
+		id="ntp"
+		scope="I"
+		type="L"
+		name="Tepehuan; Northern" />
+	<iso_639_3_entry
+		id="ntr"
+		scope="I"
+		type="L"
+		name="Delo" />
+	<iso_639_3_entry
+		id="nts"
+		scope="I"
+		type="E"
+		name="Natagaimas" />
+	<iso_639_3_entry
+		id="ntu"
+		scope="I"
+		type="L"
+		name="Natügu" />
+	<iso_639_3_entry
+		id="ntw"
+		scope="I"
+		type="E"
+		name="Nottoway" />
+	<iso_639_3_entry
+		id="nty"
+		scope="I"
+		type="L"
+		name="Mantsi" />
+	<iso_639_3_entry
+		id="ntz"
+		scope="I"
+		type="L"
+		name="Natanzi" />
+	<iso_639_3_entry
+		id="nua"
+		scope="I"
+		type="L"
+		name="Yuaga" />
+	<iso_639_3_entry
+		id="nuc"
+		scope="I"
+		type="E"
+		name="Nukuini" />
+	<iso_639_3_entry
+		id="nud"
+		scope="I"
+		type="L"
+		name="Ngala" />
+	<iso_639_3_entry
+		id="nue"
+		scope="I"
+		type="L"
+		name="Ngundu" />
+	<iso_639_3_entry
+		id="nuf"
+		scope="I"
+		type="L"
+		name="Nusu" />
+	<iso_639_3_entry
+		id="nug"
+		scope="I"
+		type="E"
+		name="Nungali" />
+	<iso_639_3_entry
+		id="nuh"
+		scope="I"
+		type="L"
+		name="Ndunda" />
+	<iso_639_3_entry
+		id="nui"
+		scope="I"
+		type="L"
+		name="Ngumbi" />
+	<iso_639_3_entry
+		id="nuj"
+		scope="I"
+		type="L"
+		name="Nyole" />
+	<iso_639_3_entry
+		id="nuk"
+		scope="I"
+		type="L"
+		name="Nuu-chah-nulth" />
+	<iso_639_3_entry
+		id="nul"
+		scope="I"
+		type="L"
+		name="Nusa Laut" />
+	<iso_639_3_entry
+		id="num"
+		scope="I"
+		type="L"
+		name="Niuafo'ou" />
+	<iso_639_3_entry
+		id="nun"
+		scope="I"
+		type="L"
+		name="Anong" />
+	<iso_639_3_entry
+		id="nuo"
+		scope="I"
+		type="L"
+		name="Nguôn" />
+	<iso_639_3_entry
+		id="nup"
+		scope="I"
+		type="L"
+		name="Nupe-Nupe-Tako" />
+	<iso_639_3_entry
+		id="nuq"
+		scope="I"
+		type="L"
+		name="Nukumanu" />
+	<iso_639_3_entry
+		id="nur"
+		scope="I"
+		type="L"
+		name="Nukuria" />
+	<iso_639_3_entry
+		id="nus"
+		scope="I"
+		type="L"
+		name="Nuer" />
+	<iso_639_3_entry
+		id="nut"
+		scope="I"
+		type="L"
+		name="Nung (Viet Nam)" />
+	<iso_639_3_entry
+		id="nuu"
+		scope="I"
+		type="L"
+		name="Ngbundu" />
+	<iso_639_3_entry
+		id="nuv"
+		scope="I"
+		type="L"
+		name="Nuni; Northern" />
+	<iso_639_3_entry
+		id="nuw"
+		scope="I"
+		type="L"
+		name="Nguluwan" />
+	<iso_639_3_entry
+		id="nux"
+		scope="I"
+		type="L"
+		name="Mehek" />
+	<iso_639_3_entry
+		id="nuy"
+		scope="I"
+		type="L"
+		name="Nunggubuyu" />
+	<iso_639_3_entry
+		id="nuz"
+		scope="I"
+		type="L"
+		name="Nahuatl; Tlamacazapa" />
+	<iso_639_3_entry
+		id="nvh"
+		scope="I"
+		type="L"
+		name="Nasarian" />
+	<iso_639_3_entry
+		id="nvm"
+		scope="I"
+		type="L"
+		name="Namiae" />
+	<iso_639_3_entry
+		id="nwa"
+		scope="I"
+		type="E"
+		name="Nawathinehena" />
+	<iso_639_3_entry
+		id="nwb"
+		scope="I"
+		type="L"
+		name="Nyabwa" />
+	<iso_639_3_entry
+		id="nwc"
+		part2_code="nwc"
+		scope="I"
+		type="H"
+		name="Newari; Old" />
+	<iso_639_3_entry
+		id="nwe"
+		scope="I"
+		type="L"
+		name="Ngwe" />
+	<iso_639_3_entry
+		id="nwi"
+		scope="I"
+		type="L"
+		name="Tanna; Southwest" />
+	<iso_639_3_entry
+		id="nwm"
+		scope="I"
+		type="L"
+		name="Nyamusa-Molo" />
+	<iso_639_3_entry
+		id="nwr"
+		scope="I"
+		type="L"
+		name="Nawaru" />
+	<iso_639_3_entry
+		id="nwx"
+		scope="I"
+		type="H"
+		name="Newar; Middle" />
+	<iso_639_3_entry
+		id="nwy"
+		scope="I"
+		type="E"
+		name="Nottoway-Meherrin" />
+	<iso_639_3_entry
+		id="nxa"
+		scope="I"
+		type="L"
+		name="Nauete" />
+	<iso_639_3_entry
+		id="nxd"
+		scope="I"
+		type="L"
+		name="Ngando (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="nxe"
+		scope="I"
+		type="L"
+		name="Nage" />
+	<iso_639_3_entry
+		id="nxg"
+		scope="I"
+		type="L"
+		name="Ngad'a" />
+	<iso_639_3_entry
+		id="nxi"
+		scope="I"
+		type="L"
+		name="Nindi" />
+	<iso_639_3_entry
+		id="nxl"
+		scope="I"
+		type="L"
+		name="Nuaulu; South" />
+	<iso_639_3_entry
+		id="nxm"
+		scope="I"
+		type="A"
+		name="Numidian" />
+	<iso_639_3_entry
+		id="nxn"
+		scope="I"
+		type="E"
+		name="Ngawun" />
+	<iso_639_3_entry
+		id="nxq"
+		scope="I"
+		type="L"
+		name="Naxi" />
+	<iso_639_3_entry
+		id="nxr"
+		scope="I"
+		type="L"
+		name="Ninggerum" />
+	<iso_639_3_entry
+		id="nxu"
+		scope="I"
+		type="L"
+		name="Narau" />
+	<iso_639_3_entry
+		id="nxx"
+		scope="I"
+		type="L"
+		name="Nafri" />
+	<iso_639_3_entry
+		id="nya"
+		part1_code="ny"
+		part2_code="nya"
+		scope="I"
+		type="L"
+		name="Nyanja" />
+	<iso_639_3_entry
+		id="nyb"
+		scope="I"
+		type="L"
+		name="Nyangbo" />
+	<iso_639_3_entry
+		id="nyc"
+		scope="I"
+		type="L"
+		name="Nyanga-li" />
+	<iso_639_3_entry
+		id="nyd"
+		scope="I"
+		type="L"
+		name="Nyore" />
+	<iso_639_3_entry
+		id="nye"
+		scope="I"
+		type="L"
+		name="Nyengo" />
+	<iso_639_3_entry
+		id="nyf"
+		scope="I"
+		type="L"
+		name="Giryama" />
+	<iso_639_3_entry
+		id="nyg"
+		scope="I"
+		type="L"
+		name="Nyindu" />
+	<iso_639_3_entry
+		id="nyh"
+		scope="I"
+		type="L"
+		name="Nyigina" />
+	<iso_639_3_entry
+		id="nyi"
+		scope="I"
+		type="L"
+		name="Ama (Sudan)" />
+	<iso_639_3_entry
+		id="nyj"
+		scope="I"
+		type="L"
+		name="Nyanga" />
+	<iso_639_3_entry
+		id="nyk"
+		scope="I"
+		type="L"
+		name="Nyaneka" />
+	<iso_639_3_entry
+		id="nyl"
+		scope="I"
+		type="L"
+		name="Nyeu" />
+	<iso_639_3_entry
+		id="nym"
+		part2_code="nym"
+		scope="I"
+		type="L"
+		name="Nyamwezi" />
+	<iso_639_3_entry
+		id="nyn"
+		part2_code="nyn"
+		scope="I"
+		type="L"
+		name="Nyankole" />
+	<iso_639_3_entry
+		id="nyo"
+		part2_code="nyo"
+		scope="I"
+		type="L"
+		name="Nyoro" />
+	<iso_639_3_entry
+		id="nyp"
+		scope="I"
+		type="E"
+		name="Nyang'i" />
+	<iso_639_3_entry
+		id="nyq"
+		scope="I"
+		type="L"
+		name="Nayini" />
+	<iso_639_3_entry
+		id="nyr"
+		scope="I"
+		type="L"
+		name="Nyiha (Malawi)" />
+	<iso_639_3_entry
+		id="nys"
+		scope="I"
+		type="L"
+		name="Nyunga" />
+	<iso_639_3_entry
+		id="nyt"
+		scope="I"
+		type="E"
+		name="Nyawaygi" />
+	<iso_639_3_entry
+		id="nyu"
+		scope="I"
+		type="L"
+		name="Nyungwe" />
+	<iso_639_3_entry
+		id="nyv"
+		scope="I"
+		type="E"
+		name="Nyulnyul" />
+	<iso_639_3_entry
+		id="nyw"
+		scope="I"
+		type="L"
+		name="Nyaw" />
+	<iso_639_3_entry
+		id="nyx"
+		scope="I"
+		type="E"
+		name="Nganyaywana" />
+	<iso_639_3_entry
+		id="nyy"
+		scope="I"
+		type="L"
+		name="Nyakyusa-Ngonde" />
+	<iso_639_3_entry
+		id="nza"
+		scope="I"
+		type="L"
+		name="Mbembe; Tigon" />
+	<iso_639_3_entry
+		id="nzb"
+		scope="I"
+		type="L"
+		name="Njebi" />
+	<iso_639_3_entry
+		id="nzi"
+		part2_code="nzi"
+		scope="I"
+		type="L"
+		name="Nzima" />
+	<iso_639_3_entry
+		id="nzk"
+		scope="I"
+		type="L"
+		name="Nzakara" />
+	<iso_639_3_entry
+		id="nzm"
+		scope="I"
+		type="L"
+		name="Naga; Zeme" />
+	<iso_639_3_entry
+		id="nzs"
+		scope="I"
+		type="L"
+		name="New Zealand Sign Language" />
+	<iso_639_3_entry
+		id="nzu"
+		scope="I"
+		type="L"
+		name="Teke-Nzikou" />
+	<iso_639_3_entry
+		id="nzy"
+		scope="I"
+		type="L"
+		name="Nzakambay" />
+	<iso_639_3_entry
+		id="nzz"
+		scope="I"
+		type="L"
+		name="Dogon; Nanga Dama" />
+	<iso_639_3_entry
+		id="oaa"
+		scope="I"
+		type="L"
+		name="Orok" />
+	<iso_639_3_entry
+		id="oac"
+		scope="I"
+		type="L"
+		name="Oroch" />
+	<iso_639_3_entry
+		id="oar"
+		scope="I"
+		type="A"
+		name="Aramaic; Old (up to 700 BCE)" />
+	<iso_639_3_entry
+		id="oav"
+		scope="I"
+		type="H"
+		name="Avar; Old" />
+	<iso_639_3_entry
+		id="obi"
+		scope="I"
+		type="E"
+		name="Obispeño" />
+	<iso_639_3_entry
+		id="obk"
+		scope="I"
+		type="L"
+		name="Bontok; Southern" />
+	<iso_639_3_entry
+		id="obl"
+		scope="I"
+		type="L"
+		name="Oblo" />
+	<iso_639_3_entry
+		id="obm"
+		scope="I"
+		type="A"
+		name="Moabite" />
+	<iso_639_3_entry
+		id="obo"
+		scope="I"
+		type="L"
+		name="Manobo; Obo" />
+	<iso_639_3_entry
+		id="obr"
+		scope="I"
+		type="H"
+		name="Burmese; Old" />
+	<iso_639_3_entry
+		id="obt"
+		scope="I"
+		type="H"
+		name="Breton; Old" />
+	<iso_639_3_entry
+		id="obu"
+		scope="I"
+		type="L"
+		name="Obulom" />
+	<iso_639_3_entry
+		id="oca"
+		scope="I"
+		type="L"
+		name="Ocaina" />
+	<iso_639_3_entry
+		id="och"
+		scope="I"
+		type="A"
+		name="Chinese; Old" />
+	<iso_639_3_entry
+		id="oci"
+		part1_code="oc"
+		part2_code="oci"
+		scope="I"
+		type="L"
+		name="Occitan (post 1500)" />
+	<iso_639_3_entry
+		id="oco"
+		scope="I"
+		type="H"
+		name="Cornish; Old" />
+	<iso_639_3_entry
+		id="ocu"
+		scope="I"
+		type="L"
+		name="Matlatzinca; Atzingo" />
+	<iso_639_3_entry
+		id="oda"
+		scope="I"
+		type="L"
+		name="Odut" />
+	<iso_639_3_entry
+		id="odk"
+		scope="I"
+		type="L"
+		name="Od" />
+	<iso_639_3_entry
+		id="odt"
+		scope="I"
+		type="H"
+		name="Dutch; Old" />
+	<iso_639_3_entry
+		id="odu"
+		scope="I"
+		type="L"
+		name="Odual" />
+	<iso_639_3_entry
+		id="ofo"
+		scope="I"
+		type="E"
+		name="Ofo" />
+	<iso_639_3_entry
+		id="ofs"
+		scope="I"
+		type="H"
+		name="Frisian; Old" />
+	<iso_639_3_entry
+		id="ofu"
+		scope="I"
+		type="L"
+		name="Efutop" />
+	<iso_639_3_entry
+		id="ogb"
+		scope="I"
+		type="L"
+		name="Ogbia" />
+	<iso_639_3_entry
+		id="ogc"
+		scope="I"
+		type="L"
+		name="Ogbah" />
+	<iso_639_3_entry
+		id="oge"
+		scope="I"
+		type="H"
+		name="Georgian; Old" />
+	<iso_639_3_entry
+		id="ogg"
+		scope="I"
+		type="L"
+		name="Ogbogolo" />
+	<iso_639_3_entry
+		id="ogo"
+		scope="I"
+		type="L"
+		name="Khana" />
+	<iso_639_3_entry
+		id="ogu"
+		scope="I"
+		type="L"
+		name="Ogbronuagum" />
+	<iso_639_3_entry
+		id="oht"
+		scope="I"
+		type="A"
+		name="Hittite; Old" />
+	<iso_639_3_entry
+		id="ohu"
+		scope="I"
+		type="H"
+		name="Hungarian; Old" />
+	<iso_639_3_entry
+		id="oia"
+		scope="I"
+		type="L"
+		name="Oirata" />
+	<iso_639_3_entry
+		id="oin"
+		scope="I"
+		type="L"
+		name="One; Inebu" />
+	<iso_639_3_entry
+		id="ojb"
+		scope="I"
+		type="L"
+		name="Ojibwa; Northwestern" />
+	<iso_639_3_entry
+		id="ojc"
+		scope="I"
+		type="L"
+		name="Ojibwa; Central" />
+	<iso_639_3_entry
+		id="ojg"
+		scope="I"
+		type="L"
+		name="Ojibwa; Eastern" />
+	<iso_639_3_entry
+		id="oji"
+		part1_code="oj"
+		part2_code="oji"
+		scope="M"
+		type="L"
+		name="Ojibwa" />
+	<iso_639_3_entry
+		id="ojp"
+		scope="I"
+		type="H"
+		name="Japanese; Old" />
+	<iso_639_3_entry
+		id="ojs"
+		scope="I"
+		type="L"
+		name="Ojibwa; Severn" />
+	<iso_639_3_entry
+		id="ojv"
+		scope="I"
+		type="L"
+		name="Ontong Java" />
+	<iso_639_3_entry
+		id="ojw"
+		scope="I"
+		type="L"
+		name="Ojibwa; Western" />
+	<iso_639_3_entry
+		id="oka"
+		scope="I"
+		type="L"
+		name="Okanagan" />
+	<iso_639_3_entry
+		id="okb"
+		scope="I"
+		type="L"
+		name="Okobo" />
+	<iso_639_3_entry
+		id="okd"
+		scope="I"
+		type="L"
+		name="Okodia" />
+	<iso_639_3_entry
+		id="oke"
+		scope="I"
+		type="L"
+		name="Okpe (Southwestern Edo)" />
+	<iso_639_3_entry
+		id="okh"
+		scope="I"
+		type="L"
+		name="Koresh-e Rostam" />
+	<iso_639_3_entry
+		id="oki"
+		scope="I"
+		type="L"
+		name="Okiek" />
+	<iso_639_3_entry
+		id="okj"
+		scope="I"
+		type="E"
+		name="Oko-Juwoi" />
+	<iso_639_3_entry
+		id="okk"
+		scope="I"
+		type="L"
+		name="One; Kwamtim" />
+	<iso_639_3_entry
+		id="okl"
+		scope="I"
+		type="E"
+		name="Kentish Sign Language; Old" />
+	<iso_639_3_entry
+		id="okm"
+		scope="I"
+		type="H"
+		name="Korean; Middle (10th-16th cent.)" />
+	<iso_639_3_entry
+		id="okn"
+		scope="I"
+		type="L"
+		name="Oki-No-Erabu" />
+	<iso_639_3_entry
+		id="oko"
+		scope="I"
+		type="H"
+		name="Korean; Old (3rd-9th cent.)" />
+	<iso_639_3_entry
+		id="okr"
+		scope="I"
+		type="L"
+		name="Kirike" />
+	<iso_639_3_entry
+		id="oks"
+		scope="I"
+		type="L"
+		name="Oko-Eni-Osayen" />
+	<iso_639_3_entry
+		id="oku"
+		scope="I"
+		type="L"
+		name="Oku" />
+	<iso_639_3_entry
+		id="okv"
+		scope="I"
+		type="L"
+		name="Orokaiva" />
+	<iso_639_3_entry
+		id="okx"
+		scope="I"
+		type="L"
+		name="Okpe (Northwestern Edo)" />
+	<iso_639_3_entry
+		id="ola"
+		scope="I"
+		type="L"
+		name="Walungge" />
+	<iso_639_3_entry
+		id="old"
+		scope="I"
+		type="L"
+		name="Mochi" />
+	<iso_639_3_entry
+		id="ole"
+		scope="I"
+		type="L"
+		name="Olekha" />
+	<iso_639_3_entry
+		id="olm"
+		scope="I"
+		type="L"
+		name="Oloma" />
+	<iso_639_3_entry
+		id="olo"
+		scope="I"
+		type="L"
+		name="Livvi" />
+	<iso_639_3_entry
+		id="olr"
+		scope="I"
+		type="L"
+		name="Olrat" />
+	<iso_639_3_entry
+		id="oma"
+		scope="I"
+		type="L"
+		name="Omaha-Ponca" />
+	<iso_639_3_entry
+		id="omb"
+		scope="I"
+		type="L"
+		name="Ambae; East" />
+	<iso_639_3_entry
+		id="omc"
+		scope="I"
+		type="E"
+		name="Mochica" />
+	<iso_639_3_entry
+		id="ome"
+		scope="I"
+		type="E"
+		name="Omejes" />
+	<iso_639_3_entry
+		id="omg"
+		scope="I"
+		type="L"
+		name="Omagua" />
+	<iso_639_3_entry
+		id="omi"
+		scope="I"
+		type="L"
+		name="Omi" />
+	<iso_639_3_entry
+		id="omk"
+		scope="I"
+		type="E"
+		name="Omok" />
+	<iso_639_3_entry
+		id="oml"
+		scope="I"
+		type="L"
+		name="Ombo" />
+	<iso_639_3_entry
+		id="omn"
+		scope="I"
+		type="A"
+		name="Minoan" />
+	<iso_639_3_entry
+		id="omo"
+		scope="I"
+		type="L"
+		name="Utarmbung" />
+	<iso_639_3_entry
+		id="omp"
+		scope="I"
+		type="H"
+		name="Manipuri; Old" />
+	<iso_639_3_entry
+		id="omr"
+		scope="I"
+		type="H"
+		name="Marathi; Old" />
+	<iso_639_3_entry
+		id="omt"
+		scope="I"
+		type="L"
+		name="Omotik" />
+	<iso_639_3_entry
+		id="omu"
+		scope="I"
+		type="E"
+		name="Omurano" />
+	<iso_639_3_entry
+		id="omw"
+		scope="I"
+		type="L"
+		name="Tairora; South" />
+	<iso_639_3_entry
+		id="omx"
+		scope="I"
+		type="H"
+		name="Mon; Old" />
+	<iso_639_3_entry
+		id="ona"
+		scope="I"
+		type="L"
+		name="Ona" />
+	<iso_639_3_entry
+		id="onb"
+		scope="I"
+		type="L"
+		name="Lingao" />
+	<iso_639_3_entry
+		id="one"
+		scope="I"
+		type="L"
+		name="Oneida" />
+	<iso_639_3_entry
+		id="ong"
+		scope="I"
+		type="L"
+		name="Olo" />
+	<iso_639_3_entry
+		id="oni"
+		scope="I"
+		type="L"
+		name="Onin" />
+	<iso_639_3_entry
+		id="onj"
+		scope="I"
+		type="L"
+		name="Onjob" />
+	<iso_639_3_entry
+		id="onk"
+		scope="I"
+		type="L"
+		name="One; Kabore" />
+	<iso_639_3_entry
+		id="onn"
+		scope="I"
+		type="L"
+		name="Onobasulu" />
+	<iso_639_3_entry
+		id="ono"
+		scope="I"
+		type="L"
+		name="Onondaga" />
+	<iso_639_3_entry
+		id="onp"
+		scope="I"
+		type="L"
+		name="Sartang" />
+	<iso_639_3_entry
+		id="onr"
+		scope="I"
+		type="L"
+		name="One; Northern" />
+	<iso_639_3_entry
+		id="ons"
+		scope="I"
+		type="L"
+		name="Ono" />
+	<iso_639_3_entry
+		id="ont"
+		scope="I"
+		type="L"
+		name="Ontenu" />
+	<iso_639_3_entry
+		id="onu"
+		scope="I"
+		type="L"
+		name="Unua" />
+	<iso_639_3_entry
+		id="onw"
+		scope="I"
+		type="H"
+		name="Nubian; Old" />
+	<iso_639_3_entry
+		id="onx"
+		scope="I"
+		type="L"
+		name="Onin Based Pidgin" />
+	<iso_639_3_entry
+		id="ood"
+		scope="I"
+		type="L"
+		name="Tohono O'odham" />
+	<iso_639_3_entry
+		id="oog"
+		scope="I"
+		type="L"
+		name="Ong" />
+	<iso_639_3_entry
+		id="oon"
+		scope="I"
+		type="L"
+		name="Önge" />
+	<iso_639_3_entry
+		id="oor"
+		scope="I"
+		type="L"
+		name="Oorlams" />
+	<iso_639_3_entry
+		id="oos"
+		scope="I"
+		type="A"
+		name="Ossetic; Old" />
+	<iso_639_3_entry
+		id="opa"
+		scope="I"
+		type="L"
+		name="Okpamheri" />
+	<iso_639_3_entry
+		id="opk"
+		scope="I"
+		type="L"
+		name="Kopkaka" />
+	<iso_639_3_entry
+		id="opm"
+		scope="I"
+		type="L"
+		name="Oksapmin" />
+	<iso_639_3_entry
+		id="opo"
+		scope="I"
+		type="L"
+		name="Opao" />
+	<iso_639_3_entry
+		id="opt"
+		scope="I"
+		type="E"
+		name="Opata" />
+	<iso_639_3_entry
+		id="opy"
+		scope="I"
+		type="L"
+		name="Ofayé" />
+	<iso_639_3_entry
+		id="ora"
+		scope="I"
+		type="L"
+		name="Oroha" />
+	<iso_639_3_entry
+		id="orc"
+		scope="I"
+		type="L"
+		name="Orma" />
+	<iso_639_3_entry
+		id="ore"
+		scope="I"
+		type="L"
+		name="Orejón" />
+	<iso_639_3_entry
+		id="org"
+		scope="I"
+		type="L"
+		name="Oring" />
+	<iso_639_3_entry
+		id="orh"
+		scope="I"
+		type="L"
+		name="Oroqen" />
+	<iso_639_3_entry
+		id="ori"
+		part1_code="or"
+		part2_code="ori"
+		scope="I"
+		type="L"
+		name="Oriya" />
+	<iso_639_3_entry
+		id="orm"
+		part1_code="om"
+		part2_code="orm"
+		scope="M"
+		type="L"
+		name="Oromo" />
+	<iso_639_3_entry
+		id="orn"
+		scope="I"
+		type="L"
+		name="Orang Kanaq" />
+	<iso_639_3_entry
+		id="oro"
+		scope="I"
+		type="L"
+		name="Orokolo" />
+	<iso_639_3_entry
+		id="orr"
+		scope="I"
+		type="L"
+		name="Oruma" />
+	<iso_639_3_entry
+		id="ors"
+		scope="I"
+		type="L"
+		name="Orang Seletar" />
+	<iso_639_3_entry
+		id="ort"
+		scope="I"
+		type="L"
+		name="Oriya; Adivasi" />
+	<iso_639_3_entry
+		id="oru"
+		scope="I"
+		type="L"
+		name="Ormuri" />
+	<iso_639_3_entry
+		id="orv"
+		scope="I"
+		type="H"
+		name="Russian; Old" />
+	<iso_639_3_entry
+		id="orw"
+		scope="I"
+		type="L"
+		name="Oro Win" />
+	<iso_639_3_entry
+		id="orx"
+		scope="I"
+		type="L"
+		name="Oro" />
+	<iso_639_3_entry
+		id="orz"
+		scope="I"
+		type="L"
+		name="Ormu" />
+	<iso_639_3_entry
+		id="osa"
+		part2_code="osa"
+		scope="I"
+		type="L"
+		name="Osage" />
+	<iso_639_3_entry
+		id="osc"
+		scope="I"
+		type="A"
+		name="Oscan" />
+	<iso_639_3_entry
+		id="osi"
+		scope="I"
+		type="L"
+		name="Osing" />
+	<iso_639_3_entry
+		id="oso"
+		scope="I"
+		type="L"
+		name="Ososo" />
+	<iso_639_3_entry
+		id="osp"
+		scope="I"
+		type="H"
+		name="Spanish; Old" />
+	<iso_639_3_entry
+		id="oss"
+		part1_code="os"
+		part2_code="oss"
+		scope="I"
+		type="L"
+		name="Ossetian" />
+	<iso_639_3_entry
+		id="ost"
+		scope="I"
+		type="L"
+		name="Osatu" />
+	<iso_639_3_entry
+		id="osu"
+		scope="I"
+		type="L"
+		name="One; Southern" />
+	<iso_639_3_entry
+		id="osx"
+		scope="I"
+		type="H"
+		name="Saxon; Old" />
+	<iso_639_3_entry
+		id="ota"
+		part2_code="ota"
+		scope="I"
+		type="H"
+		name="Turkish; Ottoman (1500-1928)" />
+	<iso_639_3_entry
+		id="otb"
+		scope="I"
+		type="H"
+		name="Tibetan; Old" />
+	<iso_639_3_entry
+		id="otd"
+		scope="I"
+		type="L"
+		name="Ot Danum" />
+	<iso_639_3_entry
+		id="ote"
+		scope="I"
+		type="L"
+		name="Otomi; Mezquital" />
+	<iso_639_3_entry
+		id="oti"
+		scope="I"
+		type="E"
+		name="Oti" />
+	<iso_639_3_entry
+		id="otk"
+		scope="I"
+		type="H"
+		name="Turkish; Old" />
+	<iso_639_3_entry
+		id="otl"
+		scope="I"
+		type="L"
+		name="Otomi; Tilapa" />
+	<iso_639_3_entry
+		id="otm"
+		scope="I"
+		type="L"
+		name="Otomi; Eastern Highland" />
+	<iso_639_3_entry
+		id="otn"
+		scope="I"
+		type="L"
+		name="Otomi; Tenango" />
+	<iso_639_3_entry
+		id="otq"
+		scope="I"
+		type="L"
+		name="Otomi; Querétaro" />
+	<iso_639_3_entry
+		id="otr"
+		scope="I"
+		type="L"
+		name="Otoro" />
+	<iso_639_3_entry
+		id="ots"
+		scope="I"
+		type="L"
+		name="Otomi; Estado de México" />
+	<iso_639_3_entry
+		id="ott"
+		scope="I"
+		type="L"
+		name="Otomi; Temoaya" />
+	<iso_639_3_entry
+		id="otu"
+		scope="I"
+		type="E"
+		name="Otuke" />
+	<iso_639_3_entry
+		id="otw"
+		scope="I"
+		type="L"
+		name="Ottawa" />
+	<iso_639_3_entry
+		id="otx"
+		scope="I"
+		type="L"
+		name="Otomi; Texcatepec" />
+	<iso_639_3_entry
+		id="oty"
+		scope="I"
+		type="A"
+		name="Tamil; Old" />
+	<iso_639_3_entry
+		id="otz"
+		scope="I"
+		type="L"
+		name="Otomi; Ixtenco" />
+	<iso_639_3_entry
+		id="oua"
+		scope="I"
+		type="L"
+		name="Tagargrent" />
+	<iso_639_3_entry
+		id="oub"
+		scope="I"
+		type="L"
+		name="Glio-Oubi" />
+	<iso_639_3_entry
+		id="oue"
+		scope="I"
+		type="L"
+		name="Oune" />
+	<iso_639_3_entry
+		id="oui"
+		scope="I"
+		type="H"
+		name="Uighur; Old" />
+	<iso_639_3_entry
+		id="oum"
+		scope="I"
+		type="E"
+		name="Ouma" />
+	<iso_639_3_entry
+		id="oun"
+		scope="I"
+		type="L"
+		name="!O!ung" />
+	<iso_639_3_entry
+		id="owi"
+		scope="I"
+		type="L"
+		name="Owiniga" />
+	<iso_639_3_entry
+		id="owl"
+		scope="I"
+		type="H"
+		name="Welsh; Old" />
+	<iso_639_3_entry
+		id="oyb"
+		scope="I"
+		type="L"
+		name="Oy" />
+	<iso_639_3_entry
+		id="oyd"
+		scope="I"
+		type="L"
+		name="Oyda" />
+	<iso_639_3_entry
+		id="oym"
+		scope="I"
+		type="L"
+		name="Wayampi" />
+	<iso_639_3_entry
+		id="oyy"
+		scope="I"
+		type="L"
+		name="Oya'oya" />
+	<iso_639_3_entry
+		id="ozm"
+		scope="I"
+		type="L"
+		name="Koonzime" />
+	<iso_639_3_entry
+		id="pab"
+		scope="I"
+		type="L"
+		name="Parecís" />
+	<iso_639_3_entry
+		id="pac"
+		scope="I"
+		type="L"
+		name="Pacoh" />
+	<iso_639_3_entry
+		id="pad"
+		scope="I"
+		type="L"
+		name="Paumarí" />
+	<iso_639_3_entry
+		id="pae"
+		scope="I"
+		type="L"
+		name="Pagibete" />
+	<iso_639_3_entry
+		id="paf"
+		scope="I"
+		type="E"
+		name="Paranawát" />
+	<iso_639_3_entry
+		id="pag"
+		part2_code="pag"
+		scope="I"
+		type="L"
+		name="Pangasinan" />
+	<iso_639_3_entry
+		id="pah"
+		scope="I"
+		type="L"
+		name="Tenharim" />
+	<iso_639_3_entry
+		id="pai"
+		scope="I"
+		type="L"
+		name="Pe" />
+	<iso_639_3_entry
+		id="pak"
+		scope="I"
+		type="L"
+		name="Parakanã" />
+	<iso_639_3_entry
+		id="pal"
+		part2_code="pal"
+		scope="I"
+		type="A"
+		name="Pahlavi" />
+	<iso_639_3_entry
+		id="pam"
+		part2_code="pam"
+		scope="I"
+		type="L"
+		name="Pampanga" />
+	<iso_639_3_entry
+		id="pan"
+		part1_code="pa"
+		part2_code="pan"
+		scope="I"
+		type="L"
+		name="Panjabi" />
+	<iso_639_3_entry
+		id="pao"
+		scope="I"
+		type="L"
+		name="Paiute; Northern" />
+	<iso_639_3_entry
+		id="pap"
+		part2_code="pap"
+		scope="I"
+		type="L"
+		name="Papiamento" />
+	<iso_639_3_entry
+		id="paq"
+		scope="I"
+		type="L"
+		name="Parya" />
+	<iso_639_3_entry
+		id="par"
+		scope="I"
+		type="L"
+		name="Panamint" />
+	<iso_639_3_entry
+		id="pas"
+		scope="I"
+		type="L"
+		name="Papasena" />
+	<iso_639_3_entry
+		id="pat"
+		scope="I"
+		type="L"
+		name="Papitalai" />
+	<iso_639_3_entry
+		id="pau"
+		part2_code="pau"
+		scope="I"
+		type="L"
+		name="Palauan" />
+	<iso_639_3_entry
+		id="pav"
+		scope="I"
+		type="L"
+		name="Pakaásnovos" />
+	<iso_639_3_entry
+		id="paw"
+		scope="I"
+		type="L"
+		name="Pawnee" />
+	<iso_639_3_entry
+		id="pax"
+		scope="I"
+		type="E"
+		name="Pankararé" />
+	<iso_639_3_entry
+		id="pay"
+		scope="I"
+		type="L"
+		name="Pech" />
+	<iso_639_3_entry
+		id="paz"
+		scope="I"
+		type="E"
+		name="Pankararú" />
+	<iso_639_3_entry
+		id="pbb"
+		scope="I"
+		type="L"
+		name="Páez" />
+	<iso_639_3_entry
+		id="pbc"
+		scope="I"
+		type="L"
+		name="Patamona" />
+	<iso_639_3_entry
+		id="pbe"
+		scope="I"
+		type="L"
+		name="Popoloca; Mezontla" />
+	<iso_639_3_entry
+		id="pbf"
+		scope="I"
+		type="L"
+		name="Popoloca; Coyotepec" />
+	<iso_639_3_entry
+		id="pbg"
+		scope="I"
+		type="E"
+		name="Paraujano" />
+	<iso_639_3_entry
+		id="pbh"
+		scope="I"
+		type="L"
+		name="E'ñapa Woromaipu" />
+	<iso_639_3_entry
+		id="pbi"
+		scope="I"
+		type="L"
+		name="Parkwa" />
+	<iso_639_3_entry
+		id="pbl"
+		scope="I"
+		type="L"
+		name="Mak (Nigeria)" />
+	<iso_639_3_entry
+		id="pbn"
+		scope="I"
+		type="L"
+		name="Kpasam" />
+	<iso_639_3_entry
+		id="pbo"
+		scope="I"
+		type="L"
+		name="Papel" />
+	<iso_639_3_entry
+		id="pbp"
+		scope="I"
+		type="L"
+		name="Badyara" />
+	<iso_639_3_entry
+		id="pbr"
+		scope="I"
+		type="L"
+		name="Pangwa" />
+	<iso_639_3_entry
+		id="pbs"
+		scope="I"
+		type="L"
+		name="Pame; Central" />
+	<iso_639_3_entry
+		id="pbt"
+		scope="I"
+		type="L"
+		name="Pashto; Southern" />
+	<iso_639_3_entry
+		id="pbu"
+		scope="I"
+		type="L"
+		name="Pashto; Northern" />
+	<iso_639_3_entry
+		id="pbv"
+		scope="I"
+		type="L"
+		name="Pnar" />
+	<iso_639_3_entry
+		id="pby"
+		scope="I"
+		type="L"
+		name="Pyu" />
+	<iso_639_3_entry
+		id="pbz"
+		scope="I"
+		type="L"
+		name="Palu" />
+	<iso_639_3_entry
+		id="pca"
+		scope="I"
+		type="L"
+		name="Popoloca; Santa Inés Ahuatempan" />
+	<iso_639_3_entry
+		id="pcb"
+		scope="I"
+		type="L"
+		name="Pear" />
+	<iso_639_3_entry
+		id="pcc"
+		scope="I"
+		type="L"
+		name="Bouyei" />
+	<iso_639_3_entry
+		id="pcd"
+		scope="I"
+		type="L"
+		name="Picard" />
+	<iso_639_3_entry
+		id="pce"
+		scope="I"
+		type="L"
+		name="Palaung; Ruching" />
+	<iso_639_3_entry
+		id="pcf"
+		scope="I"
+		type="L"
+		name="Paliyan" />
+	<iso_639_3_entry
+		id="pcg"
+		scope="I"
+		type="L"
+		name="Paniya" />
+	<iso_639_3_entry
+		id="pch"
+		scope="I"
+		type="L"
+		name="Pardhan" />
+	<iso_639_3_entry
+		id="pci"
+		scope="I"
+		type="L"
+		name="Duruwa" />
+	<iso_639_3_entry
+		id="pcj"
+		scope="I"
+		type="L"
+		name="Parenga" />
+	<iso_639_3_entry
+		id="pck"
+		scope="I"
+		type="L"
+		name="Chin; Paite" />
+	<iso_639_3_entry
+		id="pcl"
+		scope="I"
+		type="L"
+		name="Pardhi" />
+	<iso_639_3_entry
+		id="pcm"
+		scope="I"
+		type="L"
+		name="Pidgin; Nigerian" />
+	<iso_639_3_entry
+		id="pcn"
+		scope="I"
+		type="L"
+		name="Piti" />
+	<iso_639_3_entry
+		id="pcp"
+		scope="I"
+		type="L"
+		name="Pacahuara" />
+	<iso_639_3_entry
+		id="pcr"
+		scope="I"
+		type="L"
+		name="Panang" />
+	<iso_639_3_entry
+		id="pcw"
+		scope="I"
+		type="L"
+		name="Pyapun" />
+	<iso_639_3_entry
+		id="pda"
+		scope="I"
+		type="L"
+		name="Anam" />
+	<iso_639_3_entry
+		id="pdc"
+		scope="I"
+		type="L"
+		name="German; Pennsylvania" />
+	<iso_639_3_entry
+		id="pdi"
+		scope="I"
+		type="L"
+		name="Pa Di" />
+	<iso_639_3_entry
+		id="pdn"
+		scope="I"
+		type="L"
+		name="Podena" />
+	<iso_639_3_entry
+		id="pdo"
+		scope="I"
+		type="L"
+		name="Padoe" />
+	<iso_639_3_entry
+		id="pdt"
+		scope="I"
+		type="L"
+		name="Plautdietsch" />
+	<iso_639_3_entry
+		id="pdu"
+		scope="I"
+		type="L"
+		name="Kayan" />
+	<iso_639_3_entry
+		id="pea"
+		scope="I"
+		type="L"
+		name="Indonesian; Peranakan" />
+	<iso_639_3_entry
+		id="peb"
+		scope="I"
+		type="E"
+		name="Pomo; Eastern" />
+	<iso_639_3_entry
+		id="ped"
+		scope="I"
+		type="L"
+		name="Mala (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="pee"
+		scope="I"
+		type="L"
+		name="Taje" />
+	<iso_639_3_entry
+		id="pef"
+		scope="I"
+		type="E"
+		name="Pomo; Northeastern" />
+	<iso_639_3_entry
+		id="peg"
+		scope="I"
+		type="L"
+		name="Pengo" />
+	<iso_639_3_entry
+		id="peh"
+		scope="I"
+		type="L"
+		name="Bonan" />
+	<iso_639_3_entry
+		id="pei"
+		scope="I"
+		type="L"
+		name="Chichimeca-Jonaz" />
+	<iso_639_3_entry
+		id="pej"
+		scope="I"
+		type="E"
+		name="Pomo; Northern" />
+	<iso_639_3_entry
+		id="pek"
+		scope="I"
+		type="L"
+		name="Penchal" />
+	<iso_639_3_entry
+		id="pel"
+		scope="I"
+		type="L"
+		name="Pekal" />
+	<iso_639_3_entry
+		id="pem"
+		scope="I"
+		type="L"
+		name="Phende" />
+	<iso_639_3_entry
+		id="peo"
+		part2_code="peo"
+		scope="I"
+		type="H"
+		name="Persian; Old (ca. 600-400 B.C.)" />
+	<iso_639_3_entry
+		id="pep"
+		scope="I"
+		type="L"
+		name="Kunja" />
+	<iso_639_3_entry
+		id="peq"
+		scope="I"
+		type="L"
+		name="Pomo; Southern" />
+	<iso_639_3_entry
+		id="pes"
+		scope="I"
+		type="L"
+		name="Persian; Iranian" />
+	<iso_639_3_entry
+		id="pev"
+		scope="I"
+		type="L"
+		name="Pémono" />
+	<iso_639_3_entry
+		id="pex"
+		scope="I"
+		type="L"
+		name="Petats" />
+	<iso_639_3_entry
+		id="pey"
+		scope="I"
+		type="L"
+		name="Petjo" />
+	<iso_639_3_entry
+		id="pez"
+		scope="I"
+		type="L"
+		name="Penan; Eastern" />
+	<iso_639_3_entry
+		id="pfa"
+		scope="I"
+		type="L"
+		name="Pááfang" />
+	<iso_639_3_entry
+		id="pfe"
+		scope="I"
+		type="L"
+		name="Peere" />
+	<iso_639_3_entry
+		id="pfl"
+		scope="I"
+		type="L"
+		name="Pfaelzisch" />
+	<iso_639_3_entry
+		id="pga"
+		scope="I"
+		type="L"
+		name="Creole Arabic; Sudanese" />
+	<iso_639_3_entry
+		id="pgg"
+		scope="I"
+		type="L"
+		name="Pangwali" />
+	<iso_639_3_entry
+		id="pgi"
+		scope="I"
+		type="L"
+		name="Pagi" />
+	<iso_639_3_entry
+		id="pgk"
+		scope="I"
+		type="L"
+		name="Rerep" />
+	<iso_639_3_entry
+		id="pgl"
+		scope="I"
+		type="A"
+		name="Irish; Primitive" />
+	<iso_639_3_entry
+		id="pgn"
+		scope="I"
+		type="A"
+		name="Paelignian" />
+	<iso_639_3_entry
+		id="pgs"
+		scope="I"
+		type="L"
+		name="Pangseng" />
+	<iso_639_3_entry
+		id="pgu"
+		scope="I"
+		type="L"
+		name="Pagu" />
+	<iso_639_3_entry
+		id="pgy"
+		scope="I"
+		type="L"
+		name="Pongyong" />
+	<iso_639_3_entry
+		id="pha"
+		scope="I"
+		type="L"
+		name="Pa-Hng" />
+	<iso_639_3_entry
+		id="phd"
+		scope="I"
+		type="L"
+		name="Phudagi" />
+	<iso_639_3_entry
+		id="phg"
+		scope="I"
+		type="L"
+		name="Phuong" />
+	<iso_639_3_entry
+		id="phh"
+		scope="I"
+		type="L"
+		name="Phukha" />
+	<iso_639_3_entry
+		id="phk"
+		scope="I"
+		type="L"
+		name="Phake" />
+	<iso_639_3_entry
+		id="phl"
+		scope="I"
+		type="L"
+		name="Phalura" />
+	<iso_639_3_entry
+		id="phm"
+		scope="I"
+		type="L"
+		name="Phimbi" />
+	<iso_639_3_entry
+		id="phn"
+		part2_code="phn"
+		scope="I"
+		type="A"
+		name="Phoenician" />
+	<iso_639_3_entry
+		id="pho"
+		scope="I"
+		type="L"
+		name="Phunoi" />
+	<iso_639_3_entry
+		id="phq"
+		scope="I"
+		type="L"
+		name="Phana'" />
+	<iso_639_3_entry
+		id="phr"
+		scope="I"
+		type="L"
+		name="Pahari-Potwari" />
+	<iso_639_3_entry
+		id="pht"
+		scope="I"
+		type="L"
+		name="Phu Thai" />
+	<iso_639_3_entry
+		id="phu"
+		scope="I"
+		type="L"
+		name="Phuan" />
+	<iso_639_3_entry
+		id="phv"
+		scope="I"
+		type="L"
+		name="Pahlavani" />
+	<iso_639_3_entry
+		id="phw"
+		scope="I"
+		type="L"
+		name="Phangduwali" />
+	<iso_639_3_entry
+		id="pia"
+		scope="I"
+		type="L"
+		name="Pima Bajo" />
+	<iso_639_3_entry
+		id="pib"
+		scope="I"
+		type="L"
+		name="Yine" />
+	<iso_639_3_entry
+		id="pic"
+		scope="I"
+		type="L"
+		name="Pinji" />
+	<iso_639_3_entry
+		id="pid"
+		scope="I"
+		type="L"
+		name="Piaroa" />
+	<iso_639_3_entry
+		id="pie"
+		scope="I"
+		type="E"
+		name="Piro" />
+	<iso_639_3_entry
+		id="pif"
+		scope="I"
+		type="L"
+		name="Pingelapese" />
+	<iso_639_3_entry
+		id="pig"
+		scope="I"
+		type="L"
+		name="Pisabo" />
+	<iso_639_3_entry
+		id="pih"
+		scope="I"
+		type="L"
+		name="Pitcairn-Norfolk" />
+	<iso_639_3_entry
+		id="pii"
+		scope="I"
+		type="L"
+		name="Pini" />
+	<iso_639_3_entry
+		id="pij"
+		scope="I"
+		type="E"
+		name="Pijao" />
+	<iso_639_3_entry
+		id="pil"
+		scope="I"
+		type="L"
+		name="Yom" />
+	<iso_639_3_entry
+		id="pim"
+		scope="I"
+		type="E"
+		name="Powhatan" />
+	<iso_639_3_entry
+		id="pin"
+		scope="I"
+		type="L"
+		name="Piame" />
+	<iso_639_3_entry
+		id="pio"
+		scope="I"
+		type="L"
+		name="Piapoco" />
+	<iso_639_3_entry
+		id="pip"
+		scope="I"
+		type="L"
+		name="Pero" />
+	<iso_639_3_entry
+		id="pir"
+		scope="I"
+		type="L"
+		name="Piratapuyo" />
+	<iso_639_3_entry
+		id="pis"
+		scope="I"
+		type="L"
+		name="Pijin" />
+	<iso_639_3_entry
+		id="pit"
+		scope="I"
+		type="E"
+		name="Pitta Pitta" />
+	<iso_639_3_entry
+		id="piu"
+		scope="I"
+		type="L"
+		name="Pintupi-Luritja" />
+	<iso_639_3_entry
+		id="piv"
+		scope="I"
+		type="L"
+		name="Pileni" />
+	<iso_639_3_entry
+		id="piw"
+		scope="I"
+		type="L"
+		name="Pimbwe" />
+	<iso_639_3_entry
+		id="pix"
+		scope="I"
+		type="L"
+		name="Piu" />
+	<iso_639_3_entry
+		id="piy"
+		scope="I"
+		type="L"
+		name="Piya-Kwonci" />
+	<iso_639_3_entry
+		id="piz"
+		scope="I"
+		type="L"
+		name="Pije" />
+	<iso_639_3_entry
+		id="pjt"
+		scope="I"
+		type="L"
+		name="Pitjantjatjara" />
+	<iso_639_3_entry
+		id="pka"
+		scope="I"
+		type="H"
+		name="Prākrit; Ardhamāgadhī" />
+	<iso_639_3_entry
+		id="pkb"
+		scope="I"
+		type="L"
+		name="Pokomo" />
+	<iso_639_3_entry
+		id="pkc"
+		scope="I"
+		type="E"
+		name="Paekche" />
+	<iso_639_3_entry
+		id="pkg"
+		scope="I"
+		type="L"
+		name="Pak-Tong" />
+	<iso_639_3_entry
+		id="pkh"
+		scope="I"
+		type="L"
+		name="Pankhu" />
+	<iso_639_3_entry
+		id="pkn"
+		scope="I"
+		type="L"
+		name="Pakanha" />
+	<iso_639_3_entry
+		id="pko"
+		scope="I"
+		type="L"
+		name="Pökoot" />
+	<iso_639_3_entry
+		id="pkp"
+		scope="I"
+		type="L"
+		name="Pukapuka" />
+	<iso_639_3_entry
+		id="pkr"
+		scope="I"
+		type="L"
+		name="Kurumba; Attapady" />
+	<iso_639_3_entry
+		id="pks"
+		scope="I"
+		type="L"
+		name="Pakistan Sign Language" />
+	<iso_639_3_entry
+		id="pkt"
+		scope="I"
+		type="L"
+		name="Maleng" />
+	<iso_639_3_entry
+		id="pku"
+		scope="I"
+		type="L"
+		name="Paku" />
+	<iso_639_3_entry
+		id="pla"
+		scope="I"
+		type="L"
+		name="Miani" />
+	<iso_639_3_entry
+		id="plb"
+		scope="I"
+		type="L"
+		name="Polonombauk" />
+	<iso_639_3_entry
+		id="plc"
+		scope="I"
+		type="L"
+		name="Palawano; Central" />
+	<iso_639_3_entry
+		id="pld"
+		scope="I"
+		type="L"
+		name="Polari" />
+	<iso_639_3_entry
+		id="ple"
+		scope="I"
+		type="L"
+		name="Palu'e" />
+	<iso_639_3_entry
+		id="plg"
+		scope="I"
+		type="L"
+		name="Pilagá" />
+	<iso_639_3_entry
+		id="plh"
+		scope="I"
+		type="L"
+		name="Paulohi" />
+	<iso_639_3_entry
+		id="pli"
+		part1_code="pi"
+		part2_code="pli"
+		scope="I"
+		type="A"
+		name="Pali" />
+	<iso_639_3_entry
+		id="plj"
+		scope="I"
+		type="L"
+		name="Polci" />
+	<iso_639_3_entry
+		id="plk"
+		scope="I"
+		type="L"
+		name="Shina; Kohistani" />
+	<iso_639_3_entry
+		id="pll"
+		scope="I"
+		type="L"
+		name="Palaung; Shwe" />
+	<iso_639_3_entry
+		id="pln"
+		scope="I"
+		type="L"
+		name="Palenquero" />
+	<iso_639_3_entry
+		id="plo"
+		scope="I"
+		type="L"
+		name="Popoluca; Oluta" />
+	<iso_639_3_entry
+		id="plp"
+		scope="I"
+		type="L"
+		name="Palpa" />
+	<iso_639_3_entry
+		id="plq"
+		scope="I"
+		type="A"
+		name="Palaic" />
+	<iso_639_3_entry
+		id="plr"
+		scope="I"
+		type="L"
+		name="Senoufo; Palaka" />
+	<iso_639_3_entry
+		id="pls"
+		scope="I"
+		type="L"
+		name="Popoloca; San Marcos Tlalcoyalco" />
+	<iso_639_3_entry
+		id="plt"
+		scope="I"
+		type="L"
+		name="Malagasy; Plateau" />
+	<iso_639_3_entry
+		id="plu"
+		scope="I"
+		type="L"
+		name="Palikúr" />
+	<iso_639_3_entry
+		id="plv"
+		scope="I"
+		type="L"
+		name="Palawano; Southwest" />
+	<iso_639_3_entry
+		id="plw"
+		scope="I"
+		type="L"
+		name="Palawano; Brooke's Point" />
+	<iso_639_3_entry
+		id="ply"
+		scope="I"
+		type="L"
+		name="Bolyu" />
+	<iso_639_3_entry
+		id="plz"
+		scope="I"
+		type="L"
+		name="Paluan" />
+	<iso_639_3_entry
+		id="pma"
+		scope="I"
+		type="L"
+		name="Paama" />
+	<iso_639_3_entry
+		id="pmb"
+		scope="I"
+		type="L"
+		name="Pambia" />
+	<iso_639_3_entry
+		id="pmc"
+		scope="I"
+		type="E"
+		name="Palumata" />
+	<iso_639_3_entry
+		id="pme"
+		scope="I"
+		type="L"
+		name="Pwaamei" />
+	<iso_639_3_entry
+		id="pmf"
+		scope="I"
+		type="L"
+		name="Pamona" />
+	<iso_639_3_entry
+		id="pmh"
+		scope="I"
+		type="H"
+		name="Prākrit; Māhārāṣṭri" />
+	<iso_639_3_entry
+		id="pmi"
+		scope="I"
+		type="L"
+		name="Pumi; Northern" />
+	<iso_639_3_entry
+		id="pmj"
+		scope="I"
+		type="L"
+		name="Pumi; Southern" />
+	<iso_639_3_entry
+		id="pmk"
+		scope="I"
+		type="E"
+		name="Pamlico" />
+	<iso_639_3_entry
+		id="pml"
+		scope="I"
+		type="E"
+		name="Lingua Franca" />
+	<iso_639_3_entry
+		id="pmm"
+		scope="I"
+		type="L"
+		name="Pomo" />
+	<iso_639_3_entry
+		id="pmn"
+		scope="I"
+		type="L"
+		name="Pam" />
+	<iso_639_3_entry
+		id="pmo"
+		scope="I"
+		type="L"
+		name="Pom" />
+	<iso_639_3_entry
+		id="pmq"
+		scope="I"
+		type="L"
+		name="Pame; Northern" />
+	<iso_639_3_entry
+		id="pmr"
+		scope="I"
+		type="L"
+		name="Paynamar" />
+	<iso_639_3_entry
+		id="pms"
+		scope="I"
+		type="L"
+		name="Piemontese" />
+	<iso_639_3_entry
+		id="pmt"
+		scope="I"
+		type="L"
+		name="Tuamotuan" />
+	<iso_639_3_entry
+		id="pmu"
+		scope="I"
+		type="L"
+		name="Panjabi; Mirpur" />
+	<iso_639_3_entry
+		id="pmw"
+		scope="I"
+		type="L"
+		name="Miwok; Plains" />
+	<iso_639_3_entry
+		id="pmx"
+		scope="I"
+		type="L"
+		name="Naga; Poumei" />
+	<iso_639_3_entry
+		id="pmy"
+		scope="I"
+		type="L"
+		name="Malay; Papuan" />
+	<iso_639_3_entry
+		id="pmz"
+		scope="I"
+		type="E"
+		name="Pame; Southern" />
+	<iso_639_3_entry
+		id="pna"
+		scope="I"
+		type="L"
+		name="Punan Bah-Biau" />
+	<iso_639_3_entry
+		id="pnb"
+		scope="I"
+		type="L"
+		name="Panjabi; Western" />
+	<iso_639_3_entry
+		id="pnc"
+		scope="I"
+		type="L"
+		name="Pannei" />
+	<iso_639_3_entry
+		id="pne"
+		scope="I"
+		type="L"
+		name="Penan; Western" />
+	<iso_639_3_entry
+		id="png"
+		scope="I"
+		type="L"
+		name="Pongu" />
+	<iso_639_3_entry
+		id="pnh"
+		scope="I"
+		type="L"
+		name="Penrhyn" />
+	<iso_639_3_entry
+		id="pni"
+		scope="I"
+		type="L"
+		name="Aoheng" />
+	<iso_639_3_entry
+		id="pnm"
+		scope="I"
+		type="L"
+		name="Punan Batu 1" />
+	<iso_639_3_entry
+		id="pnn"
+		scope="I"
+		type="L"
+		name="Pinai-Hagahai" />
+	<iso_639_3_entry
+		id="pno"
+		scope="I"
+		type="E"
+		name="Panobo" />
+	<iso_639_3_entry
+		id="pnp"
+		scope="I"
+		type="L"
+		name="Pancana" />
+	<iso_639_3_entry
+		id="pnq"
+		scope="I"
+		type="L"
+		name="Pana (Burkina Faso)" />
+	<iso_639_3_entry
+		id="pnr"
+		scope="I"
+		type="L"
+		name="Panim" />
+	<iso_639_3_entry
+		id="pns"
+		scope="I"
+		type="L"
+		name="Ponosakan" />
+	<iso_639_3_entry
+		id="pnt"
+		scope="I"
+		type="L"
+		name="Pontic" />
+	<iso_639_3_entry
+		id="pnu"
+		scope="I"
+		type="L"
+		name="Bunu; Jiongnai" />
+	<iso_639_3_entry
+		id="pnv"
+		scope="I"
+		type="L"
+		name="Pinigura" />
+	<iso_639_3_entry
+		id="pnw"
+		scope="I"
+		type="L"
+		name="Panytyima" />
+	<iso_639_3_entry
+		id="pnx"
+		scope="I"
+		type="L"
+		name="Phong-Kniang" />
+	<iso_639_3_entry
+		id="pny"
+		scope="I"
+		type="L"
+		name="Pinyin" />
+	<iso_639_3_entry
+		id="pnz"
+		scope="I"
+		type="L"
+		name="Pana (Central African Republic)" />
+	<iso_639_3_entry
+		id="poc"
+		scope="I"
+		type="L"
+		name="Poqomam" />
+	<iso_639_3_entry
+		id="pod"
+		scope="I"
+		type="E"
+		name="Ponares" />
+	<iso_639_3_entry
+		id="poe"
+		scope="I"
+		type="L"
+		name="Popoloca; San Juan Atzingo" />
+	<iso_639_3_entry
+		id="pof"
+		scope="I"
+		type="L"
+		name="Poke" />
+	<iso_639_3_entry
+		id="pog"
+		scope="I"
+		type="E"
+		name="Potiguára" />
+	<iso_639_3_entry
+		id="poh"
+		scope="I"
+		type="L"
+		name="Poqomchi'" />
+	<iso_639_3_entry
+		id="poi"
+		scope="I"
+		type="L"
+		name="Popoluca; Highland" />
+	<iso_639_3_entry
+		id="pok"
+		scope="I"
+		type="L"
+		name="Pokangá" />
+	<iso_639_3_entry
+		id="pol"
+		part1_code="pl"
+		part2_code="pol"
+		scope="I"
+		type="L"
+		name="Polish" />
+	<iso_639_3_entry
+		id="pom"
+		scope="I"
+		type="L"
+		name="Pomo; Southeastern" />
+	<iso_639_3_entry
+		id="pon"
+		part2_code="pon"
+		scope="I"
+		type="L"
+		name="Pohnpeian" />
+	<iso_639_3_entry
+		id="poo"
+		scope="I"
+		type="L"
+		name="Pomo; Central" />
+	<iso_639_3_entry
+		id="pop"
+		scope="I"
+		type="L"
+		name="Pwapwa" />
+	<iso_639_3_entry
+		id="poq"
+		scope="I"
+		type="L"
+		name="Popoluca; Texistepec" />
+	<iso_639_3_entry
+		id="por"
+		part1_code="pt"
+		part2_code="por"
+		scope="I"
+		type="L"
+		name="Portuguese" />
+	<iso_639_3_entry
+		id="pos"
+		scope="I"
+		type="L"
+		name="Popoluca; Sayula" />
+	<iso_639_3_entry
+		id="pot"
+		scope="I"
+		type="L"
+		name="Potawatomi" />
+	<iso_639_3_entry
+		id="pov"
+		scope="I"
+		type="L"
+		name="Crioulo; Upper Guinea" />
+	<iso_639_3_entry
+		id="pow"
+		scope="I"
+		type="L"
+		name="Popoloca; San Felipe Otlaltepec" />
+	<iso_639_3_entry
+		id="pox"
+		scope="I"
+		type="E"
+		name="Polabian" />
+	<iso_639_3_entry
+		id="poy"
+		scope="I"
+		type="L"
+		name="Pogolo" />
+	<iso_639_3_entry
+		id="ppa"
+		scope="I"
+		type="L"
+		name="Pao" />
+	<iso_639_3_entry
+		id="ppe"
+		scope="I"
+		type="L"
+		name="Papi" />
+	<iso_639_3_entry
+		id="ppi"
+		scope="I"
+		type="L"
+		name="Paipai" />
+	<iso_639_3_entry
+		id="ppk"
+		scope="I"
+		type="L"
+		name="Uma" />
+	<iso_639_3_entry
+		id="ppl"
+		scope="I"
+		type="L"
+		name="Pipil" />
+	<iso_639_3_entry
+		id="ppm"
+		scope="I"
+		type="L"
+		name="Papuma" />
+	<iso_639_3_entry
+		id="ppn"
+		scope="I"
+		type="L"
+		name="Papapana" />
+	<iso_639_3_entry
+		id="ppo"
+		scope="I"
+		type="L"
+		name="Folopa" />
+	<iso_639_3_entry
+		id="ppp"
+		scope="I"
+		type="L"
+		name="Pelende" />
+	<iso_639_3_entry
+		id="ppq"
+		scope="I"
+		type="L"
+		name="Pei" />
+	<iso_639_3_entry
+		id="ppr"
+		scope="I"
+		type="L"
+		name="Piru" />
+	<iso_639_3_entry
+		id="pps"
+		scope="I"
+		type="L"
+		name="Popoloca; San Luís Temalacayuca" />
+	<iso_639_3_entry
+		id="ppt"
+		scope="I"
+		type="L"
+		name="Pare" />
+	<iso_639_3_entry
+		id="ppu"
+		scope="I"
+		type="E"
+		name="Papora" />
+	<iso_639_3_entry
+		id="pqa"
+		scope="I"
+		type="L"
+		name="Pa'a" />
+	<iso_639_3_entry
+		id="pqm"
+		scope="I"
+		type="L"
+		name="Malecite-Passamaquoddy" />
+	<iso_639_3_entry
+		id="prb"
+		scope="I"
+		type="L"
+		name="Lua'" />
+	<iso_639_3_entry
+		id="prc"
+		scope="I"
+		type="L"
+		name="Parachi" />
+	<iso_639_3_entry
+		id="prd"
+		scope="I"
+		type="L"
+		name="Parsi-Dari" />
+	<iso_639_3_entry
+		id="pre"
+		scope="I"
+		type="L"
+		name="Principense" />
+	<iso_639_3_entry
+		id="prf"
+		scope="I"
+		type="L"
+		name="Paranan" />
+	<iso_639_3_entry
+		id="prg"
+		scope="I"
+		type="L"
+		name="Prussian" />
+	<iso_639_3_entry
+		id="prh"
+		scope="I"
+		type="L"
+		name="Porohanon" />
+	<iso_639_3_entry
+		id="pri"
+		scope="I"
+		type="L"
+		name="Paicî" />
+	<iso_639_3_entry
+		id="prk"
+		scope="I"
+		type="L"
+		name="Parauk" />
+	<iso_639_3_entry
+		id="prl"
+		scope="I"
+		type="L"
+		name="Peruvian Sign Language" />
+	<iso_639_3_entry
+		id="prm"
+		scope="I"
+		type="L"
+		name="Kibiri" />
+	<iso_639_3_entry
+		id="prn"
+		scope="I"
+		type="L"
+		name="Prasuni" />
+	<iso_639_3_entry
+		id="pro"
+		part2_code="pro"
+		scope="I"
+		type="H"
+		name="Provençal; Old (to 1500)" />
+	<iso_639_3_entry
+		id="prp"
+		scope="I"
+		type="L"
+		name="Parsi" />
+	<iso_639_3_entry
+		id="prq"
+		scope="I"
+		type="L"
+		name="Ashéninka Perené" />
+	<iso_639_3_entry
+		id="prr"
+		scope="I"
+		type="E"
+		name="Puri" />
+	<iso_639_3_entry
+		id="prs"
+		scope="I"
+		type="L"
+		name="Persian; Afghan" />
+	<iso_639_3_entry
+		id="prt"
+		scope="I"
+		type="L"
+		name="Phai" />
+	<iso_639_3_entry
+		id="pru"
+		scope="I"
+		type="L"
+		name="Puragi" />
+	<iso_639_3_entry
+		id="prw"
+		scope="I"
+		type="L"
+		name="Parawen" />
+	<iso_639_3_entry
+		id="prx"
+		scope="I"
+		type="L"
+		name="Purik" />
+	<iso_639_3_entry
+		id="pry"
+		scope="I"
+		type="L"
+		name="Pray 3" />
+	<iso_639_3_entry
+		id="prz"
+		scope="I"
+		type="L"
+		name="Providencia Sign Language" />
+	<iso_639_3_entry
+		id="psa"
+		scope="I"
+		type="L"
+		name="Awyu; Asue" />
+	<iso_639_3_entry
+		id="psc"
+		scope="I"
+		type="L"
+		name="Persian Sign Language" />
+	<iso_639_3_entry
+		id="psd"
+		scope="I"
+		type="L"
+		name="Plains Indian Sign Language" />
+	<iso_639_3_entry
+		id="pse"
+		scope="I"
+		type="L"
+		name="Malay; Central" />
+	<iso_639_3_entry
+		id="psg"
+		scope="I"
+		type="L"
+		name="Penang Sign Language" />
+	<iso_639_3_entry
+		id="psh"
+		scope="I"
+		type="L"
+		name="Pashayi; Southwest" />
+	<iso_639_3_entry
+		id="psi"
+		scope="I"
+		type="L"
+		name="Pashayi; Southeast" />
+	<iso_639_3_entry
+		id="psl"
+		scope="I"
+		type="L"
+		name="Puerto Rican Sign Language" />
+	<iso_639_3_entry
+		id="psm"
+		scope="I"
+		type="E"
+		name="Pauserna" />
+	<iso_639_3_entry
+		id="psn"
+		scope="I"
+		type="L"
+		name="Panasuan" />
+	<iso_639_3_entry
+		id="pso"
+		scope="I"
+		type="L"
+		name="Polish Sign Language" />
+	<iso_639_3_entry
+		id="psp"
+		scope="I"
+		type="L"
+		name="Philippine Sign Language" />
+	<iso_639_3_entry
+		id="psq"
+		scope="I"
+		type="L"
+		name="Pasi" />
+	<iso_639_3_entry
+		id="psr"
+		scope="I"
+		type="L"
+		name="Portuguese Sign Language" />
+	<iso_639_3_entry
+		id="pss"
+		scope="I"
+		type="L"
+		name="Kaulong" />
+	<iso_639_3_entry
+		id="pst"
+		scope="I"
+		type="L"
+		name="Pashto; Central" />
+	<iso_639_3_entry
+		id="psu"
+		scope="I"
+		type="H"
+		name="Prākrit; Sauraseni" />
+	<iso_639_3_entry
+		id="psw"
+		scope="I"
+		type="L"
+		name="Port Sandwich" />
+	<iso_639_3_entry
+		id="psy"
+		scope="I"
+		type="E"
+		name="Piscataway" />
+	<iso_639_3_entry
+		id="pta"
+		scope="I"
+		type="L"
+		name="Pai Tavytera" />
+	<iso_639_3_entry
+		id="pth"
+		scope="I"
+		type="E"
+		name="Pataxó Hã-Ha-Hãe" />
+	<iso_639_3_entry
+		id="pti"
+		scope="I"
+		type="L"
+		name="Pintiini" />
+	<iso_639_3_entry
+		id="ptn"
+		scope="I"
+		type="L"
+		name="Patani" />
+	<iso_639_3_entry
+		id="pto"
+		scope="I"
+		type="L"
+		name="Zo'é" />
+	<iso_639_3_entry
+		id="ptp"
+		scope="I"
+		type="L"
+		name="Patep" />
+	<iso_639_3_entry
+		id="ptr"
+		scope="I"
+		type="L"
+		name="Piamatsina" />
+	<iso_639_3_entry
+		id="ptt"
+		scope="I"
+		type="L"
+		name="Enrekang" />
+	<iso_639_3_entry
+		id="ptu"
+		scope="I"
+		type="L"
+		name="Bambam" />
+	<iso_639_3_entry
+		id="ptv"
+		scope="I"
+		type="L"
+		name="Port Vato" />
+	<iso_639_3_entry
+		id="ptw"
+		scope="I"
+		type="E"
+		name="Pentlatch" />
+	<iso_639_3_entry
+		id="pty"
+		scope="I"
+		type="L"
+		name="Pathiya" />
+	<iso_639_3_entry
+		id="pua"
+		scope="I"
+		type="L"
+		name="Purepecha; Western Highland" />
+	<iso_639_3_entry
+		id="pub"
+		scope="I"
+		type="L"
+		name="Purum" />
+	<iso_639_3_entry
+		id="puc"
+		scope="I"
+		type="L"
+		name="Punan Merap" />
+	<iso_639_3_entry
+		id="pud"
+		scope="I"
+		type="L"
+		name="Punan Aput" />
+	<iso_639_3_entry
+		id="pue"
+		scope="I"
+		type="L"
+		name="Puelche" />
+	<iso_639_3_entry
+		id="puf"
+		scope="I"
+		type="L"
+		name="Punan Merah" />
+	<iso_639_3_entry
+		id="pug"
+		scope="I"
+		type="L"
+		name="Phuie" />
+	<iso_639_3_entry
+		id="pui"
+		scope="I"
+		type="L"
+		name="Puinave" />
+	<iso_639_3_entry
+		id="puj"
+		scope="I"
+		type="L"
+		name="Punan Tubu" />
+	<iso_639_3_entry
+		id="puk"
+		scope="I"
+		type="L"
+		name="Pu Ko" />
+	<iso_639_3_entry
+		id="pum"
+		scope="I"
+		type="L"
+		name="Puma" />
+	<iso_639_3_entry
+		id="puo"
+		scope="I"
+		type="L"
+		name="Puoc" />
+	<iso_639_3_entry
+		id="pup"
+		scope="I"
+		type="L"
+		name="Pulabu" />
+	<iso_639_3_entry
+		id="puq"
+		scope="I"
+		type="E"
+		name="Puquina" />
+	<iso_639_3_entry
+		id="pur"
+		scope="I"
+		type="L"
+		name="Puruborá" />
+	<iso_639_3_entry
+		id="pus"
+		part1_code="ps"
+		part2_code="pus"
+		scope="M"
+		type="L"
+		name="Pushto" />
+	<iso_639_3_entry
+		id="put"
+		scope="I"
+		type="L"
+		name="Putoh" />
+	<iso_639_3_entry
+		id="puu"
+		scope="I"
+		type="L"
+		name="Punu" />
+	<iso_639_3_entry
+		id="puw"
+		scope="I"
+		type="L"
+		name="Puluwatese" />
+	<iso_639_3_entry
+		id="pux"
+		scope="I"
+		type="L"
+		name="Puare" />
+	<iso_639_3_entry
+		id="puy"
+		scope="I"
+		type="E"
+		name="Purisimeño" />
+	<iso_639_3_entry
+		id="puz"
+		scope="I"
+		type="L"
+		name="Naga; Purum" />
+	<iso_639_3_entry
+		id="pwa"
+		scope="I"
+		type="L"
+		name="Pawaia" />
+	<iso_639_3_entry
+		id="pwb"
+		scope="I"
+		type="L"
+		name="Panawa" />
+	<iso_639_3_entry
+		id="pwg"
+		scope="I"
+		type="L"
+		name="Gapapaiwa" />
+	<iso_639_3_entry
+		id="pwm"
+		scope="I"
+		type="L"
+		name="Molbog" />
+	<iso_639_3_entry
+		id="pwn"
+		scope="I"
+		type="L"
+		name="Paiwan" />
+	<iso_639_3_entry
+		id="pwo"
+		scope="I"
+		type="L"
+		name="Karen; Pwo Western" />
+	<iso_639_3_entry
+		id="pwr"
+		scope="I"
+		type="L"
+		name="Powari" />
+	<iso_639_3_entry
+		id="pww"
+		scope="I"
+		type="L"
+		name="Karen; Pwo Northern" />
+	<iso_639_3_entry
+		id="pxm"
+		scope="I"
+		type="L"
+		name="Mixe; Quetzaltepec" />
+	<iso_639_3_entry
+		id="pye"
+		scope="I"
+		type="L"
+		name="Krumen; Pye" />
+	<iso_639_3_entry
+		id="pym"
+		scope="I"
+		type="L"
+		name="Fyam" />
+	<iso_639_3_entry
+		id="pyn"
+		scope="I"
+		type="L"
+		name="Poyanáwa" />
+	<iso_639_3_entry
+		id="pys"
+		scope="I"
+		type="L"
+		name="Paraguayan Sign Language" />
+	<iso_639_3_entry
+		id="pyu"
+		scope="I"
+		type="L"
+		name="Puyuma" />
+	<iso_639_3_entry
+		id="pyx"
+		scope="I"
+		type="A"
+		name="Pyu (Myanmar)" />
+	<iso_639_3_entry
+		id="pyy"
+		scope="I"
+		type="L"
+		name="Pyen" />
+	<iso_639_3_entry
+		id="pzn"
+		scope="I"
+		type="L"
+		name="Naga; Para" />
+	<iso_639_3_entry
+		id="qua"
+		scope="I"
+		type="L"
+		name="Quapaw" />
+	<iso_639_3_entry
+		id="qub"
+		scope="I"
+		type="L"
+		name="Quechua; Huallaga Huánuco" />
+	<iso_639_3_entry
+		id="quc"
+		scope="I"
+		type="L"
+		name="K'iche'" />
+	<iso_639_3_entry
+		id="qud"
+		scope="I"
+		type="L"
+		name="Quichua; Calderón Highland" />
+	<iso_639_3_entry
+		id="que"
+		part1_code="qu"
+		part2_code="que"
+		scope="M"
+		type="L"
+		name="Quechua" />
+	<iso_639_3_entry
+		id="quf"
+		scope="I"
+		type="L"
+		name="Quechua; Lambayeque" />
+	<iso_639_3_entry
+		id="qug"
+		scope="I"
+		type="L"
+		name="Quichua; Chimborazo Highland" />
+	<iso_639_3_entry
+		id="quh"
+		scope="I"
+		type="L"
+		name="Quechua; South Bolivian" />
+	<iso_639_3_entry
+		id="qui"
+		scope="I"
+		type="L"
+		name="Quileute" />
+	<iso_639_3_entry
+		id="quk"
+		scope="I"
+		type="L"
+		name="Quechua; Chachapoyas" />
+	<iso_639_3_entry
+		id="qul"
+		scope="I"
+		type="L"
+		name="Quechua; North Bolivian" />
+	<iso_639_3_entry
+		id="qum"
+		scope="I"
+		type="L"
+		name="Sipacapense" />
+	<iso_639_3_entry
+		id="qun"
+		scope="I"
+		type="E"
+		name="Quinault" />
+	<iso_639_3_entry
+		id="qup"
+		scope="I"
+		type="L"
+		name="Quechua; Southern Pastaza" />
+	<iso_639_3_entry
+		id="quq"
+		scope="I"
+		type="L"
+		name="Quinqui" />
+	<iso_639_3_entry
+		id="qur"
+		scope="I"
+		type="L"
+		name="Quechua; Yanahuanca Pasco" />
+	<iso_639_3_entry
+		id="qus"
+		scope="I"
+		type="L"
+		name="Quichua; Santiago del Estero" />
+	<iso_639_3_entry
+		id="quv"
+		scope="I"
+		type="L"
+		name="Sacapulteco" />
+	<iso_639_3_entry
+		id="quw"
+		scope="I"
+		type="L"
+		name="Quichua; Tena Lowland" />
+	<iso_639_3_entry
+		id="qux"
+		scope="I"
+		type="L"
+		name="Quechua; Yauyos" />
+	<iso_639_3_entry
+		id="quy"
+		scope="I"
+		type="L"
+		name="Quechua; Ayacucho" />
+	<iso_639_3_entry
+		id="quz"
+		scope="I"
+		type="L"
+		name="Quechua; Cusco" />
+	<iso_639_3_entry
+		id="qva"
+		scope="I"
+		type="L"
+		name="Quechua; Ambo-Pasco" />
+	<iso_639_3_entry
+		id="qvc"
+		scope="I"
+		type="L"
+		name="Quechua; Cajamarca" />
+	<iso_639_3_entry
+		id="qve"
+		scope="I"
+		type="L"
+		name="Quechua; Eastern Apurímac" />
+	<iso_639_3_entry
+		id="qvh"
+		scope="I"
+		type="L"
+		name="Quechua; Huamalíes-Dos de Mayo Huánuco" />
+	<iso_639_3_entry
+		id="qvi"
+		scope="I"
+		type="L"
+		name="Quichua; Imbabura Highland" />
+	<iso_639_3_entry
+		id="qvj"
+		scope="I"
+		type="L"
+		name="Quichua; Loja Highland" />
+	<iso_639_3_entry
+		id="qvl"
+		scope="I"
+		type="L"
+		name="Quechua; Cajatambo North Lima" />
+	<iso_639_3_entry
+		id="qvm"
+		scope="I"
+		type="L"
+		name="Quechua; Margos-Yarowilca-Lauricocha" />
+	<iso_639_3_entry
+		id="qvn"
+		scope="I"
+		type="L"
+		name="Quechua; North Junín" />
+	<iso_639_3_entry
+		id="qvo"
+		scope="I"
+		type="L"
+		name="Quechua; Napo Lowland" />
+	<iso_639_3_entry
+		id="qvp"
+		scope="I"
+		type="L"
+		name="Quechua; Pacaraos" />
+	<iso_639_3_entry
+		id="qvs"
+		scope="I"
+		type="L"
+		name="Quechua; San Martín" />
+	<iso_639_3_entry
+		id="qvw"
+		scope="I"
+		type="L"
+		name="Quechua; Huaylla Wanca" />
+	<iso_639_3_entry
+		id="qvy"
+		scope="I"
+		type="L"
+		name="Queyu" />
+	<iso_639_3_entry
+		id="qvz"
+		scope="I"
+		type="L"
+		name="Quichua; Northern Pastaza" />
+	<iso_639_3_entry
+		id="qwa"
+		scope="I"
+		type="L"
+		name="Quechua; Corongo Ancash" />
+	<iso_639_3_entry
+		id="qwc"
+		scope="I"
+		type="H"
+		name="Quechua; Classical" />
+	<iso_639_3_entry
+		id="qwh"
+		scope="I"
+		type="L"
+		name="Quechua; Huaylas Ancash" />
+	<iso_639_3_entry
+		id="qwm"
+		scope="I"
+		type="E"
+		name="Kuman (Russia)" />
+	<iso_639_3_entry
+		id="qws"
+		scope="I"
+		type="L"
+		name="Quechua; Sihuas Ancash" />
+	<iso_639_3_entry
+		id="qwt"
+		scope="I"
+		type="E"
+		name="Kwalhioqua-Tlatskanai" />
+	<iso_639_3_entry
+		id="qxa"
+		scope="I"
+		type="L"
+		name="Quechua; Chiquián Ancash" />
+	<iso_639_3_entry
+		id="qxc"
+		scope="I"
+		type="L"
+		name="Quechua; Chincha" />
+	<iso_639_3_entry
+		id="qxh"
+		scope="I"
+		type="L"
+		name="Quechua; Panao Huánuco" />
+	<iso_639_3_entry
+		id="qxl"
+		scope="I"
+		type="L"
+		name="Quichua; Salasaca Highland" />
+	<iso_639_3_entry
+		id="qxn"
+		scope="I"
+		type="L"
+		name="Quechua; Northern Conchucos Ancash" />
+	<iso_639_3_entry
+		id="qxo"
+		scope="I"
+		type="L"
+		name="Quechua; Southern Conchucos Ancash" />
+	<iso_639_3_entry
+		id="qxp"
+		scope="I"
+		type="L"
+		name="Quechua; Puno" />
+	<iso_639_3_entry
+		id="qxq"
+		scope="I"
+		type="L"
+		name="Qashqa'i" />
+	<iso_639_3_entry
+		id="qxr"
+		scope="I"
+		type="L"
+		name="Quichua; Cañar Highland" />
+	<iso_639_3_entry
+		id="qxs"
+		scope="I"
+		type="L"
+		name="Qiang; Southern" />
+	<iso_639_3_entry
+		id="qxt"
+		scope="I"
+		type="L"
+		name="Quechua; Santa Ana de Tusi Pasco" />
+	<iso_639_3_entry
+		id="qxu"
+		scope="I"
+		type="L"
+		name="Quechua; Arequipa-La Unión" />
+	<iso_639_3_entry
+		id="qxw"
+		scope="I"
+		type="L"
+		name="Quechua; Jauja Wanca" />
+	<iso_639_3_entry
+		id="qya"
+		scope="I"
+		type="C"
+		name="Quenya" />
+	<iso_639_3_entry
+		id="qyp"
+		scope="I"
+		type="E"
+		name="Quiripi" />
+	<iso_639_3_entry
+		id="raa"
+		scope="I"
+		type="L"
+		name="Dungmali" />
+	<iso_639_3_entry
+		id="rab"
+		scope="I"
+		type="L"
+		name="Camling" />
+	<iso_639_3_entry
+		id="rac"
+		scope="I"
+		type="L"
+		name="Rasawa" />
+	<iso_639_3_entry
+		id="rad"
+		scope="I"
+		type="L"
+		name="Rade" />
+	<iso_639_3_entry
+		id="raf"
+		scope="I"
+		type="L"
+		name="Meohang; Western" />
+	<iso_639_3_entry
+		id="rag"
+		scope="I"
+		type="L"
+		name="Logooli" />
+	<iso_639_3_entry
+		id="rah"
+		scope="I"
+		type="L"
+		name="Rabha" />
+	<iso_639_3_entry
+		id="rai"
+		scope="I"
+		type="L"
+		name="Ramoaaina" />
+	<iso_639_3_entry
+		id="raj"
+		part2_code="raj"
+		scope="M"
+		type="L"
+		name="Rajasthani" />
+	<iso_639_3_entry
+		id="rak"
+		scope="I"
+		type="L"
+		name="Tulu-Bohuai" />
+	<iso_639_3_entry
+		id="ral"
+		scope="I"
+		type="L"
+		name="Ralte" />
+	<iso_639_3_entry
+		id="ram"
+		scope="I"
+		type="L"
+		name="Canela" />
+	<iso_639_3_entry
+		id="ran"
+		scope="I"
+		type="L"
+		name="Riantana" />
+	<iso_639_3_entry
+		id="rao"
+		scope="I"
+		type="L"
+		name="Rao" />
+	<iso_639_3_entry
+		id="rap"
+		part2_code="rap"
+		scope="I"
+		type="L"
+		name="Rapanui" />
+	<iso_639_3_entry
+		id="raq"
+		scope="I"
+		type="L"
+		name="Saam" />
+	<iso_639_3_entry
+		id="rar"
+		part2_code="rar"
+		scope="I"
+		type="L"
+		name="Maori; Cook Islands" />
+	<iso_639_3_entry
+		id="ras"
+		scope="I"
+		type="L"
+		name="Tegali" />
+	<iso_639_3_entry
+		id="rat"
+		scope="I"
+		type="L"
+		name="Razajerdi" />
+	<iso_639_3_entry
+		id="rau"
+		scope="I"
+		type="L"
+		name="Raute" />
+	<iso_639_3_entry
+		id="rav"
+		scope="I"
+		type="L"
+		name="Sampang" />
+	<iso_639_3_entry
+		id="raw"
+		scope="I"
+		type="L"
+		name="Rawang" />
+	<iso_639_3_entry
+		id="rax"
+		scope="I"
+		type="L"
+		name="Rang" />
+	<iso_639_3_entry
+		id="ray"
+		scope="I"
+		type="L"
+		name="Rapa" />
+	<iso_639_3_entry
+		id="raz"
+		scope="I"
+		type="L"
+		name="Rahambuu" />
+	<iso_639_3_entry
+		id="rbb"
+		scope="I"
+		type="L"
+		name="Palaung; Rumai" />
+	<iso_639_3_entry
+		id="rbk"
+		scope="I"
+		type="L"
+		name="Bontok; Northern" />
+	<iso_639_3_entry
+		id="rbl"
+		scope="I"
+		type="L"
+		name="Bikol; Miraya" />
+	<iso_639_3_entry
+		id="rcf"
+		scope="I"
+		type="L"
+		name="Creole French; Réunion" />
+	<iso_639_3_entry
+		id="rdb"
+		scope="I"
+		type="L"
+		name="Rudbari" />
+	<iso_639_3_entry
+		id="rea"
+		scope="I"
+		type="L"
+		name="Rerau" />
+	<iso_639_3_entry
+		id="reb"
+		scope="I"
+		type="L"
+		name="Rembong" />
+	<iso_639_3_entry
+		id="ree"
+		scope="I"
+		type="L"
+		name="Kayan; Rejang" />
+	<iso_639_3_entry
+		id="reg"
+		scope="I"
+		type="L"
+		name="Kara (Tanzania)" />
+	<iso_639_3_entry
+		id="rei"
+		scope="I"
+		type="L"
+		name="Reli" />
+	<iso_639_3_entry
+		id="rej"
+		scope="I"
+		type="L"
+		name="Rejang" />
+	<iso_639_3_entry
+		id="rel"
+		scope="I"
+		type="L"
+		name="Rendille" />
+	<iso_639_3_entry
+		id="rem"
+		scope="I"
+		type="E"
+		name="Remo" />
+	<iso_639_3_entry
+		id="ren"
+		scope="I"
+		type="L"
+		name="Rengao" />
+	<iso_639_3_entry
+		id="rer"
+		scope="I"
+		type="E"
+		name="Rer Bare" />
+	<iso_639_3_entry
+		id="res"
+		scope="I"
+		type="L"
+		name="Reshe" />
+	<iso_639_3_entry
+		id="ret"
+		scope="I"
+		type="L"
+		name="Retta" />
+	<iso_639_3_entry
+		id="rey"
+		scope="I"
+		type="L"
+		name="Reyesano" />
+	<iso_639_3_entry
+		id="rga"
+		scope="I"
+		type="L"
+		name="Roria" />
+	<iso_639_3_entry
+		id="rge"
+		scope="I"
+		type="L"
+		name="Romano-Greek" />
+	<iso_639_3_entry
+		id="rgk"
+		scope="I"
+		type="E"
+		name="Rangkas" />
+	<iso_639_3_entry
+		id="rgn"
+		scope="I"
+		type="L"
+		name="Romagnol" />
+	<iso_639_3_entry
+		id="rgr"
+		scope="I"
+		type="L"
+		name="Resígaro" />
+	<iso_639_3_entry
+		id="rgs"
+		scope="I"
+		type="L"
+		name="Roglai; Southern" />
+	<iso_639_3_entry
+		id="rgu"
+		scope="I"
+		type="L"
+		name="Ringgou" />
+	<iso_639_3_entry
+		id="rhg"
+		scope="I"
+		type="L"
+		name="Rohingya" />
+	<iso_639_3_entry
+		id="rhp"
+		scope="I"
+		type="L"
+		name="Yahang" />
+	<iso_639_3_entry
+		id="ria"
+		scope="I"
+		type="L"
+		name="Riang (India)" />
+	<iso_639_3_entry
+		id="rie"
+		scope="I"
+		type="L"
+		name="Rien" />
+	<iso_639_3_entry
+		id="rif"
+		scope="I"
+		type="L"
+		name="Tarifit" />
+	<iso_639_3_entry
+		id="ril"
+		scope="I"
+		type="L"
+		name="Riang (Myanmar)" />
+	<iso_639_3_entry
+		id="rim"
+		scope="I"
+		type="L"
+		name="Nyaturu" />
+	<iso_639_3_entry
+		id="rin"
+		scope="I"
+		type="L"
+		name="Nungu" />
+	<iso_639_3_entry
+		id="rir"
+		scope="I"
+		type="L"
+		name="Ribun" />
+	<iso_639_3_entry
+		id="rit"
+		scope="I"
+		type="L"
+		name="Ritarungo" />
+	<iso_639_3_entry
+		id="riu"
+		scope="I"
+		type="L"
+		name="Riung" />
+	<iso_639_3_entry
+		id="rjg"
+		scope="I"
+		type="L"
+		name="Rajong" />
+	<iso_639_3_entry
+		id="rji"
+		scope="I"
+		type="L"
+		name="Raji" />
+	<iso_639_3_entry
+		id="rjs"
+		scope="I"
+		type="L"
+		name="Rajbanshi" />
+	<iso_639_3_entry
+		id="rka"
+		scope="I"
+		type="L"
+		name="Kraol" />
+	<iso_639_3_entry
+		id="rkb"
+		scope="I"
+		type="L"
+		name="Rikbaktsa" />
+	<iso_639_3_entry
+		id="rkh"
+		scope="I"
+		type="L"
+		name="Rakahanga-Manihiki" />
+	<iso_639_3_entry
+		id="rki"
+		scope="I"
+		type="L"
+		name="Rakhine" />
+	<iso_639_3_entry
+		id="rkm"
+		scope="I"
+		type="L"
+		name="Marka" />
+	<iso_639_3_entry
+		id="rkt"
+		scope="I"
+		type="L"
+		name="Rangpuri" />
+	<iso_639_3_entry
+		id="rma"
+		scope="I"
+		type="L"
+		name="Rama" />
+	<iso_639_3_entry
+		id="rmb"
+		scope="I"
+		type="L"
+		name="Rembarunga" />
+	<iso_639_3_entry
+		id="rmc"
+		scope="I"
+		type="L"
+		name="Romani; Carpathian" />
+	<iso_639_3_entry
+		id="rmd"
+		scope="I"
+		type="E"
+		name="Danish; Traveller" />
+	<iso_639_3_entry
+		id="rme"
+		scope="I"
+		type="L"
+		name="Angloromani" />
+	<iso_639_3_entry
+		id="rmf"
+		scope="I"
+		type="L"
+		name="Romani; Kalo Finnish" />
+	<iso_639_3_entry
+		id="rmg"
+		scope="I"
+		type="L"
+		name="Norwegian; Traveller" />
+	<iso_639_3_entry
+		id="rmh"
+		scope="I"
+		type="L"
+		name="Murkim" />
+	<iso_639_3_entry
+		id="rmi"
+		scope="I"
+		type="L"
+		name="Lomavren" />
+	<iso_639_3_entry
+		id="rmk"
+		scope="I"
+		type="L"
+		name="Romkun" />
+	<iso_639_3_entry
+		id="rml"
+		scope="I"
+		type="L"
+		name="Romani; Baltic" />
+	<iso_639_3_entry
+		id="rmm"
+		scope="I"
+		type="L"
+		name="Roma" />
+	<iso_639_3_entry
+		id="rmn"
+		scope="I"
+		type="L"
+		name="Romani; Balkan" />
+	<iso_639_3_entry
+		id="rmo"
+		scope="I"
+		type="L"
+		name="Romani; Sinte" />
+	<iso_639_3_entry
+		id="rmp"
+		scope="I"
+		type="L"
+		name="Rempi" />
+	<iso_639_3_entry
+		id="rmq"
+		scope="I"
+		type="L"
+		name="Caló" />
+	<iso_639_3_entry
+		id="rms"
+		scope="I"
+		type="L"
+		name="Romanian Sign Language" />
+	<iso_639_3_entry
+		id="rmt"
+		scope="I"
+		type="L"
+		name="Domari" />
+	<iso_639_3_entry
+		id="rmu"
+		scope="I"
+		type="L"
+		name="Romani; Tavringer" />
+	<iso_639_3_entry
+		id="rmv"
+		scope="I"
+		type="C"
+		name="Romanova" />
+	<iso_639_3_entry
+		id="rmw"
+		scope="I"
+		type="L"
+		name="Romani; Welsh" />
+	<iso_639_3_entry
+		id="rmx"
+		scope="I"
+		type="L"
+		name="Romam" />
+	<iso_639_3_entry
+		id="rmy"
+		scope="I"
+		type="L"
+		name="Romani; Vlax" />
+	<iso_639_3_entry
+		id="rmz"
+		scope="I"
+		type="L"
+		name="Marma" />
+	<iso_639_3_entry
+		id="rna"
+		scope="I"
+		type="E"
+		name="Runa" />
+	<iso_639_3_entry
+		id="rnd"
+		scope="I"
+		type="L"
+		name="Ruund" />
+	<iso_639_3_entry
+		id="rng"
+		scope="I"
+		type="L"
+		name="Ronga" />
+	<iso_639_3_entry
+		id="rnl"
+		scope="I"
+		type="L"
+		name="Ranglong" />
+	<iso_639_3_entry
+		id="rnn"
+		scope="I"
+		type="L"
+		name="Roon" />
+	<iso_639_3_entry
+		id="rnp"
+		scope="I"
+		type="L"
+		name="Rongpo" />
+	<iso_639_3_entry
+		id="rnw"
+		scope="I"
+		type="L"
+		name="Rungwa" />
+	<iso_639_3_entry
+		id="rob"
+		scope="I"
+		type="L"
+		name="Tae'" />
+	<iso_639_3_entry
+		id="roc"
+		scope="I"
+		type="L"
+		name="Roglai; Cacgia" />
+	<iso_639_3_entry
+		id="rod"
+		scope="I"
+		type="L"
+		name="Rogo" />
+	<iso_639_3_entry
+		id="roe"
+		scope="I"
+		type="L"
+		name="Ronji" />
+	<iso_639_3_entry
+		id="rof"
+		scope="I"
+		type="L"
+		name="Rombo" />
+	<iso_639_3_entry
+		id="rog"
+		scope="I"
+		type="L"
+		name="Roglai; Northern" />
+	<iso_639_3_entry
+		id="roh"
+		part1_code="rm"
+		part2_code="roh"
+		scope="I"
+		type="L"
+		name="Romansh" />
+	<iso_639_3_entry
+		id="rol"
+		scope="I"
+		type="L"
+		name="Romblomanon" />
+	<iso_639_3_entry
+		id="rom"
+		part2_code="rom"
+		scope="M"
+		type="L"
+		name="Romany" />
+	<iso_639_3_entry
+		id="ron"
+		part1_code="ro"
+		part2_code="rum"
+		scope="I"
+		type="L"
+		name="Romanian" />
+	<iso_639_3_entry
+		id="roo"
+		scope="I"
+		type="L"
+		name="Rotokas" />
+	<iso_639_3_entry
+		id="rop"
+		scope="I"
+		type="L"
+		name="Kriol" />
+	<iso_639_3_entry
+		id="ror"
+		scope="I"
+		type="L"
+		name="Rongga" />
+	<iso_639_3_entry
+		id="rou"
+		scope="I"
+		type="L"
+		name="Runga" />
+	<iso_639_3_entry
+		id="row"
+		scope="I"
+		type="L"
+		name="Dela-Oenale" />
+	<iso_639_3_entry
+		id="rpn"
+		scope="I"
+		type="L"
+		name="Repanbitip" />
+	<iso_639_3_entry
+		id="rpt"
+		scope="I"
+		type="L"
+		name="Rapting" />
+	<iso_639_3_entry
+		id="rri"
+		scope="I"
+		type="L"
+		name="Ririo" />
+	<iso_639_3_entry
+		id="rro"
+		scope="I"
+		type="L"
+		name="Waima" />
+	<iso_639_3_entry
+		id="rsb"
+		scope="I"
+		type="L"
+		name="Romano-Serbian" />
+	<iso_639_3_entry
+		id="rsi"
+		scope="I"
+		type="L"
+		name="Rennellese Sign Language" />
+	<iso_639_3_entry
+		id="rsl"
+		scope="I"
+		type="L"
+		name="Russian Sign Language" />
+	<iso_639_3_entry
+		id="rth"
+		scope="I"
+		type="L"
+		name="Ratahan" />
+	<iso_639_3_entry
+		id="rtm"
+		scope="I"
+		type="L"
+		name="Rotuman" />
+	<iso_639_3_entry
+		id="rtw"
+		scope="I"
+		type="L"
+		name="Rathawi" />
+	<iso_639_3_entry
+		id="rub"
+		scope="I"
+		type="L"
+		name="Gungu" />
+	<iso_639_3_entry
+		id="ruc"
+		scope="I"
+		type="L"
+		name="Ruuli" />
+	<iso_639_3_entry
+		id="rue"
+		scope="I"
+		type="L"
+		name="Rusyn" />
+	<iso_639_3_entry
+		id="ruf"
+		scope="I"
+		type="L"
+		name="Luguru" />
+	<iso_639_3_entry
+		id="rug"
+		scope="I"
+		type="L"
+		name="Roviana" />
+	<iso_639_3_entry
+		id="ruh"
+		scope="I"
+		type="L"
+		name="Ruga" />
+	<iso_639_3_entry
+		id="rui"
+		scope="I"
+		type="L"
+		name="Rufiji" />
+	<iso_639_3_entry
+		id="ruk"
+		scope="I"
+		type="L"
+		name="Che" />
+	<iso_639_3_entry
+		id="run"
+		part1_code="rn"
+		part2_code="run"
+		scope="I"
+		type="L"
+		name="Rundi" />
+	<iso_639_3_entry
+		id="ruo"
+		scope="I"
+		type="L"
+		name="Romanian; Istro" />
+	<iso_639_3_entry
+		id="rup"
+		part2_code="rup"
+		scope="I"
+		type="L"
+		name="Romanian; Macedo-" />
+	<iso_639_3_entry
+		id="ruq"
+		scope="I"
+		type="L"
+		name="Romanian; Megleno" />
+	<iso_639_3_entry
+		id="rus"
+		part1_code="ru"
+		part2_code="rus"
+		scope="I"
+		type="L"
+		name="Russian" />
+	<iso_639_3_entry
+		id="rut"
+		scope="I"
+		type="L"
+		name="Rutul" />
+	<iso_639_3_entry
+		id="ruu"
+		scope="I"
+		type="L"
+		name="Lobu; Lanas" />
+	<iso_639_3_entry
+		id="ruy"
+		scope="I"
+		type="L"
+		name="Mala (Nigeria)" />
+	<iso_639_3_entry
+		id="ruz"
+		scope="I"
+		type="L"
+		name="Ruma" />
+	<iso_639_3_entry
+		id="rwa"
+		scope="I"
+		type="L"
+		name="Rawo" />
+	<iso_639_3_entry
+		id="rwk"
+		scope="I"
+		type="L"
+		name="Rwa" />
+	<iso_639_3_entry
+		id="rwm"
+		scope="I"
+		type="L"
+		name="Amba (Uganda)" />
+	<iso_639_3_entry
+		id="rwo"
+		scope="I"
+		type="L"
+		name="Rawa" />
+	<iso_639_3_entry
+		id="rwr"
+		scope="I"
+		type="L"
+		name="Marwari (India)" />
+	<iso_639_3_entry
+		id="ryn"
+		scope="I"
+		type="L"
+		name="Amami-Oshima; Northern" />
+	<iso_639_3_entry
+		id="rys"
+		scope="I"
+		type="L"
+		name="Yaeyama" />
+	<iso_639_3_entry
+		id="ryu"
+		scope="I"
+		type="L"
+		name="Okinawan; Central" />
+	<iso_639_3_entry
+		id="saa"
+		scope="I"
+		type="L"
+		name="Saba" />
+	<iso_639_3_entry
+		id="sab"
+		scope="I"
+		type="L"
+		name="Buglere" />
+	<iso_639_3_entry
+		id="sac"
+		scope="I"
+		type="L"
+		name="Meskwaki" />
+	<iso_639_3_entry
+		id="sad"
+		part2_code="sad"
+		scope="I"
+		type="L"
+		name="Sandawe" />
+	<iso_639_3_entry
+		id="sae"
+		scope="I"
+		type="L"
+		name="Sabanê" />
+	<iso_639_3_entry
+		id="saf"
+		scope="I"
+		type="L"
+		name="Safaliba" />
+	<iso_639_3_entry
+		id="sag"
+		part1_code="sg"
+		part2_code="sag"
+		scope="I"
+		type="L"
+		name="Sango" />
+	<iso_639_3_entry
+		id="sah"
+		part2_code="sah"
+		scope="I"
+		type="L"
+		name="Yakut" />
+	<iso_639_3_entry
+		id="saj"
+		scope="I"
+		type="L"
+		name="Sahu" />
+	<iso_639_3_entry
+		id="sak"
+		scope="I"
+		type="L"
+		name="Sake" />
+	<iso_639_3_entry
+		id="sam"
+		part2_code="sam"
+		scope="I"
+		type="E"
+		name="Aramaic; Samaritan" />
+	<iso_639_3_entry
+		id="san"
+		part1_code="sa"
+		part2_code="san"
+		scope="I"
+		type="A"
+		name="Sanskrit" />
+	<iso_639_3_entry
+		id="sao"
+		scope="I"
+		type="L"
+		name="Sause" />
+	<iso_639_3_entry
+		id="sap"
+		scope="I"
+		type="L"
+		name="Sanapaná" />
+	<iso_639_3_entry
+		id="saq"
+		scope="I"
+		type="L"
+		name="Samburu" />
+	<iso_639_3_entry
+		id="sar"
+		scope="I"
+		type="E"
+		name="Saraveca" />
+	<iso_639_3_entry
+		id="sas"
+		part2_code="sas"
+		scope="I"
+		type="L"
+		name="Sasak" />
+	<iso_639_3_entry
+		id="sat"
+		part2_code="sat"
+		scope="I"
+		type="L"
+		name="Santali" />
+	<iso_639_3_entry
+		id="sau"
+		scope="I"
+		type="L"
+		name="Saleman" />
+	<iso_639_3_entry
+		id="sav"
+		scope="I"
+		type="L"
+		name="Saafi-Saafi" />
+	<iso_639_3_entry
+		id="saw"
+		scope="I"
+		type="L"
+		name="Sawi" />
+	<iso_639_3_entry
+		id="sax"
+		scope="I"
+		type="L"
+		name="Sa" />
+	<iso_639_3_entry
+		id="say"
+		scope="I"
+		type="L"
+		name="Saya" />
+	<iso_639_3_entry
+		id="saz"
+		scope="I"
+		type="L"
+		name="Saurashtra" />
+	<iso_639_3_entry
+		id="sba"
+		scope="I"
+		type="L"
+		name="Ngambay" />
+	<iso_639_3_entry
+		id="sbb"
+		scope="I"
+		type="L"
+		name="Simbo" />
+	<iso_639_3_entry
+		id="sbc"
+		scope="I"
+		type="L"
+		name="Kele (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="sbd"
+		scope="I"
+		type="L"
+		name="Samo; Southern" />
+	<iso_639_3_entry
+		id="sbe"
+		scope="I"
+		type="L"
+		name="Saliba" />
+	<iso_639_3_entry
+		id="sbf"
+		scope="I"
+		type="L"
+		name="Shabo" />
+	<iso_639_3_entry
+		id="sbg"
+		scope="I"
+		type="L"
+		name="Seget" />
+	<iso_639_3_entry
+		id="sbh"
+		scope="I"
+		type="L"
+		name="Sori-Harengan" />
+	<iso_639_3_entry
+		id="sbi"
+		scope="I"
+		type="L"
+		name="Seti" />
+	<iso_639_3_entry
+		id="sbj"
+		scope="I"
+		type="L"
+		name="Surbakhal" />
+	<iso_639_3_entry
+		id="sbk"
+		scope="I"
+		type="L"
+		name="Safwa" />
+	<iso_639_3_entry
+		id="sbl"
+		scope="I"
+		type="L"
+		name="Sambal; Botolan" />
+	<iso_639_3_entry
+		id="sbm"
+		scope="I"
+		type="L"
+		name="Sagala" />
+	<iso_639_3_entry
+		id="sbn"
+		scope="I"
+		type="L"
+		name="Bhil; Sindhi" />
+	<iso_639_3_entry
+		id="sbo"
+		scope="I"
+		type="L"
+		name="Sabüm" />
+	<iso_639_3_entry
+		id="sbp"
+		scope="I"
+		type="L"
+		name="Sangu (Tanzania)" />
+	<iso_639_3_entry
+		id="sbq"
+		scope="I"
+		type="L"
+		name="Sileibi" />
+	<iso_639_3_entry
+		id="sbr"
+		scope="I"
+		type="L"
+		name="Sembakung Murut" />
+	<iso_639_3_entry
+		id="sbs"
+		scope="I"
+		type="L"
+		name="Subiya" />
+	<iso_639_3_entry
+		id="sbt"
+		scope="I"
+		type="L"
+		name="Kimki" />
+	<iso_639_3_entry
+		id="sbu"
+		scope="I"
+		type="L"
+		name="Bhoti; Stod" />
+	<iso_639_3_entry
+		id="sbv"
+		scope="I"
+		type="A"
+		name="Sabine" />
+	<iso_639_3_entry
+		id="sbw"
+		scope="I"
+		type="L"
+		name="Simba" />
+	<iso_639_3_entry
+		id="sbx"
+		scope="I"
+		type="L"
+		name="Seberuang" />
+	<iso_639_3_entry
+		id="sby"
+		scope="I"
+		type="L"
+		name="Soli" />
+	<iso_639_3_entry
+		id="sbz"
+		scope="I"
+		type="L"
+		name="Sara Kaba" />
+	<iso_639_3_entry
+		id="sca"
+		scope="I"
+		type="L"
+		name="Sansu" />
+	<iso_639_3_entry
+		id="scb"
+		scope="I"
+		type="L"
+		name="Chut" />
+	<iso_639_3_entry
+		id="sce"
+		scope="I"
+		type="L"
+		name="Dongxiang" />
+	<iso_639_3_entry
+		id="scf"
+		scope="I"
+		type="L"
+		name="Creole French; San Miguel" />
+	<iso_639_3_entry
+		id="scg"
+		scope="I"
+		type="L"
+		name="Sanggau" />
+	<iso_639_3_entry
+		id="sch"
+		scope="I"
+		type="L"
+		name="Sakachep" />
+	<iso_639_3_entry
+		id="sci"
+		scope="I"
+		type="L"
+		name="Creole Malay; Sri Lankan" />
+	<iso_639_3_entry
+		id="sck"
+		scope="I"
+		type="L"
+		name="Sadri" />
+	<iso_639_3_entry
+		id="scl"
+		scope="I"
+		type="L"
+		name="Shina" />
+	<iso_639_3_entry
+		id="scn"
+		part2_code="scn"
+		scope="I"
+		type="L"
+		name="Sicilian" />
+	<iso_639_3_entry
+		id="sco"
+		part2_code="sco"
+		scope="I"
+		type="L"
+		name="Scots" />
+	<iso_639_3_entry
+		id="scp"
+		scope="I"
+		type="L"
+		name="Helambu Sherpa" />
+	<iso_639_3_entry
+		id="scq"
+		scope="I"
+		type="L"
+		name="Sa'och" />
+	<iso_639_3_entry
+		id="scs"
+		scope="I"
+		type="L"
+		name="Slavey; North" />
+	<iso_639_3_entry
+		id="scu"
+		scope="I"
+		type="L"
+		name="Shumcho" />
+	<iso_639_3_entry
+		id="scv"
+		scope="I"
+		type="L"
+		name="Sheni" />
+	<iso_639_3_entry
+		id="scw"
+		scope="I"
+		type="L"
+		name="Sha" />
+	<iso_639_3_entry
+		id="scx"
+		scope="I"
+		type="A"
+		name="Sicel" />
+	<iso_639_3_entry
+		id="sda"
+		scope="I"
+		type="L"
+		name="Toraja-Sa'dan" />
+	<iso_639_3_entry
+		id="sdb"
+		scope="I"
+		type="L"
+		name="Shabak" />
+	<iso_639_3_entry
+		id="sdc"
+		scope="I"
+		type="L"
+		name="Sardinian; Sassarese" />
+	<iso_639_3_entry
+		id="sde"
+		scope="I"
+		type="L"
+		name="Surubu" />
+	<iso_639_3_entry
+		id="sdf"
+		scope="I"
+		type="L"
+		name="Sarli" />
+	<iso_639_3_entry
+		id="sdg"
+		scope="I"
+		type="L"
+		name="Savi" />
+	<iso_639_3_entry
+		id="sdh"
+		scope="I"
+		type="L"
+		name="Kurdish; Southern" />
+	<iso_639_3_entry
+		id="sdj"
+		scope="I"
+		type="L"
+		name="Suundi" />
+	<iso_639_3_entry
+		id="sdk"
+		scope="I"
+		type="L"
+		name="Sos Kundi" />
+	<iso_639_3_entry
+		id="sdl"
+		scope="I"
+		type="L"
+		name="Saudi Arabian Sign Language" />
+	<iso_639_3_entry
+		id="sdm"
+		scope="I"
+		type="L"
+		name="Semandang" />
+	<iso_639_3_entry
+		id="sdn"
+		scope="I"
+		type="L"
+		name="Sardinian; Gallurese" />
+	<iso_639_3_entry
+		id="sdo"
+		scope="I"
+		type="L"
+		name="Bidayuh; Bukar-Sadung" />
+	<iso_639_3_entry
+		id="sdp"
+		scope="I"
+		type="L"
+		name="Sherdukpen" />
+	<iso_639_3_entry
+		id="sdr"
+		scope="I"
+		type="L"
+		name="Sadri; Oraon" />
+	<iso_639_3_entry
+		id="sds"
+		scope="I"
+		type="E"
+		name="Sened" />
+	<iso_639_3_entry
+		id="sdt"
+		scope="I"
+		type="E"
+		name="Shuadit" />
+	<iso_639_3_entry
+		id="sdu"
+		scope="I"
+		type="L"
+		name="Sarudu" />
+	<iso_639_3_entry
+		id="sdx"
+		scope="I"
+		type="L"
+		name="Melanau; Sibu" />
+	<iso_639_3_entry
+		id="sdz"
+		scope="I"
+		type="L"
+		name="Sallands" />
+	<iso_639_3_entry
+		id="sea"
+		scope="I"
+		type="L"
+		name="Semai" />
+	<iso_639_3_entry
+		id="seb"
+		scope="I"
+		type="L"
+		name="Senoufo; Shempire" />
+	<iso_639_3_entry
+		id="sec"
+		scope="I"
+		type="L"
+		name="Sechelt" />
+	<iso_639_3_entry
+		id="sed"
+		scope="I"
+		type="L"
+		name="Sedang" />
+	<iso_639_3_entry
+		id="see"
+		scope="I"
+		type="L"
+		name="Seneca" />
+	<iso_639_3_entry
+		id="sef"
+		scope="I"
+		type="L"
+		name="Senoufo; Cebaara" />
+	<iso_639_3_entry
+		id="seg"
+		scope="I"
+		type="L"
+		name="Segeju" />
+	<iso_639_3_entry
+		id="seh"
+		scope="I"
+		type="L"
+		name="Sena" />
+	<iso_639_3_entry
+		id="sei"
+		scope="I"
+		type="L"
+		name="Seri" />
+	<iso_639_3_entry
+		id="sej"
+		scope="I"
+		type="L"
+		name="Sene" />
+	<iso_639_3_entry
+		id="sek"
+		scope="I"
+		type="L"
+		name="Sekani" />
+	<iso_639_3_entry
+		id="sel"
+		part2_code="sel"
+		scope="I"
+		type="L"
+		name="Selkup" />
+	<iso_639_3_entry
+		id="sen"
+		scope="I"
+		type="L"
+		name="Sénoufo; Nanerigé" />
+	<iso_639_3_entry
+		id="seo"
+		scope="I"
+		type="L"
+		name="Suarmin" />
+	<iso_639_3_entry
+		id="sep"
+		scope="I"
+		type="L"
+		name="Sénoufo; Sìcìté" />
+	<iso_639_3_entry
+		id="seq"
+		scope="I"
+		type="L"
+		name="Sénoufo; Senara" />
+	<iso_639_3_entry
+		id="ser"
+		scope="I"
+		type="L"
+		name="Serrano" />
+	<iso_639_3_entry
+		id="ses"
+		scope="I"
+		type="L"
+		name="Songhai; Koyraboro Senni" />
+	<iso_639_3_entry
+		id="set"
+		scope="I"
+		type="L"
+		name="Sentani" />
+	<iso_639_3_entry
+		id="seu"
+		scope="I"
+		type="L"
+		name="Serui-Laut" />
+	<iso_639_3_entry
+		id="sev"
+		scope="I"
+		type="L"
+		name="Senoufo; Nyarafolo" />
+	<iso_639_3_entry
+		id="sew"
+		scope="I"
+		type="L"
+		name="Sewa Bay" />
+	<iso_639_3_entry
+		id="sey"
+		scope="I"
+		type="L"
+		name="Secoya" />
+	<iso_639_3_entry
+		id="sez"
+		scope="I"
+		type="L"
+		name="Chin; Senthang" />
+	<iso_639_3_entry
+		id="sfb"
+		scope="I"
+		type="L"
+		name="Langue des signes de Belgique Francophone" />
+	<iso_639_3_entry
+		id="sfm"
+		scope="I"
+		type="L"
+		name="Miao; Small Flowery" />
+	<iso_639_3_entry
+		id="sfs"
+		scope="I"
+		type="L"
+		name="South African Sign Language" />
+	<iso_639_3_entry
+		id="sfw"
+		scope="I"
+		type="L"
+		name="Sehwi" />
+	<iso_639_3_entry
+		id="sga"
+		part2_code="sga"
+		scope="I"
+		type="H"
+		name="Irish; Old (to 900)" />
+	<iso_639_3_entry
+		id="sgb"
+		scope="I"
+		type="L"
+		name="Ayta; Mag-antsi" />
+	<iso_639_3_entry
+		id="sgc"
+		scope="I"
+		type="L"
+		name="Kipsigis" />
+	<iso_639_3_entry
+		id="sgd"
+		scope="I"
+		type="L"
+		name="Surigaonon" />
+	<iso_639_3_entry
+		id="sge"
+		scope="I"
+		type="L"
+		name="Segai" />
+	<iso_639_3_entry
+		id="sgg"
+		scope="I"
+		type="L"
+		name="Swiss-German Sign Language" />
+	<iso_639_3_entry
+		id="sgh"
+		scope="I"
+		type="L"
+		name="Shughni" />
+	<iso_639_3_entry
+		id="sgi"
+		scope="I"
+		type="L"
+		name="Suga" />
+	<iso_639_3_entry
+		id="sgk"
+		scope="I"
+		type="L"
+		name="Sangkong" />
+	<iso_639_3_entry
+		id="sgm"
+		scope="I"
+		type="E"
+		name="Singa" />
+	<iso_639_3_entry
+		id="sgo"
+		scope="I"
+		type="L"
+		name="Songa" />
+	<iso_639_3_entry
+		id="sgp"
+		scope="I"
+		type="L"
+		name="Singpho" />
+	<iso_639_3_entry
+		id="sgr"
+		scope="I"
+		type="L"
+		name="Sangisari" />
+	<iso_639_3_entry
+		id="sgs"
+		scope="I"
+		type="L"
+		name="Samogitian" />
+	<iso_639_3_entry
+		id="sgt"
+		scope="I"
+		type="L"
+		name="Brokpake" />
+	<iso_639_3_entry
+		id="sgu"
+		scope="I"
+		type="L"
+		name="Salas" />
+	<iso_639_3_entry
+		id="sgw"
+		scope="I"
+		type="L"
+		name="Sebat Bet Gurage" />
+	<iso_639_3_entry
+		id="sgx"
+		scope="I"
+		type="L"
+		name="Sierra Leone Sign Language" />
+	<iso_639_3_entry
+		id="sgy"
+		scope="I"
+		type="L"
+		name="Sanglechi" />
+	<iso_639_3_entry
+		id="sgz"
+		scope="I"
+		type="L"
+		name="Sursurunga" />
+	<iso_639_3_entry
+		id="sha"
+		scope="I"
+		type="L"
+		name="Shall-Zwall" />
+	<iso_639_3_entry
+		id="shb"
+		scope="I"
+		type="L"
+		name="Ninam" />
+	<iso_639_3_entry
+		id="shc"
+		scope="I"
+		type="L"
+		name="Sonde" />
+	<iso_639_3_entry
+		id="shd"
+		scope="I"
+		type="L"
+		name="Kundal Shahi" />
+	<iso_639_3_entry
+		id="she"
+		scope="I"
+		type="L"
+		name="Sheko" />
+	<iso_639_3_entry
+		id="shg"
+		scope="I"
+		type="L"
+		name="Shua" />
+	<iso_639_3_entry
+		id="shh"
+		scope="I"
+		type="L"
+		name="Shoshoni" />
+	<iso_639_3_entry
+		id="shi"
+		scope="I"
+		type="L"
+		name="Tachelhit" />
+	<iso_639_3_entry
+		id="shj"
+		scope="I"
+		type="L"
+		name="Shatt" />
+	<iso_639_3_entry
+		id="shk"
+		scope="I"
+		type="L"
+		name="Shilluk" />
+	<iso_639_3_entry
+		id="shl"
+		scope="I"
+		type="L"
+		name="Shendu" />
+	<iso_639_3_entry
+		id="shm"
+		scope="I"
+		type="L"
+		name="Shahrudi" />
+	<iso_639_3_entry
+		id="shn"
+		part2_code="shn"
+		scope="I"
+		type="L"
+		name="Shan" />
+	<iso_639_3_entry
+		id="sho"
+		scope="I"
+		type="L"
+		name="Shanga" />
+	<iso_639_3_entry
+		id="shp"
+		scope="I"
+		type="L"
+		name="Shipibo-Conibo" />
+	<iso_639_3_entry
+		id="shq"
+		scope="I"
+		type="L"
+		name="Sala" />
+	<iso_639_3_entry
+		id="shr"
+		scope="I"
+		type="L"
+		name="Shi" />
+	<iso_639_3_entry
+		id="shs"
+		scope="I"
+		type="L"
+		name="Shuswap" />
+	<iso_639_3_entry
+		id="sht"
+		scope="I"
+		type="E"
+		name="Shasta" />
+	<iso_639_3_entry
+		id="shu"
+		scope="I"
+		type="L"
+		name="Arabic; Chadian" />
+	<iso_639_3_entry
+		id="shv"
+		scope="I"
+		type="L"
+		name="Shehri" />
+	<iso_639_3_entry
+		id="shw"
+		scope="I"
+		type="L"
+		name="Shwai" />
+	<iso_639_3_entry
+		id="shx"
+		scope="I"
+		type="L"
+		name="She" />
+	<iso_639_3_entry
+		id="shy"
+		scope="I"
+		type="L"
+		name="Tachawit" />
+	<iso_639_3_entry
+		id="shz"
+		scope="I"
+		type="L"
+		name="Senoufo; Syenara" />
+	<iso_639_3_entry
+		id="sia"
+		scope="I"
+		type="E"
+		name="Sami; Akkala" />
+	<iso_639_3_entry
+		id="sib"
+		scope="I"
+		type="L"
+		name="Sebop" />
+	<iso_639_3_entry
+		id="sid"
+		part2_code="sid"
+		scope="I"
+		type="L"
+		name="Sidamo" />
+	<iso_639_3_entry
+		id="sie"
+		scope="I"
+		type="L"
+		name="Simaa" />
+	<iso_639_3_entry
+		id="sif"
+		scope="I"
+		type="L"
+		name="Siamou" />
+	<iso_639_3_entry
+		id="sig"
+		scope="I"
+		type="L"
+		name="Paasaal" />
+	<iso_639_3_entry
+		id="sih"
+		scope="I"
+		type="L"
+		name="Zire" />
+	<iso_639_3_entry
+		id="sii"
+		scope="I"
+		type="L"
+		name="Shom Peng" />
+	<iso_639_3_entry
+		id="sij"
+		scope="I"
+		type="L"
+		name="Numbami" />
+	<iso_639_3_entry
+		id="sik"
+		scope="I"
+		type="L"
+		name="Sikiana" />
+	<iso_639_3_entry
+		id="sil"
+		scope="I"
+		type="L"
+		name="Sisaala; Tumulung" />
+	<iso_639_3_entry
+		id="sim"
+		scope="I"
+		type="L"
+		name="Mende (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="sin"
+		part1_code="si"
+		part2_code="sin"
+		scope="I"
+		type="L"
+		name="Sinhala" />
+	<iso_639_3_entry
+		id="sip"
+		scope="I"
+		type="L"
+		name="Sikkimese" />
+	<iso_639_3_entry
+		id="siq"
+		scope="I"
+		type="L"
+		name="Sonia" />
+	<iso_639_3_entry
+		id="sir"
+		scope="I"
+		type="L"
+		name="Siri" />
+	<iso_639_3_entry
+		id="sis"
+		scope="I"
+		type="E"
+		name="Siuslaw" />
+	<iso_639_3_entry
+		id="siu"
+		scope="I"
+		type="L"
+		name="Sinagen" />
+	<iso_639_3_entry
+		id="siv"
+		scope="I"
+		type="L"
+		name="Sumariup" />
+	<iso_639_3_entry
+		id="siw"
+		scope="I"
+		type="L"
+		name="Siwai" />
+	<iso_639_3_entry
+		id="six"
+		scope="I"
+		type="L"
+		name="Sumau" />
+	<iso_639_3_entry
+		id="siy"
+		scope="I"
+		type="L"
+		name="Sivandi" />
+	<iso_639_3_entry
+		id="siz"
+		scope="I"
+		type="L"
+		name="Siwi" />
+	<iso_639_3_entry
+		id="sja"
+		scope="I"
+		type="L"
+		name="Epena" />
+	<iso_639_3_entry
+		id="sjb"
+		scope="I"
+		type="L"
+		name="Sajau Basap" />
+	<iso_639_3_entry
+		id="sjd"
+		scope="I"
+		type="L"
+		name="Sami; Kildin" />
+	<iso_639_3_entry
+		id="sje"
+		scope="I"
+		type="L"
+		name="Sami; Pite" />
+	<iso_639_3_entry
+		id="sjg"
+		scope="I"
+		type="L"
+		name="Assangori" />
+	<iso_639_3_entry
+		id="sjk"
+		scope="I"
+		type="E"
+		name="Sami; Kemi" />
+	<iso_639_3_entry
+		id="sjl"
+		scope="I"
+		type="L"
+		name="Sajalong" />
+	<iso_639_3_entry
+		id="sjm"
+		scope="I"
+		type="L"
+		name="Mapun" />
+	<iso_639_3_entry
+		id="sjn"
+		scope="I"
+		type="C"
+		name="Sindarin" />
+	<iso_639_3_entry
+		id="sjo"
+		scope="I"
+		type="L"
+		name="Xibe" />
+	<iso_639_3_entry
+		id="sjp"
+		scope="I"
+		type="L"
+		name="Surjapuri" />
+	<iso_639_3_entry
+		id="sjr"
+		scope="I"
+		type="L"
+		name="Siar-Lak" />
+	<iso_639_3_entry
+		id="sjs"
+		scope="I"
+		type="E"
+		name="Senhaja De Srair" />
+	<iso_639_3_entry
+		id="sjt"
+		scope="I"
+		type="L"
+		name="Sami; Ter" />
+	<iso_639_3_entry
+		id="sju"
+		scope="I"
+		type="L"
+		name="Sami; Ume" />
+	<iso_639_3_entry
+		id="sjw"
+		scope="I"
+		type="L"
+		name="Shawnee" />
+	<iso_639_3_entry
+		id="ska"
+		scope="I"
+		type="L"
+		name="Skagit" />
+	<iso_639_3_entry
+		id="skb"
+		scope="I"
+		type="L"
+		name="Saek" />
+	<iso_639_3_entry
+		id="skc"
+		scope="I"
+		type="L"
+		name="Sauk" />
+	<iso_639_3_entry
+		id="skd"
+		scope="I"
+		type="L"
+		name="Miwok; Southern Sierra" />
+	<iso_639_3_entry
+		id="ske"
+		scope="I"
+		type="L"
+		name="Seke (Vanuatu)" />
+	<iso_639_3_entry
+		id="skf"
+		scope="I"
+		type="L"
+		name="Sakirabiá" />
+	<iso_639_3_entry
+		id="skg"
+		scope="I"
+		type="L"
+		name="Malagasy; Sakalava" />
+	<iso_639_3_entry
+		id="skh"
+		scope="I"
+		type="L"
+		name="Sikule" />
+	<iso_639_3_entry
+		id="ski"
+		scope="I"
+		type="L"
+		name="Sika" />
+	<iso_639_3_entry
+		id="skj"
+		scope="I"
+		type="L"
+		name="Seke (Nepal)" />
+	<iso_639_3_entry
+		id="skk"
+		scope="I"
+		type="L"
+		name="Sok" />
+	<iso_639_3_entry
+		id="skm"
+		scope="I"
+		type="L"
+		name="Sakam" />
+	<iso_639_3_entry
+		id="skn"
+		scope="I"
+		type="L"
+		name="Subanon; Kolibugan" />
+	<iso_639_3_entry
+		id="sko"
+		scope="I"
+		type="L"
+		name="Seko Tengah" />
+	<iso_639_3_entry
+		id="skp"
+		scope="I"
+		type="L"
+		name="Sekapan" />
+	<iso_639_3_entry
+		id="skq"
+		scope="I"
+		type="L"
+		name="Sininkere" />
+	<iso_639_3_entry
+		id="skr"
+		scope="I"
+		type="L"
+		name="Seraiki" />
+	<iso_639_3_entry
+		id="sks"
+		scope="I"
+		type="L"
+		name="Maia" />
+	<iso_639_3_entry
+		id="skt"
+		scope="I"
+		type="L"
+		name="Sakata" />
+	<iso_639_3_entry
+		id="sku"
+		scope="I"
+		type="L"
+		name="Sakao" />
+	<iso_639_3_entry
+		id="skv"
+		scope="I"
+		type="L"
+		name="Skou" />
+	<iso_639_3_entry
+		id="skw"
+		scope="I"
+		type="E"
+		name="Creole Dutch; Skepi" />
+	<iso_639_3_entry
+		id="skx"
+		scope="I"
+		type="L"
+		name="Seko Padang" />
+	<iso_639_3_entry
+		id="sky"
+		scope="I"
+		type="L"
+		name="Sikaiana" />
+	<iso_639_3_entry
+		id="skz"
+		scope="I"
+		type="L"
+		name="Sekar" />
+	<iso_639_3_entry
+		id="slc"
+		scope="I"
+		type="L"
+		name="Sáliba" />
+	<iso_639_3_entry
+		id="sld"
+		scope="I"
+		type="L"
+		name="Sissala" />
+	<iso_639_3_entry
+		id="sle"
+		scope="I"
+		type="L"
+		name="Sholaga" />
+	<iso_639_3_entry
+		id="slf"
+		scope="I"
+		type="L"
+		name="Swiss-Italian Sign Language" />
+	<iso_639_3_entry
+		id="slg"
+		scope="I"
+		type="L"
+		name="Selungai Murut" />
+	<iso_639_3_entry
+		id="slh"
+		scope="I"
+		type="L"
+		name="Salish; Southern Puget Sound" />
+	<iso_639_3_entry
+		id="sli"
+		scope="I"
+		type="L"
+		name="Silesian; Lower" />
+	<iso_639_3_entry
+		id="slj"
+		scope="I"
+		type="L"
+		name="Salumá" />
+	<iso_639_3_entry
+		id="slk"
+		part1_code="sk"
+		part2_code="slo"
+		scope="I"
+		type="L"
+		name="Slovak" />
+	<iso_639_3_entry
+		id="sll"
+		scope="I"
+		type="L"
+		name="Salt-Yui" />
+	<iso_639_3_entry
+		id="slm"
+		scope="I"
+		type="L"
+		name="Sama; Pangutaran" />
+	<iso_639_3_entry
+		id="sln"
+		scope="I"
+		type="E"
+		name="Salinan" />
+	<iso_639_3_entry
+		id="slp"
+		scope="I"
+		type="L"
+		name="Lamaholot" />
+	<iso_639_3_entry
+		id="slq"
+		scope="I"
+		type="L"
+		name="Salchuq" />
+	<iso_639_3_entry
+		id="slr"
+		scope="I"
+		type="L"
+		name="Salar" />
+	<iso_639_3_entry
+		id="sls"
+		scope="I"
+		type="L"
+		name="Singapore Sign Language" />
+	<iso_639_3_entry
+		id="slt"
+		scope="I"
+		type="L"
+		name="Sila" />
+	<iso_639_3_entry
+		id="slu"
+		scope="I"
+		type="L"
+		name="Selaru" />
+	<iso_639_3_entry
+		id="slv"
+		part1_code="sl"
+		part2_code="slv"
+		scope="I"
+		type="L"
+		name="Slovenian" />
+	<iso_639_3_entry
+		id="slw"
+		scope="I"
+		type="L"
+		name="Sialum" />
+	<iso_639_3_entry
+		id="slx"
+		scope="I"
+		type="L"
+		name="Salampasu" />
+	<iso_639_3_entry
+		id="sly"
+		scope="I"
+		type="L"
+		name="Selayar" />
+	<iso_639_3_entry
+		id="slz"
+		scope="I"
+		type="L"
+		name="Ma'ya" />
+	<iso_639_3_entry
+		id="sma"
+		part2_code="sma"
+		scope="I"
+		type="L"
+		name="Sami; Southern" />
+	<iso_639_3_entry
+		id="smb"
+		scope="I"
+		type="L"
+		name="Simbari" />
+	<iso_639_3_entry
+		id="smc"
+		scope="I"
+		type="L"
+		name="Som" />
+	<iso_639_3_entry
+		id="smd"
+		scope="I"
+		type="L"
+		name="Sama" />
+	<iso_639_3_entry
+		id="sme"
+		part1_code="se"
+		part2_code="sme"
+		scope="I"
+		type="L"
+		name="Sami; Northern" />
+	<iso_639_3_entry
+		id="smf"
+		scope="I"
+		type="L"
+		name="Auwe" />
+	<iso_639_3_entry
+		id="smg"
+		scope="I"
+		type="L"
+		name="Simbali" />
+	<iso_639_3_entry
+		id="smh"
+		scope="I"
+		type="L"
+		name="Samei" />
+	<iso_639_3_entry
+		id="smj"
+		part2_code="smj"
+		scope="I"
+		type="L"
+		name="Lule Sami" />
+	<iso_639_3_entry
+		id="smk"
+		scope="I"
+		type="L"
+		name="Bolinao" />
+	<iso_639_3_entry
+		id="sml"
+		scope="I"
+		type="L"
+		name="Sama; Central" />
+	<iso_639_3_entry
+		id="smm"
+		scope="I"
+		type="L"
+		name="Musasa" />
+	<iso_639_3_entry
+		id="smn"
+		part2_code="smn"
+		scope="I"
+		type="L"
+		name="Sami; Inari" />
+	<iso_639_3_entry
+		id="smo"
+		part1_code="sm"
+		part2_code="smo"
+		scope="I"
+		type="L"
+		name="Samoan" />
+	<iso_639_3_entry
+		id="smp"
+		scope="I"
+		type="E"
+		name="Samaritan" />
+	<iso_639_3_entry
+		id="smq"
+		scope="I"
+		type="L"
+		name="Samo" />
+	<iso_639_3_entry
+		id="smr"
+		scope="I"
+		type="L"
+		name="Simeulue" />
+	<iso_639_3_entry
+		id="sms"
+		part2_code="sms"
+		scope="I"
+		type="L"
+		name="Sami; Skolt" />
+	<iso_639_3_entry
+		id="smt"
+		scope="I"
+		type="L"
+		name="Simte" />
+	<iso_639_3_entry
+		id="smu"
+		scope="I"
+		type="E"
+		name="Somray" />
+	<iso_639_3_entry
+		id="smv"
+		scope="I"
+		type="L"
+		name="Samvedi" />
+	<iso_639_3_entry
+		id="smw"
+		scope="I"
+		type="L"
+		name="Sumbawa" />
+	<iso_639_3_entry
+		id="smx"
+		scope="I"
+		type="L"
+		name="Samba" />
+	<iso_639_3_entry
+		id="smy"
+		scope="I"
+		type="L"
+		name="Semnani" />
+	<iso_639_3_entry
+		id="smz"
+		scope="I"
+		type="L"
+		name="Simeku" />
+	<iso_639_3_entry
+		id="sna"
+		part1_code="sn"
+		part2_code="sna"
+		scope="I"
+		type="L"
+		name="Shona" />
+	<iso_639_3_entry
+		id="snb"
+		scope="I"
+		type="L"
+		name="Sebuyau" />
+	<iso_639_3_entry
+		id="snc"
+		scope="I"
+		type="L"
+		name="Sinaugoro" />
+	<iso_639_3_entry
+		id="snd"
+		part1_code="sd"
+		part2_code="snd"
+		scope="I"
+		type="L"
+		name="Sindhi" />
+	<iso_639_3_entry
+		id="sne"
+		scope="I"
+		type="L"
+		name="Bidayuh; Bau" />
+	<iso_639_3_entry
+		id="snf"
+		scope="I"
+		type="L"
+		name="Noon" />
+	<iso_639_3_entry
+		id="sng"
+		scope="I"
+		type="L"
+		name="Sanga (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="snh"
+		scope="I"
+		type="E"
+		name="Shinabo" />
+	<iso_639_3_entry
+		id="sni"
+		scope="I"
+		type="E"
+		name="Sensi" />
+	<iso_639_3_entry
+		id="snj"
+		scope="I"
+		type="L"
+		name="Sango; Riverain" />
+	<iso_639_3_entry
+		id="snk"
+		part2_code="snk"
+		scope="I"
+		type="L"
+		name="Soninke" />
+	<iso_639_3_entry
+		id="snl"
+		scope="I"
+		type="L"
+		name="Sangil" />
+	<iso_639_3_entry
+		id="snm"
+		scope="I"
+		type="L"
+		name="Ma'di; Southern" />
+	<iso_639_3_entry
+		id="snn"
+		scope="I"
+		type="L"
+		name="Siona" />
+	<iso_639_3_entry
+		id="sno"
+		scope="I"
+		type="L"
+		name="Snohomish" />
+	<iso_639_3_entry
+		id="snp"
+		scope="I"
+		type="L"
+		name="Siane" />
+	<iso_639_3_entry
+		id="snq"
+		scope="I"
+		type="L"
+		name="Sangu (Gabon)" />
+	<iso_639_3_entry
+		id="snr"
+		scope="I"
+		type="L"
+		name="Sihan" />
+	<iso_639_3_entry
+		id="sns"
+		scope="I"
+		type="L"
+		name="South West Bay" />
+	<iso_639_3_entry
+		id="snu"
+		scope="I"
+		type="L"
+		name="Senggi" />
+	<iso_639_3_entry
+		id="snv"
+		scope="I"
+		type="L"
+		name="Sa'ban" />
+	<iso_639_3_entry
+		id="snw"
+		scope="I"
+		type="L"
+		name="Selee" />
+	<iso_639_3_entry
+		id="snx"
+		scope="I"
+		type="L"
+		name="Sam" />
+	<iso_639_3_entry
+		id="sny"
+		scope="I"
+		type="L"
+		name="Saniyo-Hiyewe" />
+	<iso_639_3_entry
+		id="snz"
+		scope="I"
+		type="L"
+		name="Sinsauru" />
+	<iso_639_3_entry
+		id="soa"
+		scope="I"
+		type="L"
+		name="Thai Song" />
+	<iso_639_3_entry
+		id="sob"
+		scope="I"
+		type="L"
+		name="Sobei" />
+	<iso_639_3_entry
+		id="soc"
+		scope="I"
+		type="L"
+		name="So (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="sod"
+		scope="I"
+		type="L"
+		name="Songoora" />
+	<iso_639_3_entry
+		id="soe"
+		scope="I"
+		type="L"
+		name="Songomeno" />
+	<iso_639_3_entry
+		id="sog"
+		part2_code="sog"
+		scope="I"
+		type="A"
+		name="Sogdian" />
+	<iso_639_3_entry
+		id="soh"
+		scope="I"
+		type="L"
+		name="Aka" />
+	<iso_639_3_entry
+		id="soi"
+		scope="I"
+		type="L"
+		name="Sonha" />
+	<iso_639_3_entry
+		id="soj"
+		scope="I"
+		type="L"
+		name="Soi" />
+	<iso_639_3_entry
+		id="sok"
+		scope="I"
+		type="L"
+		name="Sokoro" />
+	<iso_639_3_entry
+		id="sol"
+		scope="I"
+		type="L"
+		name="Solos" />
+	<iso_639_3_entry
+		id="som"
+		part1_code="so"
+		part2_code="som"
+		scope="I"
+		type="L"
+		name="Somali" />
+	<iso_639_3_entry
+		id="soo"
+		scope="I"
+		type="L"
+		name="Songo" />
+	<iso_639_3_entry
+		id="sop"
+		scope="I"
+		type="L"
+		name="Songe" />
+	<iso_639_3_entry
+		id="soq"
+		scope="I"
+		type="L"
+		name="Kanasi" />
+	<iso_639_3_entry
+		id="sor"
+		scope="I"
+		type="L"
+		name="Somrai" />
+	<iso_639_3_entry
+		id="sos"
+		scope="I"
+		type="L"
+		name="Seeku" />
+	<iso_639_3_entry
+		id="sot"
+		part1_code="st"
+		part2_code="sot"
+		scope="I"
+		type="L"
+		name="Sotho; Southern" />
+	<iso_639_3_entry
+		id="sou"
+		scope="I"
+		type="L"
+		name="Thai; Southern" />
+	<iso_639_3_entry
+		id="sov"
+		scope="I"
+		type="L"
+		name="Sonsorol" />
+	<iso_639_3_entry
+		id="sow"
+		scope="I"
+		type="L"
+		name="Sowanda" />
+	<iso_639_3_entry
+		id="sox"
+		scope="I"
+		type="L"
+		name="So (Cameroon)" />
+	<iso_639_3_entry
+		id="soy"
+		scope="I"
+		type="L"
+		name="Miyobe" />
+	<iso_639_3_entry
+		id="soz"
+		scope="I"
+		type="L"
+		name="Temi" />
+	<iso_639_3_entry
+		id="spa"
+		part1_code="es"
+		part2_code="spa"
+		scope="I"
+		type="L"
+		name="Spanish" />
+	<iso_639_3_entry
+		id="spb"
+		scope="I"
+		type="L"
+		name="Sepa (Indonesia)" />
+	<iso_639_3_entry
+		id="spc"
+		scope="I"
+		type="L"
+		name="Sapé" />
+	<iso_639_3_entry
+		id="spd"
+		scope="I"
+		type="L"
+		name="Saep" />
+	<iso_639_3_entry
+		id="spe"
+		scope="I"
+		type="L"
+		name="Sepa (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="spg"
+		scope="I"
+		type="L"
+		name="Sian" />
+	<iso_639_3_entry
+		id="spi"
+		scope="I"
+		type="L"
+		name="Saponi" />
+	<iso_639_3_entry
+		id="spk"
+		scope="I"
+		type="L"
+		name="Sengo" />
+	<iso_639_3_entry
+		id="spl"
+		scope="I"
+		type="L"
+		name="Selepet" />
+	<iso_639_3_entry
+		id="spm"
+		scope="I"
+		type="L"
+		name="Sepen" />
+	<iso_639_3_entry
+		id="spo"
+		scope="I"
+		type="L"
+		name="Spokane" />
+	<iso_639_3_entry
+		id="spp"
+		scope="I"
+		type="L"
+		name="Senoufo; Supyire" />
+	<iso_639_3_entry
+		id="spq"
+		scope="I"
+		type="L"
+		name="Spanish; Loreto-Ucayali" />
+	<iso_639_3_entry
+		id="spr"
+		scope="I"
+		type="L"
+		name="Saparua" />
+	<iso_639_3_entry
+		id="sps"
+		scope="I"
+		type="L"
+		name="Saposa" />
+	<iso_639_3_entry
+		id="spt"
+		scope="I"
+		type="L"
+		name="Bhoti; Spiti" />
+	<iso_639_3_entry
+		id="spu"
+		scope="I"
+		type="L"
+		name="Sapuan" />
+	<iso_639_3_entry
+		id="spx"
+		scope="I"
+		type="A"
+		name="Picene; South" />
+	<iso_639_3_entry
+		id="spy"
+		scope="I"
+		type="L"
+		name="Sabaot" />
+	<iso_639_3_entry
+		id="sqa"
+		scope="I"
+		type="L"
+		name="Shama-Sambuga" />
+	<iso_639_3_entry
+		id="sqh"
+		scope="I"
+		type="L"
+		name="Shau" />
+	<iso_639_3_entry
+		id="sqi"
+		part1_code="sq"
+		part2_code="alb"
+		scope="M"
+		type="L"
+		name="Albanian" />
+	<iso_639_3_entry
+		id="sqm"
+		scope="I"
+		type="L"
+		name="Suma" />
+	<iso_639_3_entry
+		id="sqn"
+		scope="I"
+		type="E"
+		name="Susquehannock" />
+	<iso_639_3_entry
+		id="sqo"
+		scope="I"
+		type="L"
+		name="Sorkhei" />
+	<iso_639_3_entry
+		id="sqq"
+		scope="I"
+		type="L"
+		name="Sou" />
+	<iso_639_3_entry
+		id="sqr"
+		scope="I"
+		type="H"
+		name="Arabic; Siculo" />
+	<iso_639_3_entry
+		id="sqs"
+		scope="I"
+		type="L"
+		name="Sri Lankan Sign Language" />
+	<iso_639_3_entry
+		id="sqt"
+		scope="I"
+		type="L"
+		name="Soqotri" />
+	<iso_639_3_entry
+		id="squ"
+		scope="I"
+		type="L"
+		name="Squamish" />
+	<iso_639_3_entry
+		id="sra"
+		scope="I"
+		type="L"
+		name="Saruga" />
+	<iso_639_3_entry
+		id="srb"
+		scope="I"
+		type="L"
+		name="Sora" />
+	<iso_639_3_entry
+		id="src"
+		scope="I"
+		type="L"
+		name="Sardinian; Logudorese" />
+	<iso_639_3_entry
+		id="srd"
+		part1_code="sc"
+		part2_code="srd"
+		scope="M"
+		type="L"
+		name="Sardinian" />
+	<iso_639_3_entry
+		id="sre"
+		scope="I"
+		type="L"
+		name="Sara" />
+	<iso_639_3_entry
+		id="srf"
+		scope="I"
+		type="L"
+		name="Nafi" />
+	<iso_639_3_entry
+		id="srg"
+		scope="I"
+		type="L"
+		name="Sulod" />
+	<iso_639_3_entry
+		id="srh"
+		scope="I"
+		type="L"
+		name="Sarikoli" />
+	<iso_639_3_entry
+		id="sri"
+		scope="I"
+		type="L"
+		name="Siriano" />
+	<iso_639_3_entry
+		id="srk"
+		scope="I"
+		type="L"
+		name="Serudung Murut" />
+	<iso_639_3_entry
+		id="srl"
+		scope="I"
+		type="L"
+		name="Isirawa" />
+	<iso_639_3_entry
+		id="srm"
+		scope="I"
+		type="L"
+		name="Saramaccan" />
+	<iso_639_3_entry
+		id="srn"
+		part2_code="srn"
+		scope="I"
+		type="L"
+		name="Sranan Tongo" />
+	<iso_639_3_entry
+		id="sro"
+		scope="I"
+		type="L"
+		name="Sardinian; Campidanese" />
+	<iso_639_3_entry
+		id="srp"
+		part1_code="sr"
+		part2_code="srp"
+		scope="I"
+		type="L"
+		name="Serbian" />
+	<iso_639_3_entry
+		id="srq"
+		scope="I"
+		type="L"
+		name="Sirionó" />
+	<iso_639_3_entry
+		id="srr"
+		part2_code="srr"
+		scope="I"
+		type="L"
+		name="Serer" />
+	<iso_639_3_entry
+		id="srs"
+		scope="I"
+		type="L"
+		name="Sarsi" />
+	<iso_639_3_entry
+		id="srt"
+		scope="I"
+		type="L"
+		name="Sauri" />
+	<iso_639_3_entry
+		id="sru"
+		scope="I"
+		type="L"
+		name="Suruí" />
+	<iso_639_3_entry
+		id="srv"
+		scope="I"
+		type="L"
+		name="Sorsoganon; Southern" />
+	<iso_639_3_entry
+		id="srw"
+		scope="I"
+		type="L"
+		name="Serua" />
+	<iso_639_3_entry
+		id="srx"
+		scope="I"
+		type="L"
+		name="Sirmauri" />
+	<iso_639_3_entry
+		id="sry"
+		scope="I"
+		type="L"
+		name="Sera" />
+	<iso_639_3_entry
+		id="srz"
+		scope="I"
+		type="L"
+		name="Shahmirzadi" />
+	<iso_639_3_entry
+		id="ssb"
+		scope="I"
+		type="L"
+		name="Sama; Southern" />
+	<iso_639_3_entry
+		id="ssc"
+		scope="I"
+		type="L"
+		name="Suba-Simbiti" />
+	<iso_639_3_entry
+		id="ssd"
+		scope="I"
+		type="L"
+		name="Siroi" />
+	<iso_639_3_entry
+		id="sse"
+		scope="I"
+		type="L"
+		name="Sama; Bangingih" />
+	<iso_639_3_entry
+		id="ssf"
+		scope="I"
+		type="L"
+		name="Thao" />
+	<iso_639_3_entry
+		id="ssg"
+		scope="I"
+		type="L"
+		name="Seimat" />
+	<iso_639_3_entry
+		id="ssh"
+		scope="I"
+		type="L"
+		name="Arabic; Shihhi" />
+	<iso_639_3_entry
+		id="ssi"
+		scope="I"
+		type="L"
+		name="Sansi" />
+	<iso_639_3_entry
+		id="ssj"
+		scope="I"
+		type="L"
+		name="Sausi" />
+	<iso_639_3_entry
+		id="ssk"
+		scope="I"
+		type="L"
+		name="Sunam" />
+	<iso_639_3_entry
+		id="ssl"
+		scope="I"
+		type="L"
+		name="Sisaala; Western" />
+	<iso_639_3_entry
+		id="ssm"
+		scope="I"
+		type="L"
+		name="Semnam" />
+	<iso_639_3_entry
+		id="ssn"
+		scope="I"
+		type="L"
+		name="Waata" />
+	<iso_639_3_entry
+		id="sso"
+		scope="I"
+		type="L"
+		name="Sissano" />
+	<iso_639_3_entry
+		id="ssp"
+		scope="I"
+		type="L"
+		name="Spanish Sign Language" />
+	<iso_639_3_entry
+		id="ssq"
+		scope="I"
+		type="L"
+		name="So'a" />
+	<iso_639_3_entry
+		id="ssr"
+		scope="I"
+		type="L"
+		name="Swiss-French Sign Language" />
+	<iso_639_3_entry
+		id="sss"
+		scope="I"
+		type="L"
+		name="Sô" />
+	<iso_639_3_entry
+		id="sst"
+		scope="I"
+		type="L"
+		name="Sinasina" />
+	<iso_639_3_entry
+		id="ssu"
+		scope="I"
+		type="L"
+		name="Susuami" />
+	<iso_639_3_entry
+		id="ssv"
+		scope="I"
+		type="L"
+		name="Shark Bay" />
+	<iso_639_3_entry
+		id="ssw"
+		part1_code="ss"
+		part2_code="ssw"
+		scope="I"
+		type="L"
+		name="Swati" />
+	<iso_639_3_entry
+		id="ssx"
+		scope="I"
+		type="L"
+		name="Samberigi" />
+	<iso_639_3_entry
+		id="ssy"
+		scope="I"
+		type="L"
+		name="Saho" />
+	<iso_639_3_entry
+		id="ssz"
+		scope="I"
+		type="L"
+		name="Sengseng" />
+	<iso_639_3_entry
+		id="sta"
+		scope="I"
+		type="L"
+		name="Settla" />
+	<iso_639_3_entry
+		id="stb"
+		scope="I"
+		type="L"
+		name="Subanen; Northern" />
+	<iso_639_3_entry
+		id="std"
+		scope="I"
+		type="L"
+		name="Sentinel" />
+	<iso_639_3_entry
+		id="ste"
+		scope="I"
+		type="L"
+		name="Liana-Seti" />
+	<iso_639_3_entry
+		id="stf"
+		scope="I"
+		type="L"
+		name="Seta" />
+	<iso_639_3_entry
+		id="stg"
+		scope="I"
+		type="L"
+		name="Trieng" />
+	<iso_639_3_entry
+		id="sth"
+		scope="I"
+		type="L"
+		name="Shelta" />
+	<iso_639_3_entry
+		id="sti"
+		scope="I"
+		type="L"
+		name="Stieng; Bulo" />
+	<iso_639_3_entry
+		id="stj"
+		scope="I"
+		type="L"
+		name="Samo; Matya" />
+	<iso_639_3_entry
+		id="stk"
+		scope="I"
+		type="L"
+		name="Arammba" />
+	<iso_639_3_entry
+		id="stl"
+		scope="I"
+		type="L"
+		name="Stellingwerfs" />
+	<iso_639_3_entry
+		id="stm"
+		scope="I"
+		type="L"
+		name="Setaman" />
+	<iso_639_3_entry
+		id="stn"
+		scope="I"
+		type="L"
+		name="Owa" />
+	<iso_639_3_entry
+		id="sto"
+		scope="I"
+		type="L"
+		name="Stoney" />
+	<iso_639_3_entry
+		id="stp"
+		scope="I"
+		type="L"
+		name="Tepehuan; Southeastern" />
+	<iso_639_3_entry
+		id="stq"
+		scope="I"
+		type="L"
+		name="Saterfriesisch" />
+	<iso_639_3_entry
+		id="str"
+		scope="I"
+		type="L"
+		name="Salish; Straits" />
+	<iso_639_3_entry
+		id="sts"
+		scope="I"
+		type="L"
+		name="Shumashti" />
+	<iso_639_3_entry
+		id="stt"
+		scope="I"
+		type="L"
+		name="Stieng; Budeh" />
+	<iso_639_3_entry
+		id="stu"
+		scope="I"
+		type="L"
+		name="Samtao" />
+	<iso_639_3_entry
+		id="stv"
+		scope="I"
+		type="L"
+		name="Silt'e" />
+	<iso_639_3_entry
+		id="stw"
+		scope="I"
+		type="L"
+		name="Satawalese" />
+	<iso_639_3_entry
+		id="sua"
+		scope="I"
+		type="L"
+		name="Sulka" />
+	<iso_639_3_entry
+		id="sub"
+		scope="I"
+		type="L"
+		name="Suku" />
+	<iso_639_3_entry
+		id="suc"
+		scope="I"
+		type="L"
+		name="Subanon; Western" />
+	<iso_639_3_entry
+		id="sue"
+		scope="I"
+		type="L"
+		name="Suena" />
+	<iso_639_3_entry
+		id="sug"
+		scope="I"
+		type="L"
+		name="Suganga" />
+	<iso_639_3_entry
+		id="sui"
+		scope="I"
+		type="L"
+		name="Suki" />
+	<iso_639_3_entry
+		id="suj"
+		scope="I"
+		type="L"
+		name="Shubi" />
+	<iso_639_3_entry
+		id="suk"
+		part2_code="suk"
+		scope="I"
+		type="L"
+		name="Sukuma" />
+	<iso_639_3_entry
+		id="sun"
+		part1_code="su"
+		part2_code="sun"
+		scope="I"
+		type="L"
+		name="Sundanese" />
+	<iso_639_3_entry
+		id="suq"
+		scope="I"
+		type="L"
+		name="Suri" />
+	<iso_639_3_entry
+		id="sur"
+		scope="I"
+		type="L"
+		name="Mwaghavul" />
+	<iso_639_3_entry
+		id="sus"
+		part2_code="sus"
+		scope="I"
+		type="L"
+		name="Susu" />
+	<iso_639_3_entry
+		id="sut"
+		scope="I"
+		type="E"
+		name="Subtiaba" />
+	<iso_639_3_entry
+		id="suv"
+		scope="I"
+		type="L"
+		name="Sulung" />
+	<iso_639_3_entry
+		id="suw"
+		scope="I"
+		type="L"
+		name="Sumbwa" />
+	<iso_639_3_entry
+		id="sux"
+		part2_code="sux"
+		scope="I"
+		type="A"
+		name="Sumerian" />
+	<iso_639_3_entry
+		id="suy"
+		scope="I"
+		type="L"
+		name="Suyá" />
+	<iso_639_3_entry
+		id="suz"
+		scope="I"
+		type="L"
+		name="Sunwar" />
+	<iso_639_3_entry
+		id="sva"
+		scope="I"
+		type="L"
+		name="Svan" />
+	<iso_639_3_entry
+		id="svb"
+		scope="I"
+		type="L"
+		name="Ulau-Suain" />
+	<iso_639_3_entry
+		id="svc"
+		scope="I"
+		type="L"
+		name="Creole English; Vincentian" />
+	<iso_639_3_entry
+		id="sve"
+		scope="I"
+		type="L"
+		name="Serili" />
+	<iso_639_3_entry
+		id="svk"
+		scope="I"
+		type="L"
+		name="Slovakian Sign Language" />
+	<iso_639_3_entry
+		id="svr"
+		scope="I"
+		type="L"
+		name="Savara" />
+	<iso_639_3_entry
+		id="svs"
+		scope="I"
+		type="L"
+		name="Savosavo" />
+	<iso_639_3_entry
+		id="svx"
+		scope="I"
+		type="E"
+		name="Skalvian" />
+	<iso_639_3_entry
+		id="swa"
+		part1_code="sw"
+		part2_code="swa"
+		scope="M"
+		type="L"
+		name="Swahili (macrolanguage)" />
+	<iso_639_3_entry
+		id="swb"
+		scope="I"
+		type="L"
+		name="Comorian; Maore" />
+	<iso_639_3_entry
+		id="swc"
+		scope="I"
+		type="L"
+		name="Swahili; Congo" />
+	<iso_639_3_entry
+		id="swe"
+		part1_code="sv"
+		part2_code="swe"
+		scope="I"
+		type="L"
+		name="Swedish" />
+	<iso_639_3_entry
+		id="swf"
+		scope="I"
+		type="L"
+		name="Sere" />
+	<iso_639_3_entry
+		id="swg"
+		scope="I"
+		type="L"
+		name="Swabian" />
+	<iso_639_3_entry
+		id="swh"
+		scope="I"
+		type="L"
+		name="Swahili (individual language)" />
+	<iso_639_3_entry
+		id="swi"
+		scope="I"
+		type="L"
+		name="Sui" />
+	<iso_639_3_entry
+		id="swj"
+		scope="I"
+		type="L"
+		name="Sira" />
+	<iso_639_3_entry
+		id="swk"
+		scope="I"
+		type="L"
+		name="Sena; Malawi" />
+	<iso_639_3_entry
+		id="swl"
+		scope="I"
+		type="L"
+		name="Swedish Sign Language" />
+	<iso_639_3_entry
+		id="swm"
+		scope="I"
+		type="L"
+		name="Samosa" />
+	<iso_639_3_entry
+		id="swn"
+		scope="I"
+		type="L"
+		name="Sawknah" />
+	<iso_639_3_entry
+		id="swo"
+		scope="I"
+		type="L"
+		name="Shanenawa" />
+	<iso_639_3_entry
+		id="swp"
+		scope="I"
+		type="L"
+		name="Suau" />
+	<iso_639_3_entry
+		id="swq"
+		scope="I"
+		type="L"
+		name="Sharwa" />
+	<iso_639_3_entry
+		id="swr"
+		scope="I"
+		type="L"
+		name="Saweru" />
+	<iso_639_3_entry
+		id="sws"
+		scope="I"
+		type="L"
+		name="Seluwasan" />
+	<iso_639_3_entry
+		id="swt"
+		scope="I"
+		type="L"
+		name="Sawila" />
+	<iso_639_3_entry
+		id="swu"
+		scope="I"
+		type="L"
+		name="Suwawa" />
+	<iso_639_3_entry
+		id="swv"
+		scope="I"
+		type="L"
+		name="Shekhawati" />
+	<iso_639_3_entry
+		id="sww"
+		scope="I"
+		type="E"
+		name="Sowa" />
+	<iso_639_3_entry
+		id="swx"
+		scope="I"
+		type="L"
+		name="Suruahá" />
+	<iso_639_3_entry
+		id="swy"
+		scope="I"
+		type="L"
+		name="Sarua" />
+	<iso_639_3_entry
+		id="sxb"
+		scope="I"
+		type="L"
+		name="Suba" />
+	<iso_639_3_entry
+		id="sxc"
+		scope="I"
+		type="A"
+		name="Sicanian" />
+	<iso_639_3_entry
+		id="sxe"
+		scope="I"
+		type="L"
+		name="Sighu" />
+	<iso_639_3_entry
+		id="sxg"
+		scope="I"
+		type="L"
+		name="Shixing" />
+	<iso_639_3_entry
+		id="sxk"
+		scope="I"
+		type="E"
+		name="Kalapuya; Southern" />
+	<iso_639_3_entry
+		id="sxl"
+		scope="I"
+		type="E"
+		name="Selian" />
+	<iso_639_3_entry
+		id="sxm"
+		scope="I"
+		type="L"
+		name="Samre" />
+	<iso_639_3_entry
+		id="sxn"
+		scope="I"
+		type="L"
+		name="Sangir" />
+	<iso_639_3_entry
+		id="sxo"
+		scope="I"
+		type="A"
+		name="Sorothaptic" />
+	<iso_639_3_entry
+		id="sxr"
+		scope="I"
+		type="L"
+		name="Saaroa" />
+	<iso_639_3_entry
+		id="sxs"
+		scope="I"
+		type="L"
+		name="Sasaru" />
+	<iso_639_3_entry
+		id="sxu"
+		scope="I"
+		type="L"
+		name="Saxon; Upper" />
+	<iso_639_3_entry
+		id="sxw"
+		scope="I"
+		type="L"
+		name="Gbe; Saxwe" />
+	<iso_639_3_entry
+		id="sya"
+		scope="I"
+		type="L"
+		name="Siang" />
+	<iso_639_3_entry
+		id="syb"
+		scope="I"
+		type="L"
+		name="Subanen; Central" />
+	<iso_639_3_entry
+		id="syc"
+		part2_code="syc"
+		scope="I"
+		type="H"
+		name="Syriac; Classical" />
+	<iso_639_3_entry
+		id="syi"
+		scope="I"
+		type="L"
+		name="Seki" />
+	<iso_639_3_entry
+		id="syk"
+		scope="I"
+		type="L"
+		name="Sukur" />
+	<iso_639_3_entry
+		id="syl"
+		scope="I"
+		type="L"
+		name="Sylheti" />
+	<iso_639_3_entry
+		id="sym"
+		scope="I"
+		type="L"
+		name="Samo; Maya" />
+	<iso_639_3_entry
+		id="syn"
+		scope="I"
+		type="L"
+		name="Senaya" />
+	<iso_639_3_entry
+		id="syo"
+		scope="I"
+		type="L"
+		name="Suoy" />
+	<iso_639_3_entry
+		id="syr"
+		part2_code="syr"
+		scope="M"
+		type="L"
+		name="Syriac" />
+	<iso_639_3_entry
+		id="sys"
+		scope="I"
+		type="L"
+		name="Sinyar" />
+	<iso_639_3_entry
+		id="syw"
+		scope="I"
+		type="L"
+		name="Kagate" />
+	<iso_639_3_entry
+		id="syy"
+		scope="I"
+		type="L"
+		name="Al-Sayyid Bedouin Sign Language" />
+	<iso_639_3_entry
+		id="sza"
+		scope="I"
+		type="L"
+		name="Semelai" />
+	<iso_639_3_entry
+		id="szb"
+		scope="I"
+		type="L"
+		name="Ngalum" />
+	<iso_639_3_entry
+		id="szc"
+		scope="I"
+		type="L"
+		name="Semaq Beri" />
+	<iso_639_3_entry
+		id="szd"
+		scope="I"
+		type="E"
+		name="Seru" />
+	<iso_639_3_entry
+		id="sze"
+		scope="I"
+		type="L"
+		name="Seze" />
+	<iso_639_3_entry
+		id="szg"
+		scope="I"
+		type="L"
+		name="Sengele" />
+	<iso_639_3_entry
+		id="szl"
+		scope="I"
+		type="L"
+		name="Silesian" />
+	<iso_639_3_entry
+		id="szn"
+		scope="I"
+		type="L"
+		name="Sula" />
+	<iso_639_3_entry
+		id="szp"
+		scope="I"
+		type="L"
+		name="Suabo" />
+	<iso_639_3_entry
+		id="szv"
+		scope="I"
+		type="L"
+		name="Isu (Fako Division)" />
+	<iso_639_3_entry
+		id="szw"
+		scope="I"
+		type="L"
+		name="Sawai" />
+	<iso_639_3_entry
+		id="taa"
+		scope="I"
+		type="L"
+		name="Tanana; Lower" />
+	<iso_639_3_entry
+		id="tab"
+		scope="I"
+		type="L"
+		name="Tabassaran" />
+	<iso_639_3_entry
+		id="tac"
+		scope="I"
+		type="L"
+		name="Tarahumara; Lowland" />
+	<iso_639_3_entry
+		id="tad"
+		scope="I"
+		type="L"
+		name="Tause" />
+	<iso_639_3_entry
+		id="tae"
+		scope="I"
+		type="L"
+		name="Tariana" />
+	<iso_639_3_entry
+		id="taf"
+		scope="I"
+		type="L"
+		name="Tapirapé" />
+	<iso_639_3_entry
+		id="tag"
+		scope="I"
+		type="L"
+		name="Tagoi" />
+	<iso_639_3_entry
+		id="tah"
+		part1_code="ty"
+		part2_code="tah"
+		scope="I"
+		type="L"
+		name="Tahitian" />
+	<iso_639_3_entry
+		id="taj"
+		scope="I"
+		type="L"
+		name="Tamang; Eastern" />
+	<iso_639_3_entry
+		id="tak"
+		scope="I"
+		type="L"
+		name="Tala" />
+	<iso_639_3_entry
+		id="tal"
+		scope="I"
+		type="L"
+		name="Tal" />
+	<iso_639_3_entry
+		id="tam"
+		part1_code="ta"
+		part2_code="tam"
+		scope="I"
+		type="L"
+		name="Tamil" />
+	<iso_639_3_entry
+		id="tan"
+		scope="I"
+		type="L"
+		name="Tangale" />
+	<iso_639_3_entry
+		id="tao"
+		scope="I"
+		type="L"
+		name="Yami" />
+	<iso_639_3_entry
+		id="tap"
+		scope="I"
+		type="L"
+		name="Taabwa" />
+	<iso_639_3_entry
+		id="taq"
+		scope="I"
+		type="L"
+		name="Tamasheq" />
+	<iso_639_3_entry
+		id="tar"
+		scope="I"
+		type="L"
+		name="Tarahumara; Central" />
+	<iso_639_3_entry
+		id="tas"
+		scope="I"
+		type="E"
+		name="Tay Boi" />
+	<iso_639_3_entry
+		id="tat"
+		part1_code="tt"
+		part2_code="tat"
+		scope="I"
+		type="L"
+		name="Tatar" />
+	<iso_639_3_entry
+		id="tau"
+		scope="I"
+		type="L"
+		name="Tanana; Upper" />
+	<iso_639_3_entry
+		id="tav"
+		scope="I"
+		type="L"
+		name="Tatuyo" />
+	<iso_639_3_entry
+		id="taw"
+		scope="I"
+		type="L"
+		name="Tai" />
+	<iso_639_3_entry
+		id="tax"
+		scope="I"
+		type="L"
+		name="Tamki" />
+	<iso_639_3_entry
+		id="tay"
+		scope="I"
+		type="L"
+		name="Atayal" />
+	<iso_639_3_entry
+		id="taz"
+		scope="I"
+		type="L"
+		name="Tocho" />
+	<iso_639_3_entry
+		id="tba"
+		scope="I"
+		type="L"
+		name="Aikanã" />
+	<iso_639_3_entry
+		id="tbb"
+		scope="I"
+		type="E"
+		name="Tapeba" />
+	<iso_639_3_entry
+		id="tbc"
+		scope="I"
+		type="L"
+		name="Takia" />
+	<iso_639_3_entry
+		id="tbd"
+		scope="I"
+		type="L"
+		name="Kaki Ae" />
+	<iso_639_3_entry
+		id="tbe"
+		scope="I"
+		type="L"
+		name="Tanimbili" />
+	<iso_639_3_entry
+		id="tbf"
+		scope="I"
+		type="L"
+		name="Mandara" />
+	<iso_639_3_entry
+		id="tbg"
+		scope="I"
+		type="L"
+		name="Tairora; North" />
+	<iso_639_3_entry
+		id="tbh"
+		scope="I"
+		type="E"
+		name="Thurawal" />
+	<iso_639_3_entry
+		id="tbi"
+		scope="I"
+		type="L"
+		name="Gaam" />
+	<iso_639_3_entry
+		id="tbj"
+		scope="I"
+		type="L"
+		name="Tiang" />
+	<iso_639_3_entry
+		id="tbk"
+		scope="I"
+		type="L"
+		name="Tagbanwa; Calamian" />
+	<iso_639_3_entry
+		id="tbl"
+		scope="I"
+		type="L"
+		name="Tboli" />
+	<iso_639_3_entry
+		id="tbm"
+		scope="I"
+		type="L"
+		name="Tagbu" />
+	<iso_639_3_entry
+		id="tbn"
+		scope="I"
+		type="L"
+		name="Tunebo; Barro Negro" />
+	<iso_639_3_entry
+		id="tbo"
+		scope="I"
+		type="L"
+		name="Tawala" />
+	<iso_639_3_entry
+		id="tbp"
+		scope="I"
+		type="L"
+		name="Taworta" />
+	<iso_639_3_entry
+		id="tbr"
+		scope="I"
+		type="L"
+		name="Tumtum" />
+	<iso_639_3_entry
+		id="tbs"
+		scope="I"
+		type="L"
+		name="Tanguat" />
+	<iso_639_3_entry
+		id="tbt"
+		scope="I"
+		type="L"
+		name="Tembo (Kitembo)" />
+	<iso_639_3_entry
+		id="tbu"
+		scope="I"
+		type="E"
+		name="Tubar" />
+	<iso_639_3_entry
+		id="tbv"
+		scope="I"
+		type="L"
+		name="Tobo" />
+	<iso_639_3_entry
+		id="tbw"
+		scope="I"
+		type="L"
+		name="Tagbanwa" />
+	<iso_639_3_entry
+		id="tbx"
+		scope="I"
+		type="L"
+		name="Kapin" />
+	<iso_639_3_entry
+		id="tby"
+		scope="I"
+		type="L"
+		name="Tabaru" />
+	<iso_639_3_entry
+		id="tbz"
+		scope="I"
+		type="L"
+		name="Ditammari" />
+	<iso_639_3_entry
+		id="tca"
+		scope="I"
+		type="L"
+		name="Ticuna" />
+	<iso_639_3_entry
+		id="tcb"
+		scope="I"
+		type="L"
+		name="Tanacross" />
+	<iso_639_3_entry
+		id="tcc"
+		scope="I"
+		type="L"
+		name="Datooga" />
+	<iso_639_3_entry
+		id="tcd"
+		scope="I"
+		type="L"
+		name="Tafi" />
+	<iso_639_3_entry
+		id="tce"
+		scope="I"
+		type="L"
+		name="Tutchone; Southern" />
+	<iso_639_3_entry
+		id="tcf"
+		scope="I"
+		type="L"
+		name="Tlapanec; Malinaltepec" />
+	<iso_639_3_entry
+		id="tcg"
+		scope="I"
+		type="L"
+		name="Tamagario" />
+	<iso_639_3_entry
+		id="tch"
+		scope="I"
+		type="L"
+		name="Creole English; Turks And Caicos" />
+	<iso_639_3_entry
+		id="tci"
+		scope="I"
+		type="L"
+		name="Wára" />
+	<iso_639_3_entry
+		id="tck"
+		scope="I"
+		type="L"
+		name="Tchitchege" />
+	<iso_639_3_entry
+		id="tcl"
+		scope="I"
+		type="E"
+		name="Taman (Myanmar)" />
+	<iso_639_3_entry
+		id="tcm"
+		scope="I"
+		type="L"
+		name="Tanahmerah" />
+	<iso_639_3_entry
+		id="tcn"
+		scope="I"
+		type="L"
+		name="Tichurong" />
+	<iso_639_3_entry
+		id="tco"
+		scope="I"
+		type="L"
+		name="Taungyo" />
+	<iso_639_3_entry
+		id="tcp"
+		scope="I"
+		type="L"
+		name="Chin; Tawr" />
+	<iso_639_3_entry
+		id="tcq"
+		scope="I"
+		type="L"
+		name="Kaiy" />
+	<iso_639_3_entry
+		id="tcs"
+		scope="I"
+		type="L"
+		name="Creole; Torres Strait" />
+	<iso_639_3_entry
+		id="tct"
+		scope="I"
+		type="L"
+		name="T'en" />
+	<iso_639_3_entry
+		id="tcu"
+		scope="I"
+		type="L"
+		name="Tarahumara; Southeastern" />
+	<iso_639_3_entry
+		id="tcw"
+		scope="I"
+		type="L"
+		name="Totonac; Tecpatlán" />
+	<iso_639_3_entry
+		id="tcx"
+		scope="I"
+		type="L"
+		name="Toda" />
+	<iso_639_3_entry
+		id="tcy"
+		scope="I"
+		type="L"
+		name="Tulu" />
+	<iso_639_3_entry
+		id="tcz"
+		scope="I"
+		type="L"
+		name="Chin; Thado" />
+	<iso_639_3_entry
+		id="tda"
+		scope="I"
+		type="L"
+		name="Tagdal" />
+	<iso_639_3_entry
+		id="tdb"
+		scope="I"
+		type="L"
+		name="Panchpargania" />
+	<iso_639_3_entry
+		id="tdc"
+		scope="I"
+		type="L"
+		name="Emberá-Tadó" />
+	<iso_639_3_entry
+		id="tdd"
+		scope="I"
+		type="L"
+		name="Tai Nüa" />
+	<iso_639_3_entry
+		id="tde"
+		scope="I"
+		type="L"
+		name="Dogon; Tiranige Diga" />
+	<iso_639_3_entry
+		id="tdf"
+		scope="I"
+		type="L"
+		name="Talieng" />
+	<iso_639_3_entry
+		id="tdg"
+		scope="I"
+		type="L"
+		name="Tamang; Western" />
+	<iso_639_3_entry
+		id="tdh"
+		scope="I"
+		type="L"
+		name="Thulung" />
+	<iso_639_3_entry
+		id="tdi"
+		scope="I"
+		type="L"
+		name="Tomadino" />
+	<iso_639_3_entry
+		id="tdj"
+		scope="I"
+		type="L"
+		name="Tajio" />
+	<iso_639_3_entry
+		id="tdk"
+		scope="I"
+		type="L"
+		name="Tambas" />
+	<iso_639_3_entry
+		id="tdl"
+		scope="I"
+		type="L"
+		name="Sur" />
+	<iso_639_3_entry
+		id="tdn"
+		scope="I"
+		type="L"
+		name="Tondano" />
+	<iso_639_3_entry
+		id="tdo"
+		scope="I"
+		type="L"
+		name="Teme" />
+	<iso_639_3_entry
+		id="tdq"
+		scope="I"
+		type="L"
+		name="Tita" />
+	<iso_639_3_entry
+		id="tdr"
+		scope="I"
+		type="L"
+		name="Todrah" />
+	<iso_639_3_entry
+		id="tds"
+		scope="I"
+		type="L"
+		name="Doutai" />
+	<iso_639_3_entry
+		id="tdt"
+		scope="I"
+		type="L"
+		name="Tetun Dili" />
+	<iso_639_3_entry
+		id="tdu"
+		scope="I"
+		type="L"
+		name="Dusun; Tempasuk" />
+	<iso_639_3_entry
+		id="tdv"
+		scope="I"
+		type="L"
+		name="Toro" />
+	<iso_639_3_entry
+		id="tdx"
+		scope="I"
+		type="L"
+		name="Malagasy; Tandroy-Mahafaly" />
+	<iso_639_3_entry
+		id="tdy"
+		scope="I"
+		type="L"
+		name="Tadyawan" />
+	<iso_639_3_entry
+		id="tea"
+		scope="I"
+		type="L"
+		name="Temiar" />
+	<iso_639_3_entry
+		id="teb"
+		scope="I"
+		type="E"
+		name="Tetete" />
+	<iso_639_3_entry
+		id="tec"
+		scope="I"
+		type="L"
+		name="Terik" />
+	<iso_639_3_entry
+		id="ted"
+		scope="I"
+		type="L"
+		name="Krumen; Tepo" />
+	<iso_639_3_entry
+		id="tee"
+		scope="I"
+		type="L"
+		name="Tepehua; Huehuetla" />
+	<iso_639_3_entry
+		id="tef"
+		scope="I"
+		type="L"
+		name="Teressa" />
+	<iso_639_3_entry
+		id="teg"
+		scope="I"
+		type="L"
+		name="Teke-Tege" />
+	<iso_639_3_entry
+		id="teh"
+		scope="I"
+		type="L"
+		name="Tehuelche" />
+	<iso_639_3_entry
+		id="tei"
+		scope="I"
+		type="L"
+		name="Torricelli" />
+	<iso_639_3_entry
+		id="tek"
+		scope="I"
+		type="L"
+		name="Teke; Ibali" />
+	<iso_639_3_entry
+		id="tel"
+		part1_code="te"
+		part2_code="tel"
+		scope="I"
+		type="L"
+		name="Telugu" />
+	<iso_639_3_entry
+		id="tem"
+		part2_code="tem"
+		scope="I"
+		type="L"
+		name="Timne" />
+	<iso_639_3_entry
+		id="ten"
+		scope="I"
+		type="E"
+		name="Tama (Colombia)" />
+	<iso_639_3_entry
+		id="teo"
+		scope="I"
+		type="L"
+		name="Teso" />
+	<iso_639_3_entry
+		id="tep"
+		scope="I"
+		type="E"
+		name="Tepecano" />
+	<iso_639_3_entry
+		id="teq"
+		scope="I"
+		type="L"
+		name="Temein" />
+	<iso_639_3_entry
+		id="ter"
+		part2_code="ter"
+		scope="I"
+		type="L"
+		name="Tereno" />
+	<iso_639_3_entry
+		id="tes"
+		scope="I"
+		type="L"
+		name="Tengger" />
+	<iso_639_3_entry
+		id="tet"
+		part2_code="tet"
+		scope="I"
+		type="L"
+		name="Tetum" />
+	<iso_639_3_entry
+		id="teu"
+		scope="I"
+		type="L"
+		name="Soo" />
+	<iso_639_3_entry
+		id="tev"
+		scope="I"
+		type="L"
+		name="Teor" />
+	<iso_639_3_entry
+		id="tew"
+		scope="I"
+		type="L"
+		name="Tewa (USA)" />
+	<iso_639_3_entry
+		id="tex"
+		scope="I"
+		type="L"
+		name="Tennet" />
+	<iso_639_3_entry
+		id="tey"
+		scope="I"
+		type="L"
+		name="Tulishi" />
+	<iso_639_3_entry
+		id="tfi"
+		scope="I"
+		type="L"
+		name="Gbe; Tofin" />
+	<iso_639_3_entry
+		id="tfn"
+		scope="I"
+		type="L"
+		name="Tanaina" />
+	<iso_639_3_entry
+		id="tfo"
+		scope="I"
+		type="L"
+		name="Tefaro" />
+	<iso_639_3_entry
+		id="tfr"
+		scope="I"
+		type="L"
+		name="Teribe" />
+	<iso_639_3_entry
+		id="tft"
+		scope="I"
+		type="L"
+		name="Ternate" />
+	<iso_639_3_entry
+		id="tga"
+		scope="I"
+		type="L"
+		name="Sagalla" />
+	<iso_639_3_entry
+		id="tgb"
+		scope="I"
+		type="L"
+		name="Tobilung" />
+	<iso_639_3_entry
+		id="tgc"
+		scope="I"
+		type="L"
+		name="Tigak" />
+	<iso_639_3_entry
+		id="tgd"
+		scope="I"
+		type="L"
+		name="Ciwogai" />
+	<iso_639_3_entry
+		id="tge"
+		scope="I"
+		type="L"
+		name="Tamang; Eastern Gorkha" />
+	<iso_639_3_entry
+		id="tgf"
+		scope="I"
+		type="L"
+		name="Chalikha" />
+	<iso_639_3_entry
+		id="tgg"
+		scope="I"
+		type="L"
+		name="Tangga" />
+	<iso_639_3_entry
+		id="tgh"
+		scope="I"
+		type="L"
+		name="Creole English; Tobagonian" />
+	<iso_639_3_entry
+		id="tgi"
+		scope="I"
+		type="L"
+		name="Lawunuia" />
+	<iso_639_3_entry
+		id="tgk"
+		part1_code="tg"
+		part2_code="tgk"
+		scope="I"
+		type="L"
+		name="Tajik" />
+	<iso_639_3_entry
+		id="tgl"
+		part1_code="tl"
+		part2_code="tgl"
+		scope="I"
+		type="L"
+		name="Tagalog" />
+	<iso_639_3_entry
+		id="tgn"
+		scope="I"
+		type="L"
+		name="Tandaganon" />
+	<iso_639_3_entry
+		id="tgo"
+		scope="I"
+		type="L"
+		name="Sudest" />
+	<iso_639_3_entry
+		id="tgp"
+		scope="I"
+		type="L"
+		name="Tangoa" />
+	<iso_639_3_entry
+		id="tgq"
+		scope="I"
+		type="L"
+		name="Tring" />
+	<iso_639_3_entry
+		id="tgr"
+		scope="I"
+		type="L"
+		name="Tareng" />
+	<iso_639_3_entry
+		id="tgs"
+		scope="I"
+		type="L"
+		name="Nume" />
+	<iso_639_3_entry
+		id="tgt"
+		scope="I"
+		type="L"
+		name="Tagbanwa; Central" />
+	<iso_639_3_entry
+		id="tgu"
+		scope="I"
+		type="L"
+		name="Tanggu" />
+	<iso_639_3_entry
+		id="tgv"
+		scope="I"
+		type="E"
+		name="Tingui-Boto" />
+	<iso_639_3_entry
+		id="tgw"
+		scope="I"
+		type="L"
+		name="Senoufo; Tagwana" />
+	<iso_639_3_entry
+		id="tgx"
+		scope="I"
+		type="L"
+		name="Tagish" />
+	<iso_639_3_entry
+		id="tgy"
+		scope="I"
+		type="E"
+		name="Togoyo" />
+	<iso_639_3_entry
+		id="tha"
+		part1_code="th"
+		part2_code="tha"
+		scope="I"
+		type="L"
+		name="Thai" />
+	<iso_639_3_entry
+		id="thc"
+		scope="I"
+		type="L"
+		name="Tai Hang Tong" />
+	<iso_639_3_entry
+		id="thd"
+		scope="I"
+		type="L"
+		name="Thayore" />
+	<iso_639_3_entry
+		id="the"
+		scope="I"
+		type="L"
+		name="Tharu; Chitwania" />
+	<iso_639_3_entry
+		id="thf"
+		scope="I"
+		type="L"
+		name="Thangmi" />
+	<iso_639_3_entry
+		id="thh"
+		scope="I"
+		type="L"
+		name="Tarahumara; Northern" />
+	<iso_639_3_entry
+		id="thi"
+		scope="I"
+		type="L"
+		name="Tai Long" />
+	<iso_639_3_entry
+		id="thk"
+		scope="I"
+		type="L"
+		name="Tharaka" />
+	<iso_639_3_entry
+		id="thl"
+		scope="I"
+		type="L"
+		name="Tharu; Dangaura" />
+	<iso_639_3_entry
+		id="thm"
+		scope="I"
+		type="L"
+		name="Aheu" />
+	<iso_639_3_entry
+		id="thn"
+		scope="I"
+		type="L"
+		name="Thachanadan" />
+	<iso_639_3_entry
+		id="thp"
+		scope="I"
+		type="L"
+		name="Thompson" />
+	<iso_639_3_entry
+		id="thq"
+		scope="I"
+		type="L"
+		name="Tharu; Kochila" />
+	<iso_639_3_entry
+		id="thr"
+		scope="I"
+		type="L"
+		name="Tharu; Rana" />
+	<iso_639_3_entry
+		id="ths"
+		scope="I"
+		type="L"
+		name="Thakali" />
+	<iso_639_3_entry
+		id="tht"
+		scope="I"
+		type="L"
+		name="Tahltan" />
+	<iso_639_3_entry
+		id="thu"
+		scope="I"
+		type="L"
+		name="Thuri" />
+	<iso_639_3_entry
+		id="thv"
+		scope="I"
+		type="L"
+		name="Tamahaq; Tahaggart" />
+	<iso_639_3_entry
+		id="thw"
+		scope="I"
+		type="L"
+		name="Thudam" />
+	<iso_639_3_entry
+		id="thx"
+		scope="I"
+		type="L"
+		name="The" />
+	<iso_639_3_entry
+		id="thy"
+		scope="I"
+		type="L"
+		name="Tha" />
+	<iso_639_3_entry
+		id="thz"
+		scope="I"
+		type="L"
+		name="Tamajeq; Tayart" />
+	<iso_639_3_entry
+		id="tia"
+		scope="I"
+		type="L"
+		name="Tamazight; Tidikelt" />
+	<iso_639_3_entry
+		id="tic"
+		scope="I"
+		type="L"
+		name="Tira" />
+	<iso_639_3_entry
+		id="tid"
+		scope="I"
+		type="L"
+		name="Tidong" />
+	<iso_639_3_entry
+		id="tif"
+		scope="I"
+		type="L"
+		name="Tifal" />
+	<iso_639_3_entry
+		id="tig"
+		part2_code="tig"
+		scope="I"
+		type="L"
+		name="Tigre" />
+	<iso_639_3_entry
+		id="tih"
+		scope="I"
+		type="L"
+		name="Murut; Timugon" />
+	<iso_639_3_entry
+		id="tii"
+		scope="I"
+		type="L"
+		name="Tiene" />
+	<iso_639_3_entry
+		id="tij"
+		scope="I"
+		type="L"
+		name="Tilung" />
+	<iso_639_3_entry
+		id="tik"
+		scope="I"
+		type="L"
+		name="Tikar" />
+	<iso_639_3_entry
+		id="til"
+		scope="I"
+		type="E"
+		name="Tillamook" />
+	<iso_639_3_entry
+		id="tim"
+		scope="I"
+		type="L"
+		name="Timbe" />
+	<iso_639_3_entry
+		id="tin"
+		scope="I"
+		type="L"
+		name="Tindi" />
+	<iso_639_3_entry
+		id="tio"
+		scope="I"
+		type="L"
+		name="Teop" />
+	<iso_639_3_entry
+		id="tip"
+		scope="I"
+		type="L"
+		name="Trimuris" />
+	<iso_639_3_entry
+		id="tiq"
+		scope="I"
+		type="L"
+		name="Tiéfo" />
+	<iso_639_3_entry
+		id="tir"
+		part1_code="ti"
+		part2_code="tir"
+		scope="I"
+		type="L"
+		name="Tigrinya" />
+	<iso_639_3_entry
+		id="tis"
+		scope="I"
+		type="L"
+		name="Itneg; Masadiit" />
+	<iso_639_3_entry
+		id="tit"
+		scope="I"
+		type="L"
+		name="Tinigua" />
+	<iso_639_3_entry
+		id="tiu"
+		scope="I"
+		type="L"
+		name="Adasen" />
+	<iso_639_3_entry
+		id="tiv"
+		part2_code="tiv"
+		scope="I"
+		type="L"
+		name="Tiv" />
+	<iso_639_3_entry
+		id="tiw"
+		scope="I"
+		type="L"
+		name="Tiwi" />
+	<iso_639_3_entry
+		id="tix"
+		scope="I"
+		type="L"
+		name="Tiwa; Southern" />
+	<iso_639_3_entry
+		id="tiy"
+		scope="I"
+		type="L"
+		name="Tiruray" />
+	<iso_639_3_entry
+		id="tiz"
+		scope="I"
+		type="L"
+		name="Tai Hongjin" />
+	<iso_639_3_entry
+		id="tja"
+		scope="I"
+		type="L"
+		name="Tajuasohn" />
+	<iso_639_3_entry
+		id="tjg"
+		scope="I"
+		type="L"
+		name="Tunjung" />
+	<iso_639_3_entry
+		id="tji"
+		scope="I"
+		type="L"
+		name="Tujia; Northern" />
+	<iso_639_3_entry
+		id="tjm"
+		scope="I"
+		type="E"
+		name="Timucua" />
+	<iso_639_3_entry
+		id="tjn"
+		scope="I"
+		type="E"
+		name="Tonjon" />
+	<iso_639_3_entry
+		id="tjo"
+		scope="I"
+		type="L"
+		name="Tamazight; Temacine" />
+	<iso_639_3_entry
+		id="tjs"
+		scope="I"
+		type="L"
+		name="Tujia; Southern" />
+	<iso_639_3_entry
+		id="tju"
+		scope="I"
+		type="E"
+		name="Tjurruru" />
+	<iso_639_3_entry
+		id="tka"
+		scope="I"
+		type="E"
+		name="Truká" />
+	<iso_639_3_entry
+		id="tkb"
+		scope="I"
+		type="L"
+		name="Buksa" />
+	<iso_639_3_entry
+		id="tkd"
+		scope="I"
+		type="L"
+		name="Tukudede" />
+	<iso_639_3_entry
+		id="tke"
+		scope="I"
+		type="L"
+		name="Takwane" />
+	<iso_639_3_entry
+		id="tkf"
+		scope="I"
+		type="E"
+		name="Tukumanféd" />
+	<iso_639_3_entry
+		id="tkg"
+		scope="I"
+		type="L"
+		name="Malagasy; Tesaka" />
+	<iso_639_3_entry
+		id="tkl"
+		part2_code="tkl"
+		scope="I"
+		type="L"
+		name="Tokelau" />
+	<iso_639_3_entry
+		id="tkm"
+		scope="I"
+		type="E"
+		name="Takelma" />
+	<iso_639_3_entry
+		id="tkn"
+		scope="I"
+		type="L"
+		name="Toku-No-Shima" />
+	<iso_639_3_entry
+		id="tkp"
+		scope="I"
+		type="L"
+		name="Tikopia" />
+	<iso_639_3_entry
+		id="tkq"
+		scope="I"
+		type="L"
+		name="Tee" />
+	<iso_639_3_entry
+		id="tkr"
+		scope="I"
+		type="L"
+		name="Tsakhur" />
+	<iso_639_3_entry
+		id="tks"
+		scope="I"
+		type="L"
+		name="Takestani" />
+	<iso_639_3_entry
+		id="tkt"
+		scope="I"
+		type="L"
+		name="Tharu; Kathoriya" />
+	<iso_639_3_entry
+		id="tku"
+		scope="I"
+		type="L"
+		name="Totonac; Upper Necaxa" />
+	<iso_639_3_entry
+		id="tkw"
+		scope="I"
+		type="L"
+		name="Teanu" />
+	<iso_639_3_entry
+		id="tkx"
+		scope="I"
+		type="L"
+		name="Tangko" />
+	<iso_639_3_entry
+		id="tkz"
+		scope="I"
+		type="L"
+		name="Takua" />
+	<iso_639_3_entry
+		id="tla"
+		scope="I"
+		type="L"
+		name="Tepehuan; Southwestern" />
+	<iso_639_3_entry
+		id="tlb"
+		scope="I"
+		type="L"
+		name="Tobelo" />
+	<iso_639_3_entry
+		id="tlc"
+		scope="I"
+		type="L"
+		name="Totonac; Yecuatla" />
+	<iso_639_3_entry
+		id="tld"
+		scope="I"
+		type="L"
+		name="Talaud" />
+	<iso_639_3_entry
+		id="tlf"
+		scope="I"
+		type="L"
+		name="Telefol" />
+	<iso_639_3_entry
+		id="tlg"
+		scope="I"
+		type="L"
+		name="Tofanma" />
+	<iso_639_3_entry
+		id="tlh"
+		part2_code="tlh"
+		scope="I"
+		type="C"
+		name="Klingon" />
+	<iso_639_3_entry
+		id="tli"
+		part2_code="tli"
+		scope="I"
+		type="L"
+		name="Tlingit" />
+	<iso_639_3_entry
+		id="tlj"
+		scope="I"
+		type="L"
+		name="Talinga-Bwisi" />
+	<iso_639_3_entry
+		id="tlk"
+		scope="I"
+		type="L"
+		name="Taloki" />
+	<iso_639_3_entry
+		id="tll"
+		scope="I"
+		type="L"
+		name="Tetela" />
+	<iso_639_3_entry
+		id="tlm"
+		scope="I"
+		type="L"
+		name="Tolomako" />
+	<iso_639_3_entry
+		id="tln"
+		scope="I"
+		type="L"
+		name="Talondo'" />
+	<iso_639_3_entry
+		id="tlo"
+		scope="I"
+		type="L"
+		name="Talodi" />
+	<iso_639_3_entry
+		id="tlp"
+		scope="I"
+		type="L"
+		name="Totonac; Filomena Mata-Coahuitlán" />
+	<iso_639_3_entry
+		id="tlq"
+		scope="I"
+		type="L"
+		name="Tai Loi" />
+	<iso_639_3_entry
+		id="tlr"
+		scope="I"
+		type="L"
+		name="Talise" />
+	<iso_639_3_entry
+		id="tls"
+		scope="I"
+		type="L"
+		name="Tambotalo" />
+	<iso_639_3_entry
+		id="tlt"
+		scope="I"
+		type="L"
+		name="Teluti" />
+	<iso_639_3_entry
+		id="tlu"
+		scope="I"
+		type="L"
+		name="Tulehu" />
+	<iso_639_3_entry
+		id="tlv"
+		scope="I"
+		type="L"
+		name="Taliabu" />
+	<iso_639_3_entry
+		id="tlw"
+		scope="I"
+		type="L"
+		name="Wemale; South" />
+	<iso_639_3_entry
+		id="tlx"
+		scope="I"
+		type="L"
+		name="Khehek" />
+	<iso_639_3_entry
+		id="tly"
+		scope="I"
+		type="L"
+		name="Talysh" />
+	<iso_639_3_entry
+		id="tma"
+		scope="I"
+		type="L"
+		name="Tama (Chad)" />
+	<iso_639_3_entry
+		id="tmb"
+		scope="I"
+		type="L"
+		name="Katbol" />
+	<iso_639_3_entry
+		id="tmc"
+		scope="I"
+		type="L"
+		name="Tumak" />
+	<iso_639_3_entry
+		id="tmd"
+		scope="I"
+		type="L"
+		name="Haruai" />
+	<iso_639_3_entry
+		id="tme"
+		scope="I"
+		type="E"
+		name="Tremembé" />
+	<iso_639_3_entry
+		id="tmf"
+		scope="I"
+		type="L"
+		name="Toba-Maskoy" />
+	<iso_639_3_entry
+		id="tmg"
+		scope="I"
+		type="E"
+		name="Ternateño" />
+	<iso_639_3_entry
+		id="tmh"
+		part2_code="tmh"
+		scope="M"
+		type="L"
+		name="Tamashek" />
+	<iso_639_3_entry
+		id="tmi"
+		scope="I"
+		type="L"
+		name="Tutuba" />
+	<iso_639_3_entry
+		id="tmj"
+		scope="I"
+		type="L"
+		name="Samarokena" />
+	<iso_639_3_entry
+		id="tmk"
+		scope="I"
+		type="L"
+		name="Tamang; Northwestern" />
+	<iso_639_3_entry
+		id="tml"
+		scope="I"
+		type="L"
+		name="Citak; Tamnim" />
+	<iso_639_3_entry
+		id="tmm"
+		scope="I"
+		type="L"
+		name="Tai Thanh" />
+	<iso_639_3_entry
+		id="tmn"
+		scope="I"
+		type="L"
+		name="Taman (Indonesia)" />
+	<iso_639_3_entry
+		id="tmo"
+		scope="I"
+		type="L"
+		name="Temoq" />
+	<iso_639_3_entry
+		id="tmp"
+		scope="I"
+		type="L"
+		name="Tai Mène" />
+	<iso_639_3_entry
+		id="tmq"
+		scope="I"
+		type="L"
+		name="Tumleo" />
+	<iso_639_3_entry
+		id="tmr"
+		scope="I"
+		type="E"
+		name="Aramaic; Jewish Babylonian (ca. 200-1200 CE)" />
+	<iso_639_3_entry
+		id="tms"
+		scope="I"
+		type="L"
+		name="Tima" />
+	<iso_639_3_entry
+		id="tmt"
+		scope="I"
+		type="L"
+		name="Tasmate" />
+	<iso_639_3_entry
+		id="tmu"
+		scope="I"
+		type="L"
+		name="Iau" />
+	<iso_639_3_entry
+		id="tmv"
+		scope="I"
+		type="L"
+		name="Tembo (Motembo)" />
+	<iso_639_3_entry
+		id="tmw"
+		scope="I"
+		type="L"
+		name="Temuan" />
+	<iso_639_3_entry
+		id="tmy"
+		scope="I"
+		type="L"
+		name="Tami" />
+	<iso_639_3_entry
+		id="tmz"
+		scope="I"
+		type="E"
+		name="Tamanaku" />
+	<iso_639_3_entry
+		id="tna"
+		scope="I"
+		type="L"
+		name="Tacana" />
+	<iso_639_3_entry
+		id="tnb"
+		scope="I"
+		type="L"
+		name="Tunebo; Western" />
+	<iso_639_3_entry
+		id="tnc"
+		scope="I"
+		type="L"
+		name="Tanimuca-Retuarã" />
+	<iso_639_3_entry
+		id="tnd"
+		scope="I"
+		type="L"
+		name="Tunebo; Angosturas" />
+	<iso_639_3_entry
+		id="tne"
+		scope="I"
+		type="L"
+		name="Kallahan; Tinoc" />
+	<iso_639_3_entry
+		id="tng"
+		scope="I"
+		type="L"
+		name="Tobanga" />
+	<iso_639_3_entry
+		id="tnh"
+		scope="I"
+		type="L"
+		name="Maiani" />
+	<iso_639_3_entry
+		id="tni"
+		scope="I"
+		type="L"
+		name="Tandia" />
+	<iso_639_3_entry
+		id="tnk"
+		scope="I"
+		type="L"
+		name="Kwamera" />
+	<iso_639_3_entry
+		id="tnl"
+		scope="I"
+		type="L"
+		name="Lenakel" />
+	<iso_639_3_entry
+		id="tnm"
+		scope="I"
+		type="L"
+		name="Tabla" />
+	<iso_639_3_entry
+		id="tnn"
+		scope="I"
+		type="L"
+		name="Tanna; North" />
+	<iso_639_3_entry
+		id="tno"
+		scope="I"
+		type="L"
+		name="Toromono" />
+	<iso_639_3_entry
+		id="tnp"
+		scope="I"
+		type="L"
+		name="Whitesands" />
+	<iso_639_3_entry
+		id="tnq"
+		scope="I"
+		type="E"
+		name="Taino" />
+	<iso_639_3_entry
+		id="tnr"
+		scope="I"
+		type="L"
+		name="Bedik" />
+	<iso_639_3_entry
+		id="tns"
+		scope="I"
+		type="L"
+		name="Tenis" />
+	<iso_639_3_entry
+		id="tnt"
+		scope="I"
+		type="L"
+		name="Tontemboan" />
+	<iso_639_3_entry
+		id="tnu"
+		scope="I"
+		type="L"
+		name="Tay Khang" />
+	<iso_639_3_entry
+		id="tnv"
+		scope="I"
+		type="L"
+		name="Tangchangya" />
+	<iso_639_3_entry
+		id="tnw"
+		scope="I"
+		type="L"
+		name="Tonsawang" />
+	<iso_639_3_entry
+		id="tnx"
+		scope="I"
+		type="L"
+		name="Tanema" />
+	<iso_639_3_entry
+		id="tny"
+		scope="I"
+		type="L"
+		name="Tongwe" />
+	<iso_639_3_entry
+		id="tnz"
+		scope="I"
+		type="L"
+		name="Tonga (Thailand)" />
+	<iso_639_3_entry
+		id="tob"
+		scope="I"
+		type="L"
+		name="Toba" />
+	<iso_639_3_entry
+		id="toc"
+		scope="I"
+		type="L"
+		name="Totonac; Coyutla" />
+	<iso_639_3_entry
+		id="tod"
+		scope="I"
+		type="L"
+		name="Toma" />
+	<iso_639_3_entry
+		id="toe"
+		scope="I"
+		type="E"
+		name="Tomedes" />
+	<iso_639_3_entry
+		id="tof"
+		scope="I"
+		type="L"
+		name="Gizrra" />
+	<iso_639_3_entry
+		id="tog"
+		part2_code="tog"
+		scope="I"
+		type="L"
+		name="Tonga (Nyasa)" />
+	<iso_639_3_entry
+		id="toh"
+		scope="I"
+		type="L"
+		name="Gitonga" />
+	<iso_639_3_entry
+		id="toi"
+		scope="I"
+		type="L"
+		name="Tonga (Zambia)" />
+	<iso_639_3_entry
+		id="toj"
+		scope="I"
+		type="L"
+		name="Tojolabal" />
+	<iso_639_3_entry
+		id="tol"
+		scope="I"
+		type="L"
+		name="Tolowa" />
+	<iso_639_3_entry
+		id="tom"
+		scope="I"
+		type="L"
+		name="Tombulu" />
+	<iso_639_3_entry
+		id="ton"
+		part1_code="to"
+		part2_code="ton"
+		scope="I"
+		type="L"
+		name="Tonga (Tonga Islands)" />
+	<iso_639_3_entry
+		id="too"
+		scope="I"
+		type="L"
+		name="Totonac; Xicotepec De Juárez" />
+	<iso_639_3_entry
+		id="top"
+		scope="I"
+		type="L"
+		name="Totonac; Papantla" />
+	<iso_639_3_entry
+		id="toq"
+		scope="I"
+		type="L"
+		name="Toposa" />
+	<iso_639_3_entry
+		id="tor"
+		scope="I"
+		type="L"
+		name="Banda; Togbo-Vara" />
+	<iso_639_3_entry
+		id="tos"
+		scope="I"
+		type="L"
+		name="Totonac; Highland" />
+	<iso_639_3_entry
+		id="tou"
+		scope="I"
+		type="L"
+		name="Tho" />
+	<iso_639_3_entry
+		id="tov"
+		scope="I"
+		type="L"
+		name="Taromi; Upper" />
+	<iso_639_3_entry
+		id="tow"
+		scope="I"
+		type="L"
+		name="Jemez" />
+	<iso_639_3_entry
+		id="tox"
+		scope="I"
+		type="L"
+		name="Tobian" />
+	<iso_639_3_entry
+		id="toy"
+		scope="I"
+		type="L"
+		name="Topoiyo" />
+	<iso_639_3_entry
+		id="toz"
+		scope="I"
+		type="L"
+		name="To" />
+	<iso_639_3_entry
+		id="tpa"
+		scope="I"
+		type="L"
+		name="Taupota" />
+	<iso_639_3_entry
+		id="tpc"
+		scope="I"
+		type="L"
+		name="Tlapanec; Azoyú" />
+	<iso_639_3_entry
+		id="tpe"
+		scope="I"
+		type="L"
+		name="Tippera" />
+	<iso_639_3_entry
+		id="tpf"
+		scope="I"
+		type="L"
+		name="Tarpia" />
+	<iso_639_3_entry
+		id="tpg"
+		scope="I"
+		type="L"
+		name="Kula" />
+	<iso_639_3_entry
+		id="tpi"
+		part2_code="tpi"
+		scope="I"
+		type="L"
+		name="Tok Pisin" />
+	<iso_639_3_entry
+		id="tpj"
+		scope="I"
+		type="L"
+		name="Tapieté" />
+	<iso_639_3_entry
+		id="tpk"
+		scope="I"
+		type="E"
+		name="Tupinikin" />
+	<iso_639_3_entry
+		id="tpl"
+		scope="I"
+		type="L"
+		name="Tlapanec; Tlacoapa" />
+	<iso_639_3_entry
+		id="tpm"
+		scope="I"
+		type="L"
+		name="Tampulma" />
+	<iso_639_3_entry
+		id="tpn"
+		scope="I"
+		type="E"
+		name="Tupinambá" />
+	<iso_639_3_entry
+		id="tpo"
+		scope="I"
+		type="L"
+		name="Tai Pao" />
+	<iso_639_3_entry
+		id="tpp"
+		scope="I"
+		type="L"
+		name="Tepehua; Pisaflores" />
+	<iso_639_3_entry
+		id="tpq"
+		scope="I"
+		type="L"
+		name="Tukpa" />
+	<iso_639_3_entry
+		id="tpr"
+		scope="I"
+		type="L"
+		name="Tuparí" />
+	<iso_639_3_entry
+		id="tpt"
+		scope="I"
+		type="L"
+		name="Tepehua; Tlachichilco" />
+	<iso_639_3_entry
+		id="tpu"
+		scope="I"
+		type="L"
+		name="Tampuan" />
+	<iso_639_3_entry
+		id="tpv"
+		scope="I"
+		type="L"
+		name="Tanapag" />
+	<iso_639_3_entry
+		id="tpw"
+		scope="I"
+		type="E"
+		name="Tupí" />
+	<iso_639_3_entry
+		id="tpx"
+		scope="I"
+		type="L"
+		name="Tlapanec; Acatepec" />
+	<iso_639_3_entry
+		id="tpy"
+		scope="I"
+		type="L"
+		name="Trumai" />
+	<iso_639_3_entry
+		id="tpz"
+		scope="I"
+		type="L"
+		name="Tinputz" />
+	<iso_639_3_entry
+		id="tqb"
+		scope="I"
+		type="L"
+		name="Tembé" />
+	<iso_639_3_entry
+		id="tql"
+		scope="I"
+		type="L"
+		name="Lehali" />
+	<iso_639_3_entry
+		id="tqm"
+		scope="I"
+		type="L"
+		name="Turumsa" />
+	<iso_639_3_entry
+		id="tqn"
+		scope="I"
+		type="L"
+		name="Tenino" />
+	<iso_639_3_entry
+		id="tqo"
+		scope="I"
+		type="L"
+		name="Toaripi" />
+	<iso_639_3_entry
+		id="tqp"
+		scope="I"
+		type="L"
+		name="Tomoip" />
+	<iso_639_3_entry
+		id="tqq"
+		scope="I"
+		type="L"
+		name="Tunni" />
+	<iso_639_3_entry
+		id="tqr"
+		scope="I"
+		type="E"
+		name="Torona" />
+	<iso_639_3_entry
+		id="tqt"
+		scope="I"
+		type="L"
+		name="Totonac; Western" />
+	<iso_639_3_entry
+		id="tqu"
+		scope="I"
+		type="L"
+		name="Touo" />
+	<iso_639_3_entry
+		id="tqw"
+		scope="I"
+		type="E"
+		name="Tonkawa" />
+	<iso_639_3_entry
+		id="tra"
+		scope="I"
+		type="L"
+		name="Tirahi" />
+	<iso_639_3_entry
+		id="trb"
+		scope="I"
+		type="L"
+		name="Terebu" />
+	<iso_639_3_entry
+		id="trc"
+		scope="I"
+		type="L"
+		name="Triqui; Copala" />
+	<iso_639_3_entry
+		id="trd"
+		scope="I"
+		type="L"
+		name="Turi" />
+	<iso_639_3_entry
+		id="tre"
+		scope="I"
+		type="L"
+		name="Tarangan; East" />
+	<iso_639_3_entry
+		id="trf"
+		scope="I"
+		type="L"
+		name="Creole English; Trinidadian" />
+	<iso_639_3_entry
+		id="trg"
+		scope="I"
+		type="L"
+		name="Lishán Didán" />
+	<iso_639_3_entry
+		id="trh"
+		scope="I"
+		type="L"
+		name="Turaka" />
+	<iso_639_3_entry
+		id="tri"
+		scope="I"
+		type="L"
+		name="Trió" />
+	<iso_639_3_entry
+		id="trj"
+		scope="I"
+		type="L"
+		name="Toram" />
+	<iso_639_3_entry
+		id="trl"
+		scope="I"
+		type="L"
+		name="Scottish; Traveller" />
+	<iso_639_3_entry
+		id="trm"
+		scope="I"
+		type="L"
+		name="Tregami" />
+	<iso_639_3_entry
+		id="trn"
+		scope="I"
+		type="L"
+		name="Trinitario" />
+	<iso_639_3_entry
+		id="tro"
+		scope="I"
+		type="L"
+		name="Naga; Tarao" />
+	<iso_639_3_entry
+		id="trp"
+		scope="I"
+		type="L"
+		name="Kok Borok" />
+	<iso_639_3_entry
+		id="trq"
+		scope="I"
+		type="L"
+		name="Triqui; San Martín Itunyoso" />
+	<iso_639_3_entry
+		id="trr"
+		scope="I"
+		type="L"
+		name="Taushiro" />
+	<iso_639_3_entry
+		id="trs"
+		scope="I"
+		type="L"
+		name="Triqui; Chicahuaxtla" />
+	<iso_639_3_entry
+		id="trt"
+		scope="I"
+		type="L"
+		name="Tunggare" />
+	<iso_639_3_entry
+		id="tru"
+		scope="I"
+		type="L"
+		name="Turoyo" />
+	<iso_639_3_entry
+		id="trv"
+		scope="I"
+		type="L"
+		name="Taroko" />
+	<iso_639_3_entry
+		id="trw"
+		scope="I"
+		type="L"
+		name="Torwali" />
+	<iso_639_3_entry
+		id="trx"
+		scope="I"
+		type="L"
+		name="Bidayuh; Tringgus-Sembaan" />
+	<iso_639_3_entry
+		id="try"
+		scope="I"
+		type="E"
+		name="Turung" />
+	<iso_639_3_entry
+		id="trz"
+		scope="I"
+		type="E"
+		name="Torá" />
+	<iso_639_3_entry
+		id="tsa"
+		scope="I"
+		type="L"
+		name="Tsaangi" />
+	<iso_639_3_entry
+		id="tsb"
+		scope="I"
+		type="L"
+		name="Tsamai" />
+	<iso_639_3_entry
+		id="tsc"
+		scope="I"
+		type="L"
+		name="Tswa" />
+	<iso_639_3_entry
+		id="tsd"
+		scope="I"
+		type="L"
+		name="Tsakonian" />
+	<iso_639_3_entry
+		id="tse"
+		scope="I"
+		type="L"
+		name="Tunisian Sign Language" />
+	<iso_639_3_entry
+		id="tsf"
+		scope="I"
+		type="L"
+		name="Tamang; Southwestern" />
+	<iso_639_3_entry
+		id="tsg"
+		scope="I"
+		type="L"
+		name="Tausug" />
+	<iso_639_3_entry
+		id="tsh"
+		scope="I"
+		type="L"
+		name="Tsuvan" />
+	<iso_639_3_entry
+		id="tsi"
+		part2_code="tsi"
+		scope="I"
+		type="L"
+		name="Tsimshian" />
+	<iso_639_3_entry
+		id="tsj"
+		scope="I"
+		type="L"
+		name="Tshangla" />
+	<iso_639_3_entry
+		id="tsk"
+		scope="I"
+		type="L"
+		name="Tseku" />
+	<iso_639_3_entry
+		id="tsl"
+		scope="I"
+		type="L"
+		name="Ts'ün-Lao" />
+	<iso_639_3_entry
+		id="tsm"
+		scope="I"
+		type="L"
+		name="Turkish Sign Language" />
+	<iso_639_3_entry
+		id="tsn"
+		part1_code="tn"
+		part2_code="tsn"
+		scope="I"
+		type="L"
+		name="Tswana" />
+	<iso_639_3_entry
+		id="tso"
+		part1_code="ts"
+		part2_code="tso"
+		scope="I"
+		type="L"
+		name="Tsonga" />
+	<iso_639_3_entry
+		id="tsp"
+		scope="I"
+		type="L"
+		name="Toussian; Northern" />
+	<iso_639_3_entry
+		id="tsq"
+		scope="I"
+		type="L"
+		name="Thai Sign Language" />
+	<iso_639_3_entry
+		id="tsr"
+		scope="I"
+		type="L"
+		name="Akei" />
+	<iso_639_3_entry
+		id="tss"
+		scope="I"
+		type="L"
+		name="Taiwan Sign Language" />
+	<iso_639_3_entry
+		id="tst"
+		scope="I"
+		type="L"
+		name="Songway Kiini; Tondi" />
+	<iso_639_3_entry
+		id="tsu"
+		scope="I"
+		type="L"
+		name="Tsou" />
+	<iso_639_3_entry
+		id="tsv"
+		scope="I"
+		type="L"
+		name="Tsogo" />
+	<iso_639_3_entry
+		id="tsw"
+		scope="I"
+		type="L"
+		name="Tsishingini" />
+	<iso_639_3_entry
+		id="tsx"
+		scope="I"
+		type="L"
+		name="Mubami" />
+	<iso_639_3_entry
+		id="tsy"
+		scope="I"
+		type="L"
+		name="Tebul Sign Language" />
+	<iso_639_3_entry
+		id="tsz"
+		scope="I"
+		type="L"
+		name="Purepecha" />
+	<iso_639_3_entry
+		id="tta"
+		scope="I"
+		type="E"
+		name="Tutelo" />
+	<iso_639_3_entry
+		id="ttb"
+		scope="I"
+		type="L"
+		name="Gaa" />
+	<iso_639_3_entry
+		id="ttc"
+		scope="I"
+		type="L"
+		name="Tektiteko" />
+	<iso_639_3_entry
+		id="ttd"
+		scope="I"
+		type="L"
+		name="Tauade" />
+	<iso_639_3_entry
+		id="tte"
+		scope="I"
+		type="L"
+		name="Bwanabwana" />
+	<iso_639_3_entry
+		id="ttf"
+		scope="I"
+		type="L"
+		name="Tuotomb" />
+	<iso_639_3_entry
+		id="ttg"
+		scope="I"
+		type="L"
+		name="Tutong" />
+	<iso_639_3_entry
+		id="tth"
+		scope="I"
+		type="L"
+		name="Ta'oih; Upper" />
+	<iso_639_3_entry
+		id="tti"
+		scope="I"
+		type="L"
+		name="Tobati" />
+	<iso_639_3_entry
+		id="ttj"
+		scope="I"
+		type="L"
+		name="Tooro" />
+	<iso_639_3_entry
+		id="ttk"
+		scope="I"
+		type="L"
+		name="Totoro" />
+	<iso_639_3_entry
+		id="ttl"
+		scope="I"
+		type="L"
+		name="Totela" />
+	<iso_639_3_entry
+		id="ttm"
+		scope="I"
+		type="L"
+		name="Tutchone; Northern" />
+	<iso_639_3_entry
+		id="ttn"
+		scope="I"
+		type="L"
+		name="Towei" />
+	<iso_639_3_entry
+		id="tto"
+		scope="I"
+		type="L"
+		name="Ta'oih; Lower" />
+	<iso_639_3_entry
+		id="ttp"
+		scope="I"
+		type="L"
+		name="Tombelala" />
+	<iso_639_3_entry
+		id="ttq"
+		scope="I"
+		type="L"
+		name="Tamajaq; Tawallammat" />
+	<iso_639_3_entry
+		id="ttr"
+		scope="I"
+		type="L"
+		name="Tera" />
+	<iso_639_3_entry
+		id="tts"
+		scope="I"
+		type="L"
+		name="Thai; Northeastern" />
+	<iso_639_3_entry
+		id="ttt"
+		scope="I"
+		type="L"
+		name="Tat; Muslim" />
+	<iso_639_3_entry
+		id="ttu"
+		scope="I"
+		type="L"
+		name="Torau" />
+	<iso_639_3_entry
+		id="ttv"
+		scope="I"
+		type="L"
+		name="Titan" />
+	<iso_639_3_entry
+		id="ttw"
+		scope="I"
+		type="L"
+		name="Long Wat" />
+	<iso_639_3_entry
+		id="tty"
+		scope="I"
+		type="L"
+		name="Sikaritai" />
+	<iso_639_3_entry
+		id="ttz"
+		scope="I"
+		type="L"
+		name="Tsum" />
+	<iso_639_3_entry
+		id="tua"
+		scope="I"
+		type="L"
+		name="Wiarumus" />
+	<iso_639_3_entry
+		id="tub"
+		scope="I"
+		type="L"
+		name="Tübatulabal" />
+	<iso_639_3_entry
+		id="tuc"
+		scope="I"
+		type="L"
+		name="Mutu" />
+	<iso_639_3_entry
+		id="tud"
+		scope="I"
+		type="E"
+		name="Tuxá" />
+	<iso_639_3_entry
+		id="tue"
+		scope="I"
+		type="L"
+		name="Tuyuca" />
+	<iso_639_3_entry
+		id="tuf"
+		scope="I"
+		type="L"
+		name="Tunebo; Central" />
+	<iso_639_3_entry
+		id="tug"
+		scope="I"
+		type="L"
+		name="Tunia" />
+	<iso_639_3_entry
+		id="tuh"
+		scope="I"
+		type="L"
+		name="Taulil" />
+	<iso_639_3_entry
+		id="tui"
+		scope="I"
+		type="L"
+		name="Tupuri" />
+	<iso_639_3_entry
+		id="tuj"
+		scope="I"
+		type="L"
+		name="Tugutil" />
+	<iso_639_3_entry
+		id="tuk"
+		part1_code="tk"
+		part2_code="tuk"
+		scope="I"
+		type="L"
+		name="Turkmen" />
+	<iso_639_3_entry
+		id="tul"
+		scope="I"
+		type="L"
+		name="Tula" />
+	<iso_639_3_entry
+		id="tum"
+		part2_code="tum"
+		scope="I"
+		type="L"
+		name="Tumbuka" />
+	<iso_639_3_entry
+		id="tun"
+		scope="I"
+		type="E"
+		name="Tunica" />
+	<iso_639_3_entry
+		id="tuo"
+		scope="I"
+		type="L"
+		name="Tucano" />
+	<iso_639_3_entry
+		id="tuq"
+		scope="I"
+		type="L"
+		name="Tedaga" />
+	<iso_639_3_entry
+		id="tur"
+		part1_code="tr"
+		part2_code="tur"
+		scope="I"
+		type="L"
+		name="Turkish" />
+	<iso_639_3_entry
+		id="tus"
+		scope="I"
+		type="L"
+		name="Tuscarora" />
+	<iso_639_3_entry
+		id="tuu"
+		scope="I"
+		type="L"
+		name="Tututni" />
+	<iso_639_3_entry
+		id="tuv"
+		scope="I"
+		type="L"
+		name="Turkana" />
+	<iso_639_3_entry
+		id="tux"
+		scope="I"
+		type="E"
+		name="Tuxináwa" />
+	<iso_639_3_entry
+		id="tuy"
+		scope="I"
+		type="L"
+		name="Tugen" />
+	<iso_639_3_entry
+		id="tuz"
+		scope="I"
+		type="L"
+		name="Turka" />
+	<iso_639_3_entry
+		id="tva"
+		scope="I"
+		type="L"
+		name="Vaghua" />
+	<iso_639_3_entry
+		id="tvd"
+		scope="I"
+		type="L"
+		name="Tsuvadi" />
+	<iso_639_3_entry
+		id="tve"
+		scope="I"
+		type="L"
+		name="Te'un" />
+	<iso_639_3_entry
+		id="tvk"
+		scope="I"
+		type="L"
+		name="Ambrym; Southeast" />
+	<iso_639_3_entry
+		id="tvl"
+		part2_code="tvl"
+		scope="I"
+		type="L"
+		name="Tuvalu" />
+	<iso_639_3_entry
+		id="tvm"
+		scope="I"
+		type="L"
+		name="Tela-Masbuar" />
+	<iso_639_3_entry
+		id="tvn"
+		scope="I"
+		type="L"
+		name="Tavoyan" />
+	<iso_639_3_entry
+		id="tvo"
+		scope="I"
+		type="L"
+		name="Tidore" />
+	<iso_639_3_entry
+		id="tvs"
+		scope="I"
+		type="L"
+		name="Taveta" />
+	<iso_639_3_entry
+		id="tvt"
+		scope="I"
+		type="L"
+		name="Naga; Tutsa" />
+	<iso_639_3_entry
+		id="tvw"
+		scope="I"
+		type="L"
+		name="Sedoa" />
+	<iso_639_3_entry
+		id="tvy"
+		scope="I"
+		type="E"
+		name="Pidgin; Timor" />
+	<iso_639_3_entry
+		id="twa"
+		scope="I"
+		type="E"
+		name="Twana" />
+	<iso_639_3_entry
+		id="twb"
+		scope="I"
+		type="L"
+		name="Tawbuid; Western" />
+	<iso_639_3_entry
+		id="twc"
+		scope="I"
+		type="E"
+		name="Teshenawa" />
+	<iso_639_3_entry
+		id="twd"
+		scope="I"
+		type="L"
+		name="Twents" />
+	<iso_639_3_entry
+		id="twe"
+		scope="I"
+		type="L"
+		name="Tewa (Indonesia)" />
+	<iso_639_3_entry
+		id="twf"
+		scope="I"
+		type="L"
+		name="Tiwa; Northern" />
+	<iso_639_3_entry
+		id="twg"
+		scope="I"
+		type="L"
+		name="Tereweng" />
+	<iso_639_3_entry
+		id="twh"
+		scope="I"
+		type="L"
+		name="Tai Dón" />
+	<iso_639_3_entry
+		id="twi"
+		part1_code="tw"
+		part2_code="twi"
+		scope="I"
+		type="L"
+		name="Twi" />
+	<iso_639_3_entry
+		id="twl"
+		scope="I"
+		type="L"
+		name="Tawara" />
+	<iso_639_3_entry
+		id="twm"
+		scope="I"
+		type="L"
+		name="Monpa; Tawang" />
+	<iso_639_3_entry
+		id="twn"
+		scope="I"
+		type="L"
+		name="Twendi" />
+	<iso_639_3_entry
+		id="two"
+		scope="I"
+		type="L"
+		name="Tswapong" />
+	<iso_639_3_entry
+		id="twp"
+		scope="I"
+		type="L"
+		name="Ere" />
+	<iso_639_3_entry
+		id="twq"
+		scope="I"
+		type="L"
+		name="Tasawaq" />
+	<iso_639_3_entry
+		id="twr"
+		scope="I"
+		type="L"
+		name="Tarahumara; Southwestern" />
+	<iso_639_3_entry
+		id="twt"
+		scope="I"
+		type="E"
+		name="Turiwára" />
+	<iso_639_3_entry
+		id="twu"
+		scope="I"
+		type="L"
+		name="Termanu" />
+	<iso_639_3_entry
+		id="tww"
+		scope="I"
+		type="L"
+		name="Tuwari" />
+	<iso_639_3_entry
+		id="twx"
+		scope="I"
+		type="L"
+		name="Tewe" />
+	<iso_639_3_entry
+		id="twy"
+		scope="I"
+		type="L"
+		name="Tawoyan" />
+	<iso_639_3_entry
+		id="txa"
+		scope="I"
+		type="L"
+		name="Tombonuo" />
+	<iso_639_3_entry
+		id="txb"
+		scope="I"
+		type="A"
+		name="Tokharian B" />
+	<iso_639_3_entry
+		id="txc"
+		scope="I"
+		type="E"
+		name="Tsetsaut" />
+	<iso_639_3_entry
+		id="txe"
+		scope="I"
+		type="L"
+		name="Totoli" />
+	<iso_639_3_entry
+		id="txg"
+		scope="I"
+		type="A"
+		name="Tangut" />
+	<iso_639_3_entry
+		id="txh"
+		scope="I"
+		type="A"
+		name="Thracian" />
+	<iso_639_3_entry
+		id="txi"
+		scope="I"
+		type="L"
+		name="Ikpeng" />
+	<iso_639_3_entry
+		id="txm"
+		scope="I"
+		type="L"
+		name="Tomini" />
+	<iso_639_3_entry
+		id="txn"
+		scope="I"
+		type="L"
+		name="Tarangan; West" />
+	<iso_639_3_entry
+		id="txo"
+		scope="I"
+		type="L"
+		name="Toto" />
+	<iso_639_3_entry
+		id="txq"
+		scope="I"
+		type="L"
+		name="Tii" />
+	<iso_639_3_entry
+		id="txr"
+		scope="I"
+		type="A"
+		name="Tartessian" />
+	<iso_639_3_entry
+		id="txs"
+		scope="I"
+		type="L"
+		name="Tonsea" />
+	<iso_639_3_entry
+		id="txt"
+		scope="I"
+		type="L"
+		name="Citak" />
+	<iso_639_3_entry
+		id="txu"
+		scope="I"
+		type="L"
+		name="Kayapó" />
+	<iso_639_3_entry
+		id="txx"
+		scope="I"
+		type="L"
+		name="Tatana" />
+	<iso_639_3_entry
+		id="txy"
+		scope="I"
+		type="L"
+		name="Malagasy; Tanosy" />
+	<iso_639_3_entry
+		id="tya"
+		scope="I"
+		type="L"
+		name="Tauya" />
+	<iso_639_3_entry
+		id="tye"
+		scope="I"
+		type="L"
+		name="Kyenga" />
+	<iso_639_3_entry
+		id="tyh"
+		scope="I"
+		type="L"
+		name="O'du" />
+	<iso_639_3_entry
+		id="tyi"
+		scope="I"
+		type="L"
+		name="Teke-Tsaayi" />
+	<iso_639_3_entry
+		id="tyj"
+		scope="I"
+		type="L"
+		name="Tai Do" />
+	<iso_639_3_entry
+		id="tyl"
+		scope="I"
+		type="L"
+		name="Thu Lao" />
+	<iso_639_3_entry
+		id="tyn"
+		scope="I"
+		type="L"
+		name="Kombai" />
+	<iso_639_3_entry
+		id="typ"
+		scope="I"
+		type="E"
+		name="Thaypan" />
+	<iso_639_3_entry
+		id="tyr"
+		scope="I"
+		type="L"
+		name="Tai Daeng" />
+	<iso_639_3_entry
+		id="tys"
+		scope="I"
+		type="L"
+		name="Tày Sa Pa" />
+	<iso_639_3_entry
+		id="tyt"
+		scope="I"
+		type="L"
+		name="Tày Tac" />
+	<iso_639_3_entry
+		id="tyu"
+		scope="I"
+		type="L"
+		name="Kua" />
+	<iso_639_3_entry
+		id="tyv"
+		part2_code="tyv"
+		scope="I"
+		type="L"
+		name="Tuvinian" />
+	<iso_639_3_entry
+		id="tyx"
+		scope="I"
+		type="L"
+		name="Teke-Tyee" />
+	<iso_639_3_entry
+		id="tyz"
+		scope="I"
+		type="L"
+		name="Tày" />
+	<iso_639_3_entry
+		id="tza"
+		scope="I"
+		type="L"
+		name="Tanzanian Sign Language" />
+	<iso_639_3_entry
+		id="tzh"
+		scope="I"
+		type="L"
+		name="Tzeltal" />
+	<iso_639_3_entry
+		id="tzj"
+		scope="I"
+		type="L"
+		name="Tz'utujil" />
+	<iso_639_3_entry
+		id="tzm"
+		scope="I"
+		type="L"
+		name="Tamazight; Central Atlas" />
+	<iso_639_3_entry
+		id="tzn"
+		scope="I"
+		type="L"
+		name="Tugun" />
+	<iso_639_3_entry
+		id="tzo"
+		scope="I"
+		type="L"
+		name="Tzotzil" />
+	<iso_639_3_entry
+		id="tzx"
+		scope="I"
+		type="L"
+		name="Tabriak" />
+	<iso_639_3_entry
+		id="uam"
+		scope="I"
+		type="E"
+		name="Uamué" />
+	<iso_639_3_entry
+		id="uan"
+		scope="I"
+		type="L"
+		name="Kuan" />
+	<iso_639_3_entry
+		id="uar"
+		scope="I"
+		type="L"
+		name="Tairuma" />
+	<iso_639_3_entry
+		id="uba"
+		scope="I"
+		type="L"
+		name="Ubang" />
+	<iso_639_3_entry
+		id="ubi"
+		scope="I"
+		type="L"
+		name="Ubi" />
+	<iso_639_3_entry
+		id="ubl"
+		scope="I"
+		type="L"
+		name="Bikol; Buhi'non" />
+	<iso_639_3_entry
+		id="ubr"
+		scope="I"
+		type="L"
+		name="Ubir" />
+	<iso_639_3_entry
+		id="ubu"
+		scope="I"
+		type="L"
+		name="Umbu-Ungu" />
+	<iso_639_3_entry
+		id="uby"
+		scope="I"
+		type="E"
+		name="Ubykh" />
+	<iso_639_3_entry
+		id="uda"
+		scope="I"
+		type="L"
+		name="Uda" />
+	<iso_639_3_entry
+		id="ude"
+		scope="I"
+		type="L"
+		name="Udihe" />
+	<iso_639_3_entry
+		id="udg"
+		scope="I"
+		type="L"
+		name="Muduga" />
+	<iso_639_3_entry
+		id="udi"
+		scope="I"
+		type="L"
+		name="Udi" />
+	<iso_639_3_entry
+		id="udj"
+		scope="I"
+		type="L"
+		name="Ujir" />
+	<iso_639_3_entry
+		id="udl"
+		scope="I"
+		type="L"
+		name="Wuzlam" />
+	<iso_639_3_entry
+		id="udm"
+		part2_code="udm"
+		scope="I"
+		type="L"
+		name="Udmurt" />
+	<iso_639_3_entry
+		id="udu"
+		scope="I"
+		type="L"
+		name="Uduk" />
+	<iso_639_3_entry
+		id="ues"
+		scope="I"
+		type="L"
+		name="Kioko" />
+	<iso_639_3_entry
+		id="ufi"
+		scope="I"
+		type="L"
+		name="Ufim" />
+	<iso_639_3_entry
+		id="uga"
+		part2_code="uga"
+		scope="I"
+		type="A"
+		name="Ugaritic" />
+	<iso_639_3_entry
+		id="ugb"
+		scope="I"
+		type="E"
+		name="Kuku-Ugbanh" />
+	<iso_639_3_entry
+		id="uge"
+		scope="I"
+		type="L"
+		name="Ughele" />
+	<iso_639_3_entry
+		id="ugn"
+		scope="I"
+		type="L"
+		name="Ugandan Sign Language" />
+	<iso_639_3_entry
+		id="ugo"
+		scope="I"
+		type="L"
+		name="Ugong" />
+	<iso_639_3_entry
+		id="ugy"
+		scope="I"
+		type="L"
+		name="Uruguayan Sign Language" />
+	<iso_639_3_entry
+		id="uha"
+		scope="I"
+		type="L"
+		name="Uhami" />
+	<iso_639_3_entry
+		id="uhn"
+		scope="I"
+		type="L"
+		name="Damal" />
+	<iso_639_3_entry
+		id="uig"
+		part1_code="ug"
+		part2_code="uig"
+		scope="I"
+		type="L"
+		name="Uighur" />
+	<iso_639_3_entry
+		id="uis"
+		scope="I"
+		type="L"
+		name="Uisai" />
+	<iso_639_3_entry
+		id="uiv"
+		scope="I"
+		type="L"
+		name="Iyive" />
+	<iso_639_3_entry
+		id="uji"
+		scope="I"
+		type="L"
+		name="Tanjijili" />
+	<iso_639_3_entry
+		id="uka"
+		scope="I"
+		type="L"
+		name="Kaburi" />
+	<iso_639_3_entry
+		id="ukg"
+		scope="I"
+		type="L"
+		name="Ukuriguma" />
+	<iso_639_3_entry
+		id="ukh"
+		scope="I"
+		type="L"
+		name="Ukhwejo" />
+	<iso_639_3_entry
+		id="ukl"
+		scope="I"
+		type="L"
+		name="Ukrainian Sign Language" />
+	<iso_639_3_entry
+		id="ukp"
+		scope="I"
+		type="L"
+		name="Ukpe-Bayobiri" />
+	<iso_639_3_entry
+		id="ukq"
+		scope="I"
+		type="L"
+		name="Ukwa" />
+	<iso_639_3_entry
+		id="ukr"
+		part1_code="uk"
+		part2_code="ukr"
+		scope="I"
+		type="L"
+		name="Ukrainian" />
+	<iso_639_3_entry
+		id="uks"
+		scope="I"
+		type="L"
+		name="Urubú-Kaapor Sign Language" />
+	<iso_639_3_entry
+		id="uku"
+		scope="I"
+		type="L"
+		name="Ukue" />
+	<iso_639_3_entry
+		id="ukw"
+		scope="I"
+		type="L"
+		name="Ukwuani-Aboh-Ndoni" />
+	<iso_639_3_entry
+		id="ula"
+		scope="I"
+		type="L"
+		name="Fungwa" />
+	<iso_639_3_entry
+		id="ulb"
+		scope="I"
+		type="L"
+		name="Ulukwumi" />
+	<iso_639_3_entry
+		id="ulc"
+		scope="I"
+		type="L"
+		name="Ulch" />
+	<iso_639_3_entry
+		id="ulf"
+		scope="I"
+		type="L"
+		name="Usku" />
+	<iso_639_3_entry
+		id="uli"
+		scope="I"
+		type="L"
+		name="Ulithian" />
+	<iso_639_3_entry
+		id="ulk"
+		scope="I"
+		type="L"
+		name="Meriam" />
+	<iso_639_3_entry
+		id="ull"
+		scope="I"
+		type="L"
+		name="Ullatan" />
+	<iso_639_3_entry
+		id="ulm"
+		scope="I"
+		type="L"
+		name="Ulumanda'" />
+	<iso_639_3_entry
+		id="uln"
+		scope="I"
+		type="L"
+		name="Unserdeutsch" />
+	<iso_639_3_entry
+		id="ulu"
+		scope="I"
+		type="L"
+		name="Uma' Lung" />
+	<iso_639_3_entry
+		id="ulw"
+		scope="I"
+		type="L"
+		name="Ulwa" />
+	<iso_639_3_entry
+		id="uma"
+		scope="I"
+		type="L"
+		name="Umatilla" />
+	<iso_639_3_entry
+		id="umb"
+		part2_code="umb"
+		scope="I"
+		type="L"
+		name="Umbundu" />
+	<iso_639_3_entry
+		id="umc"
+		scope="I"
+		type="A"
+		name="Marrucinian" />
+	<iso_639_3_entry
+		id="umd"
+		scope="I"
+		type="E"
+		name="Umbindhamu" />
+	<iso_639_3_entry
+		id="umg"
+		scope="I"
+		type="E"
+		name="Umbuygamu" />
+	<iso_639_3_entry
+		id="umi"
+		scope="I"
+		type="L"
+		name="Ukit" />
+	<iso_639_3_entry
+		id="umm"
+		scope="I"
+		type="L"
+		name="Umon" />
+	<iso_639_3_entry
+		id="umn"
+		scope="I"
+		type="L"
+		name="Naga; Makyan" />
+	<iso_639_3_entry
+		id="umo"
+		scope="I"
+		type="E"
+		name="Umotína" />
+	<iso_639_3_entry
+		id="ump"
+		scope="I"
+		type="L"
+		name="Umpila" />
+	<iso_639_3_entry
+		id="umr"
+		scope="I"
+		type="E"
+		name="Umbugarla" />
+	<iso_639_3_entry
+		id="ums"
+		scope="I"
+		type="L"
+		name="Pendau" />
+	<iso_639_3_entry
+		id="umu"
+		scope="I"
+		type="L"
+		name="Munsee" />
+	<iso_639_3_entry
+		id="una"
+		scope="I"
+		type="L"
+		name="Watut; North" />
+	<iso_639_3_entry
+		id="und"
+		part2_code="und"
+		scope="S"
+		type="S"
+		name="Undetermined" />
+	<iso_639_3_entry
+		id="une"
+		scope="I"
+		type="L"
+		name="Uneme" />
+	<iso_639_3_entry
+		id="ung"
+		scope="I"
+		type="L"
+		name="Ngarinyin" />
+	<iso_639_3_entry
+		id="unk"
+		scope="I"
+		type="L"
+		name="Enawené-Nawé" />
+	<iso_639_3_entry
+		id="unm"
+		scope="I"
+		type="E"
+		name="Unami" />
+	<iso_639_3_entry
+		id="unp"
+		scope="I"
+		type="L"
+		name="Worora" />
+	<iso_639_3_entry
+		id="unr"
+		scope="I"
+		type="L"
+		name="Mundari" />
+	<iso_639_3_entry
+		id="unx"
+		scope="I"
+		type="L"
+		name="Munda" />
+	<iso_639_3_entry
+		id="unz"
+		scope="I"
+		type="L"
+		name="Kaili; Unde" />
+	<iso_639_3_entry
+		id="uok"
+		scope="I"
+		type="L"
+		name="Uokha" />
+	<iso_639_3_entry
+		id="upi"
+		scope="I"
+		type="L"
+		name="Umeda" />
+	<iso_639_3_entry
+		id="upv"
+		scope="I"
+		type="L"
+		name="Uripiv-Wala-Rano-Atchin" />
+	<iso_639_3_entry
+		id="ura"
+		scope="I"
+		type="L"
+		name="Urarina" />
+	<iso_639_3_entry
+		id="urb"
+		scope="I"
+		type="L"
+		name="Urubú-Kaapor" />
+	<iso_639_3_entry
+		id="urc"
+		scope="I"
+		type="E"
+		name="Urningangg" />
+	<iso_639_3_entry
+		id="urd"
+		part1_code="ur"
+		part2_code="urd"
+		scope="I"
+		type="L"
+		name="Urdu" />
+	<iso_639_3_entry
+		id="ure"
+		scope="I"
+		type="L"
+		name="Uru" />
+	<iso_639_3_entry
+		id="urf"
+		scope="I"
+		type="E"
+		name="Uradhi" />
+	<iso_639_3_entry
+		id="urg"
+		scope="I"
+		type="L"
+		name="Urigina" />
+	<iso_639_3_entry
+		id="urh"
+		scope="I"
+		type="L"
+		name="Urhobo" />
+	<iso_639_3_entry
+		id="uri"
+		scope="I"
+		type="L"
+		name="Urim" />
+	<iso_639_3_entry
+		id="urk"
+		scope="I"
+		type="L"
+		name="Urak Lawoi'" />
+	<iso_639_3_entry
+		id="url"
+		scope="I"
+		type="L"
+		name="Urali" />
+	<iso_639_3_entry
+		id="urm"
+		scope="I"
+		type="L"
+		name="Urapmin" />
+	<iso_639_3_entry
+		id="urn"
+		scope="I"
+		type="L"
+		name="Uruangnirin" />
+	<iso_639_3_entry
+		id="uro"
+		scope="I"
+		type="L"
+		name="Ura (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="urp"
+		scope="I"
+		type="L"
+		name="Uru-Pa-In" />
+	<iso_639_3_entry
+		id="urr"
+		scope="I"
+		type="L"
+		name="Lehalurup" />
+	<iso_639_3_entry
+		id="urt"
+		scope="I"
+		type="L"
+		name="Urat" />
+	<iso_639_3_entry
+		id="uru"
+		scope="I"
+		type="E"
+		name="Urumi" />
+	<iso_639_3_entry
+		id="urv"
+		scope="I"
+		type="E"
+		name="Uruava" />
+	<iso_639_3_entry
+		id="urw"
+		scope="I"
+		type="L"
+		name="Sop" />
+	<iso_639_3_entry
+		id="urx"
+		scope="I"
+		type="L"
+		name="Urimo" />
+	<iso_639_3_entry
+		id="ury"
+		scope="I"
+		type="L"
+		name="Orya" />
+	<iso_639_3_entry
+		id="urz"
+		scope="I"
+		type="L"
+		name="Uru-Eu-Wau-Wau" />
+	<iso_639_3_entry
+		id="usa"
+		scope="I"
+		type="L"
+		name="Usarufa" />
+	<iso_639_3_entry
+		id="ush"
+		scope="I"
+		type="L"
+		name="Ushojo" />
+	<iso_639_3_entry
+		id="usi"
+		scope="I"
+		type="L"
+		name="Usui" />
+	<iso_639_3_entry
+		id="usk"
+		scope="I"
+		type="L"
+		name="Usaghade" />
+	<iso_639_3_entry
+		id="usp"
+		scope="I"
+		type="L"
+		name="Uspanteco" />
+	<iso_639_3_entry
+		id="usu"
+		scope="I"
+		type="L"
+		name="Uya" />
+	<iso_639_3_entry
+		id="uta"
+		scope="I"
+		type="L"
+		name="Otank" />
+	<iso_639_3_entry
+		id="ute"
+		scope="I"
+		type="L"
+		name="Ute-Southern Paiute" />
+	<iso_639_3_entry
+		id="utp"
+		scope="I"
+		type="L"
+		name="Amba (Solomon Islands)" />
+	<iso_639_3_entry
+		id="utr"
+		scope="I"
+		type="L"
+		name="Etulo" />
+	<iso_639_3_entry
+		id="utu"
+		scope="I"
+		type="L"
+		name="Utu" />
+	<iso_639_3_entry
+		id="uum"
+		scope="I"
+		type="L"
+		name="Urum" />
+	<iso_639_3_entry
+		id="uun"
+		scope="I"
+		type="L"
+		name="Kulon-Pazeh" />
+	<iso_639_3_entry
+		id="uur"
+		scope="I"
+		type="L"
+		name="Ura (Vanuatu)" />
+	<iso_639_3_entry
+		id="uuu"
+		scope="I"
+		type="L"
+		name="U" />
+	<iso_639_3_entry
+		id="uve"
+		scope="I"
+		type="L"
+		name="Uvean; West" />
+	<iso_639_3_entry
+		id="uvh"
+		scope="I"
+		type="L"
+		name="Uri" />
+	<iso_639_3_entry
+		id="uvl"
+		scope="I"
+		type="L"
+		name="Lote" />
+	<iso_639_3_entry
+		id="uwa"
+		scope="I"
+		type="L"
+		name="Kuku-Uwanh" />
+	<iso_639_3_entry
+		id="uya"
+		scope="I"
+		type="L"
+		name="Doko-Uyanga" />
+	<iso_639_3_entry
+		id="uzb"
+		part1_code="uz"
+		part2_code="uzb"
+		scope="M"
+		type="L"
+		name="Uzbek" />
+	<iso_639_3_entry
+		id="uzn"
+		scope="I"
+		type="L"
+		name="Uzbek; Northern" />
+	<iso_639_3_entry
+		id="uzs"
+		scope="I"
+		type="L"
+		name="Uzbek; Southern" />
+	<iso_639_3_entry
+		id="vaa"
+		scope="I"
+		type="L"
+		name="Vaagri Booli" />
+	<iso_639_3_entry
+		id="vae"
+		scope="I"
+		type="L"
+		name="Vale" />
+	<iso_639_3_entry
+		id="vaf"
+		scope="I"
+		type="L"
+		name="Vafsi" />
+	<iso_639_3_entry
+		id="vag"
+		scope="I"
+		type="L"
+		name="Vagla" />
+	<iso_639_3_entry
+		id="vah"
+		scope="I"
+		type="L"
+		name="Varhadi-Nagpuri" />
+	<iso_639_3_entry
+		id="vai"
+		part2_code="vai"
+		scope="I"
+		type="L"
+		name="Vai" />
+	<iso_639_3_entry
+		id="vaj"
+		scope="I"
+		type="L"
+		name="Vasekela Bushman" />
+	<iso_639_3_entry
+		id="val"
+		scope="I"
+		type="L"
+		name="Vehes" />
+	<iso_639_3_entry
+		id="vam"
+		scope="I"
+		type="L"
+		name="Vanimo" />
+	<iso_639_3_entry
+		id="van"
+		scope="I"
+		type="L"
+		name="Valman" />
+	<iso_639_3_entry
+		id="vao"
+		scope="I"
+		type="L"
+		name="Vao" />
+	<iso_639_3_entry
+		id="vap"
+		scope="I"
+		type="L"
+		name="Vaiphei" />
+	<iso_639_3_entry
+		id="var"
+		scope="I"
+		type="L"
+		name="Huarijio" />
+	<iso_639_3_entry
+		id="vas"
+		scope="I"
+		type="L"
+		name="Vasavi" />
+	<iso_639_3_entry
+		id="vau"
+		scope="I"
+		type="L"
+		name="Vanuma" />
+	<iso_639_3_entry
+		id="vav"
+		scope="I"
+		type="L"
+		name="Varli" />
+	<iso_639_3_entry
+		id="vay"
+		scope="I"
+		type="L"
+		name="Wayu" />
+	<iso_639_3_entry
+		id="vbb"
+		scope="I"
+		type="L"
+		name="Babar; Southeast" />
+	<iso_639_3_entry
+		id="vbk"
+		scope="I"
+		type="L"
+		name="Bontok; Southwestern" />
+	<iso_639_3_entry
+		id="vec"
+		scope="I"
+		type="L"
+		name="Venetian" />
+	<iso_639_3_entry
+		id="ved"
+		scope="I"
+		type="L"
+		name="Veddah" />
+	<iso_639_3_entry
+		id="vel"
+		scope="I"
+		type="L"
+		name="Veluws" />
+	<iso_639_3_entry
+		id="vem"
+		scope="I"
+		type="L"
+		name="Vemgo-Mabas" />
+	<iso_639_3_entry
+		id="ven"
+		part1_code="ve"
+		part2_code="ven"
+		scope="I"
+		type="L"
+		name="Venda" />
+	<iso_639_3_entry
+		id="veo"
+		scope="I"
+		type="E"
+		name="Ventureño" />
+	<iso_639_3_entry
+		id="vep"
+		scope="I"
+		type="L"
+		name="Veps" />
+	<iso_639_3_entry
+		id="ver"
+		scope="I"
+		type="L"
+		name="Mom Jango" />
+	<iso_639_3_entry
+		id="vgr"
+		scope="I"
+		type="L"
+		name="Vaghri" />
+	<iso_639_3_entry
+		id="vgt"
+		scope="I"
+		type="L"
+		name="Vlaamse Gebarentaal" />
+	<iso_639_3_entry
+		id="vic"
+		scope="I"
+		type="L"
+		name="Creole English; Virgin Islands" />
+	<iso_639_3_entry
+		id="vid"
+		scope="I"
+		type="L"
+		name="Vidunda" />
+	<iso_639_3_entry
+		id="vie"
+		part1_code="vi"
+		part2_code="vie"
+		scope="I"
+		type="L"
+		name="Vietnamese" />
+	<iso_639_3_entry
+		id="vif"
+		scope="I"
+		type="L"
+		name="Vili" />
+	<iso_639_3_entry
+		id="vig"
+		scope="I"
+		type="L"
+		name="Viemo" />
+	<iso_639_3_entry
+		id="vil"
+		scope="I"
+		type="L"
+		name="Vilela" />
+	<iso_639_3_entry
+		id="vin"
+		scope="I"
+		type="L"
+		name="Vinza" />
+	<iso_639_3_entry
+		id="vis"
+		scope="I"
+		type="L"
+		name="Vishavan" />
+	<iso_639_3_entry
+		id="vit"
+		scope="I"
+		type="L"
+		name="Viti" />
+	<iso_639_3_entry
+		id="viv"
+		scope="I"
+		type="L"
+		name="Iduna" />
+	<iso_639_3_entry
+		id="vka"
+		scope="I"
+		type="E"
+		name="Kariyarra" />
+	<iso_639_3_entry
+		id="vki"
+		scope="I"
+		type="L"
+		name="Ija-Zuba" />
+	<iso_639_3_entry
+		id="vkj"
+		scope="I"
+		type="L"
+		name="Kujarge" />
+	<iso_639_3_entry
+		id="vkk"
+		scope="I"
+		type="L"
+		name="Kaur" />
+	<iso_639_3_entry
+		id="vkl"
+		scope="I"
+		type="L"
+		name="Kulisusu" />
+	<iso_639_3_entry
+		id="vkm"
+		scope="I"
+		type="E"
+		name="Kamakan" />
+	<iso_639_3_entry
+		id="vko"
+		scope="I"
+		type="L"
+		name="Kodeoha" />
+	<iso_639_3_entry
+		id="vkp"
+		scope="I"
+		type="L"
+		name="Creole Portuguese; Korlai" />
+	<iso_639_3_entry
+		id="vkt"
+		scope="I"
+		type="L"
+		name="Malay; Tenggarong Kutai" />
+	<iso_639_3_entry
+		id="vku"
+		scope="I"
+		type="L"
+		name="Kurrama" />
+	<iso_639_3_entry
+		id="vlp"
+		scope="I"
+		type="L"
+		name="Valpei" />
+	<iso_639_3_entry
+		id="vls"
+		scope="I"
+		type="L"
+		name="Vlaams" />
+	<iso_639_3_entry
+		id="vma"
+		scope="I"
+		type="L"
+		name="Martuyhunira" />
+	<iso_639_3_entry
+		id="vmb"
+		scope="I"
+		type="E"
+		name="Mbabaram" />
+	<iso_639_3_entry
+		id="vmc"
+		scope="I"
+		type="L"
+		name="Mixtec; Juxtlahuaca" />
+	<iso_639_3_entry
+		id="vmd"
+		scope="I"
+		type="L"
+		name="Koraga; Mudu" />
+	<iso_639_3_entry
+		id="vme"
+		scope="I"
+		type="L"
+		name="Masela; East" />
+	<iso_639_3_entry
+		id="vmf"
+		scope="I"
+		type="L"
+		name="Mainfränkisch" />
+	<iso_639_3_entry
+		id="vmg"
+		scope="I"
+		type="L"
+		name="Minigir" />
+	<iso_639_3_entry
+		id="vmh"
+		scope="I"
+		type="L"
+		name="Maraghei" />
+	<iso_639_3_entry
+		id="vmi"
+		scope="I"
+		type="E"
+		name="Miwa" />
+	<iso_639_3_entry
+		id="vmj"
+		scope="I"
+		type="L"
+		name="Mixtec; Ixtayutla" />
+	<iso_639_3_entry
+		id="vmk"
+		scope="I"
+		type="L"
+		name="Makhuwa-Shirima" />
+	<iso_639_3_entry
+		id="vml"
+		scope="I"
+		type="E"
+		name="Malgana" />
+	<iso_639_3_entry
+		id="vmm"
+		scope="I"
+		type="L"
+		name="Mixtec; Mitlatongo" />
+	<iso_639_3_entry
+		id="vmp"
+		scope="I"
+		type="L"
+		name="Mazatec; Soyaltepec" />
+	<iso_639_3_entry
+		id="vmq"
+		scope="I"
+		type="L"
+		name="Mixtec; Soyaltepec" />
+	<iso_639_3_entry
+		id="vmr"
+		scope="I"
+		type="L"
+		name="Marenje" />
+	<iso_639_3_entry
+		id="vms"
+		scope="I"
+		type="E"
+		name="Moksela" />
+	<iso_639_3_entry
+		id="vmu"
+		scope="I"
+		type="E"
+		name="Muluridyi" />
+	<iso_639_3_entry
+		id="vmv"
+		scope="I"
+		type="E"
+		name="Maidu; Valley" />
+	<iso_639_3_entry
+		id="vmw"
+		scope="I"
+		type="L"
+		name="Makhuwa" />
+	<iso_639_3_entry
+		id="vmx"
+		scope="I"
+		type="L"
+		name="Mixtec; Tamazola" />
+	<iso_639_3_entry
+		id="vmy"
+		scope="I"
+		type="L"
+		name="Mazatec; Ayautla" />
+	<iso_639_3_entry
+		id="vmz"
+		scope="I"
+		type="L"
+		name="Mazatec; Mazatlán" />
+	<iso_639_3_entry
+		id="vnk"
+		scope="I"
+		type="L"
+		name="Vano" />
+	<iso_639_3_entry
+		id="vnm"
+		scope="I"
+		type="L"
+		name="Vinmavis" />
+	<iso_639_3_entry
+		id="vnp"
+		scope="I"
+		type="L"
+		name="Vunapu" />
+	<iso_639_3_entry
+		id="vol"
+		part1_code="vo"
+		part2_code="vol"
+		scope="I"
+		type="C"
+		name="Volapük" />
+	<iso_639_3_entry
+		id="vor"
+		scope="I"
+		type="L"
+		name="Voro" />
+	<iso_639_3_entry
+		id="vot"
+		part2_code="vot"
+		scope="I"
+		type="L"
+		name="Votic" />
+	<iso_639_3_entry
+		id="vra"
+		scope="I"
+		type="L"
+		name="Vera'a" />
+	<iso_639_3_entry
+		id="vro"
+		scope="I"
+		type="L"
+		name="Võro" />
+	<iso_639_3_entry
+		id="vrs"
+		scope="I"
+		type="L"
+		name="Varisi" />
+	<iso_639_3_entry
+		id="vrt"
+		scope="I"
+		type="L"
+		name="Burmbar" />
+	<iso_639_3_entry
+		id="vsi"
+		scope="I"
+		type="L"
+		name="Moldova Sign Language" />
+	<iso_639_3_entry
+		id="vsl"
+		scope="I"
+		type="L"
+		name="Venezuelan Sign Language" />
+	<iso_639_3_entry
+		id="vsv"
+		scope="I"
+		type="L"
+		name="Valencian Sign Language" />
+	<iso_639_3_entry
+		id="vto"
+		scope="I"
+		type="L"
+		name="Vitou" />
+	<iso_639_3_entry
+		id="vum"
+		scope="I"
+		type="L"
+		name="Vumbu" />
+	<iso_639_3_entry
+		id="vun"
+		scope="I"
+		type="L"
+		name="Vunjo" />
+	<iso_639_3_entry
+		id="vut"
+		scope="I"
+		type="L"
+		name="Vute" />
+	<iso_639_3_entry
+		id="vwa"
+		scope="I"
+		type="L"
+		name="Awa (China)" />
+	<iso_639_3_entry
+		id="waa"
+		scope="I"
+		type="L"
+		name="Walla Walla" />
+	<iso_639_3_entry
+		id="wab"
+		scope="I"
+		type="L"
+		name="Wab" />
+	<iso_639_3_entry
+		id="wac"
+		scope="I"
+		type="L"
+		name="Wasco-Wishram" />
+	<iso_639_3_entry
+		id="wad"
+		scope="I"
+		type="L"
+		name="Wandamen" />
+	<iso_639_3_entry
+		id="wae"
+		scope="I"
+		type="L"
+		name="Walser" />
+	<iso_639_3_entry
+		id="waf"
+		scope="I"
+		type="E"
+		name="Wakoná" />
+	<iso_639_3_entry
+		id="wag"
+		scope="I"
+		type="L"
+		name="Wa'ema" />
+	<iso_639_3_entry
+		id="wah"
+		scope="I"
+		type="L"
+		name="Watubela" />
+	<iso_639_3_entry
+		id="wai"
+		scope="I"
+		type="L"
+		name="Wares" />
+	<iso_639_3_entry
+		id="waj"
+		scope="I"
+		type="L"
+		name="Waffa" />
+	<iso_639_3_entry
+		id="wal"
+		part2_code="wal"
+		scope="I"
+		type="L"
+		name="Wolaytta" />
+	<iso_639_3_entry
+		id="wam"
+		scope="I"
+		type="E"
+		name="Wampanoag" />
+	<iso_639_3_entry
+		id="wan"
+		scope="I"
+		type="L"
+		name="Wan" />
+	<iso_639_3_entry
+		id="wao"
+		scope="I"
+		type="E"
+		name="Wappo" />
+	<iso_639_3_entry
+		id="wap"
+		scope="I"
+		type="L"
+		name="Wapishana" />
+	<iso_639_3_entry
+		id="waq"
+		scope="I"
+		type="L"
+		name="Wageman" />
+	<iso_639_3_entry
+		id="war"
+		part2_code="war"
+		scope="I"
+		type="L"
+		name="Waray (Philippines)" />
+	<iso_639_3_entry
+		id="was"
+		part2_code="was"
+		scope="I"
+		type="L"
+		name="Washo" />
+	<iso_639_3_entry
+		id="wat"
+		scope="I"
+		type="L"
+		name="Kaninuwa" />
+	<iso_639_3_entry
+		id="wau"
+		scope="I"
+		type="L"
+		name="Waurá" />
+	<iso_639_3_entry
+		id="wav"
+		scope="I"
+		type="L"
+		name="Waka" />
+	<iso_639_3_entry
+		id="waw"
+		scope="I"
+		type="L"
+		name="Waiwai" />
+	<iso_639_3_entry
+		id="wax"
+		scope="I"
+		type="L"
+		name="Watam" />
+	<iso_639_3_entry
+		id="way"
+		scope="I"
+		type="L"
+		name="Wayana" />
+	<iso_639_3_entry
+		id="waz"
+		scope="I"
+		type="L"
+		name="Wampur" />
+	<iso_639_3_entry
+		id="wba"
+		scope="I"
+		type="L"
+		name="Warao" />
+	<iso_639_3_entry
+		id="wbb"
+		scope="I"
+		type="L"
+		name="Wabo" />
+	<iso_639_3_entry
+		id="wbe"
+		scope="I"
+		type="L"
+		name="Waritai" />
+	<iso_639_3_entry
+		id="wbf"
+		scope="I"
+		type="L"
+		name="Wara" />
+	<iso_639_3_entry
+		id="wbh"
+		scope="I"
+		type="L"
+		name="Wanda" />
+	<iso_639_3_entry
+		id="wbi"
+		scope="I"
+		type="L"
+		name="Vwanji" />
+	<iso_639_3_entry
+		id="wbj"
+		scope="I"
+		type="L"
+		name="Alagwa" />
+	<iso_639_3_entry
+		id="wbk"
+		scope="I"
+		type="L"
+		name="Waigali" />
+	<iso_639_3_entry
+		id="wbl"
+		scope="I"
+		type="L"
+		name="Wakhi" />
+	<iso_639_3_entry
+		id="wbm"
+		scope="I"
+		type="L"
+		name="Wa" />
+	<iso_639_3_entry
+		id="wbp"
+		scope="I"
+		type="L"
+		name="Warlpiri" />
+	<iso_639_3_entry
+		id="wbq"
+		scope="I"
+		type="L"
+		name="Waddar" />
+	<iso_639_3_entry
+		id="wbr"
+		scope="I"
+		type="L"
+		name="Wagdi" />
+	<iso_639_3_entry
+		id="wbt"
+		scope="I"
+		type="L"
+		name="Wanman" />
+	<iso_639_3_entry
+		id="wbv"
+		scope="I"
+		type="L"
+		name="Wajarri" />
+	<iso_639_3_entry
+		id="wbw"
+		scope="I"
+		type="L"
+		name="Woi" />
+	<iso_639_3_entry
+		id="wca"
+		scope="I"
+		type="L"
+		name="Yanomámi" />
+	<iso_639_3_entry
+		id="wci"
+		scope="I"
+		type="L"
+		name="Gbe; Waci" />
+	<iso_639_3_entry
+		id="wdd"
+		scope="I"
+		type="L"
+		name="Wandji" />
+	<iso_639_3_entry
+		id="wdg"
+		scope="I"
+		type="L"
+		name="Wadaginam" />
+	<iso_639_3_entry
+		id="wdj"
+		scope="I"
+		type="L"
+		name="Wadjiginy" />
+	<iso_639_3_entry
+		id="wdu"
+		scope="I"
+		type="E"
+		name="Wadjigu" />
+	<iso_639_3_entry
+		id="wea"
+		scope="I"
+		type="L"
+		name="Wewaw" />
+	<iso_639_3_entry
+		id="wec"
+		scope="I"
+		type="L"
+		name="Wè Western" />
+	<iso_639_3_entry
+		id="wed"
+		scope="I"
+		type="L"
+		name="Wedau" />
+	<iso_639_3_entry
+		id="weh"
+		scope="I"
+		type="L"
+		name="Weh" />
+	<iso_639_3_entry
+		id="wei"
+		scope="I"
+		type="L"
+		name="Kiunum" />
+	<iso_639_3_entry
+		id="wem"
+		scope="I"
+		type="L"
+		name="Gbe; Weme" />
+	<iso_639_3_entry
+		id="weo"
+		scope="I"
+		type="L"
+		name="Wemale; North" />
+	<iso_639_3_entry
+		id="wep"
+		scope="I"
+		type="L"
+		name="Westphalien" />
+	<iso_639_3_entry
+		id="wer"
+		scope="I"
+		type="L"
+		name="Weri" />
+	<iso_639_3_entry
+		id="wes"
+		scope="I"
+		type="L"
+		name="Pidgin; Cameroon" />
+	<iso_639_3_entry
+		id="wet"
+		scope="I"
+		type="L"
+		name="Perai" />
+	<iso_639_3_entry
+		id="weu"
+		scope="I"
+		type="L"
+		name="Welaung" />
+	<iso_639_3_entry
+		id="wew"
+		scope="I"
+		type="L"
+		name="Wejewa" />
+	<iso_639_3_entry
+		id="wfg"
+		scope="I"
+		type="L"
+		name="Yafi" />
+	<iso_639_3_entry
+		id="wga"
+		scope="I"
+		type="E"
+		name="Wagaya" />
+	<iso_639_3_entry
+		id="wgb"
+		scope="I"
+		type="L"
+		name="Wagawaga" />
+	<iso_639_3_entry
+		id="wgg"
+		scope="I"
+		type="E"
+		name="Wangganguru" />
+	<iso_639_3_entry
+		id="wgi"
+		scope="I"
+		type="L"
+		name="Wahgi" />
+	<iso_639_3_entry
+		id="wgo"
+		scope="I"
+		type="L"
+		name="Waigeo" />
+	<iso_639_3_entry
+		id="wgy"
+		scope="I"
+		type="L"
+		name="Warrgamay" />
+	<iso_639_3_entry
+		id="wha"
+		scope="I"
+		type="L"
+		name="Manusela" />
+	<iso_639_3_entry
+		id="whg"
+		scope="I"
+		type="L"
+		name="Wahgi; North" />
+	<iso_639_3_entry
+		id="whk"
+		scope="I"
+		type="L"
+		name="Kenyah; Wahau" />
+	<iso_639_3_entry
+		id="whu"
+		scope="I"
+		type="L"
+		name="Kayan; Wahau" />
+	<iso_639_3_entry
+		id="wib"
+		scope="I"
+		type="L"
+		name="Toussian; Southern" />
+	<iso_639_3_entry
+		id="wic"
+		scope="I"
+		type="L"
+		name="Wichita" />
+	<iso_639_3_entry
+		id="wie"
+		scope="I"
+		type="E"
+		name="Wik-Epa" />
+	<iso_639_3_entry
+		id="wif"
+		scope="I"
+		type="E"
+		name="Wik-Keyangan" />
+	<iso_639_3_entry
+		id="wig"
+		scope="I"
+		type="L"
+		name="Wik-Ngathana" />
+	<iso_639_3_entry
+		id="wih"
+		scope="I"
+		type="L"
+		name="Wik-Me'anha" />
+	<iso_639_3_entry
+		id="wii"
+		scope="I"
+		type="L"
+		name="Minidien" />
+	<iso_639_3_entry
+		id="wij"
+		scope="I"
+		type="L"
+		name="Wik-Iiyanh" />
+	<iso_639_3_entry
+		id="wik"
+		scope="I"
+		type="L"
+		name="Wikalkan" />
+	<iso_639_3_entry
+		id="wil"
+		scope="I"
+		type="E"
+		name="Wilawila" />
+	<iso_639_3_entry
+		id="wim"
+		scope="I"
+		type="L"
+		name="Wik-Mungkan" />
+	<iso_639_3_entry
+		id="win"
+		scope="I"
+		type="L"
+		name="Ho-Chunk" />
+	<iso_639_3_entry
+		id="wir"
+		scope="I"
+		type="E"
+		name="Wiraféd" />
+	<iso_639_3_entry
+		id="wit"
+		scope="I"
+		type="L"
+		name="Wintu" />
+	<iso_639_3_entry
+		id="wiu"
+		scope="I"
+		type="L"
+		name="Wiru" />
+	<iso_639_3_entry
+		id="wiv"
+		scope="I"
+		type="L"
+		name="Muduapa" />
+	<iso_639_3_entry
+		id="wiw"
+		scope="I"
+		type="L"
+		name="Wirangu" />
+	<iso_639_3_entry
+		id="wiy"
+		scope="I"
+		type="E"
+		name="Wiyot" />
+	<iso_639_3_entry
+		id="wja"
+		scope="I"
+		type="L"
+		name="Waja" />
+	<iso_639_3_entry
+		id="wji"
+		scope="I"
+		type="L"
+		name="Warji" />
+	<iso_639_3_entry
+		id="wka"
+		scope="I"
+		type="E"
+		name="Kw'adza" />
+	<iso_639_3_entry
+		id="wkb"
+		scope="I"
+		type="L"
+		name="Kumbaran" />
+	<iso_639_3_entry
+		id="wkd"
+		scope="I"
+		type="L"
+		name="Wakde" />
+	<iso_639_3_entry
+		id="wkl"
+		scope="I"
+		type="L"
+		name="Kalanadi" />
+	<iso_639_3_entry
+		id="wku"
+		scope="I"
+		type="L"
+		name="Kunduvadi" />
+	<iso_639_3_entry
+		id="wkw"
+		scope="I"
+		type="E"
+		name="Wakawaka" />
+	<iso_639_3_entry
+		id="wla"
+		scope="I"
+		type="L"
+		name="Walio" />
+	<iso_639_3_entry
+		id="wlc"
+		scope="I"
+		type="L"
+		name="Comorian; Mwali" />
+	<iso_639_3_entry
+		id="wle"
+		scope="I"
+		type="L"
+		name="Wolane" />
+	<iso_639_3_entry
+		id="wlg"
+		scope="I"
+		type="L"
+		name="Kunbarlang" />
+	<iso_639_3_entry
+		id="wli"
+		scope="I"
+		type="L"
+		name="Waioli" />
+	<iso_639_3_entry
+		id="wlk"
+		scope="I"
+		type="E"
+		name="Wailaki" />
+	<iso_639_3_entry
+		id="wll"
+		scope="I"
+		type="L"
+		name="Wali (Sudan)" />
+	<iso_639_3_entry
+		id="wlm"
+		scope="I"
+		type="H"
+		name="Welsh; Middle" />
+	<iso_639_3_entry
+		id="wln"
+		part1_code="wa"
+		part2_code="wln"
+		scope="I"
+		type="L"
+		name="Walloon" />
+	<iso_639_3_entry
+		id="wlo"
+		scope="I"
+		type="L"
+		name="Wolio" />
+	<iso_639_3_entry
+		id="wlr"
+		scope="I"
+		type="L"
+		name="Wailapa" />
+	<iso_639_3_entry
+		id="wls"
+		scope="I"
+		type="L"
+		name="Wallisian" />
+	<iso_639_3_entry
+		id="wlu"
+		scope="I"
+		type="E"
+		name="Wuliwuli" />
+	<iso_639_3_entry
+		id="wlv"
+		scope="I"
+		type="L"
+		name="Wichí Lhamtés Vejoz" />
+	<iso_639_3_entry
+		id="wlw"
+		scope="I"
+		type="L"
+		name="Walak" />
+	<iso_639_3_entry
+		id="wlx"
+		scope="I"
+		type="L"
+		name="Wali (Ghana)" />
+	<iso_639_3_entry
+		id="wly"
+		scope="I"
+		type="E"
+		name="Waling" />
+	<iso_639_3_entry
+		id="wma"
+		scope="I"
+		type="E"
+		name="Mawa (Nigeria)" />
+	<iso_639_3_entry
+		id="wmb"
+		scope="I"
+		type="L"
+		name="Wambaya" />
+	<iso_639_3_entry
+		id="wmc"
+		scope="I"
+		type="L"
+		name="Wamas" />
+	<iso_639_3_entry
+		id="wmd"
+		scope="I"
+		type="L"
+		name="Mamaindé" />
+	<iso_639_3_entry
+		id="wme"
+		scope="I"
+		type="L"
+		name="Wambule" />
+	<iso_639_3_entry
+		id="wmh"
+		scope="I"
+		type="L"
+		name="Waima'a" />
+	<iso_639_3_entry
+		id="wmi"
+		scope="I"
+		type="E"
+		name="Wamin" />
+	<iso_639_3_entry
+		id="wmm"
+		scope="I"
+		type="L"
+		name="Maiwa (Indonesia)" />
+	<iso_639_3_entry
+		id="wmn"
+		scope="I"
+		type="E"
+		name="Waamwang" />
+	<iso_639_3_entry
+		id="wmo"
+		scope="I"
+		type="L"
+		name="Wom (Papua New Guinea)" />
+	<iso_639_3_entry
+		id="wms"
+		scope="I"
+		type="L"
+		name="Wambon" />
+	<iso_639_3_entry
+		id="wmt"
+		scope="I"
+		type="L"
+		name="Walmajarri" />
+	<iso_639_3_entry
+		id="wmw"
+		scope="I"
+		type="L"
+		name="Mwani" />
+	<iso_639_3_entry
+		id="wmx"
+		scope="I"
+		type="L"
+		name="Womo" />
+	<iso_639_3_entry
+		id="wnb"
+		scope="I"
+		type="L"
+		name="Wanambre" />
+	<iso_639_3_entry
+		id="wnc"
+		scope="I"
+		type="L"
+		name="Wantoat" />
+	<iso_639_3_entry
+		id="wnd"
+		scope="I"
+		type="E"
+		name="Wandarang" />
+	<iso_639_3_entry
+		id="wne"
+		scope="I"
+		type="L"
+		name="Waneci" />
+	<iso_639_3_entry
+		id="wng"
+		scope="I"
+		type="L"
+		name="Wanggom" />
+	<iso_639_3_entry
+		id="wni"
+		scope="I"
+		type="L"
+		name="Comorian; Ndzwani" />
+	<iso_639_3_entry
+		id="wnk"
+		scope="I"
+		type="L"
+		name="Wanukaka" />
+	<iso_639_3_entry
+		id="wnm"
+		scope="I"
+		type="E"
+		name="Wanggamala" />
+	<iso_639_3_entry
+		id="wno"
+		scope="I"
+		type="L"
+		name="Wano" />
+	<iso_639_3_entry
+		id="wnp"
+		scope="I"
+		type="L"
+		name="Wanap" />
+	<iso_639_3_entry
+		id="wnu"
+		scope="I"
+		type="L"
+		name="Usan" />
+	<iso_639_3_entry
+		id="woa"
+		scope="I"
+		type="L"
+		name="Tyaraity" />
+	<iso_639_3_entry
+		id="wob"
+		scope="I"
+		type="L"
+		name="Wè Northern" />
+	<iso_639_3_entry
+		id="woc"
+		scope="I"
+		type="L"
+		name="Wogeo" />
+	<iso_639_3_entry
+		id="wod"
+		scope="I"
+		type="L"
+		name="Wolani" />
+	<iso_639_3_entry
+		id="woe"
+		scope="I"
+		type="L"
+		name="Woleaian" />
+	<iso_639_3_entry
+		id="wof"
+		scope="I"
+		type="L"
+		name="Wolof; Gambian" />
+	<iso_639_3_entry
+		id="wog"
+		scope="I"
+		type="L"
+		name="Wogamusin" />
+	<iso_639_3_entry
+		id="woi"
+		scope="I"
+		type="L"
+		name="Kamang" />
+	<iso_639_3_entry
+		id="wok"
+		scope="I"
+		type="L"
+		name="Longto" />
+	<iso_639_3_entry
+		id="wol"
+		part1_code="wo"
+		part2_code="wol"
+		scope="I"
+		type="L"
+		name="Wolof" />
+	<iso_639_3_entry
+		id="wom"
+		scope="I"
+		type="L"
+		name="Wom (Nigeria)" />
+	<iso_639_3_entry
+		id="won"
+		scope="I"
+		type="L"
+		name="Wongo" />
+	<iso_639_3_entry
+		id="woo"
+		scope="I"
+		type="L"
+		name="Manombai" />
+	<iso_639_3_entry
+		id="wor"
+		scope="I"
+		type="L"
+		name="Woria" />
+	<iso_639_3_entry
+		id="wos"
+		scope="I"
+		type="L"
+		name="Hanga Hundi" />
+	<iso_639_3_entry
+		id="wow"
+		scope="I"
+		type="L"
+		name="Wawonii" />
+	<iso_639_3_entry
+		id="woy"
+		scope="I"
+		type="E"
+		name="Weyto" />
+	<iso_639_3_entry
+		id="wpc"
+		scope="I"
+		type="L"
+		name="Maco" />
+	<iso_639_3_entry
+		id="wra"
+		scope="I"
+		type="L"
+		name="Warapu" />
+	<iso_639_3_entry
+		id="wrb"
+		scope="I"
+		type="E"
+		name="Warluwara" />
+	<iso_639_3_entry
+		id="wrd"
+		scope="I"
+		type="L"
+		name="Warduji" />
+	<iso_639_3_entry
+		id="wrg"
+		scope="I"
+		type="E"
+		name="Warungu" />
+	<iso_639_3_entry
+		id="wrh"
+		scope="I"
+		type="E"
+		name="Wiradhuri" />
+	<iso_639_3_entry
+		id="wri"
+		scope="I"
+		type="E"
+		name="Wariyangga" />
+	<iso_639_3_entry
+		id="wrl"
+		scope="I"
+		type="L"
+		name="Warlmanpa" />
+	<iso_639_3_entry
+		id="wrm"
+		scope="I"
+		type="L"
+		name="Warumungu" />
+	<iso_639_3_entry
+		id="wrn"
+		scope="I"
+		type="L"
+		name="Warnang" />
+	<iso_639_3_entry
+		id="wrp"
+		scope="I"
+		type="L"
+		name="Waropen" />
+	<iso_639_3_entry
+		id="wrr"
+		scope="I"
+		type="L"
+		name="Wardaman" />
+	<iso_639_3_entry
+		id="wrs"
+		scope="I"
+		type="L"
+		name="Waris" />
+	<iso_639_3_entry
+		id="wru"
+		scope="I"
+		type="L"
+		name="Waru" />
+	<iso_639_3_entry
+		id="wrv"
+		scope="I"
+		type="L"
+		name="Waruna" />
+	<iso_639_3_entry
+		id="wrw"
+		scope="I"
+		type="E"
+		name="Gugu Warra" />
+	<iso_639_3_entry
+		id="wrx"
+		scope="I"
+		type="L"
+		name="Wae Rana" />
+	<iso_639_3_entry
+		id="wry"
+		scope="I"
+		type="L"
+		name="Merwari" />
+	<iso_639_3_entry
+		id="wrz"
+		scope="I"
+		type="E"
+		name="Waray (Australia)" />
+	<iso_639_3_entry
+		id="wsa"
+		scope="I"
+		type="L"
+		name="Warembori" />
+	<iso_639_3_entry
+		id="wsi"
+		scope="I"
+		type="L"
+		name="Wusi" />
+	<iso_639_3_entry
+		id="wsk"
+		scope="I"
+		type="L"
+		name="Waskia" />
+	<iso_639_3_entry
+		id="wsr"
+		scope="I"
+		type="L"
+		name="Owenia" />
+	<iso_639_3_entry
+		id="wss"
+		scope="I"
+		type="L"
+		name="Wasa" />
+	<iso_639_3_entry
+		id="wsu"
+		scope="I"
+		type="E"
+		name="Wasu" />
+	<iso_639_3_entry
+		id="wsv"
+		scope="I"
+		type="E"
+		name="Wotapuri-Katarqalai" />
+	<iso_639_3_entry
+		id="wtf"
+		scope="I"
+		type="L"
+		name="Watiwa" />
+	<iso_639_3_entry
+		id="wti"
+		scope="I"
+		type="L"
+		name="Berta" />
+	<iso_639_3_entry
+		id="wtk"
+		scope="I"
+		type="L"
+		name="Watakataui" />
+	<iso_639_3_entry
+		id="wtm"
+		scope="I"
+		type="L"
+		name="Mewati" />
+	<iso_639_3_entry
+		id="wtw"
+		scope="I"
+		type="L"
+		name="Wotu" />
+	<iso_639_3_entry
+		id="wua"
+		scope="I"
+		type="L"
+		name="Wikngenchera" />
+	<iso_639_3_entry
+		id="wub"
+		scope="I"
+		type="L"
+		name="Wunambal" />
+	<iso_639_3_entry
+		id="wud"
+		scope="I"
+		type="L"
+		name="Wudu" />
+	<iso_639_3_entry
+		id="wuh"
+		scope="I"
+		type="L"
+		name="Wutunhua" />
+	<iso_639_3_entry
+		id="wul"
+		scope="I"
+		type="L"
+		name="Silimo" />
+	<iso_639_3_entry
+		id="wum"
+		scope="I"
+		type="L"
+		name="Wumbvu" />
+	<iso_639_3_entry
+		id="wun"
+		scope="I"
+		type="L"
+		name="Bungu" />
+	<iso_639_3_entry
+		id="wur"
+		scope="I"
+		type="E"
+		name="Wurrugu" />
+	<iso_639_3_entry
+		id="wut"
+		scope="I"
+		type="L"
+		name="Wutung" />
+	<iso_639_3_entry
+		id="wuu"
+		scope="I"
+		type="L"
+		name="Chinese; Wu" />
+	<iso_639_3_entry
+		id="wuv"
+		scope="I"
+		type="L"
+		name="Wuvulu-Aua" />
+	<iso_639_3_entry
+		id="wux"
+		scope="I"
+		type="L"
+		name="Wulna" />
+	<iso_639_3_entry
+		id="wuy"
+		scope="I"
+		type="L"
+		name="Wauyai" />
+	<iso_639_3_entry
+		id="wwa"
+		scope="I"
+		type="L"
+		name="Waama" />
+	<iso_639_3_entry
+		id="wwo"
+		scope="I"
+		type="L"
+		name="Wetamut" />
+	<iso_639_3_entry
+		id="wwr"
+		scope="I"
+		type="E"
+		name="Warrwa" />
+	<iso_639_3_entry
+		id="www"
+		scope="I"
+		type="L"
+		name="Wawa" />
+	<iso_639_3_entry
+		id="wxa"
+		scope="I"
+		type="L"
+		name="Waxianghua" />
+	<iso_639_3_entry
+		id="wya"
+		scope="I"
+		type="L"
+		name="Wyandot" />
+	<iso_639_3_entry
+		id="wyb"
+		scope="I"
+		type="L"
+		name="Wangaaybuwan-Ngiyambaa" />
+	<iso_639_3_entry
+		id="wym"
+		scope="I"
+		type="L"
+		name="Wymysorys" />
+	<iso_639_3_entry
+		id="wyr"
+		scope="I"
+		type="L"
+		name="Wayoró" />
+	<iso_639_3_entry
+		id="wyy"
+		scope="I"
+		type="L"
+		name="Fijian; Western" />
+	<iso_639_3_entry
+		id="xaa"
+		scope="I"
+		type="H"
+		name="Arabic; Andalusian" />
+	<iso_639_3_entry
+		id="xab"
+		scope="I"
+		type="L"
+		name="Sambe" />
+	<iso_639_3_entry
+		id="xac"
+		scope="I"
+		type="L"
+		name="Kachari" />
+	<iso_639_3_entry
+		id="xad"
+		scope="I"
+		type="E"
+		name="Adai" />
+	<iso_639_3_entry
+		id="xae"
+		scope="I"
+		type="A"
+		name="Aequian" />
+	<iso_639_3_entry
+		id="xag"
+		scope="I"
+		type="E"
+		name="Aghwan" />
+	<iso_639_3_entry
+		id="xai"
+		scope="I"
+		type="E"
+		name="Kaimbé" />
+	<iso_639_3_entry
+		id="xal"
+		part2_code="xal"
+		scope="I"
+		type="L"
+		name="Kalmyk" />
+	<iso_639_3_entry
+		id="xam"
+		scope="I"
+		type="E"
+		name="/Xam" />
+	<iso_639_3_entry
+		id="xan"
+		scope="I"
+		type="L"
+		name="Xamtanga" />
+	<iso_639_3_entry
+		id="xao"
+		scope="I"
+		type="L"
+		name="Khao" />
+	<iso_639_3_entry
+		id="xap"
+		scope="I"
+		type="E"
+		name="Apalachee" />
+	<iso_639_3_entry
+		id="xaq"
+		scope="I"
+		type="A"
+		name="Aquitanian" />
+	<iso_639_3_entry
+		id="xar"
+		scope="I"
+		type="E"
+		name="Karami" />
+	<iso_639_3_entry
+		id="xas"
+		scope="I"
+		type="E"
+		name="Kamas" />
+	<iso_639_3_entry
+		id="xat"
+		scope="I"
+		type="L"
+		name="Katawixi" />
+	<iso_639_3_entry
+		id="xau"
+		scope="I"
+		type="L"
+		name="Kauwera" />
+	<iso_639_3_entry
+		id="xav"
+		scope="I"
+		type="L"
+		name="Xavánte" />
+	<iso_639_3_entry
+		id="xaw"
+		scope="I"
+		type="L"
+		name="Kawaiisu" />
+	<iso_639_3_entry
+		id="xay"
+		scope="I"
+		type="L"
+		name="Kayan Mahakam" />
+	<iso_639_3_entry
+		id="xba"
+		scope="I"
+		type="E"
+		name="Kamba (Brazil)" />
+	<iso_639_3_entry
+		id="xbb"
+		scope="I"
+		type="E"
+		name="Burdekin; Lower" />
+	<iso_639_3_entry
+		id="xbc"
+		scope="I"
+		type="A"
+		name="Bactrian" />
+	<iso_639_3_entry
+		id="xbi"
+		scope="I"
+		type="L"
+		name="Kombio" />
+	<iso_639_3_entry
+		id="xbm"
+		scope="I"
+		type="H"
+		name="Breton; Middle" />
+	<iso_639_3_entry
+		id="xbn"
+		scope="I"
+		type="E"
+		name="Kenaboi" />
+	<iso_639_3_entry
+		id="xbo"
+		scope="I"
+		type="E"
+		name="Bolgarian" />
+	<iso_639_3_entry
+		id="xbr"
+		scope="I"
+		type="L"
+		name="Kambera" />
+	<iso_639_3_entry
+		id="xbw"
+		scope="I"
+		type="E"
+		name="Kambiwá" />
+	<iso_639_3_entry
+		id="xbx"
+		scope="I"
+		type="E"
+		name="Kabixí" />
+	<iso_639_3_entry
+		id="xcb"
+		scope="I"
+		type="E"
+		name="Cumbric" />
+	<iso_639_3_entry
+		id="xcc"
+		scope="I"
+		type="A"
+		name="Camunic" />
+	<iso_639_3_entry
+		id="xce"
+		scope="I"
+		type="A"
+		name="Celtiberian" />
+	<iso_639_3_entry
+		id="xcg"
+		scope="I"
+		type="A"
+		name="Gaulish; Cisalpine" />
+	<iso_639_3_entry
+		id="xch"
+		scope="I"
+		type="E"
+		name="Chemakum" />
+	<iso_639_3_entry
+		id="xcl"
+		scope="I"
+		type="H"
+		name="Armenian; Classical" />
+	<iso_639_3_entry
+		id="xcm"
+		scope="I"
+		type="E"
+		name="Comecrudo" />
+	<iso_639_3_entry
+		id="xcn"
+		scope="I"
+		type="E"
+		name="Cotoname" />
+	<iso_639_3_entry
+		id="xco"
+		scope="I"
+		type="A"
+		name="Chorasmian" />
+	<iso_639_3_entry
+		id="xcr"
+		scope="I"
+		type="A"
+		name="Carian" />
+	<iso_639_3_entry
+		id="xct"
+		scope="I"
+		type="H"
+		name="Tibetan; Classical" />
+	<iso_639_3_entry
+		id="xcu"
+		scope="I"
+		type="E"
+		name="Curonian" />
+	<iso_639_3_entry
+		id="xcv"
+		scope="I"
+		type="E"
+		name="Chuvantsy" />
+	<iso_639_3_entry
+		id="xcw"
+		scope="I"
+		type="E"
+		name="Coahuilteco" />
+	<iso_639_3_entry
+		id="xcy"
+		scope="I"
+		type="E"
+		name="Cayuse" />
+	<iso_639_3_entry
+		id="xdc"
+		scope="I"
+		type="A"
+		name="Dacian" />
+	<iso_639_3_entry
+		id="xdm"
+		scope="I"
+		type="A"
+		name="Edomite" />
+	<iso_639_3_entry
+		id="xdy"
+		scope="I"
+		type="L"
+		name="Dayak; Malayic" />
+	<iso_639_3_entry
+		id="xeb"
+		scope="I"
+		type="A"
+		name="Eblan" />
+	<iso_639_3_entry
+		id="xed"
+		scope="I"
+		type="L"
+		name="Hdi" />
+	<iso_639_3_entry
+		id="xeg"
+		scope="I"
+		type="E"
+		name="//Xegwi" />
+	<iso_639_3_entry
+		id="xel"
+		scope="I"
+		type="L"
+		name="Kelo" />
+	<iso_639_3_entry
+		id="xem"
+		scope="I"
+		type="L"
+		name="Kembayan" />
+	<iso_639_3_entry
+		id="xep"
+		scope="I"
+		type="A"
+		name="Epi-Olmec" />
+	<iso_639_3_entry
+		id="xer"
+		scope="I"
+		type="L"
+		name="Xerénte" />
+	<iso_639_3_entry
+		id="xes"
+		scope="I"
+		type="L"
+		name="Kesawai" />
+	<iso_639_3_entry
+		id="xet"
+		scope="I"
+		type="L"
+		name="Xetá" />
+	<iso_639_3_entry
+		id="xeu"
+		scope="I"
+		type="L"
+		name="Keoru-Ahia" />
+	<iso_639_3_entry
+		id="xfa"
+		scope="I"
+		type="A"
+		name="Faliscan" />
+	<iso_639_3_entry
+		id="xga"
+		scope="I"
+		type="A"
+		name="Galatian" />
+	<iso_639_3_entry
+		id="xgf"
+		scope="I"
+		type="E"
+		name="Gabrielino-Fernandeño" />
+	<iso_639_3_entry
+		id="xgl"
+		scope="I"
+		type="E"
+		name="Galindan" />
+	<iso_639_3_entry
+		id="xgr"
+		scope="I"
+		type="E"
+		name="Garza" />
+	<iso_639_3_entry
+		id="xha"
+		scope="I"
+		type="A"
+		name="Harami" />
+	<iso_639_3_entry
+		id="xhc"
+		scope="I"
+		type="E"
+		name="Hunnic" />
+	<iso_639_3_entry
+		id="xhd"
+		scope="I"
+		type="A"
+		name="Hadrami" />
+	<iso_639_3_entry
+		id="xhe"
+		scope="I"
+		type="L"
+		name="Khetrani" />
+	<iso_639_3_entry
+		id="xho"
+		part1_code="xh"
+		part2_code="xho"
+		scope="I"
+		type="L"
+		name="Xhosa" />
+	<iso_639_3_entry
+		id="xhr"
+		scope="I"
+		type="A"
+		name="Hernican" />
+	<iso_639_3_entry
+		id="xht"
+		scope="I"
+		type="A"
+		name="Hattic" />
+	<iso_639_3_entry
+		id="xhu"
+		scope="I"
+		type="A"
+		name="Hurrian" />
+	<iso_639_3_entry
+		id="xhv"
+		scope="I"
+		type="L"
+		name="Khua" />
+	<iso_639_3_entry
+		id="xia"
+		scope="I"
+		type="L"
+		name="Xiandao" />
+	<iso_639_3_entry
+		id="xib"
+		scope="I"
+		type="A"
+		name="Iberian" />
+	<iso_639_3_entry
+		id="xii"
+		scope="I"
+		type="L"
+		name="Xiri" />
+	<iso_639_3_entry
+		id="xil"
+		scope="I"
+		type="A"
+		name="Illyrian" />
+	<iso_639_3_entry
+		id="xin"
+		scope="I"
+		type="E"
+		name="Xinca" />
+	<iso_639_3_entry
+		id="xip"
+		scope="I"
+		type="E"
+		name="Xipináwa" />
+	<iso_639_3_entry
+		id="xir"
+		scope="I"
+		type="E"
+		name="Xiriâna" />
+	<iso_639_3_entry
+		id="xiv"
+		scope="I"
+		type="A"
+		name="Indus Valley Language" />
+	<iso_639_3_entry
+		id="xiy"
+		scope="I"
+		type="L"
+		name="Xipaya" />
+	<iso_639_3_entry
+		id="xka"
+		scope="I"
+		type="L"
+		name="Kalkoti" />
+	<iso_639_3_entry
+		id="xkb"
+		scope="I"
+		type="L"
+		name="Nago; Northern" />
+	<iso_639_3_entry
+		id="xkc"
+		scope="I"
+		type="L"
+		name="Kho'ini" />
+	<iso_639_3_entry
+		id="xkd"
+		scope="I"
+		type="L"
+		name="Kayan; Mendalam" />
+	<iso_639_3_entry
+		id="xke"
+		scope="I"
+		type="L"
+		name="Kereho" />
+	<iso_639_3_entry
+		id="xkf"
+		scope="I"
+		type="L"
+		name="Khengkha" />
+	<iso_639_3_entry
+		id="xkg"
+		scope="I"
+		type="L"
+		name="Kagoro" />
+	<iso_639_3_entry
+		id="xkh"
+		scope="I"
+		type="L"
+		name="Karahawyana" />
+	<iso_639_3_entry
+		id="xki"
+		scope="I"
+		type="L"
+		name="Kenyan Sign Language" />
+	<iso_639_3_entry
+		id="xkj"
+		scope="I"
+		type="L"
+		name="Kajali" />
+	<iso_639_3_entry
+		id="xkk"
+		scope="I"
+		type="L"
+		name="Kaco'" />
+	<iso_639_3_entry
+		id="xkl"
+		scope="I"
+		type="L"
+		name="Mainstream Kenyah" />
+	<iso_639_3_entry
+		id="xkn"
+		scope="I"
+		type="L"
+		name="Kayan; Kayan River" />
+	<iso_639_3_entry
+		id="xko"
+		scope="I"
+		type="L"
+		name="Kiorr" />
+	<iso_639_3_entry
+		id="xkp"
+		scope="I"
+		type="L"
+		name="Kabatei" />
+	<iso_639_3_entry
+		id="xkq"
+		scope="I"
+		type="L"
+		name="Koroni" />
+	<iso_639_3_entry
+		id="xkr"
+		scope="I"
+		type="E"
+		name="Xakriabá" />
+	<iso_639_3_entry
+		id="xks"
+		scope="I"
+		type="L"
+		name="Kumbewaha" />
+	<iso_639_3_entry
+		id="xkt"
+		scope="I"
+		type="L"
+		name="Kantosi" />
+	<iso_639_3_entry
+		id="xku"
+		scope="I"
+		type="L"
+		name="Kaamba" />
+	<iso_639_3_entry
+		id="xkv"
+		scope="I"
+		type="L"
+		name="Kgalagadi" />
+	<iso_639_3_entry
+		id="xkw"
+		scope="I"
+		type="L"
+		name="Kembra" />
+	<iso_639_3_entry
+		id="xkx"
+		scope="I"
+		type="L"
+		name="Karore" />
+	<iso_639_3_entry
+		id="xky"
+		scope="I"
+		type="L"
+		name="Uma' Lasan" />
+	<iso_639_3_entry
+		id="xkz"
+		scope="I"
+		type="L"
+		name="Kurtokha" />
+	<iso_639_3_entry
+		id="xla"
+		scope="I"
+		type="L"
+		name="Kamula" />
+	<iso_639_3_entry
+		id="xlb"
+		scope="I"
+		type="E"
+		name="Loup B" />
+	<iso_639_3_entry
+		id="xlc"
+		scope="I"
+		type="A"
+		name="Lycian" />
+	<iso_639_3_entry
+		id="xld"
+		scope="I"
+		type="A"
+		name="Lydian" />
+	<iso_639_3_entry
+		id="xle"
+		scope="I"
+		type="A"
+		name="Lemnian" />
+	<iso_639_3_entry
+		id="xlg"
+		scope="I"
+		type="A"
+		name="Ligurian (Ancient)" />
+	<iso_639_3_entry
+		id="xli"
+		scope="I"
+		type="A"
+		name="Liburnian" />
+	<iso_639_3_entry
+		id="xln"
+		scope="I"
+		type="A"
+		name="Alanic" />
+	<iso_639_3_entry
+		id="xlo"
+		scope="I"
+		type="E"
+		name="Loup A" />
+	<iso_639_3_entry
+		id="xlp"
+		scope="I"
+		type="A"
+		name="Lepontic" />
+	<iso_639_3_entry
+		id="xls"
+		scope="I"
+		type="A"
+		name="Lusitanian" />
+	<iso_639_3_entry
+		id="xlu"
+		scope="I"
+		type="A"
+		name="Luwian; Cuneiform" />
+	<iso_639_3_entry
+		id="xly"
+		scope="I"
+		type="A"
+		name="Elymian" />
+	<iso_639_3_entry
+		id="xma"
+		scope="I"
+		type="L"
+		name="Mushungulu" />
+	<iso_639_3_entry
+		id="xmb"
+		scope="I"
+		type="L"
+		name="Mbonga" />
+	<iso_639_3_entry
+		id="xmc"
+		scope="I"
+		type="L"
+		name="Makhuwa-Marrevone" />
+	<iso_639_3_entry
+		id="xmd"
+		scope="I"
+		type="L"
+		name="Mbudum" />
+	<iso_639_3_entry
+		id="xme"
+		scope="I"
+		type="A"
+		name="Median" />
+	<iso_639_3_entry
+		id="xmf"
+		scope="I"
+		type="L"
+		name="Mingrelian" />
+	<iso_639_3_entry
+		id="xmg"
+		scope="I"
+		type="L"
+		name="Mengaka" />
+	<iso_639_3_entry
+		id="xmh"
+		scope="I"
+		type="L"
+		name="Kuku-Muminh" />
+	<iso_639_3_entry
+		id="xmj"
+		scope="I"
+		type="L"
+		name="Majera" />
+	<iso_639_3_entry
+		id="xmk"
+		scope="I"
+		type="A"
+		name="Macedonian; Ancient" />
+	<iso_639_3_entry
+		id="xml"
+		scope="I"
+		type="L"
+		name="Malaysian Sign Language" />
+	<iso_639_3_entry
+		id="xmm"
+		scope="I"
+		type="L"
+		name="Malay; Manado" />
+	<iso_639_3_entry
+		id="xmn"
+		scope="I"
+		type="H"
+		name="Persian; Manichaean Middle" />
+	<iso_639_3_entry
+		id="xmo"
+		scope="I"
+		type="L"
+		name="Morerebi" />
+	<iso_639_3_entry
+		id="xmp"
+		scope="I"
+		type="E"
+		name="Kuku-Mu'inh" />
+	<iso_639_3_entry
+		id="xmq"
+		scope="I"
+		type="E"
+		name="Kuku-Mangk" />
+	<iso_639_3_entry
+		id="xmr"
+		scope="I"
+		type="A"
+		name="Meroitic" />
+	<iso_639_3_entry
+		id="xms"
+		scope="I"
+		type="L"
+		name="Moroccan Sign Language" />
+	<iso_639_3_entry
+		id="xmt"
+		scope="I"
+		type="L"
+		name="Matbat" />
+	<iso_639_3_entry
+		id="xmu"
+		scope="I"
+		type="E"
+		name="Kamu" />
+	<iso_639_3_entry
+		id="xmv"
+		scope="I"
+		type="L"
+		name="Malagasy; Tankarana" />
+	<iso_639_3_entry
+		id="xmw"
+		scope="I"
+		type="L"
+		name="Malagasy; Tsimihety" />
+	<iso_639_3_entry
+		id="xmx"
+		scope="I"
+		type="L"
+		name="Maden" />
+	<iso_639_3_entry
+		id="xmy"
+		scope="I"
+		type="L"
+		name="Mayaguduna" />
+	<iso_639_3_entry
+		id="xmz"
+		scope="I"
+		type="L"
+		name="Mori Bawah" />
+	<iso_639_3_entry
+		id="xna"
+		scope="I"
+		type="A"
+		name="North Arabian; Ancient" />
+	<iso_639_3_entry
+		id="xnb"
+		scope="I"
+		type="L"
+		name="Kanakanabu" />
+	<iso_639_3_entry
+		id="xng"
+		scope="I"
+		type="H"
+		name="Mongolian; Middle" />
+	<iso_639_3_entry
+		id="xnh"
+		scope="I"
+		type="L"
+		name="Kuanhua" />
+	<iso_639_3_entry
+		id="xnn"
+		scope="I"
+		type="L"
+		name="Kankanay; Northern" />
+	<iso_639_3_entry
+		id="xno"
+		scope="I"
+		type="H"
+		name="Anglo-Norman" />
+	<iso_639_3_entry
+		id="xnr"
+		scope="I"
+		type="L"
+		name="Kangri" />
+	<iso_639_3_entry
+		id="xns"
+		scope="I"
+		type="L"
+		name="Kanashi" />
+	<iso_639_3_entry
+		id="xnt"
+		scope="I"
+		type="E"
+		name="Narragansett" />
+	<iso_639_3_entry
+		id="xoc"
+		scope="I"
+		type="E"
+		name="O'chi'chi'" />
+	<iso_639_3_entry
+		id="xod"
+		scope="I"
+		type="L"
+		name="Kokoda" />
+	<iso_639_3_entry
+		id="xog"
+		scope="I"
+		type="L"
+		name="Soga" />
+	<iso_639_3_entry
+		id="xoi"
+		scope="I"
+		type="L"
+		name="Kominimung" />
+	<iso_639_3_entry
+		id="xok"
+		scope="I"
+		type="L"
+		name="Xokleng" />
+	<iso_639_3_entry
+		id="xom"
+		scope="I"
+		type="L"
+		name="Komo (Sudan)" />
+	<iso_639_3_entry
+		id="xon"
+		scope="I"
+		type="L"
+		name="Konkomba" />
+	<iso_639_3_entry
+		id="xoo"
+		scope="I"
+		type="E"
+		name="Xukurú" />
+	<iso_639_3_entry
+		id="xop"
+		scope="I"
+		type="L"
+		name="Kopar" />
+	<iso_639_3_entry
+		id="xor"
+		scope="I"
+		type="L"
+		name="Korubo" />
+	<iso_639_3_entry
+		id="xow"
+		scope="I"
+		type="L"
+		name="Kowaki" />
+	<iso_639_3_entry
+		id="xpc"
+		scope="I"
+		type="E"
+		name="Pecheneg" />
+	<iso_639_3_entry
+		id="xpe"
+		scope="I"
+		type="L"
+		name="Kpelle; Liberia" />
+	<iso_639_3_entry
+		id="xpg"
+		scope="I"
+		type="A"
+		name="Phrygian" />
+	<iso_639_3_entry
+		id="xpi"
+		scope="I"
+		type="E"
+		name="Pictish" />
+	<iso_639_3_entry
+		id="xpk"
+		scope="I"
+		type="L"
+		name="Pano; Kulina" />
+	<iso_639_3_entry
+		id="xpm"
+		scope="I"
+		type="E"
+		name="Pumpokol" />
+	<iso_639_3_entry
+		id="xpn"
+		scope="I"
+		type="E"
+		name="Kapinawá" />
+	<iso_639_3_entry
+		id="xpo"
+		scope="I"
+		type="E"
+		name="Pochutec" />
+	<iso_639_3_entry
+		id="xpp"
+		scope="I"
+		type="E"
+		name="Puyo-Paekche" />
+	<iso_639_3_entry
+		id="xpq"
+		scope="I"
+		type="E"
+		name="Mohegan-Pequot" />
+	<iso_639_3_entry
+		id="xpr"
+		scope="I"
+		type="A"
+		name="Parthian" />
+	<iso_639_3_entry
+		id="xps"
+		scope="I"
+		type="E"
+		name="Pisidian" />
+	<iso_639_3_entry
+		id="xpu"
+		scope="I"
+		type="A"
+		name="Punic" />
+	<iso_639_3_entry
+		id="xpy"
+		scope="I"
+		type="E"
+		name="Puyo" />
+	<iso_639_3_entry
+		id="xqa"
+		scope="I"
+		type="H"
+		name="Karakhanid" />
+	<iso_639_3_entry
+		id="xqt"
+		scope="I"
+		type="A"
+		name="Qatabanian" />
+	<iso_639_3_entry
+		id="xra"
+		scope="I"
+		type="L"
+		name="Krahô" />
+	<iso_639_3_entry
+		id="xrb"
+		scope="I"
+		type="L"
+		name="Karaboro; Eastern" />
+	<iso_639_3_entry
+		id="xre"
+		scope="I"
+		type="L"
+		name="Kreye" />
+	<iso_639_3_entry
+		id="xri"
+		scope="I"
+		type="L"
+		name="Krikati-Timbira" />
+	<iso_639_3_entry
+		id="xrm"
+		scope="I"
+		type="E"
+		name="Armazic" />
+	<iso_639_3_entry
+		id="xrn"
+		scope="I"
+		type="E"
+		name="Arin" />
+	<iso_639_3_entry
+		id="xrr"
+		scope="I"
+		type="A"
+		name="Raetic" />
+	<iso_639_3_entry
+		id="xrt"
+		scope="I"
+		type="E"
+		name="Aranama-Tamique" />
+	<iso_639_3_entry
+		id="xru"
+		scope="I"
+		type="L"
+		name="Marriammu" />
+	<iso_639_3_entry
+		id="xrw"
+		scope="I"
+		type="L"
+		name="Karawa" />
+	<iso_639_3_entry
+		id="xsa"
+		scope="I"
+		type="A"
+		name="Sabaean" />
+	<iso_639_3_entry
+		id="xsb"
+		scope="I"
+		type="L"
+		name="Sambal; Tinà" />
+	<iso_639_3_entry
+		id="xsc"
+		scope="I"
+		type="A"
+		name="Scythian" />
+	<iso_639_3_entry
+		id="xsd"
+		scope="I"
+		type="A"
+		name="Sidetic" />
+	<iso_639_3_entry
+		id="xse"
+		scope="I"
+		type="L"
+		name="Sempan" />
+	<iso_639_3_entry
+		id="xsh"
+		scope="I"
+		type="L"
+		name="Shamang" />
+	<iso_639_3_entry
+		id="xsi"
+		scope="I"
+		type="L"
+		name="Sio" />
+	<iso_639_3_entry
+		id="xsj"
+		scope="I"
+		type="L"
+		name="Subi" />
+	<iso_639_3_entry
+		id="xsl"
+		scope="I"
+		type="L"
+		name="Slavey; South" />
+	<iso_639_3_entry
+		id="xsm"
+		scope="I"
+		type="L"
+		name="Kasem" />
+	<iso_639_3_entry
+		id="xsn"
+		scope="I"
+		type="L"
+		name="Sanga (Nigeria)" />
+	<iso_639_3_entry
+		id="xso"
+		scope="I"
+		type="E"
+		name="Solano" />
+	<iso_639_3_entry
+		id="xsp"
+		scope="I"
+		type="L"
+		name="Silopi" />
+	<iso_639_3_entry
+		id="xsq"
+		scope="I"
+		type="L"
+		name="Makhuwa-Saka" />
+	<iso_639_3_entry
+		id="xsr"
+		scope="I"
+		type="L"
+		name="Sherpa" />
+	<iso_639_3_entry
+		id="xss"
+		scope="I"
+		type="E"
+		name="Assan" />
+	<iso_639_3_entry
+		id="xsu"
+		scope="I"
+		type="L"
+		name="Sanumá" />
+	<iso_639_3_entry
+		id="xsv"
+		scope="I"
+		type="E"
+		name="Sudovian" />
+	<iso_639_3_entry
+		id="xsy"
+		scope="I"
+		type="L"
+		name="Saisiyat" />
+	<iso_639_3_entry
+		id="xta"
+		scope="I"
+		type="L"
+		name="Mixtec; Alcozauca" />
+	<iso_639_3_entry
+		id="xtb"
+		scope="I"
+		type="L"
+		name="Mixtec; Chazumba" />
+	<iso_639_3_entry
+		id="xtc"
+		scope="I"
+		type="L"
+		name="Katcha-Kadugli-Miri" />
+	<iso_639_3_entry
+		id="xtd"
+		scope="I"
+		type="L"
+		name="Mixtec; Diuxi-Tilantongo" />
+	<iso_639_3_entry
+		id="xte"
+		scope="I"
+		type="L"
+		name="Ketengban" />
+	<iso_639_3_entry
+		id="xtg"
+		scope="I"
+		type="A"
+		name="Gaulish; Transalpine" />
+	<iso_639_3_entry
+		id="xti"
+		scope="I"
+		type="L"
+		name="Mixtec; Sinicahua" />
+	<iso_639_3_entry
+		id="xtj"
+		scope="I"
+		type="L"
+		name="Mixtec; San Juan Teita" />
+	<iso_639_3_entry
+		id="xtl"
+		scope="I"
+		type="L"
+		name="Mixtec; Tijaltepec" />
+	<iso_639_3_entry
+		id="xtm"
+		scope="I"
+		type="L"
+		name="Mixtec; Magdalena Peñasco" />
+	<iso_639_3_entry
+		id="xtn"
+		scope="I"
+		type="L"
+		name="Mixtec; Northern Tlaxiaco" />
+	<iso_639_3_entry
+		id="xto"
+		scope="I"
+		type="A"
+		name="Tokharian A" />
+	<iso_639_3_entry
+		id="xtp"
+		scope="I"
+		type="L"
+		name="Mixtec; San Miguel Piedras" />
+	<iso_639_3_entry
+		id="xtq"
+		scope="I"
+		type="H"
+		name="Tumshuqese" />
+	<iso_639_3_entry
+		id="xtr"
+		scope="I"
+		type="A"
+		name="Tripuri; Early" />
+	<iso_639_3_entry
+		id="xts"
+		scope="I"
+		type="L"
+		name="Mixtec; Sindihui" />
+	<iso_639_3_entry
+		id="xtt"
+		scope="I"
+		type="L"
+		name="Mixtec; Tacahua" />
+	<iso_639_3_entry
+		id="xtu"
+		scope="I"
+		type="L"
+		name="Mixtec; Cuyamecalco" />
+	<iso_639_3_entry
+		id="xtw"
+		scope="I"
+		type="L"
+		name="Tawandê" />
+	<iso_639_3_entry
+		id="xty"
+		scope="I"
+		type="L"
+		name="Mixtec; Yoloxochitl" />
+	<iso_639_3_entry
+		id="xtz"
+		scope="I"
+		type="E"
+		name="Tasmanian" />
+	<iso_639_3_entry
+		id="xua"
+		scope="I"
+		type="L"
+		name="Kurumba; Alu" />
+	<iso_639_3_entry
+		id="xub"
+		scope="I"
+		type="L"
+		name="Kurumba; Betta" />
+	<iso_639_3_entry
+		id="xug"
+		scope="I"
+		type="L"
+		name="Kunigami" />
+	<iso_639_3_entry
+		id="xuj"
+		scope="I"
+		type="L"
+		name="Kurumba; Jennu" />
+	<iso_639_3_entry
+		id="xum"
+		scope="I"
+		type="A"
+		name="Umbrian" />
+	<iso_639_3_entry
+		id="xuo"
+		scope="I"
+		type="L"
+		name="Kuo" />
+	<iso_639_3_entry
+		id="xup"
+		scope="I"
+		type="E"
+		name="Umpqua; Upper" />
+	<iso_639_3_entry
+		id="xur"
+		scope="I"
+		type="A"
+		name="Urartian" />
+	<iso_639_3_entry
+		id="xut"
+		scope="I"
+		type="E"
+		name="Kuthant" />
+	<iso_639_3_entry
+		id="xuu"
+		scope="I"
+		type="L"
+		name="Kxoe" />
+	<iso_639_3_entry
+		id="xve"
+		scope="I"
+		type="A"
+		name="Venetic" />
+	<iso_639_3_entry
+		id="xvi"
+		scope="I"
+		type="L"
+		name="Kamviri" />
+	<iso_639_3_entry
+		id="xvn"
+		scope="I"
+		type="A"
+		name="Vandalic" />
+	<iso_639_3_entry
+		id="xvo"
+		scope="I"
+		type="A"
+		name="Volscian" />
+	<iso_639_3_entry
+		id="xvs"
+		scope="I"
+		type="A"
+		name="Vestinian" />
+	<iso_639_3_entry
+		id="xwa"
+		scope="I"
+		type="L"
+		name="Kwaza" />
+	<iso_639_3_entry
+		id="xwc"
+		scope="I"
+		type="E"
+		name="Woccon" />
+	<iso_639_3_entry
+		id="xwe"
+		scope="I"
+		type="L"
+		name="Gbe; Xwela" />
+	<iso_639_3_entry
+		id="xwg"
+		scope="I"
+		type="L"
+		name="Kwegu" />
+	<iso_639_3_entry
+		id="xwl"
+		scope="I"
+		type="L"
+		name="Gbe; Western Xwla" />
+	<iso_639_3_entry
+		id="xwo"
+		scope="I"
+		type="E"
+		name="Oirat; Written" />
+	<iso_639_3_entry
+		id="xwr"
+		scope="I"
+		type="L"
+		name="Kwerba Mamberamo" />
+	<iso_639_3_entry
+		id="xxb"
+		scope="I"
+		type="E"
+		name="Boro (Ghana)" />
+	<iso_639_3_entry
+		id="xxk"
+		scope="I"
+		type="L"
+		name="Ke'o" />
+	<iso_639_3_entry
+		id="xxr"
+		scope="I"
+		type="E"
+		name="Koropó" />
+	<iso_639_3_entry
+		id="xxt"
+		scope="I"
+		type="E"
+		name="Tambora" />
+	<iso_639_3_entry
+		id="xyl"
+		scope="I"
+		type="E"
+		name="Yalakalore" />
+	<iso_639_3_entry
+		id="xzh"
+		scope="I"
+		type="A"
+		name="Zhang-Zhung" />
+	<iso_639_3_entry
+		id="xzm"
+		scope="I"
+		type="E"
+		name="Zemgalian" />
+	<iso_639_3_entry
+		id="xzp"
+		scope="I"
+		type="H"
+		name="Zapotec; Ancient" />
+	<iso_639_3_entry
+		id="yaa"
+		scope="I"
+		type="L"
+		name="Yaminahua" />
+	<iso_639_3_entry
+		id="yab"
+		scope="I"
+		type="L"
+		name="Yuhup" />
+	<iso_639_3_entry
+		id="yac"
+		scope="I"
+		type="L"
+		name="Yali; Pass Valley" />
+	<iso_639_3_entry
+		id="yad"
+		scope="I"
+		type="L"
+		name="Yagua" />
+	<iso_639_3_entry
+		id="yae"
+		scope="I"
+		type="L"
+		name="Pumé" />
+	<iso_639_3_entry
+		id="yaf"
+		scope="I"
+		type="L"
+		name="Yaka (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="yag"
+		scope="I"
+		type="L"
+		name="Yámana" />
+	<iso_639_3_entry
+		id="yah"
+		scope="I"
+		type="L"
+		name="Yazgulyam" />
+	<iso_639_3_entry
+		id="yai"
+		scope="I"
+		type="L"
+		name="Yagnobi" />
+	<iso_639_3_entry
+		id="yaj"
+		scope="I"
+		type="L"
+		name="Banda-Yangere" />
+	<iso_639_3_entry
+		id="yak"
+		scope="I"
+		type="L"
+		name="Yakama" />
+	<iso_639_3_entry
+		id="yal"
+		scope="I"
+		type="L"
+		name="Yalunka" />
+	<iso_639_3_entry
+		id="yam"
+		scope="I"
+		type="L"
+		name="Yamba" />
+	<iso_639_3_entry
+		id="yan"
+		scope="I"
+		type="L"
+		name="Mayangna" />
+	<iso_639_3_entry
+		id="yao"
+		part2_code="yao"
+		scope="I"
+		type="L"
+		name="Yao" />
+	<iso_639_3_entry
+		id="yap"
+		part2_code="yap"
+		scope="I"
+		type="L"
+		name="Yapese" />
+	<iso_639_3_entry
+		id="yaq"
+		scope="I"
+		type="L"
+		name="Yaqui" />
+	<iso_639_3_entry
+		id="yar"
+		scope="I"
+		type="L"
+		name="Yabarana" />
+	<iso_639_3_entry
+		id="yas"
+		scope="I"
+		type="L"
+		name="Nugunu (Cameroon)" />
+	<iso_639_3_entry
+		id="yat"
+		scope="I"
+		type="L"
+		name="Yambeta" />
+	<iso_639_3_entry
+		id="yau"
+		scope="I"
+		type="L"
+		name="Yuwana" />
+	<iso_639_3_entry
+		id="yav"
+		scope="I"
+		type="L"
+		name="Yangben" />
+	<iso_639_3_entry
+		id="yaw"
+		scope="I"
+		type="L"
+		name="Yawalapití" />
+	<iso_639_3_entry
+		id="yax"
+		scope="I"
+		type="L"
+		name="Yauma" />
+	<iso_639_3_entry
+		id="yay"
+		scope="I"
+		type="L"
+		name="Agwagwune" />
+	<iso_639_3_entry
+		id="yaz"
+		scope="I"
+		type="L"
+		name="Lokaa" />
+	<iso_639_3_entry
+		id="yba"
+		scope="I"
+		type="L"
+		name="Yala" />
+	<iso_639_3_entry
+		id="ybb"
+		scope="I"
+		type="L"
+		name="Yemba" />
+	<iso_639_3_entry
+		id="ybd"
+		scope="I"
+		type="L"
+		name="Yangbye" />
+	<iso_639_3_entry
+		id="ybe"
+		scope="I"
+		type="L"
+		name="Yugur; West" />
+	<iso_639_3_entry
+		id="ybh"
+		scope="I"
+		type="L"
+		name="Yakha" />
+	<iso_639_3_entry
+		id="ybi"
+		scope="I"
+		type="L"
+		name="Yamphu" />
+	<iso_639_3_entry
+		id="ybj"
+		scope="I"
+		type="L"
+		name="Hasha" />
+	<iso_639_3_entry
+		id="ybk"
+		scope="I"
+		type="L"
+		name="Bokha" />
+	<iso_639_3_entry
+		id="ybl"
+		scope="I"
+		type="L"
+		name="Yukuben" />
+	<iso_639_3_entry
+		id="ybm"
+		scope="I"
+		type="L"
+		name="Yaben" />
+	<iso_639_3_entry
+		id="ybn"
+		scope="I"
+		type="E"
+		name="Yabaâna" />
+	<iso_639_3_entry
+		id="ybo"
+		scope="I"
+		type="L"
+		name="Yabong" />
+	<iso_639_3_entry
+		id="ybx"
+		scope="I"
+		type="L"
+		name="Yawiyo" />
+	<iso_639_3_entry
+		id="yby"
+		scope="I"
+		type="L"
+		name="Yaweyuha" />
+	<iso_639_3_entry
+		id="ych"
+		scope="I"
+		type="L"
+		name="Chesu" />
+	<iso_639_3_entry
+		id="ycl"
+		scope="I"
+		type="L"
+		name="Lolopo" />
+	<iso_639_3_entry
+		id="ycn"
+		scope="I"
+		type="L"
+		name="Yucuna" />
+	<iso_639_3_entry
+		id="ycp"
+		scope="I"
+		type="L"
+		name="Chepya" />
+	<iso_639_3_entry
+		id="ydd"
+		scope="I"
+		type="L"
+		name="Yiddish; Eastern" />
+	<iso_639_3_entry
+		id="yde"
+		scope="I"
+		type="L"
+		name="Yangum Dey" />
+	<iso_639_3_entry
+		id="ydg"
+		scope="I"
+		type="L"
+		name="Yidgha" />
+	<iso_639_3_entry
+		id="ydk"
+		scope="I"
+		type="L"
+		name="Yoidik" />
+	<iso_639_3_entry
+		id="yds"
+		scope="I"
+		type="L"
+		name="Yiddish Sign Language" />
+	<iso_639_3_entry
+		id="yea"
+		scope="I"
+		type="L"
+		name="Ravula" />
+	<iso_639_3_entry
+		id="yec"
+		scope="I"
+		type="L"
+		name="Yeniche" />
+	<iso_639_3_entry
+		id="yee"
+		scope="I"
+		type="L"
+		name="Yimas" />
+	<iso_639_3_entry
+		id="yei"
+		scope="I"
+		type="E"
+		name="Yeni" />
+	<iso_639_3_entry
+		id="yej"
+		scope="I"
+		type="L"
+		name="Yevanic" />
+	<iso_639_3_entry
+		id="yel"
+		scope="I"
+		type="L"
+		name="Yela" />
+	<iso_639_3_entry
+		id="yen"
+		scope="I"
+		type="L"
+		name="Yendang" />
+	<iso_639_3_entry
+		id="yer"
+		scope="I"
+		type="L"
+		name="Tarok" />
+	<iso_639_3_entry
+		id="yes"
+		scope="I"
+		type="L"
+		name="Yeskwa" />
+	<iso_639_3_entry
+		id="yet"
+		scope="I"
+		type="L"
+		name="Yetfa" />
+	<iso_639_3_entry
+		id="yeu"
+		scope="I"
+		type="L"
+		name="Yerukula" />
+	<iso_639_3_entry
+		id="yev"
+		scope="I"
+		type="L"
+		name="Yapunda" />
+	<iso_639_3_entry
+		id="yey"
+		scope="I"
+		type="L"
+		name="Yeyi" />
+	<iso_639_3_entry
+		id="ygl"
+		scope="I"
+		type="L"
+		name="Yangum Gel" />
+	<iso_639_3_entry
+		id="ygm"
+		scope="I"
+		type="L"
+		name="Yagomi" />
+	<iso_639_3_entry
+		id="ygp"
+		scope="I"
+		type="L"
+		name="Gepo" />
+	<iso_639_3_entry
+		id="ygr"
+		scope="I"
+		type="L"
+		name="Yagaria" />
+	<iso_639_3_entry
+		id="ygw"
+		scope="I"
+		type="L"
+		name="Yagwoia" />
+	<iso_639_3_entry
+		id="yha"
+		scope="I"
+		type="L"
+		name="Buyang; Baha" />
+	<iso_639_3_entry
+		id="yhd"
+		scope="I"
+		type="L"
+		name="Arabic; Judeo-Iraqi" />
+	<iso_639_3_entry
+		id="yhl"
+		scope="I"
+		type="L"
+		name="Phowa; Hlepho" />
+	<iso_639_3_entry
+		id="yia"
+		scope="I"
+		type="L"
+		name="Yinggarda" />
+	<iso_639_3_entry
+		id="yid"
+		part1_code="yi"
+		part2_code="yid"
+		scope="M"
+		type="L"
+		name="Yiddish" />
+	<iso_639_3_entry
+		id="yif"
+		scope="I"
+		type="L"
+		name="Ache" />
+	<iso_639_3_entry
+		id="yig"
+		scope="I"
+		type="L"
+		name="Nasu; Wusa" />
+	<iso_639_3_entry
+		id="yih"
+		scope="I"
+		type="L"
+		name="Yiddish; Western" />
+	<iso_639_3_entry
+		id="yii"
+		scope="I"
+		type="L"
+		name="Yidiny" />
+	<iso_639_3_entry
+		id="yij"
+		scope="I"
+		type="L"
+		name="Yindjibarndi" />
+	<iso_639_3_entry
+		id="yik"
+		scope="I"
+		type="L"
+		name="Lalo; Dongshanba" />
+	<iso_639_3_entry
+		id="yil"
+		scope="I"
+		type="E"
+		name="Yindjilandji" />
+	<iso_639_3_entry
+		id="yim"
+		scope="I"
+		type="L"
+		name="Naga; Yimchungru" />
+	<iso_639_3_entry
+		id="yin"
+		scope="I"
+		type="L"
+		name="Yinchia" />
+	<iso_639_3_entry
+		id="yip"
+		scope="I"
+		type="L"
+		name="Pholo" />
+	<iso_639_3_entry
+		id="yiq"
+		scope="I"
+		type="L"
+		name="Miqie" />
+	<iso_639_3_entry
+		id="yir"
+		scope="I"
+		type="L"
+		name="Awyu; North" />
+	<iso_639_3_entry
+		id="yis"
+		scope="I"
+		type="L"
+		name="Yis" />
+	<iso_639_3_entry
+		id="yit"
+		scope="I"
+		type="L"
+		name="Lalu; Eastern" />
+	<iso_639_3_entry
+		id="yiu"
+		scope="I"
+		type="L"
+		name="Awu" />
+	<iso_639_3_entry
+		id="yiv"
+		scope="I"
+		type="L"
+		name="Nisu; Northern" />
+	<iso_639_3_entry
+		id="yix"
+		scope="I"
+		type="L"
+		name="Yi; Axi" />
+	<iso_639_3_entry
+		id="yiy"
+		scope="I"
+		type="L"
+		name="Yir Yoront" />
+	<iso_639_3_entry
+		id="yiz"
+		scope="I"
+		type="L"
+		name="Azhe" />
+	<iso_639_3_entry
+		id="yka"
+		scope="I"
+		type="L"
+		name="Yakan" />
+	<iso_639_3_entry
+		id="ykg"
+		scope="I"
+		type="L"
+		name="Yukaghir; Northern" />
+	<iso_639_3_entry
+		id="yki"
+		scope="I"
+		type="L"
+		name="Yoke" />
+	<iso_639_3_entry
+		id="ykk"
+		scope="I"
+		type="L"
+		name="Yakaikeke" />
+	<iso_639_3_entry
+		id="ykl"
+		scope="I"
+		type="L"
+		name="Khlula" />
+	<iso_639_3_entry
+		id="ykm"
+		scope="I"
+		type="L"
+		name="Kap" />
+	<iso_639_3_entry
+		id="yko"
+		scope="I"
+		type="L"
+		name="Yasa" />
+	<iso_639_3_entry
+		id="ykr"
+		scope="I"
+		type="L"
+		name="Yekora" />
+	<iso_639_3_entry
+		id="ykt"
+		scope="I"
+		type="L"
+		name="Kathu" />
+	<iso_639_3_entry
+		id="yky"
+		scope="I"
+		type="L"
+		name="Yakoma" />
+	<iso_639_3_entry
+		id="yla"
+		scope="I"
+		type="L"
+		name="Yaul" />
+	<iso_639_3_entry
+		id="ylb"
+		scope="I"
+		type="L"
+		name="Yaleba" />
+	<iso_639_3_entry
+		id="yle"
+		scope="I"
+		type="L"
+		name="Yele" />
+	<iso_639_3_entry
+		id="ylg"
+		scope="I"
+		type="L"
+		name="Yelogu" />
+	<iso_639_3_entry
+		id="yli"
+		scope="I"
+		type="L"
+		name="Yali; Angguruk" />
+	<iso_639_3_entry
+		id="yll"
+		scope="I"
+		type="L"
+		name="Yil" />
+	<iso_639_3_entry
+		id="ylm"
+		scope="I"
+		type="L"
+		name="Limi" />
+	<iso_639_3_entry
+		id="yln"
+		scope="I"
+		type="L"
+		name="Buyang; Langnian" />
+	<iso_639_3_entry
+		id="ylo"
+		scope="I"
+		type="L"
+		name="Yi; Naluo" />
+	<iso_639_3_entry
+		id="ylr"
+		scope="I"
+		type="E"
+		name="Yalarnnga" />
+	<iso_639_3_entry
+		id="ylu"
+		scope="I"
+		type="L"
+		name="Aribwaung" />
+	<iso_639_3_entry
+		id="yly"
+		scope="I"
+		type="L"
+		name="Nyâlayu" />
+	<iso_639_3_entry
+		id="yma"
+		scope="I"
+		type="L"
+		name="Yamphe" />
+	<iso_639_3_entry
+		id="ymb"
+		scope="I"
+		type="L"
+		name="Yambes" />
+	<iso_639_3_entry
+		id="ymc"
+		scope="I"
+		type="L"
+		name="Muji; Southern" />
+	<iso_639_3_entry
+		id="ymd"
+		scope="I"
+		type="L"
+		name="Muda" />
+	<iso_639_3_entry
+		id="yme"
+		scope="I"
+		type="E"
+		name="Yameo" />
+	<iso_639_3_entry
+		id="ymg"
+		scope="I"
+		type="L"
+		name="Yamongeri" />
+	<iso_639_3_entry
+		id="ymh"
+		scope="I"
+		type="L"
+		name="Mili" />
+	<iso_639_3_entry
+		id="ymi"
+		scope="I"
+		type="L"
+		name="Moji" />
+	<iso_639_3_entry
+		id="ymk"
+		scope="I"
+		type="L"
+		name="Makwe" />
+	<iso_639_3_entry
+		id="yml"
+		scope="I"
+		type="L"
+		name="Iamalele" />
+	<iso_639_3_entry
+		id="ymm"
+		scope="I"
+		type="L"
+		name="Maay" />
+	<iso_639_3_entry
+		id="ymn"
+		scope="I"
+		type="L"
+		name="Yamna" />
+	<iso_639_3_entry
+		id="ymo"
+		scope="I"
+		type="L"
+		name="Yangum Mon" />
+	<iso_639_3_entry
+		id="ymp"
+		scope="I"
+		type="L"
+		name="Yamap" />
+	<iso_639_3_entry
+		id="ymq"
+		scope="I"
+		type="L"
+		name="Muji; Qila" />
+	<iso_639_3_entry
+		id="ymr"
+		scope="I"
+		type="L"
+		name="Malasar" />
+	<iso_639_3_entry
+		id="yms"
+		scope="I"
+		type="A"
+		name="Mysian" />
+	<iso_639_3_entry
+		id="ymt"
+		scope="I"
+		type="E"
+		name="Mator-Taygi-Karagas" />
+	<iso_639_3_entry
+		id="ymx"
+		scope="I"
+		type="L"
+		name="Muji; Northern" />
+	<iso_639_3_entry
+		id="ymz"
+		scope="I"
+		type="L"
+		name="Muzi" />
+	<iso_639_3_entry
+		id="yna"
+		scope="I"
+		type="L"
+		name="Aluo" />
+	<iso_639_3_entry
+		id="ynd"
+		scope="I"
+		type="E"
+		name="Yandruwandha" />
+	<iso_639_3_entry
+		id="yne"
+		scope="I"
+		type="L"
+		name="Lang'e" />
+	<iso_639_3_entry
+		id="yng"
+		scope="I"
+		type="L"
+		name="Yango" />
+	<iso_639_3_entry
+		id="ynh"
+		scope="I"
+		type="L"
+		name="Yangho" />
+	<iso_639_3_entry
+		id="ynk"
+		scope="I"
+		type="L"
+		name="Yupik; Naukan" />
+	<iso_639_3_entry
+		id="ynl"
+		scope="I"
+		type="L"
+		name="Yangulam" />
+	<iso_639_3_entry
+		id="ynn"
+		scope="I"
+		type="E"
+		name="Yana" />
+	<iso_639_3_entry
+		id="yno"
+		scope="I"
+		type="L"
+		name="Yong" />
+	<iso_639_3_entry
+		id="yns"
+		scope="I"
+		type="L"
+		name="Yansi" />
+	<iso_639_3_entry
+		id="ynu"
+		scope="I"
+		type="E"
+		name="Yahuna" />
+	<iso_639_3_entry
+		id="yob"
+		scope="I"
+		type="E"
+		name="Yoba" />
+	<iso_639_3_entry
+		id="yog"
+		scope="I"
+		type="L"
+		name="Yogad" />
+	<iso_639_3_entry
+		id="yoi"
+		scope="I"
+		type="L"
+		name="Yonaguni" />
+	<iso_639_3_entry
+		id="yok"
+		scope="I"
+		type="L"
+		name="Yokuts" />
+	<iso_639_3_entry
+		id="yol"
+		scope="I"
+		type="E"
+		name="Yola" />
+	<iso_639_3_entry
+		id="yom"
+		scope="I"
+		type="L"
+		name="Yombe" />
+	<iso_639_3_entry
+		id="yon"
+		scope="I"
+		type="L"
+		name="Yongkom" />
+	<iso_639_3_entry
+		id="yor"
+		part1_code="yo"
+		part2_code="yor"
+		scope="I"
+		type="L"
+		name="Yoruba" />
+	<iso_639_3_entry
+		id="yos"
+		scope="I"
+		type="L"
+		name="Yos" />
+	<iso_639_3_entry
+		id="yox"
+		scope="I"
+		type="L"
+		name="Yoron" />
+	<iso_639_3_entry
+		id="yoy"
+		scope="I"
+		type="L"
+		name="Yoy" />
+	<iso_639_3_entry
+		id="ypa"
+		scope="I"
+		type="L"
+		name="Phala" />
+	<iso_639_3_entry
+		id="ypb"
+		scope="I"
+		type="L"
+		name="Phowa; Labo" />
+	<iso_639_3_entry
+		id="ypg"
+		scope="I"
+		type="L"
+		name="Phola" />
+	<iso_639_3_entry
+		id="yph"
+		scope="I"
+		type="L"
+		name="Phupha" />
+	<iso_639_3_entry
+		id="ypm"
+		scope="I"
+		type="L"
+		name="Phuma" />
+	<iso_639_3_entry
+		id="ypn"
+		scope="I"
+		type="L"
+		name="Phowa; Ani" />
+	<iso_639_3_entry
+		id="ypo"
+		scope="I"
+		type="L"
+		name="Phola; Alo" />
+	<iso_639_3_entry
+		id="ypp"
+		scope="I"
+		type="L"
+		name="Phupa" />
+	<iso_639_3_entry
+		id="ypz"
+		scope="I"
+		type="L"
+		name="Phuza" />
+	<iso_639_3_entry
+		id="yra"
+		scope="I"
+		type="L"
+		name="Yerakai" />
+	<iso_639_3_entry
+		id="yrb"
+		scope="I"
+		type="L"
+		name="Yareba" />
+	<iso_639_3_entry
+		id="yre"
+		scope="I"
+		type="L"
+		name="Yaouré" />
+	<iso_639_3_entry
+		id="yri"
+		scope="I"
+		type="L"
+		name="Yarí" />
+	<iso_639_3_entry
+		id="yrk"
+		scope="I"
+		type="L"
+		name="Nenets" />
+	<iso_639_3_entry
+		id="yrl"
+		scope="I"
+		type="L"
+		name="Nhengatu" />
+	<iso_639_3_entry
+		id="yrn"
+		scope="I"
+		type="L"
+		name="Yerong" />
+	<iso_639_3_entry
+		id="yrs"
+		scope="I"
+		type="L"
+		name="Yarsun" />
+	<iso_639_3_entry
+		id="yrw"
+		scope="I"
+		type="L"
+		name="Yarawata" />
+	<iso_639_3_entry
+		id="ysc"
+		scope="I"
+		type="E"
+		name="Yassic" />
+	<iso_639_3_entry
+		id="ysd"
+		scope="I"
+		type="L"
+		name="Samatao" />
+	<iso_639_3_entry
+		id="ysl"
+		scope="I"
+		type="L"
+		name="Yugoslavian Sign Language" />
+	<iso_639_3_entry
+		id="ysn"
+		scope="I"
+		type="L"
+		name="Sani" />
+	<iso_639_3_entry
+		id="yso"
+		scope="I"
+		type="L"
+		name="Nisi (China)" />
+	<iso_639_3_entry
+		id="ysp"
+		scope="I"
+		type="L"
+		name="Lolopo; Southern" />
+	<iso_639_3_entry
+		id="ysr"
+		scope="I"
+		type="E"
+		name="Yupik; Sirenik" />
+	<iso_639_3_entry
+		id="yss"
+		scope="I"
+		type="L"
+		name="Yessan-Mayo" />
+	<iso_639_3_entry
+		id="ysy"
+		scope="I"
+		type="L"
+		name="Sanie" />
+	<iso_639_3_entry
+		id="yta"
+		scope="I"
+		type="L"
+		name="Talu" />
+	<iso_639_3_entry
+		id="ytl"
+		scope="I"
+		type="L"
+		name="Tanglang" />
+	<iso_639_3_entry
+		id="ytp"
+		scope="I"
+		type="L"
+		name="Thopho" />
+	<iso_639_3_entry
+		id="ytw"
+		scope="I"
+		type="L"
+		name="Yout Wam" />
+	<iso_639_3_entry
+		id="yua"
+		scope="I"
+		type="L"
+		name="Maya; Yucatec" />
+	<iso_639_3_entry
+		id="yub"
+		scope="I"
+		type="E"
+		name="Yugambal" />
+	<iso_639_3_entry
+		id="yuc"
+		scope="I"
+		type="L"
+		name="Yuchi" />
+	<iso_639_3_entry
+		id="yud"
+		scope="I"
+		type="L"
+		name="Arabic; Judeo-Tripolitanian" />
+	<iso_639_3_entry
+		id="yue"
+		scope="I"
+		type="L"
+		name="Chinese; Yue" />
+	<iso_639_3_entry
+		id="yuf"
+		scope="I"
+		type="L"
+		name="Havasupai-Walapai-Yavapai" />
+	<iso_639_3_entry
+		id="yug"
+		scope="I"
+		type="E"
+		name="Yug" />
+	<iso_639_3_entry
+		id="yui"
+		scope="I"
+		type="L"
+		name="Yurutí" />
+	<iso_639_3_entry
+		id="yuj"
+		scope="I"
+		type="L"
+		name="Karkar-Yuri" />
+	<iso_639_3_entry
+		id="yuk"
+		scope="I"
+		type="E"
+		name="Yuki" />
+	<iso_639_3_entry
+		id="yul"
+		scope="I"
+		type="L"
+		name="Yulu" />
+	<iso_639_3_entry
+		id="yum"
+		scope="I"
+		type="L"
+		name="Quechan" />
+	<iso_639_3_entry
+		id="yun"
+		scope="I"
+		type="L"
+		name="Bena (Nigeria)" />
+	<iso_639_3_entry
+		id="yup"
+		scope="I"
+		type="L"
+		name="Yukpa" />
+	<iso_639_3_entry
+		id="yuq"
+		scope="I"
+		type="L"
+		name="Yuqui" />
+	<iso_639_3_entry
+		id="yur"
+		scope="I"
+		type="L"
+		name="Yurok" />
+	<iso_639_3_entry
+		id="yut"
+		scope="I"
+		type="L"
+		name="Yopno" />
+	<iso_639_3_entry
+		id="yuu"
+		scope="I"
+		type="L"
+		name="Yugh" />
+	<iso_639_3_entry
+		id="yuw"
+		scope="I"
+		type="L"
+		name="Yau (Morobe Province)" />
+	<iso_639_3_entry
+		id="yux"
+		scope="I"
+		type="L"
+		name="Yukaghir; Southern" />
+	<iso_639_3_entry
+		id="yuy"
+		scope="I"
+		type="L"
+		name="Yugur; East" />
+	<iso_639_3_entry
+		id="yuz"
+		scope="I"
+		type="L"
+		name="Yuracare" />
+	<iso_639_3_entry
+		id="yva"
+		scope="I"
+		type="L"
+		name="Yawa" />
+	<iso_639_3_entry
+		id="yvt"
+		scope="I"
+		type="E"
+		name="Yavitero" />
+	<iso_639_3_entry
+		id="ywa"
+		scope="I"
+		type="L"
+		name="Kalou" />
+	<iso_639_3_entry
+		id="ywl"
+		scope="I"
+		type="L"
+		name="Lalu; Western" />
+	<iso_639_3_entry
+		id="ywn"
+		scope="I"
+		type="L"
+		name="Yawanawa" />
+	<iso_639_3_entry
+		id="ywq"
+		scope="I"
+		type="L"
+		name="Yi; Wuding-Luquan" />
+	<iso_639_3_entry
+		id="ywr"
+		scope="I"
+		type="L"
+		name="Yawuru" />
+	<iso_639_3_entry
+		id="ywt"
+		scope="I"
+		type="L"
+		name="Lalo; Xishanba" />
+	<iso_639_3_entry
+		id="ywu"
+		scope="I"
+		type="L"
+		name="Nasu; Wumeng" />
+	<iso_639_3_entry
+		id="yww"
+		scope="I"
+		type="E"
+		name="Yawarawarga" />
+	<iso_639_3_entry
+		id="yyu"
+		scope="I"
+		type="L"
+		name="Yau (Sandaun Province)" />
+	<iso_639_3_entry
+		id="yyz"
+		scope="I"
+		type="L"
+		name="Ayizi" />
+	<iso_639_3_entry
+		id="yzg"
+		scope="I"
+		type="L"
+		name="Buyang; E'ma" />
+	<iso_639_3_entry
+		id="yzk"
+		scope="I"
+		type="L"
+		name="Zokhuo" />
+	<iso_639_3_entry
+		id="zaa"
+		scope="I"
+		type="L"
+		name="Zapotec; Sierra de Juárez" />
+	<iso_639_3_entry
+		id="zab"
+		scope="I"
+		type="L"
+		name="Zapotec; San Juan Guelavía" />
+	<iso_639_3_entry
+		id="zac"
+		scope="I"
+		type="L"
+		name="Zapotec; Ocotlán" />
+	<iso_639_3_entry
+		id="zad"
+		scope="I"
+		type="L"
+		name="Zapotec; Cajonos" />
+	<iso_639_3_entry
+		id="zae"
+		scope="I"
+		type="L"
+		name="Zapotec; Yareni" />
+	<iso_639_3_entry
+		id="zaf"
+		scope="I"
+		type="L"
+		name="Zapotec; Ayoquesco" />
+	<iso_639_3_entry
+		id="zag"
+		scope="I"
+		type="L"
+		name="Zaghawa" />
+	<iso_639_3_entry
+		id="zah"
+		scope="I"
+		type="L"
+		name="Zangwal" />
+	<iso_639_3_entry
+		id="zai"
+		scope="I"
+		type="L"
+		name="Zapotec; Isthmus" />
+	<iso_639_3_entry
+		id="zaj"
+		scope="I"
+		type="L"
+		name="Zaramo" />
+	<iso_639_3_entry
+		id="zak"
+		scope="I"
+		type="L"
+		name="Zanaki" />
+	<iso_639_3_entry
+		id="zal"
+		scope="I"
+		type="L"
+		name="Zauzou" />
+	<iso_639_3_entry
+		id="zam"
+		scope="I"
+		type="L"
+		name="Zapotec; Miahuatlán" />
+	<iso_639_3_entry
+		id="zao"
+		scope="I"
+		type="L"
+		name="Zapotec; Ozolotepec" />
+	<iso_639_3_entry
+		id="zap"
+		part2_code="zap"
+		scope="M"
+		type="L"
+		name="Zapotec" />
+	<iso_639_3_entry
+		id="zaq"
+		scope="I"
+		type="L"
+		name="Zapotec; Aloápam" />
+	<iso_639_3_entry
+		id="zar"
+		scope="I"
+		type="L"
+		name="Zapotec; Rincón" />
+	<iso_639_3_entry
+		id="zas"
+		scope="I"
+		type="L"
+		name="Zapotec; Santo Domingo Albarradas" />
+	<iso_639_3_entry
+		id="zat"
+		scope="I"
+		type="L"
+		name="Zapotec; Tabaa" />
+	<iso_639_3_entry
+		id="zau"
+		scope="I"
+		type="L"
+		name="Zangskari" />
+	<iso_639_3_entry
+		id="zav"
+		scope="I"
+		type="L"
+		name="Zapotec; Yatzachi" />
+	<iso_639_3_entry
+		id="zaw"
+		scope="I"
+		type="L"
+		name="Zapotec; Mitla" />
+	<iso_639_3_entry
+		id="zax"
+		scope="I"
+		type="L"
+		name="Zapotec; Xadani" />
+	<iso_639_3_entry
+		id="zay"
+		scope="I"
+		type="L"
+		name="Zayse-Zergulla" />
+	<iso_639_3_entry
+		id="zaz"
+		scope="I"
+		type="L"
+		name="Zari" />
+	<iso_639_3_entry
+		id="zbc"
+		scope="I"
+		type="L"
+		name="Berawan; Central" />
+	<iso_639_3_entry
+		id="zbe"
+		scope="I"
+		type="L"
+		name="Berawan; East" />
+	<iso_639_3_entry
+		id="zbl"
+		part2_code="zbl"
+		scope="I"
+		type="C"
+		name="Blissymbols" />
+	<iso_639_3_entry
+		id="zbt"
+		scope="I"
+		type="L"
+		name="Batui" />
+	<iso_639_3_entry
+		id="zbw"
+		scope="I"
+		type="L"
+		name="Berawan; West" />
+	<iso_639_3_entry
+		id="zca"
+		scope="I"
+		type="L"
+		name="Zapotec; Coatecas Altas" />
+	<iso_639_3_entry
+		id="zch"
+		scope="I"
+		type="L"
+		name="Zhuang; Central Hongshuihe" />
+	<iso_639_3_entry
+		id="zdj"
+		scope="I"
+		type="L"
+		name="Comorian; Ngazidja" />
+	<iso_639_3_entry
+		id="zea"
+		scope="I"
+		type="L"
+		name="Zeeuws" />
+	<iso_639_3_entry
+		id="zeg"
+		scope="I"
+		type="L"
+		name="Zenag" />
+	<iso_639_3_entry
+		id="zeh"
+		scope="I"
+		type="L"
+		name="Zhuang; Eastern Hongshuihe" />
+	<iso_639_3_entry
+		id="zen"
+		part2_code="zen"
+		scope="I"
+		type="L"
+		name="Zenaga" />
+	<iso_639_3_entry
+		id="zga"
+		scope="I"
+		type="L"
+		name="Kinga" />
+	<iso_639_3_entry
+		id="zgb"
+		scope="I"
+		type="L"
+		name="Zhuang; Guibei" />
+	<iso_639_3_entry
+		id="zgm"
+		scope="I"
+		type="L"
+		name="Zhuang; Minz" />
+	<iso_639_3_entry
+		id="zgn"
+		scope="I"
+		type="L"
+		name="Zhuang; Guibian" />
+	<iso_639_3_entry
+		id="zgr"
+		scope="I"
+		type="L"
+		name="Magori" />
+	<iso_639_3_entry
+		id="zha"
+		part1_code="za"
+		part2_code="zha"
+		scope="M"
+		type="L"
+		name="Zhuang" />
+	<iso_639_3_entry
+		id="zhb"
+		scope="I"
+		type="L"
+		name="Zhaba" />
+	<iso_639_3_entry
+		id="zhd"
+		scope="I"
+		type="L"
+		name="Zhuang; Dai" />
+	<iso_639_3_entry
+		id="zhi"
+		scope="I"
+		type="L"
+		name="Zhire" />
+	<iso_639_3_entry
+		id="zhn"
+		scope="I"
+		type="L"
+		name="Zhuang; Nong" />
+	<iso_639_3_entry
+		id="zho"
+		part1_code="zh"
+		part2_code="chi"
+		scope="M"
+		type="L"
+		name="Chinese" />
+	<iso_639_3_entry
+		id="zhw"
+		scope="I"
+		type="L"
+		name="Zhoa" />
+	<iso_639_3_entry
+		id="zia"
+		scope="I"
+		type="L"
+		name="Zia" />
+	<iso_639_3_entry
+		id="zib"
+		scope="I"
+		type="L"
+		name="Zimbabwe Sign Language" />
+	<iso_639_3_entry
+		id="zik"
+		scope="I"
+		type="L"
+		name="Zimakani" />
+	<iso_639_3_entry
+		id="zil"
+		scope="I"
+		type="L"
+		name="Zialo" />
+	<iso_639_3_entry
+		id="zim"
+		scope="I"
+		type="L"
+		name="Mesme" />
+	<iso_639_3_entry
+		id="zin"
+		scope="I"
+		type="L"
+		name="Zinza" />
+	<iso_639_3_entry
+		id="zir"
+		scope="I"
+		type="E"
+		name="Ziriya" />
+	<iso_639_3_entry
+		id="ziw"
+		scope="I"
+		type="L"
+		name="Zigula" />
+	<iso_639_3_entry
+		id="ziz"
+		scope="I"
+		type="L"
+		name="Zizilivakan" />
+	<iso_639_3_entry
+		id="zka"
+		scope="I"
+		type="L"
+		name="Kaimbulawa" />
+	<iso_639_3_entry
+		id="zkb"
+		scope="I"
+		type="E"
+		name="Koibal" />
+	<iso_639_3_entry
+		id="zkg"
+		scope="I"
+		type="E"
+		name="Koguryo" />
+	<iso_639_3_entry
+		id="zkh"
+		scope="I"
+		type="E"
+		name="Khorezmian" />
+	<iso_639_3_entry
+		id="zkk"
+		scope="I"
+		type="E"
+		name="Karankawa" />
+	<iso_639_3_entry
+		id="zko"
+		scope="I"
+		type="E"
+		name="Kott" />
+	<iso_639_3_entry
+		id="zkp"
+		scope="I"
+		type="E"
+		name="Kaingáng; São Paulo" />
+	<iso_639_3_entry
+		id="zkr"
+		scope="I"
+		type="L"
+		name="Zakhring" />
+	<iso_639_3_entry
+		id="zkt"
+		scope="I"
+		type="E"
+		name="Kitan" />
+	<iso_639_3_entry
+		id="zku"
+		scope="I"
+		type="E"
+		name="Kaurna" />
+	<iso_639_3_entry
+		id="zkv"
+		scope="I"
+		type="E"
+		name="Krevinian" />
+	<iso_639_3_entry
+		id="zkz"
+		scope="I"
+		type="E"
+		name="Khazar" />
+	<iso_639_3_entry
+		id="zlj"
+		scope="I"
+		type="L"
+		name="Zhuang; Liujiang" />
+	<iso_639_3_entry
+		id="zlm"
+		scope="I"
+		type="L"
+		name="Malay (individual language)" />
+	<iso_639_3_entry
+		id="zln"
+		scope="I"
+		type="L"
+		name="Zhuang; Lianshan" />
+	<iso_639_3_entry
+		id="zlq"
+		scope="I"
+		type="L"
+		name="Zhuang; Liuqian" />
+	<iso_639_3_entry
+		id="zma"
+		scope="I"
+		type="L"
+		name="Manda (Australia)" />
+	<iso_639_3_entry
+		id="zmb"
+		scope="I"
+		type="L"
+		name="Zimba" />
+	<iso_639_3_entry
+		id="zmc"
+		scope="I"
+		type="E"
+		name="Margany" />
+	<iso_639_3_entry
+		id="zmd"
+		scope="I"
+		type="L"
+		name="Maridan" />
+	<iso_639_3_entry
+		id="zme"
+		scope="I"
+		type="E"
+		name="Mangerr" />
+	<iso_639_3_entry
+		id="zmf"
+		scope="I"
+		type="L"
+		name="Mfinu" />
+	<iso_639_3_entry
+		id="zmg"
+		scope="I"
+		type="L"
+		name="Marti Ke" />
+	<iso_639_3_entry
+		id="zmh"
+		scope="I"
+		type="E"
+		name="Makolkol" />
+	<iso_639_3_entry
+		id="zmi"
+		scope="I"
+		type="L"
+		name="Negeri Sembilan Malay" />
+	<iso_639_3_entry
+		id="zmj"
+		scope="I"
+		type="L"
+		name="Maridjabin" />
+	<iso_639_3_entry
+		id="zmk"
+		scope="I"
+		type="E"
+		name="Mandandanyi" />
+	<iso_639_3_entry
+		id="zml"
+		scope="I"
+		type="L"
+		name="Madngele" />
+	<iso_639_3_entry
+		id="zmm"
+		scope="I"
+		type="L"
+		name="Marimanindji" />
+	<iso_639_3_entry
+		id="zmn"
+		scope="I"
+		type="L"
+		name="Mbangwe" />
+	<iso_639_3_entry
+		id="zmo"
+		scope="I"
+		type="L"
+		name="Molo" />
+	<iso_639_3_entry
+		id="zmp"
+		scope="I"
+		type="L"
+		name="Mpuono" />
+	<iso_639_3_entry
+		id="zmq"
+		scope="I"
+		type="L"
+		name="Mituku" />
+	<iso_639_3_entry
+		id="zmr"
+		scope="I"
+		type="L"
+		name="Maranunggu" />
+	<iso_639_3_entry
+		id="zms"
+		scope="I"
+		type="L"
+		name="Mbesa" />
+	<iso_639_3_entry
+		id="zmt"
+		scope="I"
+		type="L"
+		name="Maringarr" />
+	<iso_639_3_entry
+		id="zmu"
+		scope="I"
+		type="E"
+		name="Muruwari" />
+	<iso_639_3_entry
+		id="zmv"
+		scope="I"
+		type="E"
+		name="Mbariman-Gudhinma" />
+	<iso_639_3_entry
+		id="zmw"
+		scope="I"
+		type="L"
+		name="Mbo (Democratic Republic of Congo)" />
+	<iso_639_3_entry
+		id="zmx"
+		scope="I"
+		type="L"
+		name="Bomitaba" />
+	<iso_639_3_entry
+		id="zmy"
+		scope="I"
+		type="L"
+		name="Mariyedi" />
+	<iso_639_3_entry
+		id="zmz"
+		scope="I"
+		type="L"
+		name="Mbandja" />
+	<iso_639_3_entry
+		id="zna"
+		scope="I"
+		type="L"
+		name="Zan Gula" />
+	<iso_639_3_entry
+		id="zne"
+		scope="I"
+		type="L"
+		name="Zande (individual language)" />
+	<iso_639_3_entry
+		id="zng"
+		scope="I"
+		type="L"
+		name="Mang" />
+	<iso_639_3_entry
+		id="znk"
+		scope="I"
+		type="E"
+		name="Manangkari" />
+	<iso_639_3_entry
+		id="zns"
+		scope="I"
+		type="L"
+		name="Mangas" />
+	<iso_639_3_entry
+		id="zoc"
+		scope="I"
+		type="L"
+		name="Zoque; Copainalá" />
+	<iso_639_3_entry
+		id="zoh"
+		scope="I"
+		type="L"
+		name="Zoque; Chimalapa" />
+	<iso_639_3_entry
+		id="zom"
+		scope="I"
+		type="L"
+		name="Zou" />
+	<iso_639_3_entry
+		id="zoo"
+		scope="I"
+		type="L"
+		name="Zapotec; Asunción Mixtepec" />
+	<iso_639_3_entry
+		id="zoq"
+		scope="I"
+		type="L"
+		name="Zoque; Tabasco" />
+	<iso_639_3_entry
+		id="zor"
+		scope="I"
+		type="L"
+		name="Zoque; Rayón" />
+	<iso_639_3_entry
+		id="zos"
+		scope="I"
+		type="L"
+		name="Zoque; Francisco León" />
+	<iso_639_3_entry
+		id="zpa"
+		scope="I"
+		type="L"
+		name="Zapotec; Lachiguiri" />
+	<iso_639_3_entry
+		id="zpb"
+		scope="I"
+		type="L"
+		name="Zapotec; Yautepec" />
+	<iso_639_3_entry
+		id="zpc"
+		scope="I"
+		type="L"
+		name="Zapotec; Choapan" />
+	<iso_639_3_entry
+		id="zpd"
+		scope="I"
+		type="L"
+		name="Zapotec; Southeastern Ixtlán" />
+	<iso_639_3_entry
+		id="zpe"
+		scope="I"
+		type="L"
+		name="Zapotec; Petapa" />
+	<iso_639_3_entry
+		id="zpf"
+		scope="I"
+		type="L"
+		name="Zapotec; San Pedro Quiatoni" />
+	<iso_639_3_entry
+		id="zpg"
+		scope="I"
+		type="L"
+		name="Zapotec; Guevea De Humboldt" />
+	<iso_639_3_entry
+		id="zph"
+		scope="I"
+		type="L"
+		name="Zapotec; Totomachapan" />
+	<iso_639_3_entry
+		id="zpi"
+		scope="I"
+		type="L"
+		name="Zapotec; Santa María Quiegolani" />
+	<iso_639_3_entry
+		id="zpj"
+		scope="I"
+		type="L"
+		name="Zapotec; Quiavicuzas" />
+	<iso_639_3_entry
+		id="zpk"
+		scope="I"
+		type="L"
+		name="Zapotec; Tlacolulita" />
+	<iso_639_3_entry
+		id="zpl"
+		scope="I"
+		type="L"
+		name="Zapotec; Lachixío" />
+	<iso_639_3_entry
+		id="zpm"
+		scope="I"
+		type="L"
+		name="Zapotec; Mixtepec" />
+	<iso_639_3_entry
+		id="zpn"
+		scope="I"
+		type="L"
+		name="Zapotec; Santa Inés Yatzechi" />
+	<iso_639_3_entry
+		id="zpo"
+		scope="I"
+		type="L"
+		name="Zapotec; Amatlán" />
+	<iso_639_3_entry
+		id="zpp"
+		scope="I"
+		type="L"
+		name="Zapotec; El Alto" />
+	<iso_639_3_entry
+		id="zpq"
+		scope="I"
+		type="L"
+		name="Zapotec; Zoogocho" />
+	<iso_639_3_entry
+		id="zpr"
+		scope="I"
+		type="L"
+		name="Zapotec; Santiago Xanica" />
+	<iso_639_3_entry
+		id="zps"
+		scope="I"
+		type="L"
+		name="Zapotec; Coatlán" />
+	<iso_639_3_entry
+		id="zpt"
+		scope="I"
+		type="L"
+		name="Zapotec; San Vicente Coatlán" />
+	<iso_639_3_entry
+		id="zpu"
+		scope="I"
+		type="L"
+		name="Zapotec; Yalálag" />
+	<iso_639_3_entry
+		id="zpv"
+		scope="I"
+		type="L"
+		name="Zapotec; Chichicapan" />
+	<iso_639_3_entry
+		id="zpw"
+		scope="I"
+		type="L"
+		name="Zapotec; Zaniza" />
+	<iso_639_3_entry
+		id="zpx"
+		scope="I"
+		type="L"
+		name="Zapotec; San Baltazar Loxicha" />
+	<iso_639_3_entry
+		id="zpy"
+		scope="I"
+		type="L"
+		name="Zapotec; Mazaltepec" />
+	<iso_639_3_entry
+		id="zpz"
+		scope="I"
+		type="L"
+		name="Zapotec; Texmelucan" />
+	<iso_639_3_entry
+		id="zqe"
+		scope="I"
+		type="L"
+		name="Zhuang; Qiubei" />
+	<iso_639_3_entry
+		id="zra"
+		scope="I"
+		type="E"
+		name="Kara (Korea)" />
+	<iso_639_3_entry
+		id="zrg"
+		scope="I"
+		type="L"
+		name="Mirgan" />
+	<iso_639_3_entry
+		id="zrn"
+		scope="I"
+		type="L"
+		name="Zerenkel" />
+	<iso_639_3_entry
+		id="zro"
+		scope="I"
+		type="L"
+		name="Záparo" />
+	<iso_639_3_entry
+		id="zrp"
+		scope="I"
+		type="E"
+		name="Zarphatic" />
+	<iso_639_3_entry
+		id="zrs"
+		scope="I"
+		type="L"
+		name="Mairasi" />
+	<iso_639_3_entry
+		id="zsa"
+		scope="I"
+		type="L"
+		name="Sarasira" />
+	<iso_639_3_entry
+		id="zsk"
+		scope="I"
+		type="A"
+		name="Kaskean" />
+	<iso_639_3_entry
+		id="zsl"
+		scope="I"
+		type="L"
+		name="Zambian Sign Language" />
+	<iso_639_3_entry
+		id="zsm"
+		scope="I"
+		type="L"
+		name="Malay; Standard" />
+	<iso_639_3_entry
+		id="zsr"
+		scope="I"
+		type="L"
+		name="Zapotec; Southern Rincon" />
+	<iso_639_3_entry
+		id="zsu"
+		scope="I"
+		type="L"
+		name="Sukurum" />
+	<iso_639_3_entry
+		id="zte"
+		scope="I"
+		type="L"
+		name="Zapotec; Elotepec" />
+	<iso_639_3_entry
+		id="ztg"
+		scope="I"
+		type="L"
+		name="Zapotec; Xanaguía" />
+	<iso_639_3_entry
+		id="ztl"
+		scope="I"
+		type="L"
+		name="Zapotec; Lapaguía-Guivini" />
+	<iso_639_3_entry
+		id="ztm"
+		scope="I"
+		type="L"
+		name="Zapotec; San Agustín Mixtepec" />
+	<iso_639_3_entry
+		id="ztn"
+		scope="I"
+		type="L"
+		name="Zapotec; Santa Catarina Albarradas" />
+	<iso_639_3_entry
+		id="ztp"
+		scope="I"
+		type="L"
+		name="Zapotec; Loxicha" />
+	<iso_639_3_entry
+		id="ztq"
+		scope="I"
+		type="L"
+		name="Zapotec; Quioquitani-Quierí" />
+	<iso_639_3_entry
+		id="zts"
+		scope="I"
+		type="L"
+		name="Zapotec; Tilquiapan" />
+	<iso_639_3_entry
+		id="ztt"
+		scope="I"
+		type="L"
+		name="Zapotec; Tejalapan" />
+	<iso_639_3_entry
+		id="ztu"
+		scope="I"
+		type="L"
+		name="Zapotec; Güilá" />
+	<iso_639_3_entry
+		id="ztx"
+		scope="I"
+		type="L"
+		name="Zapotec; Zaachila" />
+	<iso_639_3_entry
+		id="zty"
+		scope="I"
+		type="L"
+		name="Zapotec; Yatee" />
+	<iso_639_3_entry
+		id="zua"
+		scope="I"
+		type="L"
+		name="Zeem" />
+	<iso_639_3_entry
+		id="zuh"
+		scope="I"
+		type="L"
+		name="Tokano" />
+	<iso_639_3_entry
+		id="zul"
+		part1_code="zu"
+		part2_code="zul"
+		scope="I"
+		type="L"
+		name="Zulu" />
+	<iso_639_3_entry
+		id="zum"
+		scope="I"
+		type="L"
+		name="Kumzari" />
+	<iso_639_3_entry
+		id="zun"
+		part2_code="zun"
+		scope="I"
+		type="L"
+		name="Zuni" />
+	<iso_639_3_entry
+		id="zuy"
+		scope="I"
+		type="L"
+		name="Zumaya" />
+	<iso_639_3_entry
+		id="zwa"
+		scope="I"
+		type="L"
+		name="Zay" />
+	<iso_639_3_entry
+		id="zxx"
+		part2_code="zxx"
+		scope="S"
+		type="S"
+		name="No linguistic content" />
+	<iso_639_3_entry
+		id="zyb"
+		scope="I"
+		type="L"
+		name="Zhuang; Yongbei" />
+	<iso_639_3_entry
+		id="zyg"
+		scope="I"
+		type="L"
+		name="Zhuang; Yang" />
+	<iso_639_3_entry
+		id="zyj"
+		scope="I"
+		type="L"
+		name="Zhuang; Youjiang" />
+	<iso_639_3_entry
+		id="zyn"
+		scope="I"
+		type="L"
+		name="Zhuang; Yongnan" />
+	<iso_639_3_entry
+		id="zyp"
+		scope="I"
+		type="L"
+		name="Zyphe" />
+	<iso_639_3_entry
+		id="zza"
+		part2_code="zza"
+		scope="M"
+		type="L"
+		name="Zaza" />
+	<iso_639_3_entry
+		id="zzj"
+		scope="I"
+		type="L"
+		name="Zhuang; Zuojiang" />
+</iso_639_3_entries>
diff --git a/setup/translations.py b/setup/translations.py
index e8b0fecdf1..786d44a6d6 100644
--- a/setup/translations.py
+++ b/setup/translations.py
@@ -322,21 +322,24 @@ class GetTranslations(Translations):  # {{{
 
 class ISO639(Command):  # {{{
 
-    description = 'Compile translations for ISO 639 codes'
+    description = 'Compile language code maps for performance'
     DEST = os.path.join(os.path.dirname(POT.SRC), 'resources', 'localization',
             'iso639.pickle')
 
     def run(self, opts):
-        src = POT.LP_ISO_PATH
+        src = self.j(self.d(self.SRC), 'setup', 'iso_639_3.xml')
         if not os.path.exists(src):
             raise Exception(src + ' does not exist')
         dest = self.DEST
+        base = self.d(dest)
+        if not os.path.exists(base):
+            os.makedirs(base)
         if not self.newer(dest, [src, __file__]):
             self.info('Pickled code is up to date')
             return
         self.info('Pickling ISO-639 codes to', dest)
         from lxml import etree
-        root = etree.fromstring(open(self.j(src, 'iso_639_3.xml'), 'rb').read())
+        root = etree.fromstring(open(src, 'rb').read())
         by_2 = {}
         by_3b = {}
         by_3t = {}
@@ -350,7 +353,7 @@ class ISO639(Command):  # {{{
             threet = x.get('id')
             threeb = x.get('part2_code', None)
             if threeb is None:
-                # Only recognize langauges in ISO-639-2
+                # Only recognize languages in ISO-639-2
                 continue
             name = x.get('name')
 

From 32fa93d5847ab3daf3ec0c9d2ade969b812c827d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Thu, 4 Jul 2013 00:02:19 +0200
Subject: [PATCH 0092/1154] update Woblink plugin for website changes

---
 .../gui2/store/stores/woblink_plugin.py       | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/calibre/gui2/store/stores/woblink_plugin.py b/src/calibre/gui2/store/stores/woblink_plugin.py
index 9b99271192..6eb598d65b 100644
--- a/src/calibre/gui2/store/stores/woblink_plugin.py
+++ b/src/calibre/gui2/store/stores/woblink_plugin.py
@@ -56,20 +56,20 @@ class WoblinkStore(BasicStoreConfig, StorePlugin):
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
             doc = html.fromstring(f.read())
-            for data in doc.xpath('//div[@class="book-item backgroundmix"]'):
+            for data in doc.xpath('//div[@class="nw_katalog_lista_ksiazka"]'):
                 if counter <= 0:
                     break
 
-                id = ''.join(data.xpath('.//td[@class="w10 va-t mYHaveItYes"]/a[1]/@href'))
+                id = ''.join(data.xpath('.//div[@class="nw_katalog_lista_ksiazka_okladka nw_okladka"]/a[1]/@href'))
                 if not id:
                     continue
 
-                cover_url = ''.join(data.xpath('.//td[@class="w10 va-t mYHaveItYes"]/a[1]/img/@src'))
-                title = ''.join(data.xpath('.//h2[@class="title"]/a[1]/text()'))
-                author = ', '.join(data.xpath('.//td[@class="va-t"]/h3/a/text()'))
-                price = ''.join(data.xpath('.//div[@class="prices"]/span[1]/strong/span/text()'))
+                cover_url = ''.join(data.xpath('.//div[@class="nw_katalog_lista_ksiazka_okladka nw_okladka"]/a[1]/img/@src'))
+                title = ''.join(data.xpath('.//h2[@class="nw_katalog_lista_ksiazka_detale_tytul"]/a[1]/text()'))
+                author = ', '.join(data.xpath('.//h3[@class="nw_katalog_lista_ksiazka_detale_autor"]/a/text()'))
+                price = ''.join(data.xpath('.//div[@class="nw_katalog_lista_ksiazka_opcjezakupu_cena"]/span/text()'))
                 price = re.sub('\.', ',', price)
-                formats = [ form[8:-4].split('.')[0] for form in data.xpath('.//p[3]/img/@src')]
+                formats = ', '.join(data.xpath('.//p[@class="nw_katalog_lista_ksiazka_detale_formaty"]/span/text()'))
 
                 s = SearchResult()
                 s.cover_url = 'http://woblink.com' + cover_url
@@ -77,25 +77,15 @@ class WoblinkStore(BasicStoreConfig, StorePlugin):
                 s.author = author.strip()
                 s.price = price + ' zł'
                 s.detail_item = id.strip()
+                s.formats = formats
 
-                if 'epub_drm' in formats:
+                if 'EPUB DRM' in formats:
                     s.drm = SearchResult.DRM_LOCKED
-                    s.formats = 'EPUB'
-
-                    counter -= 1
-                    yield s
-                elif 'pdf' in formats:
-                    s.drm = SearchResult.DRM_LOCKED
-                    s.formats = 'PDF'
 
                     counter -= 1
                     yield s
                 else:
                     s.drm = SearchResult.DRM_UNLOCKED
-                    if 'MOBI_nieb' in formats:
-                        formats.remove('MOBI_nieb')
-                        formats.append('MOBI')
-                    s.formats = ', '.join(formats).upper()
 
                     counter -= 1
                     yield s

From 2aa8f23d6c0b3ab585897d148c086899d80d02c6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Jul 2013 09:13:37 +0530
Subject: [PATCH 0093/1154] When parsing fields, handle escapes

---
 src/calibre/ebooks/docx/fields.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/ebooks/docx/fields.py b/src/calibre/ebooks/docx/fields.py
index 9b0d053cd0..91dcd87596 100644
--- a/src/calibre/ebooks/docx/fields.py
+++ b/src/calibre/ebooks/docx/fields.py
@@ -37,7 +37,9 @@ scanner = re.Scanner([
 def parse_hyperlink(raw, log):
     ans = {}
     last_option = None
+    raw = raw.replace('\\\\', '\x01').replace('\\"', '\x02')
     for token, token_type in scanner.scan(raw)[0]:
+        token = token.replace('\x01', '\\').replace('\x02', '"')
         if not ans:
             if token_type is not WORD:
                 log('Invalid hyperlink, first token is not a URL (%s)' % raw)

From 852bd4945394242940948e4ed2e0efb759445ce4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Jul 2013 09:54:53 +0530
Subject: [PATCH 0094/1154] MOBI Input: Fix regression parsing &apos;

MOBI Input: Fix a regression that broke parsing of MOBI files with
malformed markup that also used entities for apostrophes. Fixes #1197585 [Private bug](https://bugs.launchpad.net/calibre/+bug/1197585)
---
 src/calibre/utils/soupparser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/soupparser.py b/src/calibre/utils/soupparser.py
index 403f57baad..efbcf8b970 100644
--- a/src/calibre/utils/soupparser.py
+++ b/src/calibre/utils/soupparser.py
@@ -62,7 +62,7 @@ def _parse(source, beautifulsoup, makeelement, **bsargs):
     if makeelement is None:
         makeelement = html.html_parser.makeelement
     if 'convertEntities' not in bsargs:
-        bsargs['convertEntities'] = 'html'
+        bsargs['convertEntities'] = 'xhtml'  # Changed by Kovid, otherwise &apos; is mangled, see https://bugs.launchpad.net/calibre/+bug/1197585
     tree = beautifulsoup(source, **bsargs)
     root = _convert_tree(tree, makeelement)
     # from ET: wrap the document in a html root element, if necessary

From ef4efd57688b3cebe801557a6fe28f9997af04a5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Jul 2013 11:11:22 +0530
Subject: [PATCH 0095/1154] Refactor creation of hardlinks on windows

After creating the hardlink, open and close the file, to ensure that
the directory entry for the file contains the correct file size, see
http://blogs.msdn.com/b/oldnewthing/archive/2011/12/26/10251026.aspx
---
 src/calibre/utils/filenames.py | 45 ++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index 8c4b7edfe5..54ce568539 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -70,9 +70,11 @@ def shorten_components_to(length, components, more_to_take=0):
         else:
             if x is components[-1]:
                 b, e = os.path.splitext(x)
-                if e == '.': e = ''
+                if e == '.':
+                    e = ''
                 r = shorten_component(b, delta)+e
-                if r.startswith('.'): r = x[0]+r
+                if r.startswith('.'):
+                    r = x[0]+r
             else:
                 r = shorten_component(x, delta)
             r = r.strip()
@@ -115,7 +117,7 @@ def is_case_sensitive(path):
         os.remove(f1)
     return is_case_sensitive
 
-def case_preserving_open_file(path, mode='wb', mkdir_mode=0777):
+def case_preserving_open_file(path, mode='wb', mkdir_mode=0o777):
     '''
     Open the file pointed to by path with the specified mode. If any
     directories in path do not exist, they are created. Returns the
@@ -211,7 +213,8 @@ def samefile_windows(src, dst):
     handles = []
 
     def get_fileid(x):
-        if isbytestring(x): x = x.decode(filesystem_encoding)
+        if isbytestring(x):
+            x = x.decode(filesystem_encoding)
         try:
             h = win32file.CreateFile(x, 0, 0, None, win32file.OPEN_EXISTING,
                     win32file.FILE_FLAG_BACKUP_SEMANTICS, 0)
@@ -254,6 +257,24 @@ def samefile(src, dst):
             os.path.normcase(os.path.abspath(dst)))
     return samestring
 
+def windows_hardlink(src, dest):
+    import win32file, pywintypes
+    msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)
+    try:
+        win32file.CreateHardLink(dest, src)
+    except pywintypes.error as e:
+        raise Exception(msg % e)
+    # We open and close dest, to ensure its directory entry is updated
+    # see http://blogs.msdn.com/b/oldnewthing/archive/2011/12/26/10251026.aspx
+    h = win32file.CreateFile(
+        dest, 0, win32file.FILE_SHARE_READ | win32file.FILE_SHARE_WRITE | win32file.FILE_SHARE_DELETE,
+        None, win32file.OPEN_EXISTING, 0, None)
+    sz = win32file.GetFileSize(h)
+    win32file.CloseHandle(h)
+
+    if sz != os.path.getsize(src):
+        raise Exception(msg % ('hardlink size: %d not the same as source size' % sz))
+
 class WindowsAtomicFolderMove(object):
 
     '''
@@ -270,14 +291,16 @@ class WindowsAtomicFolderMove(object):
         import win32file, winerror
         from pywintypes import error
 
-        if isbytestring(path): path = path.decode(filesystem_encoding)
+        if isbytestring(path):
+            path = path.decode(filesystem_encoding)
 
         if not os.path.exists(path):
             return
 
         for x in os.listdir(path):
             f = os.path.normcase(os.path.abspath(os.path.join(path, x)))
-            if not os.path.isfile(f): continue
+            if not os.path.isfile(f):
+                continue
             try:
                 # Ensure the file is not read-only
                 win32file.SetFileAttributes(f, win32file.FILE_ATTRIBUTE_NORMAL)
@@ -315,9 +338,7 @@ class WindowsAtomicFolderMove(object):
             else:
                 raise ValueError(u'The file %r does not exist'%path)
         try:
-            win32file.CreateHardLink(dest, path)
-            if os.path.getsize(dest) != os.path.getsize(path):
-                raise Exception('This apparently can happen on network shares. Sigh.')
+            windows_hardlink(path, dest)
             return
         except:
             pass
@@ -355,10 +376,8 @@ class WindowsAtomicFolderMove(object):
 
 def hardlink_file(src, dest):
     if iswindows:
-        import win32file
-        win32file.CreateHardLink(dest, src)
-        if os.path.getsize(dest) != os.path.getsize(src):
-            raise Exception('This apparently can happen on network shares. Sigh.')
+        windows_hardlink(src, dest)
         return
     os.link(src, dest)
 
+

From c950518da25890d5a9f30b1f18b7fb1cbe21f15e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Jul 2013 12:18:24 +0530
Subject: [PATCH 0096/1154] Avoid unnecessary string formatting

---
 src/calibre/utils/filenames.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index 54ce568539..d6193c068b 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -259,10 +259,10 @@ def samefile(src, dst):
 
 def windows_hardlink(src, dest):
     import win32file, pywintypes
-    msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)
     try:
         win32file.CreateHardLink(dest, src)
     except pywintypes.error as e:
+        msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)
         raise Exception(msg % e)
     # We open and close dest, to ensure its directory entry is updated
     # see http://blogs.msdn.com/b/oldnewthing/archive/2011/12/26/10251026.aspx
@@ -273,6 +273,7 @@ def windows_hardlink(src, dest):
     win32file.CloseHandle(h)
 
     if sz != os.path.getsize(src):
+        msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)
         raise Exception(msg % ('hardlink size: %d not the same as source size' % sz))
 
 class WindowsAtomicFolderMove(object):

From c7033beb98340ed2577e9ff6a6515a0f77cebf6c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Jul 2013 12:46:12 +0530
Subject: [PATCH 0097/1154] Make ads in user manual async

---
 manual/templates/layout.html | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/manual/templates/layout.html b/manual/templates/layout.html
index 188e829469..ff2e7b0113 100644
--- a/manual/templates/layout.html
+++ b/manual/templates/layout.html
@@ -16,16 +16,13 @@
         <div class="body">
             {% if not embedded %}
             <div id="ad-container" style="text-align:center">
-                <script type="text/javascript"><!--
-                    google_ad_client = "ca-pub-5939552585043235";
-                    /* User Manual horizontal */
-                    google_ad_slot = "7580893187";
-                    google_ad_width = 728;
-                    google_ad_height = 90;
-                    //-->
-                </script>
-                <script type="text/javascript"
-                src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+                <script async="async" src="http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+                <ins class="adsbygoogle"
+                    style="display:inline-block;width:728px;height:90px"
+                    data-ad-client="ca-pub-5939552585043235"
+                    data-ad-slot="7580893187"></ins>
+                <script>
+                (adsbygoogle = window.adsbygoogle || []).push({});
                 </script>
             </div>
             {% endif %}

From 7e4a124d527d7fd408209dfe70917c0c2a8f456d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Jul 2013 13:00:08 +0530
Subject: [PATCH 0098/1154] Ensure we dont leak a file handle

---
 src/calibre/utils/filenames.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index d6193c068b..d756978040 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -269,8 +269,10 @@ def windows_hardlink(src, dest):
     h = win32file.CreateFile(
         dest, 0, win32file.FILE_SHARE_READ | win32file.FILE_SHARE_WRITE | win32file.FILE_SHARE_DELETE,
         None, win32file.OPEN_EXISTING, 0, None)
-    sz = win32file.GetFileSize(h)
-    win32file.CloseHandle(h)
+    try:
+        sz = win32file.GetFileSize(h)
+    finally:
+        win32file.CloseHandle(h)
 
     if sz != os.path.getsize(src):
         msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)

From f1ce0eb75c38f0f4fc3f4dea50f77d6666766925 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Jul 2013 13:16:09 +0530
Subject: [PATCH 0099/1154] Fix test failures due to file locking on windows

---
 src/calibre/db/legacy.py        |  4 +++-
 src/calibre/db/tests/legacy.py  | 32 +++++++++++++++++++-------------
 src/calibre/db/tests/writing.py |  3 +++
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 874707fa2e..287d2d47db 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -64,9 +64,11 @@ class LibraryDatabase(object):
         self.backend.close()
 
     def break_cycles(self):
+        delattr(self.backend, 'field_metadata')
         self.data.cache.backend = None
         self.data.cache = None
-        self.data = self.backend = self.new_api = self.field_metadata = self.prefs = self.listeners = self.refresh_ondevice = None
+        for x in ('data', 'backend', 'new_api', 'listeners',):
+            delattr(self, x)
 
     # Library wide properties {{{
     @property
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index af6b977aef..1fe719e31e 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -117,18 +117,24 @@ class LegacyTest(BaseTest):
             '__init__',
         }
 
-        for attr in dir(db):
-            if attr in SKIP_ATTRS:
-                continue
-            if not hasattr(ndb, attr):
-                raise AssertionError('The attribute %s is missing' % attr)
-            obj, nobj  = getattr(db, attr), getattr(ndb, attr)
-            if attr not in SKIP_ARGSPEC:
-                try:
-                    argspec = inspect.getargspec(obj)
-                except TypeError:
-                    pass
-                else:
-                    self.assertEqual(argspec, inspect.getargspec(nobj), 'argspec for %s not the same' % attr)
+        try:
+            for attr in dir(db):
+                if attr in SKIP_ATTRS:
+                    continue
+                if not hasattr(ndb, attr):
+                    raise AssertionError('The attribute %s is missing' % attr)
+                obj, nobj  = getattr(db, attr), getattr(ndb, attr)
+                if attr not in SKIP_ARGSPEC:
+                    try:
+                        argspec = inspect.getargspec(obj)
+                    except TypeError:
+                        pass
+                    else:
+                        self.assertEqual(argspec, inspect.getargspec(nobj), 'argspec for %s not the same' % attr)
+        finally:
+            for db in (ndb, db):
+                db.close()
+                db.break_cycles()
+
     # }}}
 
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 5d04c11def..597c98a771 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -374,6 +374,9 @@ class WritingTest(BaseTest):
             ae(cache.field_for('cover', book_id), 1)
             ae(old.cover(book_id, index_is_id=True), img, 'Cover was not set correctly for book %d' % book_id)
             self.assertTrue(old.has_cover(book_id))
+        old.close()
+        old.break_cycles()
+        del old
     # }}}
 
     def test_set_metadata(self):  # {{{

From 4bba2cbf926bfaee59d97576fea6a70a29d9a282 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 08:01:15 +0530
Subject: [PATCH 0100/1154] Initial implementation of add_format()

---
 src/calibre/db/backend.py | 18 +++++++++++++
 src/calibre/db/cache.py   | 54 ++++++++++++++++++++++++++++++++++++++-
 src/calibre/db/tables.py  | 19 +++++++++++---
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index c6aa2e646f..97dc673ecc 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1059,6 +1059,24 @@ class DB(object):
                         if wam is not None:
                             wam.close_handles()
 
+    def add_format(self, book_id, fmt, stream, title, author, path):
+        fname = self.construct_file_name(book_id, title, author)
+        path = os.path.join(self.library_path, path)
+        fmt = ('.' + fmt.lower()) if fmt else ''
+        dest = os.path.join(path, fname + fmt)
+        if not os.path.exists(path):
+            os.makedirs(path)
+        size = 0
+
+        if (not getattr(stream, 'name', False) or not samefile(dest, stream.name)):
+            with lopen(dest, 'wb') as f:
+                shutil.copyfileobj(stream, f)
+                size = f.tell()
+        elif os.path.exists(dest):
+            size = os.path.getsize(dest)
+
+        return size, fname
+
     def update_path(self, book_id, title, author, path_field, formats_field):
         path = self.construct_path_name(book_id, title, author)
         current_path = path_field.for_book(book_id)
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 88f06b43ba..4f7de11269 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -7,12 +7,13 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, traceback, random
+import os, traceback, random, shutil
 from io import BytesIO
 from collections import defaultdict
 from functools import wraps, partial
 
 from calibre.constants import iswindows
+from calibre.customize.ui import run_plugins_on_import, run_plugins_on_postimport
 from calibre.db import SPOOL_SIZE
 from calibre.db.categories import get_categories
 from calibre.db.locking import create_locks
@@ -22,6 +23,7 @@ from calibre.db.search import Search
 from calibre.db.tables import VirtualTable
 from calibre.db.write import get_series_values
 from calibre.db.lazy import FormatMetadata, FormatsList
+from calibre.ebooks import check_ebook_format
 from calibre.ebooks.metadata import string_to_authors
 from calibre.ebooks.metadata.book.base import Metadata
 from calibre.ebooks.metadata.opf2 import metadata_to_opf
@@ -51,6 +53,18 @@ def wrap_simple(lock, func):
             return func(*args, **kwargs)
     return ans
 
+def run_import_plugins(path_or_stream, fmt):
+    fmt = fmt.lower()
+    if hasattr(path_or_stream, 'seek'):
+        path_or_stream.seek(0)
+        pt = PersistentTemporaryFile('_import_plugin.'+fmt)
+        shutil.copyfileobj(path_or_stream, pt, 1024**2)
+        pt.close()
+        path = pt.name
+    else:
+        path = path_or_stream
+    return run_plugins_on_import(path, fmt)
+
 
 class Cache(object):
 
@@ -943,6 +957,43 @@ class Cache(object):
                         if extra is not None or force_changes:
                             protected_set_field(idx, extra)
 
+    @write_api
+    def add_format(self, book_id, fmt, stream_or_path, replace=True, run_hooks=True, dbapi=None):
+        if run_hooks:
+            # Run import plugins
+            npath = run_import_plugins(stream_or_path, fmt)
+            fmt = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
+            stream_or_path = lopen(npath, 'rb')
+            fmt = check_ebook_format(stream_or_path, fmt)
+
+        fmt = (fmt or '').upper()
+        self.format_metadata_cache[book_id].pop(fmt, None)
+        try:
+            name = self.fields['formats'].format_fname(book_id, fmt)
+        except:
+            name = None
+
+        if name and not replace:
+            return False
+
+        path = self._field_for('path', book_id).replace('/', os.sep)
+        title = self._field_for('title', book_id, default_value=_('Unknown'))
+        author = self._field_for('authors', book_id, default_value=(_('Unknown'),))[0]
+        stream = stream_or_path if hasattr(stream_or_path, 'read') else lopen(stream_or_path, 'rb')
+        size, fname = self.backend.add_format(book_id, fmt, stream, title, author, path)
+        del stream
+
+        max_size = self.fields['formats'].table.update_fmt(book_id, fmt, fname, size, self.backend)
+        self.fields['size'].table.update_size(book_id, max_size)
+        self._update_last_modified((book_id,))
+
+        if run_hooks:
+            # Run post import plugins
+            run_plugins_on_postimport(dbapi or self, book_id, fmt)
+            stream_or_path.close()
+
+        return True
+
     # }}}
 
 class SortKey(object):  # {{{
@@ -959,3 +1010,4 @@ class SortKey(object):  # {{{
         return 0
 # }}}
 
+
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 83d4b23712..4dba10abff 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -8,6 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 from datetime import datetime
+from collections import defaultdict
 
 from dateutil.tz import tzoffset
 
@@ -98,6 +99,9 @@ class SizeTable(OneToOneTable):
                 'WHERE data.book=books.id) FROM books'):
             self.book_col_map[row[0]] = self.unserialize(row[1])
 
+    def update_size(self, book_id, size):
+        self.book_col_map[book_id] = size
+
 class UUIDTable(OneToOneTable):
 
     def read(self, db):
@@ -194,8 +198,9 @@ class FormatsTable(ManyToManyTable):
         pass
 
     def read_maps(self, db):
-        self.fname_map = {}
-        for row in db.conn.execute('SELECT book, format, name FROM data'):
+        self.fname_map = defaultdict(dict)
+        self.size_map = defaultdict(dict)
+        for row in db.conn.execute('SELECT book, format, name, uncompressed_size FROM data'):
             if row[1] is not None:
                 fmt = row[1].upper()
                 if fmt not in self.col_book_map:
@@ -204,9 +209,8 @@ class FormatsTable(ManyToManyTable):
                 if row[0] not in self.book_col_map:
                     self.book_col_map[row[0]] = []
                 self.book_col_map[row[0]].append(fmt)
-                if row[0] not in self.fname_map:
-                    self.fname_map[row[0]] = {}
                 self.fname_map[row[0]][fmt] = row[2]
+                self.size_map[row[0]][fmt] = row[3]
 
         for key in tuple(self.book_col_map.iterkeys()):
             self.book_col_map[key] = tuple(sorted(self.book_col_map[key]))
@@ -216,6 +220,13 @@ class FormatsTable(ManyToManyTable):
         db.conn.execute('UPDATE data SET name=? WHERE book=? AND format=?',
                         (fname, book_id, fmt))
 
+    def update_fmt(self, book_id, fmt, fname, size, db):
+        self.fname_map[book_id][fmt] = fname
+        self.size_map[book_id][fmt] = size
+        db.conn.execute('INSERT OR REPLACE INTO data (book,format,uncompressed_size,name) VALUES (?,?,?,?)',
+                        (book_id, fmt, size, fname))
+        return max(self.size_map[book_id].itervalues())
+
 class IdentifiersTable(ManyToManyTable):
 
     def read_id_maps(self, db):

From 93264786e1bb9fb4d14b1f76bf536ffd47b21a67 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 08:03:47 +0530
Subject: [PATCH 0101/1154] Fix detection of SD Card in some PRS-T2N devices

Fixes #1197970 [Sony PRS-T2 SD card not recognized](https://bugs.launchpad.net/calibre/+bug/1197970)
---
 src/calibre/devices/prst1/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py
index 0431ca7bfd..9c76eb096f 100644
--- a/src/calibre/devices/prst1/driver.py
+++ b/src/calibre/devices/prst1/driver.py
@@ -53,7 +53,7 @@ class PRST1(USBMS):
             r'(PRS-T(1|2|2N)&)'
             )
     WINDOWS_CARD_A_MEM = re.compile(
-            r'(PRS-T(1|2|2N)__SD&)'
+            r'(PRS-T(1|2|2N)_{1,2}SD&)'
             )
     MAIN_MEMORY_VOLUME_LABEL = 'SONY Reader Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'SONY Reader Storage Card'

From 849465ccce3832958251d5ee2c69c350b67f6c10 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 08:27:29 +0530
Subject: [PATCH 0102/1154] version 0.9.38

---
 Changelog.yaml           | 50 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 7439a02986..f68617fb3a 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,56 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.38
+  date: 2013-07-05
+
+  new features:
+    - title: "Book polishing: Add option to embed all referenced fonts when polishing books using the 'Polish Books' tool."
+      tickets: [1196038]
+
+    - title: "DOCX Input: Add support for clickable (hyperlinked) images"
+      tickets: [1196728]
+
+    - title: "DOCX Input: Insert page breaks at the start of every new section"
+      tickets: [1196728]
+
+    - title: "Drivers for Trekstor Pyrus Maxi and PocketBook Surfpad 2"
+      tickets: [1196931, 1182850]
+
+    - title: "DOCX Input: Add support for horizontal rules created by typing three hyphens and pressing enter."
+ 
+  bug fixes:
+    - title: "Fix detection of SD Card in some PRS-T2N devices"
+      tickets: [1197970]
+
+    - title: "MOBI Input: Fix a regression that broke parsing of MOBI files with malformed markup that also used entities for apostrophes."
+      ticket: [1197585]
+
+    - title: "Get Books: Update Woblink store plugin"
+
+    - title: "Metadata download dialog: Prevent the buttons from being re-ordered when the Next button is clicked."
+
+    - title: "PDF Output: Fix links that point to URLs with query parameters being mangled by the conversion process."
+      tickets: [1197006]
+
+    - title: "DOCX Input: Fix links pointing to locations in the same document that contain multiple, redundant bookmarks not working."
+
+    - title: "EPUB/AZW3 Output: Fix splitting on page-break-after with plain text immediately following the split point causing the text to be added before rather than after the split point."
+      tickets: [1196728]
+
+    - title: "DOCX Input: handle bookmarks defined at the paragraph level"
+      tickets: [1196728]
+
+    - title: "DOCX Input: Handle hyperlinks created as fields"
+      tickets: [1196728]
+
+  improved recipes:
+    - iprofessional
+
+  new recipes:
+    - title: Democracy Now 
+      author: Antoine Beaupre
+     
 - version: 0.9.37
   date: 2013-06-28
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index a4edca6bd5..99146e206c 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 37)
+numeric_version = (0, 9, 38)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 8c1bb3d4cb6655a7b6a3d58fbad35c66bb869050 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 10:12:23 +0530
Subject: [PATCH 0103/1154] Add tests for add_format()

---
 src/calibre/db/tables.py           |  13 ++++
 src/calibre/db/tests/add_remove.py | 101 +++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 src/calibre/db/tests/add_remove.py

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 4dba10abff..140c95eb88 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -221,6 +221,19 @@ class FormatsTable(ManyToManyTable):
                         (fname, book_id, fmt))
 
     def update_fmt(self, book_id, fmt, fname, size, db):
+        fmts = list(self.book_col_map.get(book_id, []))
+        try:
+            fmts.remove(fmt)
+        except ValueError:
+            pass
+        fmts.append(fmt)
+        self.book_col_map[book_id] = tuple(fmts)
+
+        try:
+            self.col_book_map[fmt].add(book_id)
+        except KeyError:
+            self.col_book_map[fmt] = {book_id}
+
         self.fname_map[book_id][fmt] = fname
         self.size_map[book_id][fmt] = size
         db.conn.execute('INSERT OR REPLACE INTO data (book,format,uncompressed_size,name) VALUES (?,?,?,?)',
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
new file mode 100644
index 0000000000..c5b165bd02
--- /dev/null
+++ b/src/calibre/db/tests/add_remove.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__   = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from io import BytesIO
+from tempfile import NamedTemporaryFile
+
+from calibre.db.tests.base import BaseTest
+from calibre.ptempfile import PersistentTemporaryFile
+
+def import_test(replacement_data, replacement_fmt=None):
+    def func(path, fmt):
+        if not path.endswith('.'+fmt.lower()):
+            raise AssertionError('path extension does not match format')
+        ext = (replacement_fmt or fmt).lower()
+        with PersistentTemporaryFile('.'+ext) as f:
+            f.write(replacement_data)
+        return f.name
+    return func
+
+class AddRemoveTest(BaseTest):
+
+    def test_add_format(self):  # {{{
+        'Test adding formats to an existing book record'
+        af, ae, at = self.assertFalse, self.assertEqual, self.assertTrue
+
+        cache = self.init_cache()
+        table = cache.fields['formats'].table
+        NF = b'test_add_formatxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+
+        # Test that replace=False works
+        previous = cache.format(1, 'FMT1')
+        af(cache.add_format(1, 'FMT1', BytesIO(NF), replace=False))
+        ae(previous, cache.format(1, 'FMT1'))
+
+        # Test that replace=True works
+        lm = cache.field_for('last_modified', 1)
+        at(cache.add_format(1, 'FMT1', BytesIO(NF), replace=True))
+        ae(NF, cache.format(1, 'FMT1'))
+        ae(cache.format_metadata(1, 'FMT1')['size'], len(NF))
+        at(cache.field_for('size', 1) >= len(NF))
+        at(cache.field_for('last_modified', 1) > lm)
+        ae(('FMT2','FMT1'), cache.formats(1))
+        at(1 in table.col_book_map['FMT1'])
+
+        # Test adding a format to a record with no formats
+        at(cache.add_format(3, 'FMT1', BytesIO(NF), replace=True))
+        ae(NF, cache.format(3, 'FMT1'))
+        ae(cache.format_metadata(3, 'FMT1')['size'], len(NF))
+        ae(('FMT1',), cache.formats(3))
+        at(3 in table.col_book_map['FMT1'])
+        at(cache.add_format(3, 'FMTX', BytesIO(NF), replace=True))
+        at(3 in table.col_book_map['FMTX'])
+        ae(('FMT1','FMTX'), cache.formats(3))
+
+        # Test running on import plugins
+        import calibre.db.cache as c
+        orig = c.run_plugins_on_import
+        try:
+            c.run_plugins_on_import = import_test(b'replacement data')
+            at(cache.add_format(3, 'REPL', BytesIO(NF)))
+            ae(b'replacement data', cache.format(3, 'REPL'))
+            c.run_plugins_on_import = import_test(b'replacement data2', 'REPL2')
+            with NamedTemporaryFile(suffix='_test_add_format.repl') as f:
+                f.write(NF)
+                f.seek(0)
+                at(cache.add_format(3, 'REPL', BytesIO(NF)))
+                ae(b'replacement data', cache.format(3, 'REPL'))
+                ae(b'replacement data2', cache.format(3, 'REPL2'))
+
+        finally:
+            c.run_plugins_on_import = orig
+
+        # Test adding FMT with path
+        with NamedTemporaryFile(suffix='_test_add_format.fmt9') as f:
+            f.write(NF)
+            f.seek(0)
+            at(cache.add_format(2, 'FMT9', f))
+            ae(NF, cache.format(2, 'FMT9'))
+            ae(cache.format_metadata(2, 'FMT9')['size'], len(NF))
+            at(cache.field_for('size', 2) >= len(NF))
+            at(2 in table.col_book_map['FMT9'])
+
+        del cache
+        # Test that the old interface also shows correct format data
+        db = self.init_old()
+        ae(db.formats(3, index_is_id=True), ','.join(['FMT1', 'FMTX', 'REPL', 'REPL2']))
+        ae(db.format(3, 'FMT1', index_is_id=True), NF)
+        ae(db.format(1, 'FMT1', index_is_id=True), NF)
+
+        db.close()
+        del db
+
+    # }}}
+
+

From df2c497a13afd39b747b3937c857dd0165d44e55 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 11:42:30 +0530
Subject: [PATCH 0104/1154] ...

---
 setup/translations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/translations.py b/setup/translations.py
index 786d44a6d6..3474e82acb 100644
--- a/setup/translations.py
+++ b/setup/translations.py
@@ -165,7 +165,7 @@ class Translations(POT):  # {{{
                     subprocess.check_call(['msgfmt', '-o', dest, iso639])
             elif locale not in ('en_GB', 'en_CA', 'en_AU', 'si', 'ur', 'sc',
                     'ltg', 'nds', 'te', 'yi', 'fo', 'sq', 'ast', 'ml', 'ku',
-                    'fr_CA', 'him', 'jv', 'ka', 'fur', 'ber'):
+                    'fr_CA', 'him', 'jv', 'ka', 'fur', 'ber', 'my'):
                 self.warn('No ISO 639 translations for locale:', locale)
 
         if self.iso639_errors:

From 65e31eee1231c1fe1bcc072c7571b7d80c1947ba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 12:44:19 +0530
Subject: [PATCH 0105/1154] Implement remove_formats()

---
 src/calibre/db/backend.py          | 11 +++++++-
 src/calibre/db/cache.py            | 29 +++++++++++++++++++++-
 src/calibre/db/tables.py           | 25 +++++++++++++++++--
 src/calibre/db/tests/add_remove.py | 40 ++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 97dc673ecc..b8963fc49d 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -26,7 +26,7 @@ from calibre.utils.date import utcfromtimestamp, parse_date
 from calibre.utils.filenames import (is_case_sensitive, samefile, hardlink_file, ascii_filename,
                                      WindowsAtomicFolderMove)
 from calibre.utils.magick.draw import save_cover_data_to
-from calibre.utils.recycle_bin import delete_tree
+from calibre.utils.recycle_bin import delete_tree, delete_file
 from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable,
         SizeTable, FormatsTable, AuthorsTable, IdentifiersTable, PathTable,
         CompositeTable, LanguagesTable, UUIDTable)
@@ -940,6 +940,15 @@ class DB(object):
     def has_format(self, book_id, fmt, fname, path):
         return self.format_abspath(book_id, fmt, fname, path) is not None
 
+    def remove_format(self, book_id, fmt, fname, path):
+        path = self.format_abspath(book_id, fmt, fname, path)
+        if path is not None:
+            try:
+                delete_file(path)
+            except:
+                import traceback
+                traceback.print_exc()
+
     def copy_cover_to(self, path, dest, windows_atomic_move=None, use_hardlink=False):
         path = os.path.abspath(os.path.join(self.library_path, path, 'cover.jpg'))
         if windows_atomic_move is not None:
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 4f7de11269..4c18dde6cd 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -984,7 +984,7 @@ class Cache(object):
         del stream
 
         max_size = self.fields['formats'].table.update_fmt(book_id, fmt, fname, size, self.backend)
-        self.fields['size'].table.update_size(book_id, max_size)
+        self.fields['size'].table.update_sizes({book_id: max_size})
         self._update_last_modified((book_id,))
 
         if run_hooks:
@@ -994,6 +994,33 @@ class Cache(object):
 
         return True
 
+    @write_api
+    def remove_formats(self, formats_map, db_only=False):
+        table = self.fields['formats'].table
+        formats_map = {book_id:frozenset((f or '').upper() for f in fmts) for book_id, fmts in formats_map.iteritems()}
+        size_map = table.remove_formats(formats_map, self.backend)
+        self.fields['size'].table.update_sizes(size_map)
+
+        for book_id, fmts in formats_map.iteritems():
+            for fmt in fmts:
+                self.format_metadata_cache[book_id].pop(fmt, None)
+
+        if not db_only:
+            for book_id, fmts in formats_map.iteritems():
+                try:
+                    path = self._field_for('path', book_id).replace('/', os.sep)
+                except:
+                    continue
+                for fmt in fmts:
+                    try:
+                        name = self.fields['formats'].format_fname(book_id, fmt)
+                    except:
+                        continue
+                    if name and path:
+                        self.backend.remove_format(book_id, fmt, name, path)
+
+        self._update_last_modified(tuple(formats_map.iterkeys()))
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 140c95eb88..fce8d429ba 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -99,8 +99,8 @@ class SizeTable(OneToOneTable):
                 'WHERE data.book=books.id) FROM books'):
             self.book_col_map[row[0]] = self.unserialize(row[1])
 
-    def update_size(self, book_id, size):
-        self.book_col_map[book_id] = size
+    def update_sizes(self, size_map):
+        self.book_col_map.update(size_map)
 
 class UUIDTable(OneToOneTable):
 
@@ -220,6 +220,26 @@ class FormatsTable(ManyToManyTable):
         db.conn.execute('UPDATE data SET name=? WHERE book=? AND format=?',
                         (fname, book_id, fmt))
 
+    def remove_formats(self, formats_map, db):
+        for book_id, fmts in formats_map.iteritems():
+            self.book_col_map[book_id] = [fmt for fmt in self.book_col_map.get(book_id, []) if fmt not in fmts]
+            for m in (self.fname_map, self.size_map):
+                m[book_id] = {k:v for k, v in m[book_id].iteritems() if k not in fmts}
+            for fmt in fmts:
+                try:
+                    self.col_book_map[fmt].discard(book_id)
+                except KeyError:
+                    pass
+        db.conn.executemany('DELETE FROM data WHERE book=? AND format=?',
+            [(book_id, fmt) for book_id, fmts in formats_map.iteritems() for fmt in fmts])
+        def zero_max(book_id):
+            try:
+                return max(self.size_map[book_id].itervalues())
+            except ValueError:
+                return 0
+
+        return {book_id:zero_max(book_id) for book_id in formats_map}
+
     def update_fmt(self, book_id, fmt, fname, size, db):
         fmts = list(self.book_col_map.get(book_id, []))
         try:
@@ -259,3 +279,4 @@ class LanguagesTable(ManyToManyTable):
 
     def read_id_maps(self, db):
         ManyToManyTable.read_id_maps(self, db)
+
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index c5b165bd02..c411daa826 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -7,6 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+import os
 from io import BytesIO
 from tempfile import NamedTemporaryFile
 
@@ -98,4 +99,43 @@ class AddRemoveTest(BaseTest):
 
     # }}}
 
+    def test_remove_formats(self):  # {{{
+        'Test removal of formats from book records'
+        af, ae, at = self.assertFalse, self.assertEqual, self.assertTrue
+
+        cache = self.init_cache()
+
+        # Test removal of non-existing format does nothing
+        formats = {bid:tuple(cache.formats(bid)) for bid in (1, 2, 3)}
+        cache.remove_formats({1:{'NF'}, 2:{'NF'}, 3:{'NF'}})
+        nformats = {bid:tuple(cache.formats(bid)) for bid in (1, 2, 3)}
+        ae(formats, nformats)
+
+        # Test full removal of format
+        af(cache.format(1, 'FMT1') is None)
+        at(cache.has_format(1, 'FMT1'))
+        cache.remove_formats({1:{'FMT1'}})
+        at(cache.format(1, 'FMT1') is None)
+        af(bool(cache.format_metadata(1, 'FMT1')))
+        af(bool(cache.format_metadata(1, 'FMT1', allow_cache=False)))
+        af('FMT1' in cache.formats(1))
+        af(cache.has_format(1, 'FMT1'))
+
+        # Test db only removal
+        at(cache.has_format(1, 'FMT2'))
+        ap = cache.format_abspath(1, 'FMT2')
+        if ap and os.path.exists(ap):
+            cache.remove_formats({1:{'FMT2'}})
+            af(bool(cache.format_metadata(1, 'FMT2')))
+            af(cache.has_format(1, 'FMT2'))
+            at(os.path.exists(ap))
+
+        # Test that the old interface agrees
+        db = self.init_old()
+        at(db.format(1, 'FMT1', index_is_id=True) is None)
+
+        db.close()
+        del db
+    # }}}
+
 

From e7bf1c7b7d399737563e0ce1985df3d1db35306e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 20:32:26 +0530
Subject: [PATCH 0106/1154] Clarify use of OPF in calibredb set_metadata

---
 src/calibre/library/cli.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index b1131525d8..547cc5bc08 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -543,13 +543,14 @@ def do_set_metadata(db, id, stream):
 def set_metadata_option_parser():
     return get_parser(_(
 '''
-%prog set_metadata [options] id /path/to/metadata.opf
+%prog set_metadata [options] id [/path/to/metadata.opf]
 
 Set the metadata stored in the calibre database for the book identified by id
 from the OPF file metadata.opf. id is an id number from the list command. You
 can get a quick feel for the OPF format by using the --as-opf switch to the
 show_metadata command. You can also set the metadata of individual fields with
-the --field option.
+the --field option. If you use the --field option, there is no need to specify
+an OPF file.
 '''))
 
 def command_set_metadata(args, dbpath):

From 9a8d31ee96cba490ace1d4d2d09427833ecf8247 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jul 2013 20:48:31 +0530
Subject: [PATCH 0107/1154] Implement create_book_entry(), with tests

---
 src/calibre/db/__init__.py         |   5 +-
 src/calibre/db/backend.py          |   2 +-
 src/calibre/db/cache.py            | 110 +++++++++++++++++++++++++++--
 src/calibre/db/tables.py           |   7 +-
 src/calibre/db/tests/add_remove.py |  51 ++++++++++++-
 src/calibre/db/tests/base.py       |   2 +
 src/calibre/db/tests/reading.py    |  62 +++++++++++++---
 src/calibre/db/tests/writing.py    |   4 +-
 8 files changed, 223 insertions(+), 20 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 65beebc1fb..eded760cde 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -9,14 +9,15 @@ __docformat__ = 'restructuredtext en'
 
 SPOOL_SIZE = 30*1024*1024
 
-def _get_next_series_num_for_list(series_indices):
+def _get_next_series_num_for_list(series_indices, unwrap=True):
     from calibre.utils.config_base import tweaks
     from math import ceil, floor
     if not series_indices:
         if isinstance(tweaks['series_index_auto_increment'], (int, float)):
             return float(tweaks['series_index_auto_increment'])
         return 1.0
-    series_indices = [x[0] for x in series_indices]
+    if unwrap:
+        series_indices = [x[0] for x in series_indices]
     if tweaks['series_index_auto_increment'] == 'next':
         return floor(series_indices[-1]) + 1
     if tweaks['series_index_auto_increment'] == 'first_free':
diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index b8963fc49d..f998b91ccb 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1088,7 +1088,7 @@ class DB(object):
 
     def update_path(self, book_id, title, author, path_field, formats_field):
         path = self.construct_path_name(book_id, title, author)
-        current_path = path_field.for_book(book_id)
+        current_path = path_field.for_book(book_id, default_value='')
         formats = formats_field.for_book(book_id, default_value=())
         fname = self.construct_file_name(book_id, title, author)
         # Check if the metadata used to construct paths has changed
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 4c18dde6cd..a6647d5027 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -12,9 +12,10 @@ from io import BytesIO
 from collections import defaultdict
 from functools import wraps, partial
 
-from calibre.constants import iswindows
+from calibre import isbytestring
+from calibre.constants import iswindows, preferred_encoding
 from calibre.customize.ui import run_plugins_on_import, run_plugins_on_postimport
-from calibre.db import SPOOL_SIZE
+from calibre.db import SPOOL_SIZE, _get_next_series_num_for_list
 from calibre.db.categories import get_categories
 from calibre.db.locking import create_locks
 from calibre.db.errors import NoSuchFormat
@@ -24,12 +25,13 @@ from calibre.db.tables import VirtualTable
 from calibre.db.write import get_series_values
 from calibre.db.lazy import FormatMetadata, FormatsList
 from calibre.ebooks import check_ebook_format
-from calibre.ebooks.metadata import string_to_authors
+from calibre.ebooks.metadata import string_to_authors, author_to_author_sort
 from calibre.ebooks.metadata.book.base import Metadata
 from calibre.ebooks.metadata.opf2 import metadata_to_opf
 from calibre.ptempfile import (base_dir, PersistentTemporaryFile,
                                SpooledTemporaryFile)
-from calibre.utils.date import now as nowf
+from calibre.utils.config import prefs
+from calibre.utils.date import now as nowf, utcnow, UNDEFINED_DATE
 from calibre.utils.icu import sort_key
 
 def api(f):
@@ -65,6 +67,16 @@ def run_import_plugins(path_or_stream, fmt):
         path = path_or_stream
     return run_plugins_on_import(path, fmt)
 
+def _add_newbook_tag(mi):
+    tags = prefs['new_book_tags']
+    if tags:
+        for tag in [t.strip() for t in tags]:
+            if tag:
+                if not mi.tags:
+                    mi.tags = [tag]
+                elif tag not in mi.tags:
+                    mi.tags.append(tag)
+
 
 class Cache(object):
 
@@ -1021,6 +1033,95 @@ class Cache(object):
 
         self._update_last_modified(tuple(formats_map.iterkeys()))
 
+    @read_api
+    def get_next_series_num_for(self, series):
+        books = ()
+        sf = self.fields['series']
+        if series:
+            q = icu_lower(series)
+            for val, book_ids in sf.iter_searchable_values(self._get_metadata, frozenset(self.all_book_ids())):
+                if q == icu_lower(val):
+                    books = book_ids
+                    break
+        series_indices = sorted(self._field_for('series_index', book_id) for book_id in books)
+        return _get_next_series_num_for_list(tuple(series_indices), unwrap=False)
+
+    @read_api
+    def author_sort_from_authors(self, authors):
+        '''Given a list of authors, return the author_sort string for the authors,
+        preferring the author sort associated with the author over the computed
+        string. '''
+        table = self.fields['authors'].table
+        result = []
+        rmap = {icu_lower(v):k for k, v in table.id_map.iteritems()}
+        for aut in authors:
+            aid = rmap.get(icu_lower(aut), None)
+            result.append(author_to_author_sort(aut) if aid is None else table.asort_map[aid])
+        return ' & '.join(result)
+
+    @read_api
+    def has_book(self, mi):
+        title = mi.title
+        if title:
+            if isbytestring(title):
+                title = title.decode(preferred_encoding, 'replace')
+            q = icu_lower(title)
+            for title in self.fields['title'].table.book_col_map.itervalues():
+                if q == icu_lower(title):
+                    return True
+        return False
+
+    @write_api
+    def create_book_entry(self, mi, cover=None, add_duplicates=True, force_id=None, apply_import_tags=True, preserve_uuid=False):
+        if mi.tags:
+            mi.tags = list(mi.tags)
+        if apply_import_tags:
+            _add_newbook_tag(mi)
+        if not add_duplicates and self._has_book(mi):
+            return
+        series_index = (self._get_next_series_num_for(mi.series) if mi.series_index is None else mi.series_index)
+        if not mi.authors:
+            mi.authors = (_('Unknown'),)
+        aus = mi.author_sort if mi.author_sort else self._author_sort_from_authors(mi.authors)
+        mi.title = mi.title or _('Unknown')
+        if isbytestring(aus):
+            aus = aus.decode(preferred_encoding, 'replace')
+        if isbytestring(mi.title):
+            mi.title = mi.title.decode(preferred_encoding, 'replace')
+        conn = self.backend.conn
+        if force_id is None:
+            conn.execute('INSERT INTO books(title, series_index, author_sort) VALUES (?, ?, ?)',
+                         (mi.title, series_index, aus))
+        else:
+            conn.execute('INSERT INTO books(id, title, series_index, author_sort) VALUES (?, ?, ?, ?)',
+                         (force_id, mi.title, series_index, aus))
+        book_id = conn.last_insert_rowid()
+
+        mi.timestamp = utcnow() if mi.timestamp is None else mi.timestamp
+        mi.pubdate = UNDEFINED_DATE if mi.pubdate is None else mi.pubdate
+        if cover is not None:
+            mi.cover, mi.cover_data = None, (None, cover)
+        self._set_metadata(book_id, mi, ignore_errors=True)
+        if preserve_uuid and mi.uuid:
+            self._set_field('uuid', {book_id:mi.uuid})
+        # Update the caches for fields from the books table
+        self.fields['size'].table.book_col_map[book_id] = 0
+        row = next(conn.execute('SELECT sort, series_index, author_sort, uuid, has_cover FROM books WHERE id=?', (book_id,)))
+        for field, val in zip(('sort', 'series_index', 'author_sort', 'uuid', 'cover'), row):
+            if field == 'cover':
+                val = bool(val)
+            elif field == 'uuid':
+                self.fields[field].table.uuid_to_id_map[val] = book_id
+            self.fields[field].table.book_col_map[book_id] = val
+
+        return book_id
+
+    @write_api
+    def add_books(self, books, add_duplicates=True):
+        duplicates, ids = [], []
+        for mi, format_map in books:
+            pass
+
     # }}}
 
 class SortKey(object):  # {{{
@@ -1038,3 +1139,4 @@ class SortKey(object):  # {{{
 # }}}
 
 
+
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index fce8d429ba..6f3343ba12 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -110,7 +110,7 @@ class UUIDTable(OneToOneTable):
 
     def update_uuid_cache(self, book_id_val_map):
         for book_id, uuid in book_id_val_map.iteritems():
-            self.uuid_to_id_map.pop(self.book_col_map[book_id], None)  # discard old uuid
+            self.uuid_to_id_map.pop(self.book_col_map.get(book_id, None), None)  # discard old uuid
             self.uuid_to_id_map[uuid] = book_id
 
 class CompositeTable(OneToOneTable):
@@ -192,6 +192,11 @@ class AuthorsTable(ManyToManyTable):
                     author_to_author_sort(row[1]))
             self.alink_map[row[0]] = row[3]
 
+    def set_sort_names(self, aus_map, db):
+        self.asort_map.update(aus_map)
+        db.conn.executemany('UPDATE authors SET sort=? WHERE id=?',
+            [(v, k) for k, v in aus_map.iteritems()])
+
 class FormatsTable(ManyToManyTable):
 
     def read_id_maps(self, db):
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index c411daa826..c5845f01da 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -10,9 +10,11 @@ __docformat__ = 'restructuredtext en'
 import os
 from io import BytesIO
 from tempfile import NamedTemporaryFile
+from datetime import timedelta
 
-from calibre.db.tests.base import BaseTest
+from calibre.db.tests.base import BaseTest, IMG
 from calibre.ptempfile import PersistentTemporaryFile
+from calibre.utils.date import now, UNDEFINED_DATE
 
 def import_test(replacement_data, replacement_fmt=None):
     def func(path, fmt):
@@ -138,4 +140,51 @@ class AddRemoveTest(BaseTest):
         del db
     # }}}
 
+    def test_create_book_entry(self):  # {{{
+        'Test the creation of new book entries'
+        from calibre.ebooks.metadata.book.base import Metadata
+        cache = self.init_cache()
+        mi = Metadata('Created One', authors=('Creator One', 'Creator Two'))
+
+        book_id = cache.create_book_entry(mi)
+        self.assertIsNot(book_id, None)
+
+        def do_test(cache, book_id):
+            for field in ('path', 'uuid', 'author_sort', 'timestamp', 'pubdate', 'title', 'authors', 'series_index', 'sort'):
+                self.assertTrue(cache.field_for(field, book_id))
+            for field in ('size', 'cover'):
+                self.assertFalse(cache.field_for(field, book_id))
+            self.assertEqual(book_id, cache.fields['uuid'].table.uuid_to_id_map[cache.field_for('uuid', book_id)])
+            self.assertLess(now() - cache.field_for('timestamp', book_id), timedelta(seconds=30))
+            self.assertEqual(('Created One', ('Creator One', 'Creator Two')), (cache.field_for('title', book_id), cache.field_for('authors', book_id)))
+            self.assertEqual(cache.field_for('series_index', book_id), 1.0)
+            self.assertEqual(cache.field_for('pubdate', book_id), UNDEFINED_DATE)
+
+        do_test(cache, book_id)
+        # Test that the db contains correct data
+        cache = self.init_cache()
+        do_test(cache, book_id)
+
+        self.assertIs(None, cache.create_book_entry(mi, add_duplicates=False), 'Duplicate added incorrectly')
+        book_id = cache.create_book_entry(mi, cover=IMG)
+        self.assertIsNot(book_id, None)
+        self.assertEqual(IMG, cache.cover(book_id))
+
+        import calibre.db.cache as c
+        orig = c.prefs
+        c.prefs = {'new_book_tags':('newbook', 'newbook2')}
+        try:
+            book_id = cache.create_book_entry(mi)
+            self.assertEqual(('newbook', 'newbook2'), cache.field_for('tags', book_id))
+            mi.tags = ('one', 'two')
+            book_id = cache.create_book_entry(mi)
+            self.assertEqual(('one', 'two') + ('newbook', 'newbook2'), cache.field_for('tags', book_id))
+            mi.tags = ()
+        finally:
+            c.prefs = orig
+
+        mi.uuid = 'a preserved uuid'
+        book_id = cache.create_book_entry(mi, preserve_uuid=True)
+        self.assertEqual(mi.uuid, cache.field_for('uuid', book_id))
+    # }}}
 
diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index b57b017ba3..b94faf6b28 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -14,6 +14,8 @@ from future_builtins import map
 
 rmtree = partial(shutil.rmtree, ignore_errors=True)
 
+IMG = b'\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01\x01\x00`\x00`\x00\x00\xff\xe1\x00\x16Exif\x00\x00II*\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xdb\x00C\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb\x00C\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xc0\x00\x11\x08\x00\x01\x00\x01\x03\x01"\x00\x02\x11\x01\x03\x11\x01\xff\xc4\x00\x15\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xda\x00\x0c\x03\x01\x00\x02\x11\x03\x11\x00?\x00\xbf\x80\x01\xff\xd9'  # noqa {{{ }}}
+
 class BaseTest(unittest.TestCase):
 
     longMessage = True
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 979e2e9247..24d80d33c7 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -15,7 +15,7 @@ from calibre.db.tests.base import BaseTest
 
 class ReadingTest(BaseTest):
 
-    def test_read(self): # {{{
+    def test_read(self):  # {{{
         'Test the reading of data from the database'
         cache = self.init_cache(self.library_path)
         tests = {
@@ -123,7 +123,7 @@ class ReadingTest(BaseTest):
                             book_id, field, expected_val, val))
         # }}}
 
-    def test_sorting(self): # {{{
+    def test_sorting(self):  # {{{
         'Test sorting'
         cache = self.init_cache(self.library_path)
         for field, order in {
@@ -165,7 +165,7 @@ class ReadingTest(BaseTest):
             ('title', True)]), 'Subsort failed')
     # }}}
 
-    def test_get_metadata(self): # {{{
+    def test_get_metadata(self):  # {{{
         'Test get_metadata() returns the same data for both backends'
         from calibre.library.database2 import LibraryDatabase2
         old = LibraryDatabase2(self.library_path)
@@ -188,7 +188,7 @@ class ReadingTest(BaseTest):
             self.compare_metadata(mi1, mi2)
     # }}}
 
-    def test_get_cover(self): # {{{
+    def test_get_cover(self):  # {{{
         'Test cover() returns the same data for both backends'
         from calibre.library.database2 import LibraryDatabase2
         old = LibraryDatabase2(self.library_path)
@@ -212,7 +212,7 @@ class ReadingTest(BaseTest):
 
     # }}}
 
-    def test_searching(self): # {{{
+    def test_searching(self):  # {{{
         'Test searching returns the same data for both backends'
         from calibre.library.database2 import LibraryDatabase2
         old = LibraryDatabase2(self.library_path)
@@ -267,7 +267,7 @@ class ReadingTest(BaseTest):
 
     # }}}
 
-    def test_get_categories(self): # {{{
+    def test_get_categories(self):  # {{{
         'Check that get_categories() returns the same data for both backends'
         from calibre.library.database2 import LibraryDatabase2
         old = LibraryDatabase2(self.library_path)
@@ -286,9 +286,9 @@ class ReadingTest(BaseTest):
                 oval, nval = getattr(old, attr), getattr(new, attr)
                 if (
                     (category in {'rating', '#rating'} and attr in {'id_set', 'sort'}) or
-                    (category == 'series' and attr == 'sort') or # Sorting is wrong in old
+                    (category == 'series' and attr == 'sort') or  # Sorting is wrong in old
                     (category == 'identifiers' and attr == 'id_set') or
-                    (category == '@Good Series') or # Sorting is wrong in old
+                    (category == '@Good Series') or  # Sorting is wrong in old
                     (category == 'news' and attr in {'count', 'id_set'}) or
                     (category == 'formats' and attr == 'id_set')
                 ):
@@ -306,7 +306,7 @@ class ReadingTest(BaseTest):
 
     # }}}
 
-    def test_get_formats(self): # {{{
+    def test_get_formats(self):  # {{{
         'Test reading ebook formats using the format() method'
         from calibre.library.database2 import LibraryDatabase2
         from calibre.db.cache import NoSuchFormat
@@ -343,3 +343,47 @@ class ReadingTest(BaseTest):
 
     # }}}
 
+    def test_author_sort_for_authors(self):  # {{{
+        'Test getting the author sort for authors from the db'
+        cache = self.init_cache()
+        table = cache.fields['authors'].table
+        table.set_sort_names({next(table.id_map.iterkeys()): 'Fake Sort'}, cache.backend)
+
+        authors = tuple(table.id_map.itervalues())
+        nval = cache.author_sort_from_authors(authors)
+        self.assertIn('Fake Sort', nval)
+
+        db = self.init_old()
+        self.assertEqual(db.author_sort_from_authors(authors), nval)
+        db.close()
+        del db
+
+    # }}}
+
+    def test_get_next_series_num(self):  # {{{
+        'Test getting the next series number for a series'
+        cache = self.init_cache()
+        cache.set_field('series', {3:'test series'})
+        cache.set_field('series_index', {3:13})
+        table = cache.fields['series'].table
+        series = tuple(table.id_map.itervalues())
+        nvals = {s:cache.get_next_series_num_for(s) for s in series}
+        db = self.init_old()
+        self.assertEqual({s:db.get_next_series_num_for(s) for s in series}, nvals)
+        db.close()
+
+    # }}}
+
+    def test_has_book(self):  # {{{
+        'Test detecting duplicates'
+        from calibre.ebooks.metadata.book.base import Metadata
+        cache = self.init_cache()
+        db = self.init_old()
+        for title in cache.fields['title'].table.book_col_map.itervalues():
+            for x in (db, cache):
+                self.assertTrue(x.has_book(Metadata(title)))
+                self.assertTrue(x.has_book(Metadata(title.upper())))
+                self.assertFalse(x.has_book(Metadata(title + 'XXX')))
+                self.assertFalse(x.has_book(Metadata(title[:1])))
+        db.close()
+    # }}}
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 597c98a771..cb525900ee 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -13,7 +13,7 @@ from io import BytesIO
 
 from calibre.ebooks.metadata import author_to_author_sort
 from calibre.utils.date import UNDEFINED_DATE
-from calibre.db.tests.base import BaseTest
+from calibre.db.tests.base import BaseTest, IMG
 
 class WritingTest(BaseTest):
 
@@ -364,8 +364,8 @@ class WritingTest(BaseTest):
         ae(cache.field_for('cover', 1), 1)
         ae(cache.set_cover({1:None}), set([1]))
         ae(cache.field_for('cover', 1), 0)
+        img = IMG
 
-        img = b'\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01\x01\x00`\x00`\x00\x00\xff\xe1\x00\x16Exif\x00\x00II*\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xdb\x00C\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb\x00C\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xc0\x00\x11\x08\x00\x01\x00\x01\x03\x01"\x00\x02\x11\x01\x03\x11\x01\xff\xc4\x00\x15\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xda\x00\x0c\x03\x01\x00\x02\x11\x03\x11\x00?\x00\xbf\x80\x01\xff\xd9'  # noqa {{{ }}}
         # Test setting a cover
         ae(cache.set_cover({bid:img for bid in (1, 2, 3)}), {1, 2, 3})
         old = self.init_old()

From 42202faae823d3052150af72ea9ce90d2fd71a35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 6 Jul 2013 09:30:37 +0530
Subject: [PATCH 0108/1154] Metadata download dialog: Have the OK button
 enabled in the results screen as well. See #1198288

---
 src/calibre/gui2/metadata/single_download.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index ed378745a5..fc883bd88f 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -1019,7 +1019,6 @@ class FullFetch(QDialog):  # {{{
         self.log_button = self.bb.addButton(_('View log'), self.bb.ActionRole)
         self.log_button.clicked.connect(self.view_log)
         self.log_button.setIcon(QIcon(I('debug.png')))
-        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
 
         self.identify_widget = IdentifyWidget(self.log, self)
@@ -1044,7 +1043,6 @@ class FullFetch(QDialog):  # {{{
 
     def book_selected(self, book, caches):
         self.next_button.setVisible(False)
-        self.ok_button.setEnabled(True)
         self.prev_button.setVisible(True)
         self.book = book
         self.stack.setCurrentIndex(1)
@@ -1055,7 +1053,6 @@ class FullFetch(QDialog):  # {{{
 
     def back_clicked(self):
         self.next_button.setVisible(True)
-        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
         self.next_button.setFocus()
         self.stack.setCurrentIndex(0)
@@ -1063,11 +1060,14 @@ class FullFetch(QDialog):  # {{{
         self.covers_widget.reset_covers()
 
     def accept(self):
-        gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
-        if self.stack.currentIndex() == 1:
-            return QDialog.accept(self)
         # Prevent the usual dialog accept mechanisms from working
-        pass
+        gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
+        if DEBUG_DIALOG:
+            if self.stack.currentIndex() == 2:
+                return QDialog.accept(self)
+        else:
+            if self.stack.currentIndex() == 1:
+                return QDialog.accept(self)
 
     def reject(self):
         gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
@@ -1087,6 +1087,9 @@ class FullFetch(QDialog):  # {{{
 
     def ok_clicked(self, *args):
         self.cover_pixmap = self.covers_widget.cover_pixmap()
+        if self.stack.currentIndex() == 0:
+            self.next_clicked()
+            return
         if DEBUG_DIALOG:
             if self.cover_pixmap is not None:
                 self.w = QLabel()

From 7c9ae4ebc918d10fe2defb1d294ce8af0ab26b3e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 6 Jul 2013 11:13:55 +0530
Subject: [PATCH 0109/1154] ...

---
 manual/customize.rst | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/manual/customize.rst b/manual/customize.rst
index ceee4ece62..59475e91f2 100644
--- a/manual/customize.rst
+++ b/manual/customize.rst
@@ -46,17 +46,31 @@ The default values for the tweaks are reproduced below
 Overriding icons, templates, et cetera
 ----------------------------------------
 
-|app| allows you to override the static resources, like icons, templates, javascript, etc. with customized versions that you like.
-All static resources are stored in the resources sub-folder of the calibre install location. On Windows, this is usually
-:file:`C:/Program Files/Calibre2/resources`. On OS X, :file:`/Applications/calibre.app/Contents/Resources/resources/`. On linux, if you are using the binary installer
-from the calibre website it will be :file:`/opt/calibre/resources`. These paths can change depending on where you choose to install |app|. 
+|app| allows you to override the static resources, like icons, javascript and
+templates for the metadata jacket, catalogs, etc. with customized versions that
+you like.  All static resources are stored in the resources sub-folder of the
+calibre install location. On Windows, this is usually :file:`C:/Program Files/Calibre2/resources`. 
+On OS X, :file:`/Applications/calibre.app/Contents/Resources/resources/`. On linux, if
+you are using the binary installer from the calibre website it will be
+:file:`/opt/calibre/resources`. These paths can change depending on where you
+choose to install |app|. 
 
-You should not change the files in this resources folder, as your changes will get overwritten the next time you update |app|. Instead, go to
-:guilabel:`Preferences->Advanced->Miscellaneous` and click :guilabel:`Open calibre configuration directory`. In this configuration directory, create a sub-folder called resources and place the files you want to override in it. Place the files in the appropriate sub folders, for example place images in :file:`resources/images`, etc. 
-|app| will automatically use your custom file in preference to the built-in one the next time it is started.
+You should not change the files in this resources folder, as your changes will
+get overwritten the next time you update |app|. Instead, go to
+:guilabel:`Preferences->Advanced->Miscellaneous` and click 
+:guilabel:`Open calibre configuration directory`. In this configuration directory, create a
+sub-folder called resources and place the files you want to override in it.
+Place the files in the appropriate sub folders, for example place images in
+:file:`resources/images`, etc. |app| will automatically use your custom file
+in preference to the built-in one the next time it is started.
 
-For example, if you wanted to change the icon for the :guilabel:`Remove books` action, you would first look in the built-in resources folder and see that the relevant file is
-:file:`resources/images/trash.png`. Assuming you have an alternate icon in PNG format called :file:`mytrash.png` you would save it in the configuration directory as :file:`resources/images/trash.png`. All the icons used by the calibre user interface are in :file:`resources/images` and its sub-folders.
+For example, if you wanted to change the icon for the :guilabel:`Remove books`
+action, you would first look in the built-in resources folder and see that the
+relevant file is :file:`resources/images/trash.png`. Assuming you have an
+alternate icon in PNG format called :file:`mytrash.png` you would save it in
+the configuration directory as :file:`resources/images/trash.png`. All the
+icons used by the calibre user interface are in :file:`resources/images` and
+its sub-folders.
 
 Customizing |app| with plugins
 --------------------------------

From 20920b37b2ae8655aeb135f9c82ae6eb58cacf2e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 6 Jul 2013 11:24:19 +0530
Subject: [PATCH 0110/1154] Implement add_books()

---
 src/calibre/db/cache.py            | 11 +++++++++--
 src/calibre/db/tests/add_remove.py | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index a6647d5027..e6044ce6de 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1117,10 +1117,17 @@ class Cache(object):
         return book_id
 
     @write_api
-    def add_books(self, books, add_duplicates=True):
+    def add_books(self, books, add_duplicates=True, apply_import_tags=True, preserve_uuid=False, dbapi=None):
         duplicates, ids = [], []
         for mi, format_map in books:
-            pass
+            book_id = self._create_book_entry(mi, add_duplicates=add_duplicates, apply_import_tags=apply_import_tags, preserve_uuid=preserve_uuid)
+            if book_id is None:
+                duplicates.append((mi, format_map))
+            else:
+                ids.append(book_id)
+                for fmt, stream_or_path in format_map.iteritems():
+                    self._add_format(book_id, fmt, stream_or_path, dbapi=dbapi)
+        return ids, duplicates
 
     # }}}
 
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index c5845f01da..5744d63635 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -188,3 +188,19 @@ class AddRemoveTest(BaseTest):
         self.assertEqual(mi.uuid, cache.field_for('uuid', book_id))
     # }}}
 
+    def test_add_books(self):  # {{{
+        'Test the adding of new books'
+        from calibre.ebooks.metadata.book.base import Metadata
+        cache = self.init_cache()
+        mi = Metadata('Created One', authors=('Creator One', 'Creator Two'))
+        FMT1, FMT2 = b'format1', b'format2'
+        format_map = {'FMT1':BytesIO(FMT1), 'FMT2':BytesIO(FMT2)}
+        ids, duplicates = cache.add_books([(mi, format_map)])
+        self.assertTrue(len(ids) == 1)
+        self.assertFalse(duplicates)
+        book_id = ids[0]
+        self.assertEqual(set(cache.formats(book_id)), {'FMT1', 'FMT2'})
+        self.assertEqual(cache.format(book_id, 'FMT1'), FMT1)
+        self.assertEqual(cache.format(book_id, 'FMT2'), FMT2)
+    # }}}
+

From 0711e03bd4686262ba35b28326897360fd7cb440 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 6 Jul 2013 12:43:02 +0530
Subject: [PATCH 0111/1154] Initial implementation of remove_book(), needs
 testing

---
 src/calibre/db/backend.py |  14 +++++-
 src/calibre/db/cache.py   |  13 +++++
 src/calibre/db/tables.py  | 103 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 125 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index f998b91ccb..d75106209f 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -29,7 +29,7 @@ from calibre.utils.magick.draw import save_cover_data_to
 from calibre.utils.recycle_bin import delete_tree, delete_file
 from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable,
         SizeTable, FormatsTable, AuthorsTable, IdentifiersTable, PathTable,
-        CompositeTable, LanguagesTable, UUIDTable)
+        CompositeTable, UUIDTable)
 # }}}
 
 '''
@@ -711,7 +711,6 @@ class DB(object):
                     'authors':AuthorsTable,
                     'formats':FormatsTable,
                     'identifiers':IdentifiersTable,
-                    'languages':LanguagesTable,
                   }.get(col, ManyToManyTable)
             tables[col] = cls(col, self.field_metadata[col].copy())
 
@@ -1165,5 +1164,16 @@ class DB(object):
         with lopen(path, 'rb') as f:
             return f.read()
 
+    def remove_books(self, path_map, permanent=False):
+        for book_id, path in path_map.iteritems():
+            if path:
+                path = os.path.join(self.library_path, path)
+                if os.path.exists(path):
+                    self.rmtree(path, permanent=permanent)
+                    parent = os.path.dirname(path)
+                    if len(os.listdir(parent)) == 0:
+                        self.rmtree(parent, permanent=permanent)
+        self.conn.executemany(
+            'DELETE FROM books WHERE id=?', [(x,) for x in path_map])
    # }}}
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index e6044ce6de..ce0582f893 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1129,6 +1129,19 @@ class Cache(object):
                     self._add_format(book_id, fmt, stream_or_path, dbapi=dbapi)
         return ids, duplicates
 
+    @write_api
+    def remove_books(self, book_ids, permanent=False):
+        path_map = {}
+        for book_id in book_ids:
+            try:
+                path = self._field_for('path', book_id).replace('/', os.sep)
+            except:
+                path = None
+            path_map[book_id] = path
+        self.backend.remove_books(path_map, permanent=permanent)
+        for field in self.fields.itervalues():
+            field.table.remove_books(book_ids, self.backend)
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 6f3343ba12..19c4ade10c 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -20,6 +20,10 @@ _c_speedup = plugins['speedup'][0]
 
 ONE_ONE, MANY_ONE, MANY_MANY = xrange(3)
 
+class Null:
+    pass
+null = Null()
+
 def _c_convert_timestamp(val):
     if not val:
         return None
@@ -55,6 +59,9 @@ class Table(object):
         self.link_table = (link_table if link_table else
                 'books_%s_link'%self.metadata['table'])
 
+    def remove_books(self, book_ids, db):
+        return set()
+
 class VirtualTable(Table):
 
     '''
@@ -83,6 +90,14 @@ class OneToOneTable(Table):
             self.metadata['column'], self.metadata['table'])):
             self.book_col_map[row[0]] = self.unserialize(row[1])
 
+    def remove_books(self, book_ids, db):
+        clean = set()
+        for book_id in book_ids:
+            val = self.book_col_map.pop(book_id, null)
+            if val is not null:
+                clean.add(val)
+        return clean
+
 class PathTable(OneToOneTable):
 
     def set_path(self, book_id, path, db):
@@ -113,6 +128,15 @@ class UUIDTable(OneToOneTable):
             self.uuid_to_id_map.pop(self.book_col_map.get(book_id, None), None)  # discard old uuid
             self.uuid_to_id_map[uuid] = book_id
 
+    def remove_books(self, book_ids, db):
+        clean = set()
+        for book_id in book_ids:
+            val = self.book_col_map.pop(book_id, null)
+            if val is not null:
+                self.uuid_to_id_map.pop(val, None)
+                clean.add(val)
+        return clean
+
 class CompositeTable(OneToOneTable):
 
     def read(self, db):
@@ -124,6 +148,9 @@ class CompositeTable(OneToOneTable):
         self.composite_sort = d.get('composite_sort', False)
         self.use_decorations = d.get('use_decorations', False)
 
+    def remove_books(self, book_ids, db):
+        return set()
+
 class ManyToOneTable(Table):
 
     '''
@@ -156,6 +183,27 @@ class ManyToOneTable(Table):
             self.col_book_map[row[1]].add(row[0])
             self.book_col_map[row[0]] = row[1]
 
+    def remove_books(self, book_ids, db):
+        clean = set()
+        for book_id in book_ids:
+            item_id = self.book_col_map.pop(book_id, None)
+            if item_id is not None:
+                try:
+                    self.col_book_map[item_id].discard(book_id)
+                except KeyError:
+                    if self.id_map.pop(item_id, null) is not null:
+                        clean.add(item_id)
+                else:
+                    if not self.col_book_map[item_id]:
+                        del self.col_book_map[item_id]
+                        if self.id_map.pop(item_id, null) is not null:
+                            clean.add(item_id)
+        if clean:
+            db.conn.executemany(
+                'DELETE FROM {0} WHERE id=?'.format(self.metadata['table']),
+                [(x,) for x in clean])
+        return clean
+
 class ManyToManyTable(ManyToOneTable):
 
     '''
@@ -166,6 +214,7 @@ class ManyToManyTable(ManyToOneTable):
 
     table_type = MANY_MANY
     selectq = 'SELECT book, {0} FROM {1} ORDER BY id'
+    do_clean_on_remove = True
 
     def read_maps(self, db):
         for row in db.conn.execute(
@@ -180,6 +229,27 @@ class ManyToManyTable(ManyToOneTable):
         for key in tuple(self.book_col_map.iterkeys()):
             self.book_col_map[key] = tuple(self.book_col_map[key])
 
+    def remove_books(self, book_ids, db):
+        clean = set()
+        for book_id in book_ids:
+            item_ids = self.book_col_map.pop(book_id, ())
+            for item_id in item_ids:
+                try:
+                    self.col_book_map[item_id].discard(book_id)
+                except KeyError:
+                    if self.id_map.pop(item_id, null) is not null:
+                        clean.add(item_id)
+                else:
+                    if not self.col_book_map[item_id]:
+                        del self.col_book_map[item_id]
+                        if self.id_map.pop(item_id, null) is not null:
+                            clean.add(item_id)
+        if clean and self.do_clean_on_remove:
+            db.conn.executemany(
+                'DELETE FROM {0} WHERE id=?'.format(self.metadata['table']),
+                [(x,) for x in clean])
+        return clean
+
 class AuthorsTable(ManyToManyTable):
 
     def read_id_maps(self, db):
@@ -197,8 +267,17 @@ class AuthorsTable(ManyToManyTable):
         db.conn.executemany('UPDATE authors SET sort=? WHERE id=?',
             [(v, k) for k, v in aus_map.iteritems()])
 
+    def remove_books(self, book_ids, db):
+        clean = ManyToManyTable.remove_books(self, book_ids, db)
+        for item_id in clean:
+            self.alink_map.pop(item_id, None)
+            self.asort_map.pop(item_id, None)
+        return clean
+
 class FormatsTable(ManyToManyTable):
 
+    do_clean_on_remove = False
+
     def read_id_maps(self, db):
         pass
 
@@ -220,6 +299,13 @@ class FormatsTable(ManyToManyTable):
         for key in tuple(self.book_col_map.iterkeys()):
             self.book_col_map[key] = tuple(sorted(self.book_col_map[key]))
 
+    def remove_books(self, book_ids, db):
+        clean = ManyToManyTable.remove_books(self, book_ids, db)
+        for book_id in book_ids:
+            self.fname_map.pop(book_id, None)
+            self.size_map.pop(book_id, None)
+        return clean
+
     def set_fname(self, book_id, fmt, fname, db):
         self.fname_map[book_id][fmt] = fname
         db.conn.execute('UPDATE data SET name=? WHERE book=? AND format=?',
@@ -280,8 +366,19 @@ class IdentifiersTable(ManyToManyTable):
                     self.book_col_map[row[0]] = {}
                 self.book_col_map[row[0]][row[1]] = row[2]
 
-class LanguagesTable(ManyToManyTable):
+    def remove_books(self, book_ids, db):
+        clean = set()
+        for book_id in book_ids:
+            item_map = self.book_col_map.pop(book_id, {})
+            for item_id in item_map:
+                try:
+                    self.col_book_map[item_id].discard(book_id)
+                except KeyError:
+                    clean.add(item_id)
+                else:
+                    if not self.col_book_map[item_id]:
+                        del self.col_book_map[item_id]
+                        clean.add(item_id)
+        return clean
 
-    def read_id_maps(self, db):
-        ManyToManyTable.read_id_maps(self, db)
 

From e836bbd20390dcc669f90cdb06bb9ea8bb5547a4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 6 Jul 2013 19:02:00 +0530
Subject: [PATCH 0112/1154] DOCX Input: Fix no page break being inserted before
 the last section.

Fixes #1198414 [Private bug](https://bugs.launchpad.net/calibre/+bug/1198414)
---
 src/calibre/ebooks/docx/to_html.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 01808657ea..be0576d2b9 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -203,6 +203,7 @@ class Convert(object):
                 current.append(p)
 
         if current:
+            self.section_starts.append(current[0])
             last = XPath('./w:body/w:sectPr')(doc)
             pr = PageProperties(last)
             for x in current:

From 75cf58d0f119476da2da9530aa5d85a51b27a82e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 7 Jul 2013 08:47:26 +0530
Subject: [PATCH 0113/1154] Glenn Brenwald and Ludwig von Mises Institute by
 anywho

---
 recipes/glenn_greenwald.recipe | 10 ++++++++++
 recipes/ludwig_mises.recipe    | 14 ++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 recipes/glenn_greenwald.recipe
 create mode 100644 recipes/ludwig_mises.recipe

diff --git a/recipes/glenn_greenwald.recipe b/recipes/glenn_greenwald.recipe
new file mode 100644
index 0000000000..63ed285e72
--- /dev/null
+++ b/recipes/glenn_greenwald.recipe
@@ -0,0 +1,10 @@
+from calibre.web.feeds.news import AutomaticNewsRecipe
+class BasicUserRecipe1373130920(AutomaticNewsRecipe):
+    title          = u'Glenn Greenwald | guardian.co.uk'
+    language = 'en_GB'
+    __author__ = 'anywho'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    auto_cleanup = True
+
+    feeds          = [(u'Latest', u'http://www.guardian.co.uk/profile/glenn-greenwald/rss')]
diff --git a/recipes/ludwig_mises.recipe b/recipes/ludwig_mises.recipe
new file mode 100644
index 0000000000..7e46a9a7db
--- /dev/null
+++ b/recipes/ludwig_mises.recipe
@@ -0,0 +1,14 @@
+from calibre.web.feeds.news import AutomaticNewsRecipe
+
+class BasicUserRecipe1373130372(AutomaticNewsRecipe):
+    title          = u'Ludwig von Mises Institute'
+    __author__ = 'anywho'
+    language = 'en'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    auto_cleanup = True
+
+    feeds          = [(u'Daily Articles (Full text version)',
+                       u'http://feed.mises.org/MisesFullTextArticles'),
+                      (u'Mises Blog Posts',
+                       u'http://mises.org/blog/index.rdf')]

From 535cff6f03378a17ef26078a24bba36c5f41ad2b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 7 Jul 2013 10:32:20 +0530
Subject: [PATCH 0114/1154] Tests for remove_books()

---
 src/calibre/db/cache.py            |  7 +++++-
 src/calibre/db/tests/add_remove.py | 39 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index ce0582f893..b94258b1ef 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1140,7 +1140,12 @@ class Cache(object):
             path_map[book_id] = path
         self.backend.remove_books(path_map, permanent=permanent)
         for field in self.fields.itervalues():
-            field.table.remove_books(book_ids, self.backend)
+            try:
+                table = field.table
+            except AttributeError:
+                continue  # Some fields like ondevice do not have tables
+            else:
+                table.remove_books(book_ids, self.backend)
 
     # }}}
 
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index 5744d63635..5d490a2bcb 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -204,3 +204,42 @@ class AddRemoveTest(BaseTest):
         self.assertEqual(cache.format(book_id, 'FMT2'), FMT2)
     # }}}
 
+    def test_remove_books(self):  # {{{
+        'Test removal of books'
+        cache = self.init_cache()
+        af, ae, at = self.assertFalse, self.assertEqual, self.assertTrue
+        authors = cache.fields['authors'].table
+
+        # Delete a single book, with no formats and check cleaning
+        self.assertIn(_('Unknown'), set(authors.id_map.itervalues()))
+        olen = len(authors.id_map)
+        item_id = {v:k for k, v in authors.id_map.iteritems()}[_('Unknown')]
+        cache.remove_books((3,))
+        for c in (cache, self.init_cache()):
+            table = c.fields['authors'].table
+            self.assertNotIn(3, c.all_book_ids())
+            self.assertNotIn(_('Unknown'), set(table.id_map.itervalues()))
+            self.assertNotIn(item_id, table.asort_map)
+            self.assertNotIn(item_id, table.alink_map)
+            ae(len(table.id_map), olen-1)
+
+        # Check that files are removed
+        fmtpath = cache.format_abspath(1, 'FMT1')
+        bookpath = os.path.dirname(fmtpath)
+        authorpath = os.path.dirname(bookpath)
+        item_id = {v:k for k, v in cache.fields['#series'].table.id_map.iteritems()}['My Series Two']
+        cache.remove_books((1,), permanent=True)
+        for x in (fmtpath, bookpath, authorpath):
+            af(os.path.exists(x))
+        for c in (cache, self.init_cache()):
+            table = c.fields['authors'].table
+            self.assertNotIn(1, c.all_book_ids())
+            self.assertNotIn('Author Two', set(table.id_map.itervalues()))
+            self.assertNotIn(6, set(c.fields['rating'].table.id_map.itervalues()))
+            self.assertIn('A Series One', set(c.fields['series'].table.id_map.itervalues()))
+            self.assertNotIn('My Series Two', set(c.fields['#series'].table.id_map.itervalues()))
+            self.assertNotIn(item_id, c.fields['#series'].table.col_book_map)
+            self.assertNotIn(1, c.fields['#series'].table.book_col_map)
+    # }}}
+
+

From 3b438889a4fecc1de39c7407ef5b30f973d69501 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 7 Jul 2013 11:17:57 +0530
Subject: [PATCH 0115/1154] Test emptying db

---
 src/calibre/db/tests/add_remove.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index 5d490a2bcb..76349df1c5 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -240,6 +240,15 @@ class AddRemoveTest(BaseTest):
             self.assertNotIn('My Series Two', set(c.fields['#series'].table.id_map.itervalues()))
             self.assertNotIn(item_id, c.fields['#series'].table.col_book_map)
             self.assertNotIn(1, c.fields['#series'].table.book_col_map)
+
+        # Test emptying the db
+        cache.remove_books(cache.all_book_ids(), permanent=True)
+        for f in ('authors', 'series', '#series', 'tags'):
+            table = cache.fields[f].table
+            self.assertFalse(table.id_map)
+            self.assertFalse(table.book_col_map)
+            self.assertFalse(table.col_book_map)
+
     # }}}
 
 

From e64ff83e070b21461e119f913837c7ea361feeff Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 7 Jul 2013 11:44:30 +0530
Subject: [PATCH 0116/1154] Legacy implementations of a few direct methods

---
 src/calibre/db/legacy.py       |  3 +++
 src/calibre/db/tests/legacy.py | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 287d2d47db..2ad5da61b8 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -58,6 +58,9 @@ class LibraryDatabase(object):
             setattr(self, prop, partial(self.get_property,
                     loc=self.FIELD_MAP[fm]))
 
+        for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
+            setattr(self, meth, getattr(self.new_api, meth))
+
         self.last_update_check = self.last_modified()
 
     def close(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 1fe719e31e..ae99d8190f 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -103,6 +103,22 @@ class LegacyTest(BaseTest):
 
     # }}}
 
+    def test_legacy_direct(self):  # {{{
+        'Test methods that are directly equivalent in the old and new interface'
+        from calibre.ebooks.metadata.book.base import Metadata
+        ndb = self.init_legacy()
+        db = self.init_old()
+        for meth, args in {
+            'get_next_series_num_for': [('A Series One',)],
+            'author_sort_from_authors': [(['Author One', 'Author Two', 'Unknown'],)],
+            'has_book':[(Metadata('title one'),), (Metadata('xxxx1111'),)],
+        }.iteritems():
+            for a in args:
+                self.assertEqual(getattr(db, meth)(*a), getattr(ndb, meth)(*a),
+                                 'The method: %s() returned different results for argument %s' % (meth, a))
+        db.close()
+        # }}}
+
     def test_legacy_coverage(self):  # {{{
         ' Check that the emulation of the legacy interface is (almost) total '
         cl = self.cloned_library

From 08834f636a73464366be017cb1074b85be72c2cf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 7 Jul 2013 22:47:57 +0530
Subject: [PATCH 0117/1154] Update mediapart.fr

---
 recipes/mediapart.recipe | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/recipes/mediapart.recipe b/recipes/mediapart.recipe
index f1e6c87385..a457b713f2 100644
--- a/recipes/mediapart.recipe
+++ b/recipes/mediapart.recipe
@@ -1,17 +1,18 @@
 __license__   = 'GPL v3'
-__copyright__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>'
+__copyright__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf.fr>'
 '''
 Mediapart
 '''
 
-__author__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>'
+__author__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf.fr>'
 
+import re
 from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Mediapart(BasicNewsRecipe):
     title          = 'Mediapart'
-    __author__ = 'Mathieu Godlewski, Louis Gesbert'
+    __author__ = 'Mathieu Godlewski, Louis Gesbert, Malah'
     description = 'Global news in french from news site Mediapart'
     oldest_article = 7
     language = 'fr'
@@ -21,6 +22,7 @@ class Mediapart(BasicNewsRecipe):
     use_embedded_content = False
     no_stylesheets = True
 
+    masthead_url       = 'https://upload.wikimedia.org/wikipedia/fr/2/23/Mediapart.png'
     cover_url = 'http://static.mediapart.fr/files/pave_mediapart.jpg'
 
     feeds =  [
@@ -36,18 +38,18 @@ class Mediapart(BasicNewsRecipe):
     def print_version(self, url):
         raw = self.browser.open(url).read()
         soup = BeautifulSoup(raw.decode('utf8', 'replace'))
-        link = soup.find('a', {'title':'Imprimer'})
+        link = soup.find('a', {'href':re.compile('^/print/[0-9]+')})
         if link is None:
             return None
-        return link['href']
+        return 'http://www.mediapart.fr' + link['href']
 
 # -- Handle login
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
         if self.username is not None and self.password is not None:
-            br.open('http://www.mediapart.fr/')
-            br.select_form(nr=0)
+            br.open('http://blogs.mediapart.fr/editions/guide-du-coordonnateur-d-edition')
+            br.select_form(nr=1)
             br['name'] = self.username
             br['pass'] = self.password
             br.submit()

From a41a945e8f33a856d055f9c55c3cc34358b0023d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 8 Jul 2013 10:26:50 +0530
Subject: [PATCH 0118/1154] Add FAQ about windows temp folder permissions

---
 manual/faq.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/manual/faq.rst b/manual/faq.rst
index bdac21a622..64da7cd7ef 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -776,6 +776,29 @@ The only way to find the culprit is to eliminate the programs one by one and
 see which one is causing the issue. Basically, stop a program, run calibre,
 check for crashes. If they still happen, stop another program and repeat.
 
+
+Using the viewer or doing any conversions results in a permission denied error on windows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Something on your computer is preventing calibre from accessing its own
+temporary files. Most likely the permissions on your Temp folder are incorrect.
+Go to the folder file:`C:\\Users\\USERNAME\\AppData\\Local` in Windows
+Explorer and then right click on the file:`Temp` folder, select Properties and go to
+the Security tab. Make sure that your user account has full control for this
+folder.
+
+Some users have reported that running the following command in an Administrator
+Command Prompt fixed their permissions.  To get an Administrator Command Prompt
+search for cmd.exe in the start menu, then right click on the command prompt
+entry and select Run as Administrator::
+    icacls "%appdata%\..\Local\Temp" /reset /T
+
+Alternately, you can run calibre as Administrator, but doing so will cause
+some functionality, such as drag and drop to not work.
+
+Finally, some users have reported that disabling UAC fixes the problem.
+
+
 |app| is not starting on OS X?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From a8deb4b1f8dfb768a32b95b1540be32d5d6e871e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 8 Jul 2013 10:30:34 +0530
Subject: [PATCH 0119/1154] Ignore type errors when sorting device collections

Invalid data in the device database on sony readers could cause errors
when sorting device collections, ignore those errors.
---
 src/calibre/devices/usbms/books.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py
index bbbb3938ac..5254a814be 100644
--- a/src/calibre/devices/usbms/books.py
+++ b/src/calibre/devices/usbms/books.py
@@ -283,11 +283,17 @@ class CollectionsBookList(BookList):
                 return -1
             if isinstance(x, basestring) and isinstance(y, basestring):
                 x, y = sort_key(force_unicode(x)), sort_key(force_unicode(y))
-            c = cmp(x, y)
+            try:
+                c = cmp(x, y)
+            except TypeError:
+                c = 0
             if c != 0:
                 return c
             # same as above -- no sort_key needed here
-            return cmp(xx[2], yy[2])
+            try:
+                return cmp(xx[2], yy[2])
+            except TypeError:
+                return 0
 
         for category, lpaths in collections.items():
             books = lpaths.values()

From fae8aa1405279b630456880f0689f2eece115154 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 8 Jul 2013 11:32:40 +0530
Subject: [PATCH 0120/1154] Dont change into temp dir when downloading single
 covers

Works around the problem with temp dir permissions on some windows
computers.
---
 src/calibre/ebooks/metadata/sources/worker.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/worker.py b/src/calibre/ebooks/metadata/sources/worker.py
index 51fb883e7d..1c83f965e1 100644
--- a/src/calibre/ebooks/metadata/sources/worker.py
+++ b/src/calibre/ebooks/metadata/sources/worker.py
@@ -106,7 +106,6 @@ def single_identify(title, authors, identifiers):
         r in results], dump_caches(), log.dump()
 
 def single_covers(title, authors, identifiers, caches, tdir):
-    os.chdir(tdir)
     load_caches(caches)
     log = GUILog()
     results = Queue()
@@ -126,9 +125,9 @@ def single_covers(title, authors, identifiers, caches, tdir):
                 name += '{%d}'%c[plugin.name]
                 c[plugin.name] += 1
             name = '%s,,%s,,%s,,%s.cover'%(name, width, height, fmt)
-            with open(name, 'wb') as f:
+            with open(os.path.join(tdir, name), 'wb') as f:
                 f.write(data)
-            os.mkdir(name+'.done')
+            os.mkdir(os.path.join(tdir, name+'.done'))
 
     return log.dump()
 

From 3a9fa00032fd8dca84848fcc979a5f97f8def534 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 8 Jul 2013 12:24:39 +0530
Subject: [PATCH 0121/1154] Try to automatically fix temp folder permissions on
 windows

---
 manual/faq.rst                      |  4 +++-
 src/calibre/__init__.py             | 12 ++++++++++--
 src/calibre/customize/conversion.py |  2 +-
 src/calibre/ptempfile.py            | 13 +++++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index 64da7cd7ef..e5a6342cf8 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -790,7 +790,9 @@ folder.
 Some users have reported that running the following command in an Administrator
 Command Prompt fixed their permissions.  To get an Administrator Command Prompt
 search for cmd.exe in the start menu, then right click on the command prompt
-entry and select Run as Administrator::
+entry and select Run as Administrator. At the command prompt type the following
+command and press Enter::
+
     icacls "%appdata%\..\Local\Temp" /reset /T
 
 Alternately, you can run calibre as Administrator, but doing so will cause
diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 07ad906247..5d938ecc55 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -436,13 +436,21 @@ def fit_image(width, height, pwidth, pheight):
 
 class CurrentDir(object):
 
-    def __init__(self, path):
+    def __init__(self, path, workaround_temp_folder_permissions=False):
         self.path = path
         self.cwd = None
+        self.workaround_temp_folder_permissions = workaround_temp_folder_permissions
 
     def __enter__(self, *args):
         self.cwd = os.getcwdu()
-        os.chdir(self.path)
+        try:
+            os.chdir(self.path)
+        except OSError:
+            if not self.workaround_temp_folder_permissions:
+                raise
+            from calibre.ptempfile import reset_temp_folder_permissions
+            reset_temp_folder_permissions()
+            os.chdir(self.path)
         return self.cwd
 
     def __exit__(self, *args):
diff --git a/src/calibre/customize/conversion.py b/src/calibre/customize/conversion.py
index 38ffcef71f..9a7ed0d24c 100644
--- a/src/calibre/customize/conversion.py
+++ b/src/calibre/customize/conversion.py
@@ -233,7 +233,7 @@ class InputFormatPlugin(Plugin):
             # In case stdout is broken
             pass
 
-        with CurrentDir(output_dir):
+        with CurrentDir(output_dir, workaround_temp_folder_permissions=True):
             for x in os.listdir('.'):
                 shutil.rmtree(x) if os.path.isdir(x) else os.remove(x)
 
diff --git a/src/calibre/ptempfile.py b/src/calibre/ptempfile.py
index 96271fbeaf..f3816f766b 100644
--- a/src/calibre/ptempfile.py
+++ b/src/calibre/ptempfile.py
@@ -34,6 +34,19 @@ def app_prefix(prefix):
         return '%s_'%__appname__
     return '%s_%s_%s'%(__appname__, __version__, prefix)
 
+def reset_temp_folder_permissions():
+    # There are some broken windows installs where the permissions for the temp
+    # folder are set to not be executable, which means chdir() into temp
+    # folders fails. Try to fix that by resetting the permissions on the temp
+    # folder.
+    global _base_dir
+    if iswindows and _base_dir:
+        import subprocess
+        from calibre import prints
+        parent = os.path.dirname(_base_dir)
+        retcode = subprocess.Popen(['icacls.exe', parent, '/reset', '/Q', '/T']).wait()
+        prints('Trying to reset permissions of temp folder', parent, 'return code:', retcode)
+
 def base_dir():
     global _base_dir
     if _base_dir is not None and not os.path.exists(_base_dir):

From af3d990264298697d907769e3e1a2ac777aa4921 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 8 Jul 2013 12:52:51 +0530
Subject: [PATCH 0122/1154] Edelweiss: Workaround broken advanced search

Edelweiss metadata download plugin: Workaround for advanced search being
broken at the Edelweiss website.
---
 .../ebooks/metadata/sources/edelweiss.py      | 59 +++++++++++++++----
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/edelweiss.py b/src/calibre/ebooks/metadata/sources/edelweiss.py
index 27fd296503..fab0b2017d 100644
--- a/src/calibre/ebooks/metadata/sources/edelweiss.py
+++ b/src/calibre/ebooks/metadata/sources/edelweiss.py
@@ -34,7 +34,7 @@ def astext(node):
     return etree.tostring(node, method='text', encoding=unicode,
                           with_tail=False).strip()
 
-class Worker(Thread): # {{{
+class Worker(Thread):  # {{{
 
     def __init__(self, sku, url, relevance, result_queue, br, timeout, log, plugin):
         Thread.__init__(self)
@@ -154,8 +154,8 @@ class Worker(Thread): # {{{
         # remove all attributes from tags
         desc = re.sub(r'<([a-zA-Z0-9]+)\s[^>]+>', r'<\1>', desc)
         # Collapse whitespace
-        #desc = re.sub('\n+', '\n', desc)
-        #desc = re.sub(' +', ' ', desc)
+        # desc = re.sub('\n+', '\n', desc)
+        # desc = re.sub(' +', ' ', desc)
         # Remove comments
         desc = re.sub(r'(?s)<!--.*?-->', '', desc)
         return sanitize_comments_html(desc)
@@ -183,14 +183,14 @@ class Edelweiss(Source):
         if sku:
             return 'http://edelweiss.abovethetreeline.com/ProductDetailPage.aspx?sku=%s'%sku
 
-    def get_book_url(self, identifiers): # {{{
+    def get_book_url(self, identifiers):  # {{{
         sku = identifiers.get('edelweiss', None)
         if sku:
             return 'edelweiss', sku, self._get_book_url(sku)
 
     # }}}
 
-    def get_cached_cover_url(self, identifiers): # {{{
+    def get_cached_cover_url(self, identifiers):  # {{{
         sku = identifiers.get('edelweiss', None)
         if not sku:
             isbn = identifiers.get('isbn', None)
@@ -199,7 +199,7 @@ class Edelweiss(Source):
         return self.cached_identifier_to_cover_url(sku)
     # }}}
 
-    def create_query(self, log, title=None, authors=None, identifiers={}): # {{{
+    def create_query(self, log, title=None, authors=None, identifiers={}):  # {{{
         from urllib import urlencode
         BASE_URL = 'http://edelweiss.abovethetreeline.com/CatalogOverview.aspx?'
         params = {
@@ -239,9 +239,40 @@ class Edelweiss(Source):
                 params[k] = v.encode('utf-8')
 
         return BASE_URL+urlencode(params)
+
+    def create_query2(self, log, title=None, authors=None, identifiers={}):
+        ''' The edelweiss advanced search appears to be broken, use the keyword search instead, until it is fixed. '''
+        from urllib import urlencode
+        BASE_URL = 'http://edelweiss.abovethetreeline.com/CatalogOverview.aspx?'
+        params = {
+            'group':'search',
+            'section':'CatalogOverview',
+            'searchType':1,
+            'searchOrgID':'',
+            'searchCatalogID': '',
+            'searchMailingID': '',
+            'searchSelect':1,
+        }
+        keywords = []
+        isbn = check_isbn(identifiers.get('isbn', None))
+        if isbn is not None:
+            keywords.append(isbn)
+        elif title or authors:
+            title_tokens = list(self.get_title_tokens(title))
+            if title_tokens:
+                keywords.extend(title_tokens)
+            author_tokens = self.get_author_tokens(authors,
+                    only_first_author=True)
+            if author_tokens:
+                keywords.extend(author_tokens)
+        if not keywords:
+            return None
+        params['keywords'] = (' '.join(keywords)).encode('utf-8')
+        return BASE_URL+urlencode(params)
+
     # }}}
 
-    def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
+    def identify(self, log, result_queue, abort, title=None, authors=None,  # {{{
             identifiers={}, timeout=30):
         from urlparse import parse_qs
 
@@ -251,11 +282,12 @@ class Edelweiss(Source):
             entries = [(book_url, identifiers['edelweiss'])]
         else:
             entries = []
-            query = self.create_query(log, title=title, authors=authors,
+            query = self.create_query2(log, title=title, authors=authors,
                     identifiers=identifiers)
             if not query:
                 log.error('Insufficient metadata to construct query')
                 return
+            log('Using query URL:', query)
             try:
                 raw = br.open_novisit(query, timeout=timeout).read()
             except Exception as e:
@@ -270,7 +302,8 @@ class Edelweiss(Source):
 
             for entry in CSSSelect('div.listRow div.listRowMain')(root):
                 a = entry.xpath('descendant::a[contains(@href, "sku=") and contains(@href, "ProductDetailPage.aspx")]')
-                if not a: continue
+                if not a:
+                    continue
                 href = a[0].get('href')
                 prefix, qs = href.partition('?')[0::2]
                 sku = parse_qs(qs).get('sku', None)
@@ -288,7 +321,7 @@ class Edelweiss(Source):
 
                     div = CSSSelect('div.format.attGroup')(entry)
                     text = astext(div[0]).lower()
-                    if 'audio' in text or 'mp3' in text: # Audio-book, ignore
+                    if 'audio' in text or 'mp3' in text:  # Audio-book, ignore
                         continue
                     entries.append((self._get_book_url(sku), sku))
 
@@ -321,7 +354,7 @@ class Edelweiss(Source):
 
     # }}}
 
-    def download_cover(self, log, result_queue, abort, # {{{
+    def download_cover(self, log, result_queue, abort,  # {{{
             title=None, authors=None, identifiers={}, timeout=30, get_best_cover=False):
         cached_url = self.get_cached_cover_url(identifiers)
         if cached_url is None:
@@ -381,7 +414,7 @@ if __name__ == '__main__':
 
         ),
 
-        ( # Pubdate
+        (  # Pubdate
          {'title':'The Great Gatsby', 'authors':['F. Scott Fitzgerald']},
             [title_test('The great gatsby', exact=True),
                 authors_test(['F. Scott Fitzgerald']), pubdate_test(2004, 9, 29)]
@@ -395,3 +428,5 @@ if __name__ == '__main__':
     test_identify_plugin(Edelweiss.name, tests)
 
 
+
+

From c4cb0e445e9d2dc438f878cbe7590ff060b7c9c4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 8 Jul 2013 15:56:09 +0530
Subject: [PATCH 0123/1154] Update amazon metadata download plugin for website
 changes

Amazon metadata download: Update plugin to deal with the new amazon.com
website
---
 src/calibre/ebooks/metadata/sources/amazon.py | 144 +++++++++++++-----
 1 file changed, 104 insertions(+), 40 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index eb9e5a18cc..028bad6922 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -19,6 +19,11 @@ from calibre.ebooks.metadata.sources.base import (Source, Option, fixcase,
 from calibre.ebooks.metadata.book.base import Metadata
 from calibre.utils.localization import canonicalize_lang
 
+def CSSSelect(expr):
+    from cssselect import HTMLTranslator
+    from lxml.etree import XPath
+    return XPath(HTMLTranslator().css_to_xpath(expr))
+
 class Worker(Thread):  # Get details {{{
 
     '''
@@ -142,6 +147,8 @@ class Worker(Thread):  # Get details {{{
                     starts-with(text(), "Editora:") or \
                     starts-with(text(), "出版社:")]
             '''
+        self.publisher_names = {'Publisher', 'Verlag', 'Editore', 'Editeur', 'Editor', 'Editora', '出版社'}
+
         self.language_xpath =    '''
             descendant::*[
                 starts-with(text(), "Language:") \
@@ -153,6 +160,7 @@ class Worker(Thread):  # Get details {{{
                 or starts-with(text(), "言語") \
                 ]
             '''
+        self.language_names = {'Language', 'Sprache', 'Lingua', 'Idioma', 'Langue', '言語'}
 
         self.ratings_pat = re.compile(
             r'([0-9.]+) ?(out of|von|su|étoiles sur|つ星のうち|de un máximo de|de) ([\d\.]+)( (stars|Sternen|stelle|estrellas|estrelas)){0,1}')
@@ -310,36 +318,44 @@ class Worker(Thread):  # Get details {{{
             self.log.exception('Error parsing cover for url: %r'%self.url)
         mi.has_cover = bool(self.cover_url)
 
-        pd = root.xpath(self.pd_xpath)
-        if pd:
-            pd = pd[0]
-
+        non_hero = CSSSelect('div#bookDetails_container_div div#nonHeroSection')(root)
+        if non_hero:
+            # New style markup
             try:
-                isbn = self.parse_isbn(pd)
-                if isbn:
-                    self.isbn = mi.isbn = isbn
+                self.parse_new_details(root, mi, non_hero[0])
             except:
-                self.log.exception('Error parsing ISBN for url: %r'%self.url)
-
-            try:
-                mi.publisher = self.parse_publisher(pd)
-            except:
-                self.log.exception('Error parsing publisher for url: %r'%self.url)
-
-            try:
-                mi.pubdate = self.parse_pubdate(pd)
-            except:
-                self.log.exception('Error parsing publish date for url: %r'%self.url)
-
-            try:
-                lang = self.parse_language(pd)
-                if lang:
-                    mi.language = lang
-            except:
-                self.log.exception('Error parsing language for url: %r'%self.url)
-
+                self.log.exception('Failed to parse new-style book details section')
         else:
-            self.log.warning('Failed to find product description for url: %r'%self.url)
+            pd = root.xpath(self.pd_xpath)
+            if pd:
+                pd = pd[0]
+
+                try:
+                    isbn = self.parse_isbn(pd)
+                    if isbn:
+                        self.isbn = mi.isbn = isbn
+                except:
+                    self.log.exception('Error parsing ISBN for url: %r'%self.url)
+
+                try:
+                    mi.publisher = self.parse_publisher(pd)
+                except:
+                    self.log.exception('Error parsing publisher for url: %r'%self.url)
+
+                try:
+                    mi.pubdate = self.parse_pubdate(pd)
+                except:
+                    self.log.exception('Error parsing publish date for url: %r'%self.url)
+
+                try:
+                    lang = self.parse_language(pd)
+                    if lang:
+                        mi.language = lang
+                except:
+                    self.log.exception('Error parsing language for url: %r'%self.url)
+
+            else:
+                self.log.warning('Failed to find product description for url: %r'%self.url)
 
         mi.source_relevance = self.relevance
 
@@ -359,7 +375,13 @@ class Worker(Thread):  # Get details {{{
         for l in link:
             return l.get('href').rpartition('/')[-1]
 
+    def totext(self, elem):
+        return self.tostring(elem, encoding=unicode, method='text').strip()
+
     def parse_title(self, root):
+        h1 = root.xpath('//h1[@id="title"]')
+        if h1:
+            return self.totext(h1[0])
         tdiv = root.xpath('//h1[contains(@class, "parseasinTitle")]')[0]
         actual_title = tdiv.xpath('descendant::*[@id="btAsinTitle"]')
         if actual_title:
@@ -373,6 +395,11 @@ class Worker(Thread):  # Get details {{{
         return ans
 
     def parse_authors(self, root):
+        matches = CSSSelect('#byline .author .contributorNameID')(root)
+        if matches:
+            authors = [self.totext(x) for x in matches]
+            return [a for a in authors if a]
+
         x = '//h1[contains(@class, "parseasinTitle")]/following-sibling::span/*[(name()="a" and @href) or (name()="span" and @class="contributorNameTrigger")]'
         aname = root.xpath(x)
         if not aname:
@@ -420,8 +447,8 @@ class Worker(Thread):  # Get details {{{
         # remove all attributes from tags
         desc = re.sub(r'<([a-zA-Z0-9]+)\s[^>]+>', r'<\1>', desc)
         # Collapse whitespace
-        #desc = re.sub('\n+', '\n', desc)
-        #desc = re.sub(' +', ' ', desc)
+        # desc = re.sub('\n+', '\n', desc)
+        # desc = re.sub(' +', ' ', desc)
         # Remove the notice about text referring to out of print editions
         desc = re.sub(r'(?s)<em>--This text ref.*?</em>', '', desc)
         # Remove comments
@@ -429,6 +456,17 @@ class Worker(Thread):  # Get details {{{
         return sanitize_comments_html(desc)
 
     def parse_comments(self, root):
+        ns = CSSSelect('#bookDescription_feature_div noscript')(root)
+        if ns:
+            ns = ns[0]
+            if len(ns) == 0 and ns.text:
+                import html5lib
+                # html5lib parsed noscript as CDATA
+                ns = html5lib.parseFragment('<div>%s</div>' % (ns.text), treebuilder='lxml', namespaceHTMLElements=False)[0]
+            else:
+                ns.tag = 'div'
+            return self._render_comments(ns)
+
         ans = ''
         desc = root.xpath('//div[@id="ps-content"]/div[@class="content"]')
         if desc:
@@ -472,6 +510,37 @@ class Worker(Thread):  # Get details {{{
                         bn = re.sub(r'\.\.jpg$', '.jpg', (sparts[0] + sparts[-1]))
                         return ('/'.join(parts[:-1]))+'/'+bn
 
+    def parse_new_details(self, root, mi, non_hero):
+        table = non_hero.xpath('descendant::table')[0]
+        for tr in table.xpath('descendant::tr'):
+            cells = tr.xpath('descendant::td')
+            if len(cells) == 2:
+                name = self.totext(cells[0])
+                val = self.totext(cells[1])
+                if not val:
+                    continue
+                if name in self.language_names:
+                    ans = self.lang_map.get(val, None)
+                    if not ans:
+                        ans = canonicalize_lang(val)
+                    if ans:
+                        mi.language = ans
+                elif name in self.publisher_names:
+                    pub = val.partition(';')[0].partition('(')[0].strip()
+                    if pub:
+                        mi.publisher = pub
+                    date = val.rpartition('(')[-1].replace(')', '').strip()
+                    try:
+                        from calibre.utils.date import parse_only_date
+                        date = self.delocalize_datestr(date)
+                        mi.pubdate = parse_only_date(date, assume_utc=True)
+                    except:
+                        self.log.exception('Failed to parse pubdate: %s' % val)
+                elif name in {'ISBN', 'ISBN-10', 'ISBN-13'}:
+                    ans = check_isbn(val)
+                    if ans:
+                        self.isbn = mi.isbn = ans
+
     def parse_isbn(self, pd):
         items = pd.xpath(
             'descendant::*[starts-with(text(), "ISBN")]')
@@ -721,9 +790,9 @@ class Amazon(Source):
 
         def title_ok(title):
             title = title.lower()
-            bad = ['bulk pack', '[audiobook]', '[audio cd]']
+            bad = ['bulk pack', '[audiobook]', '[audio cd]', '(a book companion)', '( slipcase with door )']
             if self.domain == 'com':
-                bad.append('(spanish edition)')
+                bad.extend(['(%s edition)' % x for x in ('spanish', 'german')])
             for x in bad:
                 if x in title:
                     return False
@@ -901,14 +970,9 @@ if __name__ == '__main__':  # tests {{{
     # To run these test use: calibre-debug -e
     # src/calibre/ebooks/metadata/sources/amazon.py
     from calibre.ebooks.metadata.sources.test import (test_identify_plugin,
-            isbn_test, title_test, authors_test, comments_test, series_test)
+            isbn_test, title_test, authors_test, comments_test)
     com_tests = [  # {{{
 
-            (  # Has a spanish edition
-             {'title':'11/22/63'},
-             [title_test('11/22/63: A Novel', exact=True), authors_test(['Stephen King']),]
-             ),
-
             (  # + in title and uses id="main-image" for cover
              {'title':'C++ Concurrency in Action'},
              [title_test('C++ Concurrency in Action: Practical Multithreading',
@@ -916,11 +980,10 @@ if __name__ == '__main__':  # tests {{{
               ]
              ),
 
-            (  # Series
+            (  # noscript description
                 {'identifiers':{'amazon':'0756407117'}},
                 [title_test(
-                "Throne of the Crescent Moon",
-                exact=True), series_test('Crescent Moon Kingdoms', 1),
+                "Throne of the Crescent Moon"),
                 comments_test('Makhslood'),
                 ]
             ),
@@ -1054,3 +1117,4 @@ if __name__ == '__main__':  # tests {{{
 
 # }}}
 
+

From a94539c32b4f2d3a359f733ee0a277af72c8c8ff Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 14:44:46 +0530
Subject: [PATCH 0124/1154] jsbrowser: Fix handling of html with non lxml safe
 chars

---
 src/calibre/web/fetch/javascript.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/web/fetch/javascript.py b/src/calibre/web/fetch/javascript.py
index 6e9ef86ff1..d7dfcf0a6a 100644
--- a/src/calibre/web/fetch/javascript.py
+++ b/src/calibre/web/fetch/javascript.py
@@ -145,8 +145,11 @@ def download_resources(browser, resource_cache, output_dir):
             elem.removeFromDocument()
 
 def save_html(browser, output_dir, postprocess_html, url, recursion_level):
-    html = strip_encoding_declarations(browser.html)
     import html5lib
+    from calibre.utils.cleantext import clean_xml_chars
+    html = strip_encoding_declarations(browser.html)
+    if isinstance(html, unicode):
+        html = clean_xml_chars(html)
     root = html5lib.parse(html, treebuilder='lxml', namespaceHTMLElements=False).getroot()
     root = postprocess_html(root, url, recursion_level)
     if root is None:

From bba659b852ded2b2e026eb0be58c67b0862cda6f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 14:53:40 +0530
Subject: [PATCH 0125/1154] Add a check for modern WebKit

---
 src/calibre/constants.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 99146e206c..5c9ecbc832 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -282,3 +282,8 @@ def get_windows_user_locale_name():
         return None
     return u'_'.join(buf.value.split(u'-')[:2])
 
+def is_modern_webkit():
+    # Check if we are using QtWebKit >= 2.3
+    from PyQt4.QtWebKit import qWebKitMajorVersion
+    return qWebKitMajorVersion() >= 537
+

From ed55e76ff4557c4c3558b28b6dcf29c452d9e9e1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 15:45:20 +0530
Subject: [PATCH 0126/1154] Update cracked.com

---
 recipes/cracked_com.recipe | 68 +++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/recipes/cracked_com.recipe b/recipes/cracked_com.recipe
index 829299ae17..a702f93433 100644
--- a/recipes/cracked_com.recipe
+++ b/recipes/cracked_com.recipe
@@ -1,63 +1,55 @@
 from calibre.web.feeds.news import BasicNewsRecipe
 
-class Cracked(BasicNewsRecipe):
-    title                 = u'Cracked.com'
-    __author__            = 'UnWeave'
-    language              = 'en'
-    description           = "America's Only HumorSite since 1958"
-    publisher             = 'Cracked'
-    category              = 'comedy, lists'
-    oldest_article        = 3 #days
-    max_articles_per_feed = 100
-    no_stylesheets        = True
-    encoding              = 'ascii'
-    remove_javascript     = True
-    use_embedded_content  = False
 
-    feeds = [ (u'Articles', u'http://feeds.feedburner.com/CrackedRSS/') ]
+class Cracked(BasicNewsRecipe):
+    title = u'Cracked.com'
+    __author__ = 'UnWeave'
+    language = 'en'
+    description = "America's Only HumorSite since 1958"
+    publisher = 'Cracked'
+    category = 'comedy, lists'
+    oldest_article = 3  # days
+    max_articles_per_feed = 100
+    no_stylesheets = True
+    encoding = 'ascii'
+    remove_javascript = True
+    use_embedded_content = False
+    # auto_cleanup = True
+
+    feeds = [(u'Articles', u'http://feeds.feedburner.com/CrackedRSS/')]
 
     conversion_options = {
-                          'comment'   : description
-                        , 'tags'      : category
-                        , 'publisher' : publisher
-                        , 'language'  : language
-                        }
+        'comment': description, 'tags': category, 'publisher': publisher, 'language': language
+    }
 
-    remove_tags_before = dict(id='PrimaryContent')
+    # remove_tags_before = dict(id='PrimaryContent')
 
-    remove_tags_after = dict(name='div', attrs={'class':'shareBar'})
+    keep_only_tags = dict(name='article', attrs={
+                          'class': 'module article dropShadowBottomCurved'})
 
-    remove_tags = [ dict(name='div', attrs={'class':['social',
-                                                     'FacebookLike',
-                                                     'shareBar'
-                                                     ]}),
+    # remove_tags_after = dict(name='div', attrs={'class':'shareBar'})
 
-                    dict(name='div', attrs={'id':['inline-share-buttons',
-                                                  ]}),
-
-                    dict(name='span', attrs={'class':['views',
-                                                      'KonaFilter'
-                                                      ]}),
-                    #dict(name='img'),
-                    ]
+    remove_tags = [
+        dict(name='section', attrs={'class': ['socialTools', 'quickFixModule']})]
 
     def appendPage(self, soup, appendTag, position):
         # Check if article has multiple pages
-        pageNav = soup.find('nav', attrs={'class':'PaginationContent'})
+        pageNav = soup.find('nav', attrs={'class': 'PaginationContent'})
         if pageNav:
             # Check not at last page
-            nextPage = pageNav.find('a', attrs={'class':'next'})
+            nextPage = pageNav.find('a', attrs={'class': 'next'})
             if nextPage:
                 nextPageURL = nextPage['href']
                 nextPageSoup = self.index_to_soup(nextPageURL)
                 # 8th <section> tag contains article content
-                nextPageContent = nextPageSoup.findAll('section')[7]
+                nextPageContent = nextPageSoup.findAll('article')[0]
                 newPosition = len(nextPageContent.contents)
-                self.appendPage(nextPageSoup,nextPageContent,newPosition)
+                self.appendPage(nextPageSoup, nextPageContent, newPosition)
                 nextPageContent.extract()
                 pageNav.extract()
-                appendTag.insert(position,nextPageContent)
+                appendTag.insert(position, nextPageContent)
 
     def preprocess_html(self, soup):
         self.appendPage(soup, soup.body, 3)
         return soup
+

From 26f86ca98741327da50c377a7ec4c09280a81949 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 16:54:11 +0530
Subject: [PATCH 0127/1154] jsbrowser(): Fix typo causing some images to not be
 downloaded

Fixes images missing in the Time recipe
---
 src/calibre/web/jsbrowser/browser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/web/jsbrowser/browser.py b/src/calibre/web/jsbrowser/browser.py
index 104347bfb2..387b149bb9 100644
--- a/src/calibre/web/jsbrowser/browser.py
+++ b/src/calibre/web/jsbrowser/browser.py
@@ -571,7 +571,7 @@ class Browser(QObject, FormsMixin):
                     ans[url] = raw
                     urls.discard(url)
 
-        while urls and time.time() - start_time > timeout and self.page.ready_state not in {'complete', 'completed'}:
+        while urls and time.time() - start_time < timeout and self.page.ready_state not in {'complete', 'completed'}:
             get_resources()
             if urls:
                 self.run_for_a_time(0.1)

From 03041f925e288b081c5868e163e7d670878ba1fc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 17:33:28 +0530
Subject: [PATCH 0128/1154] Tweak to restrict list of output formats

Add a tweak to restrict the list of output formats available in the
conversion dialog. Go to Preferences->Tweaks to change it.
---
 resources/default_tweaks.py        |  7 +++++++
 src/calibre/gui2/convert/bulk.py   | 15 ++++++---------
 src/calibre/gui2/convert/single.py | 22 +++++++++++++++++-----
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index a0e8fafd0f..d8e158f842 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -537,3 +537,10 @@ many_libraries = 10
 # highlight with this tweak. Set it to 'transparent' to disable highlighting.
 highlight_virtual_library = 'yellow'
 
+#: Choose available output formats for conversion
+# Restrict the list of available output formats in the conversion dialogs.
+# For example, if you only want to convert to EPUB and AZW3, change this to
+# restrict_output_formats = ['EPUB', 'AZW3']. The default value of None causes
+# all available output formats to be present.
+restrict_output_formats = None
+
diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py
index b1c3de122b..91efc73ca9 100644
--- a/src/calibre/gui2/convert/bulk.py
+++ b/src/calibre/gui2/convert/bulk.py
@@ -9,8 +9,7 @@ import shutil
 from PyQt4.Qt import QString, SIGNAL
 
 from calibre.gui2.convert.single import (Config, sort_formats_by_preference,
-    GroupModel, gprefs)
-from calibre.customize.ui import available_output_formats
+    GroupModel, gprefs, get_output_formats)
 from calibre.gui2 import ResizableDialog
 from calibre.gui2.convert.look_and_feel import LookAndFeelWidget
 from calibre.gui2.convert.heuristics import HeuristicsWidget
@@ -43,7 +42,6 @@ class BulkConfig(Config):
             'values saved in a previous conversion (if they exist) instead '
             'of using the defaults specified in the Preferences'))
 
-
         self.connect(self.output_formats, SIGNAL('currentIndexChanged(QString)'),
                 self.setup_pipeline)
         self.connect(self.groups, SIGNAL('activated(QModelIndex)'),
@@ -96,7 +94,8 @@ class BulkConfig(Config):
 
         while True:
             c = self.stack.currentWidget()
-            if not c: break
+            if not c:
+                break
             self.stack.removeWidget(c)
 
         widgets = [lf, hw, ps, sd, toc, sr]
@@ -118,17 +117,14 @@ class BulkConfig(Config):
         except:
             pass
 
-
     def setup_output_formats(self, db, preferred_output_format):
         if preferred_output_format:
             preferred_output_format = preferred_output_format.lower()
-        output_formats = sorted(available_output_formats(),
-                key=lambda x:{'EPUB':'!A', 'MOBI':'!B'}.get(x.upper(), x))
-        output_formats.remove('oeb')
+        output_formats = get_output_formats(preferred_output_format)
         preferred_output_format = preferred_output_format if \
             preferred_output_format and preferred_output_format \
             in output_formats else sort_formats_by_preference(output_formats,
-                    prefs['output_format'])[0]
+                    [prefs['output_format']])[0]
         self.output_formats.addItems(list(map(QString, [x.upper() for x in
             output_formats])))
         self.output_formats.setCurrentIndex(output_formats.index(preferred_output_format))
@@ -149,3 +145,4 @@ class BulkConfig(Config):
                 bytearray(self.saveGeometry())
         return ResizableDialog.done(self, r)
 
+
diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py
index 1a915288a8..e8342610dd 100644
--- a/src/calibre/gui2/convert/single.py
+++ b/src/calibre/gui2/convert/single.py
@@ -29,7 +29,7 @@ from calibre.ebooks.conversion.plumber import (Plumber,
 from calibre.ebooks.conversion.config import delete_specifics
 from calibre.customize.ui import available_output_formats
 from calibre.customize.conversion import OptionRecommendation
-from calibre.utils.config import prefs
+from calibre.utils.config import prefs, tweaks
 from calibre.utils.logging import Log
 
 class NoSupportedInputFormats(Exception):
@@ -48,6 +48,20 @@ def sort_formats_by_preference(formats, prefs):
         return len(prefs)
     return sorted(formats, key=key)
 
+def get_output_formats(preferred_output_format):
+    all_formats = {x.upper() for x in available_output_formats()}
+    all_formats.discard('OEB')
+    pfo = preferred_output_format.upper() if preferred_output_format else ''
+    restrict = tweaks['restrict_output_formats']
+    if restrict:
+        fmts = [x.upper() for x in restrict]
+        if pfo and pfo not in fmts and pfo in all_formats:
+            fmts.append(pfo)
+    else:
+        fmts = list(sorted(all_formats,
+                key=lambda x:{'EPUB':'!A', 'MOBI':'!B'}.get(x.upper(), x)))
+    return fmts
+
 class GroupModel(QAbstractListModel):
 
     def __init__(self, widgets):
@@ -239,15 +253,13 @@ class Config(ResizableDialog, Ui_Dialog):
             preferred_output_format):
         if preferred_output_format:
             preferred_output_format = preferred_output_format.lower()
-        output_formats = sorted(available_output_formats(),
-                key=lambda x:{'EPUB':'!A', 'MOBI':'!B'}.get(x.upper(), x))
-        output_formats.remove('oeb')
+        output_formats = get_output_formats(preferred_output_format)
         input_format, input_formats = get_input_format_for_book(db, book_id,
                 preferred_input_format)
         preferred_output_format = preferred_output_format if \
             preferred_output_format in output_formats else \
             sort_formats_by_preference(output_formats,
-                    prefs['output_format'])[0]
+                    [prefs['output_format']])[0]
         self.input_formats.addItems(list(map(QString, [x.upper() for x in
             input_formats])))
         self.output_formats.addItems(list(map(QString, [x.upper() for x in

From dca69aa470dd84d1967146e1f854b3313eb3a4a1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 17:50:04 +0530
Subject: [PATCH 0129/1154] Confirm format override when add files to book

When adding formats to an existing book, ask for confirmation if some
formats will be overwritten.
---
 src/calibre/gui2/actions/add.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index 4071ad1468..c5a778f965 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -110,6 +110,19 @@ class AddAction(InterfaceAction):
             return
 
         db = view.model().db
+        if len(ids) == 1:
+            formats = db.formats(ids[0], index_is_id=True)
+            if formats:
+                formats = {x.upper() for x in formats.split(',')}
+                nformats = {f.rpartition('.')[-1].upper() for f in books}
+                override = formats.intersection(nformats)
+                if override:
+                    title = db.title(ids[0], index_is_id=True)
+                    msg = _('The {0} format(s) will be replaced in the book {1}. Are you sure?').format(
+                        ', '.join(override), title)
+                    if not confirm(msg, 'confirm_format_override_on_add', title=_('Are you sure'), parent=self.gui):
+                        return
+
         for id_ in ids:
             for fpath in books:
                 fmt = os.path.splitext(fpath)[1][1:].upper()

From 2544d48fbeb68f46b5f9009a818c254ef7881a59 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 19:00:16 +0530
Subject: [PATCH 0130/1154] A bit of formatting

---
 manual/conversion.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/manual/conversion.rst b/manual/conversion.rst
index c693d0be15..2387fe915a 100644
--- a/manual/conversion.rst
+++ b/manual/conversion.rst
@@ -772,9 +772,11 @@ size. By default, |app| uses a page size defined by the current
 :guilabel:`Output profile`. So if your output profile is set to Kindle, |app|
 will create a PDF with page size suitable for viewing on the small kindle
 screen. However, if you view this PDF file on a computer screen, then it will
-appear to have too large fonts. To create "normal" sized PDFs, use the override
-page size option under :guilabel:`PDF Output` in the conversion dialog.
+appear to have too large fonts. To create "normal" sized PDFs, use the
+:guilabel:`Override page size` option under :guilabel:`PDF Output` in the conversion dialog.
 
+Headers and Footers
+^^^^^^^^^^^^^^^^^^^^
 You can insert arbitrary headers and footers on each page of the PDF by
 specifying header and footer templates. Templates are just snippets of HTML
 code that get rendered in the header and footer locations. For example, to
@@ -813,6 +815,9 @@ the page will be used.
     bottom margins to large enough values, under the Page Setup section of the
     conversion dialog.
 
+Printable Table of Contents
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 You can also insert a printable Table of Contents at the end of the PDF that
 lists the page numbers for every section. This is very useful if you intend to
 print out the PDF to paper. If you wish to use the PDF on an electronic device,

From 135a0420b11369a75cbd66a31073e0d9ce5f418d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 21:08:27 +0530
Subject: [PATCH 0131/1154] Driver for Coby Kyros MID1126

Fixes #1199410 [Unrecognized device Coby Kyros MID1126](https://bugs.launchpad.net/calibre/+bug/1199410)
---
 src/calibre/devices/android/driver.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 31b60389ad..1880324fdc 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -107,7 +107,7 @@ class ANDROID(USBMS):
                 0x0ff9 : [0x0226],
                 0xc91  : HTC_BCDS,
                 0xdddd : [0x216],
-                0xdeed : [0x231],
+                0xdeed : [0x231, 0x226],
             },
 
             # Samsung
@@ -241,7 +241,7 @@ class ANDROID(USBMS):
             'S5830I_CARD', 'MID7042', 'LINK-CREATE', '7035', 'VIEWPAD_7E',
             'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS',
             'ICS', 'E400', '__FILE-STOR_GADG', 'ST80208-1', 'GT-S5660M_CARD', 'XT894', '_USB',
-            'PROD_TAB13-201', 'URFPAD2',
+            'PROD_TAB13-201', 'URFPAD2', 'MID1126',
     ]
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
@@ -254,7 +254,7 @@ class ANDROID(USBMS):
             'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD', 'SGH-I727',
             'USB_FLASH_DRIVER', 'ANDROID', 'MID7042', '7035', 'VIEWPAD_7E',
             'NOVO7', 'ADVANCED', 'TABLET_PC', 'F', 'E400_SD_CARD', 'ST80208-1', 'XT894',
-            '_USB', 'PROD_TAB13-201', 'URFPAD2'
+            '_USB', 'PROD_TAB13-201', 'URFPAD2', 'MID1126',
     ]
 
     OSX_MAIN_MEM = 'Android Device Main Memory'

From 0f6161e5baf11bc573731c09e387ba9a5d9f1faf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Jul 2013 22:28:14 +0530
Subject: [PATCH 0132/1154] Update Houston Chronicle

---
 recipes/houston_chronicle.recipe | 221 +++++++++++++++++++++++++++----
 1 file changed, 193 insertions(+), 28 deletions(-)

diff --git a/recipes/houston_chronicle.recipe b/recipes/houston_chronicle.recipe
index ed430aa45a..d7e2ae14c3 100644
--- a/recipes/houston_chronicle.recipe
+++ b/recipes/houston_chronicle.recipe
@@ -1,41 +1,206 @@
 #!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+__license__   = 'GPL v3'
+__copyright__ = '2013, Dale Furrow dkfurrow@gmail.com'
+'''
+chron.com
+'''
+import re, time
+from calibre.web.feeds.recipes import BasicNewsRecipe
+from calibre.utils.date import dt_factory, local_tz
+from datetime import datetime, timedelta, date
+from lxml import html
 
-from calibre.web.feeds.news import BasicNewsRecipe
 
 class HoustonChronicle(BasicNewsRecipe):
 
-    title          = u'The Houston Chronicle'
+    title      =  u'The Houston Chronicle'
     description    = 'News from Houston, Texas'
-    __author__     = 'Kovid Goyal'
-    language       = 'en'
-    timefmt        = ' [%a, %d %b, %Y]'
+    __author__ = 'Dale Furrow'
+    language = 'en'
     no_stylesheets = True
-    use_embedded_content = False
+    # use_embedded_content = False
     remove_attributes = ['style']
-    auto_cleanup = True
-
-    oldest_article = 3.0
-
-    #keep_only_tags = {'class':lambda x: x and ('hst-articletitle' in x or
-        #'hst-articletext' in x or 'hst-galleryitem' in x)}
+    remove_empty_feeds = True
+    timefmt = '[%a, %d %b %Y]'
+    timestampfmt = '%Y%m%d%H%M%S'
+    ignore_duplicate_articles = {'url'}
     remove_attributes = ['xmlns']
 
-    feeds = [
-            ('News', "http://www.chron.com/rss/feed/News-270.php"),
-            ('Sports',
-                'http://www.chron.com/sports/headlines/collectionRss/Sports-Headlines-Staff-Stories-10767.php'),
-            ('Neighborhood',
-                'http://www.chron.com/rss/feed/Neighborhood-305.php'),
-            ('Business', 'http://www.chron.com/rss/feed/Business-287.php'),
-            ('Entertainment',
-                'http://www.chron.com/rss/feed/Entertainment-293.php'),
-            ('Editorials',
-                'http://www.chron.com/opinion/editorials/collectionRss/Opinion-Editorials-Headline-List-10567.php'),
-            ('Life', 'http://www.chron.com/rss/feed/Life-297.php'),
-            ('Science & Tech',
-                'http://www.chron.com/rss/feed/AP-Technology-and-Science-266.php'),
-        ]
+    remove_tags = [dict(name='div', attrs={'class':'socialBar'}),
+                   dict(name='div', attrs={'class':re.compile('post-commentmeta')}),
+                   dict(name='div', attrs={'class':re.compile('slideshow_wrapper')}),
+                   dict(name='div', attrs={'class':'entry-summary'}),
+                   dict(name='a', attrs={'rel':'item-license'})]
+
+    baseUrl = 'http://www.chron.com'
+
+    oldest_web_article = 7.0
+
+    if oldest_web_article is None:
+        earliest_date = date.today()
+    else:
+        earliest_date = date.today() - timedelta(days=oldest_web_article)
+
+    pages = [('news' , '/news/houston-texas/'),
+        ('business' , '/business/'),
+        ('opinion', '/opinion/'),
+        ('sports', '/sports/')]
+
+    def getLinksFromSectionPage(self, sectionUrl):
+        pageDoc = html.parse(sectionUrl)
+        els = pageDoc.xpath("""//div[contains(@class, 'scp-item')
+        or @class='scp-feature' or contains(@class, 'simplelist')
+        or contains(@class, 'scp-blogpromo')]
+        //a[@href and not(@target) and not(child::img)]""")
+        elList = []
+        for el in els:
+            link = el.get('href')
+            title = el.text
+            if link[:4] != 'http':
+                link = self.baseUrl + link
+            if title is not None:
+                elList.append((link, el.text))
+        return elList
+
+    def getArticleDescriptionFromDoc(self, pageDoc):
+        descriptionCharsBreak = 140
+        descriptionMaxChars = 300
+        descXpath = """//div[contains(@class, 'article-body') or
+        contains(@class, 'resource-content') or contains(@class, 'post')]//p"""
+        sentenceRegex = re.compile("(\S.+?[.!?])(?=\s+|$)")
+
+        def stringify_children(node):
+            return ''.join([x for x in node.itertext()])
+        try:
+            els = pageDoc.xpath(descXpath)
+            outText = ""
+            ellipsis = ""
+            for el in els:
+                sentences = re.findall(sentenceRegex, stringify_children(el))
+                for sentence in sentences:
+                    if len(outText) < descriptionCharsBreak:
+                        outText += sentence + " "
+                    else:
+                        if len(outText) > descriptionMaxChars:
+                            ellipsis = "..."
+                        return outText[:descriptionMaxChars] + ellipsis
+            return outText
+        except:
+            self.log('Error on Article Description')
+            return ""
+
+    def getPublishedTimeFromDoc(self, pageDoc):
+        regexDateOnly = re.compile("""(?:January|February|March|April|
+        May|June|July|August|September|October|November|
+        December)\s[0-9]{1,2},\s20[01][0-9]""")
+        regextTimeOnly = re.compile("""[0-9]{1,2}:[0-9]{1,2} \w{2}""")
+        def getRegularTimestamp(dateString):
+            try:
+                outDate = datetime.strptime(dateString, "%Y-%m-%dT%H:%M:%SZ")
+                return outDate
+            except:
+                return None
+        def getDateFromString(inText):
+            match = re.findall(regexDateOnly, inText)
+            if match:
+                try:
+                    outDate = datetime.strptime(match[0], "%B %d, %Y")
+                    match = re.findall(regextTimeOnly, inText)
+                    if match:
+                        outTime = datetime.strptime(match[0], "%I:%M %p")
+                        return datetime.combine(outDate.date(), outTime.time())
+                    return outDate
+                except:
+                    return None
+                else:
+                    return None
+        el = pageDoc.xpath("//*[@class='timestamp'][1]")
+        if len(el) == 1:
+            return getRegularTimestamp(el[0].get('title'))
+        else:
+            el = pageDoc.xpath("//*[@class='entry-date' or @class='post-date'][1]")
+            if len(el) == 1:
+                return getDateFromString(el[0].text_content())
+            else:
+                return None
+
+    def getAllFeedDataFromPage(self, page):
+        articles = []
+        linkList = self.getLinksFromSectionPage(self.baseUrl + page[1])
+        self.log('from section: ', page[0], " found ", len(linkList), " links")
+        for link in linkList:
+            try:
+                articleDoc = html.parse(link[0])
+                description = self.getArticleDescriptionFromDoc(articleDoc)
+                articleDate = self.getPublishedTimeFromDoc(articleDoc)
+                if articleDate is not None and description is not None and articleDate.date() > self.earliest_date:
+                    dateText = articleDate.strftime('%a, %d %b')
+                    author = articleDate.strftime(self.timestampfmt)
+                    articles.append({'title':link[1], 'url':link[0],
+                                     'description':description, 'date':dateText, 'author':author})
+                    self.log(page[0] + ": " + link[1] + ', from ' + dateText +
+                     " description of " + str(len(description)) + ' characters at ' + link[0])
+                else:
+                    msg = ""
+                    if articleDate is None:
+                        msg = " No Timestamp Found"
+                    else:
+                        msg = " article older than " + str(self.oldest_web_article) + ' days...'
+                    self.log("Skipping article: ", link[0], msg)
+            except:
+                print 'error on fetching ' + link[0]
+                continue
+        return articles
+
+    def parse_index(self):
+
+        self.timefmt = ' [%a, %d %b, %Y]'
+        self.log('starting parse_index: ',  time.strftime(self.timestampfmt))
+        feeds = []
+        for page in self.pages:
+            articles = []
+            articles = self.getAllFeedDataFromPage(page)
+            if articles:
+                feeds.append((page[0], articles))
+        self.log('finished parse_index: ', time.strftime(self.timestampfmt))
+        return feeds
+
+    def preprocess_html(self, thisSoup):
+        baseTags = []
+        baseTags.extend(thisSoup.findAll(name='div', attrs={'id':re.compile('post-\d+')}))
+        baseTags.extend(thisSoup.findAll(name='div', attrs={'class':'hnews hentry item'}))
+        allTags = []
+        allTags.extend(baseTags)
+        if len(baseTags) > 0:
+            for tag in baseTags:
+                allTags.extend(tag.findAll(True))
+        paragraphs = thisSoup.findAll(name='p')
+        for paragraph in paragraphs:
+            if paragraph not in allTags:
+                allTags.append(paragraph)
+        for tag in baseTags:
+            while tag.parent is not None:
+                allTags.append(tag)
+                tag = tag.parent
+        for tag in thisSoup.findAll(True):
+            if tag not in allTags:
+                tag.extract()
+        return thisSoup
+
+    def populate_article_metadata(self, article, soup, first):
+        if not first:
+            return
+        try:
+            article.date = time.strptime(article.author, self.timestampfmt)
+            article.utctime = dt_factory(article.date, assume_utc=False, as_utc=False)
+            article.localtime = article.utctime.astimezone(local_tz)
+        except Exception as inst:  # remove after debug
+            self.log('Exception: ', article.title)  # remove after debug
+            self.log(type(inst))  # remove after debug
+            self.log(inst)  # remove after debug
+
+
 
 
 

From b6c0716cff07a99c518032e028d71724cbb5f818 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Wed, 10 Jul 2013 17:44:00 +0200
Subject: [PATCH 0133/1154] Add: 1) send metadata to device while connected 2)
 ability to manually match books on device with books in library

---
 src/calibre/customize/builtins.py       |   7 +-
 src/calibre/gui2/__init__.py            |   2 +-
 src/calibre/gui2/actions/match_books.py |  37 +++++
 src/calibre/gui2/device.py              |  10 +-
 src/calibre/gui2/dialogs/match_books.py | 197 ++++++++++++++++++++++++
 src/calibre/gui2/dialogs/match_books.ui | 138 +++++++++++++++++
 src/calibre/gui2/layout.py              |   4 +
 src/calibre/gui2/library/models.py      |   6 +
 src/calibre/gui2/ui.py                  |   1 +
 9 files changed, 398 insertions(+), 4 deletions(-)
 create mode 100644 src/calibre/gui2/actions/match_books.py
 create mode 100644 src/calibre/gui2/dialogs/match_books.py
 create mode 100644 src/calibre/gui2/dialogs/match_books.ui

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index e6073a3bd4..8fce645c6e 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -886,6 +886,11 @@ class ActionEditCollections(InterfaceActionBase):
     actual_plugin = 'calibre.gui2.actions.edit_collections:EditCollectionsAction'
     description = _('Edit the collections in which books are placed on your device')
 
+class ActionMatchBooks(InterfaceActionBase):
+    name = 'Match Books'
+    actual_plugin = 'calibre.gui2.actions.match_books:MatchBookAction'
+    description = _('Match book on the devices to books in the library')
+
 class ActionCopyToLibrary(InterfaceActionBase):
     name = 'Copy To Library'
     actual_plugin = 'calibre.gui2.actions.copy_to_library:CopyToLibraryAction'
@@ -936,7 +941,7 @@ plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionFetchNews, ActionSaveToDisk, ActionQuickview, ActionPolish,
         ActionShowBookDetails,ActionRestart, ActionOpenFolder, ActionConnectShare,
         ActionSendToDevice, ActionHelp, ActionPreferences, ActionSimilarBooks,
-        ActionAddToLibrary, ActionEditCollections, ActionChooseLibrary,
+        ActionAddToLibrary, ActionEditCollections, ActionMatchBooks, ActionChooseLibrary,
         ActionCopyToLibrary, ActionTweakEpub, ActionNextMatch, ActionStore,
         ActionPluginUpdater, ActionPickRandom, ActionEditToC]
 
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index a552ad8594..2fd2135956 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -73,7 +73,7 @@ defs['action-layout-context-menu'] = (
 
 defs['action-layout-context-menu-device'] = (
         'View', 'Save To Disk', None, 'Remove Books', None,
-        'Add To Library', 'Edit Collections',
+        'Add To Library', 'Edit Collections', 'Match Books'
         )
 
 defs['action-layout-context-menu-cover-browser'] = (
diff --git a/src/calibre/gui2/actions/match_books.py b/src/calibre/gui2/actions/match_books.py
new file mode 100644
index 0000000000..28b6afeba9
--- /dev/null
+++ b/src/calibre/gui2/actions/match_books.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from calibre.gui2 import error_dialog
+from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.dialogs.match_books import MatchBooks
+
+class MatchBookAction(InterfaceAction):
+
+    name = 'Match Books'
+    action_spec = (_('Match book to library'), 'book.png',
+            _('Match this book to a book in the library'),
+            ())
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
+    action_type = 'current'
+
+    def genesis(self):
+        self.qaction.triggered.connect(self.match_books_in_library)
+
+    def location_selected(self, loc):
+        enabled = loc != 'library'
+        self.qaction.setEnabled(enabled)
+
+    def match_books_in_library(self, *args):
+        view = self.gui.current_view()
+        rows = view.selectionModel().selectedRows()
+        if not rows or len(rows) != 1:
+            d = error_dialog(self.gui, _('Match books'), _('You must select one book'))
+            d.exec_()
+            return
+
+        id_ = view.model().indices(rows)[0]
+        MatchBooks(self.gui, view, id_).exec_()
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 15dc1f0c0a..d3225e66e7 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1604,6 +1604,10 @@ class DeviceMixin(object): # {{{
                 except:
                     pass
 
+    def update_metadata_on_device(self):
+        self.set_books_in_library(self.booklists(), reset=True, force_send=True)
+        self.refresh_ondevice()
+
     def book_on_device(self, id, reset=False):
         '''
         Return an indication of whether the given book represented by its db id
@@ -1652,7 +1656,8 @@ class DeviceMixin(object): # {{{
                 loc[4] |= self.book_db_uuid_path_map[id]
         return loc
 
-    def set_books_in_library(self, booklists, reset=False, add_as_step_to_job=None):
+    def set_books_in_library(self, booklists, reset=False, add_as_step_to_job=None,
+                             force_send=False):
         '''
         Set the ondevice indications in the device database.
         This method should be called before book_on_device is called, because
@@ -1675,7 +1680,8 @@ class DeviceMixin(object): # {{{
             x = x.lower() if x else ''
             return string_pat.sub('', x)
 
-        update_metadata = device_prefs['manage_device_metadata'] == 'on_connect'
+        update_metadata = (
+           device_prefs['manage_device_metadata'] == 'on_connect' or force_send)
 
         get_covers = False
         desired_thumbnail_height = 0
diff --git a/src/calibre/gui2/dialogs/match_books.py b/src/calibre/gui2/dialogs/match_books.py
new file mode 100644
index 0000000000..847d1cbc70
--- /dev/null
+++ b/src/calibre/gui2/dialogs/match_books.py
@@ -0,0 +1,197 @@
+#!/usr/bin/env  python
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
+
+
+from PyQt4.Qt import (Qt, QDialog, QAbstractItemView, QTableWidgetItem,
+                      QByteArray)
+
+from calibre.gui2 import gprefs, error_dialog
+from calibre.gui2.dialogs.match_books_ui import Ui_MatchBooks
+from calibre.utils.icu import sort_key
+
+class TableItem(QTableWidgetItem):
+    '''
+    A QTableWidgetItem that sorts on a separate string and uses ICU rules
+    '''
+
+    def __init__(self, val, sort, idx=0):
+        self.sort = sort
+        self.sort_idx = idx
+        QTableWidgetItem.__init__(self, val)
+        self.setFlags(Qt.ItemIsEnabled|Qt.ItemIsSelectable)
+
+    def __ge__(self, other):
+        l = sort_key(self.sort)
+        r = sort_key(other.sort)
+        if l > r:
+            return 1
+        if l == r:
+            return self.sort_idx >= other.sort_idx
+        return 0
+
+    def __lt__(self, other):
+        l = sort_key(self.sort)
+        r = sort_key(other.sort)
+        if l < r:
+            return 1
+        if l == r:
+            return self.sort_idx < other.sort_idx
+        return 0
+
+class MatchBooks(QDialog, Ui_MatchBooks):
+
+    def __init__(self, gui, view, id_):
+        QDialog.__init__(self, gui, flags=Qt.Window)
+        Ui_MatchBooks.__init__(self)
+        self.setupUi(self)
+        self.isClosed = False
+
+        self.books_table_column_widths = None
+        try:
+            self.books_table_column_widths = \
+                        gprefs.get('match_books_dialog_books_table_widths', None)
+            geom = gprefs.get('match_books_dialog_geometry', bytearray(''))
+            self.restoreGeometry(QByteArray(geom))
+        except:
+            pass
+
+        self.search_text.initialize('match_books_dialog')
+
+        # Remove the help button from the window title bar
+        icon = self.windowIcon()
+        self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint))
+        self.setWindowIcon(icon)
+
+        self.device_db = view.model().db
+        self.library_db = gui.library_view.model().db
+        self.view = view
+        self.gui = gui
+        self.current_device_book_id = id_
+        self.current_library_book_id = None
+
+        # Set up the books table columns
+        self.books_table.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.books_table.setSelectionMode(QAbstractItemView.SingleSelection)
+        self.books_table.setColumnCount(3)
+        t = QTableWidgetItem(_('Title'))
+        self.books_table.setHorizontalHeaderItem(0, t)
+        t = QTableWidgetItem(_('Authors'))
+        self.books_table.setHorizontalHeaderItem(1, t)
+        t = QTableWidgetItem(_('Series'))
+        self.books_table.setHorizontalHeaderItem(2, t)
+        self.books_table_header_height = self.books_table.height()
+        self.books_table.cellDoubleClicked.connect(self.book_doubleclicked)
+        self.books_table.cellClicked.connect(self.book_clicked)
+        self.books_table.sortByColumn(0, Qt.AscendingOrder)
+
+        # get the standard table row height. Do this here because calling
+        # resizeRowsToContents can word wrap long cell contents, creating
+        # double-high rows
+        self.books_table.setRowCount(1)
+        self.books_table.setItem(0, 0, TableItem('A', ''))
+        self.books_table.resizeRowsToContents()
+        self.books_table_row_height = self.books_table.rowHeight(0)
+        self.books_table.setRowCount(0)
+
+        self.search_button.clicked.connect(self.do_search)
+        self.search_button.setDefault(False)
+        self.search_text.lineEdit().returnPressed.connect(self.return_pressed)
+
+        self.buttonBox.accepted.connect(self.accept)
+        self.buttonBox.rejected.connect(self.reject)
+        self.ignore_next_key = False
+
+    def return_pressed(self):
+        self.ignore_next_key = True
+        self.do_search()
+
+    def keyPressEvent(self, e):
+        if self.ignore_next_key:
+            self.ignore_next_key = False
+        else:
+            QDialog.keyPressEvent(self, e)
+
+    def do_search(self):
+        query = unicode(self.search_text.text())
+        if not query:
+            d = error_dialog(self.gui, _('Match books'),
+                     _('You must enter a search expression into the search box'))
+            d.exec_()
+            return
+        books = self.library_db.data.search(query, return_matches=True)
+        self.books_table.setRowCount(len(books))
+
+        self.books_table.setSortingEnabled(False)
+        for row, b in enumerate(books):
+            mi = self.library_db.get_metadata(b, index_is_id=True, get_user_categories=False)
+            a = TableItem(mi.title, mi.title_sort)
+            a.setData(Qt.UserRole, b)
+            self.books_table.setItem(row, 0, a)
+            a = TableItem(' & '.join(mi.authors), mi.author_sort)
+            self.books_table.setItem(row, 1, a)
+            series = mi.format_field('series')[1]
+            if series is None:
+                series = ''
+            a = TableItem(series, mi.series, mi.series_index)
+            self.books_table.setItem(row, 2, a)
+            self.books_table.setRowHeight(row, self.books_table_row_height)
+
+        self.books_table.setSortingEnabled(True)
+
+    # Deal with sizing the table columns. Done here because the numbers are not
+    # correct until the first paint.
+    def resizeEvent(self, *args):
+        QDialog.resizeEvent(self, *args)
+        if self.books_table_column_widths is not None:
+            for c,w in enumerate(self.books_table_column_widths):
+                self.books_table.setColumnWidth(c, w)
+        else:
+            # the vertical scroll bar might not be rendered, so might not yet
+            # have a width. Assume 25. Not a problem because user-changed column
+            # widths will be remembered
+            w = self.books_table.width() - 25 - self.books_table.verticalHeader().width()
+            w /= self.books_table.columnCount()
+            for c in range(0, self.books_table.columnCount()):
+                self.books_table.setColumnWidth(c, w)
+        self.save_state()
+
+    def book_clicked(self, row, column):
+        self.book_selected = True;
+        id_ = self.books_table.item(row, 0).data(Qt.UserRole).toInt()[0]
+        self.current_library_book_id = id_
+
+    def book_doubleclicked(self, row, column):
+        self.book_clicked(row, column)
+        self.accept()
+
+    def save_state(self):
+        self.books_table_column_widths = []
+        for c in range(0, self.books_table.columnCount()):
+            self.books_table_column_widths.append(self.books_table.columnWidth(c))
+        gprefs['match_books_dialog_books_table_widths'] = self.books_table_column_widths
+        gprefs['match_books_dialog_geometry'] = bytearray(self.saveGeometry())
+        self.search_text.save_history()
+
+    def close(self):
+        self.save_state()
+        # clean up to prevent memory leaks
+        self.device_db = self.view = self.gui = None
+
+    def accept(self):
+        if not self.current_library_book_id:
+            d = error_dialog(self.gui, _('Match books'),
+                     _('You must select a matching book'))
+            d.exec_()
+            return
+        mi = self.library_db.get_metadata(self.current_library_book_id,
+                              index_is_id=True, get_user_categories=False)
+        self.device_db[self.current_device_book_id].smart_update(mi, replace_metadata=True)
+        self.device_db[self.current_device_book_id].in_library_waiting = True
+        self.save_state()
+        QDialog.accept(self)
+
+    def reject(self):
+        self.close()
+        QDialog.reject(self)
\ No newline at end of file
diff --git a/src/calibre/gui2/dialogs/match_books.ui b/src/calibre/gui2/dialogs/match_books.ui
new file mode 100644
index 0000000000..814b3b831d
--- /dev/null
+++ b/src/calibre/gui2/dialogs/match_books.ui
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MatchBooks</class>
+ <widget class="QDialog" name="MatchBooks">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>768</width>
+    <height>342</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Match Books</string>
+  </property>
+  <layout class="QGridLayout">
+   <item row="0" column="0">
+    <widget class="HistoryLineEdit" name="search_text">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>100</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>350</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+     </property>
+     <property name="minimumContentsLength">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QPushButton" name="search_button">
+     <property name="text">
+      <string>Search</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QLabel">
+     <property name="text">
+      <string>Do a search to find the book you want to match</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QTableWidget" name="books_table">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding" >
+       <horstretch>4</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="columnCount">
+      <number>0</number>
+     </property>
+     <property name="rowCount">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QLabel">
+     <property name="text">
+      <string>&lt;p&gt;Be sure to update metadata on the device when you are
+      finished matching books (Device -> Update Metadata)&lt;/p&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <layout class="QHBoxLayout">
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+       <property name="centerButtons">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <customwidgets>
+  <customwidget>
+   <class>HistoryLineEdit</class>
+   <extends>QComboBox</extends>
+   <header>calibre/gui2/widgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>MatchBooks</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>297</x>
+     <y>217</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>234</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 82e127970c..d8d91b99af 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -25,6 +25,7 @@ class LocationManager(QObject):  # {{{
     unmount_device = pyqtSignal()
     location_selected = pyqtSignal(object)
     configure_device = pyqtSignal()
+    update_device_metadata = pyqtSignal()
 
     def __init__(self, parent=None):
         QObject.__init__(self, parent)
@@ -60,6 +61,9 @@ class LocationManager(QObject):  # {{{
                 a = m.addAction(QIcon(I('config.png')), _('Configure this device'))
                 a.triggered.connect(self._configure_requested)
                 self._mem.append(a)
+                a = m.addAction(QIcon(I('sync.png')), _('Update metadata on device'))
+                a.triggered.connect(lambda x : self.update_device_metadata.emit())
+                self._mem.append(a)
 
             else:
                 ac.setToolTip(tooltip)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 324031aff0..3dc85bf46a 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1207,6 +1207,8 @@ class DeviceBooksModel(BooksModel):  # {{{
         self.search_engine = OnDeviceSearch(self)
         self.editable = ['title', 'authors', 'collections']
         self.book_in_library = None
+        self.sync_icon = QIcon(I('sync.png'))
+
 
     def counts(self):
         return Counts(len(self.db), len(self.db), len(self.map))
@@ -1535,6 +1537,8 @@ class DeviceBooksModel(BooksModel):  # {{{
             elif DEBUG and cname == 'inlibrary':
                 return QVariant(self.db[self.map[row]].in_library)
         elif role == Qt.ToolTipRole and index.isValid():
+            if col == 0 and hasattr(self.db[self.map[row]], 'in_library_waiting'):
+                return QVariant(_('Waiting for metadata to be updated'))
             if self.is_row_marked_for_deletion(row):
                 return QVariant(_('Marked for deletion'))
             if cname in ['title', 'authors'] or (cname == 'collections' and
@@ -1543,6 +1547,8 @@ class DeviceBooksModel(BooksModel):  # {{{
         elif role == Qt.DecorationRole and cname == 'inlibrary':
             if self.db[self.map[row]].in_library:
                 return QVariant(self.bool_yes_icon)
+            elif hasattr(self.db[self.map[row]], 'in_library_waiting'):
+                return QVariant(self.sync_icon)
             elif self.db[self.map[row]].in_library is not None:
                 return QVariant(self.bool_no_icon)
         elif role == Qt.TextAlignmentRole:
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index c9f07ef6f6..06cb4d904f 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -293,6 +293,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         self.location_manager.location_selected.connect(self.location_selected)
         self.location_manager.unmount_device.connect(self.device_manager.umount_device)
         self.location_manager.configure_device.connect(self.configure_connected_device)
+        self.location_manager.update_device_metadata.connect(self.update_metadata_on_device)
         self.eject_action.triggered.connect(self.device_manager.umount_device)
 
         #################### Update notification ###################

From a0c9d4621423c690df49ae1f1d203f73a9b42327 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Wed, 10 Jul 2013 17:44:23 +0200
Subject: [PATCH 0134/1154] Make sure eclipse files are ignored

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 090d11fd24..192b503429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ build
 dist
 docs
 resources/localization
-resources/images.qrc
 resources/scripts.pickle
 resources/ebook-convert-complete.pickle
 resources/builtin_recipes.xml
@@ -42,3 +41,4 @@ calibre_plugins/
 recipes/*.mobi
 recipes/*.epub
 recipes/debug
+/.metadata/

From 6c310278c989ef5039e241d82169d9cc0b3464a2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 10:41:32 +0530
Subject: [PATCH 0135/1154] Log what type of ToC is used

---
 src/calibre/ebooks/docx/to_html.py |  2 +-
 src/calibre/ebooks/docx/toc.py     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index be0576d2b9..05b4b7e9d3 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -279,7 +279,7 @@ class Convert(object):
         self.styles.resolve_numbering(numbering)
 
     def write(self, doc):
-        toc = create_toc(doc, self.body, self.resolved_link_map, self.styles, self.object_map)
+        toc = create_toc(doc, self.body, self.resolved_link_map, self.styles, self.object_map, self.log)
         raw = html.tostring(self.html, encoding='utf-8', doctype='<!DOCTYPE html>')
         with open(os.path.join(self.dest_dir, 'index.html'), 'wb') as f:
             f.write(raw)
diff --git a/src/calibre/ebooks/docx/toc.py b/src/calibre/ebooks/docx/toc.py
index 5936d34355..314dc2479d 100644
--- a/src/calibre/ebooks/docx/toc.py
+++ b/src/calibre/ebooks/docx/toc.py
@@ -21,7 +21,7 @@ class Count(object):
     def __init__(self):
         self.val = 0
 
-def from_headings(body):
+def from_headings(body, log):
     ' Create a TOC from headings in the document '
     headings = ('h1', 'h2', 'h3')
     tocroot = TOC()
@@ -58,6 +58,7 @@ def from_headings(body):
             level_prev[i] = None
 
     if len(tuple(tocroot.flat())) > 1:
+        log('Generating Table of Contents from headings')
         return tocroot
 
 def structure_toc(entries):
@@ -98,7 +99,7 @@ def link_to_txt(a, styles, object_map):
 
     return tostring(a, method='text', with_tail=False, encoding=unicode).strip()
 
-def from_toc(docx, link_map, styles, object_map):
+def from_toc(docx, link_map, styles, object_map, log):
     toc_level = None
     level = 0
     TI = namedtuple('TI', 'text anchor indent')
@@ -132,9 +133,10 @@ def from_toc(docx, link_map, styles, object_map):
                         ml = 0
                     toc.append(TI(txt, href[1:], ml))
     if toc:
+        log('Found Word Table of Contents, using it to generate the Table of Contents')
         return structure_toc(toc)
 
-def create_toc(docx, body, link_map, styles, object_map):
-    return from_toc(docx, link_map, styles, object_map) or from_headings(body)
+def create_toc(docx, body, link_map, styles, object_map, log):
+    return from_toc(docx, link_map, styles, object_map, log) or from_headings(body, log)
 
 

From 278a13abc3300a5cf034e9d2447b070cf5ab97fa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 15:08:20 +0530
Subject: [PATCH 0136/1154] Bulk metadata edit: option to not refresh after
 edit

Bulk metadata edit: Add a checkbox to prevent the refreshing of the book
list after the bulk edit. This means that the book list will not be
resorted and any existing search/virtual library will not be refreshed.
Useful if you have a large library as the refresh can be slow.
---
 src/calibre/gui2/__init__.py              |  1 +
 src/calibre/gui2/actions/edit_metadata.py |  9 ++++--
 src/calibre/gui2/dialogs/metadata_bulk.py |  5 +++
 src/calibre/gui2/dialogs/metadata_bulk.ui | 37 ++++++++++++++++-------
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 2fd2135956..7b88a943bb 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -110,6 +110,7 @@ defs['bd_overlay_cover_size'] = False
 defs['tags_browser_category_icons'] = {}
 defs['cover_browser_reflections'] = True
 defs['extra_row_spacing'] = 0
+defs['refresh_book_list_on_bulk_edit'] = True
 del defs
 # }}}
 
diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 729de33c7f..4817db953c 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -10,7 +10,7 @@ from functools import partial
 
 from PyQt4.Qt import QMenu, QModelIndex, QTimer, QIcon
 
-from calibre.gui2 import error_dialog, Dispatcher, question_dialog
+from calibre.gui2 import error_dialog, Dispatcher, question_dialog, gprefs
 from calibre.gui2.dialogs.metadata_bulk import MetadataBulkDialog
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.dialogs.device_category_editor import DeviceCategoryEditor
@@ -366,8 +366,11 @@ class EditMetadataAction(InterfaceAction):
             self.gui.tags_view.blockSignals(False)
         if changed:
             m = self.gui.library_view.model()
-            m.refresh(reset=False)
-            m.research()
+            if gprefs['refresh_book_list_on_bulk_edit']:
+                m.refresh(reset=False)
+                m.research()
+            else:
+                m.refresh_ids(book_ids)
             self.gui.tags_view.recount()
             if self.gui.cover_flow:
                 self.gui.cover_flow.dataChanged()
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 84ca9135f0..0e4b2a1572 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -317,6 +317,8 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         Ui_MetadataBulkDialog.__init__(self)
         self.model = model
         self.db = model.db
+        self.refresh_book_list.setChecked(gprefs['refresh_book_list_on_bulk_edit'])
+        self.refresh_book_list.toggled.connect(self.save_refresh_booklist)
         self.ids = [self.db.id(r) for r in rows]
         self.box_title.setText('<p>' +
                 _('Editing meta information for <b>%d books</b>') %
@@ -380,6 +382,9 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         self.authors.setFocus(Qt.OtherFocusReason)
         self.exec_()
 
+    def save_refresh_booklist(self, *args):
+        gprefs['refresh_book_list_on_bulk_edit'] = bool(self.refresh_book_list.isChecked())
+
     def save_state(self, *args):
         gprefs['bulk_metadata_window_geometry'] = \
             bytearray(self.saveGeometry())
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index b03f3e8e94..2b48e635be 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -45,7 +45,7 @@
         <x>0</x>
         <y>0</y>
         <width>950</width>
-        <height>576</height>
+        <height>577</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -1113,7 +1113,7 @@ not multiple and the destination field is multiple</string>
                 <x>0</x>
                 <y>0</y>
                 <width>934</width>
-                <height>213</height>
+                <height>256</height>
                </rect>
               </property>
               <layout class="QGridLayout" name="testgrid">
@@ -1170,14 +1170,30 @@ not multiple and the destination field is multiple</string>
     </widget>
    </item>
    <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="button_box">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_8">
+     <item>
+      <widget class="QCheckBox" name="refresh_book_list">
+       <property name="toolTip">
+        <string>If enabled, the book list will be re-sorted and any existing
+search or Virtual LIbrary will be refreshed after the edit
+is completed. This can be slow on large libraries.</string>
+       </property>
+       <property name="text">
+        <string>&amp;Refresh book list after edit</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="button_box">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
@@ -1241,7 +1257,6 @@ not multiple and the destination field is multiple</string>
   <tabstop>scrollArea</tabstop>
   <tabstop>central_widget</tabstop>
   <tabstop>query_field</tabstop>
-  <tabstop>button_box</tabstop>
   <tabstop>save_button</tabstop>
   <tabstop>remove_button</tabstop>
   <tabstop>search_field</tabstop>

From c1be9b1ecdc45ad74ef398d0deb787da7ae6f916 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 16:13:28 +0530
Subject: [PATCH 0137/1154] Legacy wrappers for add_books() and
 create_book_entry()

---
 src/calibre/db/legacy.py       | 20 ++++++++++++++++-
 src/calibre/db/tests/legacy.py | 39 ++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 2ad5da61b8..809ec816a8 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -8,6 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, traceback
 from functools import partial
+from future_builtins import zip
 
 from calibre.db import _get_next_series_num_for_list, _get_series_values
 from calibre.db.backend import DB
@@ -150,7 +151,7 @@ class LibraryDatabase(object):
     def path(self, index, index_is_id=False):
         'Return the relative path to the directory containing this books files as a unicode string.'
         book_id = index if index_is_id else self.data.index_to_id(index)
-        return self.data.cache.field_for('path', book_id).replace('/', os.sep)
+        return self.new_api.field_for('path', book_id).replace('/', os.sep)
 
     def abspath(self, index, index_is_id=False, create_dirs=True):
         'Return the absolute path to the directory containing this books files as a unicode string.'
@@ -159,6 +160,23 @@ class LibraryDatabase(object):
             os.makedirs(path)
         return path
 
+    def create_book_entry(self, mi, cover=None, add_duplicates=True, force_id=None):
+        return self.new_api.create_book_entry(mi, cover=cover, add_duplicates=add_duplicates, force_id=force_id)
+
+    def add_books(self, paths, formats, metadata, add_duplicates=True, return_ids=False):
+        books = [(mi, {fmt:path}) for mi, path, fmt in zip(metadata, paths, formats)]
+        book_ids, duplicates = self.new_api.add_books(books, add_duplicates=add_duplicates, dbapi=self)
+        if duplicates:
+            paths, formats, metadata = [], [], []
+            for mi, format_map in duplicates:
+                metadata.append(mi)
+                for fmt, path in format_map.iteritems():
+                    formats.append(fmt)
+                    paths.append(path)
+            duplicates = (paths, formats, metadata)
+        ids = book_ids if return_ids else len(book_ids)
+        return duplicates or None, ids
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index ae99d8190f..5735d77ff4 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -7,8 +7,27 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import inspect
+from repr import repr
+from functools import partial
+from tempfile import NamedTemporaryFile
+
 from calibre.db.tests.base import BaseTest
 
+class ET(object):
+
+    def __init__(self, func_name, args, kwargs={}, old=None, legacy=None):
+        self.func_name = func_name
+        self.args, self.kwargs = args, kwargs
+        self.old, self.legacy = old, legacy
+
+    def __call__(self, test):
+        old = self.old or test.init_old(test.cloned_library)
+        legacy = self.legacy or test.init_legacy(test.cloned_library)
+        oldres = getattr(old, self.func_name)(*self.args, **self.kwargs)
+        newres = getattr(legacy, self.func_name)(*self.args, **self.kwargs)
+        test.assertEqual(oldres, newres, 'Equivalence test for %s with args: %s and kwargs: %s failed' % (
+            self.func_name, repr(self.args), repr(self.kwargs)))
+
 class LegacyTest(BaseTest):
 
     ''' Test the emulation of the legacy interface. '''
@@ -119,6 +138,26 @@ class LegacyTest(BaseTest):
         db.close()
         # }}}
 
+    def test_legacy_adding_books(self):  # {{{
+        'Test various adding books methods'
+        from calibre.ebooks.metadata.book.base import Metadata
+        legacy, old = self.init_legacy(self.cloned_library), self.init_old(self.cloned_library)
+        mi = Metadata('Added Book', authors=('Added Author',))
+        with NamedTemporaryFile(suffix='.aff') as f:
+            f.write(b'xxx')
+            f.flush()
+            T = partial(ET, 'add_books', ([f.name], ['AFF'], [mi]), old=old, legacy=legacy)
+            T()(self)
+            T(kwargs={'return_ids':True})(self)
+            T(kwargs={'add_duplicates':False})(self)
+
+        mi.title = 'Added Book2'
+        T = partial(ET, 'create_book_entry', (mi,), old=old, legacy=legacy)
+        T()
+        T({'add_duplicates':False})
+        T({'force_id':1000})
+    # }}}
+
     def test_legacy_coverage(self):  # {{{
         ' Check that the emulation of the legacy interface is (almost) total '
         cl = self.cloned_library

From 1ac522d94e431473272f8481176e25228e24cfc5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 16:58:03 +0530
Subject: [PATCH 0138/1154] Improve coverage test

---
 src/calibre/db/tests/legacy.py | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 5735d77ff4..ddf6833bee 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -27,6 +27,13 @@ class ET(object):
         newres = getattr(legacy, self.func_name)(*self.args, **self.kwargs)
         test.assertEqual(oldres, newres, 'Equivalence test for %s with args: %s and kwargs: %s failed' % (
             self.func_name, repr(self.args), repr(self.kwargs)))
+        self.retval = newres
+        return newres
+
+def compare_argspecs(old, new, attr):
+    ok = len(old.args) == len(new.args) and len(old.defaults or ()) == len(new.defaults or ()) and old.args[-len(old.defaults or ()):] == new.args[-len(new.defaults or ()):]  # noqa
+    if not ok:
+        raise AssertionError('The argspec for %s does not match. %r != %r' % (attr, old, new))
 
 class LegacyTest(BaseTest):
 
@@ -169,15 +176,20 @@ class LegacyTest(BaseTest):
             '_set_title', '_set_custom', '_update_author_in_cache',
         }
         SKIP_ARGSPEC = {
-            '__init__',
+            '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
         }
 
+        missing = []
+
         try:
+            total = 0
             for attr in dir(db):
                 if attr in SKIP_ATTRS:
                     continue
+                total += 1
                 if not hasattr(ndb, attr):
-                    raise AssertionError('The attribute %s is missing' % attr)
+                    missing.append(attr)
+                    continue
                 obj, nobj  = getattr(db, attr), getattr(ndb, attr)
                 if attr not in SKIP_ARGSPEC:
                     try:
@@ -185,11 +197,15 @@ class LegacyTest(BaseTest):
                     except TypeError:
                         pass
                     else:
-                        self.assertEqual(argspec, inspect.getargspec(nobj), 'argspec for %s not the same' % attr)
+                        compare_argspecs(argspec, inspect.getargspec(nobj), attr)
         finally:
             for db in (ndb, db):
                 db.close()
                 db.break_cycles()
 
+        if missing:
+            pc = len(missing)/total
+            raise AssertionError('{0:.1%} of API ({2} attrs) are missing. For example: {1}'.format(pc, missing[0], len(missing)))
+
     # }}}
 

From 213a2136cf520c2d600843456fd237150cb4b13f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 17:18:45 +0530
Subject: [PATCH 0139/1154] Implement import_book()

---
 src/calibre/db/cache.py        |  4 ++--
 src/calibre/db/legacy.py       | 15 ++++++++++++++-
 src/calibre/db/tests/legacy.py | 19 +++++++++++++++++--
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index b94258b1ef..b8b9ad7436 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1117,7 +1117,7 @@ class Cache(object):
         return book_id
 
     @write_api
-    def add_books(self, books, add_duplicates=True, apply_import_tags=True, preserve_uuid=False, dbapi=None):
+    def add_books(self, books, add_duplicates=True, apply_import_tags=True, preserve_uuid=False, run_hooks=True, dbapi=None):
         duplicates, ids = [], []
         for mi, format_map in books:
             book_id = self._create_book_entry(mi, add_duplicates=add_duplicates, apply_import_tags=apply_import_tags, preserve_uuid=preserve_uuid)
@@ -1126,7 +1126,7 @@ class Cache(object):
             else:
                 ids.append(book_id)
                 for fmt, stream_or_path in format_map.iteritems():
-                    self._add_format(book_id, fmt, stream_or_path, dbapi=dbapi)
+                    self._add_format(book_id, fmt, stream_or_path, dbapi=dbapi, run_hooks=run_hooks)
         return ids, duplicates
 
     @write_api
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 809ec816a8..39d15f604e 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -37,7 +37,7 @@ class LibraryDatabase(object):
             progress_callback=lambda x, y:True, restore_all_prefs=False):
 
         self.is_second_db = is_second_db  # TODO: Use is_second_db
-        self.listeners = set([])
+        self.listeners = set()
 
         backend = self.backend = DB(library_path, default_prefs=default_prefs,
                      read_only=read_only, restore_all_prefs=restore_all_prefs,
@@ -177,6 +177,19 @@ class LibraryDatabase(object):
         ids = book_ids if return_ids else len(book_ids)
         return duplicates or None, ids
 
+    def import_book(self, mi, formats, notify=True, import_hooks=True, apply_import_tags=True, preserve_uuid=False):
+        format_map = {}
+        for path in formats:
+            ext = os.path.splitext(path)[1][1:].upper()
+            if ext == 'OPF':
+                continue
+            format_map[ext] = path
+        book_ids, duplicates = self.new_api.add_books(
+            [(mi, format_map)], add_duplicates=True, apply_import_tags=apply_import_tags, preserve_uuid=preserve_uuid, dbapi=self, run_hooks=import_hooks)
+        if notify:
+            self.notify('add', book_ids)
+        return book_ids[0]
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index ddf6833bee..cf3bd93d9d 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -149,14 +149,29 @@ class LegacyTest(BaseTest):
         'Test various adding books methods'
         from calibre.ebooks.metadata.book.base import Metadata
         legacy, old = self.init_legacy(self.cloned_library), self.init_old(self.cloned_library)
-        mi = Metadata('Added Book', authors=('Added Author',))
+        mi = Metadata('Added Book0', authors=('Added Author',))
         with NamedTemporaryFile(suffix='.aff') as f:
             f.write(b'xxx')
             f.flush()
             T = partial(ET, 'add_books', ([f.name], ['AFF'], [mi]), old=old, legacy=legacy)
             T()(self)
-            T(kwargs={'return_ids':True})(self)
+            book_id = T(kwargs={'return_ids':True})(self)[1][0]
+            self.assertEqual(legacy.new_api.formats(book_id), ('AFF',))
             T(kwargs={'add_duplicates':False})(self)
+            mi.title = 'Added Book1'
+            mi.uuid = 'uuu'
+            T = partial(ET, 'import_book', (mi,[f.name]), old=old, legacy=legacy)
+            book_id = T()(self)
+            self.assertNotEqual(legacy.uuid(book_id, index_is_id=True), old.uuid(book_id, index_is_id=True))
+            book_id = T(kwargs={'preserve_uuid':True})(self)
+            self.assertEqual(legacy.uuid(book_id, index_is_id=True), old.uuid(book_id, index_is_id=True))
+            self.assertEqual(legacy.new_api.formats(book_id), ('AFF',))
+        with NamedTemporaryFile(suffix='.opf') as f:
+            f.write(b'zzzz')
+            f.flush()
+            T = partial(ET, 'import_book', (mi,[f.name]), old=old, legacy=legacy)
+            book_id = T()(self)
+            self.assertFalse(legacy.new_api.formats(book_id))
 
         mi.title = 'Added Book2'
         T = partial(ET, 'create_book_entry', (mi,), old=old, legacy=legacy)

From 396c4a61313c7fef8e86849913a1e00b4e7fb393 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 17:54:37 +0530
Subject: [PATCH 0140/1154] Finish implementation of the rest of the import
 books API

---
 src/calibre/db/adding.py         | 102 +++++++++++++++++++++++++++++++
 src/calibre/db/legacy.py         |  17 ++++++
 src/calibre/library/database2.py |  88 ++------------------------
 3 files changed, 125 insertions(+), 82 deletions(-)
 create mode 100644 src/calibre/db/adding.py

diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py
new file mode 100644
index 0000000000..34ac84c493
--- /dev/null
+++ b/src/calibre/db/adding.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os
+from calibre.ebooks import BOOK_EXTENSIONS
+
+def find_books_in_directory(dirpath, single_book_per_directory):
+    dirpath = os.path.abspath(dirpath)
+    if single_book_per_directory:
+        formats = []
+        for path in os.listdir(dirpath):
+            path = os.path.abspath(os.path.join(dirpath, path))
+            if os.path.isdir(path) or not os.access(path, os.R_OK):
+                continue
+            ext = os.path.splitext(path)[1]
+            if not ext:
+                continue
+            ext = ext[1:].lower()
+            if ext not in BOOK_EXTENSIONS and ext != 'opf':
+                continue
+            formats.append(path)
+        yield formats
+    else:
+        books = {}
+        for path in os.listdir(dirpath):
+            path = os.path.abspath(os.path.join(dirpath, path))
+            if os.path.isdir(path) or not os.access(path, os.R_OK):
+                continue
+            ext = os.path.splitext(path)[1]
+            if not ext:
+                continue
+            ext = ext[1:].lower()
+            if ext not in BOOK_EXTENSIONS:
+                continue
+
+            key = os.path.splitext(path)[0]
+            if key not in books:
+                books[key] = []
+            books[key].append(path)
+
+        for formats in books.values():
+            yield formats
+
+def import_book_directory_multiple(db, dirpath, callback=None,
+        added_ids=None):
+    from calibre.ebooks.metadata.meta import metadata_from_formats
+
+    duplicates = []
+    for formats in find_books_in_directory(dirpath, False):
+        mi = metadata_from_formats(formats)
+        if mi.title is None:
+            continue
+        if db.has_book(mi):
+            duplicates.append((mi, formats))
+            continue
+        book_id = db.import_book(mi, formats)
+        if added_ids is not None:
+            added_ids.add(book_id)
+        if callable(callback):
+            if callback(mi.title):
+                break
+    return duplicates
+
+def import_book_directory(db, dirpath, callback=None, added_ids=None):
+    from calibre.ebooks.metadata.meta import metadata_from_formats
+    dirpath = os.path.abspath(dirpath)
+    formats = find_books_in_directory(dirpath, True)
+    formats = list(formats)[0]
+    if not formats:
+        return
+    mi = metadata_from_formats(formats)
+    if mi.title is None:
+        return
+    if db.has_book(mi):
+        return [(mi, formats)]
+    book_id = db.import_book(mi, formats)
+    if added_ids is not None:
+        added_ids.add(book_id)
+    if callable(callback):
+        callback(mi.title)
+
+def recursive_import(db, root, single_book_per_directory=True,
+        callback=None, added_ids=None):
+    root = os.path.abspath(root)
+    duplicates  = []
+    for dirpath in os.walk(root):
+        res = (import_book_directory(db, dirpath[0], callback=callback,
+            added_ids=added_ids) if single_book_per_directory else
+            import_book_directory_multiple(db, dirpath[0],
+                callback=callback, added_ids=added_ids))
+        if res is not None:
+            duplicates.extend(res)
+        if callable(callback):
+            if callback(''):
+                break
+    return duplicates
+
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 39d15f604e..e75ea12169 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -11,6 +11,7 @@ from functools import partial
 from future_builtins import zip
 
 from calibre.db import _get_next_series_num_for_list, _get_series_values
+from calibre.db.adding import find_books_in_directory, import_book_directory_multiple, import_book_directory, recursive_import
 from calibre.db.backend import DB
 from calibre.db.cache import Cache
 from calibre.db.categories import CATEGORY_SORTS
@@ -160,6 +161,7 @@ class LibraryDatabase(object):
             os.makedirs(path)
         return path
 
+    # Adding books {{{
     def create_book_entry(self, mi, cover=None, add_duplicates=True, force_id=None):
         return self.new_api.create_book_entry(mi, cover=cover, add_duplicates=add_duplicates, force_id=force_id)
 
@@ -190,6 +192,21 @@ class LibraryDatabase(object):
             self.notify('add', book_ids)
         return book_ids[0]
 
+    def find_books_in_directory(self, dirpath, single_book_per_directory):
+        return find_books_in_directory(dirpath, single_book_per_directory)
+
+    def import_book_directory_multiple(self, dirpath, callback=None,
+            added_ids=None):
+        return import_book_directory_multiple(self, dirpath, callback=callback, added_ids=added_ids)
+
+    def import_book_directory(self, dirpath, callback=None, added_ids=None):
+        return import_book_directory(self, dirpath, callback=callback, added_ids=added_ids)
+
+    def recursive_import(self, root, single_book_per_directory=True,
+            callback=None, added_ids=None):
+        return recursive_import(self, root, single_book_per_directory=single_book_per_directory, callback=callback, added_ids=added_ids)
+    # }}}
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 435d8edeeb..0540e8ede4 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -37,11 +37,12 @@ from calibre.utils.date import (utcnow, now as nowf, utcfromtimestamp,
 from calibre.utils.config import prefs, tweaks, from_json, to_json
 from calibre.utils.icu import sort_key, strcmp, lower
 from calibre.utils.search_query_parser import saved_searches, set_saved_searches
-from calibre.ebooks import BOOK_EXTENSIONS, check_ebook_format
+from calibre.ebooks import check_ebook_format
 from calibre.utils.magick.draw import save_cover_data_to
 from calibre.utils.recycle_bin import delete_file, delete_tree
 from calibre.utils.formatter_functions import load_user_template_functions
 from calibre.db import _get_next_series_num_for_list, _get_series_values
+from calibre.db.adding import find_books_in_directory, import_book_directory_multiple, import_book_directory, recursive_import
 from calibre.db.errors import NoSuchFormat
 from calibre.db.lazy import FormatMetadata, FormatsList
 from calibre.db.categories import Tag, CATEGORY_SORTS
@@ -3728,95 +3729,18 @@ books_series_link      feeds
         return len(books)
 
     def find_books_in_directory(self, dirpath, single_book_per_directory):
-        dirpath = os.path.abspath(dirpath)
-        if single_book_per_directory:
-            formats = []
-            for path in os.listdir(dirpath):
-                path = os.path.abspath(os.path.join(dirpath, path))
-                if os.path.isdir(path) or not os.access(path, os.R_OK):
-                    continue
-                ext = os.path.splitext(path)[1]
-                if not ext:
-                    continue
-                ext = ext[1:].lower()
-                if ext not in BOOK_EXTENSIONS and ext != 'opf':
-                    continue
-                formats.append(path)
-            yield formats
-        else:
-            books = {}
-            for path in os.listdir(dirpath):
-                path = os.path.abspath(os.path.join(dirpath, path))
-                if os.path.isdir(path) or not os.access(path, os.R_OK):
-                    continue
-                ext = os.path.splitext(path)[1]
-                if not ext:
-                    continue
-                ext = ext[1:].lower()
-                if ext not in BOOK_EXTENSIONS:
-                    continue
-
-                key = os.path.splitext(path)[0]
-                if key not in books:
-                    books[key] = []
-                books[key].append(path)
-
-            for formats in books.values():
-                yield formats
+        return find_books_in_directory(dirpath, single_book_per_directory)
 
     def import_book_directory_multiple(self, dirpath, callback=None,
             added_ids=None):
-        from calibre.ebooks.metadata.meta import metadata_from_formats
-
-        duplicates = []
-        for formats in self.find_books_in_directory(dirpath, False):
-            mi = metadata_from_formats(formats)
-            if mi.title is None:
-                continue
-            if self.has_book(mi):
-                duplicates.append((mi, formats))
-                continue
-            book_id = self.import_book(mi, formats)
-            if added_ids is not None:
-                added_ids.add(book_id)
-            if callable(callback):
-                if callback(mi.title):
-                    break
-        return duplicates
+        return import_book_directory_multiple(self, dirpath, callback=callback, added_ids=added_ids)
 
     def import_book_directory(self, dirpath, callback=None, added_ids=None):
-        from calibre.ebooks.metadata.meta import metadata_from_formats
-        dirpath = os.path.abspath(dirpath)
-        formats = self.find_books_in_directory(dirpath, True)
-        formats = list(formats)[0]
-        if not formats:
-            return
-        mi = metadata_from_formats(formats)
-        if mi.title is None:
-            return
-        if self.has_book(mi):
-            return [(mi, formats)]
-        book_id = self.import_book(mi, formats)
-        if added_ids is not None:
-            added_ids.add(book_id)
-        if callable(callback):
-            callback(mi.title)
+        return import_book_directory(self, dirpath, callback=callback, added_ids=added_ids)
 
     def recursive_import(self, root, single_book_per_directory=True,
             callback=None, added_ids=None):
-        root = os.path.abspath(root)
-        duplicates  = []
-        for dirpath in os.walk(root):
-            res = (self.import_book_directory(dirpath[0], callback=callback,
-                added_ids=added_ids) if single_book_per_directory else
-                self.import_book_directory_multiple(dirpath[0],
-                    callback=callback, added_ids=added_ids))
-            if res is not None:
-                duplicates.extend(res)
-            if callable(callback):
-                if callback(''):
-                    break
-        return duplicates
+        return recursive_import(self, root, single_book_per_directory=single_book_per_directory, callback=callback, added_ids=added_ids)
 
     def add_custom_book_data(self, book_id, name, val):
         x = self.conn.get('SELECT id FROM books WHERE ID=?', (book_id,), all=False)

From bb94f0007b853b39925c0847f929ca7d152dfad6 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 11 Jul 2013 15:44:38 +0200
Subject: [PATCH 0141/1154] In device view, make "waiting to sync" icon have
 precedence over "matched" icon

---
 src/calibre/gui2/library/models.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 3dc85bf46a..af293b864d 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1545,10 +1545,10 @@ class DeviceBooksModel(BooksModel):  # {{{
                     self.db.supports_collections()):
                 return QVariant(_("Double click to <b>edit</b> me<br><br>"))
         elif role == Qt.DecorationRole and cname == 'inlibrary':
-            if self.db[self.map[row]].in_library:
-                return QVariant(self.bool_yes_icon)
-            elif hasattr(self.db[self.map[row]], 'in_library_waiting'):
+            if hasattr(self.db[self.map[row]], 'in_library_waiting'):
                 return QVariant(self.sync_icon)
+            elif self.db[self.map[row]].in_library:
+                return QVariant(self.bool_yes_icon)
             elif self.db[self.map[row]].in_library is not None:
                 return QVariant(self.bool_no_icon)
         elif role == Qt.TextAlignmentRole:

From 477767f2ce3d68528f0aee600af7f18a5a14faac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gae=CC=88tan=20Lehmann?= <gaetan.lehmann@gmail.com>
Date: Thu, 11 Jul 2013 15:53:27 +0200
Subject: [PATCH 0142/1154] add acrimed.org recipe

---
 recipes/acrimed.recipe    |  24 ++++++++++++++++++++++++
 recipes/icons/acrimed.png | Bin 0 -> 709 bytes
 2 files changed, 24 insertions(+)
 create mode 100644 recipes/acrimed.recipe
 create mode 100644 recipes/icons/acrimed.png

diff --git a/recipes/acrimed.recipe b/recipes/acrimed.recipe
new file mode 100644
index 0000000000..66e3e732bb
--- /dev/null
+++ b/recipes/acrimed.recipe
@@ -0,0 +1,24 @@
+__license__   = 'GPL v3'
+__copyright__ = '2012'
+'''
+acrimed.org
+'''
+
+class Acrimed(BasicNewsRecipe):
+    title                  = u'Acrimed'
+    __author__             = 'Gaëtan Lehmann'
+    oldest_article         = 30
+    max_articles_per_feed  = 100
+    auto_cleanup           = True
+    auto_cleanup_keep      = '//div[@class="crayon article-chapo-4112 chapo"]'
+    language               = 'fr'
+    masthead_url           = 'http://www.acrimed.org/IMG/siteon0.gif'
+    feeds                  = [(u'Acrimed', u'http://www.acrimed.org/spip.php?page=backend')]
+
+    preprocess_regexps     = [
+        (re.compile(r'<title>(.*) - Acrimed \| Action Critique M.*dias</title>'), lambda m: '<title>' + m.group(1) + '</title>'),
+        (re.compile(r'<h2>(.*) - Acrimed \| Action Critique M.*dias</h2>'), lambda m: '<h2>' + m.group(1) + '</h2>')]
+
+    extra_css              = """
+                                .chapo{font-style:italic; margin: 1em 0 0.5em}
+                            """
diff --git a/recipes/icons/acrimed.png b/recipes/icons/acrimed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b88f368d3ca856f4b1efc14a62323bb1a82264b0
GIT binary patch
literal 709
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><Y92O8g1%331)IbLZj1hwt6H
z_wL=h|NsB5S+nNCg$sA@-hK4w(fRY|tE#GQ+_<q~#fr0M&pv(nbpQVS|Ni}3y?XVs
zWy@Z@dbM!j!o7R<UcGj0^XAR2uC7HzMYXlHZ{NP1J9lnjVWGa7?D6Br8yXt6ZQIt`
z(yF4O(%s!17!<s2-MWyF(5+jyK7018t*!0k$&)TFE<HUx2M!$g_U+q?7cV+HJAeQF
z{rB(RY15`HTC`~Q?%hpIP1e>nyLa#5=H?a<6x7qxGd4Cpefo5Gc=&?{4}f0L)zwW*
zOtiDJQ&Li@tE-zmd-lhVA0;Ft;^PyFi;E{toOtBOk<`@G#KffX^75ZQe+C5jZ``<X
ze$i}T*f20AdAqx?^k>`*1afYAx;TbNT=qTpGVG8859@=M0tr!G%}lObH-gwwg)bPT
zin4}>ggp3rzjZ_9p8b>Ft2~c6W+K;EpLj7M<_+6j519i#MR|(tS8i5T@y}c{clQbF
z*8S5LwYj~#bo2-3o=wlg|C9tB>kBv=6MKDup0w|+AQs){%kDA;nrx1J5yV*bdS=KI
zz4o#T!HSOc3tZS4t`?ZgyCdu)KV<<^|GS)jU;a1=?AiCw+Cg#Sj|q9EOgwhI>s34d
z{eApme+gq4fA30;uvz-kYuKl3)oJH3e|v$8??TYLB(uX4e&sVxeJRdam;1~O=t<QQ
z*NBpo#FA92<f2p{#b9J$Xsl~su4`x*VrXh*Vr*q-sBK_mWnf_ax(bxc5E^pxQ!>*k
Wacl6}cIZ7&1B0ilpUXO@geCyLCONwR

literal 0
HcmV?d00001


From 937f475a9ef35b062afd93cdcd1457451b400447 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 21:20:20 +0530
Subject: [PATCH 0143/1154] Implement adding of catalogs and news

---
 src/calibre/db/adding.py       | 63 ++++++++++++++++++++++++++++++++++
 src/calibre/db/legacy.py       | 11 +++++-
 src/calibre/db/search.py       |  8 ++---
 src/calibre/db/tests/legacy.py | 19 ++++++++++
 4 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py
index 34ac84c493..d777e7065e 100644
--- a/src/calibre/db/adding.py
+++ b/src/calibre/db/adding.py
@@ -100,3 +100,66 @@ def recursive_import(db, root, single_book_per_directory=True,
                 break
     return duplicates
 
+def add_catalog(cache, path, title):
+    from calibre.ebooks.metadata.book.base import Metadata
+    from calibre.ebooks.metadata.meta import get_metadata
+    from calibre.utils.date import utcnow
+
+    fmt = os.path.splitext(path)[1][1:].lower()
+    with lopen(path, 'rb') as stream, cache.write_lock:
+        matches = cache._search('title:="%s" and tags:="%s"' % (title.replace('"', '\\"'), _('Catalog')), None)
+        db_id = None
+        if matches:
+            db_id = list(matches)[0]
+        try:
+            mi = get_metadata(stream, fmt)
+            mi.authors = ['calibre']
+        except:
+            mi = Metadata(title, ['calibre'])
+        mi.title, mi.authors = title, ['calibre']
+        mi.tags = [_('Catalog')]
+        mi.pubdate = mi.timestamp = utcnow()
+        if fmt == 'mobi':
+            mi.cover, mi.cover_data = None, (None, None)
+        if db_id is None:
+            db_id = cache._create_book_entry(mi, apply_import_tags=False)
+        else:
+            cache._set_metadata(db_id, mi)
+        cache._add_format(db_id, fmt, stream)
+
+    return db_id
+
+def add_news(cache, path, arg):
+    from calibre.ebooks.metadata.meta import get_metadata
+    from calibre.utils.date import utcnow
+
+    fmt = os.path.splitext(getattr(path, 'name', path))[1][1:].lower()
+    stream = path if hasattr(path, 'read') else lopen(path, 'rb')
+    stream.seek(0)
+    mi = get_metadata(stream, fmt, use_libprs_metadata=False,
+            force_read_metadata=True)
+    # Force the author to calibre as the auto delete of old news checks for
+    # both the author==calibre and the tag News
+    mi.authors = ['calibre']
+    stream.seek(0)
+    with cache.write_lock:
+        if mi.series_index is None:
+            mi.series_index = cache._get_next_series_num_for(mi.series)
+        mi.tags = [_('News')]
+        if arg['add_title_tag']:
+            mi.tags += [arg['title']]
+        if arg['custom_tags']:
+            mi.tags += arg['custom_tags']
+        if mi.pubdate is None:
+            mi.pubdate = utcnow()
+        if mi.timestamp is None:
+            mi.timestamp = utcnow()
+
+        db_id = cache._create_book_entry(mi, apply_import_tags=False)
+        cache._add_format(db_id, fmt, stream)
+
+    if not hasattr(path, 'read'):
+        stream.close()
+    return db_id
+
+
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index e75ea12169..b9f23cc5d7 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -11,7 +11,9 @@ from functools import partial
 from future_builtins import zip
 
 from calibre.db import _get_next_series_num_for_list, _get_series_values
-from calibre.db.adding import find_books_in_directory, import_book_directory_multiple, import_book_directory, recursive_import
+from calibre.db.adding import (
+    find_books_in_directory, import_book_directory_multiple,
+    import_book_directory, recursive_import, add_catalog, add_news)
 from calibre.db.backend import DB
 from calibre.db.cache import Cache
 from calibre.db.categories import CATEGORY_SORTS
@@ -205,6 +207,13 @@ class LibraryDatabase(object):
     def recursive_import(self, root, single_book_per_directory=True,
             callback=None, added_ids=None):
         return recursive_import(self, root, single_book_per_directory=single_book_per_directory, callback=callback, added_ids=added_ids)
+
+    def add_catalog(self, path, title):
+        return add_catalog(self.new_api, path, title)
+
+    def add_news(self, path, arg):
+        return add_news(self.new_api, path, arg)
+
     # }}}
 
     # Private interface {{{
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 4a6eace0f7..7b4ad90bc3 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -526,7 +526,7 @@ class Parser(SearchQueryParser):
             if dt == 'bool':
                 return self.bool_search(icu_lower(query),
                                 partial(self.field_iter, location, candidates),
-                                self.dbcache.pref('bools_are_tristate'))
+                                self.dbcache._pref('bools_are_tristate'))
 
             # special case: colon-separated fields such as identifiers. isbn
             # is a special case within the case
@@ -630,7 +630,7 @@ class Parser(SearchQueryParser):
         if len(query) < 2:
             return matches
 
-        user_cats = self.dbcache.pref('user_categories')
+        user_cats = self.dbcache._pref('user_categories')
         c = set(candidates)
 
         if query.startswith('.'):
@@ -674,7 +674,7 @@ class Search(object):
             if search_restriction:
                 q = u'(%s) and (%s)' % (search_restriction, query)
 
-        all_book_ids = dbcache.all_book_ids(type=set)
+        all_book_ids = dbcache._all_book_ids(type=set)
         if not q:
             return all_book_ids
 
@@ -686,7 +686,7 @@ class Search(object):
         # takes 0.000975 seconds and restoring it from a pickle takes
         # 0.000974 seconds.
         sqp = Parser(
-            dbcache, all_book_ids, dbcache.pref('grouped_search_terms'),
+            dbcache, all_book_ids, dbcache._pref('grouped_search_terms'),
             self.date_search, self.num_search, self.bool_search,
             self.keypair_search,
             prefs['limit_search_columns'],
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index cf3bd93d9d..af16c7c5eb 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -178,6 +178,25 @@ class LegacyTest(BaseTest):
         T()
         T({'add_duplicates':False})
         T({'force_id':1000})
+
+        with NamedTemporaryFile(suffix='.txt') as f:
+            f.write(b'tttttt')
+            f.seek(0)
+            bid = legacy.add_catalog(f.name, 'My Catalog')
+            cache = legacy.new_api
+            self.assertEqual(cache.formats(bid), ('TXT',))
+            self.assertEqual(cache.field_for('title', bid), 'My Catalog')
+            self.assertEqual(cache.field_for('authors', bid), ('calibre',))
+            self.assertEqual(cache.field_for('tags', bid), (_('Catalog'),))
+            self.assertTrue(bid < legacy.add_catalog(f.name, 'Something else'))
+            self.assertEqual(legacy.add_catalog(f.name, 'My Catalog'), bid)
+
+            bid = legacy.add_news(f.name, {'title':'Events', 'add_title_tag':True, 'custom_tags':('one', 'two')})
+            self.assertEqual(cache.formats(bid), ('TXT',))
+            self.assertEqual(cache.field_for('authors', bid), ('calibre',))
+            self.assertEqual(cache.field_for('tags', bid), (_('News'), 'Events', 'one', 'two'))
+
+        old.close()
     # }}}
 
     def test_legacy_coverage(self):  # {{{

From a8dba2f02072207174bbae65ed01c51a3ecab93b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Jul 2013 21:25:06 +0530
Subject: [PATCH 0144/1154] ...

---
 src/calibre/db/tests/legacy.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index af16c7c5eb..ef47f5d7bf 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -183,6 +183,7 @@ class LegacyTest(BaseTest):
             f.write(b'tttttt')
             f.seek(0)
             bid = legacy.add_catalog(f.name, 'My Catalog')
+            self.assertEqual(old.add_catalog(f.name, 'My Catalog'), bid)
             cache = legacy.new_api
             self.assertEqual(cache.formats(bid), ('TXT',))
             self.assertEqual(cache.field_for('title', bid), 'My Catalog')
@@ -190,6 +191,7 @@ class LegacyTest(BaseTest):
             self.assertEqual(cache.field_for('tags', bid), (_('Catalog'),))
             self.assertTrue(bid < legacy.add_catalog(f.name, 'Something else'))
             self.assertEqual(legacy.add_catalog(f.name, 'My Catalog'), bid)
+            self.assertEqual(old.add_catalog(f.name, 'My Catalog'), bid)
 
             bid = legacy.add_news(f.name, {'title':'Events', 'add_title_tag':True, 'custom_tags':('one', 'two')})
             self.assertEqual(cache.formats(bid), ('TXT',))

From 26d20cdf6baf6d37d2fef66a504228911957f6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Thu, 11 Jul 2013 22:30:26 +0200
Subject: [PATCH 0145/1154] update empik plugin for website change

---
 src/calibre/gui2/store/stores/empik_plugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/store/stores/empik_plugin.py b/src/calibre/gui2/store/stores/empik_plugin.py
index c771722120..b716567e54 100644
--- a/src/calibre/gui2/store/stores/empik_plugin.py
+++ b/src/calibre/gui2/store/stores/empik_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 2 # Needed for dynamic plugin loading
+store_version = 3 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2013, Tomasz Długosz <tomek3d@gmail.com>'
@@ -51,7 +51,7 @@ class EmpikStore(BasicStoreConfig, StorePlugin):
                 if not id:
                     continue
 
-                cover_url = ''.join(data.xpath('.//div[@class="productBox-450Pic"]/a/img/@data-original'))
+                cover_url = ''.join(data.xpath('.//div[@class="productBox-450Pic"]/a/img/@src'))
                 title = ''.join(data.xpath('.//a[@class="productBox-450Title"]/text()'))
                 title = re.sub(r' \(ebook\)', '', title)
                 author = ''.join(data.xpath('.//div[@class="productBox-450Author"]/a/text()'))

From 90599f9c46a4afbf8556aadac8616fc7c2c89774 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 08:16:55 +0530
Subject: [PATCH 0146/1154] version 0.9.39

---
 Changelog.yaml           | 39 +++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index f68617fb3a..db25f77a8d 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,45 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.39
+  date: 2013-07-12
+
+  new features:
+    - title: "Bulk metadata edit: Add a checkbox to prevent the refreshing of the book list after the bulk edit. This means that the book list will not be resorted and any existing search/virtual library will not be refreshed.  Useful if you have a large library as the refresh can be slow."
+
+    - title: "Allow manually marking a book in the calibre library as being on the device. To do so click the device icon in calibre, then right click on the book you want marked and choose 'Match book to library'. Once you are done marking all the books, right click the device icon and choose 'Update cached metadata'"
+
+    - title: "Driver for Coby Kyros MID1126"
+      tickets: [1199410]
+
+    - title: "When adding formats to an existing book, by right clicking the add books button, ask for confirmation if some formats will be overwritten."
+
+    - title: "Add a tweak to restrict the list of output formats available in the conversion dialog. Go to Preferences->Tweaks to change it."
+ 
+  bug fixes:
+    - title: "Amazon metadata download: Update plugin to deal with the new amazon.com website"
+
+    - title: "Edelweiss metadata download plugin: Workaround for advanced search being broken at the Edelweiss website."
+
+    - title: "Invalid data in the device database on sony readers could cause errors when sorting device collections, ignore those errors."
+
+    - title: "DOCX Input: Fix no page break being inserted before the last section."
+      tickets: [1198414]
+
+    - title: "Metadata download dialog: Have the OK button enabled in the results screen as well."
+      tickets: [1198288]
+
+    - title: "Get Books: Update empik store plugin"
+
+  improved recipes:
+    - Houston Chronicle
+    - cracked.com
+    - mediapart.fr
+
+  new recipes:
+    - title: Glenn Brenwald and Ludwig von Mises Institute 
+      author: anywho
+
 - version: 0.9.38
   date: 2013-07-05
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 5c9ecbc832..18b4e3d238 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 38)
+numeric_version = (0, 9, 39)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 6c9a6c1020f0641fa7ee7757c0d151de28298891 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 10:23:38 +0530
Subject: [PATCH 0147/1154] Implement custom book data API

---
 src/calibre/db/backend.py      | 41 ++++++++++++++++++++++++++++++++++
 src/calibre/db/cache.py        | 30 +++++++++++++++++++++++++
 src/calibre/db/legacy.py       | 23 +++++++++++++++++++
 src/calibre/db/tests/legacy.py | 31 +++++++++++++++++++++++++
 4 files changed, 125 insertions(+)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index d75106209f..8ebdc4a154 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1175,5 +1175,46 @@ class DB(object):
                         self.rmtree(parent, permanent=permanent)
         self.conn.executemany(
             'DELETE FROM books WHERE id=?', [(x,) for x in path_map])
+
+    def add_custom_data(self, name, val_map, delete_first):
+        if delete_first:
+            self.conn.execute('DELETE FROM books_plugin_data WHERE name=?', (name, ))
+        self.conn.executemany(
+            'INSERT OR REPLACE INTO books_plugin_data (book, name, val) VALUES (?, ?, ?)',
+            [(book_id, name, json.dumps(val, default=to_json))
+                    for book_id, val in val_map.iteritems()])
+
+    def get_custom_book_data(self, name, book_ids, default=None):
+        book_ids = frozenset(book_ids)
+        def safe_load(val):
+            try:
+                return json.loads(val, object_hook=from_json)
+            except:
+                return default
+
+        if len(book_ids) == 1:
+            bid = next(iter(book_ids))
+            ans = {book_id:safe_load(val) for book_id, val in
+                   self.conn.execute('SELECT book, val FROM books_plugin_data WHERE book=? AND name=?', (bid, name))}
+            return ans or {bid:default}
+
+        ans = {}
+        for book_id, val in self.conn.execute(
+            'SELECT book, val FROM books_plugin_data WHERE name=?', (name,)):
+            if not book_ids or book_id in book_ids:
+                val = safe_load(val)
+                ans[book_id] = val
+        return ans
+
+    def delete_custom_book_data(self, name, book_ids):
+        if book_ids:
+            self.conn.executemany('DELETE FROM books_plugin_data WHERE book=? AND name=?',
+                                  [(book_id, name) for book_id in book_ids])
+        else:
+            self.conn.execute('DELETE FROM books_plugin_data WHERE name=?', (name,))
+
+    def get_ids_for_custom_book_data(self, name):
+        return frozenset(r[0] for r in self.conn.execute('SELECT book FROM books_plugin_data WHERE name=?', (name,)))
+
    # }}}
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index b8b9ad7436..49f5bd24ec 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1147,6 +1147,36 @@ class Cache(object):
             else:
                 table.remove_books(book_ids, self.backend)
 
+    @write_api
+    def add_custom_book_data(self, name, val_map, delete_first=False):
+        ''' Add data for name where val_map is a map of book_ids to values. If
+        delete_first is True, all previously stored data for name will be
+        removed. '''
+        missing = frozenset(val_map) - self._all_book_ids()
+        if missing:
+            raise ValueError('add_custom_book_data: no such book_ids: %d'%missing)
+        self.backend.add_custom_data(name, val_map, delete_first)
+
+    @read_api
+    def get_custom_book_data(self, name, book_ids=(), default=None):
+        ''' Get data for name. By default returns data for all book_ids, pass
+        in a list of book ids if you only want some data. Returns a map of
+        book_id to values. If a particular value could not be decoded, uses
+        default for it. '''
+        return self.backend.get_custom_book_data(name, book_ids, default)
+
+    @write_api
+    def delete_custom_book_data(self, name, book_ids=()):
+        ''' Delete data for name. By default deletes all data, if you only want
+        to delete data for some book ids, pass in a list of book ids. '''
+        self.backend.delete_custom_book_data(name, book_ids)
+
+    @read_api
+    def get_ids_for_custom_book_data(self, name):
+        ''' Return the set of book ids for which name has data. '''
+        return self.backend.get_ids_for_custom_book_data(name)
+
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b9f23cc5d7..a12e949b55 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -216,6 +216,29 @@ class LibraryDatabase(object):
 
     # }}}
 
+    # Custom data {{{
+    def add_custom_book_data(self, book_id, name, val):
+        self.new_api.add_custom_book_data(name, {book_id:val})
+
+    def add_multiple_custom_book_data(self, name, val_map, delete_first=False):
+        self.new_api.add_custom_book_data(name, val_map, delete_first=delete_first)
+
+    def get_custom_book_data(self, book_id, name, default=None):
+        return self.new_api.get_custom_book_data(name, book_ids={book_id}, default=default).get(book_id, default)
+
+    def get_all_custom_book_data(self, name, default=None):
+        return self.new_api.get_custom_book_data(name, default=default)
+
+    def delete_custom_book_data(self, book_id, name):
+        self.new_api.delete_custom_book_data(name, book_ids=(book_id,))
+
+    def delete_all_custom_book_data(self, name):
+        self.new_api.delete_custom_book_data(name)
+
+    def get_ids_for_custom_book_data(self, name):
+        return list(self.new_api.get_ids_for_custom_book_data(name))
+    # }}}
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index ef47f5d7bf..a94e59d17f 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -245,3 +245,34 @@ class LegacyTest(BaseTest):
 
     # }}}
 
+    def test_legacy_custom_data(self):  # {{{
+        'Test the API for custom data storage'
+        legacy, old = self.init_legacy(self.cloned_library), self.init_old(self.cloned_library)
+        for name in ('name1', 'name2', 'name3'):
+            T = partial(ET, 'add_custom_book_data', old=old, legacy=legacy)
+            T((1, name, 'val1'))(self)
+            T((2, name, 'val2'))(self)
+            T((3, name, 'val3'))(self)
+            T = partial(ET, 'get_ids_for_custom_book_data', old=old, legacy=legacy)
+            T((name,))(self)
+            T = partial(ET, 'get_custom_book_data', old=old, legacy=legacy)
+            T((1, name, object()))
+            T((9, name, object()))
+            T = partial(ET, 'get_all_custom_book_data', old=old, legacy=legacy)
+            T((name, object()))
+            T((name+'!', object()))
+            T = partial(ET, 'delete_custom_book_data', old=old, legacy=legacy)
+            T((name, 1))
+            T = partial(ET, 'get_all_custom_book_data', old=old, legacy=legacy)
+            T((name, object()))
+            T = partial(ET, 'delete_all_custom_book_data', old=old, legacy=legacy)
+            T((name))
+            T = partial(ET, 'get_all_custom_book_data', old=old, legacy=legacy)
+            T((name, object()))
+
+        T = partial(ET, 'add_multiple_custom_book_data', old=old, legacy=legacy)
+        T(('n', {1:'val1', 2:'val2'}))(self)
+        T = partial(ET, 'get_all_custom_book_data', old=old, legacy=legacy)
+        T(('n', object()))
+        old.close()
+    # }}}

From f9bd87d785693e06f263a79c288a179fa54fd7ae Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 10:29:56 +0530
Subject: [PATCH 0148/1154] Ignore unused feeds API

---
 src/calibre/db/tests/legacy.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index a94e59d17f..dd9cbc2dc5 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -210,6 +210,8 @@ class LegacyTest(BaseTest):
         SKIP_ATTRS = {
             'TCat_Tag', '_add_newbook_tag', '_clean_identifier', '_library_id_', '_set_authors',
             '_set_title', '_set_custom', '_update_author_in_cache',
+            # Feeds are now stored in the config folder
+            'get_feeds', 'get_feed', 'update_feed', 'remove_feeds', 'add_feed', 'set_feeds',
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
@@ -241,7 +243,7 @@ class LegacyTest(BaseTest):
 
         if missing:
             pc = len(missing)/total
-            raise AssertionError('{0:.1%} of API ({2} attrs) are missing. For example: {1}'.format(pc, missing[0], len(missing)))
+            raise AssertionError('{0:.1%} of API ({2} attrs) are missing. For example: {1}'.format(pc, ', '.join(missing[:5]), len(missing)))
 
     # }}}
 

From 4a2a4a54d471731bdff97733f9605f24759230ef Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 11:04:47 +0530
Subject: [PATCH 0149/1154] Add legacy add_format API

---
 src/calibre/db/legacy.py       | 10 ++++++++++
 src/calibre/db/tests/legacy.py |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index a12e949b55..e1e533266f 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -214,6 +214,16 @@ class LibraryDatabase(object):
     def add_news(self, path, arg):
         return add_news(self.new_api, path, arg)
 
+    def add_format(self, index, fmt, stream, index_is_id=False, path=None, notify=True, replace=True, copy_function=None):
+        ''' path and copy_function are ignored by the new API '''
+        book_id = index if index_is_id else self.data.index_to_id(index)
+        return self.new_api.add_format(book_id, fmt, stream, replace=replace, run_hooks=False, dbapi=self)
+
+    def add_format_with_hooks(self, index, fmt, fpath, index_is_id=False, path=None, notify=True, replace=True):
+        ''' path is ignored by the new API '''
+        book_id = index if index_is_id else self.data.index_to_id(index)
+        return self.new_api.add_format(book_id, fmt, fpath, replace=replace, run_hooks=True, dbapi=self)
+
     # }}}
 
     # Custom data {{{
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index dd9cbc2dc5..ced21f479d 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -7,6 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import inspect
+from io import BytesIO
 from repr import repr
 from functools import partial
 from tempfile import NamedTemporaryFile
@@ -166,6 +167,11 @@ class LegacyTest(BaseTest):
             book_id = T(kwargs={'preserve_uuid':True})(self)
             self.assertEqual(legacy.uuid(book_id, index_is_id=True), old.uuid(book_id, index_is_id=True))
             self.assertEqual(legacy.new_api.formats(book_id), ('AFF',))
+
+            T = partial(ET, 'add_format', old=old, legacy=legacy)
+            T((0, 'AFF', BytesIO(b'fffff')))(self)
+            T((0, 'AFF', BytesIO(b'fffff')))(self)
+            T((0, 'AFF', BytesIO(b'fffff')), {'replace':True})(self)
         with NamedTemporaryFile(suffix='.opf') as f:
             f.write(b'zzzz')
             f.flush()

From 6a724d931f9856ce89396c8488cfd2d3811cc95f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 11:10:35 +0530
Subject: [PATCH 0150/1154] ...

---
 src/calibre/db/legacy.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index e1e533266f..54d0887954 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -217,12 +217,22 @@ class LibraryDatabase(object):
     def add_format(self, index, fmt, stream, index_is_id=False, path=None, notify=True, replace=True, copy_function=None):
         ''' path and copy_function are ignored by the new API '''
         book_id = index if index_is_id else self.data.index_to_id(index)
-        return self.new_api.add_format(book_id, fmt, stream, replace=replace, run_hooks=False, dbapi=self)
+        try:
+            return self.new_api.add_format(book_id, fmt, stream, replace=replace, run_hooks=False, dbapi=self)
+        except:
+            raise
+        else:
+            self.notify('metadata', [book_id])
 
     def add_format_with_hooks(self, index, fmt, fpath, index_is_id=False, path=None, notify=True, replace=True):
         ''' path is ignored by the new API '''
         book_id = index if index_is_id else self.data.index_to_id(index)
-        return self.new_api.add_format(book_id, fmt, fpath, replace=replace, run_hooks=True, dbapi=self)
+        try:
+            return self.new_api.add_format(book_id, fmt, fpath, replace=replace, run_hooks=True, dbapi=self)
+        except:
+            raise
+        else:
+            self.notify('metadata', [book_id])
 
     # }}}
 

From 0a72140cac41989951f2101bcc4df2b4cef01f1e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 12:48:21 +0530
Subject: [PATCH 0151/1154] Various library wide properties

---
 src/calibre/db/cache.py        | 24 ++++++++++++++++++++++++
 src/calibre/db/legacy.py       | 14 ++++++++++++++
 src/calibre/db/tests/legacy.py | 23 ++++++++++++++++++++---
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 49f5bd24ec..a322c9b6d7 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -360,6 +360,30 @@ class Cache(object):
         '''
         return frozenset(iter(self.fields[name]))
 
+    @read_api
+    def all_field_names(self, field):
+        ''' Frozen set of all fields names (should only be used for many-one and many-many fields) '''
+        try:
+            return frozenset(self.fields[field].table.id_map.itervalues())
+        except AttributeError:
+            raise ValueError('%s is not a many-one or many-many field' % field)
+
+    @read_api
+    def get_usage_count_by_id(self, field):
+        try:
+            return {k:len(v) for k, v in self.fields[field].table.col_book_map.iteritems()}
+        except AttributeError:
+            raise ValueError('%s is not a many-one or many-many field' % field)
+
+    @read_api
+    def get_id_map(self, field):
+        try:
+            return self.fields[field].table.id_map.copy()
+        except AttributeError:
+            if field == 'title':
+                return self.fields[field].table.book_col_map.copy()
+            raise ValueError('%s is not a many-one or many-many field' % field)
+
     @read_api
     def author_data(self, author_id):
         '''
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 54d0887954..5f04dd18b2 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -65,6 +65,14 @@ class LibraryDatabase(object):
         for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
             setattr(self, meth, getattr(self.new_api, meth))
 
+        for field in ('authors', 'tags', 'publisher', 'series'):
+            name = field[:-1] if field in {'authors', 'tags'} else field
+            setattr(self, 'all_%s_names' % name, partial(self.new_api.all_field_names, field))
+
+        for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}.iteritems():
+            setattr(self, func, partial(self.field_id_map, field))
+        self.all_tags = lambda : list(self.all_tag_names())
+
         self.last_update_check = self.last_modified()
 
     def close(self):
@@ -129,6 +137,12 @@ class LibraryDatabase(object):
         for book_id in self.data.cache.all_book_ids():
             yield book_id
 
+    def get_usage_count_by_id(self, field):
+        return [[k, v] for k, v in self.new_api.get_usage_count_by_id(field).iteritems()]
+
+    def field_id_map(self, field):
+        return [(k, v) for k, v in self.new_api.get_id_map(field).iteritems()]
+
     def refresh(self, field=None, ascending=True):
         self.data.cache.refresh()
         self.data.refresh(field=field, ascending=ascending)
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index ced21f479d..b7fd99378a 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -139,9 +139,25 @@ class LegacyTest(BaseTest):
             'get_next_series_num_for': [('A Series One',)],
             'author_sort_from_authors': [(['Author One', 'Author Two', 'Unknown'],)],
             'has_book':[(Metadata('title one'),), (Metadata('xxxx1111'),)],
+            'all_author_names':[()],
+            'all_tag_names':[()],
+            'all_series_names':[()],
+            'all_publisher_names':[()],
+            'all_authors':[()],
+            'all_tags2':[()],
+            'all_tags':[()],
+            'all_publishers':[()],
+            'all_titles':[()],
+            'all_series':[()],
+            'get_usage_count_by_id':[('authors',), ('tags',), ('series',), ('publisher',), ('#tags',), ('languages',)],
         }.iteritems():
             for a in args:
-                self.assertEqual(getattr(db, meth)(*a), getattr(ndb, meth)(*a),
+                fmt = lambda x: x
+                if meth in {'get_usage_count_by_id', 'all_series', 'all_authors', 'all_tags2', 'all_publishers', 'all_titles'}:
+                    fmt = dict
+                elif meth in {'all_tags'}:
+                    fmt = frozenset
+                self.assertEqual(fmt(getattr(db, meth)(*a)), fmt(getattr(ndb, meth)(*a)),
                                  'The method: %s() returned different results for argument %s' % (meth, a))
         db.close()
         # }}}
@@ -220,7 +236,7 @@ class LegacyTest(BaseTest):
             'get_feeds', 'get_feed', 'update_feed', 'remove_feeds', 'add_feed', 'set_feeds',
         }
         SKIP_ARGSPEC = {
-            '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
+            '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors', 'all_tags',
         }
 
         missing = []
@@ -238,10 +254,11 @@ class LegacyTest(BaseTest):
                 if attr not in SKIP_ARGSPEC:
                     try:
                         argspec = inspect.getargspec(obj)
+                        nargspec = inspect.getargspec(nobj)
                     except TypeError:
                         pass
                     else:
-                        compare_argspecs(argspec, inspect.getargspec(nobj), attr)
+                        compare_argspecs(argspec, nargspec, attr)
         finally:
             for db in (ndb, db):
                 db.close()

From c1cca5213a310c0e0b0483fa455b2aeab20002dc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 13:21:08 +0530
Subject: [PATCH 0152/1154] The field API

---
 src/calibre/db/legacy.py         | 13 +++++++++++++
 src/calibre/db/tests/legacy.py   |  8 ++++++++
 src/calibre/library/database2.py |  4 ++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 5f04dd18b2..4c825247e9 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -73,6 +73,14 @@ class LibraryDatabase(object):
             setattr(self, func, partial(self.field_id_map, field))
         self.all_tags = lambda : list(self.all_tag_names())
 
+        for func in (
+            'standard_field_keys', 'custom_field_keys', 'all_field_keys',
+            'searchable_fields', 'sortable_field_keys',
+            'search_term_to_field_key', 'custom_field_metadata',
+            'all_metadata'):
+            setattr(self, func, getattr(self.field_metadata, func))
+        self.metadata_for_field = self.field_metadata.get
+
         self.last_update_check = self.last_modified()
 
     def close(self):
@@ -273,6 +281,11 @@ class LibraryDatabase(object):
         return list(self.new_api.get_ids_for_custom_book_data(name))
     # }}}
 
+    def get_field(self, index, key, default=None, index_is_id=False):
+        book_id = index if index_is_id else self.data.index_to_id(index)
+        mi = self.new_api.get_metadata(book_id, get_cover=key == 'cover')
+        return mi.get(key, default)
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index b7fd99378a..6413dc0d8f 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -149,7 +149,15 @@ class LegacyTest(BaseTest):
             'all_publishers':[()],
             'all_titles':[()],
             'all_series':[()],
+            'standard_field_keys':[()],
+            'all_field_keys':[()],
+            'searchable_fields':[()],
+            'search_term_to_field_key':[('author',), ('tag',)],
+            'metadata_for_field':[('title',), ('tags',)],
+            'sortable_field_keys':[()],
+            'custom_field_keys':[(True,), (False,)],
             'get_usage_count_by_id':[('authors',), ('tags',), ('series',), ('publisher',), ('#tags',), ('languages',)],
+            'get_field':[(1, 'title'), (2, 'tags'), (0, 'rating'), (1, 'authors'), (2, 'series'), (1, '#tags')],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 0540e8ede4..bd3f155c9d 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -776,10 +776,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         return self.field_metadata.sortable_field_keys()
 
     def searchable_fields(self):
-        return self.field_metadata.searchable_field_keys()
+        return self.field_metadata.searchable_fields()
 
     def search_term_to_field_key(self, term):
-        return self.field_metadata.search_term_to_key(term)
+        return self.field_metadata.search_term_to_field_key(term)
 
     def custom_field_metadata(self, include_composites=True):
         return self.field_metadata.custom_field_metadata(include_composites)

From 89f712dc53d982c737c5152a2eeec5b06bd83a3a Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 12 Jul 2013 10:01:42 +0200
Subject: [PATCH 0153/1154] Recover from yet another Amazon EU website change.
 This time they introduced a new table form with a very different structure.
 They switch between the form types on a seemingly random basis.

---
 .../gui2/store/stores/amazon_de_plugin.py     | 65 ++++++++++++++-----
 .../gui2/store/stores/amazon_es_plugin.py     | 64 ++++++++++++++----
 .../gui2/store/stores/amazon_fr_plugin.py     | 64 ++++++++++++++----
 .../gui2/store/stores/amazon_it_plugin.py     | 65 +++++++++++++++----
 .../gui2/store/stores/amazon_uk_plugin.py     | 64 ++++++++++++++----
 5 files changed, 251 insertions(+), 71 deletions(-)

diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py
index 6833bd3710..72c69415bc 100644
--- a/src/calibre/gui2/store/stores/amazon_de_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py
@@ -52,25 +52,61 @@ class AmazonDEKindleStore(StorePlugin):
 
     def search(self, query, max_results=10, timeout=60):
         url = self.search_url + query.encode('ascii', 'backslashreplace').replace('%', '%25').replace('\\x', '%').replace(' ', '+')
+        #print(url)
         br = browser()
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())#.decode('latin-1', 'replace'))
+            allText = f.read()
+            doc = html.fromstring(allText)#.decode('latin-1', 'replace'))
+
+            if doc.xpath('//div[@id = "atfResults" and contains(@class, "grid")]'):
+                #print('grid form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "ilresults")]'):
+                #print('ilo form')
+                data_xpath = '//li[(@class="ilo")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './div[@class = "ilf"]/a/img[contains(@class, "ilo")]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                # Results can be in a grid (table) or a column
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "list")]'):
+                #print('list form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            else:
+                # URK -- whats this?
+                print('unknown result table form for Amazon EU search')
+                #with open("c:/amazon_search_results.html", "w") as out:
+                #    out.write(allText)
+                return
 
-            data_xpath = '//div[contains(@class, "prod")]'
-            # Results can be in a grid (table) or a column
-            format_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
-            asin_xpath = '@name'
-            cover_xpath = './/img[@class="productImage"]/@src'
-            title_xpath = './/h3[@class="newaps"]/a//text()'
-            author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
-            # Results can be in a grid (table) or a column
-            price_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:
@@ -120,4 +156,3 @@ class AmazonDEKindleStore(StorePlugin):
 
     def get_details(self, search_result, timeout):
         pass
-
diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py
index 0b71ae657b..2caff27477 100644
--- a/src/calibre/gui2/store/stores/amazon_es_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py
@@ -51,25 +51,61 @@ class AmazonESKindleStore(StorePlugin):
 
     def search(self, query, max_results=10, timeout=60):
         url = self.search_url + query.encode('ascii', 'backslashreplace').replace('%', '%25').replace('\\x', '%').replace(' ', '+')
+        #print(url)
         br = browser()
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())#.decode('latin-1', 'replace'))
+            allText = f.read()
+            doc = html.fromstring(allText)#.decode('latin-1', 'replace'))
+
+            if doc.xpath('//div[@id = "atfResults" and contains(@class, "grid")]'):
+                #print('grid form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "ilresults")]'):
+                #print('ilo form')
+                data_xpath = '//li[(@class="ilo")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './div[@class = "ilf"]/a/img[contains(@class, "ilo")]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                # Results can be in a grid (table) or a column
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "list")]'):
+                #print('list form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            else:
+                # URK -- whats this?
+                print('unknown result table form for Amazon EU search')
+                #with open("c:/amazon_search_results.html", "w") as out:
+                #    out.write(allText)
+                return
 
-            data_xpath = '//div[contains(@class, "prod")]'
-            # Results can be in a grid (table) or a column
-            format_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
-            asin_xpath = '@name'
-            cover_xpath = './/img[@class="productImage"]/@src'
-            title_xpath = './/h3[@class="newaps"]/a//text()'
-            author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
-            # Results can be in a grid (table) or a column
-            price_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:
diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py
index 4520a3a104..3261e3acb1 100644
--- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py
@@ -48,25 +48,61 @@ class AmazonFRKindleStore(StorePlugin):
 
     def search(self, query, max_results=10, timeout=60):
         url = self.search_url + query.encode('ascii', 'backslashreplace').replace('%', '%25').replace('\\x', '%').replace(' ', '+')
+        #print(url)
         br = browser()
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())#.decode('latin-1', 'replace'))
+            allText = f.read()
+            doc = html.fromstring(allText)#.decode('latin-1', 'replace'))
+
+            if doc.xpath('//div[@id = "atfResults" and contains(@class, "grid")]'):
+                #print('grid form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "ilresults")]'):
+                #print('ilo form')
+                data_xpath = '//li[(@class="ilo")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './div[@class = "ilf"]/a/img[contains(@class, "ilo")]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                # Results can be in a grid (table) or a column
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "list")]'):
+                #print('list form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            else:
+                # URK -- whats this?
+                print('unknown result table form for Amazon EU search')
+                #with open("c:/amazon_search_results.html", "w") as out:
+                #    out.write(allText)
+                return
 
-            data_xpath = '//div[contains(@class, "prod")]'
-            # Results can be in a grid (table) or a column
-            format_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
-            asin_xpath = '@name'
-            cover_xpath = './/img[@class="productImage"]/@src'
-            title_xpath = './/h3[@class="newaps"]/a//text()'
-            author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
-            # Results can be in a grid (table) or a column
-            price_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:
diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py
index f8a756d1d5..4df20d10f5 100644
--- a/src/calibre/gui2/store/stores/amazon_it_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py
@@ -51,25 +51,61 @@ class AmazonITKindleStore(StorePlugin):
 
     def search(self, query, max_results=10, timeout=60):
         url = self.search_url + query.encode('ascii', 'backslashreplace').replace('%', '%25').replace('\\x', '%').replace(' ', '+')
+        #print(url)
         br = browser()
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())#.decode('latin-1', 'replace'))
+            allText = f.read()
+            doc = html.fromstring(allText)#.decode('latin-1', 'replace'))
+
+            if doc.xpath('//div[@id = "atfResults" and contains(@class, "grid")]'):
+                #print('grid form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "ilresults")]'):
+                #print('ilo form')
+                data_xpath = '//li[(@class="ilo")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './div[@class = "ilf"]/a/img[contains(@class, "ilo")]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                # Results can be in a grid (table) or a column
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "list")]'):
+                #print('list form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            else:
+                # URK -- whats this?
+                print('unknown result table form for Amazon EU search')
+                #with open("c:/amazon_search_results.html", "w") as out:
+                #    out.write(allText)
+                return
 
-            data_xpath = '//div[contains(@class, "prod")]'
-            # Results can be in a grid (table) or a column
-            format_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
-            asin_xpath = '@name'
-            cover_xpath = './/img[@class="productImage"]/@src'
-            title_xpath = './/h3[@class="newaps"]/a//text()'
-            author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
-            # Results can be in a grid (table) or a column
-            price_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:
@@ -119,3 +155,4 @@ class AmazonITKindleStore(StorePlugin):
 
     def get_details(self, search_result, timeout):
         pass
+
diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py
index f6082ac790..836e46f89c 100644
--- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py
@@ -55,25 +55,61 @@ class AmazonUKKindleStore(StorePlugin):
 
     def search(self, query, max_results=10, timeout=60):
         url = self.search_url + query.encode('ascii', 'backslashreplace').replace('%', '%25').replace('\\x', '%').replace(' ', '+')
+        #print(url)
         br = browser()
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())#.decode('latin-1', 'replace'))
+            allText = f.read()
+            doc = html.fromstring(allText)#.decode('latin-1', 'replace'))
+
+            if doc.xpath('//div[@id = "atfResults" and contains(@class, "grid")]'):
+                #print('grid form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "ilresults")]'):
+                #print('ilo form')
+                data_xpath = '//li[(@class="ilo")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './div[@class = "ilf"]/a/img[contains(@class, "ilo")]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                # Results can be in a grid (table) or a column
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "list")]'):
+                #print('list form')
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            else:
+                # URK -- whats this?
+                print('unknown result table form for Amazon EU search')
+                #with open("c:/amazon_search_results.html", "w") as out:
+                #    out.write(allText)
+                return
 
-            data_xpath = '//div[contains(@class, "prod")]'
-            # Results can be in a grid (table) or a column
-            format_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
-            asin_xpath = '@name'
-            cover_xpath = './/img[@class="productImage"]/@src'
-            title_xpath = './/h3[@class="newaps"]/a//text()'
-            author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
-            # Results can be in a grid (table) or a column
-            price_xpath = (
-                    './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
-                    '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:

From 998a79075ce9c68f5c0e7860af663dcc5ed2bde2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 13:39:14 +0530
Subject: [PATCH 0154/1154] all_formats()

---
 src/calibre/db/cache.py        | 3 +++
 src/calibre/db/legacy.py       | 1 +
 src/calibre/db/tests/legacy.py | 1 +
 3 files changed, 5 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index a322c9b6d7..ce921537f2 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -363,6 +363,9 @@ class Cache(object):
     @read_api
     def all_field_names(self, field):
         ''' Frozen set of all fields names (should only be used for many-one and many-many fields) '''
+        if field == 'formats':
+            return frozenset(self.fields[field].table.col_book_map)
+
         try:
             return frozenset(self.fields[field].table.id_map.itervalues())
         except AttributeError:
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 4c825247e9..398d1b1a86 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -68,6 +68,7 @@ class LibraryDatabase(object):
         for field in ('authors', 'tags', 'publisher', 'series'):
             name = field[:-1] if field in {'authors', 'tags'} else field
             setattr(self, 'all_%s_names' % name, partial(self.new_api.all_field_names, field))
+        self.all_formats = partial(self.new_api.all_field_names, 'formats')
 
         for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}.iteritems():
             setattr(self, func, partial(self.field_id_map, field))
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 6413dc0d8f..b816341b5a 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -158,6 +158,7 @@ class LegacyTest(BaseTest):
             'custom_field_keys':[(True,), (False,)],
             'get_usage_count_by_id':[('authors',), ('tags',), ('series',), ('publisher',), ('#tags',), ('languages',)],
             'get_field':[(1, 'title'), (2, 'tags'), (0, 'rating'), (1, 'authors'), (2, 'series'), (1, '#tags')],
+            'all_formats':[()],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x

From 7ad78fc4475e40d95d7e1ac77614baab9302ea90 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 12 Jul 2013 10:10:31 +0200
Subject: [PATCH 0155/1154] Forgot to update the version number...

---
 src/calibre/gui2/store/stores/amazon_de_plugin.py | 2 +-
 src/calibre/gui2/store/stores/amazon_es_plugin.py | 2 +-
 src/calibre/gui2/store/stores/amazon_fr_plugin.py | 2 +-
 src/calibre/gui2/store/stores/amazon_it_plugin.py | 2 +-
 src/calibre/gui2/store/stores/amazon_uk_plugin.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py
index 72c69415bc..7bb2f43047 100644
--- a/src/calibre/gui2/store/stores/amazon_de_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py
index 2caff27477..1613e3f13a 100644
--- a/src/calibre/gui2/store/stores/amazon_es_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py
index 3261e3acb1..4d210111e8 100644
--- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py
index 4df20d10f5..1e905d370e 100644
--- a/src/calibre/gui2/store/stores/amazon_it_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py
index 836e46f89c..0cd5f34dbd 100644
--- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'

From 9249fd8a3e79ebe8a9dc7049e6fad8878d1f8c2d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 14:25:39 +0530
Subject: [PATCH 0156/1154] Refactor the author data api for multiple authors

---
 src/calibre/db/cache.py        | 17 +++++++++--------
 src/calibre/db/tests/legacy.py |  2 ++
 src/calibre/db/view.py         |  6 ++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index ce921537f2..2c74a31438 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -161,7 +161,8 @@ class Cache(object):
     def _get_metadata(self, book_id, get_user_categories=True):  # {{{
         mi = Metadata(None, template_cache=self.formatter_template_cache)
         author_ids = self._field_ids_for('authors', book_id)
-        aut_list = [self._author_data(i) for i in author_ids]
+        adata = self._author_data(author_ids)
+        aut_list = [adata[i] for i in author_ids]
         aum = []
         aus = {}
         aul = {}
@@ -388,17 +389,17 @@ class Cache(object):
             raise ValueError('%s is not a many-one or many-many field' % field)
 
     @read_api
-    def author_data(self, author_id):
+    def author_data(self, author_ids):
         '''
         Return author data as a dictionary with keys: name, sort, link
 
-        If no author with the specified id is found an empty dictionary is
-        returned.
+        If no authors with the specified ids are found an empty dictionary is
+        returned. If author_ids is None, data for all authors is returned.
         '''
-        try:
-            return self.fields['authors'].author_data(author_id)
-        except (KeyError, IndexError):
-            return {}
+        af = self.fields['authors']
+        if author_ids is None:
+            author_ids = tuple(af.table.id_map)
+        return {aid:af.author_data(aid) for aid in author_ids if aid in af.table.id_map}
 
     @read_api
     def format_metadata(self, book_id, fmt, allow_cache=True):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index b816341b5a..b28a5cb93e 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -243,6 +243,8 @@ class LegacyTest(BaseTest):
             '_set_title', '_set_custom', '_update_author_in_cache',
             # Feeds are now stored in the config folder
             'get_feeds', 'get_feed', 'update_feed', 'remove_feeds', 'add_feed', 'set_feeds',
+            # Obsolete/broken methods
+            'author_id',  # replaced by get_author_id
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors', 'all_tags',
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 3f135860d9..ecd5182232 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -189,10 +189,8 @@ class View(object):
         id_ = idx if index_is_id else self.index_to_id(idx)
         with self.cache.read_lock:
             ids = self.cache._field_ids_for('authors', id_)
-            ans = []
-            for id_ in ids:
-                data = self.cache._author_data(id_)
-                ans.append(':::'.join((data['name'], data['sort'], data['link'])))
+            adata = self.cache._author_data(ids)
+            ans = [':::'.join((adata[aid]['name'], adata[aid]['sort'], adata[aid]['link'])) for aid in ids if aid in adata]
         return ':#:'.join(ans) if ans else default_value
 
     def multisort(self, fields=[], subsort=False, only_ids=None):

From ca8f29db0bd79392a51a59ef7e57598b54b161c3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 14:43:08 +0530
Subject: [PATCH 0157/1154] get_*_with_ids() API

---
 src/calibre/db/cache.py        |  2 +-
 src/calibre/db/legacy.py       |  6 ++++++
 src/calibre/db/tests/legacy.py | 29 ++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 2c74a31438..eca5a2a395 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -389,7 +389,7 @@ class Cache(object):
             raise ValueError('%s is not a many-one or many-many field' % field)
 
     @read_api
-    def author_data(self, author_ids):
+    def author_data(self, author_ids=None):
         '''
         Return author data as a dictionary with keys: name, sort, link
 
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 398d1b1a86..7f375756e7 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -73,6 +73,12 @@ class LibraryDatabase(object):
         for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}.iteritems():
             setattr(self, func, partial(self.field_id_map, field))
         self.all_tags = lambda : list(self.all_tag_names())
+        self.get_authors_with_ids = lambda : [[aid, adata['name'], adata['sort'], adata['link']] for aid, adata in self.new_api.author_data().iteritems()]
+        self.get_tags_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('tags').iteritems()]
+        self.get_series_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('series').iteritems()]
+        self.get_publishers_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('publisher').iteritems()]
+        self.get_ratings_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('rating').iteritems()]
+        self.get_languages_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('languages').iteritems()]
 
         for func in (
             'standard_field_keys', 'custom_field_keys', 'all_field_keys',
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index b28a5cb93e..b731dcc819 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -143,12 +143,12 @@ class LegacyTest(BaseTest):
             'all_tag_names':[()],
             'all_series_names':[()],
             'all_publisher_names':[()],
-            'all_authors':[()],
-            'all_tags2':[()],
-            'all_tags':[()],
-            'all_publishers':[()],
-            'all_titles':[()],
-            'all_series':[()],
+            '!all_authors':[()],
+            '!all_tags2':[()],
+            '@all_tags':[()],
+            '!all_publishers':[()],
+            '!all_titles':[()],
+            '!all_series':[()],
             'standard_field_keys':[()],
             'all_field_keys':[()],
             'searchable_fields':[()],
@@ -156,16 +156,23 @@ class LegacyTest(BaseTest):
             'metadata_for_field':[('title',), ('tags',)],
             'sortable_field_keys':[()],
             'custom_field_keys':[(True,), (False,)],
-            'get_usage_count_by_id':[('authors',), ('tags',), ('series',), ('publisher',), ('#tags',), ('languages',)],
+            '!get_usage_count_by_id':[('authors',), ('tags',), ('series',), ('publisher',), ('#tags',), ('languages',)],
             'get_field':[(1, 'title'), (2, 'tags'), (0, 'rating'), (1, 'authors'), (2, 'series'), (1, '#tags')],
             'all_formats':[()],
+            'get_authors_with_ids':[()],
+            '!get_tags_with_ids':[()],
+            '!get_series_with_ids':[()],
+            '!get_publishers_with_ids':[()],
+            '!get_ratings_with_ids':[()],
+            '!get_languages_with_ids':[()],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x
-                if meth in {'get_usage_count_by_id', 'all_series', 'all_authors', 'all_tags2', 'all_publishers', 'all_titles'}:
-                    fmt = dict
-                elif meth in {'all_tags'}:
-                    fmt = frozenset
+                if meth[0] in {'!', '@'}:
+                    fmt = {'!':dict, '@':frozenset}[meth[0]]
+                    meth = meth[1:]
+                elif meth == 'get_authors_with_ids':
+                    fmt = lambda val:{x[0]:tuple(x[1:]) for x in val}
                 self.assertEqual(fmt(getattr(db, meth)(*a)), fmt(getattr(ndb, meth)(*a)),
                                  'The method: %s() returned different results for argument %s' % (meth, a))
         db.close()

From d80f36ef28d93795c5c2fe1d76b086a1e22a131c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 15:16:16 +0530
Subject: [PATCH 0158/1154] Use MethodType for legacy interface to ensure
 method signatures match

---
 src/calibre/db/legacy.py       | 32 ++++++++++++++++++++++----------
 src/calibre/db/tests/legacy.py |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 7f375756e7..2c84542d4f 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import os, traceback
+import os, traceback, types
 from functools import partial
 from future_builtins import zip
 
@@ -62,24 +62,36 @@ class LibraryDatabase(object):
             setattr(self, prop, partial(self.get_property,
                     loc=self.FIELD_MAP[fm]))
 
+        MT = lambda func: types.MethodType(func, self, LibraryDatabase)
+
         for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
             setattr(self, meth, getattr(self.new_api, meth))
 
+        # Legacy API to get information about many-(one, many) fields
         for field in ('authors', 'tags', 'publisher', 'series'):
+            def getter(field):
+                def func(self):
+                    return self.new_api.all_field_names(field)
+                return func
             name = field[:-1] if field in {'authors', 'tags'} else field
-            setattr(self, 'all_%s_names' % name, partial(self.new_api.all_field_names, field))
-        self.all_formats = partial(self.new_api.all_field_names, 'formats')
+            setattr(self, 'all_%s_names' % name, MT(getter(field)))
+            self.all_formats = MT(lambda self:self.new_api.all_field_names('formats'))
 
         for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}.iteritems():
             setattr(self, func, partial(self.field_id_map, field))
-        self.all_tags = lambda : list(self.all_tag_names())
-        self.get_authors_with_ids = lambda : [[aid, adata['name'], adata['sort'], adata['link']] for aid, adata in self.new_api.author_data().iteritems()]
-        self.get_tags_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('tags').iteritems()]
-        self.get_series_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('series').iteritems()]
-        self.get_publishers_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('publisher').iteritems()]
-        self.get_ratings_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('rating').iteritems()]
-        self.get_languages_with_ids = lambda : [[tid, tag] for tid, tag in self.new_api.get_id_map('languages').iteritems()]
+        self.all_tags = MT(lambda self: list(self.all_tag_names()))
+        self.get_authors_with_ids = MT(
+            lambda self: [[aid, adata['name'], adata['sort'], adata['link']] for aid, adata in self.new_api.author_data().iteritems()])
+        for field in ('tags', 'series', 'publishers', 'ratings', 'languages'):
+            def getter(field):
+                fname = field[:-1] if field in {'publishers', 'ratings'} else field
+                def func(self):
+                    return [[tid, tag] for tid, tag in self.new_api.get_id_map(fname).iteritems()]
+                return func
+            setattr(self, 'get_%s_with_ids' % field,
+                    MT(getter(field)))
 
+        # Legacy field API
         for func in (
             'standard_field_keys', 'custom_field_keys', 'all_field_keys',
             'searchable_fields', 'sortable_field_keys',
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index b731dcc819..55fac0120d 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -254,7 +254,7 @@ class LegacyTest(BaseTest):
             'author_id',  # replaced by get_author_id
         }
         SKIP_ARGSPEC = {
-            '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors', 'all_tags',
+            '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
         }
 
         missing = []

From 71e27433ec30d3f8995d5bade3af0eb3341aac41 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 15:37:07 +0530
Subject: [PATCH 0159/1154] API to get item name from item id

---
 src/calibre/db/cache.py        | 4 ++++
 src/calibre/db/legacy.py       | 7 +++++++
 src/calibre/db/tests/legacy.py | 7 ++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index eca5a2a395..bc8f1024f5 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -388,6 +388,10 @@ class Cache(object):
                 return self.fields[field].table.book_col_map.copy()
             raise ValueError('%s is not a many-one or many-many field' % field)
 
+    @read_api
+    def get_item_name(self, field, item_id):
+        return self.fields[field].table.id_map[item_id]
+
     @read_api
     def author_data(self, author_ids=None):
         '''
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 2c84542d4f..f8faed4290 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -90,6 +90,13 @@ class LibraryDatabase(object):
                 return func
             setattr(self, 'get_%s_with_ids' % field,
                     MT(getter(field)))
+        for field in ('author', 'tag', 'series'):
+            def getter(field):
+                field = field if field == 'series' else (field+'s')
+                def func(self, item_id):
+                    return self.new_api.get_item_name(field, item_id)
+                return func
+            setattr(self, '%s_name' % field, MT(getter(field)))
 
         # Legacy field API
         for func in (
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 55fac0120d..96fc98d5be 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -32,7 +32,9 @@ class ET(object):
         return newres
 
 def compare_argspecs(old, new, attr):
-    ok = len(old.args) == len(new.args) and len(old.defaults or ()) == len(new.defaults or ()) and old.args[-len(old.defaults or ()):] == new.args[-len(new.defaults or ()):]  # noqa
+    num = len(old.defaults or ())
+
+    ok = len(old.args) == len(new.args) and old.defaults == new.defaults and (num == 0 or old.args[-num:] == new.args[-num:])
     if not ok:
         raise AssertionError('The argspec for %s does not match. %r != %r' % (attr, old, new))
 
@@ -165,6 +167,9 @@ class LegacyTest(BaseTest):
             '!get_publishers_with_ids':[()],
             '!get_ratings_with_ids':[()],
             '!get_languages_with_ids':[()],
+            'tag_name':[(3,)],
+            'author_name':[(3,)],
+            'series_name':[(3,)],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x

From 14441ff0524064a05ba2d05c80f82b6ba12edf7b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 16:01:16 +0530
Subject: [PATCH 0160/1154] ...

---
 src/calibre/db/tests/legacy.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 96fc98d5be..5df09ec065 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -32,6 +32,8 @@ class ET(object):
         return newres
 
 def compare_argspecs(old, new, attr):
+    # We dont compare the names of the non-keyword arguments as they are often
+    # different and they dont affect the usage of the API.
     num = len(old.defaults or ())
 
     ok = len(old.args) == len(new.args) and old.defaults == new.defaults and (num == 0 or old.args[-num:] == new.args[-num:])

From 598a604853a8b0b8a2b435aa5b4fc1c3bf0adb54 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 17:11:13 +0530
Subject: [PATCH 0161/1154] MTP driver: Ignore the zinio folder by default

---
 src/calibre/devices/mtp/driver.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py
index f0e532639a..40fa9d900b 100644
--- a/src/calibre/devices/mtp/driver.py
+++ b/src/calibre/devices/mtp/driver.py
@@ -83,7 +83,7 @@ class MTP_DEVICE(BASE):
         return name in {
             'alarms', 'android', 'dcim', 'movies', 'music', 'notifications',
             'pictures', 'ringtones', 'samsung', 'sony', 'htc', 'bluetooth',
-            'games', 'lost.dir', 'video', 'whatsapp', 'image'}
+            'games', 'lost.dir', 'video', 'whatsapp', 'image', 'com.zinio.mobile.android.reader'}
 
     def configure_for_kindle_app(self):
         proxy = self.prefs
@@ -159,16 +159,17 @@ class MTP_DEVICE(BASE):
     def get_driveinfo(self):
         if not self.driveinfo:
             self.driveinfo = {}
-            for sid, location_code in ( (self._main_id, 'main'), (self._carda_id,
+            for sid, location_code in ((self._main_id, 'main'), (self._carda_id,
                 'A'), (self._cardb_id, 'B')):
-                if sid is None: continue
+                if sid is None:
+                    continue
                 self._update_drive_info(self.filesystem_cache.storage(sid), location_code)
         return self.driveinfo
 
     def get_device_information(self, end_session=True):
         self.report_progress(1.0, _('Get device information...'))
         dinfo = self.get_basic_device_information()
-        return tuple( list(dinfo) + [self.driveinfo] )
+        return tuple(list(dinfo) + [self.driveinfo])
 
     def card_prefix(self, end_session=True):
         return (self._carda_id, self._cardb_id)
@@ -190,7 +191,7 @@ class MTP_DEVICE(BASE):
         from calibre.devices.mtp.books import JSONCodec
         from calibre.devices.mtp.books import BookList, Book
         self.report_progress(0, _('Listing files, this can take a while'))
-        self.get_driveinfo() # Ensure driveinfo is loaded
+        self.get_driveinfo()  # Ensure driveinfo is loaded
         sid = {'carda':self._carda_id, 'cardb':self._cardb_id}.get(oncard,
                 self._main_id)
         if sid is None:
@@ -230,7 +231,7 @@ class MTP_DEVICE(BASE):
                     cached_metadata.path = mtp_file.mtp_id_path
                     debug('Using cached metadata for',
                             '/'.join(mtp_file.full_path))
-                    continue # No need to update metadata
+                    continue  # No need to update metadata
                 book = cached_metadata
             else:
                 book = Book(sid, '/'.join(relpath))
@@ -352,8 +353,8 @@ class MTP_DEVICE(BASE):
     def prefix_for_location(self, on_card):
         if self.location_paths is None:
             self.location_paths = {}
-            for sid, loc in ( (self._main_id, None), (self._carda_id, 'carda'),
-                    (self._cardb_id, 'cardb') ):
+            for sid, loc in ((self._main_id, None), (self._carda_id, 'carda'),
+                    (self._cardb_id, 'cardb')):
                 if sid is not None:
                     storage = self.filesystem_cache.storage(sid)
                     prefixes = self.get_pref('send_to')
@@ -470,7 +471,8 @@ class MTP_DEVICE(BASE):
 
     def remove_books_from_metadata(self, paths, booklists):
         self.report_progress(0, _('Removing books from metadata'))
-        class NextPath(Exception): pass
+        class NextPath(Exception):
+            pass
 
         for i, path in enumerate(paths):
             try:
@@ -549,3 +551,4 @@ if __name__ == '__main__':
         dev.shutdown()
 
 
+

From a8033fc610b940a493734624485579bb5c8cc65e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 17:27:13 +0530
Subject: [PATCH 0162/1154] Author data legacy API

---
 src/calibre/db/legacy.py       | 19 +++++++++++++++++++
 src/calibre/db/tests/legacy.py |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index f8faed4290..0ab29d2e3d 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -312,6 +312,25 @@ class LibraryDatabase(object):
         mi = self.new_api.get_metadata(book_id, get_cover=key == 'cover')
         return mi.get(key, default)
 
+    def authors_sort_strings(self, index, index_is_id=False):
+        book_id = index if index_is_id else self.data.index_to_id(index)
+        with self.new_api.read_lock:
+            af = self.new_api.fields['authors'].table
+            authors = af.book_col_map.get(book_id, ())
+            adata = self.new_api._author_data(authors)
+            return [adata[aid]['sort'] for aid in authors]
+
+    def author_sort_from_book(self, index, index_is_id=False):
+        return ' & '.join(self.authors_sort_strings(index, index_is_id=index_is_id))
+
+    def authors_with_sort_strings(self, index, index_is_id=False):
+        book_id = index if index_is_id else self.data.index_to_id(index)
+        with self.new_api.read_lock:
+            af = self.new_api.fields['authors'].table
+            authors = af.book_col_map.get(book_id, ())
+            adata = self.new_api._author_data(authors)
+            return [(aid, adata[aid]['name'], adata[aid]['sort'], adata[aid]['link']) for aid in authors]
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 5df09ec065..fa76439387 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -172,6 +172,9 @@ class LegacyTest(BaseTest):
             'tag_name':[(3,)],
             'author_name':[(3,)],
             'series_name':[(3,)],
+            'authors_sort_strings':[(0,), (1,), (2,)],
+            'author_sort_from_book':[(0,), (1,), (2,)],
+            'authors_with_sort_strings':[(0,), (1,), (2,)],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x

From 7c1421d15a6137a4a5fa90ec060d1ebec6e1433f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 17:38:16 +0530
Subject: [PATCH 0163/1154] ...

---
 src/calibre/db/legacy.py       | 6 ++----
 src/calibre/db/tests/legacy.py | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 0ab29d2e3d..ff0c742e9d 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -315,8 +315,7 @@ class LibraryDatabase(object):
     def authors_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.data.index_to_id(index)
         with self.new_api.read_lock:
-            af = self.new_api.fields['authors'].table
-            authors = af.book_col_map.get(book_id, ())
+            authors = self.new_api._field_ids_for('authors', book_id)
             adata = self.new_api._author_data(authors)
             return [adata[aid]['sort'] for aid in authors]
 
@@ -326,8 +325,7 @@ class LibraryDatabase(object):
     def authors_with_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.data.index_to_id(index)
         with self.new_api.read_lock:
-            af = self.new_api.fields['authors'].table
-            authors = af.book_col_map.get(book_id, ())
+            authors = self.new_api._field_ids_for('authors', book_id)
             adata = self.new_api._author_data(authors)
             return [(aid, adata[aid]['name'], adata[aid]['sort'], adata[aid]['link']) for aid in authors]
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index fa76439387..daa53b7ddd 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -262,6 +262,8 @@ class LegacyTest(BaseTest):
             'get_feeds', 'get_feed', 'update_feed', 'remove_feeds', 'add_feed', 'set_feeds',
             # Obsolete/broken methods
             'author_id',  # replaced by get_author_id
+            'books_for_author',  # broken
+            'books_in_old_database',  # unused
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
@@ -329,3 +331,4 @@ class LegacyTest(BaseTest):
         T(('n', object()))
         old.close()
     # }}}
+

From 3719dfb4d8a607566b2ac4f069671ec878b4a44a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 17:42:16 +0530
Subject: [PATCH 0164/1154] book_on_device API

---
 src/calibre/db/legacy.py       | 23 +++++++++++++++++++++++
 src/calibre/db/tests/legacy.py |  1 +
 2 files changed, 24 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index ff0c742e9d..97be03fb19 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -108,6 +108,7 @@ class LibraryDatabase(object):
         self.metadata_for_field = self.field_metadata.get
 
         self.last_update_check = self.last_modified()
+        self.book_on_device_func = None
 
     def close(self):
         self.backend.close()
@@ -329,6 +330,28 @@ class LibraryDatabase(object):
             adata = self.new_api._author_data(authors)
             return [(aid, adata[aid]['name'], adata[aid]['sort'], adata[aid]['link']) for aid in authors]
 
+    def book_on_device(self, book_id):
+        if callable(self.book_on_device_func):
+            return self.book_on_device_func(book_id)
+        return None
+
+    def book_on_device_string(self, book_id):
+        loc = []
+        count = 0
+        on = self.book_on_device(book_id)
+        if on is not None:
+            m, a, b, count = on[:4]
+            if m is not None:
+                loc.append(_('Main'))
+            if a is not None:
+                loc.append(_('Card A'))
+            if b is not None:
+                loc.append(_('Card B'))
+        return ', '.join(loc) + ((_(' (%s books)')%count) if count > 1 else '')
+
+    def set_book_on_device_func(self, func):
+        self.book_on_device_func = func
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index daa53b7ddd..e5a8a8e7b5 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -175,6 +175,7 @@ class LegacyTest(BaseTest):
             'authors_sort_strings':[(0,), (1,), (2,)],
             'author_sort_from_book':[(0,), (1,), (2,)],
             'authors_with_sort_strings':[(0,), (1,), (2,)],
+            'book_on_device_string':[(1,), (2,), (3,)],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x

From ecbea8b0e22b507d88db5cfab997d38031a46196 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 18:04:27 +0530
Subject: [PATCH 0165/1154] More API

---
 src/calibre/db/legacy.py       | 16 ++++++++++++++++
 src/calibre/db/tests/legacy.py |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 97be03fb19..a4dd30a88c 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -109,6 +109,9 @@ class LibraryDatabase(object):
 
         self.last_update_check = self.last_modified()
         self.book_on_device_func = None
+        # Cleaning is not required anymore
+        self.clean = self.clean_custom = MT(lambda self:None)
+        self.clean_standard_field = MT(lambda self, field, commit=False:None)
 
     def close(self):
         self.backend.close()
@@ -352,6 +355,19 @@ class LibraryDatabase(object):
     def set_book_on_device_func(self, func):
         self.book_on_device_func = func
 
+    def books_in_series(self, series_id):
+        with self.new_api.read_lock:
+            book_ids = self.new_api._books_for_field('series', series_id)
+            ff = self.new_api._field_for
+            return sorted(book_ids, key=lambda x:ff('series_index', x))
+
+    def books_in_series_of(self, index, index_is_id=False):
+        book_id = index if index_is_id else self.data.index_to_id(index)
+        series_ids = self.new_api.field_ids_for('series', book_id)
+        if not series_ids:
+            return []
+        return self.books_in_series(series_ids[0])
+
     # Private interface {{{
 
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index e5a8a8e7b5..5c26e50ae5 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -176,6 +176,7 @@ class LegacyTest(BaseTest):
             'author_sort_from_book':[(0,), (1,), (2,)],
             'authors_with_sort_strings':[(0,), (1,), (2,)],
             'book_on_device_string':[(1,), (2,), (3,)],
+            'books_in_series_of':[(0,), (1,), (2,)],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x
@@ -265,6 +266,8 @@ class LegacyTest(BaseTest):
             'author_id',  # replaced by get_author_id
             'books_for_author',  # broken
             'books_in_old_database',  # unused
+            'clean_user_categories',  # internal API
+            'cleanup_tags',  # internal API
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',

From 1e4d11d78fb59a7cb548106ac9b699a158bac559 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 18:21:37 +0530
Subject: [PATCH 0166/1154] books_with_same_title()

---
 src/calibre/db/legacy.py       | 16 +++++++++++++++-
 src/calibre/db/tests/legacy.py |  6 ++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index a4dd30a88c..8c5fa5bd31 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -10,6 +10,7 @@ import os, traceback, types
 from functools import partial
 from future_builtins import zip
 
+from calibre import force_unicode
 from calibre.db import _get_next_series_num_for_list, _get_series_values
 from calibre.db.adding import (
     find_books_in_directory, import_book_directory_multiple,
@@ -112,6 +113,8 @@ class LibraryDatabase(object):
         # Cleaning is not required anymore
         self.clean = self.clean_custom = MT(lambda self:None)
         self.clean_standard_field = MT(lambda self, field, commit=False:None)
+        # apsw operates in autocommit mode
+        self.commit = MT(lambda self:None)
 
     def close(self):
         self.backend.close()
@@ -368,8 +371,19 @@ class LibraryDatabase(object):
             return []
         return self.books_in_series(series_ids[0])
 
-    # Private interface {{{
+    def books_with_same_title(self, mi, all_matches=True):
+        title = mi.title
+        ans = set()
+        if title:
+            title = icu_lower(force_unicode(title))
+            for book_id, x in self.new_api.get_id_map('title').iteritems():
+                if icu_lower(x) == title:
+                    ans.add(book_id)
+                    if not all_matches:
+                        break
+        return ans
 
+    # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
             yield row
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 5c26e50ae5..2f5c879532 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -177,6 +177,7 @@ class LegacyTest(BaseTest):
             'authors_with_sort_strings':[(0,), (1,), (2,)],
             'book_on_device_string':[(1,), (2,), (3,)],
             'books_in_series_of':[(0,), (1,), (2,)],
+            'books_with_same_title':[(Metadata(db.title(0)),), (Metadata(db.title(1)),), (Metadata('1234'),)],
         }.iteritems():
             for a in args:
                 fmt = lambda x: x
@@ -266,8 +267,9 @@ class LegacyTest(BaseTest):
             'author_id',  # replaced by get_author_id
             'books_for_author',  # broken
             'books_in_old_database',  # unused
-            'clean_user_categories',  # internal API
-            'cleanup_tags',  # internal API
+
+            # Internal API
+            'clean_user_categories',  'cleanup_tags',  'books_list_filter',
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',

From 72c0346874fa2bb96236b76c0a1c7a49752a3400 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 18:23:34 +0530
Subject: [PATCH 0167/1154] Update lamebook

---
 recipes/lamebook.recipe | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes/lamebook.recipe b/recipes/lamebook.recipe
index e449285d84..0f4fbe9dc0 100644
--- a/recipes/lamebook.recipe
+++ b/recipes/lamebook.recipe
@@ -13,6 +13,8 @@ class LamebookRecipe(BasicNewsRecipe):
     language = 'en'
     use_embedded_content  = False
     publication_type = 'blog'
+    reverse_article_order = True
+    encoding = 'utf-8'
 
     keep_only_tags = [
         dict(name='div', attrs={'class':'entry'})

From 8a3cb9b977abf1b0017fb83694df40d75e032d19 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 12 Jul 2013 17:22:45 +0200
Subject: [PATCH 0168/1154] Add ability to create a composite column containing
 the virtual libraries that the book is a member of.

Intermediate commit -- still testing
---
 src/calibre/gui2/search_restriction_mixin.py |   7 ++
 src/calibre/library/caches.py                | 115 ++++++++++++-------
 src/calibre/library/cli.py                   |   2 +-
 src/calibre/library/database2.py             |   6 +
 src/calibre/library/field_metadata.py        |  10 ++
 src/calibre/utils/formatter_functions.py     |  12 +-
 src/calibre/utils/search_query_parser.py     |  15 ++-
 7 files changed, 119 insertions(+), 48 deletions(-)

diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index b986a2a78e..a90d607ea9 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -332,6 +332,7 @@ class SearchRestrictionMixin(object):
         virt_libs = db.prefs.get('virtual_libraries', {})
         virt_libs[name] = search
         db.prefs.set('virtual_libraries', virt_libs)
+        db.data.invalidate_virtual_libraries_caches(db)
 
     def do_create_edit(self, name=None):
         db = self.library_view.model().db
@@ -341,8 +342,11 @@ class SearchRestrictionMixin(object):
             if name:
                 self._remove_vl(name, reapply=False)
             self.add_virtual_library(db, cd.library_name, cd.library_search)
+            db.data.invalidate_virtual_libraries_caches(db)
             if not name or name == db.data.get_base_restriction_name():
                 self.apply_virtual_library(cd.library_name)
+            else:
+                self.tags_view.recount()
 
     def virtual_library_clicked(self):
         m = self.virtual_library_menu
@@ -462,6 +466,9 @@ class SearchRestrictionMixin(object):
                         default_yes=False):
             return
         self._remove_vl(name, reapply=True)
+        db = self.library_view.model().db
+        db.data.invalidate_virtual_libraries_caches(db)
+        self.tags_view.recount()
 
     def _remove_vl(self, name, reapply=True):
         db = self.library_view.model().db
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index e552ead591..05d964be71 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import with_statement
 
-__license__   = 'GPL v3'
+__license__ = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
@@ -144,7 +144,8 @@ def force_to_bool(val):
 
 class CacheRow(list):  # {{{
 
-    def __init__(self, db, composites, val, series_col, series_sort_col):
+    def __init__(self, db, composites, val, series_col, series_sort_col,
+                 virtual_library_col):
         self.db = db
         self._composites = composites
         list.__init__(self, val)
@@ -152,6 +153,8 @@ class CacheRow(list):  # {{{
         self._series_col = series_col
         self._series_sort_col = series_sort_col
         self._series_sort = None
+        self._virt_lib_col = virtual_library_col
+        self._virt_libs = None
 
     def __getitem__(self, col):
         if self._must_do:
@@ -171,7 +174,7 @@ class CacheRow(list):  # {{{
                 mi = self.db.get_metadata(id_, index_is_id=True,
                                           get_user_categories=False)
                 for c in self._composites:
-                    self[c] =  mi.get(self._composites[c])
+                    self[c] = mi.get(self._composites[c])
         if col == self._series_sort_col and self._series_sort is None:
             if self[self._series_col]:
                 self._series_sort = title_sort(self[self._series_col])
@@ -179,6 +182,26 @@ class CacheRow(list):  # {{{
             else:
                 self._series_sort = ''
                 self[self._series_sort_col] = ''
+
+        if col == self._virt_lib_col and self._virt_libs is None:
+            try:
+                if not getattr(self.db.data, '_virt_libs_computed', False):
+                    self.db.data._ids_in_virt_libs = {}
+                    for v,s in self.db.prefs.get('virtual_libraries', {}).iteritems():
+                        self.db.data._ids_in_virt_libs[v] = self.db.data.search_raw(s)
+                    self.db.data._virt_libs_computed = True
+                r = []
+                for v in self.db.prefs.get('virtual_libraries', {}).keys():
+                    # optimize the lookup of the ID -- it is always zero
+                    if self[0] in self.db.data._ids_in_virt_libs[v]:
+                        r.append(v)
+                from calibre.utils.icu import sort_key
+                self._virt_libs = ", ".join(sorted(r, key=sort_key))
+                self[self._virt_lib_col] = self._virt_libs
+            except:
+                print len(self)
+                traceback.print_exc()
+
         return list.__getitem__(self, col)
 
     def __getslice__(self, i, j):
@@ -186,7 +209,7 @@ class CacheRow(list):  # {{{
 
     def refresh_composites(self):
         for c in self._composites:
-            self[c] =  None
+            self[c] = None
         self._must_do = True
 
 # }}}
@@ -206,6 +229,7 @@ class ResultCache(SearchQueryParser):  # {{{
                 self.composites[field_metadata[key]['rec_index']] = key
         self.series_col = field_metadata['series']['rec_index']
         self.series_sort_col = field_metadata['series_sort']['rec_index']
+        self.virtual_libraries_col = field_metadata['virtual_libraries']['rec_index']
         self._data = []
         self._map = self._map_filtered = []
         self.first_sort = True
@@ -312,12 +336,12 @@ class ResultCache(SearchQueryParser):  # {{{
                             '<=':[2, relop_le]
                         }
 
-    local_today         = ('_today', icu_lower(_('today')))
-    local_yesterday     = ('_yesterday', icu_lower(_('yesterday')))
-    local_thismonth     = ('_thismonth', icu_lower(_('thismonth')))
-    local_daysago       = icu_lower(_('daysago'))
-    local_daysago_len   = len(local_daysago)
-    untrans_daysago     = '_daysago'
+    local_today = ('_today', icu_lower(_('today')))
+    local_yesterday = ('_yesterday', icu_lower(_('yesterday')))
+    local_thismonth = ('_thismonth', icu_lower(_('thismonth')))
+    local_daysago = icu_lower(_('daysago'))
+    local_daysago_len = len(local_daysago)
+    untrans_daysago = '_daysago'
     untrans_daysago_len = len('_daysago')
 
     def get_dates_matches(self, location, query, candidates):
@@ -413,21 +437,21 @@ class ResultCache(SearchQueryParser):  # {{{
 
         if val_func is None:
             loc = self.field_metadata[location]['rec_index']
-            val_func = lambda item, loc=loc: item[loc]
+            val_func = lambda item, loc = loc: item[loc]
         q = ''
         cast = adjust = lambda x: x
         dt = self.field_metadata[location]['datatype']
 
         if query == 'false':
             if dt == 'rating' or location == 'cover':
-                relop = lambda x,y: not bool(x)
+                relop = lambda x, y: not bool(x)
             else:
-                relop = lambda x,y: x is None
+                relop = lambda x, y: x is None
         elif query == 'true':
             if dt == 'rating' or location == 'cover':
-                relop = lambda x,y: bool(x)
+                relop = lambda x, y: bool(x)
             else:
-                relop = lambda x,y: x is not None
+                relop = lambda x, y: x is not None
         else:
             relop = None
             for k in self.numeric_search_relops.keys():
@@ -441,7 +465,7 @@ class ResultCache(SearchQueryParser):  # {{{
                 cast = lambda x: int(x)
             elif dt == 'rating':
                 cast = lambda x: 0 if x is None else int(x)
-                adjust = lambda x: x/2
+                adjust = lambda x: x / 2
             elif dt in ('float', 'composite'):
                 cast = lambda x : float(x)
             else:  # count operation
@@ -449,7 +473,7 @@ class ResultCache(SearchQueryParser):  # {{{
 
             if len(query) > 1:
                 mult = query[-1:].lower()
-                mult = {'k':1024.,'m': 1024.**2, 'g': 1024.**3}.get(mult, 1.0)
+                mult = {'k':1024., 'm': 1024.**2, 'g': 1024.**3}.get(mult, 1.0)
                 if mult != 1.0:
                     query = query[:-1]
             else:
@@ -568,12 +592,12 @@ class ResultCache(SearchQueryParser):  # {{{
             query = icu_lower(query)
         return matchkind, query
 
-    local_no        = icu_lower(_('no'))
-    local_yes       = icu_lower(_('yes'))
+    local_no = icu_lower(_('no'))
+    local_yes = icu_lower(_('yes'))
     local_unchecked = icu_lower(_('unchecked'))
-    local_checked   = icu_lower(_('checked'))
-    local_empty     = icu_lower(_('empty'))
-    local_blank     = icu_lower(_('blank'))
+    local_checked = icu_lower(_('checked'))
+    local_empty = icu_lower(_('empty'))
+    local_blank = icu_lower(_('blank'))
     local_bool_values = (
                     local_no, local_unchecked, '_no', 'false',
                     local_yes, local_checked, '_yes', 'true',
@@ -696,8 +720,8 @@ class ResultCache(SearchQueryParser):  # {{{
                 if fm['is_multiple'] and \
                         len(query) > 1 and query.startswith('#') and \
                         query[1:1] in '=<>!':
-                    vf = lambda item, loc=fm['rec_index'], \
-                                ms=fm['is_multiple']['cache_to_list']:\
+                    vf = lambda item, loc = fm['rec_index'], \
+                                ms = fm['is_multiple']['cache_to_list']:\
                             len(item[loc].split(ms)) if item[loc] is not None else 0
                     return self.get_numeric_matches(location, query[1:],
                                                     candidates, val_func=vf)
@@ -707,7 +731,7 @@ class ResultCache(SearchQueryParser):  # {{{
                 if fm.get('is_csp', False):
                     if location == 'identifiers' and original_location == 'isbn':
                         return self.get_keypair_matches('identifiers',
-                                                   '=isbn:'+query, candidates)
+                                                   '=isbn:' + query, candidates)
                     return self.get_keypair_matches(location, query, candidates)
 
             # check for user categories
@@ -759,7 +783,7 @@ class ResultCache(SearchQueryParser):  # {{{
                     q = canonicalize_lang(query)
                     if q is None:
                         lm = lang_map()
-                        rm = {v.lower():k for k,v in lm.iteritems()}
+                        rm = {v.lower():k for k, v in lm.iteritems()}
                         q = rm.get(query, query)
                 else:
                     q = query
@@ -772,7 +796,7 @@ class ResultCache(SearchQueryParser):  # {{{
                     if not item[loc]:
                         if q == 'false' and matchkind == CONTAINS_MATCH:
                             matches.add(item[0])
-                        continue     # item is empty. No possible matches below
+                        continue  # item is empty. No possible matches below
                     if q == 'false'and matchkind == CONTAINS_MATCH:
                         # Field has something in it, so a false query does not match
                         continue
@@ -816,6 +840,13 @@ class ResultCache(SearchQueryParser):  # {{{
                 current_candidates -= matches
         return matches
 
+    def invalidate_virtual_libraries_caches(self, db):
+        self.refresh(db)
+
+    def search_raw(self, query):
+        matches = self.parse(query)
+        return matches
+
     def search(self, query, return_matches=False):
         ans = self.search_getting_ids(query, self.search_restriction,
                                       set_restriction_count=True)
@@ -973,10 +1004,11 @@ class ResultCache(SearchQueryParser):  # {{{
             try:
                 self._data[id] = CacheRow(db, self.composites,
                         db.conn.get('SELECT * from meta2 WHERE id=?', (id,))[0],
-                        self.series_col, self.series_sort_col)
+                        self.series_col, self.series_sort_col,
+                        self.virtual_libraries_col)
                 self._data[id].append(db.book_on_device_string(id))
-                self._data[id].append(self.marked_ids_dict.get(id, None))
-                self._data[id].append(None)
+                self._data[id].extend((self.marked_ids_dict.get(id, None), None, None))
+                self._virt_libs_computed = False
                 self._uuid_map[self._data[id][self._uuid_column_index]] = id
             except IndexError:
                 return None
@@ -989,14 +1021,15 @@ class ResultCache(SearchQueryParser):  # {{{
     def books_added(self, ids, db):
         if not ids:
             return
-        self._data.extend(repeat(None, max(ids)-len(self._data)+2))
+        self._data.extend(repeat(None, max(ids) - len(self._data) + 2))
         for id in ids:
             self._data[id] = CacheRow(db, self.composites,
                         db.conn.get('SELECT * from meta2 WHERE id=?', (id,))[0],
-                        self.series_col, self.series_sort_col)
+                        self.series_col, self.series_sort_col,
+                        self.virtual_libraries_col)
             self._data[id].append(db.book_on_device_string(id))
-            self._data[id].append(self.marked_ids_dict.get(id, None))
-            self._data[id].append(None)  # Series sort column
+            self._data[id].extend((self.marked_ids_dict.get(id, None), None, None))
+            self._virt_libs_computed = False
             self._uuid_map[self._data[id][self._uuid_column_index]] = id
         self._map[0:0] = ids
         self._map_filtered[0:0] = ids
@@ -1020,20 +1053,22 @@ class ResultCache(SearchQueryParser):  # {{{
         db.initialize_template_cache()
 
         temp = db.conn.get('SELECT * FROM meta2')
-        self._data = list(itertools.repeat(None, temp[-1][0]+2)) if temp else []
+        self._data = list(itertools.repeat(None, temp[-1][0] + 2)) if temp else []
         for r in temp:
             self._data[r[0]] = CacheRow(db, self.composites, r,
-                                        self.series_col, self.series_sort_col)
+                                        self.series_col, self.series_sort_col,
+                                        self.virtual_libraries_col)
             self._uuid_map[self._data[r[0]][self._uuid_column_index]] = r[0]
 
         for item in self._data:
             if item is not None:
                 item.append(db.book_on_device_string(item[0]))
-                # Temp mark and series_sort columns
-                item.extend((None, None))
+                # Temp mark, series_sort, virtual_library columns
+                item.extend((None, None, None))
 
+        self._virt_libs_computed = False
         marked_col = self.FIELD_MAP['marked']
-        for id_,val in self.marked_ids_dict.iteritems():
+        for id_, val in self.marked_ids_dict.iteritems():
             try:
                 self._data[id_][marked_col] = val
             except:
@@ -1134,7 +1169,7 @@ class SortKeyGenerator(object):
                         for i, candidate in enumerate(
                                     ('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB')):
                             if val.endswith(candidate):
-                                p = 1024**(i)
+                                p = 1024 ** (i)
                                 val = val[:-len(candidate)].strip()
                                 break
                         val = locale.atof(val) * p
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 547cc5bc08..a86ec7ef6d 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -575,7 +575,7 @@ def command_set_metadata(args, dbpath):
         for key in sorted(db.field_metadata.all_field_keys()):
             m = db.field_metadata[key]
             if (key not in {'formats', 'series_sort', 'ondevice', 'path',
-                'last_modified'} and m['is_editable'] and m['name']):
+                'virtual_libraries', 'last_modified'} and m['is_editable'] and m['name']):
                 yield key, m
                 if m['datatype'] == 'series':
                     si = m.copy()
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index bd3f155c9d..d23633e433 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -449,6 +449,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         self.field_metadata.set_field_record_index('marked', base, prefer_custom=False)
         self.FIELD_MAP['series_sort'] = base = base+1
         self.field_metadata.set_field_record_index('series_sort', base, prefer_custom=False)
+        self.FIELD_MAP['virtual_libraries'] = base = base+1
+        self.field_metadata.set_field_record_index('virtual_libraries', base, prefer_custom=False)
 
         script = '''
         DROP VIEW IF EXISTS meta2;
@@ -992,6 +994,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         mi.book_size   = row[fm['size']]
         mi.ondevice_col= row[fm['ondevice']]
         mi.last_modified = row[fm['last_modified']]
+
+        mi._base_db_row = row # So the formatter functions can see the underlying data
+        mi._virt_lib_column = fm['virtual_libraries']
+
         formats = row[fm['formats']]
         mi.format_metadata = {}
         if not formats:
diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py
index 08c26e95a9..a96f819b58 100644
--- a/src/calibre/library/field_metadata.py
+++ b/src/calibre/library/field_metadata.py
@@ -387,6 +387,16 @@ class FieldMetadata(dict):
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
+            ('virtual_libraries',  {'table':None,
+                           'column':None,
+                           'datatype':'text',
+                           'is_multiple':{},
+                           'kind':'field',
+                           'name':_('Virtual Libraries'),
+                           'search_terms':['virtual_libraries'],
+                           'is_custom':False,
+                           'is_category':False,
+                           'is_csp': False}),
         ]
     # }}}
 
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index 73dad7422b..c94467fec0 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -1209,9 +1209,19 @@ class BuiltinFinishFormatting(BuiltinFormatterFunction):
             return val
         return prefix + formatter._do_format(val, fmt) + suffix
 
+class BuiltinBookInVirtualLibraries(BuiltinFormatterFunction):
+    name = 'book_in_virtual_libraries'
+    arg_count = 0
+    category = 'Get values from metadata'
+    __doc__ = doc = _('book_in_virtual_libraries() -- returns a list of '
+                      'virtual libraries that this book is in.')
+
+    def evaluate(self, formatter, kwargs, mi, locals_):
+        return mi._base_db_row[mi._virt_lib_column ]
+
 _formatter_builtins = [
     BuiltinAdd(), BuiltinAnd(), BuiltinApproximateFormats(),
-    BuiltinAssign(), BuiltinBooksize(),
+    BuiltinAssign(), BuiltinBookInVirtualLibraries(), BuiltinBooksize(),
     BuiltinCapitalize(), BuiltinCmp(), BuiltinContains(), BuiltinCount(),
     BuiltinCurrentLibraryName(), BuiltinCurrentLibraryPath(),
     BuiltinDaysBetween(), BuiltinDivide(), BuiltinEval(), BuiltinFirstNonEmpty(),
diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index 2682088681..08a70a533d 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -294,6 +294,7 @@ class SearchQueryParser(object):
 
     def __init__(self, locations, test=False, optimize=False):
         self.sqp_initialize(locations, test=test, optimize=optimize)
+        self.sqp_parsed_search_cache = {}
         self.parser = Parser()
 
     def sqp_change_locations(self, locations):
@@ -308,8 +309,7 @@ class SearchQueryParser(object):
         # empty the list of searches used for recursion testing
         self.recurse_level = 0
         self.searches_seen = set([])
-        candidates = self.universal_set()
-        return self._parse(query, candidates)
+        return self._parse(query)
 
     # this parse is used internally because it doesn't clear the
     # recursive search test list. However, we permit seeing the
@@ -317,10 +317,13 @@ class SearchQueryParser(object):
     # another search.
     def _parse(self, query, candidates=None):
         self.recurse_level += 1
-        try:
-            res = self.parser.parse(query, self.locations)
-        except RuntimeError:
-            raise ParseException(_('Failed to parse query, recursion limit reached: %s')%repr(query))
+        res = self.sqp_parsed_search_cache.get(query, None)
+        if res is None:
+            try:
+                res = self.parser.parse(query, self.locations)
+                self.sqp_parsed_search_cache[query] = res
+            except RuntimeError:
+                raise ParseException(_('Failed to parse query, recursion limit reached: %s')%repr(query))
         if candidates is None:
             candidates = self.universal_set()
         t = self.evaluate(res, candidates)

From 86c314bbc5a618b46e8429ba26da6ef30793a74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gae=CC=88tan=20Lehmann?= <gaetan.lehmann@gmail.com>
Date: Fri, 12 Jul 2013 18:33:12 +0200
Subject: [PATCH 0169/1154] add monde-diplomatique.fr recipe

---
 recipes/icons/le_monde_diplomatique_fr.png | Bin 0 -> 446 bytes
 recipes/le_monde_diplomatique_fr.recipe    | 111 +++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 recipes/icons/le_monde_diplomatique_fr.png
 create mode 100644 recipes/le_monde_diplomatique_fr.recipe

diff --git a/recipes/icons/le_monde_diplomatique_fr.png b/recipes/icons/le_monde_diplomatique_fr.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae4547977f67c6988ecf696047b47482effa8ddf
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10!Y05c#P!UXGhe=Z{`c?i
zOa_J%<z;tPuH53{e7?PXcWB50LBWrAZXZlby*6XUtJ9~}8XG^}wd?!aH_MciUcGwx
z|NsBp0pCP{<}fCCySoVU?2efR<V^B(aSX9Ief9D|zGejh*T6aKhZZdO_TN5i0;_Ru
z)UHi0?+U1?3mQs&=J##p;oZf2Aa3>HJ8W`|Cl(zu^J-YSPTNYul2KxwhLQP$Q#x!4
zr4Nj^*=~OQplTk&#D2-_NexCU3wTo(H-<LUR0{Ko@n%WM{E>X&ystszz{M@xoaYxD
z{krHL^S0l%^Q$@Jn(O`s*IwmZW5-qS@Zi5#pzBmiTq8<S5=&C8l8aJ-6oZk0p|P%k
zxvrsMh@q*KiLsTbp|*jMm4U(jg(WLdH00)|WTsUDH5gdx8W`ysnS~e{TA3JH8Chx@
X7y>oyUAEN_sDZ)L)z4*}Q$iB}g`T6{

literal 0
HcmV?d00001

diff --git a/recipes/le_monde_diplomatique_fr.recipe b/recipes/le_monde_diplomatique_fr.recipe
new file mode 100644
index 0000000000..b099cf3729
--- /dev/null
+++ b/recipes/le_monde_diplomatique_fr.recipe
@@ -0,0 +1,111 @@
+# vim:fileencoding=utf-8
+from __future__ import unicode_literals
+
+__license__   = 'GPL v3'
+__copyright__ = '2013'
+'''
+monde-diplomatique.fr
+'''
+
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.web.feeds import feeds_from_index
+
+class LeMondeDiplomatiqueSiteWeb(BasicNewsRecipe):
+    title                  = u'Le Monde diplomatique.fr'
+    __author__             = 'Gaëtan Lehmann'
+    description            = "Le Monde diplomatique est un mensuel français d’information et d’opinion à la ligne éditoriale nettement engagée en faveur d'une gauche de rupture avec le capitalisme. Il aborde de nombreux sujets — géopolitique, relations internationales, économie, questions sociales, écologie, culture, médias, …"
+    oldest_article         = 7
+    max_articles_per_feed  = 100
+    auto_cleanup = True
+    publisher              = 'monde-diplomatique.fr'
+    category               = 'news, France, world'
+    language               = 'fr'
+    masthead_url           = 'http://www.monde-diplomatique.fr/squelettes/images/logotyfa.png'
+    timefmt                = ' [%d %b %Y]'
+    no_stylesheets         = True
+
+    feeds                  = [(u'Blogs', u'http://blog.mondediplo.net/spip.php?page=backend'), (u'Archives', u'http://www.monde-diplomatique.fr/rss/')]
+
+    preprocess_regexps     = [
+        (re.compile(r'<title>(.*) - Les blogs du Diplo</title>'), lambda m: '<title>' + m.group(1) + '</title>'),
+        (re.compile(r'<h2>(.*) - Les blogs du Diplo</h2>'), lambda m: '<h2>' + m.group(1) + '</h2>'),
+        (re.compile(r'<title>(.*) \(Le Monde diplomatique\)</title>'), lambda m: '<title>' + m.group(1) + '</title>'),
+        (re.compile(r'<h2>(.*) \(Le Monde diplomatique\)</h2>'), lambda m: '<h2>' + m.group(1) + '</h2>'),
+        (re.compile(r'<h3>Grand format</h3>'), lambda m: '')]
+
+    remove_tags            = [dict(name='div', attrs={'class':'voiraussi liste'}),
+      dict(name='ul', attrs={'class':'hermetique carto hombre_demi_inverse'}),
+      dict(name='a', attrs={'class':'tousles'}),
+      dict(name='h3', attrs={'class':'cat'}),
+      dict(name='div', attrs={'class':'logodiplo'}),
+      dict(name='img', attrs={'class':'spip_logos'}),
+      dict(name='p', attrs={'id':'hierarchie'}),
+      dict(name='div', attrs={'class':'espace'})]
+    
+    conversion_options     = {
+                              'comments'        : description
+                             ,'tags'            : category
+                             ,'language'        : language
+                             ,'publisher'       : publisher
+                             ,'linearize_tables': True
+                          }
+
+    remove_empty_feeds     = True
+
+    filterDuplicates       = True
+
+    # don't use parse_index - we need it to send an exception so we can mix
+    # feed and parse_index results in parse_feeds
+    def parse_index_valise(self):
+        articles = []
+        soup = self.index_to_soup('http://www.monde-diplomatique.fr/carnet/')
+        cnt = soup.find('ul',attrs={'class':'hermetique liste'})
+        for item in cnt.findAll('li'):
+            description = ''
+            feed_link = item.find('a')
+            desc = item.find('div',attrs={'class':'intro'})
+            date = item.find('div',attrs={'class':'dates_auteurs'})
+            if desc:
+               description = desc.string
+            if feed_link and feed_link.has_key('href'):
+                url   = 'http://www.monde-diplomatique.fr' + feed_link['href']
+                title = self.tag_to_string(feed_link)
+                articles.append({
+                                  'title'      :title
+                                 ,'date'       :date.string.strip()
+                                 ,'url'        :url
+                                 ,'description':description
+                                })
+        return [("La valise diplomatique", articles)]
+
+    def parse_index_cartes(self):
+        articles = []
+        soup = self.index_to_soup('http://www.monde-diplomatique.fr/cartes/')
+        cnt = soup.find('div',attrs={'class':'decale hermetique'})
+        for item in cnt.findAll('div',attrs={'class':re.compile('grid_3 filet hombre_demi')}):
+            feed_link = item.find('a',attrs={'class':'couve'})
+            h3 = item.find('h3')
+            authorAndDate = item.find('div',attrs={'class':'dates_auteurs'})
+            author, date = authorAndDate.string.strip().split(', ')
+            if feed_link and feed_link.has_key('href'):
+                url   = 'http://www.monde-diplomatique.fr' + feed_link['href']
+                title = self.tag_to_string(h3)
+                articles.append({
+                                  'title'      :title
+                                 ,'date'       :date
+                                 ,'url'        :url
+                                 ,'description': author
+                                })
+        return [("Cartes", articles)]
+    
+    def parse_feeds(self):
+        feeds = BasicNewsRecipe.parse_feeds(self)
+        valise = feeds_from_index(self.parse_index_valise(), oldest_article=self.oldest_article,
+                                     max_articles_per_feed=self.max_articles_per_feed,
+                                    log=self.log)
+        cartes = feeds_from_index(self.parse_index_cartes(), oldest_article=self.oldest_article,
+                                     max_articles_per_feed=self.max_articles_per_feed,
+                                     log=self.log)
+        feeds = valise + feeds + cartes
+        return feeds

From 452ff0f8a842fd8c93350bf7322c5aba3784cc16 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 Jul 2013 22:17:58 +0530
Subject: [PATCH 0170/1154] oops, accidentally unstaged the files in the last
 commit

---
 recipes/icons/le_monde_diplomatique_fr.png | Bin 0 -> 446 bytes
 recipes/le_monde_diplomatique_fr.recipe    | 111 +++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 recipes/icons/le_monde_diplomatique_fr.png
 create mode 100644 recipes/le_monde_diplomatique_fr.recipe

diff --git a/recipes/icons/le_monde_diplomatique_fr.png b/recipes/icons/le_monde_diplomatique_fr.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae4547977f67c6988ecf696047b47482effa8ddf
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10!Y05c#P!UXGhe=Z{`c?i
zOa_J%<z;tPuH53{e7?PXcWB50LBWrAZXZlby*6XUtJ9~}8XG^}wd?!aH_MciUcGwx
z|NsBp0pCP{<}fCCySoVU?2efR<V^B(aSX9Ief9D|zGejh*T6aKhZZdO_TN5i0;_Ru
z)UHi0?+U1?3mQs&=J##p;oZf2Aa3>HJ8W`|Cl(zu^J-YSPTNYul2KxwhLQP$Q#x!4
zr4Nj^*=~OQplTk&#D2-_NexCU3wTo(H-<LUR0{Ko@n%WM{E>X&ystszz{M@xoaYxD
z{krHL^S0l%^Q$@Jn(O`s*IwmZW5-qS@Zi5#pzBmiTq8<S5=&C8l8aJ-6oZk0p|P%k
zxvrsMh@q*KiLsTbp|*jMm4U(jg(WLdH00)|WTsUDH5gdx8W`ysnS~e{TA3JH8Chx@
X7y>oyUAEN_sDZ)L)z4*}Q$iB}g`T6{

literal 0
HcmV?d00001

diff --git a/recipes/le_monde_diplomatique_fr.recipe b/recipes/le_monde_diplomatique_fr.recipe
new file mode 100644
index 0000000000..f7c3b30fa0
--- /dev/null
+++ b/recipes/le_monde_diplomatique_fr.recipe
@@ -0,0 +1,111 @@
+# vim:fileencoding=utf-8
+from __future__ import unicode_literals
+
+__license__   = 'GPL v3'
+__copyright__ = '2013'
+'''
+monde-diplomatique.fr
+'''
+
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.web.feeds import feeds_from_index
+
+class LeMondeDiplomatiqueSiteWeb(BasicNewsRecipe):
+    title                  = u'Le Monde diplomatique.fr'
+    __author__             = 'Gaëtan Lehmann'
+    description            = "Le Monde diplomatique est un mensuel français d’information et d’opinion à la ligne éditoriale nettement engagée en faveur d'une gauche de rupture avec le capitalisme. Il aborde de nombreux sujets — géopolitique, relations internationales, économie, questions sociales, écologie, culture, médias, …"  # noqa
+    oldest_article         = 7
+    max_articles_per_feed  = 100
+    auto_cleanup = True
+    publisher              = 'monde-diplomatique.fr'
+    category               = 'news, France, world'
+    language               = 'fr'
+    masthead_url           = 'http://www.monde-diplomatique.fr/squelettes/images/logotyfa.png'
+    timefmt                = ' [%d %b %Y]'
+    no_stylesheets         = True
+
+    feeds                  = [(u'Blogs', u'http://blog.mondediplo.net/spip.php?page=backend'), (u'Archives', u'http://www.monde-diplomatique.fr/rss/')]
+
+    preprocess_regexps     = [
+        (re.compile(r'<title>(.*) - Les blogs du Diplo</title>'), lambda m: '<title>' + m.group(1) + '</title>'),
+        (re.compile(r'<h2>(.*) - Les blogs du Diplo</h2>'), lambda m: '<h2>' + m.group(1) + '</h2>'),
+        (re.compile(r'<title>(.*) \(Le Monde diplomatique\)</title>'), lambda m: '<title>' + m.group(1) + '</title>'),
+        (re.compile(r'<h2>(.*) \(Le Monde diplomatique\)</h2>'), lambda m: '<h2>' + m.group(1) + '</h2>'),
+        (re.compile(r'<h3>Grand format</h3>'), lambda m: '')]
+
+    remove_tags            = [dict(name='div', attrs={'class':'voiraussi liste'}),
+      dict(name='ul', attrs={'class':'hermetique carto hombre_demi_inverse'}),
+      dict(name='a', attrs={'class':'tousles'}),
+      dict(name='h3', attrs={'class':'cat'}),
+      dict(name='div', attrs={'class':'logodiplo'}),
+      dict(name='img', attrs={'class':'spip_logos'}),
+      dict(name='p', attrs={'id':'hierarchie'}),
+      dict(name='div', attrs={'class':'espace'})]
+
+    conversion_options     = {
+                              'comments'        : description
+                             ,'tags'            : category
+                             ,'language'        : language
+                             ,'publisher'       : publisher
+                             ,'linearize_tables': True
+                          }
+
+    remove_empty_feeds     = True
+
+    filterDuplicates       = True
+
+    # don't use parse_index - we need it to send an exception so we can mix
+    # feed and parse_index results in parse_feeds
+    def parse_index_valise(self):
+        articles = []
+        soup = self.index_to_soup('http://www.monde-diplomatique.fr/carnet/')
+        cnt = soup.find('ul',attrs={'class':'hermetique liste'})
+        for item in cnt.findAll('li'):
+            description = ''
+            feed_link = item.find('a')
+            desc = item.find('div',attrs={'class':'intro'})
+            date = item.find('div',attrs={'class':'dates_auteurs'})
+            if desc:
+                description = desc.string
+            if feed_link and feed_link.has_key('href'):
+                url   = 'http://www.monde-diplomatique.fr' + feed_link['href']
+                title = self.tag_to_string(feed_link)
+                articles.append({
+                                  'title'      :title
+                                 ,'date'       :date.string.strip()
+                                 ,'url'        :url
+                                 ,'description':description
+                                })
+        return [("La valise diplomatique", articles)]
+
+    def parse_index_cartes(self):
+        articles = []
+        soup = self.index_to_soup('http://www.monde-diplomatique.fr/cartes/')
+        cnt = soup.find('div',attrs={'class':'decale hermetique'})
+        for item in cnt.findAll('div',attrs={'class':re.compile('grid_3 filet hombre_demi')}):
+            feed_link = item.find('a',attrs={'class':'couve'})
+            h3 = item.find('h3')
+            authorAndDate = item.find('div',attrs={'class':'dates_auteurs'})
+            author, date = authorAndDate.string.strip().split(', ')
+            if feed_link and feed_link.has_key('href'):
+                url   = 'http://www.monde-diplomatique.fr' + feed_link['href']
+                title = self.tag_to_string(h3)
+                articles.append({
+                                  'title'      :title
+                                 ,'date'       :date
+                                 ,'url'        :url
+                                 ,'description': author
+                                })
+        return [("Cartes", articles)]
+
+    def parse_feeds(self):
+        feeds = BasicNewsRecipe.parse_feeds(self)
+        valise = feeds_from_index(self.parse_index_valise(), oldest_article=self.oldest_article,
+                                     max_articles_per_feed=self.max_articles_per_feed,
+                                    log=self.log)
+        cartes = feeds_from_index(self.parse_index_cartes(), oldest_article=self.oldest_article,
+                                     max_articles_per_feed=self.max_articles_per_feed,
+                                     log=self.log)
+        feeds = valise + feeds + cartes
+        return feeds

From 2a5e7e09ae423249c317971fe46a3ef41c1bd634 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Fri, 12 Jul 2013 22:28:11 -0400
Subject: [PATCH 0171/1154] Store: Update Amazon plugin for new site layout.

---
 .../gui2/store/stores/amazon_plugin.py        | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/store/stores/amazon_plugin.py b/src/calibre/gui2/store/stores/amazon_plugin.py
index 33f8f9b048..82e83401e8 100644
--- a/src/calibre/gui2/store/stores/amazon_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
@@ -126,15 +126,47 @@ class AmazonKindleStore(StorePlugin):
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read().decode('latin-1', 'replace'))
+            doc = html.fromstring(f.read())
 
-            data_xpath = '//div[contains(@class, "prod")]'
-            format_xpath = './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()'
-            asin_xpath = '@name'
-            cover_xpath = './/img[@class="productImage"]/@src'
-            title_xpath = './/h3[@class="newaps"]/a//text()'
-            author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
-            price_xpath = './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]//span[contains(@class, "lrg") and contains(@class, "bld")]/text()'
+            if doc.xpath('//div[@id = "atfResults" and contains(@class, "grid")]'):
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "ilresults")]'):
+                data_xpath = '//li[(@class="ilo")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './div[@class = "ilf"]/a/img[contains(@class, "ilo")]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                # Results can be in a grid (table) or a column
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "list")]'):
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            else:
+                return
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:

From 309813c8e0e7141a5ef93fed31df05bf7e9c4f36 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 08:52:18 +0530
Subject: [PATCH 0172/1154] Ignore more unused API

---
 src/calibre/db/tests/legacy.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 2f5c879532..eabd351bde 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -269,7 +269,9 @@ class LegacyTest(BaseTest):
             'books_in_old_database',  # unused
 
             # Internal API
-            'clean_user_categories',  'cleanup_tags',  'books_list_filter',
+            'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
+            'construct_path_name', 'clear_dirtied', 'commit_dirty_cache', 'initialize_database', 'initialize_dynamic',
+            'run_import_plugins',
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
@@ -280,7 +282,7 @@ class LegacyTest(BaseTest):
         try:
             total = 0
             for attr in dir(db):
-                if attr in SKIP_ATTRS:
+                if attr in SKIP_ATTRS or attr.startswith('upgrade_version'):
                     continue
                 total += 1
                 if not hasattr(ndb, attr):
@@ -302,7 +304,7 @@ class LegacyTest(BaseTest):
 
         if missing:
             pc = len(missing)/total
-            raise AssertionError('{0:.1%} of API ({2} attrs) are missing. For example: {1}'.format(pc, ', '.join(missing[:5]), len(missing)))
+            raise AssertionError('{0:.1%} of API ({2} attrs) are missing: {1}'.format(pc, ', '.join(missing), len(missing)))
 
     # }}}
 

From 9ea6e0d2a94261619ec65b4b2faf8392937fa32a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 10:03:31 +0530
Subject: [PATCH 0173/1154] conversion_options API

---
 src/calibre/db/backend.py       | 24 +++++++++++++++++++++++-
 src/calibre/db/cache.py         | 16 ++++++++++++++++
 src/calibre/db/legacy.py        | 12 ++++++++++++
 src/calibre/db/tests/legacy.py  | 24 +++++++++++++++++++++++-
 src/calibre/db/tests/writing.py | 17 +++++++++++++++++
 5 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 8ebdc4a154..0ebc9679b7 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -8,7 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 # Imports {{{
-import os, shutil, uuid, json, glob, time
+import os, shutil, uuid, json, glob, time, cPickle
 from functools import partial
 
 import apsw
@@ -1216,5 +1216,27 @@ class DB(object):
     def get_ids_for_custom_book_data(self, name):
         return frozenset(r[0] for r in self.conn.execute('SELECT book FROM books_plugin_data WHERE name=?', (name,)))
 
+    def conversion_options(self, book_id, fmt):
+        for (data,) in self.conn.get('SELECT data FROM conversion_options WHERE book=? AND format=?', (book_id, fmt.upper())):
+            if data:
+                return cPickle.loads(bytes(data))
+
+    def has_conversion_options(self, ids, fmt='PIPE'):
+        ids = frozenset(ids)
+        self.conn.execute('DROP TABLE IF EXISTS conversion_options_temp; CREATE TEMP TABLE conversion_options_temp (id INTEGER PRIMARY KEY);')
+        self.conn.executemany('INSERT INTO conversion_options_temp VALUES (?)', [(x,) for x in ids])
+        for (book_id,) in self.conn.get(
+            'SELECT book FROM conversion_options WHERE format=? AND book IN (SELECT id FROM conversion_options_temp)', (fmt.upper(),)):
+            return True
+        return False
+
+    def delete_conversion_options(self, book_ids, fmt):
+        self.conn.executemany('DELETE FROM conversion_options WHERE book=? AND format=?',
+            [(book_id, fmt.upper()) for book_id in book_ids])
+
+    def set_conversion_options(self, options, fmt):
+        options = [(book_id, fmt.upper(), buffer(cPickle.dumps(data, -1))) for book_id, data in options.iteritems()]
+        self.conn.executemany('INSERT OR REPLACE INTO conversion_options(book,format,data) VALUES (?,?,?)', options)
+
    # }}}
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index bc8f1024f5..a36e53c175 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1208,6 +1208,22 @@ class Cache(object):
         ''' Return the set of book ids for which name has data. '''
         return self.backend.get_ids_for_custom_book_data(name)
 
+    @read_api
+    def conversion_options(self, book_id, fmt='PIPE'):
+        return self.backend.conversion_options(book_id, fmt)
+
+    @read_api
+    def has_conversion_options(self, ids, fmt='PIPE'):
+        return self.backend.has_conversion_options(ids, fmt)
+
+    @write_api
+    def delete_conversion_options(self, book_ids, fmt='PIPE'):
+        return self.backend.delete_conversion_options(book_ids, fmt)
+
+    @write_api
+    def set_conversion_options(self, options, fmt='PIPE'):
+        ''' options must be a map of the form {book_id:conversion_options} '''
+        return self.backend.set_conversion_options(options, fmt)
 
     # }}}
 
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 8c5fa5bd31..03146ea1dc 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -383,6 +383,18 @@ class LibraryDatabase(object):
                         break
         return ans
 
+    def set_conversion_options(self, book_id, fmt, options):
+        self.new_api.set_conversion_options({book_id:options}, fmt=fmt)
+
+    def conversion_options(self, book_id, fmt):
+        return self.new_api.conversion_options(book_id, fmt=fmt)
+
+    def has_conversion_options(self, ids, format='PIPE'):
+        return self.new_api.has_conversion_options(ids, fmt=format)
+
+    def delete_conversion_options(self, book_id, fmt, commit=True):
+        self.new_api.delete_conversion_options((book_id,), fmt=fmt)
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index eabd351bde..bda3401107 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -191,6 +191,27 @@ class LegacyTest(BaseTest):
         db.close()
         # }}}
 
+    def test_legacy_conversion_options(self):  # {{{
+        'Test conversion options API'
+        ndb = self.init_legacy()
+        db = self.init_old()
+        all_ids = ndb.new_api.all_book_ids()
+        op1, op2 = {'xx':'yy'}, {'yy':'zz'}
+        for x in (
+            ('has_conversion_options', all_ids),
+            ('conversion_options', 1, 'PIPE'),
+            ('set_conversion_options', 1, 'PIPE', op1),
+            ('has_conversion_options', all_ids),
+            ('conversion_options', 1, 'PIPE'),
+            ('delete_conversion_options', 1, 'PIPE'),
+            ('has_conversion_options', all_ids),
+        ):
+            meth, args = x[0], x[1:]
+            self.assertEqual((getattr(db, meth)(*args)), (getattr(ndb, meth)(*args)),
+                                 'The method: %s() returned different results for argument %s' % (meth, args))
+        db.close()
+    # }}}
+
     def test_legacy_adding_books(self):  # {{{
         'Test various adding books methods'
         from calibre.ebooks.metadata.book.base import Metadata
@@ -271,7 +292,8 @@ class LegacyTest(BaseTest):
             # Internal API
             'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
             'construct_path_name', 'clear_dirtied', 'commit_dirty_cache', 'initialize_database', 'initialize_dynamic',
-            'run_import_plugins',
+            'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
+            'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length',
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index cb525900ee..36b6d3d2a3 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -419,3 +419,20 @@ class WritingTest(BaseTest):
 
     # }}}
 
+    def test_conversion_options(self):  # {{{
+        ' Test saving of conversion options '
+        cache = self.init_cache()
+        all_ids = cache.all_book_ids()
+        self.assertFalse(cache.has_conversion_options(all_ids))
+        self.assertIsNone(cache.conversion_options(1))
+        op1, op2 = {'xx':'yy'}, {'yy':'zz'}
+        cache.set_conversion_options({1:op1, 2:op2})
+        self.assertTrue(cache.has_conversion_options(all_ids))
+        self.assertEqual(cache.conversion_options(1), op1)
+        self.assertEqual(cache.conversion_options(2), op2)
+        cache.set_conversion_options({1:op2})
+        self.assertEqual(cache.conversion_options(1), op2)
+        cache.delete_conversion_options(all_ids)
+        self.assertFalse(cache.has_conversion_options(all_ids))
+    # }}}
+

From b2163e3846058b94cc8000511d6790f19ba5e80e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 12:02:17 +0530
Subject: [PATCH 0174/1154] remove_items() API

---
 src/calibre/db/cache.py         | 14 ++++++++++++
 src/calibre/db/tables.py        | 38 +++++++++++++++++++++++++++++++++
 src/calibre/db/tests/legacy.py  |  2 +-
 src/calibre/db/tests/writing.py | 38 +++++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index a36e53c175..119e166c49 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -265,8 +265,10 @@ class Cache(object):
             for name, field in self.fields.iteritems():
                 if name[0] == '#' and name.endswith('_index'):
                     field.series_field = self.fields[name[:-len('_index')]]
+                    self.fields[name[:-len('_index')]].index_field = field
                 elif name == 'series_index':
                     field.series_field = self.fields['series']
+                    self.fields['series'].index_field = field
                 elif name == 'authors':
                     field.author_sort_field = self.fields['author_sort']
                 elif name == 'title':
@@ -1179,6 +1181,18 @@ class Cache(object):
             else:
                 table.remove_books(book_ids, self.backend)
 
+    @write_api
+    def remove_items(self, field, item_ids):
+        ''' Delete all items in the specified field with the specified ids. Returns the set of affected book ids. '''
+        field = self.fields[field]
+        affected_books = field.table.remove_items(item_ids, self.backend)
+        if affected_books:
+            if hasattr(field, 'index_field'):
+                self._set_field(field.index_field.name, {bid:1.0 for bid in affected_books})
+            else:
+                self._mark_as_dirty(affected_books)
+        return affected_books
+
     @write_api
     def add_custom_book_data(self, name, val_map, delete_first=False):
         ''' Add data for name where val_map is a map of book_ids to values. If
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 19c4ade10c..7715f6abef 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -204,6 +204,21 @@ class ManyToOneTable(Table):
                 [(x,) for x in clean])
         return clean
 
+    def remove_items(self, item_ids, db):
+        affected_books = set()
+        for item_id in item_ids:
+            val = self.id_map.pop(item_id, null)
+            if val is null:
+                continue
+            book_ids = self.col_book_map.pop(item_id, set())
+            for book_id in book_ids:
+                self.book_col_map.pop(book_id, None)
+            affected_books.update(book_ids)
+        item_ids = tuple((x,) for x in item_ids)
+        db.conn.executemany('DELETE FROM {0} WHERE {1}=?'.format(self.link_table, self.metadata['link_column']), item_ids)
+        db.conn.executemany('DELETE FROM {0} WHERE id=?'.format(self.metadata['table']), item_ids)
+        return affected_books
+
 class ManyToManyTable(ManyToOneTable):
 
     '''
@@ -250,6 +265,21 @@ class ManyToManyTable(ManyToOneTable):
                 [(x,) for x in clean])
         return clean
 
+    def remove_items(self, item_ids, db):
+        affected_books = set()
+        for item_id in item_ids:
+            val = self.id_map.pop(item_id, null)
+            if val is null:
+                continue
+            book_ids = self.col_book_map.pop(item_id, set())
+            for book_id in book_ids:
+                self.book_col_map[book_id] = tuple(x for x in self.book_col_map.get(book_id, ()) if x != item_id)
+            affected_books.update(book_ids)
+        item_ids = tuple((x,) for x in item_ids)
+        db.conn.executemany('DELETE FROM {0} WHERE {1}=?'.format(self.link_table, self.metadata['link_column']), item_ids)
+        db.conn.executemany('DELETE FROM {0} WHERE id=?'.format(self.metadata['table']), item_ids)
+        return affected_books
+
 class AuthorsTable(ManyToManyTable):
 
     def read_id_maps(self, db):
@@ -274,6 +304,9 @@ class AuthorsTable(ManyToManyTable):
             self.asort_map.pop(item_id, None)
         return clean
 
+    def remove_items(self, item_ids, db):
+        raise ValueError('Direct removal of authors is not allowed')
+
 class FormatsTable(ManyToManyTable):
 
     do_clean_on_remove = False
@@ -331,6 +364,9 @@ class FormatsTable(ManyToManyTable):
 
         return {book_id:zero_max(book_id) for book_id in formats_map}
 
+    def remove_items(self, item_ids, db):
+        raise NotImplementedError('Cannot delete a format directly')
+
     def update_fmt(self, book_id, fmt, fname, size, db):
         fmts = list(self.book_col_map.get(book_id, []))
         try:
@@ -381,4 +417,6 @@ class IdentifiersTable(ManyToManyTable):
                         clean.add(item_id)
         return clean
 
+    def remove_items(self, item_ids, db):
+        raise NotImplementedError('Direct deletion of identifiers is not implemented')
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index bda3401107..7182a6ef06 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -293,7 +293,7 @@ class LegacyTest(BaseTest):
             'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
             'construct_path_name', 'clear_dirtied', 'commit_dirty_cache', 'initialize_database', 'initialize_dynamic',
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
-            'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length',
+            'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 36b6d3d2a3..c4918b4c4b 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -436,3 +436,41 @@ class WritingTest(BaseTest):
         self.assertFalse(cache.has_conversion_options(all_ids))
     # }}}
 
+    def test_remove_items(self):  # {{{
+        ' Test removal of many-(many,one) items '
+        cache = self.init_cache()
+        tmap = cache.get_id_map('tags')
+        self.assertEqual(cache.remove_items('tags', tmap), {1, 2})
+        tmap = cache.get_id_map('#tags')
+        t = {v:k for k, v in tmap.iteritems()}['My Tag Two']
+        self.assertEqual(cache.remove_items('#tags', (t,)), {1, 2})
+
+        smap = cache.get_id_map('series')
+        self.assertEqual(cache.remove_items('series', smap), {1, 2})
+        smap = cache.get_id_map('#series')
+        s = {v:k for k, v in smap.iteritems()}['My Series Two']
+        self.assertEqual(cache.remove_items('#series', (s,)), {1})
+
+        for c in (cache, self.init_cache()):
+            self.assertFalse(c.get_id_map('tags'))
+            self.assertFalse(c.all_field_names('tags'))
+            for bid in c.all_book_ids():
+                self.assertFalse(c.field_for('tags', bid))
+
+            self.assertEqual(len(c.get_id_map('#tags')), 1)
+            self.assertEqual(c.all_field_names('#tags'), {'My Tag One'})
+            for bid in c.all_book_ids():
+                self.assertIn(c.field_for('#tags', bid), ((), ('My Tag One',)))
+
+            for bid in (1, 2):
+                self.assertEqual(c.field_for('series_index', bid), 1.0)
+            self.assertFalse(c.get_id_map('series'))
+            self.assertFalse(c.all_field_names('series'))
+            for bid in c.all_book_ids():
+                self.assertFalse(c.field_for('series', bid))
+
+            self.assertEqual(c.field_for('series_index', 1), 1.0)
+            self.assertEqual(c.all_field_names('#series'), {'My Series One'})
+            for bid in c.all_book_ids():
+                self.assertIn(c.field_for('#series', bid), (None, 'My Series One'))
+    # }}}

From ba2618f03d90625d17bf8ff4081ba461c6c10413 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 12:45:35 +0530
Subject: [PATCH 0175/1154] delete_*_using_id() API

---
 src/calibre/db/legacy.py       |  7 +++++++
 src/calibre/db/tests/legacy.py | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 03146ea1dc..6128d6a09a 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -98,6 +98,13 @@ class LibraryDatabase(object):
                     return self.new_api.get_item_name(field, item_id)
                 return func
             setattr(self, '%s_name' % field, MT(getter(field)))
+        for field in ('publisher', 'series', 'tag'):
+            def getter(field):
+                fname = 'tags' if field == 'tag' else field
+                def func(self, item_id):
+                    self.new_api.remove_items(fname, (item_id,))
+                return func
+            setattr(self, 'delete_%s_using_id' % field, MT(getter(field)))
 
         # Legacy field API
         for func in (
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 7182a6ef06..76deaea792 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -212,6 +212,31 @@ class LegacyTest(BaseTest):
         db.close()
     # }}}
 
+    def test_legacy_delete_using(self):  # {{{
+        'Test delete_using() API'
+        ndb = self.init_legacy()
+        db = self.init_old()
+        cache = ndb.new_api
+        tmap = cache.get_id_map('tags')
+        t = next(tmap.iterkeys())
+        pmap = cache.get_id_map('publisher')
+        p = next(pmap.iterkeys())
+        for x in (
+            ('delete_tag_using_id', t),
+            ('delete_publisher_using_id', p),
+            (db.refresh,),
+            ('all_tag_names',), ('tags', 0), ('tags', 1), ('tags', 2),
+            ('all_publisher_names',), ('publisher', 0), ('publisher', 1), ('publisher', 2),
+        ):
+            meth, args = x[0], x[1:]
+            if callable(meth):
+                meth(*args)
+            else:
+                self.assertEqual((getattr(db, meth)(*args)), (getattr(ndb, meth)(*args)),
+                                 'The method: %s() returned different results for argument %s' % (meth, args))
+        db.close()
+    # }}}
+
     def test_legacy_adding_books(self):  # {{{
         'Test various adding books methods'
         from calibre.ebooks.metadata.book.base import Metadata

From a87be86958d7ce9a2a7ecd9719ee2ad0328163c2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 14:04:11 +0530
Subject: [PATCH 0176/1154] set() API

---
 src/calibre/db/legacy.py         |  7 +++++
 src/calibre/db/tests/legacy.py   | 47 ++++++++++++++++++++++++++------
 src/calibre/db/write.py          |  2 +-
 src/calibre/library/database2.py |  2 +-
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 6128d6a09a..83392d6d16 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -402,6 +402,13 @@ class LibraryDatabase(object):
     def delete_conversion_options(self, book_id, fmt, commit=True):
         self.new_api.delete_conversion_options((book_id,), fmt=fmt)
 
+    def set(self, index, field, val, allow_case_change=False):
+        book_id = self.data.index_to_id(index)
+        try:
+            return self.new_api.set_field(field, {book_id:val}, allow_case_change=allow_case_change)
+        finally:
+            self.notify('metadata', [book_id])
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 76deaea792..037f972010 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -40,6 +40,19 @@ def compare_argspecs(old, new, attr):
     if not ok:
         raise AssertionError('The argspec for %s does not match. %r != %r' % (attr, old, new))
 
+def run_funcs(self, db, ndb, funcs):
+    for func in funcs:
+        meth, args = func[0], func[1:]
+        if callable(meth):
+            meth(*args)
+        else:
+            fmt = lambda x:x
+            if meth[0] in {'!', '@', '#'}:
+                fmt = {'!':dict, '@':frozenset, '#':lambda x:set((x or '').split(','))}[meth[0]]
+                meth = meth[1:]
+            self.assertEqual(fmt(getattr(db, meth)(*args)), fmt(getattr(ndb, meth)(*args)),
+                                'The method: %s() returned different results for argument %s' % (meth, args))
+
 class LegacyTest(BaseTest):
 
     ''' Test the emulation of the legacy interface. '''
@@ -137,8 +150,9 @@ class LegacyTest(BaseTest):
     def test_legacy_direct(self):  # {{{
         'Test methods that are directly equivalent in the old and new interface'
         from calibre.ebooks.metadata.book.base import Metadata
-        ndb = self.init_legacy()
+        ndb = self.init_legacy(self.cloned_library)
         db = self.init_old()
+
         for meth, args in {
             'get_next_series_num_for': [('A Series One',)],
             'author_sort_from_authors': [(['Author One', 'Author Two', 'Unknown'],)],
@@ -221,19 +235,13 @@ class LegacyTest(BaseTest):
         t = next(tmap.iterkeys())
         pmap = cache.get_id_map('publisher')
         p = next(pmap.iterkeys())
-        for x in (
+        run_funcs(self, db, ndb, (
             ('delete_tag_using_id', t),
             ('delete_publisher_using_id', p),
             (db.refresh,),
             ('all_tag_names',), ('tags', 0), ('tags', 1), ('tags', 2),
             ('all_publisher_names',), ('publisher', 0), ('publisher', 1), ('publisher', 2),
-        ):
-            meth, args = x[0], x[1:]
-            if callable(meth):
-                meth(*args)
-            else:
-                self.assertEqual((getattr(db, meth)(*args)), (getattr(ndb, meth)(*args)),
-                                 'The method: %s() returned different results for argument %s' % (meth, args))
+        ))
         db.close()
     # }}}
 
@@ -387,3 +395,24 @@ class LegacyTest(BaseTest):
         old.close()
     # }}}
 
+    def test_legacy_setters(self):  # {{{
+        'Test methods that are directly equivalent in the old and new interface'
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+
+        run_funcs(self, db, ndb, (
+            ('set', 0, 'title', 'newtitle'),
+            ('set', 0, 'tags', 't1,t2,tag one', True),
+            ('set', 0, 'authors', 'author one & Author Two', True),
+            ('set', 0, 'rating', 3.2),
+            ('set', 0, 'publisher', 'publisher one', True),
+            (db.refresh,),
+            ('title', 0),
+            ('rating', 0),
+            ('#tags', 0), ('#tags', 1), ('#tags', 2),
+            ('authors', 0), ('authors', 1), ('authors', 2),
+            ('publisher', 0), ('publisher', 1), ('publisher', 2),
+        ))
+        db.close()
+
+    # }}}
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 9bae3e6abb..a257788a60 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -142,7 +142,7 @@ def get_adapter(name, metadata):
     elif dt == 'comments':
         ans = single_text
     elif dt == 'rating':
-        ans = lambda x: None if x in {None, 0} else min(10., max(0., adapt_number(float, x)))
+        ans = lambda x: None if x in {None, 0} else min(10, max(0, adapt_number(int, x)))
     elif dt == 'enumeration':
         ans = single_text
     elif dt == 'composite':
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index bd3f155c9d..61c1653cee 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -2206,7 +2206,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         id = self.data[row][0]
         col = self.FIELD_MAP[column]
 
-        books_to_refresh = set()
+        books_to_refresh = {id}
         set_args = (row, col, val)
         if column == 'authors':
             val = string_to_authors(val)

From 3d122c8e7d120358c38fb84be2f51ff8a8df1cd0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 14:10:34 +0530
Subject: [PATCH 0177/1154] Add note about migrating refresh() behavior

---
 src/calibre/db/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index eded760cde..781e886567 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -114,4 +114,7 @@ Various things that require other things before they can be migrated:
     3. From refresh in the legacy interface: Rember to flush the composite
     column template cache.
     4. Replace the metadatabackup thread with the new implementation when using the new backend.
+    5. In the new API refresh() does not re-read from disk. That might break a
+    few things, for example content server reloading on db change as well as
+    dump/restore of db?
 '''

From 090eed4153772a7a6cbcdf67ddb321eae324f57c Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 13 Jul 2013 11:09:14 +0200
Subject: [PATCH 0178/1154] For the virtual library column stuff: avoid using
 refresh when invalidating libraries.

---
 src/calibre/gui2/search_restriction_mixin.py |  6 +++---
 src/calibre/library/caches.py                | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index a90d607ea9..63094b45f0 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -332,7 +332,7 @@ class SearchRestrictionMixin(object):
         virt_libs = db.prefs.get('virtual_libraries', {})
         virt_libs[name] = search
         db.prefs.set('virtual_libraries', virt_libs)
-        db.data.invalidate_virtual_libraries_caches(db)
+        db.data.invalidate_virtual_libraries_caches()
 
     def do_create_edit(self, name=None):
         db = self.library_view.model().db
@@ -342,7 +342,7 @@ class SearchRestrictionMixin(object):
             if name:
                 self._remove_vl(name, reapply=False)
             self.add_virtual_library(db, cd.library_name, cd.library_search)
-            db.data.invalidate_virtual_libraries_caches(db)
+            db.data.invalidate_virtual_libraries_caches()
             if not name or name == db.data.get_base_restriction_name():
                 self.apply_virtual_library(cd.library_name)
             else:
@@ -467,7 +467,7 @@ class SearchRestrictionMixin(object):
             return
         self._remove_vl(name, reapply=True)
         db = self.library_view.model().db
-        db.data.invalidate_virtual_libraries_caches(db)
+        db.data.invalidate_virtual_libraries_caches()
         self.tags_view.recount()
 
     def _remove_vl(self, name, reapply=True):
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index 05d964be71..544a8e4b56 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -212,6 +212,8 @@ class CacheRow(list):  # {{{
             self[c] = None
         self._must_do = True
 
+    def refresh_virtual_libraries(self):
+        self._virt_libs = None
 # }}}
 
 class ResultCache(SearchQueryParser):  # {{{
@@ -247,6 +249,8 @@ class ResultCache(SearchQueryParser):  # {{{
         pref_use_primary_find_in_search = prefs['use_primary_find_in_search']
         self._uuid_column_index = self.FIELD_MAP['uuid']
         self._uuid_map = {}
+        self._virt_libs_computed = False
+        self._ids_in_virt_libs = {}
 
     def break_cycles(self):
         self._data = self.field_metadata = self.FIELD_MAP = \
@@ -840,8 +844,14 @@ class ResultCache(SearchQueryParser):  # {{{
                 current_candidates -= matches
         return matches
 
-    def invalidate_virtual_libraries_caches(self, db):
-        self.refresh(db)
+    def invalidate_virtual_libraries_caches(self):
+        self._virt_libs_computed = False
+        self._ids_in_virt_libs = {}
+
+        for row in self._data:
+            if row is not None:
+                row.refresh_virtual_libraries()
+                row.refresh_composites()
 
     def search_raw(self, query):
         matches = self.parse(query)

From 642b6732c7170372d75029838a0a3774122b37e8 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 13 Jul 2013 11:38:23 +0200
Subject: [PATCH 0179/1154] [Bug 1200826] [NEW] Matching a library book to
 device search default

---
 src/calibre/gui2/dialogs/match_books.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/dialogs/match_books.py b/src/calibre/gui2/dialogs/match_books.py
index 6914c8bb84..6ac7aa533c 100644
--- a/src/calibre/gui2/dialogs/match_books.py
+++ b/src/calibre/gui2/dialogs/match_books.py
@@ -107,6 +107,8 @@ class MatchBooks(QDialog, Ui_MatchBooks):
         self.buttonBox.rejected.connect(self.reject)
         self.ignore_next_key = False
 
+        self.search_text.setText(self.device_db[self.current_device_book_id].title)
+
     def return_pressed(self):
         self.ignore_next_key = True
         self.do_search()

From 2dec08b6fbb0f4330bf408d237bd37f25da3707a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 15:25:10 +0530
Subject: [PATCH 0180/1154] Fix #1200826 [Matching a library book to device
 search default](https://bugs.launchpad.net/calibre/+bug/1200826) (patch taken
 from cbhaley)

---
 src/calibre/gui2/dialogs/match_books.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/dialogs/match_books.py b/src/calibre/gui2/dialogs/match_books.py
index 6914c8bb84..6ac7aa533c 100644
--- a/src/calibre/gui2/dialogs/match_books.py
+++ b/src/calibre/gui2/dialogs/match_books.py
@@ -107,6 +107,8 @@ class MatchBooks(QDialog, Ui_MatchBooks):
         self.buttonBox.rejected.connect(self.reject)
         self.ignore_next_key = False
 
+        self.search_text.setText(self.device_db[self.current_device_book_id].title)
+
     def return_pressed(self):
         self.ignore_next_key = True
         self.do_search()

From 1c75418d2065b51fd9782206705cbe938ee08c1a Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 13 Jul 2013 12:52:47 +0200
Subject: [PATCH 0181/1154] Back the virtual library column stuff out of this
 branch.

---
 src/calibre/gui2/search_restriction_mixin.py |   7 --
 src/calibre/library/caches.py                | 125 ++++++-------------
 src/calibre/library/cli.py                   |   2 +-
 src/calibre/library/database2.py             |   6 -
 src/calibre/library/field_metadata.py        |  10 --
 src/calibre/utils/formatter_functions.py     |  12 +-
 src/calibre/utils/search_query_parser.py     |  15 +--
 7 files changed, 48 insertions(+), 129 deletions(-)

diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 63094b45f0..b986a2a78e 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -332,7 +332,6 @@ class SearchRestrictionMixin(object):
         virt_libs = db.prefs.get('virtual_libraries', {})
         virt_libs[name] = search
         db.prefs.set('virtual_libraries', virt_libs)
-        db.data.invalidate_virtual_libraries_caches()
 
     def do_create_edit(self, name=None):
         db = self.library_view.model().db
@@ -342,11 +341,8 @@ class SearchRestrictionMixin(object):
             if name:
                 self._remove_vl(name, reapply=False)
             self.add_virtual_library(db, cd.library_name, cd.library_search)
-            db.data.invalidate_virtual_libraries_caches()
             if not name or name == db.data.get_base_restriction_name():
                 self.apply_virtual_library(cd.library_name)
-            else:
-                self.tags_view.recount()
 
     def virtual_library_clicked(self):
         m = self.virtual_library_menu
@@ -466,9 +462,6 @@ class SearchRestrictionMixin(object):
                         default_yes=False):
             return
         self._remove_vl(name, reapply=True)
-        db = self.library_view.model().db
-        db.data.invalidate_virtual_libraries_caches()
-        self.tags_view.recount()
 
     def _remove_vl(self, name, reapply=True):
         db = self.library_view.model().db
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index 544a8e4b56..e552ead591 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import with_statement
 
-__license__ = 'GPL v3'
+__license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
@@ -144,8 +144,7 @@ def force_to_bool(val):
 
 class CacheRow(list):  # {{{
 
-    def __init__(self, db, composites, val, series_col, series_sort_col,
-                 virtual_library_col):
+    def __init__(self, db, composites, val, series_col, series_sort_col):
         self.db = db
         self._composites = composites
         list.__init__(self, val)
@@ -153,8 +152,6 @@ class CacheRow(list):  # {{{
         self._series_col = series_col
         self._series_sort_col = series_sort_col
         self._series_sort = None
-        self._virt_lib_col = virtual_library_col
-        self._virt_libs = None
 
     def __getitem__(self, col):
         if self._must_do:
@@ -174,7 +171,7 @@ class CacheRow(list):  # {{{
                 mi = self.db.get_metadata(id_, index_is_id=True,
                                           get_user_categories=False)
                 for c in self._composites:
-                    self[c] = mi.get(self._composites[c])
+                    self[c] =  mi.get(self._composites[c])
         if col == self._series_sort_col and self._series_sort is None:
             if self[self._series_col]:
                 self._series_sort = title_sort(self[self._series_col])
@@ -182,26 +179,6 @@ class CacheRow(list):  # {{{
             else:
                 self._series_sort = ''
                 self[self._series_sort_col] = ''
-
-        if col == self._virt_lib_col and self._virt_libs is None:
-            try:
-                if not getattr(self.db.data, '_virt_libs_computed', False):
-                    self.db.data._ids_in_virt_libs = {}
-                    for v,s in self.db.prefs.get('virtual_libraries', {}).iteritems():
-                        self.db.data._ids_in_virt_libs[v] = self.db.data.search_raw(s)
-                    self.db.data._virt_libs_computed = True
-                r = []
-                for v in self.db.prefs.get('virtual_libraries', {}).keys():
-                    # optimize the lookup of the ID -- it is always zero
-                    if self[0] in self.db.data._ids_in_virt_libs[v]:
-                        r.append(v)
-                from calibre.utils.icu import sort_key
-                self._virt_libs = ", ".join(sorted(r, key=sort_key))
-                self[self._virt_lib_col] = self._virt_libs
-            except:
-                print len(self)
-                traceback.print_exc()
-
         return list.__getitem__(self, col)
 
     def __getslice__(self, i, j):
@@ -209,11 +186,9 @@ class CacheRow(list):  # {{{
 
     def refresh_composites(self):
         for c in self._composites:
-            self[c] = None
+            self[c] =  None
         self._must_do = True
 
-    def refresh_virtual_libraries(self):
-        self._virt_libs = None
 # }}}
 
 class ResultCache(SearchQueryParser):  # {{{
@@ -231,7 +206,6 @@ class ResultCache(SearchQueryParser):  # {{{
                 self.composites[field_metadata[key]['rec_index']] = key
         self.series_col = field_metadata['series']['rec_index']
         self.series_sort_col = field_metadata['series_sort']['rec_index']
-        self.virtual_libraries_col = field_metadata['virtual_libraries']['rec_index']
         self._data = []
         self._map = self._map_filtered = []
         self.first_sort = True
@@ -249,8 +223,6 @@ class ResultCache(SearchQueryParser):  # {{{
         pref_use_primary_find_in_search = prefs['use_primary_find_in_search']
         self._uuid_column_index = self.FIELD_MAP['uuid']
         self._uuid_map = {}
-        self._virt_libs_computed = False
-        self._ids_in_virt_libs = {}
 
     def break_cycles(self):
         self._data = self.field_metadata = self.FIELD_MAP = \
@@ -340,12 +312,12 @@ class ResultCache(SearchQueryParser):  # {{{
                             '<=':[2, relop_le]
                         }
 
-    local_today = ('_today', icu_lower(_('today')))
-    local_yesterday = ('_yesterday', icu_lower(_('yesterday')))
-    local_thismonth = ('_thismonth', icu_lower(_('thismonth')))
-    local_daysago = icu_lower(_('daysago'))
-    local_daysago_len = len(local_daysago)
-    untrans_daysago = '_daysago'
+    local_today         = ('_today', icu_lower(_('today')))
+    local_yesterday     = ('_yesterday', icu_lower(_('yesterday')))
+    local_thismonth     = ('_thismonth', icu_lower(_('thismonth')))
+    local_daysago       = icu_lower(_('daysago'))
+    local_daysago_len   = len(local_daysago)
+    untrans_daysago     = '_daysago'
     untrans_daysago_len = len('_daysago')
 
     def get_dates_matches(self, location, query, candidates):
@@ -441,21 +413,21 @@ class ResultCache(SearchQueryParser):  # {{{
 
         if val_func is None:
             loc = self.field_metadata[location]['rec_index']
-            val_func = lambda item, loc = loc: item[loc]
+            val_func = lambda item, loc=loc: item[loc]
         q = ''
         cast = adjust = lambda x: x
         dt = self.field_metadata[location]['datatype']
 
         if query == 'false':
             if dt == 'rating' or location == 'cover':
-                relop = lambda x, y: not bool(x)
+                relop = lambda x,y: not bool(x)
             else:
-                relop = lambda x, y: x is None
+                relop = lambda x,y: x is None
         elif query == 'true':
             if dt == 'rating' or location == 'cover':
-                relop = lambda x, y: bool(x)
+                relop = lambda x,y: bool(x)
             else:
-                relop = lambda x, y: x is not None
+                relop = lambda x,y: x is not None
         else:
             relop = None
             for k in self.numeric_search_relops.keys():
@@ -469,7 +441,7 @@ class ResultCache(SearchQueryParser):  # {{{
                 cast = lambda x: int(x)
             elif dt == 'rating':
                 cast = lambda x: 0 if x is None else int(x)
-                adjust = lambda x: x / 2
+                adjust = lambda x: x/2
             elif dt in ('float', 'composite'):
                 cast = lambda x : float(x)
             else:  # count operation
@@ -477,7 +449,7 @@ class ResultCache(SearchQueryParser):  # {{{
 
             if len(query) > 1:
                 mult = query[-1:].lower()
-                mult = {'k':1024., 'm': 1024.**2, 'g': 1024.**3}.get(mult, 1.0)
+                mult = {'k':1024.,'m': 1024.**2, 'g': 1024.**3}.get(mult, 1.0)
                 if mult != 1.0:
                     query = query[:-1]
             else:
@@ -596,12 +568,12 @@ class ResultCache(SearchQueryParser):  # {{{
             query = icu_lower(query)
         return matchkind, query
 
-    local_no = icu_lower(_('no'))
-    local_yes = icu_lower(_('yes'))
+    local_no        = icu_lower(_('no'))
+    local_yes       = icu_lower(_('yes'))
     local_unchecked = icu_lower(_('unchecked'))
-    local_checked = icu_lower(_('checked'))
-    local_empty = icu_lower(_('empty'))
-    local_blank = icu_lower(_('blank'))
+    local_checked   = icu_lower(_('checked'))
+    local_empty     = icu_lower(_('empty'))
+    local_blank     = icu_lower(_('blank'))
     local_bool_values = (
                     local_no, local_unchecked, '_no', 'false',
                     local_yes, local_checked, '_yes', 'true',
@@ -724,8 +696,8 @@ class ResultCache(SearchQueryParser):  # {{{
                 if fm['is_multiple'] and \
                         len(query) > 1 and query.startswith('#') and \
                         query[1:1] in '=<>!':
-                    vf = lambda item, loc = fm['rec_index'], \
-                                ms = fm['is_multiple']['cache_to_list']:\
+                    vf = lambda item, loc=fm['rec_index'], \
+                                ms=fm['is_multiple']['cache_to_list']:\
                             len(item[loc].split(ms)) if item[loc] is not None else 0
                     return self.get_numeric_matches(location, query[1:],
                                                     candidates, val_func=vf)
@@ -735,7 +707,7 @@ class ResultCache(SearchQueryParser):  # {{{
                 if fm.get('is_csp', False):
                     if location == 'identifiers' and original_location == 'isbn':
                         return self.get_keypair_matches('identifiers',
-                                                   '=isbn:' + query, candidates)
+                                                   '=isbn:'+query, candidates)
                     return self.get_keypair_matches(location, query, candidates)
 
             # check for user categories
@@ -787,7 +759,7 @@ class ResultCache(SearchQueryParser):  # {{{
                     q = canonicalize_lang(query)
                     if q is None:
                         lm = lang_map()
-                        rm = {v.lower():k for k, v in lm.iteritems()}
+                        rm = {v.lower():k for k,v in lm.iteritems()}
                         q = rm.get(query, query)
                 else:
                     q = query
@@ -800,7 +772,7 @@ class ResultCache(SearchQueryParser):  # {{{
                     if not item[loc]:
                         if q == 'false' and matchkind == CONTAINS_MATCH:
                             matches.add(item[0])
-                        continue  # item is empty. No possible matches below
+                        continue     # item is empty. No possible matches below
                     if q == 'false'and matchkind == CONTAINS_MATCH:
                         # Field has something in it, so a false query does not match
                         continue
@@ -844,19 +816,6 @@ class ResultCache(SearchQueryParser):  # {{{
                 current_candidates -= matches
         return matches
 
-    def invalidate_virtual_libraries_caches(self):
-        self._virt_libs_computed = False
-        self._ids_in_virt_libs = {}
-
-        for row in self._data:
-            if row is not None:
-                row.refresh_virtual_libraries()
-                row.refresh_composites()
-
-    def search_raw(self, query):
-        matches = self.parse(query)
-        return matches
-
     def search(self, query, return_matches=False):
         ans = self.search_getting_ids(query, self.search_restriction,
                                       set_restriction_count=True)
@@ -1014,11 +973,10 @@ class ResultCache(SearchQueryParser):  # {{{
             try:
                 self._data[id] = CacheRow(db, self.composites,
                         db.conn.get('SELECT * from meta2 WHERE id=?', (id,))[0],
-                        self.series_col, self.series_sort_col,
-                        self.virtual_libraries_col)
+                        self.series_col, self.series_sort_col)
                 self._data[id].append(db.book_on_device_string(id))
-                self._data[id].extend((self.marked_ids_dict.get(id, None), None, None))
-                self._virt_libs_computed = False
+                self._data[id].append(self.marked_ids_dict.get(id, None))
+                self._data[id].append(None)
                 self._uuid_map[self._data[id][self._uuid_column_index]] = id
             except IndexError:
                 return None
@@ -1031,15 +989,14 @@ class ResultCache(SearchQueryParser):  # {{{
     def books_added(self, ids, db):
         if not ids:
             return
-        self._data.extend(repeat(None, max(ids) - len(self._data) + 2))
+        self._data.extend(repeat(None, max(ids)-len(self._data)+2))
         for id in ids:
             self._data[id] = CacheRow(db, self.composites,
                         db.conn.get('SELECT * from meta2 WHERE id=?', (id,))[0],
-                        self.series_col, self.series_sort_col,
-                        self.virtual_libraries_col)
+                        self.series_col, self.series_sort_col)
             self._data[id].append(db.book_on_device_string(id))
-            self._data[id].extend((self.marked_ids_dict.get(id, None), None, None))
-            self._virt_libs_computed = False
+            self._data[id].append(self.marked_ids_dict.get(id, None))
+            self._data[id].append(None)  # Series sort column
             self._uuid_map[self._data[id][self._uuid_column_index]] = id
         self._map[0:0] = ids
         self._map_filtered[0:0] = ids
@@ -1063,22 +1020,20 @@ class ResultCache(SearchQueryParser):  # {{{
         db.initialize_template_cache()
 
         temp = db.conn.get('SELECT * FROM meta2')
-        self._data = list(itertools.repeat(None, temp[-1][0] + 2)) if temp else []
+        self._data = list(itertools.repeat(None, temp[-1][0]+2)) if temp else []
         for r in temp:
             self._data[r[0]] = CacheRow(db, self.composites, r,
-                                        self.series_col, self.series_sort_col,
-                                        self.virtual_libraries_col)
+                                        self.series_col, self.series_sort_col)
             self._uuid_map[self._data[r[0]][self._uuid_column_index]] = r[0]
 
         for item in self._data:
             if item is not None:
                 item.append(db.book_on_device_string(item[0]))
-                # Temp mark, series_sort, virtual_library columns
-                item.extend((None, None, None))
+                # Temp mark and series_sort columns
+                item.extend((None, None))
 
-        self._virt_libs_computed = False
         marked_col = self.FIELD_MAP['marked']
-        for id_, val in self.marked_ids_dict.iteritems():
+        for id_,val in self.marked_ids_dict.iteritems():
             try:
                 self._data[id_][marked_col] = val
             except:
@@ -1179,7 +1134,7 @@ class SortKeyGenerator(object):
                         for i, candidate in enumerate(
                                     ('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB')):
                             if val.endswith(candidate):
-                                p = 1024 ** (i)
+                                p = 1024**(i)
                                 val = val[:-len(candidate)].strip()
                                 break
                         val = locale.atof(val) * p
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index a86ec7ef6d..547cc5bc08 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -575,7 +575,7 @@ def command_set_metadata(args, dbpath):
         for key in sorted(db.field_metadata.all_field_keys()):
             m = db.field_metadata[key]
             if (key not in {'formats', 'series_sort', 'ondevice', 'path',
-                'virtual_libraries', 'last_modified'} and m['is_editable'] and m['name']):
+                'last_modified'} and m['is_editable'] and m['name']):
                 yield key, m
                 if m['datatype'] == 'series':
                     si = m.copy()
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 00c6fb057f..61c1653cee 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -449,8 +449,6 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         self.field_metadata.set_field_record_index('marked', base, prefer_custom=False)
         self.FIELD_MAP['series_sort'] = base = base+1
         self.field_metadata.set_field_record_index('series_sort', base, prefer_custom=False)
-        self.FIELD_MAP['virtual_libraries'] = base = base+1
-        self.field_metadata.set_field_record_index('virtual_libraries', base, prefer_custom=False)
 
         script = '''
         DROP VIEW IF EXISTS meta2;
@@ -994,10 +992,6 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         mi.book_size   = row[fm['size']]
         mi.ondevice_col= row[fm['ondevice']]
         mi.last_modified = row[fm['last_modified']]
-
-        mi._base_db_row = row # So the formatter functions can see the underlying data
-        mi._virt_lib_column = fm['virtual_libraries']
-
         formats = row[fm['formats']]
         mi.format_metadata = {}
         if not formats:
diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py
index a96f819b58..08c26e95a9 100644
--- a/src/calibre/library/field_metadata.py
+++ b/src/calibre/library/field_metadata.py
@@ -387,16 +387,6 @@ class FieldMetadata(dict):
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('virtual_libraries',  {'table':None,
-                           'column':None,
-                           'datatype':'text',
-                           'is_multiple':{},
-                           'kind':'field',
-                           'name':_('Virtual Libraries'),
-                           'search_terms':['virtual_libraries'],
-                           'is_custom':False,
-                           'is_category':False,
-                           'is_csp': False}),
         ]
     # }}}
 
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index c94467fec0..73dad7422b 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -1209,19 +1209,9 @@ class BuiltinFinishFormatting(BuiltinFormatterFunction):
             return val
         return prefix + formatter._do_format(val, fmt) + suffix
 
-class BuiltinBookInVirtualLibraries(BuiltinFormatterFunction):
-    name = 'book_in_virtual_libraries'
-    arg_count = 0
-    category = 'Get values from metadata'
-    __doc__ = doc = _('book_in_virtual_libraries() -- returns a list of '
-                      'virtual libraries that this book is in.')
-
-    def evaluate(self, formatter, kwargs, mi, locals_):
-        return mi._base_db_row[mi._virt_lib_column ]
-
 _formatter_builtins = [
     BuiltinAdd(), BuiltinAnd(), BuiltinApproximateFormats(),
-    BuiltinAssign(), BuiltinBookInVirtualLibraries(), BuiltinBooksize(),
+    BuiltinAssign(), BuiltinBooksize(),
     BuiltinCapitalize(), BuiltinCmp(), BuiltinContains(), BuiltinCount(),
     BuiltinCurrentLibraryName(), BuiltinCurrentLibraryPath(),
     BuiltinDaysBetween(), BuiltinDivide(), BuiltinEval(), BuiltinFirstNonEmpty(),
diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index 08a70a533d..2682088681 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -294,7 +294,6 @@ class SearchQueryParser(object):
 
     def __init__(self, locations, test=False, optimize=False):
         self.sqp_initialize(locations, test=test, optimize=optimize)
-        self.sqp_parsed_search_cache = {}
         self.parser = Parser()
 
     def sqp_change_locations(self, locations):
@@ -309,7 +308,8 @@ class SearchQueryParser(object):
         # empty the list of searches used for recursion testing
         self.recurse_level = 0
         self.searches_seen = set([])
-        return self._parse(query)
+        candidates = self.universal_set()
+        return self._parse(query, candidates)
 
     # this parse is used internally because it doesn't clear the
     # recursive search test list. However, we permit seeing the
@@ -317,13 +317,10 @@ class SearchQueryParser(object):
     # another search.
     def _parse(self, query, candidates=None):
         self.recurse_level += 1
-        res = self.sqp_parsed_search_cache.get(query, None)
-        if res is None:
-            try:
-                res = self.parser.parse(query, self.locations)
-                self.sqp_parsed_search_cache[query] = res
-            except RuntimeError:
-                raise ParseException(_('Failed to parse query, recursion limit reached: %s')%repr(query))
+        try:
+            res = self.parser.parse(query, self.locations)
+        except RuntimeError:
+            raise ParseException(_('Failed to parse query, recursion limit reached: %s')%repr(query))
         if candidates is None:
             candidates = self.universal_set()
         t = self.evaluate(res, candidates)

From 69c3f37f334f4df4dd4c0fc4935f308200c1e92f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Jul 2013 19:04:42 +0530
Subject: [PATCH 0182/1154] Fix case changing even when
 allow_case_changes=False when setting series/tags/publisher and the value
 being set is the only instance in the db. Also rationalize the way
 books_to_refresh works.

---
 src/calibre/library/database2.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 61c1653cee..b61544f172 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -2423,7 +2423,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         if not authors:
             authors = [_('Unknown')]
         self.conn.execute('DELETE FROM books_authors_link WHERE book=?',(id,))
-        books_to_refresh = set([])
+        books_to_refresh = {id}
         final_authors = []
         for a in authors:
             case_change = False
@@ -2615,10 +2615,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
     def set_publisher(self, id, publisher, notify=True, commit=True,
                       allow_case_change=False):
         self.conn.execute('DELETE FROM books_publishers_link WHERE book=?',(id,))
-        self.conn.execute('''DELETE FROM publishers WHERE (SELECT COUNT(id)
-                             FROM books_publishers_link
-                             WHERE publisher=publishers.id) < 1''')
-        books_to_refresh = set([])
+        books_to_refresh = {id}
         if publisher:
             case_change = False
             if not isinstance(publisher, unicode):
@@ -2634,6 +2631,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                         case_change = True
                     else:
                         publisher = cur_name
+                        books_to_refresh = set()
             else:
                 aid = self.conn.execute('''INSERT INTO publishers(name)
                                            VALUES (?)''', (publisher,)).lastrowid
@@ -2643,6 +2641,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 bks = self.conn.get('''SELECT book FROM books_publishers_link
                                        WHERE publisher=?''', (aid,))
                 books_to_refresh |= set([bk[0] for bk in bks])
+        self.conn.execute('''DELETE FROM publishers WHERE (SELECT COUNT(id)
+                             FROM books_publishers_link
+                             WHERE publisher=publishers.id) < 1''')
+
         self.dirtied(set([id])|books_to_refresh, commit=False)
         if commit:
             self.conn.commit()
@@ -3054,11 +3056,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             tags = []
         if not append:
             self.conn.execute('DELETE FROM books_tags_link WHERE book=?', (id,))
-            self.conn.execute('''DELETE FROM tags WHERE (SELECT COUNT(id)
-                                 FROM books_tags_link WHERE tag=tags.id) < 1''')
         otags = self.get_tags(id)
         tags = self.cleanup_tags(tags)
-        books_to_refresh = set([])
+        books_to_refresh = {id}
         for tag in (set(tags)-otags):
             case_changed = False
             tag = tag.strip()
@@ -3089,6 +3089,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 bks = self.conn.get('SELECT book FROM books_tags_link WHERE tag=?',
                                         (tid,))
                 books_to_refresh |= set([bk[0] for bk in bks])
+        self.conn.execute('''DELETE FROM tags WHERE (SELECT COUNT(id)
+                                FROM books_tags_link WHERE tag=tags.id) < 1''')
         self.dirtied(set([id])|books_to_refresh, commit=False)
         if commit:
             self.conn.commit()
@@ -3139,11 +3141,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
 
     def set_series(self, id, series, notify=True, commit=True, allow_case_change=True):
         self.conn.execute('DELETE FROM books_series_link WHERE book=?',(id,))
-        self.conn.execute('''DELETE FROM series
-                             WHERE (SELECT COUNT(id) FROM books_series_link
-                                    WHERE series=series.id) < 1''')
         (series, idx) = self._get_series_values(series)
-        books_to_refresh = set([])
+        books_to_refresh = {id}
         if series:
             case_change = False
             if not isinstance(series, unicode):
@@ -3159,6 +3158,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                         case_change = True
                     else:
                         series = cur_name
+                        books_to_refresh = set()
             else:
                 aid = self.conn.execute('INSERT INTO series(name) VALUES (?)', (series,)).lastrowid
             self.conn.execute('INSERT INTO books_series_link(book, series) VALUES (?,?)', (id, aid))
@@ -3168,6 +3168,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 bks = self.conn.get('SELECT book FROM books_series_link WHERE series=?',
                                         (aid,))
                 books_to_refresh |= set([bk[0] for bk in bks])
+        self.conn.execute('''DELETE FROM series
+                             WHERE (SELECT COUNT(id) FROM books_series_link
+                                    WHERE series=series.id) < 1''')
         self.dirtied([id], commit=False)
         if commit:
             self.conn.commit()

From 9c64054826335e1fa6ae634cce9c0b49b6392d4e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 08:54:59 +0530
Subject: [PATCH 0183/1154] Basic setters API

---
 src/calibre/db/legacy.py       | 44 +++++++++++++++++++++++---
 src/calibre/db/tests/legacy.py | 58 +++++++++++++++++++++++++++++-----
 2 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 83392d6d16..0f0f35ea87 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -52,18 +52,22 @@ class LibraryDatabase(object):
 
         self.get_property = self.data.get_property
 
+        MT = lambda func: types.MethodType(func, self, LibraryDatabase)
+
         for prop in (
-                'author_sort', 'authors', 'comment', 'comments',
-                'publisher', 'rating', 'series', 'series_index', 'tags',
-                'title', 'timestamp', 'uuid', 'pubdate', 'ondevice',
-                'metadata_last_modified', 'languages',
+            'author_sort', 'authors', 'comment', 'comments', 'publisher',
+            'rating', 'series', 'series_index', 'tags', 'title', 'title_sort',
+            'timestamp', 'uuid', 'pubdate', 'ondevice',
+            'metadata_last_modified', 'languages',
                 ):
             fm = {'comment':'comments', 'metadata_last_modified':
                   'last_modified', 'title_sort':'sort'}.get(prop, prop)
             setattr(self, prop, partial(self.get_property,
                     loc=self.FIELD_MAP[fm]))
 
-        MT = lambda func: types.MethodType(func, self, LibraryDatabase)
+        self.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
+        self.get_identifiers = MT(
+            lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.data.index_to_id(index)))
 
         for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
             setattr(self, meth, getattr(self.new_api, meth))
@@ -115,6 +119,36 @@ class LibraryDatabase(object):
             setattr(self, func, getattr(self.field_metadata, func))
         self.metadata_for_field = self.field_metadata.get
 
+        # Legacy setter API
+        for field in (
+            '!authors', 'author_sort', 'comment', 'has_cover', 'identifiers', 'languages',
+            'pubdate', '!publisher', 'rating', '!series', 'series_index', 'timestamp', 'uuid',
+        ):
+            def setter(field):
+                has_case_change = field.startswith('!')
+                field = {'comment':'comments',}.get(field, field)
+                if has_case_change:
+                    field = field[1:]
+                    acc = field == 'series'
+                    def func(self, book_id, val, notify=True, commit=True, allow_case_change=acc):
+                        ret = self.new_api.set_field(field, {book_id:val}, allow_case_change=allow_case_change)
+                        if notify:
+                            self.notify([book_id])
+                        return ret
+                elif field == 'has_cover':
+                    def func(self, book_id, val):
+                        self.new_api.set_field('cover', {book_id:bool(val)})
+                else:
+                    def func(self, book_id, val, notify=True, commit=True):
+                        if not val and field == 'uuid':
+                            return
+                        ret = self.new_api.set_field(field, {book_id:val})
+                        if notify:
+                            self.notify([book_id])
+                        return ret if field == 'languages' else None
+                return func
+            setattr(self, 'set_%s' % field.replace('!', ''), MT(setter(field)))
+
         self.last_update_check = self.last_modified()
         self.book_on_device_func = None
         # Cleaning is not required anymore
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 037f972010..f6f0fdd12c 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -47,11 +47,15 @@ def run_funcs(self, db, ndb, funcs):
             meth(*args)
         else:
             fmt = lambda x:x
-            if meth[0] in {'!', '@', '#'}:
-                fmt = {'!':dict, '@':frozenset, '#':lambda x:set((x or '').split(','))}[meth[0]]
+            if meth[0] in {'!', '@', '#', '+'}:
+                if meth[0] != '+':
+                    fmt = {'!':dict, '@':frozenset, '#':lambda x:set((x or '').split(','))}[meth[0]]
+                else:
+                    fmt = args[-1]
+                    args = args[:-1]
                 meth = meth[1:]
-            self.assertEqual(fmt(getattr(db, meth)(*args)), fmt(getattr(ndb, meth)(*args)),
-                                'The method: %s() returned different results for argument %s' % (meth, args))
+            res1, res2 = fmt(getattr(db, meth)(*args)), fmt(getattr(ndb, meth)(*args))
+            self.assertEqual(res1, res2, 'The method: %s() returned different results for argument %s' % (meth, args))
 
 class LegacyTest(BaseTest):
 
@@ -129,7 +133,7 @@ class LegacyTest(BaseTest):
     def test_legacy_getters(self):  # {{{
         ' Test various functions to get individual bits of metadata '
         old = self.init_old()
-        getters = ('path', 'abspath', 'title', 'authors', 'series',
+        getters = ('path', 'abspath', 'title', 'title_sort', 'authors', 'series',
                    'publisher', 'author_sort', 'authors', 'comments',
                    'comment', 'publisher', 'rating', 'series_index', 'tags',
                    'timestamp', 'uuid', 'pubdate', 'ondevice',
@@ -327,6 +331,7 @@ class LegacyTest(BaseTest):
             'construct_path_name', 'clear_dirtied', 'commit_dirty_cache', 'initialize_database', 'initialize_dynamic',
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
+            'windows_check_if_files_in_use',
         }
         SKIP_ARGSPEC = {
             '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
@@ -400,12 +405,51 @@ class LegacyTest(BaseTest):
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
 
+        run_funcs(self, db, ndb, (
+            ('set_authors', 1, ('author one',),), ('set_authors', 2, ('author two',), True, True, True),
+            ('set_author_sort', 3, 'new_aus'),
+            ('set_comment', 1, ''), ('set_comment', 2, None), ('set_comment', 3, '<p>a comment</p>'),
+            ('set_has_cover', 1, True), ('set_has_cover', 2, True), ('set_has_cover', 3, 1),
+            ('set_identifiers', 2, {'test':'', 'a':'b'}), ('set_identifiers', 3, {'id':'1', 'url':'http://acme.com'}), ('set_identifiers', 1, {}),
+            ('set_languages', 1, ('en',)),
+            ('set_languages', 2, ()),
+            ('set_languages', 3, ('deu', 'spa', 'fra')),
+            ('set_pubdate', 1, None), ('set_pubdate', 2, '2011-1-7'),
+            ('set_series', 1, 'a series one'), ('set_series', 2, 'another series [7]'), ('set_series', 3, 'a third series'),
+            ('set_publisher', 1, 'publisher two'), ('set_publisher', 2, None), ('set_publisher', 3, 'a third puB'),
+            ('set_rating', 1, 2.3), ('set_rating', 2, 0), ('set_rating', 3, 8),
+            ('set_timestamp', 1, None), ('set_timestamp', 2, '2011-1-7'),
+            ('set_uuid', 1, None), ('set_uuid', 2, 'a test uuid'),
+
+            (db.refresh,),
+
+            ('authors', 0), ('authors', 1), ('authors', 2),
+            ('author_sort', 0), ('author_sort', 1), ('author_sort', 2),
+            ('has_cover', 3), ('has_cover', 1), ('has_cover', 2),
+            ('get_identifiers', 0), ('get_identifiers', 1), ('get_identifiers', 2),
+            ('pubdate', 0), ('pubdate', 1), ('pubdate', 2),
+            ('timestamp', 0), ('timestamp', 1), ('timestamp', 2),
+            ('publisher', 0), ('publisher', 1), ('publisher', 2),
+            ('rating', 0), ('+rating', 1, lambda x: x or 0), ('rating', 2),
+            ('series', 0), ('series', 1), ('series', 2),
+            ('series_index', 0), ('series_index', 1), ('series_index', 2),
+            ('uuid', 0), ('uuid', 1), ('uuid', 2),
+
+            ('set_series_index', 1, 2.3), ('set_series_index', 2, 0), ('set_series_index', 3, 8),
+            (db.refresh,),
+            ('series_index', 0), ('series_index', 1), ('series_index', 2),
+        ))
+        db.close()
+
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+
         run_funcs(self, db, ndb, (
             ('set', 0, 'title', 'newtitle'),
             ('set', 0, 'tags', 't1,t2,tag one', True),
             ('set', 0, 'authors', 'author one & Author Two', True),
             ('set', 0, 'rating', 3.2),
-            ('set', 0, 'publisher', 'publisher one', True),
+            ('set', 0, 'publisher', 'publisher one', False),
             (db.refresh,),
             ('title', 0),
             ('rating', 0),
@@ -413,6 +457,4 @@ class LegacyTest(BaseTest):
             ('authors', 0), ('authors', 1), ('authors', 2),
             ('publisher', 0), ('publisher', 1), ('publisher', 2),
         ))
-        db.close()
-
     # }}}

From 867f46db2b4593ad88564e8da7c651bcde257021 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 09:43:18 +0530
Subject: [PATCH 0184/1154] Move dynamic method generation to class instead of
 object level

---
 src/calibre/db/__init__.py     |   1 +
 src/calibre/db/legacy.py       | 239 +++++++++++++++++++--------------
 src/calibre/db/tests/legacy.py |   2 +-
 3 files changed, 138 insertions(+), 104 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 781e886567..47e44335ea 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -117,4 +117,5 @@ Various things that require other things before they can be migrated:
     5. In the new API refresh() does not re-read from disk. That might break a
     few things, for example content server reloading on db change as well as
     dump/restore of db?
+    6. grep the sources for TODO
 '''
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 0f0f35ea87..ec2d6ffec4 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -7,7 +7,6 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, traceback, types
-from functools import partial
 from future_builtins import zip
 
 from calibre import force_unicode
@@ -52,110 +51,8 @@ class LibraryDatabase(object):
 
         self.get_property = self.data.get_property
 
-        MT = lambda func: types.MethodType(func, self, LibraryDatabase)
-
-        for prop in (
-            'author_sort', 'authors', 'comment', 'comments', 'publisher',
-            'rating', 'series', 'series_index', 'tags', 'title', 'title_sort',
-            'timestamp', 'uuid', 'pubdate', 'ondevice',
-            'metadata_last_modified', 'languages',
-                ):
-            fm = {'comment':'comments', 'metadata_last_modified':
-                  'last_modified', 'title_sort':'sort'}.get(prop, prop)
-            setattr(self, prop, partial(self.get_property,
-                    loc=self.FIELD_MAP[fm]))
-
-        self.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
-        self.get_identifiers = MT(
-            lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.data.index_to_id(index)))
-
-        for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
-            setattr(self, meth, getattr(self.new_api, meth))
-
-        # Legacy API to get information about many-(one, many) fields
-        for field in ('authors', 'tags', 'publisher', 'series'):
-            def getter(field):
-                def func(self):
-                    return self.new_api.all_field_names(field)
-                return func
-            name = field[:-1] if field in {'authors', 'tags'} else field
-            setattr(self, 'all_%s_names' % name, MT(getter(field)))
-            self.all_formats = MT(lambda self:self.new_api.all_field_names('formats'))
-
-        for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}.iteritems():
-            setattr(self, func, partial(self.field_id_map, field))
-        self.all_tags = MT(lambda self: list(self.all_tag_names()))
-        self.get_authors_with_ids = MT(
-            lambda self: [[aid, adata['name'], adata['sort'], adata['link']] for aid, adata in self.new_api.author_data().iteritems()])
-        for field in ('tags', 'series', 'publishers', 'ratings', 'languages'):
-            def getter(field):
-                fname = field[:-1] if field in {'publishers', 'ratings'} else field
-                def func(self):
-                    return [[tid, tag] for tid, tag in self.new_api.get_id_map(fname).iteritems()]
-                return func
-            setattr(self, 'get_%s_with_ids' % field,
-                    MT(getter(field)))
-        for field in ('author', 'tag', 'series'):
-            def getter(field):
-                field = field if field == 'series' else (field+'s')
-                def func(self, item_id):
-                    return self.new_api.get_item_name(field, item_id)
-                return func
-            setattr(self, '%s_name' % field, MT(getter(field)))
-        for field in ('publisher', 'series', 'tag'):
-            def getter(field):
-                fname = 'tags' if field == 'tag' else field
-                def func(self, item_id):
-                    self.new_api.remove_items(fname, (item_id,))
-                return func
-            setattr(self, 'delete_%s_using_id' % field, MT(getter(field)))
-
-        # Legacy field API
-        for func in (
-            'standard_field_keys', 'custom_field_keys', 'all_field_keys',
-            'searchable_fields', 'sortable_field_keys',
-            'search_term_to_field_key', 'custom_field_metadata',
-            'all_metadata'):
-            setattr(self, func, getattr(self.field_metadata, func))
-        self.metadata_for_field = self.field_metadata.get
-
-        # Legacy setter API
-        for field in (
-            '!authors', 'author_sort', 'comment', 'has_cover', 'identifiers', 'languages',
-            'pubdate', '!publisher', 'rating', '!series', 'series_index', 'timestamp', 'uuid',
-        ):
-            def setter(field):
-                has_case_change = field.startswith('!')
-                field = {'comment':'comments',}.get(field, field)
-                if has_case_change:
-                    field = field[1:]
-                    acc = field == 'series'
-                    def func(self, book_id, val, notify=True, commit=True, allow_case_change=acc):
-                        ret = self.new_api.set_field(field, {book_id:val}, allow_case_change=allow_case_change)
-                        if notify:
-                            self.notify([book_id])
-                        return ret
-                elif field == 'has_cover':
-                    def func(self, book_id, val):
-                        self.new_api.set_field('cover', {book_id:bool(val)})
-                else:
-                    def func(self, book_id, val, notify=True, commit=True):
-                        if not val and field == 'uuid':
-                            return
-                        ret = self.new_api.set_field(field, {book_id:val})
-                        if notify:
-                            self.notify([book_id])
-                        return ret if field == 'languages' else None
-                return func
-            setattr(self, 'set_%s' % field.replace('!', ''), MT(setter(field)))
-
         self.last_update_check = self.last_modified()
         self.book_on_device_func = None
-        # Cleaning is not required anymore
-        self.clean = self.clean_custom = MT(lambda self:None)
-        self.clean_standard_field = MT(lambda self, field, commit=False:None)
-        # apsw operates in autocommit mode
-        self.commit = MT(lambda self:None)
 
     def close(self):
         self.backend.close()
@@ -456,3 +353,139 @@ class LibraryDatabase(object):
 
     # }}}
 
+MT = lambda func: types.MethodType(func, None, LibraryDatabase)
+
+# Legacy getter API {{{
+for prop in ('author_sort', 'authors', 'comment', 'comments', 'publisher',
+             'rating', 'series', 'series_index', 'tags', 'title', 'title_sort',
+             'timestamp', 'uuid', 'pubdate', 'ondevice', 'metadata_last_modified', 'languages',):
+    def getter(prop):
+        fm = {'comment':'comments', 'metadata_last_modified':
+                'last_modified', 'title_sort':'sort'}.get(prop, prop)
+        def func(self, index, index_is_id=False):
+            return self.get_property(index, index_is_id=index_is_id, loc=self.FIELD_MAP[fm])
+        return func
+    setattr(LibraryDatabase, prop, MT(getter(prop)))
+
+LibraryDatabase.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
+LibraryDatabase.get_identifiers = MT(
+    lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.data.index_to_id(index)))
+# }}}
+
+# Legacy setter API {{{
+for field in (
+    '!authors', 'author_sort', 'comment', 'has_cover', 'identifiers', 'languages',
+    'pubdate', '!publisher', 'rating', '!series', 'series_index', 'timestamp', 'uuid',
+):
+    def setter(field):
+        has_case_change = field.startswith('!')
+        field = {'comment':'comments',}.get(field, field)
+        if has_case_change:
+            field = field[1:]
+            acc = field == 'series'
+            def func(self, book_id, val, notify=True, commit=True, allow_case_change=acc):
+                ret = self.new_api.set_field(field, {book_id:val}, allow_case_change=allow_case_change)
+                if notify:
+                    self.notify([book_id])
+                return ret
+        elif field == 'has_cover':
+            def func(self, book_id, val):
+                self.new_api.set_field('cover', {book_id:bool(val)})
+        else:
+            def func(self, book_id, val, notify=True, commit=True):
+                if not val and field == 'uuid':
+                    return
+                ret = self.new_api.set_field(field, {book_id:val})
+                if notify:
+                    self.notify([book_id])
+                return ret if field == 'languages' else None
+        return func
+    setattr(LibraryDatabase, 'set_%s' % field.replace('!', ''), MT(setter(field)))
+# }}}
+
+# Legacy API to get information about many-(one, many) fields {{{
+for field in ('authors', 'tags', 'publisher', 'series'):
+    def getter(field):
+        def func(self):
+            return self.new_api.all_field_names(field)
+        return func
+    name = field[:-1] if field in {'authors', 'tags'} else field
+    setattr(LibraryDatabase, 'all_%s_names' % name, MT(getter(field)))
+    LibraryDatabase.all_formats = MT(lambda self:self.new_api.all_field_names('formats'))
+
+for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}.iteritems():
+    def getter(field):
+        def func(self):
+            return self.field_id_map(field)
+        return func
+    setattr(LibraryDatabase, func, MT(getter(field)))
+
+LibraryDatabase.all_tags = MT(lambda self: list(self.all_tag_names()))
+LibraryDatabase.get_authors_with_ids = MT(
+    lambda self: [[aid, adata['name'], adata['sort'], adata['link']] for aid, adata in self.new_api.author_data().iteritems()])
+
+for field in ('tags', 'series', 'publishers', 'ratings', 'languages'):
+    def getter(field):
+        fname = field[:-1] if field in {'publishers', 'ratings'} else field
+        def func(self):
+            return [[tid, tag] for tid, tag in self.new_api.get_id_map(fname).iteritems()]
+        return func
+    setattr(LibraryDatabase, 'get_%s_with_ids' % field, MT(getter(field)))
+
+for field in ('author', 'tag', 'series'):
+    def getter(field):
+        field = field if field == 'series' else (field+'s')
+        def func(self, item_id):
+            return self.new_api.get_item_name(field, item_id)
+        return func
+    setattr(LibraryDatabase, '%s_name' % field, MT(getter(field)))
+
+for field in ('publisher', 'series', 'tag'):
+    def getter(field):
+        fname = 'tags' if field == 'tag' else field
+        def func(self, item_id):
+            self.new_api.remove_items(fname, (item_id,))
+        return func
+    setattr(LibraryDatabase, 'delete_%s_using_id' % field, MT(getter(field)))
+# }}}
+
+# Legacy field API {{{
+for func in (
+    'standard_field_keys', '!custom_field_keys', 'all_field_keys',
+    'searchable_fields', 'sortable_field_keys',
+    'search_term_to_field_key', '!custom_field_metadata',
+    'all_metadata'):
+    def getter(func):
+        if func.startswith('!'):
+            func = func[1:]
+            def meth(self, include_composites=True):
+                return getattr(self.field_metadata, func)(include_composites=include_composites)
+        elif func == 'search_term_to_field_key':
+            def meth(self, term):
+                return self.field_metadata.search_term_to_field_key(term)
+        else:
+            def meth(self):
+                return getattr(self.field_metadata, func)()
+        return meth
+    setattr(LibraryDatabase, func.replace('!', ''), MT(getter(func)))
+LibraryDatabase.metadata_for_field = MT(lambda self, field:self.field_metadata.get(field))
+
+# }}}
+
+# Miscellaneous API {{{
+for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
+    def getter(meth):
+        def func(self, x):
+            return getattr(self.new_api, meth)(x)
+        return func
+    setattr(LibraryDatabase, meth, MT(getter(meth)))
+
+# Cleaning is not required anymore
+LibraryDatabase.clean = LibraryDatabase.clean_custom = MT(lambda self:None)
+LibraryDatabase.clean_standard_field = MT(lambda self, field, commit=False:None)
+# apsw operates in autocommit mode
+LibraryDatabase.commit = MT(lambda self:None)
+# }}}
+
+del MT
+
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index f6f0fdd12c..b3b8d86d59 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -334,7 +334,7 @@ class LegacyTest(BaseTest):
             'windows_check_if_files_in_use',
         }
         SKIP_ARGSPEC = {
-            '__init__', 'get_next_series_num_for', 'has_book', 'author_sort_from_authors',
+            '__init__',
         }
 
         missing = []

From a3884f22f5fde66cac13b8b6c0b48939f38867eb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 10:25:08 +0530
Subject: [PATCH 0185/1154] title and title_sort setters

---
 src/calibre/db/legacy.py       | 11 +++++++----
 src/calibre/db/tests/legacy.py |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index ec2d6ffec4..f21d938009 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -376,10 +376,11 @@ LibraryDatabase.get_identifiers = MT(
 for field in (
     '!authors', 'author_sort', 'comment', 'has_cover', 'identifiers', 'languages',
     'pubdate', '!publisher', 'rating', '!series', 'series_index', 'timestamp', 'uuid',
+    'title', 'title_sort',
 ):
     def setter(field):
         has_case_change = field.startswith('!')
-        field = {'comment':'comments',}.get(field, field)
+        field = {'comment':'comments', 'title_sort':'sort'}.get(field, field)
         if has_case_change:
             field = field[1:]
             acc = field == 'series'
@@ -392,13 +393,15 @@ for field in (
             def func(self, book_id, val):
                 self.new_api.set_field('cover', {book_id:bool(val)})
         else:
+            null_field = field in {'title', 'sort', 'uuid'}
+            retval = (True if field == 'sort' else None)
             def func(self, book_id, val, notify=True, commit=True):
-                if not val and field == 'uuid':
-                    return
+                if not val and null_field:
+                    return (False if field == 'sort' else None)
                 ret = self.new_api.set_field(field, {book_id:val})
                 if notify:
                     self.notify([book_id])
-                return ret if field == 'languages' else None
+                return ret if field == 'languages' else retval
         return func
     setattr(LibraryDatabase, 'set_%s' % field.replace('!', ''), MT(setter(field)))
 # }}}
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index b3b8d86d59..6c67fcea36 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -420,9 +420,12 @@ class LegacyTest(BaseTest):
             ('set_rating', 1, 2.3), ('set_rating', 2, 0), ('set_rating', 3, 8),
             ('set_timestamp', 1, None), ('set_timestamp', 2, '2011-1-7'),
             ('set_uuid', 1, None), ('set_uuid', 2, 'a test uuid'),
+            ('set_title', 1, 'title two'), ('set_title', 2, None), ('set_title', 3, 'The Test Title'),
 
             (db.refresh,),
 
+            ('title', 0), ('title', 1), ('title', 2),
+            ('title_sort', 0), ('title_sort', 1), ('title_sort', 2),
             ('authors', 0), ('authors', 1), ('authors', 2),
             ('author_sort', 0), ('author_sort', 1), ('author_sort', 2),
             ('has_cover', 3), ('has_cover', 1), ('has_cover', 2),
@@ -435,9 +438,11 @@ class LegacyTest(BaseTest):
             ('series_index', 0), ('series_index', 1), ('series_index', 2),
             ('uuid', 0), ('uuid', 1), ('uuid', 2),
 
+            ('set_title_sort', 1, 'Title Two'), ('set_title_sort', 2, None), ('set_title_sort', 3, 'The Test Title_sort'),
             ('set_series_index', 1, 2.3), ('set_series_index', 2, 0), ('set_series_index', 3, 8),
             (db.refresh,),
             ('series_index', 0), ('series_index', 1), ('series_index', 2),
+            ('title_sort', 0), ('title_sort', 1), ('title_sort', 2),
         ))
         db.close()
 

From e923fbcffd15e3243b4ca089356bb1400cc47af3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 13:05:15 +0530
Subject: [PATCH 0186/1154] More set_*() API

---
 src/calibre/db/legacy.py       | 32 ++++++++++++++++++++++++++++++++
 src/calibre/db/tables.py       |  3 +++
 src/calibre/db/tests/legacy.py | 26 ++++++++++++++++++++++----
 src/calibre/db/write.py        |  4 ++--
 4 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index f21d938009..9d9e93c02b 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -18,6 +18,7 @@ from calibre.db.backend import DB
 from calibre.db.cache import Cache
 from calibre.db.categories import CATEGORY_SORTS
 from calibre.db.view import View
+from calibre.db.write import clean_identifier
 from calibre.utils.date import utcnow
 
 class LibraryDatabase(object):
@@ -340,6 +341,36 @@ class LibraryDatabase(object):
         finally:
             self.notify('metadata', [book_id])
 
+    def set_identifier(self, book_id, typ, val, notify=True, commit=True):
+        with self.new_api.write_lock:
+            identifiers = self.new_api._field_for('identifiers', book_id)
+            typ, val = clean_identifier(typ, val)
+            if typ:
+                identifiers[typ] = val
+                self.new_api._set_field('identifiers', {book_id:identifiers})
+                self.notify('metadata', [book_id])
+
+    def set_isbn(self, book_id, isbn, notify=True, commit=True):
+        self.set_identifier(book_id, 'isbn', isbn, notify=notify, commit=commit)
+
+    def set_tags(self, book_id, tags, append=False, notify=True, commit=True, allow_case_change=False):
+        tags = tags or []
+        with self.new_api.write_lock:
+            if append:
+                otags = self.new_api._field_for('tags', book_id)
+                existing = {icu_lower(x) for x in otags}
+                tags = list(otags) + [x for x in tags if icu_lower(x) not in existing]
+            ret = self.new_api._set_field('tags', {book_id:tags}, allow_case_change=allow_case_change)
+            if notify:
+                self.notify('metadata', [book_id])
+            return ret
+
+    def set_metadata(self, book_id, mi, ignore_errors=False, set_title=True,
+                     set_authors=True, commit=True, force_changes=False, notify=True):
+        self.new_api.set_metadata(book_id, mi, ignore_errors=ignore_errors, set_title=set_title, set_authors=set_authors, force_changes=force_changes)
+        if notify:
+            self.notify('metadata', [book_id])
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
@@ -424,6 +455,7 @@ for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'
     setattr(LibraryDatabase, func, MT(getter(field)))
 
 LibraryDatabase.all_tags = MT(lambda self: list(self.all_tag_names()))
+LibraryDatabase.get_all_identifier_types = MT(lambda self: list(self.new_api.fields['identifiers'].table.all_identifier_types()))
 LibraryDatabase.get_authors_with_ids = MT(
     lambda self: [[aid, adata['name'], adata['sort'], adata['link']] for aid, adata in self.new_api.author_data().iteritems()])
 
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 7715f6abef..46c4554586 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -420,3 +420,6 @@ class IdentifiersTable(ManyToManyTable):
     def remove_items(self, item_ids, db):
         raise NotImplementedError('Direct deletion of identifiers is not implemented')
 
+    def all_identifier_types(self):
+        return frozenset(k for k, v in self.col_book_map.iteritems() if v)
+
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 6c67fcea36..b0ef9fbe1e 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -49,7 +49,7 @@ def run_funcs(self, db, ndb, funcs):
             fmt = lambda x:x
             if meth[0] in {'!', '@', '#', '+'}:
                 if meth[0] != '+':
-                    fmt = {'!':dict, '@':frozenset, '#':lambda x:set((x or '').split(','))}[meth[0]]
+                    fmt = {'!':dict, '@':lambda x:frozenset(x or ()), '#':lambda x:set((x or '').split(','))}[meth[0]]
                 else:
                     fmt = args[-1]
                     args = args[:-1]
@@ -168,6 +168,7 @@ class LegacyTest(BaseTest):
             '!all_authors':[()],
             '!all_tags2':[()],
             '@all_tags':[()],
+            '@get_all_identifier_types':[()],
             '!all_publishers':[()],
             '!all_titles':[()],
             '!all_series':[()],
@@ -331,7 +332,7 @@ class LegacyTest(BaseTest):
             'construct_path_name', 'clear_dirtied', 'commit_dirty_cache', 'initialize_database', 'initialize_dynamic',
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
-            'windows_check_if_files_in_use',
+            'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book',
         }
         SKIP_ARGSPEC = {
             '__init__',
@@ -402,6 +403,7 @@ class LegacyTest(BaseTest):
 
     def test_legacy_setters(self):  # {{{
         'Test methods that are directly equivalent in the old and new interface'
+        from calibre.ebooks.metadata.book.base import Metadata
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
 
@@ -421,9 +423,8 @@ class LegacyTest(BaseTest):
             ('set_timestamp', 1, None), ('set_timestamp', 2, '2011-1-7'),
             ('set_uuid', 1, None), ('set_uuid', 2, 'a test uuid'),
             ('set_title', 1, 'title two'), ('set_title', 2, None), ('set_title', 3, 'The Test Title'),
-
+            ('set_tags', 1, ['a1', 'a2'], True), ('set_tags', 2, ['b1', 'tag one'], False, False, False, True), ('set_tags', 3, ['A1']),
             (db.refresh,),
-
             ('title', 0), ('title', 1), ('title', 2),
             ('title_sort', 0), ('title_sort', 1), ('title_sort', 2),
             ('authors', 0), ('authors', 1), ('authors', 2),
@@ -437,12 +438,29 @@ class LegacyTest(BaseTest):
             ('series', 0), ('series', 1), ('series', 2),
             ('series_index', 0), ('series_index', 1), ('series_index', 2),
             ('uuid', 0), ('uuid', 1), ('uuid', 2),
+            ('@tags', 0), ('@tags', 1), ('@tags', 2),
+            ('@all_tags',),
+            ('@get_all_identifier_types',),
 
             ('set_title_sort', 1, 'Title Two'), ('set_title_sort', 2, None), ('set_title_sort', 3, 'The Test Title_sort'),
             ('set_series_index', 1, 2.3), ('set_series_index', 2, 0), ('set_series_index', 3, 8),
+            ('set_identifier', 1, 'moose', 'val'), ('set_identifier', 2, 'test', ''), ('set_identifier', 3, '', ''),
             (db.refresh,),
             ('series_index', 0), ('series_index', 1), ('series_index', 2),
             ('title_sort', 0), ('title_sort', 1), ('title_sort', 2),
+            ('get_identifiers', 0), ('get_identifiers', 1), ('get_identifiers', 2),
+            ('@get_all_identifier_types',),
+
+            ('set_metadata', 1, Metadata('title', ('a1',)), False, False, False, True, True),
+            ('set_metadata', 3, Metadata('title', ('a1',))),
+            (db.refresh,),
+            ('title', 0), ('title', 1), ('title', 2),
+            ('title_sort', 0), ('title_sort', 1), ('title_sort', 2),
+            ('authors', 0), ('authors', 1), ('authors', 2),
+            ('author_sort', 0), ('author_sort', 1), ('author_sort', 2),
+            ('@tags', 0), ('@tags', 1), ('@tags', 2),
+            ('@all_tags',),
+            ('@get_all_identifier_types',),
         ))
         db.close()
 
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index a257788a60..5b35248353 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -107,8 +107,8 @@ def adapt_languages(to_tuple, x):
     return tuple(ans)
 
 def clean_identifier(typ, val):
-    typ = icu_lower(typ).strip().replace(':', '').replace(',', '')
-    val = val.strip().replace(',', '|').replace(':', '|')
+    typ = icu_lower(typ or '').strip().replace(':', '').replace(',', '')
+    val = (val or '').strip().replace(',', '|').replace(':', '|')
     return typ, val
 
 def adapt_identifiers(to_tuple, x):

From e87e6941dc7af81bf9e8c276c9c84127a131312c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 13:51:14 +0530
Subject: [PATCH 0187/1154] Show auto convert format in question dialog

---
 src/calibre/gui2/email.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index f8c7552437..665b19cc5a 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -257,8 +257,8 @@ class EmailMixin(object):  # {{{
             else:
                 autos = [self.library_view.model().db.title(id, index_is_id=True) for id in auto]
                 if self.auto_convert_question(
-                    _('Auto convert the following books before sending via '
-                        'email?'), autos):
+                    _('Auto convert the following books to %s before sending via '
+                        'email?') % format.upper(), autos):
                     self.iactions['Convert Books'].auto_convert_mail(to, fmts, delete_from_library, auto, format, subject)
 
         if bad:

From 96aa24f59f3e27393a541f9d282590ea349b3c8a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 14:03:09 +0530
Subject: [PATCH 0188/1154] Fix auto-conversion regression

Fix regression in last release that broke auto-conversion of ebooks when
sending to device/sending by email. Fixes #1200864 [False conversion from mobi to epub by using Tolino](https://bugs.launchpad.net/calibre/+bug/1200864)
---
 src/calibre/gui2/convert/bulk.py   | 2 +-
 src/calibre/gui2/convert/single.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py
index 91efc73ca9..8c1ef8cb96 100644
--- a/src/calibre/gui2/convert/bulk.py
+++ b/src/calibre/gui2/convert/bulk.py
@@ -119,7 +119,7 @@ class BulkConfig(Config):
 
     def setup_output_formats(self, db, preferred_output_format):
         if preferred_output_format:
-            preferred_output_format = preferred_output_format.lower()
+            preferred_output_format = preferred_output_format.upper()
         output_formats = get_output_formats(preferred_output_format)
         preferred_output_format = preferred_output_format if \
             preferred_output_format and preferred_output_format \
diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py
index e8342610dd..945ed42594 100644
--- a/src/calibre/gui2/convert/single.py
+++ b/src/calibre/gui2/convert/single.py
@@ -252,7 +252,7 @@ class Config(ResizableDialog, Ui_Dialog):
     def setup_input_output_formats(self, db, book_id, preferred_input_format,
             preferred_output_format):
         if preferred_output_format:
-            preferred_output_format = preferred_output_format.lower()
+            preferred_output_format = preferred_output_format.upper()
         output_formats = get_output_formats(preferred_output_format)
         input_format, input_formats = get_input_format_for_book(db, book_id,
                 preferred_input_format)

From 72d5185347f8e155febe151d7fc8866f82573e7d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 14:53:14 +0530
Subject: [PATCH 0189/1154] tags manipulation API

---
 src/calibre/db/legacy.py       | 56 +++++++++++++++++++++++++++++++++-
 src/calibre/db/tests/legacy.py | 35 +++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 9d9e93c02b..428e164f06 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -9,7 +9,8 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, traceback, types
 from future_builtins import zip
 
-from calibre import force_unicode
+from calibre import force_unicode, isbytestring
+from calibre.constants import preferred_encoding
 from calibre.db import _get_next_series_num_for_list, _get_series_values
 from calibre.db.adding import (
     find_books_in_directory, import_book_directory_multiple,
@@ -21,6 +22,19 @@ from calibre.db.view import View
 from calibre.db.write import clean_identifier
 from calibre.utils.date import utcnow
 
+def cleanup_tags(tags):
+    tags = [x.strip().replace(',', ';') for x in tags if x.strip()]
+    tags = [x.decode(preferred_encoding, 'replace')
+                if isbytestring(x) else x for x in tags]
+    tags = [u' '.join(x.split()) for x in tags]
+    ans, seen = [], set([])
+    for tag in tags:
+        if tag.lower() not in seen:
+            seen.add(tag.lower())
+            ans.append(tag)
+    return ans
+
+
 class LibraryDatabase(object):
 
     ''' Emulate the old LibraryDatabase2 interface '''
@@ -371,6 +385,44 @@ class LibraryDatabase(object):
         if notify:
             self.notify('metadata', [book_id])
 
+    def remove_all_tags(self, ids, notify=False, commit=True):
+        self.new_api.set_field('tags', {book_id:() for book_id in ids})
+        if notify:
+            self.notify('metadata', ids)
+
+    def bulk_modify_tags(self, ids, add=[], remove=[], notify=False):
+        add = cleanup_tags(add)
+        remove = cleanup_tags(remove)
+        remove = set(remove) - set(add)
+        if not ids or (not add and not remove):
+            return
+        remove = {icu_lower(x) for x in remove}
+        with self.new_api.write_lock:
+            val_map = {}
+            for book_id in ids:
+                tags = list(self.new_api._field_for('tags', book_id))
+                existing = {icu_lower(x) for x in tags}
+                tags.extend(t for t in add if icu_lower(t) not in existing)
+                tags = tuple(t for t in tags if icu_lower(t) not in remove)
+                val_map[book_id] = tags
+            self.new_api._set_field('tags', val_map, allow_case_change=False)
+
+        if notify:
+            self.notify('metadata', ids)
+
+    def unapply_tags(self, book_id, tags, notify=True):
+        self.bulk_modify_tags((book_id,), remove=tags, notify=notify)
+
+    def is_tag_used(self, tag):
+        return icu_lower(tag) in {icu_lower(x) for x in self.new_api.all_field_names('tags')}
+
+    def delete_tag(self, tag):
+        with self.new_api.write_lock:
+            tag_map = {icu_lower(v):k for k, v in self.new_api._get_id_map('tags').iteritems()}
+            tid = tag_map.get(icu_lower(tag), None)
+            if tid is not None:
+                self.new_api._remove_items('tags', (tid,))
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
@@ -399,6 +451,7 @@ for prop in ('author_sort', 'authors', 'comment', 'comments', 'publisher',
     setattr(LibraryDatabase, prop, MT(getter(prop)))
 
 LibraryDatabase.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
+LibraryDatabase.get_tags = MT(lambda self, book_id:set(self.new_api.field_for('tags', book_id)))
 LibraryDatabase.get_identifiers = MT(
     lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.data.index_to_id(index)))
 # }}}
@@ -524,3 +577,4 @@ LibraryDatabase.commit = MT(lambda self:None)
 
 del MT
 
+
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index b0ef9fbe1e..0a9aff1c9c 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -404,6 +404,26 @@ class LegacyTest(BaseTest):
     def test_legacy_setters(self):  # {{{
         'Test methods that are directly equivalent in the old and new interface'
         from calibre.ebooks.metadata.book.base import Metadata
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+        run_funcs(self, db, ndb, (
+            ('get_tags', 0), ('get_tags', 1), ('get_tags', 2),
+            ('is_tag_used', 'News'), ('is_tag_used', 'xchkjgfh'),
+            ('bulk_modify_tags', (1,), ['t1'], ['News']),
+            ('bulk_modify_tags', (2,), ['t1'], ['Tag One', 'Tag Two']),
+            ('bulk_modify_tags', (3,), ['t1', 't2', 't3']),
+            (db.clean,),
+            ('@all_tags',),
+            ('@tags', 0), ('@tags', 1), ('@tags', 2),
+
+            ('unapply_tags', 1, ['t1']),
+            ('unapply_tags', 2, ['xxxx']),
+            ('unapply_tags', 3, ['t2', 't3']),
+            (db.clean,),
+            ('@all_tags',),
+            ('@tags', 0), ('@tags', 1), ('@tags', 2),
+        ))
+
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
 
@@ -479,5 +499,20 @@ class LegacyTest(BaseTest):
             ('#tags', 0), ('#tags', 1), ('#tags', 2),
             ('authors', 0), ('authors', 1), ('authors', 2),
             ('publisher', 0), ('publisher', 1), ('publisher', 2),
+            ('delete_tag', 'T1'), ('delete_tag', 'T2'), ('delete_tag', 'Tag one'), ('delete_tag', 'News'),
+            (db.clean,), (db.refresh,),
+            ('@all_tags',),
+            ('#tags', 0), ('#tags', 1), ('#tags', 2),
         ))
+
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+        run_funcs(self, db, ndb, (
+            ('remove_all_tags', (1, 2, 3)),
+            (db.clean,),
+            ('@all_tags',),
+            ('@tags', 0), ('@tags', 1), ('@tags', 2),
+        ))
+
+
     # }}}

From 73536b642133530158ecc4d0e53a3b62c2ab69bb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 15:12:20 +0530
Subject: [PATCH 0190/1154] ...

---
 src/calibre/db/legacy.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 428e164f06..05362d98df 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -417,11 +417,15 @@ class LibraryDatabase(object):
         return icu_lower(tag) in {icu_lower(x) for x in self.new_api.all_field_names('tags')}
 
     def delete_tag(self, tag):
+        self.delete_tags((tag,))
+
+    def delete_tags(self, tags):
         with self.new_api.write_lock:
             tag_map = {icu_lower(v):k for k, v in self.new_api._get_id_map('tags').iteritems()}
-            tid = tag_map.get(icu_lower(tag), None)
-            if tid is not None:
-                self.new_api._remove_items('tags', (tid,))
+            tag_ids = (tag_map.get(icu_lower(tag), None) for tag in tags)
+            tag_ids = tuple(tid for tid in tag_ids if tid is not None)
+            if tag_ids:
+                self.new_api._remove_items('tags', tag_ids)
 
     # Private interface {{{
     def __iter__(self):

From 34abccc4f128c5f2fb514adf271df4b650279b26 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 15:48:56 +0530
Subject: [PATCH 0191/1154] Miscellaneous API

---
 src/calibre/db/legacy.py       | 30 +++++++++++++++++++++---------
 src/calibre/db/tests/legacy.py | 10 ++++++++--
 src/calibre/db/view.py         |  3 +++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 05362d98df..580fcc2ae6 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -63,11 +63,13 @@ class LibraryDatabase(object):
         cache = self.new_api = Cache(backend)
         cache.init()
         self.data = View(cache)
+        self.id = self.data.index_to_id
 
         self.get_property = self.data.get_property
 
         self.last_update_check = self.last_modified()
         self.book_on_device_func = None
+        self.is_case_sensitive = getattr(backend, 'is_case_sensitive', False)
 
     def close(self):
         self.backend.close()
@@ -131,6 +133,10 @@ class LibraryDatabase(object):
         for book_id in self.data.cache.all_book_ids():
             yield book_id
 
+    def is_empty(self):
+        with self.new_api.read_lock:
+            return not bool(self.new_api.fields['title'].table.book_col_map)
+
     def get_usage_count_by_id(self, field):
         return [[k, v] for k, v in self.new_api.get_usage_count_by_id(field).iteritems()]
 
@@ -161,7 +167,7 @@ class LibraryDatabase(object):
 
     def path(self, index, index_is_id=False):
         'Return the relative path to the directory containing this books files as a unicode string.'
-        book_id = index if index_is_id else self.data.index_to_id(index)
+        book_id = index if index_is_id else self.id(index)
         return self.new_api.field_for('path', book_id).replace('/', os.sep)
 
     def abspath(self, index, index_is_id=False, create_dirs=True):
@@ -224,7 +230,7 @@ class LibraryDatabase(object):
 
     def add_format(self, index, fmt, stream, index_is_id=False, path=None, notify=True, replace=True, copy_function=None):
         ''' path and copy_function are ignored by the new API '''
-        book_id = index if index_is_id else self.data.index_to_id(index)
+        book_id = index if index_is_id else self.id(index)
         try:
             return self.new_api.add_format(book_id, fmt, stream, replace=replace, run_hooks=False, dbapi=self)
         except:
@@ -234,7 +240,7 @@ class LibraryDatabase(object):
 
     def add_format_with_hooks(self, index, fmt, fpath, index_is_id=False, path=None, notify=True, replace=True):
         ''' path is ignored by the new API '''
-        book_id = index if index_is_id else self.data.index_to_id(index)
+        book_id = index if index_is_id else self.id(index)
         try:
             return self.new_api.add_format(book_id, fmt, fpath, replace=replace, run_hooks=True, dbapi=self)
         except:
@@ -268,12 +274,12 @@ class LibraryDatabase(object):
     # }}}
 
     def get_field(self, index, key, default=None, index_is_id=False):
-        book_id = index if index_is_id else self.data.index_to_id(index)
+        book_id = index if index_is_id else self.id(index)
         mi = self.new_api.get_metadata(book_id, get_cover=key == 'cover')
         return mi.get(key, default)
 
     def authors_sort_strings(self, index, index_is_id=False):
-        book_id = index if index_is_id else self.data.index_to_id(index)
+        book_id = index if index_is_id else self.id(index)
         with self.new_api.read_lock:
             authors = self.new_api._field_ids_for('authors', book_id)
             adata = self.new_api._author_data(authors)
@@ -283,7 +289,7 @@ class LibraryDatabase(object):
         return ' & '.join(self.authors_sort_strings(index, index_is_id=index_is_id))
 
     def authors_with_sort_strings(self, index, index_is_id=False):
-        book_id = index if index_is_id else self.data.index_to_id(index)
+        book_id = index if index_is_id else self.id(index)
         with self.new_api.read_lock:
             authors = self.new_api._field_ids_for('authors', book_id)
             adata = self.new_api._author_data(authors)
@@ -318,7 +324,7 @@ class LibraryDatabase(object):
             return sorted(book_ids, key=lambda x:ff('series_index', x))
 
     def books_in_series_of(self, index, index_is_id=False):
-        book_id = index if index_is_id else self.data.index_to_id(index)
+        book_id = index if index_is_id else self.id(index)
         series_ids = self.new_api.field_ids_for('series', book_id)
         if not series_ids:
             return []
@@ -349,7 +355,7 @@ class LibraryDatabase(object):
         self.new_api.delete_conversion_options((book_id,), fmt=fmt)
 
     def set(self, index, field, val, allow_case_change=False):
-        book_id = self.data.index_to_id(index)
+        book_id = self.id(index)
         try:
             return self.new_api.set_field(field, {book_id:val}, allow_case_change=allow_case_change)
         finally:
@@ -427,6 +433,9 @@ class LibraryDatabase(object):
             if tag_ids:
                 self.new_api._remove_items('tags', tag_ids)
 
+    def has_id(self, book_id):
+        return book_id in self.new_api.all_book_ids()
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
@@ -454,10 +463,13 @@ for prop in ('author_sort', 'authors', 'comment', 'comments', 'publisher',
         return func
     setattr(LibraryDatabase, prop, MT(getter(prop)))
 
+LibraryDatabase.index = MT(lambda self, book_id, cache=False:self.data.id_to_index(book_id))
 LibraryDatabase.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
 LibraryDatabase.get_tags = MT(lambda self, book_id:set(self.new_api.field_for('tags', book_id)))
 LibraryDatabase.get_identifiers = MT(
-    lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.data.index_to_id(index)))
+    lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.id(index)))
+LibraryDatabase.isbn = MT(
+    lambda self, index, index_is_id=False: self.get_identifiers(index, index_is_id=index_is_id).get('isbn', None))
 # }}}
 
 # Legacy setter API {{{
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 0a9aff1c9c..8d07e0cff2 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -161,6 +161,10 @@ class LegacyTest(BaseTest):
             'get_next_series_num_for': [('A Series One',)],
             'author_sort_from_authors': [(['Author One', 'Author Two', 'Unknown'],)],
             'has_book':[(Metadata('title one'),), (Metadata('xxxx1111'),)],
+            'has_id':[(1,), (2,), (3,), (9999,)],
+            'id':[(1,), (2,), (0,),],
+            'index':[(1,), (2,), (3,), ],
+            'is_empty':[()],
             'all_author_names':[()],
             'all_tag_names':[()],
             'all_series_names':[()],
@@ -332,7 +336,7 @@ class LegacyTest(BaseTest):
             'construct_path_name', 'clear_dirtied', 'commit_dirty_cache', 'initialize_database', 'initialize_dynamic',
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
-            'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book',
+            'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book', 'dirtied_sequence',
         }
         SKIP_ARGSPEC = {
             '__init__',
@@ -432,7 +436,7 @@ class LegacyTest(BaseTest):
             ('set_author_sort', 3, 'new_aus'),
             ('set_comment', 1, ''), ('set_comment', 2, None), ('set_comment', 3, '<p>a comment</p>'),
             ('set_has_cover', 1, True), ('set_has_cover', 2, True), ('set_has_cover', 3, 1),
-            ('set_identifiers', 2, {'test':'', 'a':'b'}), ('set_identifiers', 3, {'id':'1', 'url':'http://acme.com'}), ('set_identifiers', 1, {}),
+            ('set_identifiers', 2, {'test':'', 'a':'b'}), ('set_identifiers', 3, {'id':'1', 'isbn':'9783161484100'}), ('set_identifiers', 1, {}),
             ('set_languages', 1, ('en',)),
             ('set_languages', 2, ()),
             ('set_languages', 3, ('deu', 'spa', 'fra')),
@@ -458,6 +462,7 @@ class LegacyTest(BaseTest):
             ('series', 0), ('series', 1), ('series', 2),
             ('series_index', 0), ('series_index', 1), ('series_index', 2),
             ('uuid', 0), ('uuid', 1), ('uuid', 2),
+            ('isbn', 0), ('isbn', 1), ('isbn', 2),
             ('@tags', 0), ('@tags', 1), ('@tags', 2),
             ('@all_tags',),
             ('@get_all_identifier_types',),
@@ -516,3 +521,4 @@ class LegacyTest(BaseTest):
 
 
     # }}}
+
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index ecd5182232..43aed74f59 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -161,6 +161,9 @@ class View(object):
     def index_to_id(self, idx):
         return self._map_filtered[idx]
 
+    def id_to_index(self, book_id):
+        return self._map.index(book_id)
+
     def _get(self, field, idx, index_is_id=True, default_value=None, fmt=lambda x:x):
         id_ = idx if index_is_id else self.index_to_id(idx)
         if index_is_id and id_ not in self.cache.all_book_ids():

From 9ec8aac3f47cdaff374ad99dad5c4ad9b456f663 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 16:10:17 +0530
Subject: [PATCH 0192/1154] Fix img flip regression in PDF

PDF Input: Fix a regression that caused some images to be flipped when
converting PDF files that use image rotation operators. See #1201083
---
 src/calibre/ebooks/pdf/pdftohtml.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/pdf/pdftohtml.py b/src/calibre/ebooks/pdf/pdftohtml.py
index ca950b84b2..47bd64c2d0 100644
--- a/src/calibre/ebooks/pdf/pdftohtml.py
+++ b/src/calibre/ebooks/pdf/pdftohtml.py
@@ -118,7 +118,7 @@ def flip_image(img, flip):
     im.save(img)
 
 def flip_images(raw):
-    for match in re.finditer(b'<IMG[^>]+/?>', raw):
+    for match in re.finditer(b'<IMG[^>]+/?>', raw, flags=re.I):
         img = match.group()
         m = re.search(br'class="(x|y|xy)flip"', img)
         if m is None: continue
@@ -127,7 +127,6 @@ def flip_images(raw):
         if src is None: continue
         img = src.group(1)
         if not os.path.exists(img): continue
-        print ('Flipping image %s: %s'%(img, flip))
         flip_image(img, flip)
     raw = re.sub(br'<STYLE.+?</STYLE>\s*', b'', raw, flags=re.I|re.DOTALL)
     return raw

From 3e47e065ee1d1181177f41be6d8b119a0fd03e11 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Jul 2013 17:07:58 +0530
Subject: [PATCH 0193/1154] formats API

---
 src/calibre/db/backend.py      | 17 ++++++++++++-
 src/calibre/db/cache.py        | 45 ++++++++++++++++++++++++++--------
 src/calibre/db/legacy.py       | 39 +++++++++++++++++++++++++++++
 src/calibre/db/tests/legacy.py | 11 +++++++++
 4 files changed, 101 insertions(+), 11 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 0ebc9679b7..2c4dfb8395 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -8,7 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 # Imports {{{
-import os, shutil, uuid, json, glob, time, cPickle
+import os, shutil, uuid, json, glob, time, cPickle, hashlib
 from functools import partial
 
 import apsw
@@ -17,7 +17,9 @@ from calibre import isbytestring, force_unicode, prints
 from calibre.constants import (iswindows, filesystem_encoding,
         preferred_encoding)
 from calibre.ptempfile import PersistentTemporaryFile
+from calibre.db import SPOOL_SIZE
 from calibre.db.schema_upgrades import SchemaUpgrade
+from calibre.db.errors import NoSuchFormat
 from calibre.library.field_metadata import FieldMetadata
 from calibre.ebooks.metadata import title_sort, author_to_author_sort
 from calibre.utils.icu import sort_key
@@ -926,6 +928,19 @@ class DB(object):
             shutil.copyfile(candidates[0], fmt_path)
             return fmt_path
 
+    def format_hash(self, book_id, fmt, fname, path):
+        path = self.format_abspath(book_id, fmt, fname, path)
+        if path is None:
+            raise NoSuchFormat('Record %d has no fmt: %s'%(book_id, fmt))
+        sha = hashlib.sha256()
+        with lopen(path, 'rb') as f:
+            while True:
+                raw = f.read(SPOOL_SIZE)
+                sha.update(raw)
+                if len(raw) < SPOOL_SIZE:
+                    break
+        return sha.hexdigest()
+
     def format_metadata(self, book_id, fmt, fname, path):
         path = self.format_abspath(book_id, fmt, fname, path)
         ans = {}
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 119e166c49..c615f62bf7 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -408,7 +408,16 @@ class Cache(object):
         return {aid:af.author_data(aid) for aid in author_ids if aid in af.table.id_map}
 
     @read_api
-    def format_metadata(self, book_id, fmt, allow_cache=True):
+    def format_hash(self, book_id, fmt):
+        try:
+            name = self.fields['formats'].format_fname(book_id, fmt)
+            path = self._field_for('path', book_id).replace('/', os.sep)
+        except:
+            raise NoSuchFormat('Record %d has no fmt: %s'%(book_id, fmt))
+        return self.backend.format_hash(book_id, fmt, name, path)
+
+    @api
+    def format_metadata(self, book_id, fmt, allow_cache=True, update_db=False):
         if not fmt:
             return {}
         fmt = fmt.upper()
@@ -416,18 +425,30 @@ class Cache(object):
             x = self.format_metadata_cache[book_id].get(fmt, None)
             if x is not None:
                 return x
-        try:
-            name = self.fields['formats'].format_fname(book_id, fmt)
-            path = self._field_for('path', book_id).replace('/', os.sep)
-        except:
-            return {}
+        with self.read_lock:
+            try:
+                name = self.fields['formats'].format_fname(book_id, fmt)
+                path = self._field_for('path', book_id).replace('/', os.sep)
+            except:
+                return {}
+
+            ans = {}
+            if path and name:
+                ans = self.backend.format_metadata(book_id, fmt, name, path)
+                self.format_metadata_cache[book_id][fmt] = ans
+        if update_db and 'size' in ans:
+            with self.write_lock:
+                max_size = self.fields['formats'].table.update_fmt(book_id, fmt, name, ans['size'], self.backend)
+                self.fields['size'].table.update_sizes({book_id: max_size})
 
-        ans = {}
-        if path and name:
-            ans = self.backend.format_metadata(book_id, fmt, name, path)
-            self.format_metadata_cache[book_id][fmt] = ans
         return ans
 
+    @read_api
+    def format_files(self, book_id):
+        field = self.fields['formats']
+        fmts = field.table.book_col_map.get(book_id, ())
+        return {fmt:field.format_fname(book_id, fmt) for fmt in fmts}
+
     @read_api
     def pref(self, name, default=None):
         return self.backend.prefs.get(name, default)
@@ -524,6 +545,7 @@ class Cache(object):
         the path is different from the current path (taking case sensitivity
         into account).
         '''
+        fmt = (fmt or '').upper()
         try:
             name = self.fields['formats'].format_fname(book_id, fmt)
             path = self._field_for('path', book_id).replace('/', os.sep)
@@ -544,6 +566,7 @@ class Cache(object):
         Apart from the viewer, I don't believe any of the others do any file
         I/O with the results of this call.
         '''
+        fmt = (fmt or '').upper()
         try:
             name = self.fields['formats'].format_fname(book_id, fmt)
             path = self._field_for('path', book_id).replace('/', os.sep)
@@ -555,6 +578,7 @@ class Cache(object):
     @read_api
     def has_format(self, book_id, fmt):
         'Return True iff the format exists on disk'
+        fmt = (fmt or '').upper()
         try:
             name = self.fields['formats'].format_fname(book_id, fmt)
             path = self._field_for('path', book_id).replace('/', os.sep)
@@ -601,6 +625,7 @@ class Cache(object):
                                   this means that repeated calls yield the same
                                   temp file (which is re-created each time)
         '''
+        fmt = (fmt or '').upper()
         ext = ('.'+fmt.lower()) if fmt else ''
         if as_path:
             if preserve_filename:
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 580fcc2ae6..0ec44e9670 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -17,6 +17,7 @@ from calibre.db.adding import (
     import_book_directory, recursive_import, add_catalog, add_news)
 from calibre.db.backend import DB
 from calibre.db.cache import Cache
+from calibre.db.errors import NoSuchFormat
 from calibre.db.categories import CATEGORY_SORTS
 from calibre.db.view import View
 from calibre.db.write import clean_identifier
@@ -436,6 +437,43 @@ class LibraryDatabase(object):
     def has_id(self, book_id):
         return book_id in self.new_api.all_book_ids()
 
+    def format(self, index, fmt, index_is_id=False, as_file=False, mode='r+b', as_path=False, preserve_filename=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.format(book_id, fmt, as_file=as_file, as_path=as_path, preserve_filename=preserve_filename)
+
+    def format_abspath(self, index, fmt, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.format_abspath(book_id, fmt)
+
+    def format_path(self, index, fmt, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        ans = self.new_api.format_abspath(book_id, fmt)
+        if ans is None:
+            raise NoSuchFormat('Record %d has no format: %s'%(book_id, fmt))
+        return ans
+
+    def format_files(self, index, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        return [(v, k) for k, v in self.new_api.format_files(book_id).iteritems()]
+
+    def format_metadata(self, book_id, fmt, allow_cache=True, update_db=False, commit=False):
+        return self.new_api.format_metadata(book_id, fmt, allow_cache=allow_cache, update_db=update_db)
+
+    def format_last_modified(self, book_id, fmt):
+        m = self.format_metadata(book_id, fmt)
+        if m:
+            return m['mtime']
+
+    def formats(self, index, index_is_id=False, verify_formats=True):
+        book_id = index if index_is_id else self.id(index)
+        ans = self.new_api.formats(book_id, verify_formats=verify_formats)
+        if ans:
+            return ','.join(ans)
+
+    def has_format(self, index, fmt, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.has_format(book_id, fmt)
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
@@ -463,6 +501,7 @@ for prop in ('author_sort', 'authors', 'comment', 'comments', 'publisher',
         return func
     setattr(LibraryDatabase, prop, MT(getter(prop)))
 
+LibraryDatabase.format_hash = MT(lambda self, book_id, fmt:self.new_api.format_hash(book_id, fmt))
 LibraryDatabase.index = MT(lambda self, book_id, cache=False:self.data.id_to_index(book_id))
 LibraryDatabase.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
 LibraryDatabase.get_tags = MT(lambda self, book_id:set(self.new_api.field_for('tags', book_id)))
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 8d07e0cff2..1cae34fd04 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -11,6 +11,7 @@ from io import BytesIO
 from repr import repr
 from functools import partial
 from tempfile import NamedTemporaryFile
+from operator import itemgetter
 
 from calibre.db.tests.base import BaseTest
 
@@ -159,6 +160,11 @@ class LegacyTest(BaseTest):
 
         for meth, args in {
             'get_next_series_num_for': [('A Series One',)],
+            'format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
+            'has_format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
+            '@format_files':[(0,),(1,),(2,)],
+            'formats':[(0,),(1,),(2,)],
+            'format_hash':[(1, 'FMT1'),(1, 'FMT2'), (2, 'FMT1')],
             'author_sort_from_authors': [(['Author One', 'Author Two', 'Unknown'],)],
             'has_book':[(Metadata('title one'),), (Metadata('xxxx1111'),)],
             'has_id':[(1,), (2,), (3,), (9999,)],
@@ -330,6 +336,7 @@ class LegacyTest(BaseTest):
             'author_id',  # replaced by get_author_id
             'books_for_author',  # broken
             'books_in_old_database',  # unused
+            'migrate_old',  # no longer supported
 
             # Internal API
             'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
@@ -337,6 +344,7 @@ class LegacyTest(BaseTest):
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
             'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book', 'dirtied_sequence',
+            'format_filename_cache', 'format_metadata_cache', 'filter', 'create_version1',
         }
         SKIP_ARGSPEC = {
             '__init__',
@@ -411,6 +419,9 @@ class LegacyTest(BaseTest):
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
         run_funcs(self, db, ndb, (
+            ('+format_metadata', 1, 'FMT1', itemgetter('size')),
+            ('+format_metadata', 1, 'FMT2', itemgetter('size')),
+            ('+format_metadata', 2, 'FMT1', itemgetter('size')),
             ('get_tags', 0), ('get_tags', 1), ('get_tags', 2),
             ('is_tag_used', 'News'), ('is_tag_used', 'xchkjgfh'),
             ('bulk_modify_tags', (1,), ['t1'], ['News']),

From 055bee6610a2704926921af7c6b050a48cb6e0e7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 10:47:54 +0530
Subject: [PATCH 0194/1154] Implement refresh/reload semantics

---
 src/calibre/db/__init__.py |  4 +++-
 src/calibre/db/cache.py    | 26 +++++++++++++++++++++-----
 src/calibre/db/fields.py   | 35 ++++++++++++++++++++++++-----------
 src/calibre/db/legacy.py   | 35 ++++++++++++++++-------------------
 src/calibre/db/view.py     | 11 +++++++++++
 5 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 47e44335ea..8f83a6bb81 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -116,6 +116,8 @@ Various things that require other things before they can be migrated:
     4. Replace the metadatabackup thread with the new implementation when using the new backend.
     5. In the new API refresh() does not re-read from disk. That might break a
     few things, for example content server reloading on db change as well as
-    dump/restore of db?
+    dump/restore of db and the refreshdb: action in gui2/ui.py. Probaly you'll have to create a dedicated API for
+    refreshing the db from disk and change the code to use it instead of the overloaded refresh (which is often used
+    to reread data from the db after writing to it). See reload_from_db() in cache.py
     6. grep the sources for TODO
 '''
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index c615f62bf7..d278e880b7 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -146,11 +146,18 @@ class Cache(object):
         self.formatter_template_cache = {}
 
     @write_api
-    def refresh(self):
-        self._initialize_template_cache()
+    def clear_caches(self, book_ids=None):
+        self._initialize_template_cache()  # Clear the formatter template cache
+        for field in self.fields.itervalues():
+            if hasattr(field, 'clear_caches'):
+                field.clear_caches(book_ids=book_ids)  # Clear the composite cache and ondevice caches
+        self.format_metadata_cache.clear()
+
+    @write_api
+    def reload_from_db(self, clear_caches=True):
+        if clear_caches:
+            self._clear_caches()
         for field in self.fields.itervalues():
-            if hasattr(field, 'clear_cache'):
-                field.clear_cache()  # Clear the composite cache
             if hasattr(field, 'table'):
                 field.table.read(self.backend)  # Reread data from metadata.db
 
@@ -786,7 +793,7 @@ class Cache(object):
 
         if dirtied and self.composites:
             for name in self.composites:
-                self.fields[name].pop_cache(dirtied)
+                self.fields[name].clear_caches(book_ids=dirtied)
 
         if dirtied and update_path and do_path_update:
             self._update_path(dirtied, mark_as_dirtied=False)
@@ -1264,6 +1271,15 @@ class Cache(object):
         ''' options must be a map of the form {book_id:conversion_options} '''
         return self.backend.set_conversion_options(options, fmt)
 
+    @write_api
+    def refresh_format_cache(self):
+        self.fields['formats'].table.read(self.backend)
+        self.format_metadata_cache.clear()
+
+    @write_api
+    def refresh_ondevice(self):
+        self.fields['ondevice'].clear_caches()
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 20d0d75ff4..e18179e4b1 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -11,7 +11,7 @@ __docformat__ = 'restructuredtext en'
 from threading import Lock
 from collections import defaultdict, Counter
 
-from calibre.db.tables import ONE_ONE, MANY_ONE, MANY_MANY
+from calibre.db.tables import ONE_ONE, MANY_ONE, MANY_MANY, null
 from calibre.db.write import Writer
 from calibre.ebooks.metadata import title_sort
 from calibre.utils.config_base import tweaks
@@ -163,14 +163,13 @@ class CompositeField(OneToOneField):
                 self._render_cache[book_id] = ans
         return ans
 
-    def clear_cache(self):
+    def clear_caches(self, book_ids=None):
         with self._lock:
-            self._render_cache = {}
-
-    def pop_cache(self, book_ids):
-        with self._lock:
-            for book_id in book_ids:
-                self._render_cache.pop(book_id, None)
+            if book_ids is None:
+                self._render_cache.clear()
+            else:
+                for book_id in book_ids:
+                    self._render_cache.pop(book_id, None)
 
     def get_value_with_cache(self, book_id, get_metadata):
         with self._lock:
@@ -218,11 +217,25 @@ class OnDeviceField(OneToOneField):
         self.name = name
         self.book_on_device_func = None
         self.is_multiple = False
+        self.cache = {}
+        self._lock = Lock()
+
+    def clear_caches(self, book_ids=None):
+        with self._lock:
+            if book_ids is None:
+                self.cache.clear()
+            else:
+                for book_id in book_ids:
+                    self.cache.pop(book_id, None)
 
     def book_on_device(self, book_id):
-        if callable(self.book_on_device_func):
-            return self.book_on_device_func(book_id)
-        return None
+        with self._lock:
+            ans = self.cache.get(book_id, null)
+        if ans is null and callable(self.book_on_device_func):
+            ans = self.book_on_device_func(book_id)
+            with self._lock:
+                self.cache[book_id] = ans
+        return None if ans is null else ans
 
     def set_book_on_device_func(self, func):
         self.book_on_device_func = func
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 0ec44e9670..f9e4b52896 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -69,7 +69,7 @@ class LibraryDatabase(object):
         self.get_property = self.data.get_property
 
         self.last_update_check = self.last_modified()
-        self.book_on_device_func = None
+        self.refresh_ids = self.data.refresh_ids
         self.is_case_sensitive = getattr(backend, 'is_case_sensitive', False)
 
     def close(self):
@@ -108,7 +108,7 @@ class LibraryDatabase(object):
 
     def check_if_modified(self):
         if self.last_modified() > self.last_update_check:
-            self.refresh()
+            self.new_api.reload_from_db()
         self.last_update_check = utcnow()
 
     @property
@@ -145,7 +145,6 @@ class LibraryDatabase(object):
         return [(k, v) for k, v in self.new_api.get_id_map(field).iteritems()]
 
     def refresh(self, field=None, ascending=True):
-        self.data.cache.refresh()
         self.data.refresh(field=field, ascending=ascending)
 
     def add_listener(self, listener):
@@ -297,26 +296,18 @@ class LibraryDatabase(object):
             return [(aid, adata[aid]['name'], adata[aid]['sort'], adata[aid]['link']) for aid in authors]
 
     def book_on_device(self, book_id):
-        if callable(self.book_on_device_func):
-            return self.book_on_device_func(book_id)
-        return None
+        with self.new_api.read_lock:
+            return self.new_api.fields['ondevice'].book_on_device(book_id)
 
     def book_on_device_string(self, book_id):
-        loc = []
-        count = 0
-        on = self.book_on_device(book_id)
-        if on is not None:
-            m, a, b, count = on[:4]
-            if m is not None:
-                loc.append(_('Main'))
-            if a is not None:
-                loc.append(_('Card A'))
-            if b is not None:
-                loc.append(_('Card B'))
-        return ', '.join(loc) + ((_(' (%s books)')%count) if count > 1 else '')
+        return self.new_api.field_for('ondevice', book_id)
 
     def set_book_on_device_func(self, func):
-        self.book_on_device_func = func
+        self.new_api.fields['ondevice'].set_book_on_device_func(func)
+
+    @property
+    def book_on_device_func(self):
+        return self.new_api.fields['ondevice'].book_on_device_func
 
     def books_in_series(self, series_id):
         with self.new_api.read_lock:
@@ -474,6 +465,12 @@ class LibraryDatabase(object):
         book_id = index if index_is_id else self.id(index)
         return self.new_api.has_format(book_id, fmt)
 
+    def refresh_format_cache(self):
+        self.new_api.refresh_format_cache()
+
+    def refresh_ondevice(self):
+        self.new_api.refresh_ondevice()
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 43aed74f59..bc341698e2 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -10,6 +10,7 @@ __docformat__ = 'restructuredtext en'
 import weakref
 from functools import partial
 from itertools import izip, imap
+from future_builtins import map
 
 from calibre.ebooks.metadata import title_sort
 from calibre.utils.config_base import tweaks
@@ -163,6 +164,7 @@ class View(object):
 
     def id_to_index(self, book_id):
         return self._map.index(book_id)
+    row = index_to_id
 
     def _get(self, field, idx, index_is_id=True, default_value=None, fmt=lambda x:x):
         id_ = idx if index_is_id else self.index_to_id(idx)
@@ -307,8 +309,17 @@ class View(object):
     def refresh(self, field=None, ascending=True):
         self._map = tuple(self.cache.all_book_ids())
         self._map_filtered = tuple(self._map)
+        self.cache.clear_caches()
         if field is not None:
             self.sort(field, ascending)
         if self.search_restriction or self.base_restriction:
             self.search('', return_matches=False)
 
+    def refresh_ids(self, db, ids):
+        self.cache.clear_caches(book_ids=ids)
+        try:
+            return list(map(self.id_to_index, ids))
+        except ValueError:
+            pass
+        return None
+

From e8a912267d3ced92ec82ca709ff284d3713b4e2f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 11:17:03 +0530
Subject: [PATCH 0195/1154] update_last_modified() and set_marked_ids()

---
 src/calibre/db/legacy.py       | 5 +++++
 src/calibre/db/tests/legacy.py | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index f9e4b52896..b2ad232f24 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -70,6 +70,7 @@ class LibraryDatabase(object):
 
         self.last_update_check = self.last_modified()
         self.refresh_ids = self.data.refresh_ids
+        self.set_marked_ids = self.data.set_marked_ids
         self.is_case_sensitive = getattr(backend, 'is_case_sensitive', False)
 
     def close(self):
@@ -540,6 +541,10 @@ for field in (
                 return ret if field == 'languages' else retval
         return func
     setattr(LibraryDatabase, 'set_%s' % field.replace('!', ''), MT(setter(field)))
+
+LibraryDatabase.update_last_modified = MT(
+    lambda self, book_ids, commit=False, now=None: self.new_api.update_last_modified(book_ids, now=now))
+
 # }}}
 
 # Legacy API to get information about many-(one, many) fields {{{
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 1cae34fd04..3f2c8729b8 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -416,6 +416,8 @@ class LegacyTest(BaseTest):
     def test_legacy_setters(self):  # {{{
         'Test methods that are directly equivalent in the old and new interface'
         from calibre.ebooks.metadata.book.base import Metadata
+        from calibre.utils.date import now
+        n = now()
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
         run_funcs(self, db, ndb, (
@@ -437,6 +439,9 @@ class LegacyTest(BaseTest):
             (db.clean,),
             ('@all_tags',),
             ('@tags', 0), ('@tags', 1), ('@tags', 2),
+
+            ('update_last_modified', (1,), True, n), ('update_last_modified', (3,), True, n),
+            ('metadata_last_modified', 1, True), ('metadata_last_modified', 3, True),
         ))
 
         ndb = self.init_legacy(self.cloned_library)

From 51018ff76f9f9345dd12a92fdbbf767e4303dc2e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 13:34:43 +0530
Subject: [PATCH 0196/1154] tags_older_than()

---
 src/calibre/db/__init__.py     |  6 ++---
 src/calibre/db/cache.py        | 45 ++++++++++++++++++++++++++++++++++
 src/calibre/db/legacy.py       |  4 +++
 src/calibre/db/tests/legacy.py | 20 +++++++++------
 4 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 8f83a6bb81..3a14552281 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -107,12 +107,10 @@ Various things that require other things before they can be migrated:
     1. From initialize_dynamic(): set_saved_searches,
                     load_user_template_functions. Also add custom
                     columns/categories/searches info into
-                    self.field_metadata. Finally, implement metadata dirtied
-                    functionality.
+                    self.field_metadata.
     2. Catching DatabaseException and sqlite.Error when creating new
     libraries/switching/on calibre startup.
-    3. From refresh in the legacy interface: Rember to flush the composite
-    column template cache.
+    3. Port library/restore.py
     4. Replace the metadatabackup thread with the new implementation when using the new backend.
     5. In the new API refresh() does not re-read from disk. That might break a
     few things, for example content server reloading on db change as well as
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d278e880b7..28fff9268b 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1280,6 +1280,51 @@ class Cache(object):
     def refresh_ondevice(self):
         self.fields['ondevice'].clear_caches()
 
+    @read_api
+    def tags_older_than(self, tag, delta=None, must_have_tag=None, must_have_authors=None):
+        '''
+        Return the ids of all books having the tag ``tag`` that are older than
+        than the specified time. tag comparison is case insensitive.
+
+        :param delta: A timedelta object or None. If None, then all ids with
+        the tag are returned.
+        :param must_have_tag: If not None the list of matches will be
+        restricted to books that have this tag
+        :param must_have_authors: A list of authors. If not None the list of
+        matches will be restricted to books that have these authors (case
+        insensitive).
+        '''
+        tag_map = {icu_lower(v):k for k, v in self._get_id_map('tags').iteritems()}
+        tag = icu_lower(tag.strip())
+        mht = icu_lower(must_have_tag.strip()) if must_have_tag else None
+        tag_id, mht_id = tag_map.get(tag, None), tag_map.get(mht, None)
+        ans = set()
+        if mht_id is None and mht:
+            return ans
+        if tag_id is not None:
+            tagged_books = self._books_for_field('tags', tag_id)
+            if mht_id is not None and tagged_books:
+                tagged_books = tagged_books.intersection(self._books_for_field('tags', mht_id))
+            if tagged_books:
+                if must_have_authors is not None:
+                    amap = {icu_lower(v):k for k, v in self._get_id_map('authors').iteritems()}
+                    books = None
+                    for author in must_have_authors:
+                        abooks = self._books_for_field('authors', amap.get(icu_lower(author), None))
+                        books = abooks if books is None else books.intersection(abooks)
+                        if not books:
+                            break
+                    tagged_books = tagged_books.intersection(books or set())
+                if delta is None:
+                    ans = tagged_books
+                else:
+                    now = nowf()
+                    for book_id in tagged_books:
+                        ts = self._field_for('timestamp', book_id)
+                        if (now - ts) > delta:
+                            ans.add(book_id)
+        return ans
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b2ad232f24..62cfe08838 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -472,6 +472,10 @@ class LibraryDatabase(object):
     def refresh_ondevice(self):
         self.new_api.refresh_ondevice()
 
+    def tags_older_than(self, tag, delta, must_have_tag=None, must_have_authors=None):
+        for book_id in sorted(self.new_api.tags_older_than(tag, delta=delta, must_have_tag=must_have_tag, must_have_authors=must_have_authors)):
+            yield book_id
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 3f2c8729b8..4d25c8798a 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -153,13 +153,19 @@ class LegacyTest(BaseTest):
     # }}}
 
     def test_legacy_direct(self):  # {{{
-        'Test methods that are directly equivalent in the old and new interface'
+        'Test read-only methods that are directly equivalent in the old and new interface'
         from calibre.ebooks.metadata.book.base import Metadata
+        from datetime import timedelta
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old()
 
         for meth, args in {
             'get_next_series_num_for': [('A Series One',)],
+            '@tags_older_than': [
+                ('News', None), ('Tag One', None), ('xxxx', None), ('Tag One', None, 'News'), ('News', None, 'xxxx'),
+                ('News', None, None, ['xxxxxxx']), ('News', None, 'Tag One', ['Author Two', 'Author One']),
+                ('News', timedelta(0), None, None), ('News', timedelta(100000)),
+            ],
             'format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
             'has_format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
             '@format_files':[(0,),(1,),(2,)],
@@ -208,13 +214,13 @@ class LegacyTest(BaseTest):
             'books_in_series_of':[(0,), (1,), (2,)],
             'books_with_same_title':[(Metadata(db.title(0)),), (Metadata(db.title(1)),), (Metadata('1234'),)],
         }.iteritems():
+            fmt = lambda x: x
+            if meth[0] in {'!', '@'}:
+                fmt = {'!':dict, '@':frozenset}[meth[0]]
+                meth = meth[1:]
+            elif meth == 'get_authors_with_ids':
+                fmt = lambda val:{x[0]:tuple(x[1:]) for x in val}
             for a in args:
-                fmt = lambda x: x
-                if meth[0] in {'!', '@'}:
-                    fmt = {'!':dict, '@':frozenset}[meth[0]]
-                    meth = meth[1:]
-                elif meth == 'get_authors_with_ids':
-                    fmt = lambda val:{x[0]:tuple(x[1:]) for x in val}
                 self.assertEqual(fmt(getattr(db, meth)(*a)), fmt(getattr(ndb, meth)(*a)),
                                  'The method: %s() returned different results for argument %s' % (meth, a))
         db.close()

From 3e184968f25462361fbe349eabf6a758e94eaf9f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 15:35:55 +0530
Subject: [PATCH 0197/1154] More API

---
 src/calibre/db/cache.py        | 26 ++++++++++++++++++++++++++
 src/calibre/db/legacy.py       | 18 ++++++++++++++++++
 src/calibre/db/tables.py       |  7 +++++++
 src/calibre/db/tests/legacy.py | 17 ++++++++++++++++-
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 28fff9268b..42e53a6f47 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1325,6 +1325,32 @@ class Cache(object):
                             ans.add(book_id)
         return ans
 
+    @write_api
+    def set_sort_for_authors(self, author_id_to_sort_map, update_books=True):
+        self.fields['authors'].table.set_sort_names(author_id_to_sort_map, self.backend)
+        changed_books = set()
+        if update_books:
+            val_map = {}
+            for author_id in author_id_to_sort_map:
+                books = self._books_for_field('authors', author_id)
+                changed_books |= books
+                for book_id in books:
+                    authors = self._field_ids_for('authors', book_id)
+                    adata = self._author_data(authors)
+                    sorts = [adata[x]['sort'] for x in authors]
+                    val_map[book_id] = ' & '.join(sorts)
+            if val_map:
+                self._set_field('author_sort', val_map)
+        return changed_books
+
+    @write_api
+    def set_link_for_authors(self, author_id_to_link_map):
+        self.fields['authors'].table.set_links(author_id_to_link_map, self.backend)
+        changed_books = set()
+        for author_id in author_id_to_link_map:
+            changed_books |= self._books_for_field('authors', author_id)
+        return changed_books
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 62cfe08838..fef440dd6d 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -296,6 +296,16 @@ class LibraryDatabase(object):
             adata = self.new_api._author_data(authors)
             return [(aid, adata[aid]['name'], adata[aid]['sort'], adata[aid]['link']) for aid in authors]
 
+    def set_sort_field_for_author(self, old_id, new_sort, commit=True, notify=False):
+        changed_books = self.new_api.set_sort_for_authors({old_id:new_sort})
+        if notify:
+            self.notify('metadata', list(changed_books))
+
+    def set_link_field_for_author(self, aid, link, commit=True, notify=False):
+        changed_books = self.new_api.set_link_for_authors({aid:link})
+        if notify:
+            self.notify('metadata', list(changed_books))
+
     def book_on_device(self, book_id):
         with self.new_api.read_lock:
             return self.new_api.fields['ondevice'].book_on_device(book_id)
@@ -476,6 +486,14 @@ class LibraryDatabase(object):
         for book_id in sorted(self.new_api.tags_older_than(tag, delta=delta, must_have_tag=must_have_tag, must_have_authors=must_have_authors)):
             yield book_id
 
+    def sizeof_format(self, index, fmt, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.format_metadata(book_id, fmt).get('size', None)
+
+    def get_metadata(self, index, index_is_id=False, get_cover=False, get_user_categories=True, cover_as_data=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.get_metadata(book_id, get_cover=get_cover, get_user_categories=get_user_categories, cover_as_data=cover_as_data)
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 46c4554586..81c66a0ca5 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -293,10 +293,17 @@ class AuthorsTable(ManyToManyTable):
             self.alink_map[row[0]] = row[3]
 
     def set_sort_names(self, aus_map, db):
+        aus_map = {aid:(a or '').strip() for aid, a in aus_map.iteritems()}
         self.asort_map.update(aus_map)
         db.conn.executemany('UPDATE authors SET sort=? WHERE id=?',
             [(v, k) for k, v in aus_map.iteritems()])
 
+    def set_links(self, link_map, db):
+        link_map = {aid:(l or '').strip() for aid, l in link_map.iteritems()}
+        self.alink_map.update(link_map)
+        db.conn.executemany('UPDATE authors SET link=? WHERE id=?',
+            [(v, k) for k, v in link_map.iteritems()])
+
     def remove_books(self, book_ids, db):
         clean = ManyToManyTable.remove_books(self, book_ids, db)
         for item_id in clean:
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 4d25c8798a..0707022674 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -168,6 +168,7 @@ class LegacyTest(BaseTest):
             ],
             'format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
             'has_format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
+            'sizeof_format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
             '@format_files':[(0,),(1,),(2,)],
             'formats':[(0,),(1,),(2,)],
             'format_hash':[(1, 'FMT1'),(1, 'FMT2'), (2, 'FMT1')],
@@ -341,7 +342,7 @@ class LegacyTest(BaseTest):
             # Obsolete/broken methods
             'author_id',  # replaced by get_author_id
             'books_for_author',  # broken
-            'books_in_old_database',  # unused
+            'books_in_old_database', 'sizeof_old_database',  # unused
             'migrate_old',  # no longer supported
 
             # Internal API
@@ -425,6 +426,8 @@ class LegacyTest(BaseTest):
         from calibre.utils.date import now
         n = now()
         ndb = self.init_legacy(self.cloned_library)
+        amap = ndb.new_api.get_id_map('authors')
+        sorts = [(aid, 's%d' % aid) for aid in amap]
         db = self.init_old(self.cloned_library)
         run_funcs(self, db, ndb, (
             ('+format_metadata', 1, 'FMT1', itemgetter('size')),
@@ -448,7 +451,19 @@ class LegacyTest(BaseTest):
 
             ('update_last_modified', (1,), True, n), ('update_last_modified', (3,), True, n),
             ('metadata_last_modified', 1, True), ('metadata_last_modified', 3, True),
+            ('set_sort_field_for_author', sorts[0][0], sorts[0][1]),
+            ('set_sort_field_for_author', sorts[1][0], sorts[1][1]),
+            ('set_sort_field_for_author', sorts[2][0], sorts[2][1]),
+            ('set_link_field_for_author', sorts[0][0], sorts[0][1]),
+            ('set_link_field_for_author', sorts[1][0], sorts[1][1]),
+            ('set_link_field_for_author', sorts[2][0], sorts[2][1]),
+            (db.refresh,),
+            ('author_sort', 0), ('author_sort', 1), ('author_sort', 2),
         ))
+        omi = [db.get_metadata(x) for x in (0, 1, 2)]
+        nmi = [ndb.get_metadata(x) for x in (0, 1, 2)]
+        self.assertEqual([x.author_sort_map for x in omi], [x.author_sort_map for x in nmi])
+        self.assertEqual([x.author_link_map for x in omi], [x.author_link_map for x in nmi])
 
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)

From dc97d6ad695cd3b010a81024827e63ba69e85db4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 15:41:19 +0530
Subject: [PATCH 0198/1154] ...

---
 src/calibre/db/tests/legacy.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 0707022674..b609cb478d 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -344,6 +344,7 @@ class LegacyTest(BaseTest):
             'books_for_author',  # broken
             'books_in_old_database', 'sizeof_old_database',  # unused
             'migrate_old',  # no longer supported
+            'remove_unused_series',  # superseded by clean API
 
             # Internal API
             'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',

From 12cded043fb1796f564346a412072ded8519b60b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 16:47:54 +0530
Subject: [PATCH 0199/1154] EPUB Output: Generate inline ToC

EPUB Output: Add an option to insert an inline Table of COntents into
the main text. Fixes #1201006 [Epub output: not possible to insert inline toc](https://bugs.launchpad.net/calibre/+bug/1201006)
---
 .../ebooks/conversion/plugins/epub_output.py  | 44 +++++++----
 src/calibre/ebooks/mobi/writer8/toc.py        | 40 ++++++++--
 src/calibre/gui2/convert/epub_output.py       |  1 +
 src/calibre/gui2/convert/epub_output.ui       | 77 +++++++++++++------
 4 files changed, 114 insertions(+), 48 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/epub_output.py b/src/calibre/ebooks/conversion/plugins/epub_output.py
index f09f2560b0..5569be4304 100644
--- a/src/calibre/ebooks/conversion/plugins/epub_output.py
+++ b/src/calibre/ebooks/conversion/plugins/epub_output.py
@@ -105,14 +105,23 @@ class EPUBOutput(OutputFormatPlugin):
                 ' EPUB, putting all files into the top level.')
         ),
 
+        OptionRecommendation(name='epub_inline_toc', recommended_value=False,
+            help=_('Insert an inline Table of Contents that will appear as part of the main book content.')
+        ),
+
+        OptionRecommendation(name='epub_toc_at_end', recommended_value=False,
+            help=_('Put the inserted inline Table of Contents at the end of the book instead of the start.')
+        ),
+
+        OptionRecommendation(name='toc_title', recommended_value=None,
+            help=_('Title for any generated in-line table of contents.')
+        ),
 
         ])
 
     recommendations = set([('pretty_print', True, OptionRecommendation.HIGH)])
 
-
-
-    def workaround_webkit_quirks(self): # {{{
+    def workaround_webkit_quirks(self):  # {{{
         from calibre.ebooks.oeb.base import XPath
         for x in self.oeb.spine:
             root = x.data
@@ -128,13 +137,13 @@ class EPUBOutput(OutputFormatPlugin):
                     pre.tag = 'div'
     # }}}
 
-    def upshift_markup(self): # {{{
+    def upshift_markup(self):  # {{{
         'Upgrade markup to comply with XHTML 1.1 where possible'
         from calibre.ebooks.oeb.base import XPath, XML
         for x in self.oeb.spine:
             root = x.data
             if (not root.get(XML('lang'))) and (root.get('lang')):
-               root.set(XML('lang'), root.get('lang'))
+                root.set(XML('lang'), root.get('lang'))
             body = XPath('//h:body')(root)
             if body:
                 body = body[0]
@@ -159,12 +168,17 @@ class EPUBOutput(OutputFormatPlugin):
                     else:
                         seen_names.add(name)
 
-
     # }}}
-
     def convert(self, oeb, output_path, input_plugin, opts, log):
         self.log, self.opts, self.oeb = log, opts, oeb
 
+        if self.opts.epub_inline_toc:
+            from calibre.ebooks.mobi.writer8.toc import TOCAdder
+            opts.mobi_toc_at_start = not opts.epub_toc_at_end
+            opts.mobi_passthrough = False
+            opts.no_inline_toc = False
+            TOCAdder(oeb, opts, replace_previous_inline_toc=True, ignore_existing_toc=True)
+
         if self.opts.epub_flatten:
             from calibre.ebooks.oeb.transforms.filenames import FlatFilenames
             FlatFilenames()(oeb, opts)
@@ -234,7 +248,7 @@ class EPUBOutput(OutputFormatPlugin):
             oeb_output = plugin_for_output_format('oeb')
             oeb_output.convert(oeb, tdir, input_plugin, opts, log)
             opf = [x for x in os.listdir(tdir) if x.endswith('.opf')][0]
-            self.condense_ncx([os.path.join(tdir, x) for x in os.listdir(tdir)\
+            self.condense_ncx([os.path.join(tdir, x) for x in os.listdir(tdir)
                     if x.endswith('.ncx')][0])
             encryption = None
             if encrypted_fonts:
@@ -261,7 +275,7 @@ class EPUBOutput(OutputFormatPlugin):
                     zf.extractall(path=opts.extract_to)
                 self.log.info('EPUB extracted to', opts.extract_to)
 
-    def encrypt_fonts(self, uris, tdir, uuid): # {{{
+    def encrypt_fonts(self, uris, tdir, uuid):  # {{{
         from binascii import unhexlify
 
         key = re.sub(r'[^a-fA-F0-9]', '', uuid)
@@ -301,14 +315,14 @@ class EPUBOutput(OutputFormatPlugin):
                 </enc:EncryptedData>
                 '''%(uri.replace('"', '\\"')))
             if fonts:
-                    ans = '''<encryption
+                ans = '''<encryption
                     xmlns="urn:oasis:names:tc:opendocument:xmlns:container"
                     xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
                     xmlns:deenc="http://ns.adobe.com/digitaleditions/enc">
                     '''
-                    ans += (u'\n'.join(fonts)).encode('utf-8')
-                    ans += '\n</encryption>'
-                    return ans
+                ans += (u'\n'.join(fonts)).encode('utf-8')
+                ans += '\n</encryption>'
+                return ans
     # }}}
 
     def condense_ncx(self, ncx_path):
@@ -323,7 +337,7 @@ class EPUBOutput(OutputFormatPlugin):
             compressed = etree.tostring(tree.getroot(), encoding='utf-8')
             open(ncx_path, 'wb').write(compressed)
 
-    def workaround_ade_quirks(self): # {{{
+    def workaround_ade_quirks(self):  # {{{
         '''
         Perform various markup transforms to get the output to render correctly
         in the quirky ADE.
@@ -462,7 +476,7 @@ class EPUBOutput(OutputFormatPlugin):
 
     # }}}
 
-    def workaround_sony_quirks(self): # {{{
+    def workaround_sony_quirks(self):  # {{{
         '''
         Perform toc link transforms to alleviate slow loading.
         '''
diff --git a/src/calibre/ebooks/mobi/writer8/toc.py b/src/calibre/ebooks/mobi/writer8/toc.py
index 7bae35ae98..640e8bec5f 100644
--- a/src/calibre/ebooks/mobi/writer8/toc.py
+++ b/src/calibre/ebooks/mobi/writer8/toc.py
@@ -34,9 +34,17 @@ TEMPLATE = '''
 </html>
 '''
 
+def find_previous_calibre_inline_toc(oeb):
+    if 'toc' in oeb.guide:
+        href = urlnormalize(oeb.guide['toc'].href.partition('#')[0])
+        if href in oeb.manifest.hrefs:
+            item = oeb.manifest.hrefs[href]
+            if (hasattr(item.data, 'xpath') and XPath('//h:body[@id="calibre_generated_inline_toc"]')(item.data)):
+                return item
+
 class TOCAdder(object):
 
-    def __init__(self, oeb, opts):
+    def __init__(self, oeb, opts, replace_previous_inline_toc=False, ignore_existing_toc=False):
         self.oeb, self.opts, self.log = oeb, opts, oeb.log
         self.title = opts.toc_title or DEFAULT_TITLE
         self.at_start = opts.mobi_toc_at_start
@@ -44,6 +52,12 @@ class TOCAdder(object):
         self.added_toc_guide_entry = False
         self.has_toc = oeb.toc and oeb.toc.count() > 1
 
+        self.tocitem = tocitem = None
+        if find_previous_calibre_inline_toc:
+            tocitem = self.tocitem = find_previous_calibre_inline_toc(oeb)
+        if ignore_existing_toc and 'toc' in oeb.guide:
+            oeb.guide.remove('toc')
+
         if 'toc' in oeb.guide:
             # Remove spurious toc entry from guide if it is not in spine or it
             # does not have any hyperlinks
@@ -81,13 +95,19 @@ class TOCAdder(object):
         for child in self.oeb.toc:
             self.process_toc_node(child, parent)
 
-        id, href = oeb.manifest.generate('contents', 'contents.xhtml')
-        item = self.generated_item = oeb.manifest.add(id, href, XHTML_MIME,
-                data=root)
-        if self.at_start:
-            oeb.spine.insert(0, item, linear=True)
+        if tocitem is not None:
+            href = tocitem.href
+            if oeb.spine.index(tocitem) > -1:
+                oeb.spine.remove(tocitem)
+            tocitem.data = root
         else:
-            oeb.spine.add(item, linear=False)
+            id, href = oeb.manifest.generate('contents', 'contents.xhtml')
+            tocitem = self.generated_item = oeb.manifest.add(id, href, XHTML_MIME,
+                    data=root)
+        if self.at_start:
+            oeb.spine.insert(0, tocitem, linear=True)
+        else:
+            oeb.spine.add(tocitem, linear=False)
 
         oeb.guide.add('toc', 'Table of Contents', href)
 
@@ -95,7 +115,10 @@ class TOCAdder(object):
         li = parent.makeelement(XHTML('li'))
         li.tail = '\n'+ ('\t'*level)
         parent.append(li)
-        a = parent.makeelement(XHTML('a'), href=toc.href or '#')
+        href = toc.href
+        if self.tocitem is not None and href:
+            href = self.tocitem.relhref(toc.href)
+        a = parent.makeelement(XHTML('a'), href=href or '#')
         a.text = toc.title
         li.append(a)
         if toc.count() > 0:
@@ -115,3 +138,4 @@ class TOCAdder(object):
             self.oeb.guide.remove('toc')
             self.added_toc_guide_entry = False
 
+
diff --git a/src/calibre/gui2/convert/epub_output.py b/src/calibre/gui2/convert/epub_output.py
index 2fcbd751fe..5fbfd74d05 100644
--- a/src/calibre/gui2/convert/epub_output.py
+++ b/src/calibre/gui2/convert/epub_output.py
@@ -21,6 +21,7 @@ class PluginWidget(Widget, Ui_Form):
         Widget.__init__(self, parent,
                 ['dont_split_on_page_breaks', 'flow_size',
                     'no_default_epub_cover', 'no_svg_cover',
+                 'epub_inline_toc', 'epub_toc_at_end', 'toc_title',
                     'preserve_cover_aspect_ratio', 'epub_flatten']
                 )
         for i in range(2):
diff --git a/src/calibre/gui2/convert/epub_output.ui b/src/calibre/gui2/convert/epub_output.ui
index 606ed62065..fa939d289f 100644
--- a/src/calibre/gui2/convert/epub_output.ui
+++ b/src/calibre/gui2/convert/epub_output.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>644</width>
     <height>300</height>
    </rect>
   </property>
@@ -14,27 +14,6 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QCheckBox" name="opt_dont_split_on_page_breaks">
-     <property name="text">
-      <string>Do not &amp;split on page breaks</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="opt_no_default_epub_cover">
-     <property name="text">
-      <string>No default &amp;cover</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QCheckBox" name="opt_no_svg_cover">
-     <property name="text">
-      <string>No &amp;SVG cover</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="1">
     <widget class="QCheckBox" name="opt_preserve_cover_aspect_ratio">
      <property name="text">
@@ -42,7 +21,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Split files &amp;larger than:</string>
@@ -52,7 +31,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="5" column="1">
     <widget class="QSpinBox" name="opt_flow_size">
      <property name="suffix">
       <string> KB</string>
@@ -68,7 +47,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="6" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -81,6 +60,41 @@
      </property>
     </spacer>
    </item>
+   <item row="1" column="0">
+    <widget class="QCheckBox" name="opt_no_default_epub_cover">
+     <property name="text">
+      <string>No default &amp;cover</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="opt_no_svg_cover">
+     <property name="text">
+      <string>No &amp;SVG cover</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QCheckBox" name="opt_epub_inline_toc">
+     <property name="text">
+      <string>Insert inline &amp;Table of Contents</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QCheckBox" name="opt_dont_split_on_page_breaks">
+     <property name="text">
+      <string>Do not &amp;split on page breaks</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QCheckBox" name="opt_epub_toc_at_end">
+     <property name="text">
+      <string>Put inserted Table of Contents at the &amp;end of the book</string>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="1">
     <widget class="QCheckBox" name="opt_epub_flatten">
      <property name="text">
@@ -88,6 +102,19 @@
      </property>
     </widget>
    </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>&amp;Title for inserted ToC:</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_toc_title</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QLineEdit" name="opt_toc_title"/>
+   </item>
   </layout>
  </widget>
  <resources/>

From 67025df8ef24cc788a68f78a488b21d22b102ab3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 18:31:55 +0530
Subject: [PATCH 0200/1154] Implement refreshdb:

---
 src/calibre/db/__init__.py | 8 ++------
 src/calibre/gui2/ui.py     | 7 ++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 3a14552281..99154ad618 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -112,10 +112,6 @@ Various things that require other things before they can be migrated:
     libraries/switching/on calibre startup.
     3. Port library/restore.py
     4. Replace the metadatabackup thread with the new implementation when using the new backend.
-    5. In the new API refresh() does not re-read from disk. That might break a
-    few things, for example content server reloading on db change as well as
-    dump/restore of db and the refreshdb: action in gui2/ui.py. Probaly you'll have to create a dedicated API for
-    refreshing the db from disk and change the code to use it instead of the overloaded refresh (which is often used
-    to reread data from the db after writing to it). See reload_from_db() in cache.py
-    6. grep the sources for TODO
+    5. grep the sources for TODO
+    6. Check that content server reloading on metadata,db change, metadata backup, refresh gui on calibredb add all work
 '''
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 06cb4d904f..229ed0933d 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -532,7 +532,12 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             self.raise_()
             self.activateWindow()
         elif msg.startswith('refreshdb:'):
-            self.library_view.model().refresh()
+            db = self.library_view.model().db
+            if hasattr(db, 'new_api'):
+                db.new_api.reload_from_db()
+                self.library_view.model().resort()
+            else:
+                self.library_view.model().refresh()
             self.library_view.model().research()
             self.tags_view.recount()
             self.library_view.model().db.refresh_format_cache()

From eac44f83b8d80e5820d567f44027bd7f6b676e62 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 18:53:55 +0530
Subject: [PATCH 0201/1154] More API

---
 src/calibre/db/legacy.py       | 19 +++++++++++++++++++
 src/calibre/db/tests/legacy.py |  8 +++++++-
 src/calibre/db/view.py         |  3 +++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index fef440dd6d..ec480c3d2d 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -65,6 +65,7 @@ class LibraryDatabase(object):
         cache.init()
         self.data = View(cache)
         self.id = self.data.index_to_id
+        self.count = self.data.count
 
         self.get_property = self.data.get_property
 
@@ -84,6 +85,10 @@ class LibraryDatabase(object):
             delattr(self, x)
 
     # Library wide properties {{{
+    @property
+    def prefs(self):
+        return self.new_api.backend.prefs
+
     @property
     def field_metadata(self):
         return self.backend.field_metadata
@@ -521,6 +526,18 @@ for prop in ('author_sort', 'authors', 'comment', 'comments', 'publisher',
         return func
     setattr(LibraryDatabase, prop, MT(getter(prop)))
 
+for prop in ('series', 'publisher'):
+    def getter(field):
+        def func(self, index, index_is_id=False):
+            book_id = index if index_is_id else self.id(index)
+            ans = self.new_api.field_ids_for(field, book_id)
+            try:
+                return ans[0]
+            except IndexError:
+                pass
+        return func
+    setattr(LibraryDatabase, prop + '_id', MT(getter(prop)))
+
 LibraryDatabase.format_hash = MT(lambda self, book_id, fmt:self.new_api.format_hash(book_id, fmt))
 LibraryDatabase.index = MT(lambda self, book_id, cache=False:self.data.id_to_index(book_id))
 LibraryDatabase.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
@@ -590,6 +607,8 @@ LibraryDatabase.all_tags = MT(lambda self: list(self.all_tag_names()))
 LibraryDatabase.get_all_identifier_types = MT(lambda self: list(self.new_api.fields['identifiers'].table.all_identifier_types()))
 LibraryDatabase.get_authors_with_ids = MT(
     lambda self: [[aid, adata['name'], adata['sort'], adata['link']] for aid, adata in self.new_api.author_data().iteritems()])
+LibraryDatabase.get_author_id = MT(
+    lambda self, author: {icu_lower(v):k for k, v in self.new_api.get_id_map('authors').iteritems()}.get(icu_lower(author), None))
 
 for field in ('tags', 'series', 'publishers', 'ratings', 'languages'):
     def getter(field):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index b609cb478d..5f1aa2ff41 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -159,8 +159,13 @@ class LegacyTest(BaseTest):
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old()
 
+        self.assertEqual(dict(db.prefs), dict(ndb.prefs))
+
         for meth, args in {
             'get_next_series_num_for': [('A Series One',)],
+            'get_author_id': [('author one',), ('unknown',), ('xxxxx',)],
+            'series_id': [(0,), (1,), (2,)],
+            'publisher_id': [(0,), (1,), (2,)],
             '@tags_older_than': [
                 ('News', None), ('Tag One', None), ('xxxx', None), ('Tag One', None, 'News'), ('News', None, 'xxxx'),
                 ('News', None, None, ['xxxxxxx']), ('News', None, 'Tag One', ['Author Two', 'Author One']),
@@ -178,6 +183,7 @@ class LegacyTest(BaseTest):
             'id':[(1,), (2,), (0,),],
             'index':[(1,), (2,), (3,), ],
             'is_empty':[()],
+            'count':[()],
             'all_author_names':[()],
             'all_tag_names':[()],
             'all_series_names':[()],
@@ -352,7 +358,7 @@ class LegacyTest(BaseTest):
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
             'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book', 'dirtied_sequence',
-            'format_filename_cache', 'format_metadata_cache', 'filter', 'create_version1',
+            'format_filename_cache', 'format_metadata_cache', 'filter', 'create_version1', 'normpath',
         }
         SKIP_ARGSPEC = {
             '__init__',
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index bc341698e2..bb9131e212 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -120,6 +120,9 @@ class View(object):
         self._map = tuple(sorted(self.cache.all_book_ids()))
         self._map_filtered = tuple(self._map)
 
+    def count(self):
+        return len(self._map)
+
     def get_property(self, id_or_index, index_is_id=False, loc=-1):
         book_id = id_or_index if index_is_id else self._map_filtered[id_or_index]
         return self._field_getters[loc](book_id)

From abc9232016ee33a518f99dee2970ad88e46a4a8c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 19:07:33 +0530
Subject: [PATCH 0202/1154] ...

---
 src/calibre/db/cache.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 42e53a6f47..330e8dfba5 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1341,6 +1341,7 @@ class Cache(object):
                     val_map[book_id] = ' & '.join(sorts)
             if val_map:
                 self._set_field('author_sort', val_map)
+        self._mark_as_dirty(changed_books)
         return changed_books
 
     @write_api
@@ -1349,6 +1350,7 @@ class Cache(object):
         changed_books = set()
         for author_id in author_id_to_link_map:
             changed_books |= self._books_for_field('authors', author_id)
+        self._mark_as_dirty(changed_books)
         return changed_books
 
     # }}}

From cdf50da0342729728efc99d90eb519c5400c7387 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 15 Jul 2013 21:16:07 +0530
Subject: [PATCH 0203/1154] get_id_from_uuid()

---
 src/calibre/db/cache.py        | 5 +++++
 src/calibre/db/legacy.py       | 4 ++++
 src/calibre/db/tables.py       | 3 +++
 src/calibre/db/tests/legacy.py | 1 +
 4 files changed, 13 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 330e8dfba5..ea62f3b90a 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1353,6 +1353,11 @@ class Cache(object):
         self._mark_as_dirty(changed_books)
         return changed_books
 
+    @read_api
+    def lookup_by_uuid(self, uuid):
+        return self.fields['uuid'].table.lookup_by_uuid(uuid)
+
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index ec480c3d2d..1faf9a2d1a 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -153,6 +153,10 @@ class LibraryDatabase(object):
     def refresh(self, field=None, ascending=True):
         self.data.refresh(field=field, ascending=ascending)
 
+    def get_id_from_uuid(self, uuid):
+        if uuid:
+            return self.new_api.lookup_by_uuid(uuid)
+
     def add_listener(self, listener):
         '''
         Add a listener. Will be called on change events with two arguments.
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 81c66a0ca5..e76423d971 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -137,6 +137,9 @@ class UUIDTable(OneToOneTable):
                 clean.add(val)
         return clean
 
+    def lookup_by_uuid(self, uuid):
+        return self.uuid_to_id_map.get(uuid, None)
+
 class CompositeTable(OneToOneTable):
 
     def read(self, db):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 5f1aa2ff41..725f6c3ad9 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -163,6 +163,7 @@ class LegacyTest(BaseTest):
 
         for meth, args in {
             'get_next_series_num_for': [('A Series One',)],
+            'get_id_from_uuid':[('ddddd',), (db.uuid(1, True),)],
             'get_author_id': [('author one',), ('unknown',), ('xxxxx',)],
             'series_id': [(0,), (1,), (2,)],
             'publisher_id': [(0,), (1,), (2,)],

From 22f2aca3ebee11ac3a7938946035925402880201 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 09:09:19 +0530
Subject: [PATCH 0204/1154] Dont chdir() when doing bulk metadata

Works around broken windows systems with temp folder permission issues.
---
 src/calibre/ebooks/metadata/sources/worker.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/worker.py b/src/calibre/ebooks/metadata/sources/worker.py
index 1c83f965e1..ebe764c68f 100644
--- a/src/calibre/ebooks/metadata/sources/worker.py
+++ b/src/calibre/ebooks/metadata/sources/worker.py
@@ -50,14 +50,13 @@ def merge_result(oldmi, newmi, ensure_fields=None):
     return newmi
 
 def main(do_identify, covers, metadata, ensure_fields, tdir):
-    os.chdir(tdir)
     failed_ids = set()
     failed_covers = set()
     all_failed = True
     log = GUILog()
 
     for book_id, mi in metadata.iteritems():
-        mi = OPF(BytesIO(mi), basedir=os.getcwdu(),
+        mi = OPF(BytesIO(mi), basedir=tdir,
                 populate_spine=False).to_book_metadata()
         title, authors, identifiers = mi.title, mi.authors, mi.identifiers
         cdata = None
@@ -77,7 +76,7 @@ def main(do_identify, covers, metadata, ensure_fields, tdir):
                 if not mi.is_null('rating'):
                     # set_metadata expects a rating out of 10
                     mi.rating *= 2
-                with open('%d.mi'%book_id, 'wb') as f:
+                with open(os.path.join(tdir, '%d.mi'%book_id), 'wb') as f:
                     f.write(metadata_to_opf(mi, default_lang='und'))
             else:
                 log.error('Failed to download metadata for', title)
@@ -89,11 +88,11 @@ def main(do_identify, covers, metadata, ensure_fields, tdir):
             if cdata is None:
                 failed_covers.add(book_id)
             else:
-                with open('%d.cover'%book_id, 'wb') as f:
+                with open(os.path.join(tdir, '%d.cover'%book_id), 'wb') as f:
                     f.write(cdata[-1])
                 all_failed = False
 
-        with open('%d.log'%book_id, 'wb') as f:
+        with open(os.path.join(tdir, '%d.log'%book_id), 'wb') as f:
             f.write(log.plain_text.encode('utf-8'))
 
     return failed_ids, failed_covers, all_failed

From 0c6d820f2b60914b5a19cb5e04bee3424a251ca9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 15:00:02 +0530
Subject: [PATCH 0205/1154] Renaming of many-(one,many) items

---
 src/calibre/db/cache.py         | 27 +++++++++++++
 src/calibre/db/legacy.py        |  5 +--
 src/calibre/db/tables.py        | 66 +++++++++++++++++++++++++++++++
 src/calibre/db/tests/writing.py | 69 +++++++++++++++++++++++++++++++++
 4 files changed, 163 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index ea62f3b90a..c662b2a951 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1213,6 +1213,33 @@ class Cache(object):
             else:
                 table.remove_books(book_ids, self.backend)
 
+    @read_api
+    def author_sort_strings_for_books(self, book_ids):
+        val_map = {}
+        for book_id in book_ids:
+            authors = self._field_ids_for('authors', book_id)
+            adata = self._author_data(authors)
+            val_map[book_id] = tuple(adata[aid]['sort'] for aid in authors)
+        return val_map
+
+    @write_api
+    def rename_items(self, field, item_id_to_new_name_map):
+        try:
+            func = self.fields[field].table.rename_item
+        except AttributeError:
+            raise ValueError('Cannot rename items for one-one fields: %s' % field)
+        affected_books = set()
+        for item_id, new_name in item_id_to_new_name_map.iteritems():
+            affected_books.update(func(item_id, new_name, self.backend))
+        if affected_books:
+            if field == 'authors':
+                self._set_field('author_sort',  # also marks as dirty
+                                {k:' & '.join(v) for k, v in self._author_sort_strings_for_books(affected_books).iteritems()})
+                self._update_path(affected_books, mark_as_dirtied=False)
+            else:
+                self._mark_as_dirty(affected_books)
+        return affected_books
+
     @write_api
     def remove_items(self, field, item_ids):
         ''' Delete all items in the specified field with the specified ids. Returns the set of affected book ids. '''
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 1faf9a2d1a..5df491eca3 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -290,10 +290,7 @@ class LibraryDatabase(object):
 
     def authors_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
-        with self.new_api.read_lock:
-            authors = self.new_api._field_ids_for('authors', book_id)
-            adata = self.new_api._author_data(authors)
-            return [adata[aid]['sort'] for aid in authors]
+        return list(self.author_sort_strings_for_books.canonical_author_sort_for_books((book_id,))[book_id])
 
     def author_sort_from_book(self, index, index_is_id=False):
         return ' & '.join(self.authors_sort_strings(index, index_is_id=index_is_id))
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index e76423d971..274cffd6d5 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -222,6 +222,29 @@ class ManyToOneTable(Table):
         db.conn.executemany('DELETE FROM {0} WHERE id=?'.format(self.metadata['table']), item_ids)
         return affected_books
 
+    def rename_item(self, item_id, new_name, db):
+        rmap = {icu_lower(v):k for k, v in self.id_map.iteritems()}
+        existing_item = rmap.get(icu_lower(new_name), None)
+        table, col, lcol = self.metadata['table'], self.metadata['column'], self.metadata['link_column']
+        affected_books = self.col_book_map.get(item_id, set())
+        if existing_item is None or existing_item == item_id:
+            # A simple rename will do the trick
+            self.id_map[item_id] = new_name
+            db.conn.execute('UPDATE {0} SET {1}=? WHERE id=?'.format(table, col), (new_name, item_id))
+        else:
+            # We have to replace
+            self.id_map.pop(item_id, None)
+            books = self.col_book_map.pop(item_id, set())
+            for book_id in books:
+                self.book_col_map[book_id] = existing_item
+            self.col_book_map[existing_item].update(books)
+            # For custom series this means that the series index can
+            # potentially have duplicates/be incorrect, but there is no way to
+            # handle that in this context.
+            db.conn.execute('UPDATE {0} SET {1}=? WHERE {1}=?; DELETE FROM {2} WHERE id=?'.format(
+                self.link_table, lcol, table), (existing_item, item_id, item_id))
+        return affected_books
+
 class ManyToManyTable(ManyToOneTable):
 
     '''
@@ -283,6 +306,32 @@ class ManyToManyTable(ManyToOneTable):
         db.conn.executemany('DELETE FROM {0} WHERE id=?'.format(self.metadata['table']), item_ids)
         return affected_books
 
+    def rename_item(self, item_id, new_name, db):
+        rmap = {icu_lower(v):k for k, v in self.id_map.iteritems()}
+        existing_item = rmap.get(icu_lower(new_name), None)
+        table, col, lcol = self.metadata['table'], self.metadata['column'], self.metadata['link_column']
+        affected_books = self.col_book_map.get(item_id, set())
+        if existing_item is None or existing_item == item_id:
+            # A simple rename will do the trick
+            self.id_map[item_id] = new_name
+            db.conn.execute('UPDATE {0} SET {1}=? WHERE id=?'.format(table, col), (new_name, item_id))
+        else:
+            # We have to replace
+            self.id_map.pop(item_id, None)
+            books = self.col_book_map.pop(item_id, set())
+            # Replacing item_id with existing_item could cause the same id to
+            # appear twice in the book list. Handle that by removing existing
+            # item from the book list before replacing.
+            for book_id in books:
+                self.book_col_map[book_id] = tuple((existing_item if x == item_id else x) for x in self.book_col_map.get(book_id, ()) if x != existing_item)
+            self.col_book_map[existing_item].update(books)
+            db.conn.executemany('DELETE FROM {0} WHERE book=? AND {1}=?'.format(self.link_table, lcol), [
+                (book_id, existing_item) for book_id in books])
+            db.conn.execute('UPDATE {0} SET {1}=? WHERE {1}=?; DELETE FROM {2} WHERE id=?'.format(
+                self.link_table, lcol, table), (existing_item, item_id, item_id))
+        return affected_books
+
+
 class AuthorsTable(ManyToManyTable):
 
     def read_id_maps(self, db):
@@ -314,6 +363,17 @@ class AuthorsTable(ManyToManyTable):
             self.asort_map.pop(item_id, None)
         return clean
 
+    def rename_item(self, item_id, new_name, db):
+        ret = ManyToManyTable.rename_item(self, item_id, new_name, db)
+        if item_id not in self.id_map:
+            self.alink_map.pop(item_id, None)
+            self.asort_map.pop(item_id, None)
+        else:
+            # Was a simple rename, update the author sort value
+            self.set_sort_names({item_id:author_to_author_sort(new_name)}, db)
+
+        return ret
+
     def remove_items(self, item_ids, db):
         raise ValueError('Direct removal of authors is not allowed')
 
@@ -377,6 +437,9 @@ class FormatsTable(ManyToManyTable):
     def remove_items(self, item_ids, db):
         raise NotImplementedError('Cannot delete a format directly')
 
+    def rename_item(self, item_id, new_name, db):
+        raise NotImplementedError('Cannot rename formats')
+
     def update_fmt(self, book_id, fmt, fname, size, db):
         fmts = list(self.book_col_map.get(book_id, []))
         try:
@@ -430,6 +493,9 @@ class IdentifiersTable(ManyToManyTable):
     def remove_items(self, item_ids, db):
         raise NotImplementedError('Direct deletion of identifiers is not implemented')
 
+    def rename_item(self, item_id, new_name, db):
+        raise NotImplementedError('Cannot rename identifiers')
+
     def all_identifier_types(self):
         return frozenset(k for k, v in self.col_book_map.iteritems() if v)
 
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index c4918b4c4b..a2a36ec340 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -474,3 +474,72 @@ class WritingTest(BaseTest):
             for bid in c.all_book_ids():
                 self.assertIn(c.field_for('#series', bid), (None, 'My Series One'))
     # }}}
+
+    def test_rename_items(self):  # {{{
+        ' Test renaming of many-(many,one) items '
+        cl = self.cloned_library
+        cache = self.init_cache(cl)
+        # Check that renaming authors updates author sort and path
+        a = {v:k for k, v in cache.get_id_map('authors').iteritems()}['Unknown']
+        self.assertEqual(cache.rename_items('authors', {a:'New Author'}), {3})
+        a = {v:k for k, v in cache.get_id_map('authors').iteritems()}['Author One']
+        self.assertEqual(cache.rename_items('authors', {a:'Author Two'}), {1, 2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('authors'), {'New Author', 'Author Two'})
+            self.assertEqual(c.field_for('author_sort', 3), 'Author, New')
+            self.assertIn('New Author/', c.field_for('path', 3))
+            self.assertEqual(c.field_for('authors', 1), ('Author Two',))
+            self.assertEqual(c.field_for('author_sort', 1), 'Two, Author')
+
+        t = {v:k for k, v in cache.get_id_map('tags').iteritems()}['Tag One']
+        # Test case change
+        self.assertEqual(cache.rename_items('tags', {t:'tag one'}), {1, 2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('tags'), {'tag one', 'Tag Two', 'News'})
+            self.assertEqual(set(c.field_for('tags', 1)), {'tag one', 'News'})
+            self.assertEqual(set(c.field_for('tags', 2)), {'tag one', 'Tag Two'})
+        # Test new name
+        self.assertEqual(cache.rename_items('tags', {t:'t1'}), {1,2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('tags'), {'t1', 'Tag Two', 'News'})
+            self.assertEqual(set(c.field_for('tags', 1)), {'t1', 'News'})
+            self.assertEqual(set(c.field_for('tags', 2)), {'t1', 'Tag Two'})
+        # Test rename to existing
+        self.assertEqual(cache.rename_items('tags', {t:'Tag Two'}), {1,2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('tags'), {'Tag Two', 'News'})
+            self.assertEqual(set(c.field_for('tags', 1)), {'Tag Two', 'News'})
+            self.assertEqual(set(c.field_for('tags', 2)), {'Tag Two'})
+        # Test on a custom column
+        t = {v:k for k, v in cache.get_id_map('#tags').iteritems()}['My Tag One']
+        self.assertEqual(cache.rename_items('#tags', {t:'My Tag Two'}), {2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('#tags'), {'My Tag Two'})
+            self.assertEqual(set(c.field_for('#tags', 2)), {'My Tag Two'})
+
+        # Test a Many-one field
+        s = {v:k for k, v in cache.get_id_map('series').iteritems()}['A Series One']
+        # Test case change
+        self.assertEqual(cache.rename_items('series', {s:'a series one'}), {1, 2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('series'), {'a series one'})
+            self.assertEqual(c.field_for('series', 1), 'a series one')
+            self.assertEqual(c.field_for('series_index', 1), 2.0)
+
+        # Test new name
+        self.assertEqual(cache.rename_items('series', {s:'series'}), {1, 2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('series'), {'series'})
+            self.assertEqual(c.field_for('series', 1), 'series')
+            self.assertEqual(c.field_for('series', 2), 'series')
+            self.assertEqual(c.field_for('series_index', 1), 2.0)
+
+        s = {v:k for k, v in cache.get_id_map('#series').iteritems()}['My Series One']
+        # Test custom column with rename to existing
+        self.assertEqual(cache.rename_items('#series', {s:'My Series Two'}), {2})
+        for c in (cache, self.init_cache(cl)):
+            self.assertEqual(c.all_field_names('#series'), {'My Series Two'})
+            self.assertEqual(c.field_for('#series', 2), 'My Series Two')
+            self.assertEqual(c.field_for('#series_index', 1), 3.0)
+            self.assertEqual(c.field_for('#series_index', 2), 1.0)
+    # }}}

From 7819f37a45a802185842d6d5b18d5fab5a110a90 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 15:09:03 +0530
Subject: [PATCH 0206/1154] When renaming return id map as well

---
 src/calibre/db/cache.py         |  7 +++++--
 src/calibre/db/tables.py        |  8 ++++++--
 src/calibre/db/tests/writing.py | 18 +++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index c662b2a951..178e4d3285 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1229,8 +1229,11 @@ class Cache(object):
         except AttributeError:
             raise ValueError('Cannot rename items for one-one fields: %s' % field)
         affected_books = set()
+        id_map = {}
         for item_id, new_name in item_id_to_new_name_map.iteritems():
-            affected_books.update(func(item_id, new_name, self.backend))
+            books, new_id = func(item_id, new_name, self.backend)
+            affected_books.update(books)
+            id_map[item_id] = new_id
         if affected_books:
             if field == 'authors':
                 self._set_field('author_sort',  # also marks as dirty
@@ -1238,7 +1241,7 @@ class Cache(object):
                 self._update_path(affected_books, mark_as_dirtied=False)
             else:
                 self._mark_as_dirty(affected_books)
-        return affected_books
+        return affected_books, id_map
 
     @write_api
     def remove_items(self, field, item_ids):
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 274cffd6d5..4ab3269ef0 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -227,12 +227,14 @@ class ManyToOneTable(Table):
         existing_item = rmap.get(icu_lower(new_name), None)
         table, col, lcol = self.metadata['table'], self.metadata['column'], self.metadata['link_column']
         affected_books = self.col_book_map.get(item_id, set())
+        new_id = item_id
         if existing_item is None or existing_item == item_id:
             # A simple rename will do the trick
             self.id_map[item_id] = new_name
             db.conn.execute('UPDATE {0} SET {1}=? WHERE id=?'.format(table, col), (new_name, item_id))
         else:
             # We have to replace
+            new_id = existing_item
             self.id_map.pop(item_id, None)
             books = self.col_book_map.pop(item_id, set())
             for book_id in books:
@@ -243,7 +245,7 @@ class ManyToOneTable(Table):
             # handle that in this context.
             db.conn.execute('UPDATE {0} SET {1}=? WHERE {1}=?; DELETE FROM {2} WHERE id=?'.format(
                 self.link_table, lcol, table), (existing_item, item_id, item_id))
-        return affected_books
+        return affected_books, new_id
 
 class ManyToManyTable(ManyToOneTable):
 
@@ -311,12 +313,14 @@ class ManyToManyTable(ManyToOneTable):
         existing_item = rmap.get(icu_lower(new_name), None)
         table, col, lcol = self.metadata['table'], self.metadata['column'], self.metadata['link_column']
         affected_books = self.col_book_map.get(item_id, set())
+        new_id = item_id
         if existing_item is None or existing_item == item_id:
             # A simple rename will do the trick
             self.id_map[item_id] = new_name
             db.conn.execute('UPDATE {0} SET {1}=? WHERE id=?'.format(table, col), (new_name, item_id))
         else:
             # We have to replace
+            new_id = existing_item
             self.id_map.pop(item_id, None)
             books = self.col_book_map.pop(item_id, set())
             # Replacing item_id with existing_item could cause the same id to
@@ -329,7 +333,7 @@ class ManyToManyTable(ManyToOneTable):
                 (book_id, existing_item) for book_id in books])
             db.conn.execute('UPDATE {0} SET {1}=? WHERE {1}=?; DELETE FROM {2} WHERE id=?'.format(
                 self.link_table, lcol, table), (existing_item, item_id, item_id))
-        return affected_books
+        return affected_books, new_id
 
 
 class AuthorsTable(ManyToManyTable):
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index a2a36ec340..9a882bbd03 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -481,9 +481,9 @@ class WritingTest(BaseTest):
         cache = self.init_cache(cl)
         # Check that renaming authors updates author sort and path
         a = {v:k for k, v in cache.get_id_map('authors').iteritems()}['Unknown']
-        self.assertEqual(cache.rename_items('authors', {a:'New Author'}), {3})
+        self.assertEqual(cache.rename_items('authors', {a:'New Author'})[0], {3})
         a = {v:k for k, v in cache.get_id_map('authors').iteritems()}['Author One']
-        self.assertEqual(cache.rename_items('authors', {a:'Author Two'}), {1, 2})
+        self.assertEqual(cache.rename_items('authors', {a:'Author Two'})[0], {1, 2})
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('authors'), {'New Author', 'Author Two'})
             self.assertEqual(c.field_for('author_sort', 3), 'Author, New')
@@ -493,26 +493,26 @@ class WritingTest(BaseTest):
 
         t = {v:k for k, v in cache.get_id_map('tags').iteritems()}['Tag One']
         # Test case change
-        self.assertEqual(cache.rename_items('tags', {t:'tag one'}), {1, 2})
+        self.assertEqual(cache.rename_items('tags', {t:'tag one'}), ({1, 2}, {t:t}))
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('tags'), {'tag one', 'Tag Two', 'News'})
             self.assertEqual(set(c.field_for('tags', 1)), {'tag one', 'News'})
             self.assertEqual(set(c.field_for('tags', 2)), {'tag one', 'Tag Two'})
         # Test new name
-        self.assertEqual(cache.rename_items('tags', {t:'t1'}), {1,2})
+        self.assertEqual(cache.rename_items('tags', {t:'t1'})[0], {1,2})
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('tags'), {'t1', 'Tag Two', 'News'})
             self.assertEqual(set(c.field_for('tags', 1)), {'t1', 'News'})
             self.assertEqual(set(c.field_for('tags', 2)), {'t1', 'Tag Two'})
         # Test rename to existing
-        self.assertEqual(cache.rename_items('tags', {t:'Tag Two'}), {1,2})
+        self.assertEqual(cache.rename_items('tags', {t:'Tag Two'})[0], {1,2})
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('tags'), {'Tag Two', 'News'})
             self.assertEqual(set(c.field_for('tags', 1)), {'Tag Two', 'News'})
             self.assertEqual(set(c.field_for('tags', 2)), {'Tag Two'})
         # Test on a custom column
         t = {v:k for k, v in cache.get_id_map('#tags').iteritems()}['My Tag One']
-        self.assertEqual(cache.rename_items('#tags', {t:'My Tag Two'}), {2})
+        self.assertEqual(cache.rename_items('#tags', {t:'My Tag Two'})[0], {2})
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('#tags'), {'My Tag Two'})
             self.assertEqual(set(c.field_for('#tags', 2)), {'My Tag Two'})
@@ -520,14 +520,14 @@ class WritingTest(BaseTest):
         # Test a Many-one field
         s = {v:k for k, v in cache.get_id_map('series').iteritems()}['A Series One']
         # Test case change
-        self.assertEqual(cache.rename_items('series', {s:'a series one'}), {1, 2})
+        self.assertEqual(cache.rename_items('series', {s:'a series one'}), ({1, 2}, {s:s}))
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('series'), {'a series one'})
             self.assertEqual(c.field_for('series', 1), 'a series one')
             self.assertEqual(c.field_for('series_index', 1), 2.0)
 
         # Test new name
-        self.assertEqual(cache.rename_items('series', {s:'series'}), {1, 2})
+        self.assertEqual(cache.rename_items('series', {s:'series'})[0], {1, 2})
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('series'), {'series'})
             self.assertEqual(c.field_for('series', 1), 'series')
@@ -536,7 +536,7 @@ class WritingTest(BaseTest):
 
         s = {v:k for k, v in cache.get_id_map('#series').iteritems()}['My Series One']
         # Test custom column with rename to existing
-        self.assertEqual(cache.rename_items('#series', {s:'My Series Two'}), {2})
+        self.assertEqual(cache.rename_items('#series', {s:'My Series Two'})[0], {2})
         for c in (cache, self.init_cache(cl)):
             self.assertEqual(c.all_field_names('#series'), {'My Series Two'})
             self.assertEqual(c.field_for('#series', 2), 'My Series Two')

From 064294fa3213a1666ea8c5128418865836a09254 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 15:56:57 +0530
Subject: [PATCH 0207/1154] Ensure tweaks are set to default when running tests

---
 src/calibre/db/tests/base.py     | 5 +++++
 src/calibre/utils/config_base.py | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index b94faf6b28..dd87ab1583 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -21,6 +21,11 @@ class BaseTest(unittest.TestCase):
     longMessage = True
     maxDiff = None
 
+    @classmethod
+    def setUpClass(cls):
+        from calibre.utils.config_base import reset_tweaks_to_default
+        reset_tweaks_to_default()
+
     def setUp(self):
         self.library_path = self.mkdtemp()
         self.create_db(self.library_path)
diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index a31b7052b1..a9860b60fa 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -474,4 +474,11 @@ def write_tweaks(raw):
 
 tweaks = read_tweaks()
 
+def reset_tweaks_to_default():
+    global tweaks
+    default_tweaks = P('default_tweaks.py', data=True,
+            allow_user_override=False)
+    dl, dg = {}, {}
+    exec default_tweaks in dg, dl
+    tweaks = dl
 

From 17c520d1d911eb66a7cfa7e2b4820b2979061cb0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 16:11:04 +0530
Subject: [PATCH 0208/1154] Legacy rename API

---
 src/calibre/db/cache.py         | 26 ++++++++++++++++----------
 src/calibre/db/legacy.py        | 15 ++++++++++++++-
 src/calibre/db/tests/legacy.py  | 27 +++++++++++++++++++++++++++
 src/calibre/db/tests/writing.py |  2 +-
 4 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 178e4d3285..6564a9a9a2 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -30,7 +30,7 @@ from calibre.ebooks.metadata.book.base import Metadata
 from calibre.ebooks.metadata.opf2 import metadata_to_opf
 from calibre.ptempfile import (base_dir, PersistentTemporaryFile,
                                SpooledTemporaryFile)
-from calibre.utils.config import prefs
+from calibre.utils.config import prefs, tweaks
 from calibre.utils.date import now as nowf, utcnow, UNDEFINED_DATE
 from calibre.utils.icu import sort_key
 
@@ -1100,16 +1100,16 @@ class Cache(object):
         self._update_last_modified(tuple(formats_map.iterkeys()))
 
     @read_api
-    def get_next_series_num_for(self, series):
+    def get_next_series_num_for(self, series, field='series'):
         books = ()
-        sf = self.fields['series']
+        sf = self.fields[field]
         if series:
             q = icu_lower(series)
-            for val, book_ids in sf.iter_searchable_values(self._get_metadata, frozenset(self.all_book_ids())):
+            for val, book_ids in sf.iter_searchable_values(self._get_metadata, frozenset(self._all_book_ids())):
                 if q == icu_lower(val):
                     books = book_ids
                     break
-        series_indices = sorted(self._field_for('series_index', book_id) for book_id in books)
+        series_indices = sorted(self._field_for(sf.index_field.name, book_id) for book_id in books)
         return _get_next_series_num_for_list(tuple(series_indices), unwrap=False)
 
     @read_api
@@ -1223,24 +1223,30 @@ class Cache(object):
         return val_map
 
     @write_api
-    def rename_items(self, field, item_id_to_new_name_map):
+    def rename_items(self, field, item_id_to_new_name_map, change_index=True):
+        f = self.fields[field]
         try:
-            func = self.fields[field].table.rename_item
+            func = f.table.rename_item
         except AttributeError:
             raise ValueError('Cannot rename items for one-one fields: %s' % field)
         affected_books = set()
+        moved_books = set()
         id_map = {}
         for item_id, new_name in item_id_to_new_name_map.iteritems():
             books, new_id = func(item_id, new_name, self.backend)
             affected_books.update(books)
             id_map[item_id] = new_id
+            if new_id != item_id:
+                moved_books.update(books)
         if affected_books:
             if field == 'authors':
-                self._set_field('author_sort',  # also marks as dirty
+                self._set_field('author_sort',
                                 {k:' & '.join(v) for k, v in self._author_sort_strings_for_books(affected_books).iteritems()})
                 self._update_path(affected_books, mark_as_dirtied=False)
-            else:
-                self._mark_as_dirty(affected_books)
+            elif change_index and hasattr(f, 'index_field') and tweaks['series_index_auto_increment'] != 'no_change':
+                for book_id in moved_books:
+                    self._set_field(f.index_field.name, {book_id:self._get_next_series_num_for(self._field_for(field, book_id), field=field)})
+            self._mark_as_dirty(affected_books)
         return affected_books, id_map
 
     @write_api
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 5df491eca3..a6e6bd9fa7 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -290,7 +290,7 @@ class LibraryDatabase(object):
 
     def authors_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
-        return list(self.author_sort_strings_for_books.canonical_author_sort_for_books((book_id,))[book_id])
+        return list(self.new_api.author_sort_strings_for_books((book_id,))[book_id])
 
     def author_sort_from_book(self, index, index_is_id=False):
         return ' & '.join(self.authors_sort_strings(index, index_is_id=index_is_id))
@@ -500,6 +500,9 @@ class LibraryDatabase(object):
         book_id = index if index_is_id else self.id(index)
         return self.new_api.get_metadata(book_id, get_cover=get_cover, get_user_categories=get_user_categories, cover_as_data=cover_as_data)
 
+    def rename_series(self, old_id, new_name, change_index=True):
+        self.new_api.rename_items('series', {old_id:new_name}, change_index=change_index)
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
@@ -582,6 +585,16 @@ for field in (
         return func
     setattr(LibraryDatabase, 'set_%s' % field.replace('!', ''), MT(setter(field)))
 
+for field in ('authors', 'tags', 'publisher'):
+    def renamer(field):
+        def func(self, old_id, new_name):
+            id_map = self.new_api.rename_items(field, {old_id:new_name})[1]
+            if field == 'authors':
+                return id_map[old_id]
+        return func
+    fname = field[:-1] if field in {'tags', 'authors'} else field
+    setattr(LibraryDatabase, 'rename_%s' % fname, MT(renamer(field)))
+
 LibraryDatabase.update_last_modified = MT(
     lambda self, book_ids, commit=False, now=None: self.new_api.update_last_modified(book_ids, now=now))
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 725f6c3ad9..09ae756d10 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -472,6 +472,7 @@ class LegacyTest(BaseTest):
         nmi = [ndb.get_metadata(x) for x in (0, 1, 2)]
         self.assertEqual([x.author_sort_map for x in omi], [x.author_sort_map for x in nmi])
         self.assertEqual([x.author_link_map for x in omi], [x.author_link_map for x in nmi])
+        db.close()
 
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
@@ -554,6 +555,7 @@ class LegacyTest(BaseTest):
             ('@all_tags',),
             ('#tags', 0), ('#tags', 1), ('#tags', 2),
         ))
+        db.close()
 
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
@@ -563,6 +565,31 @@ class LegacyTest(BaseTest):
             ('@all_tags',),
             ('@tags', 0), ('@tags', 1), ('@tags', 2),
         ))
+        db.close()
+
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+        a = {v:k for k, v in ndb.new_api.get_id_map('authors').iteritems()}['Author One']
+        t = {v:k for k, v in ndb.new_api.get_id_map('tags').iteritems()}['Tag One']
+        s = {v:k for k, v in ndb.new_api.get_id_map('series').iteritems()}['A Series One']
+        p = {v:k for k, v in ndb.new_api.get_id_map('publisher').iteritems()}['Publisher One']
+        run_funcs(self, db, ndb, (
+            ('rename_author', a, 'Author Two'),
+            ('rename_tag', t, 'News'),
+            ('rename_series', s, 'ss'),
+            ('rename_publisher', p, 'publisher one'),
+            (db.clean,),
+            (db.refresh,),
+            ('@all_tags',),
+            ('tags', 0), ('tags', 1), ('tags', 2),
+            ('series', 0), ('series', 1), ('series', 2),
+            ('publisher', 0), ('publisher', 1), ('publisher', 2),
+            ('series_index', 0), ('series_index', 1), ('series_index', 2),
+            ('authors', 0), ('authors', 1), ('authors', 2),
+            ('author_sort', 0), ('author_sort', 1), ('author_sort', 2),
+        ))
+        db.close()
+
 
 
     # }}}
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 9a882bbd03..26f73964df 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -541,5 +541,5 @@ class WritingTest(BaseTest):
             self.assertEqual(c.all_field_names('#series'), {'My Series Two'})
             self.assertEqual(c.field_for('#series', 2), 'My Series Two')
             self.assertEqual(c.field_for('#series_index', 1), 3.0)
-            self.assertEqual(c.field_for('#series_index', 2), 1.0)
+            self.assertEqual(c.field_for('#series_index', 2), 4.0)
     # }}}

From 522ddc9c91d9b6c5b54335c873864e3217308a85 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 16:25:52 +0530
Subject: [PATCH 0209/1154] ...

---
 setup/file_hosting_servers.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index c72998958e..5b494cf066 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -22,6 +22,7 @@ mkdir -p /root/staging /root/work/vim /srv/download /srv/manual
 
 scp .zshrc .vimrc  server:
 scp -r ~/work/vim/zsh-syntax-highlighting server:work/vim
+scp -r ~/work/vim/zsh-history-substring-search server:work/vim
 
 If the server has a backup hard-disk, mount it at /mnt/backup and edit /etc/fstab so that it is auto-mounted.
 Then, add the following to crontab::

From a824208ea2fcfb9fd36c13d129f01cfa02ac7ef6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 17:26:18 +0530
Subject: [PATCH 0210/1154] Il Foglio by faber1971

---
 recipes/il_foglio.recipe | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 recipes/il_foglio.recipe

diff --git a/recipes/il_foglio.recipe b/recipes/il_foglio.recipe
new file mode 100644
index 0000000000..9d5e8aa2e6
--- /dev/null
+++ b/recipes/il_foglio.recipe
@@ -0,0 +1,16 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1373969939(BasicNewsRecipe):
+    title          = u'Il Foglio - Editoriali'
+    oldest_article = 1
+    max_articles_per_feed = 10
+    auto_cleanup = False
+    keep_only_tags = [
+                       dict(name='div', attrs={'class':'sec_item'})
+                     ]
+    feeds          = [(u'Il Foglio - Editoriali', u'http://feed43.com/8814237344800115.xml')]
+    no_stylesheets = True
+    __author__    = 'faber1971'
+    description   = 'Leading articles from an Italian newspaper - v1.00 (16 July, 2013)'
+    language = 'it'
+    masthead_url            = 'http://www.ilfoglio.it/media/img/interface/logo_testata_small.gif'

From a65f8042434dccb4da3f178133ba980213f48a53 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 17:49:19 +0530
Subject: [PATCH 0211/1154] Some misc legacy API

---
 src/calibre/db/legacy.py       | 12 +++++++-----
 src/calibre/db/tests/legacy.py |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index a6e6bd9fa7..f13e8107df 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -65,14 +65,13 @@ class LibraryDatabase(object):
         cache.init()
         self.data = View(cache)
         self.id = self.data.index_to_id
-        self.count = self.data.count
+        for x in ('get_property', 'count', 'refresh_ids', 'set_marked_ids',
+                  'multisort', 'search', 'search_getting_ids'):
+            setattr(self, x, getattr(self.data, x))
 
-        self.get_property = self.data.get_property
+        self.is_case_sensitive = getattr(backend, 'is_case_sensitive', False)
 
         self.last_update_check = self.last_modified()
-        self.refresh_ids = self.data.refresh_ids
-        self.set_marked_ids = self.data.set_marked_ids
-        self.is_case_sensitive = getattr(backend, 'is_case_sensitive', False)
 
     def close(self):
         self.backend.close()
@@ -283,6 +282,9 @@ class LibraryDatabase(object):
         return list(self.new_api.get_ids_for_custom_book_data(name))
     # }}}
 
+    def sort(self, field, ascending, subsort=False):
+        self.multisort([(field, ascending)])
+
     def get_field(self, index, key, default=None, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
         mi = self.new_api.get_metadata(book_id, get_cover=key == 'cover')
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 09ae756d10..137acff8d5 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -359,7 +359,8 @@ class LegacyTest(BaseTest):
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
             'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book', 'dirtied_sequence',
-            'format_filename_cache', 'format_metadata_cache', 'filter', 'create_version1', 'normpath',
+            'format_filename_cache', 'format_metadata_cache', 'filter', 'create_version1', 'normpath', 'custom_data_adapters',
+            'custom_table_names', 'custom_columns_in_meta', 'custom_tables',
         }
         SKIP_ARGSPEC = {
             '__init__',

From a49b518cde782a8efc43c39aed998d1d5f6fafde Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 17:58:22 +0530
Subject: [PATCH 0212/1154] cover_last_modified()

---
 src/calibre/db/backend.py | 7 +++++++
 src/calibre/db/cache.py   | 8 ++++++++
 src/calibre/db/legacy.py  | 4 ++++
 3 files changed, 19 insertions(+)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 2c4dfb8395..1f561980bd 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -963,6 +963,13 @@ class DB(object):
                 import traceback
                 traceback.print_exc()
 
+    def cover_last_modified(self, path):
+        path = os.path.abspath(os.path.join(self.library_path, path, 'cover.jpg'))
+        try:
+            return utcfromtimestamp(os.stat(path).st_mtime)
+        except EnvironmentError:
+            pass  # Cover doesn't exist
+
     def copy_cover_to(self, path, dest, windows_atomic_move=None, use_hardlink=False):
         path = os.path.abspath(os.path.join(self.library_path, path, 'cover.jpg'))
         if windows_atomic_move is not None:
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 6564a9a9a2..e7c3114f0d 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -526,6 +526,14 @@ class Cache(object):
                 ret = i
         return ret
 
+    @read_api
+    def cover_last_modified(self, book_id):
+        try:
+            path = self._field_for('path', book_id).replace('/', os.sep)
+        except AttributeError:
+            return
+        return self.backend.cover_last_modified(path)
+
     @read_api
     def copy_cover_to(self, book_id, dest, use_hardlink=False):
         '''
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index f13e8107df..a6d7f22989 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -290,6 +290,10 @@ class LibraryDatabase(object):
         mi = self.new_api.get_metadata(book_id, get_cover=key == 'cover')
         return mi.get(key, default)
 
+    def cover_last_modified(self, index, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.cover_last_modified(book_id) or self.last_modified()
+
     def authors_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
         return list(self.new_api.author_sort_strings_for_books((book_id,))[book_id])

From a57a35557263dde8496de90e5888f94e749c1bdc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 18:15:34 +0530
Subject: [PATCH 0213/1154] More API

---
 src/calibre/db/legacy.py       | 17 +++++++++++++++++
 src/calibre/db/tests/legacy.py | 14 +++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index a6d7f22989..3301bebdf3 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -294,6 +294,23 @@ class LibraryDatabase(object):
         book_id = index if index_is_id else self.id(index)
         return self.new_api.cover_last_modified(book_id) or self.last_modified()
 
+    def cover(self, index, index_is_id=False, as_file=False, as_image=False, as_path=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.cover(book_id, as_file=as_file, as_image=as_image, as_path=as_path)
+
+    def copy_cover_to(self, index, dest, index_is_id=False, windows_atomic_move=None, use_hardlink=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.copy_cover_to(book_id, dest, use_hardlink=use_hardlink)
+
+    def copy_format_to(self, index, fmt, dest, index_is_id=False, windows_atomic_move=None, use_hardlink=False):
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.copy_format_to(book_id, fmt, dest, use_hardlink=use_hardlink)
+
+    def delete_book(self, book_id, notify=True, commit=True, permanent=False, do_clean=True):
+        self.new_api.remove_books((book_id,), permanent=permanent)
+        if notify:
+            self.notify('delete', [id])
+
     def authors_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
         return list(self.new_api.author_sort_strings_for_books((book_id,))[book_id])
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 137acff8d5..4986b1b5dd 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -164,6 +164,7 @@ class LegacyTest(BaseTest):
         for meth, args in {
             'get_next_series_num_for': [('A Series One',)],
             'get_id_from_uuid':[('ddddd',), (db.uuid(1, True),)],
+            'cover':[(0,), (1,), (2,)],
             'get_author_id': [('author one',), ('unknown',), ('xxxxx',)],
             'series_id': [(0,), (1,), (2,)],
             'publisher_id': [(0,), (1,), (2,)],
@@ -231,6 +232,14 @@ class LegacyTest(BaseTest):
             for a in args:
                 self.assertEqual(fmt(getattr(db, meth)(*a)), fmt(getattr(ndb, meth)(*a)),
                                  'The method: %s() returned different results for argument %s' % (meth, a))
+        d1, d2 = BytesIO(), BytesIO()
+        db.copy_cover_to(1, d1, True)
+        ndb.copy_cover_to(1, d2, True)
+        self.assertTrue(d1.getvalue() == d2.getvalue())
+        d1, d2 = BytesIO(), BytesIO()
+        db.copy_format_to(1, 'FMT1', d1, True)
+        ndb.copy_format_to(1, 'FMT1', d2, True)
+        self.assertTrue(d1.getvalue() == d2.getvalue())
         db.close()
         # }}}
 
@@ -275,7 +284,7 @@ class LegacyTest(BaseTest):
     # }}}
 
     def test_legacy_adding_books(self):  # {{{
-        'Test various adding books methods'
+        'Test various adding/deleting books methods'
         from calibre.ebooks.metadata.book.base import Metadata
         legacy, old = self.init_legacy(self.cloned_library), self.init_old(self.cloned_library)
         mi = Metadata('Added Book0', authors=('Added Author',))
@@ -332,6 +341,9 @@ class LegacyTest(BaseTest):
             self.assertEqual(cache.field_for('authors', bid), ('calibre',))
             self.assertEqual(cache.field_for('tags', bid), (_('News'), 'Events', 'one', 'two'))
 
+        legacy.delete_book(1)
+        old.delete_book(1)
+        self.assertNotIn(1, legacy.all_ids())
         old.close()
     # }}}
 

From 70f338b047a730cc0961d50c4b663bfaaa4cb15b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 18:22:09 +0530
Subject: [PATCH 0214/1154] More API

---
 src/calibre/db/legacy.py       | 6 ++++++
 src/calibre/db/tests/legacy.py | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 3301bebdf3..be979ebed3 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -311,6 +311,12 @@ class LibraryDatabase(object):
         if notify:
             self.notify('delete', [id])
 
+    def dirtied(self, book_ids, commit=True):
+        self.new_api.mark_as_dirty(book_ids)
+
+    def dump_metadata(self, book_ids=None, remove_from_dirtied=True, commit=True, callback=None):
+        self.new_api.dump_metadata(book_ids=book_ids, remove_from_dirtied=remove_from_dirtied, callback=callback)
+
     def authors_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
         return list(self.new_api.author_sort_strings_for_books((book_id,))[book_id])
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 4986b1b5dd..216a0499ec 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -344,6 +344,7 @@ class LegacyTest(BaseTest):
         legacy.delete_book(1)
         old.delete_book(1)
         self.assertNotIn(1, legacy.all_ids())
+        legacy.dump_metadata((2,3))
         old.close()
     # }}}
 

From 62d1dfbeef792a805f46e66cbdf7e0448eb5ed7c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 22:19:58 +0530
Subject: [PATCH 0215/1154] Start work on legacy custom column API

---
 src/calibre/db/backend.py      |  7 +++++++
 src/calibre/db/legacy.py       |  4 +++-
 src/calibre/db/tests/legacy.py | 14 ++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 1f561980bd..20ca7eda3f 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -549,6 +549,7 @@ class DB(object):
 
         # Load metadata for custom columns
         self.custom_column_label_map, self.custom_column_num_map = {}, {}
+        self.custom_column_num_to_label_map = {}
         triggers = []
         remove = []
         custom_tables = self.custom_tables
@@ -586,6 +587,7 @@ class DB(object):
 
             self.custom_column_num_map[data['num']] = \
                 self.custom_column_label_map[data['label']] = data
+            self.custom_column_num_to_label_map[data['num']] = data['label']
 
             # Create Foreign Key triggers
             if data['normalized']:
@@ -785,6 +787,11 @@ class DB(object):
                 self._conn = Connection(self.dbpath)
         return self._conn
 
+    def custom_field_name(self, label=None, num=None):
+        if label is not None:
+            return self.field_metadata.custom_field_prefix + label
+        return self.field_metadata.custom_field_prefix + self.custom_column_num_to_label_map[num]
+
     def close(self):
         if self._conn is not None:
             self._conn.close()
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index be979ebed3..9073ed05ae 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -70,6 +70,7 @@ class LibraryDatabase(object):
             setattr(self, x, getattr(self.data, x))
 
         self.is_case_sensitive = getattr(backend, 'is_case_sensitive', False)
+        self.custom_field_name = backend.custom_field_name
 
         self.last_update_check = self.last_modified()
 
@@ -637,7 +638,8 @@ for field in ('authors', 'tags', 'publisher', 'series'):
         return func
     name = field[:-1] if field in {'authors', 'tags'} else field
     setattr(LibraryDatabase, 'all_%s_names' % name, MT(getter(field)))
-    LibraryDatabase.all_formats = MT(lambda self:self.new_api.all_field_names('formats'))
+LibraryDatabase.all_formats = MT(lambda self:self.new_api.all_field_names('formats'))
+LibraryDatabase.all_custom = MT(lambda self, label=None, num=None:self.new_api.all_field_names(self.custom_field_name(label, num)))
 
 for func, field in {'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}.iteritems():
     def getter(field):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 216a0499ec..3e08274561 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -604,7 +604,17 @@ class LegacyTest(BaseTest):
         ))
         db.close()
 
-
-
+    # }}}
+
+    def test_legacy_custom(self):  # {{{
+        'Test the legacy API for custom columns'
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+        run_funcs(self, db, ndb, (
+            ('all_custom', 'series'),
+            ('all_custom', 'tags'),
+            ('all_custom', 'rating'),
+            ('all_custom', 'authors'),
+        ))
     # }}}
 

From 7ceedb4e3ce3356e893dc20d8b4b4a137c4ea5f3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 Jul 2013 22:35:23 +0530
Subject: [PATCH 0216/1154] get_custome_items_with_ids()

---
 src/calibre/db/legacy.py       |  6 ++++++
 src/calibre/db/tests/legacy.py | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 9073ed05ae..4d29a6b18f 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -150,6 +150,12 @@ class LibraryDatabase(object):
     def field_id_map(self, field):
         return [(k, v) for k, v in self.new_api.get_id_map(field).iteritems()]
 
+    def get_custom_items_with_ids(self, label=None, num=None):
+        try:
+            return [[k, v] for k, v in self.new_api.get_id_map(self.custom_field_name(label, num)).iteritems()]
+        except ValueError:
+            return []
+
     def refresh(self, field=None, ascending=True):
         self.data.refresh(field=field, ascending=ascending)
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 3e08274561..45d1367b4e 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -48,9 +48,10 @@ def run_funcs(self, db, ndb, funcs):
             meth(*args)
         else:
             fmt = lambda x:x
-            if meth[0] in {'!', '@', '#', '+'}:
+            if meth[0] in {'!', '@', '#', '+', '$'}:
                 if meth[0] != '+':
-                    fmt = {'!':dict, '@':lambda x:frozenset(x or ()), '#':lambda x:set((x or '').split(','))}[meth[0]]
+                    fmt = {'!':dict, '@':lambda x:frozenset(x or ()), '#':lambda x:set((x or '').split(',')),
+                           '$':lambda x:set(tuple(y) for y in x)}[meth[0]]
                 else:
                     fmt = args[-1]
                     args = args[:-1]
@@ -611,10 +612,9 @@ class LegacyTest(BaseTest):
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
         run_funcs(self, db, ndb, (
-            ('all_custom', 'series'),
-            ('all_custom', 'tags'),
-            ('all_custom', 'rating'),
-            ('all_custom', 'authors'),
+            ('all_custom', 'series'), ('all_custom', 'tags'), ('all_custom', 'rating'), ('all_custom', 'authors'),
+            ('$get_custom_items_with_ids', 'series'), ('$get_custom_items_with_ids', 'tags'), ('$get_custom_items_with_ids', 'float'),
+            ('$get_custom_items_with_ids', 'rating'), ('$get_custom_items_with_ids', 'authors'),
         ))
     # }}}
 

From 2e6813ce02b7d3ae37014d67a892e9bc68ddb25a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 07:59:44 +0530
Subject: [PATCH 0217/1154] Fix memory card not being detected for Elonex 621
 on Windows

---
 src/calibre/devices/eb600/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index f647c28a75..e51633f3a1 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -86,7 +86,7 @@ class COOL_ER(EB600):
     FORMATS = ['epub', 'mobi', 'prc', 'pdf', 'txt']
 
     VENDOR_NAME = 'COOL-ER'
-    WINDOWS_MAIN_MEM = 'EREADER'
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EREADER'
 
     OSX_MAIN_MEM = 'COOL-ER eReader Media'
 

From 1dc169db4cba678a28baae4e001dcd7974135339 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 08:23:15 +0530
Subject: [PATCH 0218/1154] Driver for LG Android phone

Fixes #1202013 [Calibre does not recognize my device](https://bugs.launchpad.net/calibre/+bug/1202013)
---
 src/calibre/devices/android/driver.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 1880324fdc..a0eb021289 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -151,6 +151,7 @@ class ANDROID(USBMS):
                     0x61ce : [0x226, 0x227, 0x9999, 0x100],
                     0x618e : [0x226, 0x227, 0x9999, 0x100],
                     0x6205 : [0x226, 0x227, 0x9999, 0x100],
+                    0x6234 : [0x231],
                     },
 
             # Archos
@@ -254,7 +255,7 @@ class ANDROID(USBMS):
             'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD', 'SGH-I727',
             'USB_FLASH_DRIVER', 'ANDROID', 'MID7042', '7035', 'VIEWPAD_7E',
             'NOVO7', 'ADVANCED', 'TABLET_PC', 'F', 'E400_SD_CARD', 'ST80208-1', 'XT894',
-            '_USB', 'PROD_TAB13-201', 'URFPAD2', 'MID1126',
+            '_USB', 'PROD_TAB13-201', 'URFPAD2', 'MID1126', 'ANDROID_PLATFORM',
     ]
 
     OSX_MAIN_MEM = 'Android Device Main Memory'

From 6c1bcc65033b5b489b4c503b6165d221be55ca4c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 09:36:12 +0530
Subject: [PATCH 0219/1154] CC get API

---
 src/calibre/db/backend.py      |  5 +++++
 src/calibre/db/fields.py       |  6 +++++-
 src/calibre/db/legacy.py       | 35 ++++++++++++++++++++++++++++++++++
 src/calibre/db/tables.py       |  1 +
 src/calibre/db/tests/legacy.py | 11 +++++++++--
 5 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 20ca7eda3f..13e8b80ff5 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -792,6 +792,11 @@ class DB(object):
             return self.field_metadata.custom_field_prefix + label
         return self.field_metadata.custom_field_prefix + self.custom_column_num_to_label_map[num]
 
+    def custom_field_metadata(self, label=None, num=None):
+        if label is not None:
+            return self.custom_column_label_map[label]
+        return self.custom_column_num_map[num]
+
     def close(self):
         if self._conn is not None:
             self._conn.close()
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index e18179e4b1..dd0165b44e 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -325,7 +325,11 @@ class ManyToManyField(Field):
     def for_book(self, book_id, default_value=None):
         ids = self.table.book_col_map.get(book_id, ())
         if ids:
-            ans = tuple(self.table.id_map[i] for i in ids)
+            ans = (self.table.id_map[i] for i in ids)
+            if self.table.sort_alpha:
+                ans = tuple(sorted(ans, key=sort_key))
+            else:
+                ans = tuple(ans)
         else:
             ans = default_value
         return ans
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 4d29a6b18f..44b26f5f43 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -539,6 +539,41 @@ class LibraryDatabase(object):
     def rename_series(self, old_id, new_name, change_index=True):
         self.new_api.rename_items('series', {old_id:new_name}, change_index=change_index)
 
+    def get_custom(self, index, label=None, num=None, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        ans = self.new_api.field_for(self.custom_field_name(label, num), book_id)
+        if isinstance(ans, tuple):
+            ans = list(ans)
+        return ans
+
+    def get_custom_extra(self, index, label=None, num=None, index_is_id=False):
+        data = self.backend.custom_field_metadata(label, num)
+        # add future datatypes with an extra column here
+        if data['datatype'] != 'series':
+            return None
+        book_id = index if index_is_id else self.id(index)
+        return self.new_api.field_for(self.custom_field_name(label, num) + '_index', book_id)
+
+    def get_custom_and_extra(self, index, label=None, num=None, index_is_id=False):
+        book_id = index if index_is_id else self.id(index)
+        data = self.backend.custom_field_metadata(label, num)
+        ans = self.new_api.field_for(self.custom_field_name(label, num), book_id)
+        if isinstance(ans, tuple):
+            ans = list(ans)
+        if data['datatype'] != 'series':
+            return (ans, None)
+        return (ans, self.new_api.field_for(self.custom_field_name(label, num) + '_index', book_id))
+
+    def get_next_cc_series_num_for(self, series, label=None, num=None):
+        data = self.backend.custom_field_metadata(label, num)
+        if data['datatype'] != 'series':
+            return None
+        return self.new_api.get_next_series_num_for(series, field=self.custom_field_name(label, num))
+
+    def is_item_used_in_multiple(self, item, label=None, num=None):
+        existing_tags = self.all_custom(label=label, num=num)
+        return icu_lower(item) in {icu_lower(t) for t in existing_tags}
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 4ab3269ef0..9b9ff4e9e0 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -44,6 +44,7 @@ class Table(object):
 
     def __init__(self, name, metadata, link_table=None):
         self.name, self.metadata = name, metadata
+        self.sort_alpha = metadata.get('is_multiple', False) and metadata.get('display', {}).get('sort_alpha', False)
 
         # self.unserialize() maps values from the db to python objects
         self.unserialize = \
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 45d1367b4e..2db0394d20 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -612,9 +612,16 @@ class LegacyTest(BaseTest):
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
         run_funcs(self, db, ndb, (
-            ('all_custom', 'series'), ('all_custom', 'tags'), ('all_custom', 'rating'), ('all_custom', 'authors'),
+            ('all_custom', 'series'), ('all_custom', 'tags'), ('all_custom', 'rating'), ('all_custom', 'authors'), ('all_custom', None, 7),
+            ('get_next_cc_series_num_for', 'My Series One', 'series'), ('get_next_cc_series_num_for', 'My Series Two', 'series'),
+            ('is_item_used_in_multiple', 'My Tag One', 'tags'),
+            ('is_item_used_in_multiple', 'My Series One', 'series'),
             ('$get_custom_items_with_ids', 'series'), ('$get_custom_items_with_ids', 'tags'), ('$get_custom_items_with_ids', 'float'),
-            ('$get_custom_items_with_ids', 'rating'), ('$get_custom_items_with_ids', 'authors'),
+            ('$get_custom_items_with_ids', 'rating'), ('$get_custom_items_with_ids', 'authors'), ('$get_custom_items_with_ids', None, 7),
         ))
+        for label in ('tags', 'series', 'authors', 'comments', 'rating', 'date', 'yesno', 'isbn', 'enum', 'formats', 'float', 'comp_tags'):
+            for func in ('get_custom', 'get_custom_extra', 'get_custom_and_extra'):
+                run_funcs(self, db, ndb, [(func, idx, label) for idx in range(3)])
+        db.close()
     # }}}
 

From dd5ccfd75ce830165ec2d8ceacfb244e1ffbabcc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 10:45:51 +0530
Subject: [PATCH 0220/1154] More CC API

---
 src/calibre/db/legacy.py       | 15 +++++++++++++++
 src/calibre/db/tests/legacy.py | 21 +++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 44b26f5f43..eb0debe758 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -574,6 +574,21 @@ class LibraryDatabase(object):
         existing_tags = self.all_custom(label=label, num=num)
         return icu_lower(item) in {icu_lower(t) for t in existing_tags}
 
+    def delete_custom_item_using_id(self, item_id, label=None, num=None):
+        self.new_api.remove_items(self.custom_field_name(label, num), (item_id,))
+
+    def rename_custom_item(self, old_id, new_name, label=None, num=None):
+        self.new_api.rename_items(self.custom_field_name(label, num), {old_id:new_name}, change_index=False)
+
+    def delete_item_from_multiple(self, item, label=None, num=None):
+        field = self.custom_field_name(label, num)
+        existing = self.new_api.get_id_map(field)
+        rmap = {icu_lower(v):k for k, v in existing.iteritems()}
+        item_id = rmap.get(icu_lower(item), None)
+        if item_id is None:
+            return []
+        return list(self.new_api.remove_items(field, (item_id,)))
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 2db0394d20..83325c1615 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -611,6 +611,7 @@ class LegacyTest(BaseTest):
         'Test the legacy API for custom columns'
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old(self.cloned_library)
+        # Test getting
         run_funcs(self, db, ndb, (
             ('all_custom', 'series'), ('all_custom', 'tags'), ('all_custom', 'rating'), ('all_custom', 'authors'), ('all_custom', None, 7),
             ('get_next_cc_series_num_for', 'My Series One', 'series'), ('get_next_cc_series_num_for', 'My Series Two', 'series'),
@@ -622,6 +623,26 @@ class LegacyTest(BaseTest):
         for label in ('tags', 'series', 'authors', 'comments', 'rating', 'date', 'yesno', 'isbn', 'enum', 'formats', 'float', 'comp_tags'):
             for func in ('get_custom', 'get_custom_extra', 'get_custom_and_extra'):
                 run_funcs(self, db, ndb, [(func, idx, label) for idx in range(3)])
+
+        # Test renaming/deleting
+        t = {v:k for k, v in ndb.new_api.get_id_map('#tags').iteritems()}['My Tag One']
+        t2 = {v:k for k, v in ndb.new_api.get_id_map('#tags').iteritems()}['My Tag Two']
+        a = {v:k for k, v in ndb.new_api.get_id_map('#authors').iteritems()}['My Author Two']
+        a2 = {v:k for k, v in ndb.new_api.get_id_map('#authors').iteritems()}['Custom One']
+        s = {v:k for k, v in ndb.new_api.get_id_map('#series').iteritems()}['My Series One']
+        run_funcs(self, db, ndb, (
+            ('delete_custom_item_using_id', t, 'tags'),
+            ('delete_custom_item_using_id', a, 'authors'),
+            ('rename_custom_item', t2, 't2', 'tags'),
+            ('rename_custom_item', a2, 'custom one', 'authors'),
+            ('rename_custom_item', s, 'My Series Two', 'series'),
+            ('delete_item_from_multiple', 'custom two', 'authors'),
+            (db.clean,),
+            (db.refresh,),
+            ('all_custom', 'series'), ('all_custom', 'tags'), ('all_custom', 'authors'),
+        ))
+        for label in ('tags', 'authors', 'series'):
+            run_funcs(self, db, ndb, [('get_custom_and_extra', idx, label) for idx in range(3)])
         db.close()
     # }}}
 

From fb38f7d5653e164232c53f9dcb42914f2a9add7c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 15:52:31 +0530
Subject: [PATCH 0221/1154] Fucking McAfee

---
 manual/faq.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/manual/faq.rst b/manual/faq.rst
index e5a6342cf8..71246acdcd 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -840,6 +840,18 @@ If you still cannot get the installer to work and you are on windows, you can us
 My antivirus program claims |app| is a virus/trojan?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. note :: 
+    As of July, 2013 McAfee Site Advisor has started warning that
+    http://calibre-ebook.com is unsafe, with no stated reason or justification.
+    McAfee is wrong, the mistake has been reported to them, by several people,
+    but they have not corrected it. McAfee SiteAdvisor is a notoriously
+    unreliable service, see for example
+    http://www.naturalnews.com/041170_McAfee_Site_Advisor_false_information.html or
+    http://www.snapfiles.com/siteadvisor.html or
+    http://en.wikipedia.org/wiki/McAfee_SiteAdvisor#Criticism We strongly urge
+    you to stop using McAfee products, find a more competent security provider
+    to give your business to.
+
 The first thing to check is that you are downloading |app| from the official
 website: `<http://calibre-ebook.com/download>`_. |app| is a very popular program
 and unscrupulous people try to setup websites offering it for download to fool

From de5237c4d5c3e26cec9de2cfcd38de0e02d483e8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 16:24:42 +0530
Subject: [PATCH 0222/1154] CC set_* API

---
 src/calibre/db/legacy.py       | 72 ++++++++++++++++++++++++++++++++--
 src/calibre/db/tests/legacy.py | 49 ++++++++++++++++++++++-
 2 files changed, 116 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index eb0debe758..b814b1e23e 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -441,26 +441,39 @@ class LibraryDatabase(object):
         if notify:
             self.notify('metadata', ids)
 
-    def bulk_modify_tags(self, ids, add=[], remove=[], notify=False):
+    def _do_bulk_modify(self, field, ids, add, remove, notify):
         add = cleanup_tags(add)
         remove = cleanup_tags(remove)
         remove = set(remove) - set(add)
         if not ids or (not add and not remove):
             return
+
         remove = {icu_lower(x) for x in remove}
         with self.new_api.write_lock:
             val_map = {}
             for book_id in ids:
-                tags = list(self.new_api._field_for('tags', book_id))
+                tags = list(self.new_api._field_for(field, book_id))
                 existing = {icu_lower(x) for x in tags}
                 tags.extend(t for t in add if icu_lower(t) not in existing)
                 tags = tuple(t for t in tags if icu_lower(t) not in remove)
                 val_map[book_id] = tags
-            self.new_api._set_field('tags', val_map, allow_case_change=False)
+            self.new_api._set_field(field, val_map, allow_case_change=False)
 
         if notify:
             self.notify('metadata', ids)
 
+    def bulk_modify_tags(self, ids, add=[], remove=[], notify=False):
+        self._do_bulk_modify('tags', ids, add, remove, notify)
+
+    def set_custom_bulk_multiple(self, ids, add=[], remove=[], label=None, num=None, notify=False):
+        data = self.backend.custom_field_metadata(label, num)
+        if not data['editable']:
+            raise ValueError('Column %r is not editable'%data['label'])
+        if data['datatype'] != 'text' or not data['is_multiple']:
+            raise ValueError('Column %r is not text/multiple'%data['label'])
+        field = self.custom_field_name(label, num)
+        self._do_bulk_modify(field, ids, add, remove, notify)
+
     def unapply_tags(self, book_id, tags, notify=True):
         self.bulk_modify_tags((book_id,), remove=tags, notify=notify)
 
@@ -589,6 +602,57 @@ class LibraryDatabase(object):
             return []
         return list(self.new_api.remove_items(field, (item_id,)))
 
+    def set_custom(self, book_id, val, label=None, num=None, append=False,
+                   notify=True, extra=None, commit=True, allow_case_change=False):
+        field = self.custom_field_name(label, num)
+        data = self.backend.custom_field_metadata(label, num)
+        if data['datatype'] == 'composite':
+            return set()
+        if not data['editable']:
+            raise ValueError('Column %r is not editable'%data['label'])
+        if data['datatype'] == 'enumeration' and (
+                val and val not in data['display']['enum_values']):
+            return set()
+        with self.new_api.write_lock:
+            if append and data['is_multiple']:
+                current = self.new_api._field_for(field, book_id)
+                existing = {icu_lower(x) for x in current}
+                val = current + tuple(x for x in self.new_api.fields[field].writer.adapter(val) if icu_lower(x) not in existing)
+                affected_books = self.new_api._set_field(field, {book_id:val}, allow_case_change=allow_case_change)
+            else:
+                affected_books = self.new_api._set_field(field, {book_id:val}, allow_case_change=allow_case_change)
+            if data['datatype'] == 'series':
+                extra = 1.0 if extra is None else extra
+                self.new_api._set_field(field + '_index', {book_id:extra})
+        if notify and affected_books:
+            self.notify('metadata', list(affected_books))
+        return affected_books
+
+    def set_custom_bulk(self, ids, val, label=None, num=None,
+                   append=False, notify=True, extras=None):
+        if extras is not None and len(extras) != len(ids):
+            raise ValueError('Length of ids and extras is not the same')
+        field = self.custom_field_name(label, num)
+        data = self.backend.custom_field_metadata(label, num)
+        if data['datatype'] == 'composite':
+            return set()
+        if data['datatype'] == 'enumeration' and (
+                val and val not in data['display']['enum_values']):
+            return
+        if not data['editable']:
+            raise ValueError('Column %r is not editable'%data['label'])
+
+        if append:
+            for book_id in ids:
+                self.set_custom(book_id, val, label=label, num=num, append=True, notify=False)
+        else:
+            with self.new_api.write_lock:
+                self.new_api._set_field(field, {book_id:val for book_id in ids}, allow_case_change=False)
+            if extras is not None:
+                self.new_api._set_field(field + '_index', {book_id:val for book_id, val in zip(ids, extras)})
+        if notify:
+            self.notify('metadata', list(ids))
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
@@ -777,3 +841,5 @@ LibraryDatabase.commit = MT(lambda self:None)
 del MT
 
 
+
+
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 83325c1615..6765392638 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -48,10 +48,10 @@ def run_funcs(self, db, ndb, funcs):
             meth(*args)
         else:
             fmt = lambda x:x
-            if meth[0] in {'!', '@', '#', '+', '$'}:
+            if meth[0] in {'!', '@', '#', '+', '$', '-'}:
                 if meth[0] != '+':
                     fmt = {'!':dict, '@':lambda x:frozenset(x or ()), '#':lambda x:set((x or '').split(',')),
-                           '$':lambda x:set(tuple(y) for y in x)}[meth[0]]
+                           '$':lambda x:set(tuple(y) for y in x), '-':lambda x:None}[meth[0]]
                 else:
                     fmt = args[-1]
                     args = args[:-1]
@@ -644,5 +644,50 @@ class LegacyTest(BaseTest):
         for label in ('tags', 'authors', 'series'):
             run_funcs(self, db, ndb, [('get_custom_and_extra', idx, label) for idx in range(3)])
         db.close()
+
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+        # Test setting
+        run_funcs(self, db, ndb, (
+            ('-set_custom', 1, 't1 & t2', 'authors'),
+            ('-set_custom', 1, 't3 & t4', 'authors', None, True),
+            ('-set_custom', 3, 'test one & test Two', 'authors'),
+            ('-set_custom', 1, 'ijfkghkjdf', 'enum'),
+            ('-set_custom', 3, 'One', 'enum'),
+            ('-set_custom', 3, 'xxx', 'formats'),
+            ('-set_custom', 1, 'my tag two', 'tags', None, False, False, None, True, True),
+            (db.clean,), (db.refresh,),
+            ('all_custom', 'series'), ('all_custom', 'tags'), ('all_custom', 'authors'),
+        ))
+        for label in ('tags', 'series', 'authors', 'comments', 'rating', 'date', 'yesno', 'isbn', 'enum', 'formats', 'float', 'comp_tags'):
+            for func in ('get_custom', 'get_custom_extra', 'get_custom_and_extra'):
+                run_funcs(self, db, ndb, [(func, idx, label) for idx in range(3)])
+        db.close()
+
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+        # Test setting bulk
+        run_funcs(self, db, ndb, (
+            ('set_custom_bulk', (1,2,3), 't1 & t2', 'authors'),
+            ('set_custom_bulk', (1,2,3), 'a series', 'series', None, False, False, (9, 10, 11)),
+            ('set_custom_bulk', (1,2,3), 't1', 'tags', None, True),
+            (db.clean,), (db.refresh,),
+            ('all_custom', 'series'), ('all_custom', 'tags'), ('all_custom', 'authors'),
+        ))
+        for label in ('tags', 'series', 'authors', 'comments', 'rating', 'date', 'yesno', 'isbn', 'enum', 'formats', 'float', 'comp_tags'):
+            for func in ('get_custom', 'get_custom_extra', 'get_custom_and_extra'):
+                run_funcs(self, db, ndb, [(func, idx, label) for idx in range(3)])
+        db.close()
+
+        ndb = self.init_legacy(self.cloned_library)
+        db = self.init_old(self.cloned_library)
+        # Test bulk multiple
+        run_funcs(self, db, ndb, (
+            ('set_custom_bulk_multiple', (1,2,3), ['t1'], ['My Tag One'], 'tags'),
+            (db.clean,), (db.refresh,),
+            ('all_custom', 'tags'),
+            ('get_custom', 0, 'tags'), ('get_custom', 1, 'tags'), ('get_custom', 2, 'tags'),
+        ))
+        db.close()
     # }}}
 

From 3cc7a7374d639bf0a5d202e68b603b4b244d60d1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 17:40:45 +0530
Subject: [PATCH 0223/1154] API for creating, modifying and deleting custom
 columns

---
 src/calibre/db/backend.py      | 181 +++++++++++++++++++++++++++++++++
 src/calibre/db/cache.py        |  11 ++
 src/calibre/db/legacy.py       |  12 +++
 src/calibre/db/tests/legacy.py |  20 ++++
 4 files changed, 224 insertions(+)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 13e8b80ff5..fc7d556dc0 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -42,6 +42,8 @@ Differences in semantics from pysqlite:
     3. There is no executescript
 
 '''
+CUSTOM_DATA_TYPES = frozenset(['rating', 'text', 'comments', 'datetime',
+    'int', 'float', 'bool', 'series', 'composite', 'enumeration'])
 
 
 class DynamicFilter(object):  # {{{
@@ -797,6 +799,184 @@ class DB(object):
             return self.custom_column_label_map[label]
         return self.custom_column_num_map[num]
 
+    def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None):
+        changed = False
+        if name is not None:
+            self.conn.execute('UPDATE custom_columns SET name=? WHERE id=?', (name, num))
+            changed = True
+        if label is not None:
+            self.conn.execute('UPDATE custom_columns SET label=? WHERE id=?', (label, num))
+            changed = True
+        if is_editable is not None:
+            self.conn.execute('UPDATE custom_columns SET editable=? WHERE id=?', (bool(is_editable), num))
+            self.custom_column_num_map[num]['is_editable'] = bool(is_editable)
+            changed = True
+        if display is not None:
+            self.conn.execute('UPDATE custom_columns SET display=? WHERE id=?', (json.dumps(display), num))
+            changed = True
+        return changed
+
+    def create_custom_column(self, label, name, datatype, is_multiple, editable=True, display={}):  # {{{
+        import re
+        if not label:
+            raise ValueError(_('No label was provided'))
+        if re.match('^\w*$', label) is None or not label[0].isalpha() or label.lower() != label:
+            raise ValueError(_('The label must contain only lower case letters, digits and underscores, and start with a letter'))
+        if datatype not in CUSTOM_DATA_TYPES:
+            raise ValueError('%r is not a supported data type'%datatype)
+        normalized  = datatype not in ('datetime', 'comments', 'int', 'bool',
+                'float', 'composite')
+        is_multiple = is_multiple and datatype in ('text', 'composite')
+        self.conn.execute(
+                ('INSERT INTO '
+                'custom_columns(label,name,datatype,is_multiple,editable,display,normalized)'
+                'VALUES (?,?,?,?,?,?,?)'),
+                (label, name, datatype, is_multiple, editable, json.dumps(display), normalized))
+        num = self.conn.last_insert_rowid()
+
+        if datatype in ('rating', 'int'):
+            dt = 'INT'
+        elif datatype in ('text', 'comments', 'series', 'composite', 'enumeration'):
+            dt = 'TEXT'
+        elif datatype in ('float',):
+            dt = 'REAL'
+        elif datatype == 'datetime':
+            dt = 'timestamp'
+        elif datatype == 'bool':
+            dt = 'BOOL'
+        collate = 'COLLATE NOCASE' if dt == 'TEXT' else ''
+        table, lt = self.custom_table_names(num)
+        if normalized:
+            if datatype == 'series':
+                s_index = 'extra REAL,'
+            else:
+                s_index = ''
+            lines = [
+                '''\
+                CREATE TABLE %s(
+                    id    INTEGER PRIMARY KEY AUTOINCREMENT,
+                    value %s NOT NULL %s,
+                    UNIQUE(value));
+                '''%(table, dt, collate),
+
+                'CREATE INDEX %s_idx ON %s (value %s);'%(table, table, collate),
+
+                '''\
+                CREATE TABLE %s(
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    book INTEGER NOT NULL,
+                    value INTEGER NOT NULL,
+                    %s
+                    UNIQUE(book, value)
+                    );'''%(lt, s_index),
+
+                'CREATE INDEX %s_aidx ON %s (value);'%(lt,lt),
+                'CREATE INDEX %s_bidx ON %s (book);'%(lt,lt),
+
+                '''\
+                CREATE TRIGGER fkc_update_{lt}_a
+                        BEFORE UPDATE OF book ON {lt}
+                        BEGIN
+                            SELECT CASE
+                                WHEN (SELECT id from books WHERE id=NEW.book) IS NULL
+                                THEN RAISE(ABORT, 'Foreign key violation: book not in books')
+                            END;
+                        END;
+                CREATE TRIGGER fkc_update_{lt}_b
+                        BEFORE UPDATE OF author ON {lt}
+                        BEGIN
+                            SELECT CASE
+                                WHEN (SELECT id from {table} WHERE id=NEW.value) IS NULL
+                                THEN RAISE(ABORT, 'Foreign key violation: value not in {table}')
+                            END;
+                        END;
+                CREATE TRIGGER fkc_insert_{lt}
+                        BEFORE INSERT ON {lt}
+                        BEGIN
+                            SELECT CASE
+                                WHEN (SELECT id from books WHERE id=NEW.book) IS NULL
+                                THEN RAISE(ABORT, 'Foreign key violation: book not in books')
+                                WHEN (SELECT id from {table} WHERE id=NEW.value) IS NULL
+                                THEN RAISE(ABORT, 'Foreign key violation: value not in {table}')
+                            END;
+                        END;
+                CREATE TRIGGER fkc_delete_{lt}
+                        AFTER DELETE ON {table}
+                        BEGIN
+                            DELETE FROM {lt} WHERE value=OLD.id;
+                        END;
+
+                CREATE VIEW tag_browser_{table} AS SELECT
+                    id,
+                    value,
+                    (SELECT COUNT(id) FROM {lt} WHERE value={table}.id) count,
+                    (SELECT AVG(r.rating)
+                     FROM {lt},
+                          books_ratings_link as bl,
+                          ratings as r
+                     WHERE {lt}.value={table}.id and bl.book={lt}.book and
+                           r.id = bl.rating and r.rating <> 0) avg_rating,
+                    value AS sort
+                FROM {table};
+
+                CREATE VIEW tag_browser_filtered_{table} AS SELECT
+                    id,
+                    value,
+                    (SELECT COUNT({lt}.id) FROM {lt} WHERE value={table}.id AND
+                    books_list_filter(book)) count,
+                    (SELECT AVG(r.rating)
+                     FROM {lt},
+                          books_ratings_link as bl,
+                          ratings as r
+                     WHERE {lt}.value={table}.id AND bl.book={lt}.book AND
+                           r.id = bl.rating AND r.rating <> 0 AND
+                           books_list_filter(bl.book)) avg_rating,
+                    value AS sort
+                FROM {table};
+
+                '''.format(lt=lt, table=table),
+
+            ]
+        else:
+            lines = [
+                '''\
+                CREATE TABLE %s(
+                    id    INTEGER PRIMARY KEY AUTOINCREMENT,
+                    book  INTEGER,
+                    value %s NOT NULL %s,
+                    UNIQUE(book));
+                '''%(table, dt, collate),
+
+                'CREATE INDEX %s_idx ON %s (book);'%(table, table),
+
+                '''\
+                CREATE TRIGGER fkc_insert_{table}
+                        BEFORE INSERT ON {table}
+                        BEGIN
+                            SELECT CASE
+                                WHEN (SELECT id from books WHERE id=NEW.book) IS NULL
+                                THEN RAISE(ABORT, 'Foreign key violation: book not in books')
+                            END;
+                        END;
+                CREATE TRIGGER fkc_update_{table}
+                        BEFORE UPDATE OF book ON {table}
+                        BEGIN
+                            SELECT CASE
+                                WHEN (SELECT id from books WHERE id=NEW.book) IS NULL
+                                THEN RAISE(ABORT, 'Foreign key violation: book not in books')
+                            END;
+                        END;
+                '''.format(table=table),
+            ]
+        script = ' \n'.join(lines)
+        self.conn.execute(script)
+        return num
+    # }}}
+
+    def delete_custom_column(self, label=None, num=None):
+        data = self.custom_field_metadata(label, num)
+        self.conn.execute('UPDATE custom_columns SET mark_for_delete=1 WHERE id=?', (data['num'],))
+
     def close(self):
         if self._conn is not None:
             self._conn.close()
@@ -1274,3 +1454,4 @@ class DB(object):
 
    # }}}
 
+
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index e7c3114f0d..d9dda41aa3 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1401,6 +1401,17 @@ class Cache(object):
     def lookup_by_uuid(self, uuid):
         return self.fields['uuid'].table.lookup_by_uuid(uuid)
 
+    @write_api
+    def delete_custom_column(self, label=None, num=None):
+        self.backend.delete_custom_column(label, num)
+
+    @write_api
+    def create_custom_column(self, label, name, datatype, is_multiple, editable=True, display={}):
+        self.backend.create_custom_column(label, name, datatype, is_multiple, editable=editable, display=display)
+
+    @write_api
+    def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None):
+        return self.backend.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
 
     # }}}
 
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b814b1e23e..8f7a1c577e 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -653,6 +653,17 @@ class LibraryDatabase(object):
         if notify:
             self.notify('metadata', list(ids))
 
+    def delete_custom_column(self, label=None, num=None):
+        self.new_api.delete_custom_column(label, num)
+
+    def create_custom_column(self, label, name, datatype, is_multiple, editable=True, display={}):
+        self.new_api.create_custom_column(label, name, datatype, is_multiple, editable=editable, display=display)
+
+    def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None, notify=True):
+        changed = self.new_api.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
+        if changed and notify:
+            self.notify('metadata', [])
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
@@ -843,3 +854,4 @@ del MT
 
 
 
+
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 6765392638..6e50c164e3 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -689,5 +689,25 @@ class LegacyTest(BaseTest):
             ('get_custom', 0, 'tags'), ('get_custom', 1, 'tags'), ('get_custom', 2, 'tags'),
         ))
         db.close()
+
+        o = self.cloned_library
+        n = self.cloned_library
+        ndb, db = self.init_legacy(n), self.init_old(o)
+        ndb.create_custom_column('created', 'Created', 'text', True, True, {'moose':'cat'})
+        db.create_custom_column('created', 'Created', 'text', True, True, {'moose':'cat'})
+        db.close()
+        ndb, db = self.init_legacy(n), self.init_old(o)
+        self.assertEqual(db.custom_column_label_map['created'], ndb.backend.custom_field_metadata('created'))
+        num = db.custom_column_label_map['created']['num']
+        ndb.set_custom_column_metadata(num, is_editable=False, name='Crikey', display={})
+        db.set_custom_column_metadata(num, is_editable=False, name='Crikey', display={})
+        db.close()
+        ndb, db = self.init_legacy(n), self.init_old(o)
+        self.assertEqual(db.custom_column_label_map['created'], ndb.backend.custom_field_metadata('created'))
+        db.close()
+        ndb = self.init_legacy(n)
+        ndb.delete_custom_column('created')
+        ndb = self.init_legacy(n)
+        self.assertRaises(KeyError, ndb.custom_field_name, num=num)
     # }}}
 

From a7ca60b0e91c142db6b3ed70db566a0e2bd8f31a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 17:44:50 +0530
Subject: [PATCH 0224/1154] Instructions on how to uninstall McAfee SiteAdvisor

---
 manual/faq.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index 71246acdcd..46d675da13 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -846,11 +846,12 @@ My antivirus program claims |app| is a virus/trojan?
     McAfee is wrong, the mistake has been reported to them, by several people,
     but they have not corrected it. McAfee SiteAdvisor is a notoriously
     unreliable service, see for example
-    http://www.naturalnews.com/041170_McAfee_Site_Advisor_false_information.html or
-    http://www.snapfiles.com/siteadvisor.html or
-    http://en.wikipedia.org/wiki/McAfee_SiteAdvisor#Criticism We strongly urge
-    you to stop using McAfee products, find a more competent security provider
+    `this page <http://www.naturalnews.com/041170_McAfee_Site_Advisor_false_information.html>`_ or
+    `this page <http://www.snapfiles.com/siteadvisor.html>`_ or
+    `this Wikipedia entry <http://en.wikipedia.org/wiki/McAfee_SiteAdvisor#Criticism>`_.
+    We strongly urge you to stop using McAfee products, find a more competent security provider
     to give your business to.
+    Instructions on how to `uninstall McAfee SiteAdvisor <http://service.mcafee.com/faqdocument.aspx?id=TS100162>`_.
 
 The first thing to check is that you are downloading |app| from the official
 website: `<http://calibre-ebook.com/download>`_. |app| is a very popular program

From 0ab4ebbfbd4f38780cf7a8266a3fcba4e18f7ff5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 18:11:06 +0530
Subject: [PATCH 0225/1154] max_size()

---
 src/calibre/db/legacy.py        | 4 ++--
 src/calibre/db/tests/legacy.py  | 3 +++
 src/calibre/library/database.py | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 8f7a1c577e..fff77948f8 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -680,12 +680,12 @@ class LibraryDatabase(object):
 MT = lambda func: types.MethodType(func, None, LibraryDatabase)
 
 # Legacy getter API {{{
-for prop in ('author_sort', 'authors', 'comment', 'comments', 'publisher',
+for prop in ('author_sort', 'authors', 'comment', 'comments', 'publisher', 'max_size',
              'rating', 'series', 'series_index', 'tags', 'title', 'title_sort',
              'timestamp', 'uuid', 'pubdate', 'ondevice', 'metadata_last_modified', 'languages',):
     def getter(prop):
         fm = {'comment':'comments', 'metadata_last_modified':
-                'last_modified', 'title_sort':'sort'}.get(prop, prop)
+              'last_modified', 'title_sort':'sort', 'max_size':'size'}.get(prop, prop)
         def func(self, index, index_is_id=False):
             return self.get_property(index, index_is_id=index_is_id, loc=self.FIELD_MAP[fm])
         return func
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 6e50c164e3..aa70a9bb1d 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -15,6 +15,7 @@ from operator import itemgetter
 
 from calibre.db.tests.base import BaseTest
 
+# Utils {{{
 class ET(object):
 
     def __init__(self, func_name, args, kwargs={}, old=None, legacy=None):
@@ -58,6 +59,7 @@ def run_funcs(self, db, ndb, funcs):
                 meth = meth[1:]
             res1, res2 = fmt(getattr(db, meth)(*args)), fmt(getattr(ndb, meth)(*args))
             self.assertEqual(res1, res2, 'The method: %s() returned different results for argument %s' % (meth, args))
+# }}}
 
 class LegacyTest(BaseTest):
 
@@ -179,6 +181,7 @@ class LegacyTest(BaseTest):
             'sizeof_format':[(1, 'FMT1', True), (2, 'FMT1', True), (0, 'xxxxxx')],
             '@format_files':[(0,),(1,),(2,)],
             'formats':[(0,),(1,),(2,)],
+            'max_size':[(0,),(1,),(2,)],
             'format_hash':[(1, 'FMT1'),(1, 'FMT2'), (2, 'FMT1')],
             'author_sort_from_authors': [(['Author One', 'Author Two', 'Unknown'],)],
             'has_book':[(Metadata('title one'),), (Metadata('xxxx1111'),)],
diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py
index 0e2bd5876b..6d4f55a535 100644
--- a/src/calibre/library/database.py
+++ b/src/calibre/library/database.py
@@ -959,7 +959,7 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
     def max_size(self, index, index_is_id=False):
         if index_is_id:
             return self.conn.get('SELECT size FROM meta WHERE id=?', (index,), all=False)
-        return self.data[index][6]
+        return self.data[index][4]
 
     def cover(self, index, index_is_id=False):
         '''Cover as a data string or None'''

From f75458224bfdc311b4322478c979acab002b117e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 22:11:44 +0530
Subject: [PATCH 0226/1154] E-book viewer: Fix page position incorrect after
 startup bookmark

E-book viewer: Fix a bug that could cause the reported position to be
incorrect immediately after opening a previously opened book.

This also fixes the Back button not working if a link is clicked on the
page immediately after opening the book.
---
 resources/compiled_coffeescript.zip           | Bin 71881 -> 71983 bytes
 .../ebooks/oeb/display/indexing.coffee        |   4 ++++
 src/calibre/gui2/viewer/main.py               |  10 ++++++++++
 3 files changed, 14 insertions(+)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index e092b53157f3c30f95712db0b597358b744dc08a..3c5f0e80c6f57fd0b309fa8ea039fcfcd3f1e310 100644
GIT binary patch
delta 328
zcmX@Pk!AfR7Ty4FW)=|!5LmwU<L143wNXN^)_inYRTFcYMT~&~gyk5f7l<>8ZZ_gK
z;NZzjQ_xUM%uCM5FDjmFs3km^U4nOV-3N}zp{yd4A4utJUL>x?jHzm#9OvYFja(pA
zn;%Hs6W(msdA(<{-eiuATtE4E8JR?w;f|QjCC(^4-Byf|e|oJrBgb?baYhjZOgDku
z3?&+(z%HD=P>j)(=|BO5^Hz*eZhD9~qZHHBDv*dL)5I2t%mr~qBPNGQlfN&JovtXs
zsKwMe6C#l$!DzrV^%sP*Qi73Zx~LeV26F{F<8%ixMkNteHjss!K)8U3fuT~25y%4o
D7KK^O

delta 278
zcmZ3#iRI)*mhBbnjLiI!%q$`dARy?u-)T!=LB~8%1_lt8o4lb)Z1ct_1CGg_3q&?+
zCWkSD7?U-VbvA!Y+a$b^uO@2q{HohM)2qc8xu)NcV3cD98Z-T;1f!A`Ba;X-4r9TV
z!3akF$s4Ogr!$K)nljy10ki$Z8RcXSnuxl%M=>yfury3DnBJfVR<%ovQDk~1P$`o^
zCs06s`U-JIEhe4GV9A%_j7Chi7fhFxV033vSTT9wOzG*35{z2R2Aqu3*GVuch_JGO
R4C4gC1xySK!eWd-9suzoMJxaS

diff --git a/src/calibre/ebooks/oeb/display/indexing.coffee b/src/calibre/ebooks/oeb/display/indexing.coffee
index efe42199e9..357128fce9 100644
--- a/src/calibre/ebooks/oeb/display/indexing.coffee
+++ b/src/calibre/ebooks/oeb/display/indexing.coffee
@@ -50,6 +50,8 @@ class BookIndexing
         this.last_check = [null, null]
 
     cache_valid: (anchors) ->
+        if not anchors
+            return false
         for a in anchors
             if not Object.prototype.hasOwnProperty.call(this.cache, a)
                 return false
@@ -65,6 +67,8 @@ class BookIndexing
             return this.cache
 
         ans = {}
+        if not anchors
+            return ans
         for anchor in anchors
             elem = document.getElementById(anchor)
             if elem == null
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 113e1201e2..8681a0fe21 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -772,12 +772,14 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
             self.scrolled(self.view.scroll_fraction)
 
     def internal_link_clicked(self, frac):
+        self.update_page_number()  # Ensure page number is accurate as it is used for history
         self.history.add(self.pos.value())
 
     def link_clicked(self, url):
         path = os.path.abspath(unicode(url.toLocalFile()))
         frag = None
         if path in self.iterator.spine:
+            self.update_page_number()  # Ensure page number is accurate as it is used for history
             self.history.add(self.pos.value())
             path = self.iterator.spine[self.iterator.spine.index(path)]
             if url.hasFragment():
@@ -913,6 +915,14 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         else:
             self.view.document.page_position.restore()
         self.view.document.after_resize()
+        # For some reason scroll_fraction returns incorrect results in paged
+        # mode for some time after a resize is finished. No way of knowing
+        # exactly how long, so we update it in a second, in the hopes that it
+        # will be enough *most* of the time.
+        QTimer.singleShot(1000, self.update_page_number)
+
+    def update_page_number(self):
+        self.set_page_number(self.view.document.scroll_fraction)
 
     def close_progress_indicator(self):
         self.pi.stop()

From 93e68b13986ca19d0b817152b7e04dac47e3f552 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jul 2013 22:16:45 +0530
Subject: [PATCH 0227/1154] remove_cover()

---
 src/calibre/db/legacy.py       | 5 +++++
 src/calibre/db/tests/legacy.py | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index fff77948f8..a4d5a332e5 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -664,6 +664,11 @@ class LibraryDatabase(object):
         if changed and notify:
             self.notify('metadata', [])
 
+    def remove_cover(self, book_id, notify=True, commit=True):
+        self.new_api.set_cover({book_id:None})
+        if notify:
+            self.notify('cover', [id])
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index aa70a9bb1d..4f448b5113 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -345,6 +345,12 @@ class LegacyTest(BaseTest):
             self.assertEqual(cache.field_for('authors', bid), ('calibre',))
             self.assertEqual(cache.field_for('tags', bid), (_('News'), 'Events', 'one', 'two'))
 
+        self.assertTrue(legacy.cover(1, index_is_id=True))
+        self.assertTrue(legacy.has_cover(1))
+        legacy.remove_cover(1)
+        self.assertFalse(legacy.has_cover(1))
+        self.assertFalse(legacy.cover(1, index_is_id=True))
+
         legacy.delete_book(1)
         old.delete_book(1)
         self.assertNotIn(1, legacy.all_ids())

From ce4d12711ab8674fad84bb65f26f17fcc7749010 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 08:16:29 +0530
Subject: [PATCH 0228/1154] Correctly identify JPEG files that have no headers

---
 src/calibre/utils/imghdr.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/utils/imghdr.py b/src/calibre/utils/imghdr.py
index c899a5be95..c4070f072e 100644
--- a/src/calibre/utils/imghdr.py
+++ b/src/calibre/utils/imghdr.py
@@ -26,6 +26,10 @@ def what(file, h=None):
     finally:
         if f:
             f.close()
+    # There exist some jpeg files with no headers, only the starting two bits
+    # If we cannot identify as anything else, identify as jpeg.
+    if h[:2] == b'\xff\xd8':
+        return 'jpeg'
     return None
 
 

From 0c5959f2983cd863ee87dd956b4881c1ba077003 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 10:03:30 +0530
Subject: [PATCH 0229/1154] PDF Output: Fix anchors sometimes located
 incorrectly

PDF Output: Workaround bug in WebKit's getBoundingClientRect() method
that could cause links to occasionally point to incorrect locations.
Fixes #1202390 [Private bug](https://bugs.launchpad.net/calibre/+bug/1202390)
---
 resources/compiled_coffeescript.zip         | Bin 71983 -> 72211 bytes
 src/calibre/ebooks/oeb/display/paged.coffee |  16 ++++++++++++++--
 src/calibre/ebooks/pdf/render/from_html.py  |   1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index 3c5f0e80c6f57fd0b309fa8ea039fcfcd3f1e310..ddf0db08e77d28f55c7eb8344a7899e938a18244 100644
GIT binary patch
delta 260
zcmZ3#iDmK@7U=+QW)=|!5XkcS<iv61;41BC1_lt8p1h$-Y@^|JtI5}Q@K63=r8)Vl
zuk7S*Al|R0!=IXynyXiwT$G=a<CB_JGI^h$>SSJZ^~onK1zF>ZQqv44_v`CVw#}3V
zit=(AMjOQHD3s(EOpbXVy}8f&j~w$#*H4>!qkin>L$!DMWHCl-kmU4>VvN#EDbbTR
zR*6n$7H2eNT2csR`-?MLFjZCq+49p@h%;(2m9~P#Uy3stF{w<RE-S(4&XhT8^1_+Y
h(;Fp#@|C|QZ~P@c{S1g5!!iAb1fwBatT-dk%K$LVTLJ(8

delta 224
zcmbQdg=PIF7Ks3FW)=|!5LmwUqtihXQ5W|p1_t-2$-S+T)8~mZa%{9*Z#DV7mEq)r
zYFd+JZ44(%sY`7xviT#&{A$g|&4tlFcJra?oL(-@XsrO0bXrvtbDKqsfdPc&z;?ih
zhN#ICTScco7iTnOI#2*+8%r=+Fiouju_v#p=9=Ck!KlSFu?5JNoqiR>c9=AsQIgS}
psdXk;eY_;20n^l9(<e$YdNNnAGfsA#EIj>#B%>@_r5Gd79stY?N45X}

diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee
index f97f1b3cf8..39c4b12fe9 100644
--- a/src/calibre/ebooks/oeb/display/paged.coffee
+++ b/src/calibre/ebooks/oeb/display/paged.coffee
@@ -294,9 +294,21 @@ class PagedDisplay
         return Math.floor(xpos/this.page_width)
 
     column_location: (elem) ->
-        # Return the location of elem relative to its containing column
+        # Return the location of elem relative to its containing column.
+        # WARNING: This method may cause the viewport to scroll (to workaround
+        # a bug in WebKit).
         br = elem.getBoundingClientRect()
-        [left, top] = calibre_utils.viewport_to_document(br.left, br.top, elem.ownerDocument)
+        # Because of a bug in WebKit's getBoundingClientRect() in column
+        # mode, this position can be inaccurate, see
+        # https://bugs.launchpad.net/calibre/+bug/1202390 for a test case.
+        # The usual symptom of the inaccuracy is br.top is highly negative.
+        if br.top < -100
+            # We have to actually scroll the element into view to get its
+            # position
+            elem.scrollIntoView()
+            [left, top] = calibre_utils.viewport_to_document(elem.scrollLeft, elem.scrollTop, elem.ownerDocument)
+        else
+            [left, top] = calibre_utils.viewport_to_document(br.left, br.top, elem.ownerDocument)
         c = this.column_at(left)
         width = Math.min(br.right, (c+1)*this.page_width) - br.left
         if br.bottom < br.top
diff --git a/src/calibre/ebooks/pdf/render/from_html.py b/src/calibre/ebooks/pdf/render/from_html.py
index 8ea1d8203e..771cc33ede 100644
--- a/src/calibre/ebooks/pdf/render/from_html.py
+++ b/src/calibre/ebooks/pdf/render/from_html.py
@@ -353,6 +353,7 @@ class PDFWriter(QObject):
         paged_display.layout();
         paged_display.fit_images();
         py_bridge.value = book_indexing.all_links_and_anchors();
+        window.scrollTo(0, 0); // This is needed as getting anchor positions could have caused the viewport to scroll
         '''%(self.margin_top, 0, self.margin_bottom))
 
         amap = self.bridge_value

From 5542dcfbb3e6c303f3e1fd30300452904d3152fb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 11:34:39 +0530
Subject: [PATCH 0230/1154] Dont add page breaks for chapters at the start of
 the file

PDF Output: Fix extra blank page being inserted at the start of the
chapter when converting some epub files from feedbooks
---
 .../ebooks/oeb/transforms/structure.py        | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/calibre/ebooks/oeb/transforms/structure.py b/src/calibre/ebooks/oeb/transforms/structure.py
index cd376b4ec4..50ee4d011d 100644
--- a/src/calibre/ebooks/oeb/transforms/structure.py
+++ b/src/calibre/ebooks/oeb/transforms/structure.py
@@ -10,7 +10,7 @@ import re, uuid
 
 from lxml import etree
 from urlparse import urlparse
-from collections import OrderedDict
+from collections import OrderedDict, Counter
 
 from calibre.ebooks.oeb.base import XPNSMAP, TOC, XHTML, xml2text, barename
 from calibre.ebooks import ConversionError
@@ -22,6 +22,26 @@ def XPath(x):
         raise ConversionError(
         'The syntax of the XPath expression %s is invalid.' % repr(x))
 
+def isspace(x):
+    return not x or x.replace(u'\xa0', u'').isspace()
+
+def at_start(elem):
+    ' Return True if there is no content before elem '
+    body = XPath('ancestor-or-self::h:body')(elem)
+    if not body:
+        return True
+    body = body[0]
+    ancestors = frozenset(XPath('ancestor::*')(elem))
+    for x in body.iter():
+        if x is elem:
+            return True
+        if getattr(x, 'tag', None) and x.tag.rpartition('}')[-1] in {'img', 'svg'}:
+            return False
+        if isspace(getattr(x, 'text', None)) and (x in ancestors or isspace(getattr(x, 'tail', None))):
+            continue
+        return False
+    return False
+
 class DetectStructure(object):
 
     def __call__(self, oeb, opts):
@@ -51,7 +71,7 @@ class DetectStructure(object):
             regexp = re.compile(opts.toc_filter)
             for node in list(self.oeb.toc.iter()):
                 if not node.title or regexp.search(node.title) is not None:
-                    self.log('Filtering', node.title if node.title else\
+                    self.log('Filtering', node.title if node.title else
                             'empty node', 'from TOC')
                     self.oeb.toc.remove(node)
 
@@ -92,7 +112,8 @@ class DetectStructure(object):
                 'Invalid start reading at XPath expression, ignoring: %s'%expr)
             return
         for item in self.oeb.spine:
-            if not hasattr(item.data, 'xpath'): continue
+            if not hasattr(item.data, 'xpath'):
+                continue
             matches = expr(item.data)
             if matches:
                 elem = matches[0]
@@ -129,17 +150,27 @@ class DetectStructure(object):
             chapter_mark = self.opts.chapter_mark
             page_break_before = 'display: block; page-break-before: always'
             page_break_after = 'display: block; page-break-after: always'
+            c = Counter()
             for item, elem in self.detected_chapters:
+                c[item] += 1
                 text = xml2text(elem).strip()
                 text = re.sub(r'\s+', ' ', text.strip())
                 self.log('\tDetected chapter:', text[:50])
                 if chapter_mark == 'none':
                     continue
-                elif chapter_mark == 'rule':
+                if chapter_mark == 'rule':
                     mark = etree.Element(XHTML('hr'))
                 elif chapter_mark == 'pagebreak':
+                    if c[item] < 3 and at_start(elem):
+                        # For the first two elements in this item, check if they
+                        # are at the start of the file, in which case inserting a
+                        # page break in unnecessary and can lead to extra blank
+                        # pages in the PDF Output plugin. We need to use two as
+                        # feedbooks epubs match both a heading tag and its
+                        # containing div with the default chapter expression.
+                        continue
                     mark = etree.Element(XHTML('div'), style=page_break_after)
-                else: # chapter_mark == 'both':
+                else:  # chapter_mark == 'both':
                     mark = etree.Element(XHTML('hr'), style=page_break_before)
                 try:
                     elem.addprevious(mark)
@@ -182,8 +213,6 @@ class DetectStructure(object):
                             self.log('Maximum TOC links reached, stopping.')
                             return
 
-
-
     def elem_to_link(self, item, elem, counter):
         text = xml2text(elem).strip()
         if not text:
@@ -197,7 +226,6 @@ class DetectStructure(object):
         href = '#'.join((item.href, id))
         return text, href
 
-
     def add_leveled_toc_items(self):
         added = OrderedDict()
         added2 = OrderedDict()
@@ -223,7 +251,7 @@ class DetectStructure(object):
                     node = self.oeb.toc.add(text, _href,
                             play_order=self.oeb.toc.next_play_order())
                     added[elem] = node
-                    #node.add(_('Top'), _href)
+                    # node.add(_('Top'), _href)
 
             if self.opts.level2_toc is not None and added:
                 for elem in find_matches(self.opts.level2_toc, document.data):
@@ -263,3 +291,4 @@ class DetectStructure(object):
                                         play_order=self.oeb.toc.next_play_order())
                                 break
 
+

From b982bcc3f2d0f3340764db04c8fd6c4f7c8360ed Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 12:45:35 +0530
Subject: [PATCH 0231/1154] Get Books: Fix title author search handling

Get Books: Fix searching for title and author returning some extra
matches, if the title starts with an article like the, a or an.
Fixes #1200012 ["Get books" search is too fuzzy](https://bugs.launchpad.net/calibre/+bug/1200012)
---
 src/calibre/gui2/store/search/models.py | 22 ++++++++++++----------
 src/calibre/gui2/store/search/search.py |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py
index 59292b54d7..af2c274bd7 100644
--- a/src/calibre/gui2/store/search/models.py
+++ b/src/calibre/gui2/store/search/models.py
@@ -229,14 +229,14 @@ class Matches(QAbstractItemModel):
             if col == 1:
                 return QVariant('<p>%s</p>' % result.title)
             elif col == 2:
-                return QVariant('<p>' + _('Detected price as: %s. Check with the store before making a purchase to verify this price is correct. This price often does not include promotions the store may be running.') % result.price + '</p>')
+                return QVariant('<p>' + _('Detected price as: %s. Check with the store before making a purchase to verify this price is correct. This price often does not include promotions the store may be running.') % result.price + '</p>')  # noqa
             elif col == 3:
                 if result.drm == SearchResult.DRM_LOCKED:
-                    return QVariant('<p>' + _('This book as been detected as having DRM restrictions. This book may not work with your reader and you will have limitations placed upon you as to what you can do with this book. Check with the store before making any purchases to ensure you can actually read this book.') + '</p>')
+                    return QVariant('<p>' + _('This book as been detected as having DRM restrictions. This book may not work with your reader and you will have limitations placed upon you as to what you can do with this book. Check with the store before making any purchases to ensure you can actually read this book.') + '</p>')  # noqa
                 elif result.drm == SearchResult.DRM_UNLOCKED:
-                    return QVariant('<p>' + _('This book has been detected as being DRM Free. You should be able to use this book on any device provided it is in a format calibre supports for conversion. However, before making a purchase double check the DRM status with the store. The store may not be disclosing the use of DRM.') + '</p>')
+                    return QVariant('<p>' + _('This book has been detected as being DRM Free. You should be able to use this book on any device provided it is in a format calibre supports for conversion. However, before making a purchase double check the DRM status with the store. The store may not be disclosing the use of DRM.') + '</p>')  # noqa
                 else:
-                    return QVariant('<p>' + _('The DRM status of this book could not be determined. There is a very high likelihood that this book is actually DRM restricted.') + '</p>')
+                    return QVariant('<p>' + _('The DRM status of this book could not be determined. There is a very high likelihood that this book is actually DRM restricted.') + '</p>')  # noqa
             elif col == 4:
                 return QVariant('<p>%s</p>' % result.formats)
             elif col == 5:
@@ -337,7 +337,7 @@ class SearchFilter(SearchQueryParser):
 
     def _match(self, query, value, matchkind):
         for t in value:
-            try:     ### ignore regexp exceptions, required because search-ahead tries before typing is finished
+            try:  # ignore regexp exceptions, required because search-ahead tries before typing is finished
                 t = icu_lower(t)
                 if matchkind == self.EQUALS_MATCH:
                     if query == t:
@@ -375,7 +375,7 @@ class SearchFilter(SearchQueryParser):
             elif query.startswith('~'):
                 matchkind = self.REGEXP_MATCH
                 query = query[1:]
-        if matchkind != self.REGEXP_MATCH: ### leave case in regexps because it can be significant e.g. \S \W \D
+        if matchkind != self.REGEXP_MATCH:  # leave case in regexps because it can be significant e.g. \S \W \D
             query = query.lower()
 
         if location not in self.USABLE_LOCATIONS:
@@ -439,9 +439,9 @@ class SearchFilter(SearchQueryParser):
                 if locvalue in ('affiliate', 'drm', 'download', 'downloads'):
                     continue
                 try:
-                    ### Can't separate authors because comma is used for name sep and author sep
-                    ### Exact match might not get what you want. For that reason, turn author
-                    ### exactmatch searches into contains searches.
+                    # Can't separate authors because comma is used for name sep and author sep
+                    # Exact match might not get what you want. For that reason, turn author
+                    # exactmatch searches into contains searches.
                     if locvalue == 'author' and matchkind == self.EQUALS_MATCH:
                         m = self.CONTAINS_MATCH
                     else:
@@ -452,13 +452,15 @@ class SearchFilter(SearchQueryParser):
                     elif locvalue in ('author2', 'title2'):
                         m = self.IN_MATCH
                         vals = re.sub(r'(^|\s)(and|not|or|a|the|is|of|,)(\s|$)', ' ', accessor(sr)).split(' ')
+                        vals = [x for x in vals if x]
                         final_query = query.lower()
                     else:
                         vals = [accessor(sr)]
                     if self._match(final_query, vals, m):
                         matches.add(sr)
                         break
-                except ValueError: # Unicode errors
+                except ValueError:  # Unicode errors
                     import traceback
                     traceback.print_exc()
         return matches
+
diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py
index 117bc0dca3..7e39e5d513 100644
--- a/src/calibre/gui2/store/search/search.py
+++ b/src/calibre/gui2/store/search/search.py
@@ -236,11 +236,11 @@ class SearchDialog(QDialog, Ui_Dialog):
             query = re.sub(r'%s:"[^"]"' % loc, '', query)
             query = re.sub(r'%s:[^\s]*' % loc, '', query)
         # Remove logic.
-        query = re.sub(r'(^|\s)(and|not|or|a|the|is|of)(\s|$)', ' ', query)
+        query = re.sub(r'(^|\s|")(and|not|or|a|the|is|of)(\s|$|")', r' ', query)
         # Remove "
         query = query.replace('"', '')
         # Remove excess whitespace.
-        query = re.sub(r'\s{2,}', ' ', query)
+        query = re.sub(r'\s+', ' ', query)
         query = query.strip()
         return query.encode('utf-8')
 

From 781191c21b4059d83efdfb56ac92900f28f5590a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 12:49:29 +0530
Subject: [PATCH 0232/1154] More trekstor 4ink device ids

---
 src/calibre/devices/misc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index e35db8f03d..13ae870fd1 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -229,7 +229,8 @@ class TREKSTOR(USBMS):
             0x0067,  # This is for the Pyrus Mini
             0x006f,  # This is for the Pyrus Maxi
             0x003e,  # This is for the EBOOK_PLAYER_5M https://bugs.launchpad.net/bugs/792091
-            0x5cL,  # This is for the 4ink http://www.mobileread.com/forums/showthread.php?t=191318
+            0x05cL,  # This is for the 4ink http://www.mobileread.com/forums/showthread.php?t=191318
+            0x006c,  # This is for the 4ink http://www.mobileread.com/forums/showthread.php?t=218273
             ]
     BCD         = [0x0002, 0x100, 0x0222]
 

From aefab3b47abfb4077e7c58cd83a4f452ffd99b7f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 13:30:44 +0530
Subject: [PATCH 0233/1154] Fix regression that caused rescaling of ont size in
 dropcaps generated by the DOCX input plugin

---
 src/calibre/ebooks/oeb/transforms/flatcss.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index 9c08934938..1b678a3fe5 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -371,11 +371,13 @@ class CSSFlattener(object):
         is_drop_cap = (cssdict.get('float', None) == 'left' and 'font-size' in
                        cssdict and len(node) == 0 and node.text and
                        len(node.text) == 1)
-        is_drop_cap = is_drop_cap or (
-            # The docx input plugin generates drop caps that look like this
-            len(node) == 1 and not node.text and len(node[0]) == 0 and
-            node[0].text and not node[0].tail and len(node[0].text) == 1 and
-            'line-height' in cssdict and 'font-size' in cssdict)
+        # Detect drop caps generated by the docx input plugin
+        if (node.tag and node.tag.endswith('}p') and len(node) == 0 and node.text and len(node.text.strip()) == 1 and
+            not node.tail and 'line-height' in cssdict and 'font-size' in cssdict):
+            dp = node.getparent()
+            if dp.tag and dp.tag.endswith('}div') and len(dp) == 1 and not dp.text:
+                if stylizer.style(dp).cssdict().get('float', None) == 'left':
+                    is_drop_cap = True
         if not self.context.disable_font_rescaling and not is_drop_cap:
             _sbase = self.sbase if self.sbase is not None else \
                 self.context.source.fbase

From 1ee4cad632c83830d216f79d0f1ffba475495d7f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 14:52:09 +0530
Subject: [PATCH 0234/1154] set_cover()

---
 src/calibre/db/legacy.py       | 7 ++++++-
 src/calibre/db/tests/legacy.py | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index a4d5a332e5..b079c776bb 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -667,7 +667,12 @@ class LibraryDatabase(object):
     def remove_cover(self, book_id, notify=True, commit=True):
         self.new_api.set_cover({book_id:None})
         if notify:
-            self.notify('cover', [id])
+            self.notify('cover', [book_id])
+
+    def set_cover(self, book_id, data, notify=True, commit=True):
+        self.new_api.set_cover({book_id:data})
+        if notify:
+            self.notify('cover', [book_id])
 
     # Private interface {{{
     def __iter__(self):
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 4f448b5113..091d344e2d 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -346,10 +346,14 @@ class LegacyTest(BaseTest):
             self.assertEqual(cache.field_for('tags', bid), (_('News'), 'Events', 'one', 'two'))
 
         self.assertTrue(legacy.cover(1, index_is_id=True))
+        origcov = legacy.cover(1, index_is_id=True)
         self.assertTrue(legacy.has_cover(1))
         legacy.remove_cover(1)
         self.assertFalse(legacy.has_cover(1))
         self.assertFalse(legacy.cover(1, index_is_id=True))
+        legacy.set_cover(3, origcov)
+        self.assertEqual(legacy.cover(3, index_is_id=True), origcov)
+        self.assertTrue(legacy.has_cover(3))
 
         legacy.delete_book(1)
         old.delete_book(1)

From 76045d2a5490addb8d0e7e79a2af326e91864d82 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 15:25:30 +0530
Subject: [PATCH 0235/1154] categories API

---
 src/calibre/db/cache.py        | 14 ++++++++++++++
 src/calibre/db/fields.py       | 10 ++++++++++
 src/calibre/db/legacy.py       |  3 +++
 src/calibre/db/tests/legacy.py |  2 ++
 4 files changed, 29 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d9dda41aa3..82dd762077 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -401,6 +401,12 @@ class Cache(object):
     def get_item_name(self, field, item_id):
         return self.fields[field].table.id_map[item_id]
 
+    @read_api
+    def get_item_id(self, field, item_name):
+        ' Return the item id for item_name (case-insensitive) '
+        rmap = {icu_lower(v) if isinstance(v, unicode) else v:k for k, v in self.fields[field].table.id_map.iteritems()}
+        return rmap.get(icu_lower(item_name) if isinstance(item_name, unicode) else item_name, None)
+
     @read_api
     def author_data(self, author_ids=None):
         '''
@@ -1413,6 +1419,14 @@ class Cache(object):
     def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None):
         return self.backend.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
 
+    @read_api
+    def get_books_for_category(self, category, item_id_or_composite_value):
+        f = self.fields[category]
+        if hasattr(f, 'get_books_for_val'):
+            # Composite field
+            return f.get_books_for_val(item_id_or_composite_value, self._get_metadata, self._all_book_ids())
+        return self._books_for_field(f.name, item_id_or_composite_value)
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index dd0165b44e..e028ff5d99 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -211,6 +211,16 @@ class CompositeField(OneToOneField):
             ans.append(c)
         return ans
 
+    def get_books_for_val(self, value, get_metadata, book_ids):
+        is_multiple = self.table.metadata['is_multiple'].get('cache_to_list', None)
+        ans = set()
+        for book_id in book_ids:
+            val = self.get_value_with_cache(book_id, get_metadata)
+            vals = {x.strip() for x in val.split(is_multiple)} if is_multiple else [val]
+            if value in vals:
+                ans.add(book_id)
+        return ans
+
 class OnDeviceField(OneToOneField):
 
     def __init__(self, name, table):
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b079c776bb..f7cab21baf 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -717,10 +717,13 @@ LibraryDatabase.format_hash = MT(lambda self, book_id, fmt:self.new_api.format_h
 LibraryDatabase.index = MT(lambda self, book_id, cache=False:self.data.id_to_index(book_id))
 LibraryDatabase.has_cover = MT(lambda self, book_id:self.new_api.field_for('cover', book_id))
 LibraryDatabase.get_tags = MT(lambda self, book_id:set(self.new_api.field_for('tags', book_id)))
+LibraryDatabase.get_categories = MT(lambda self, sort='name', ids=None, icon_map=None:self.new_api.get_categories(sort=sort, book_ids=ids, icon_map=icon_map))
 LibraryDatabase.get_identifiers = MT(
     lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.id(index)))
 LibraryDatabase.isbn = MT(
     lambda self, index, index_is_id=False: self.get_identifiers(index, index_is_id=index_is_id).get('isbn', None))
+LibraryDatabase.get_books_for_category = MT(
+    lambda self, category, id_:self.new_api.get_books_for_category(category, id_))
 # }}}
 
 # Legacy setter API {{{
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 091d344e2d..936eb12e44 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -161,10 +161,12 @@ class LegacyTest(BaseTest):
         from datetime import timedelta
         ndb = self.init_legacy(self.cloned_library)
         db = self.init_old()
+        newstag = ndb.new_api.get_item_id('tags', 'news')
 
         self.assertEqual(dict(db.prefs), dict(ndb.prefs))
 
         for meth, args in {
+            'get_books_for_category': [('tags', newstag), ('#formats', 'FMT1')],
             'get_next_series_num_for': [('A Series One',)],
             'get_id_from_uuid':[('ddddd',), (db.uuid(1, True),)],
             'cover':[(0,), (1,), (2,)],

From 51620932a80ad8f5cd19245542efb8e396423ad2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 16:33:24 +0530
Subject: [PATCH 0236/1154] Format manipulation API

---
 src/calibre/db/cache.py            | 25 +++++++++++++++++++++++++
 src/calibre/db/legacy.py           | 22 ++++++++++++++++++++++
 src/calibre/db/tests/add_remove.py | 17 +++++++++++++++++
 src/calibre/db/tests/legacy.py     | 21 +++++++++++++++++++--
 src/calibre/library/database2.py   |  2 ++
 5 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 82dd762077..46dc5df6d7 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -607,6 +607,31 @@ class Cache(object):
             return False
         return self.backend.has_format(book_id, fmt, name, path)
 
+    @api
+    def save_original_format(self, book_id, fmt):
+        fmt = fmt.upper()
+        if 'ORIGINAL' in fmt:
+            raise ValueError('Cannot save original of an original fmt')
+        fmtfile = self.format(book_id, fmt, as_file=True)
+        if fmtfile is None:
+            return False
+        with fmtfile:
+            nfmt = 'ORIGINAL_'+fmt
+            return self.add_format(book_id, nfmt, fmtfile, run_hooks=False)
+
+    @api
+    def restore_original_format(self, book_id, original_fmt):
+        original_fmt = original_fmt.upper()
+        fmtfile = self.format(book_id, original_fmt, as_file=True)
+        if fmtfile is not None:
+            fmt = original_fmt.partition('_')[2]
+            with self.write_lock:
+                with fmtfile:
+                    self._add_format(book_id, fmt, fmtfile, run_hooks=False)
+                self._remove_formats({book_id:(original_fmt,)})
+                return True
+        return False
+
     @read_api
     def formats(self, book_id, verify_formats=True):
         '''
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index f7cab21baf..aeab6e3de0 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -674,6 +674,28 @@ class LibraryDatabase(object):
         if notify:
             self.notify('cover', [book_id])
 
+    def original_fmt(self, book_id, fmt):
+        nfmt = ('ORIGINAL_%s'%fmt).upper()
+        return nfmt if self.new_api.has_format(book_id, nfmt) else fmt
+
+    def save_original_format(self, book_id, fmt, notify=True):
+        ret = self.new_api.save_original_format(book_id, fmt)
+        if ret and notify:
+            self.notify('metadata', [book_id])
+        return ret
+
+    def restore_original_format(self, book_id, original_fmt, notify=True):
+        ret = self.new_api.restore_original_format(book_id, original_fmt)
+        if ret and notify:
+            self.notify('metadata', [book_id])
+        return ret
+
+    def remove_format(self, index, fmt, index_is_id=False, notify=True, commit=True, db_only=False):
+        book_id = index if index_is_id else self.id(index)
+        self.new_api.remove_formats({book_id:(fmt,)}, db_only=db_only)
+        if notify:
+            self.notify('metadata', [book_id])
+
     # Private interface {{{
     def __iter__(self):
         for row in self.data.iterall():
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index 76349df1c5..0047a0ec4f 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -251,4 +251,21 @@ class AddRemoveTest(BaseTest):
 
     # }}}
 
+    def test_original_fmt(self):  # {{{
+        ' Test management of original fmt '
+        af, ae, at = self.assertFalse, self.assertEqual, self.assertTrue
+        db = self.init_cache()
+        fmts = db.formats(1)
+        af(db.has_format(1, 'ORIGINAL_FMT1'))
+        at(db.save_original_format(1, 'FMT1'))
+        at(db.has_format(1, 'ORIGINAL_FMT1'))
+        raw = db.format(1, 'FMT1')
+        ae(raw, db.format(1, 'ORIGINAL_FMT1'))
+        db.add_format(1, 'FMT1', BytesIO(b'replacedfmt'))
+        self.assertNotEqual(db.format(1, 'FMT1'), db.format(1, 'ORIGINAL_FMT1'))
+        at(db.restore_original_format(1, 'ORIGINAL_FMT1'))
+        ae(raw, db.format(1, 'FMT1'))
+        af(db.has_format(1, 'ORIGINAL_FMT1'))
+        ae(set(fmts), set(db.formats(1, verify_formats=False)))
+    # }}}
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 936eb12e44..e37d954225 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -49,10 +49,10 @@ def run_funcs(self, db, ndb, funcs):
             meth(*args)
         else:
             fmt = lambda x:x
-            if meth[0] in {'!', '@', '#', '+', '$', '-'}:
+            if meth[0] in {'!', '@', '#', '+', '$', '-', '%'}:
                 if meth[0] != '+':
                     fmt = {'!':dict, '@':lambda x:frozenset(x or ()), '#':lambda x:set((x or '').split(',')),
-                           '$':lambda x:set(tuple(y) for y in x), '-':lambda x:None}[meth[0]]
+                           '$':lambda x:set(tuple(y) for y in x), '-':lambda x:None, '%':lambda x: set((x or '').split(','))}[meth[0]]
                 else:
                     fmt = args[-1]
                     args = args[:-1]
@@ -357,6 +357,10 @@ class LegacyTest(BaseTest):
         self.assertEqual(legacy.cover(3, index_is_id=True), origcov)
         self.assertTrue(legacy.has_cover(3))
 
+        self.assertTrue(legacy.format(1, 'FMT1', index_is_id=True))
+        legacy.remove_format(1, 'FMT1', index_is_id=True)
+        self.assertIsNone(legacy.format(1, 'FMT1', index_is_id=True))
+
         legacy.delete_book(1)
         old.delete_book(1)
         self.assertNotIn(1, legacy.all_ids())
@@ -726,3 +730,16 @@ class LegacyTest(BaseTest):
         self.assertRaises(KeyError, ndb.custom_field_name, num=num)
     # }}}
 
+    def test_legacy_original_fmt(self):  # {{{
+        db, ndb = self.init_old(), self.init_legacy()
+        run_funcs(self, db, ndb, (
+            ('original_fmt', 1, 'FMT1'),
+            ('save_original_format', 1, 'FMT1'),
+            ('original_fmt', 1, 'FMT1'),
+            ('restore_original_format', 1, 'ORIGINAL_FMT1'),
+            ('original_fmt', 1, 'FMT1'),
+            ('%formats', 1, True),
+        ))
+        db.close()
+
+    # }}}
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index b61544f172..4ccba4d9fc 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -1570,6 +1570,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             with lopen(opath, 'rb') as f:
                 self.add_format(book_id, fmt, f, index_is_id=True, notify=False)
             self.remove_format(book_id, original_fmt, index_is_id=True, notify=notify)
+            return True
+        return False
 
     def delete_book(self, id, notify=True, commit=True, permanent=False,
             do_clean=True):

From 6298b1d0591cd12cb86d9e3214430bdacb3f442f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jul 2013 16:35:21 +0530
Subject: [PATCH 0237/1154] ...

---
 src/calibre/db/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 99154ad618..47ceb996ea 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -113,5 +113,7 @@ Various things that require other things before they can be migrated:
     3. Port library/restore.py
     4. Replace the metadatabackup thread with the new implementation when using the new backend.
     5. grep the sources for TODO
-    6. Check that content server reloading on metadata,db change, metadata backup, refresh gui on calibredb add all work
+    6. Check that content server reloading on metadata,db change, metadata
+    backup, refresh gui on calibredb add and moving libraries all work (check
+    them on windows as well for file locking issues)
 '''

From 54054c1c9fde8bd14f80dc2cd564bbc258a85341 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 09:07:04 +0530
Subject: [PATCH 0238/1154] Allow using non-ascii chars in email passwords

Fixes #1202825 [SMTP password with special characters not stored correctly](https://bugs.launchpad.net/calibre/+bug/1202825)
---
 src/calibre/gui2/email.py             | 2 +-
 src/calibre/gui2/wizard/send_email.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 665b19cc5a..6645441158 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -113,7 +113,7 @@ class Sendmail(object):
                         verbose=1,
                         relay=opts.relay_host,
                         username=opts.relay_username,
-                        password=unhexlify(opts.relay_password), port=opts.relay_port,
+                        password=unhexlify(opts.relay_password).decode('utf-8'), port=opts.relay_port,
                         encryption=opts.encryption,
                         debug_output=log.debug)
         finally:
diff --git a/src/calibre/gui2/wizard/send_email.py b/src/calibre/gui2/wizard/send_email.py
index 0dc6861116..b183af1744 100644
--- a/src/calibre/gui2/wizard/send_email.py
+++ b/src/calibre/gui2/wizard/send_email.py
@@ -32,7 +32,7 @@ class TestEmail(QDialog, TE_Dialog):
             self.to.setText(pa)
         if opts.relay_host:
             self.label.setText(_('Using: %(un)s:%(pw)s@%(host)s:%(port)s and %(enc)s encryption')%
-                    dict(un=opts.relay_username, pw=unhexlify(opts.relay_password),
+                    dict(un=opts.relay_username, pw=unhexlify(opts.relay_password).decode('utf-8'),
                         host=opts.relay_host, port=opts.relay_port, enc=opts.encryption))
 
     def test(self, *args):
@@ -129,7 +129,7 @@ class SendEmail(QWidget, Ui_Form):
             self.relay_username.setText(opts.relay_username)
         self.relay_username.textChanged.connect(self.changed)
         if opts.relay_password:
-            self.relay_password.setText(unhexlify(opts.relay_password))
+            self.relay_password.setText(unhexlify(opts.relay_password).decode('utf-8'))
         self.relay_password.textChanged.connect(self.changed)
         getattr(self, 'relay_'+opts.encryption.lower()).setChecked(True)
         self.relay_tls.toggled.connect(self.changed)
@@ -169,7 +169,7 @@ class SendEmail(QWidget, Ui_Form):
             sendmail(msg, from_=opts.from_, to=[to],
                 verbose=3, timeout=30, relay=opts.relay_host,
                 username=opts.relay_username,
-                password=unhexlify(opts.relay_password),
+                password=unhexlify(opts.relay_password).decode('utf-8'),
                 encryption=opts.encryption, port=opts.relay_port)
         except:
             import traceback
@@ -248,7 +248,7 @@ class SendEmail(QWidget, Ui_Form):
         conf.set('relay_host', host if host else None)
         conf.set('relay_port', self.relay_port.value())
         conf.set('relay_username', username if username else None)
-        conf.set('relay_password', hexlify(password))
+        conf.set('relay_password', hexlify(password.encode('utf-8')))
         conf.set('encryption', enc_method)
         return True
 

From dc3dde863a7607ef74471e5113b0092e32fc239a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 09:21:33 +0530
Subject: [PATCH 0239/1154] Update Galaxy's Edge

---
 recipes/galaxys_edge.recipe | 47 +++----------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/recipes/galaxys_edge.recipe b/recipes/galaxys_edge.recipe
index e6e1dd7475..4406db4620 100644
--- a/recipes/galaxys_edge.recipe
+++ b/recipes/galaxys_edge.recipe
@@ -14,19 +14,12 @@ class GalaxyEdge(BasicNewsRecipe):
 
     auto_cleanup = True
 
-    #keep_only_tags = [dict(id='content')]
-    #remove_tags = [dict(attrs={'class':['article-links', 'breadcr']}),
-            #dict(id=['email-section', 'right-column', 'printfooter', 'topover',
-                     #'slidebox', 'th_footer'])]
-
     extra_css = '.photo-caption { font-size: smaller }'
 
     def parse_index(self):
         soup = self.index_to_soup('http://www.galaxysedge.com/')
-        main = soup.find('table', attrs={'width':'911'})
-        toc = main.find('td', attrs={'width':'225'})
-
-
+        main = soup.find('table', attrs={'width':'944'})
+        toc = main.find('td', attrs={'width':'204'})
 
         current_section = None
         current_articles = []
@@ -68,41 +61,7 @@ class GalaxyEdge(BasicNewsRecipe):
                     current_articles.append({'title': title, 'url':url,
                         'description':'', 'date':''})
             if current_articles and current_section:
-                 feeds.append((current_section, current_articles))
+                feeds.append((current_section, current_articles))
 
         return feeds
 
-
-
-
-    #def preprocess_raw_html(self, raw, url):
-        #return raw.replace('<body><p>', '<p>').replace('</p></body>', '</p>')
-
-    #def postprocess_html(self, soup, first_fetch):
-        #for t in soup.findAll(['table', 'tr', 'td','center']):
-            #t.name = 'div'
-        #return soup
-
-    #def parse_index(self):
-        #today = time.strftime('%Y-%m-%d')
-        #soup = self.index_to_soup(
-                #'http://www.thehindu.com/todays-paper/tp-index/?date=' + today)
-        #div = soup.find(id='left-column')
-        #feeds = []
-        #current_section = None
-        #current_articles = []
-        #for x in div.findAll(['h3', 'div']):
-            #if current_section and x.get('class', '') == 'tpaper':
-                #a = x.find('a', href=True)
-                #if a is not None:
-                    #current_articles.append({'url':a['href']+'?css=print',
-                        #'title':self.tag_to_string(a), 'date': '',
-                        #'description':''})
-            #if x.name == 'h3':
-                #if current_section and current_articles:
-                    #feeds.append((current_section, current_articles))
-                #current_section = self.tag_to_string(x)
-                #current_articles = []
-        #return feeds
-
-

From 161233430bc1186483fa54ef14f711eb3e1bb7a4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 09:29:26 +0530
Subject: [PATCH 0240/1154] version 0.9.40

---
 Changelog.yaml           | 49 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index db25f77a8d..2cbe422226 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,55 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.40
+  date: 2013-07-19
+
+  new features:
+    - title: "EPUB Output: Add an option to insert an inline Table of Contents into the main text."
+      tickets: [1201006]
+
+    - title: "Driver for LG Android phone"
+      tickets: [1202013]
+
+    - title: "When matching books in the library against the device manually, pre-fill the search field with the book title"
+      tickets: [1200826]
+ 
+  bug fixes:
+    - title: "PDF Input: Fix a regression that caused some images to be flipped when converting PDF files that use image rotation operators."
+      tickets: [1201083]
+
+    - title: "Fix regression that caused incorrect font size in dropcaps generated by the DOCX input plugin"
+
+    - title: "Get Books: Fix searching for title and author returning some extra matches, if the title starts with an article like the, a or an."
+      tickets: [1200012]
+
+    - title: "PDF Output: Fix extra blank page being inserted at the start of the chapter when converting some epub files from feedbooks"
+
+    - title: "PDF Output: Workaround bug in WebKit's getBoundingClientRect() method that could cause links to occasionally point to incorrect locations."
+      tickets: [1202390]
+
+    - title: "E-book viewer: Fix a bug that could cause the reported position to be incorrect immediately after opening a previously opened book. This also fixes the Back button not working if a link is clicked on the page immediately after opening the book."
+
+    - title: "Fix memory card not being detected for Elonex 621 on Windows"
+
+    - title: "Fix regression in last release that broke auto-conversion of ebooks when sending to device/sending by email."
+      tickets: [1200864]
+
+    - title: "Get Books: Update amazon plugins for website changes"
+
+    - title: "Allow using non-ascii chars in email passwords."
+      tickets: [1202825]
+
+  improved recipes:
+    - Galaxy's Edge
+
+  new recipes:
+    - title: Il Foglio 
+      author: faber1971
+
+    - title: Le Monde Diplomatique and Acrimed
+      author: Gaetan Lehmann
+
 - version: 0.9.39
   date: 2013-07-12
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 18b4e3d238..1e0b2a1a83 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 39)
+numeric_version = (0, 9, 40)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 669efdd6f69e775f3e386071032b54eb9a9ed2ae Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 10:44:46 +0530
Subject: [PATCH 0241/1154] get_data_as_dict()

---
 src/calibre/db/__init__.py       | 64 ++++++++++++++++++++++++++++++
 src/calibre/db/legacy.py         |  5 ++-
 src/calibre/db/tests/legacy.py   |  6 +++
 src/calibre/library/database2.py | 68 ++------------------------------
 4 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 47ceb996ea..a07fb8b5a3 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -54,6 +54,70 @@ def _get_series_values(val):
             pass
     return (val, None)
 
+def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None):
+    '''
+    Return all metadata stored in the database as a dict. Includes paths to
+    the cover and each format.
+
+    :param prefix: The prefix for all paths. By default, the prefix is the absolute path
+    to the library folder.
+    :param ids: Set of ids to return the data for. If None return data for
+    all entries in database.
+    '''
+    import os
+    from calibre.ebooks.metadata import authors_to_string
+    backend = getattr(self, 'backend', self)  # Works with both old and legacy interfaces
+    if prefix is None:
+        prefix = backend.library_path
+    fdata = backend.custom_column_num_map
+
+    FIELDS = set(['title', 'sort', 'authors', 'author_sort', 'publisher',
+        'rating', 'timestamp', 'size', 'tags', 'comments', 'series',
+        'series_index', 'uuid', 'pubdate', 'last_modified', 'identifiers',
+        'languages']).union(set(fdata))
+    for x, data in fdata.iteritems():
+        if data['datatype'] == 'series':
+            FIELDS.add('%d_index'%x)
+    data = []
+    for record in self.data:
+        if record is None:
+            continue
+        db_id = record[self.FIELD_MAP['id']]
+        if ids is not None and db_id not in ids:
+            continue
+        x = {}
+        for field in FIELDS:
+            x[field] = record[self.FIELD_MAP[field]]
+        data.append(x)
+        x['id'] = db_id
+        x['formats'] = []
+        isbn = self.isbn(db_id, index_is_id=True)
+        x['isbn'] = isbn if isbn else ''
+        if not x['authors']:
+            x['authors'] = _('Unknown')
+        x['authors'] = [i.replace('|', ',') for i in x['authors'].split(',')]
+        if authors_as_string:
+            x['authors'] = authors_to_string(x['authors'])
+        x['tags'] = [i.replace('|', ',').strip() for i in x['tags'].split(',')] if x['tags'] else []
+        path = os.path.join(prefix, self.path(record[self.FIELD_MAP['id']], index_is_id=True))
+        x['cover'] = os.path.join(path, 'cover.jpg')
+        if not record[self.FIELD_MAP['cover']]:
+            x['cover'] = None
+        formats = self.formats(record[self.FIELD_MAP['id']], index_is_id=True)
+        if formats:
+            for fmt in formats.split(','):
+                path = self.format_abspath(x['id'], fmt, index_is_id=True)
+                if path is None:
+                    continue
+                if prefix != self.library_path:
+                    path = os.path.relpath(path, self.library_path)
+                    path = os.path.join(prefix, path)
+                x['formats'].append(path)
+                x['fmt_'+fmt.lower()] = path
+            x['available_formats'] = [i.upper() for i in formats.split(',')]
+
+    return data
+
 '''
 Rewrite of the calibre database backend.
 
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index aeab6e3de0..9c6071283e 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -11,7 +11,7 @@ from future_builtins import zip
 
 from calibre import force_unicode, isbytestring
 from calibre.constants import preferred_encoding
-from calibre.db import _get_next_series_num_for_list, _get_series_values
+from calibre.db import _get_next_series_num_for_list, _get_series_values, get_data_as_dict
 from calibre.db.adding import (
     find_books_in_directory, import_book_directory_multiple,
     import_book_directory, recursive_import, add_catalog, add_news)
@@ -35,7 +35,6 @@ def cleanup_tags(tags):
             ans.append(tag)
     return ans
 
-
 class LibraryDatabase(object):
 
     ''' Emulate the old LibraryDatabase2 interface '''
@@ -746,6 +745,7 @@ LibraryDatabase.isbn = MT(
     lambda self, index, index_is_id=False: self.get_identifiers(index, index_is_id=index_is_id).get('isbn', None))
 LibraryDatabase.get_books_for_category = MT(
     lambda self, category, id_:self.new_api.get_books_for_category(category, id_))
+LibraryDatabase.get_data_as_dict = MT(get_data_as_dict)
 # }}}
 
 # Legacy setter API {{{
@@ -890,3 +890,4 @@ del MT
 
 
 
+
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index e37d954225..3e1165e3f2 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -246,6 +246,12 @@ class LegacyTest(BaseTest):
         db.copy_format_to(1, 'FMT1', d1, True)
         ndb.copy_format_to(1, 'FMT1', d2, True)
         self.assertTrue(d1.getvalue() == d2.getvalue())
+        old = db.get_data_as_dict(prefix='test-prefix')
+        new = ndb.get_data_as_dict(prefix='test-prefix')
+        for o, n in zip(old, new):
+            o = {type('')(k) if isinstance(k, bytes) else k:set(v) if isinstance(v, list) else v for k, v in o.iteritems()}
+            n = {k:set(v) if isinstance(v, list) else v for k, v in n.iteritems()}
+            self.assertEqual(o, n)
         db.close()
         # }}}
 
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 4ccba4d9fc..e0cd9c613e 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -7,14 +7,14 @@ __docformat__ = 'restructuredtext en'
 The database used to store ebook metadata
 '''
 import os, sys, shutil, cStringIO, glob, time, functools, traceback, re, \
-        json, uuid, hashlib, copy
+        json, uuid, hashlib, copy, types
 from collections import defaultdict
 import threading, random
 from itertools import repeat
 
 from calibre import prints, force_unicode
 from calibre.ebooks.metadata import (title_sort, author_to_author_sort,
-        string_to_authors, authors_to_string, get_title_sort_pat)
+        string_to_authors, get_title_sort_pat)
 from calibre.ebooks.metadata.opf2 import metadata_to_opf
 from calibre.library.database import LibraryDatabase
 from calibre.library.field_metadata import FieldMetadata, TagsIcons
@@ -41,7 +41,7 @@ from calibre.ebooks import check_ebook_format
 from calibre.utils.magick.draw import save_cover_data_to
 from calibre.utils.recycle_bin import delete_file, delete_tree
 from calibre.utils.formatter_functions import load_user_template_functions
-from calibre.db import _get_next_series_num_for_list, _get_series_values
+from calibre.db import _get_next_series_num_for_list, _get_series_values, get_data_as_dict
 from calibre.db.adding import find_books_in_directory, import_book_directory_multiple, import_book_directory, recursive_import
 from calibre.db.errors import NoSuchFormat
 from calibre.db.lazy import FormatMetadata, FormatsList
@@ -135,6 +135,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             read_only=False, is_second_db=False, progress_callback=None,
             restore_all_prefs=False):
         self.is_second_db = is_second_db
+        self.get_data_as_dict = types.MethodType(get_data_as_dict, self, LibraryDatabase2)
         try:
             if isbytestring(library_path):
                 library_path = library_path.decode(filesystem_encoding)
@@ -3619,67 +3620,6 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         for i in iter(self):
             yield i[x]
 
-    def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None):
-        '''
-        Return all metadata stored in the database as a dict. Includes paths to
-        the cover and each format.
-
-        :param prefix: The prefix for all paths. By default, the prefix is the absolute path
-        to the library folder.
-        :param ids: Set of ids to return the data for. If None return data for
-        all entries in database.
-        '''
-        if prefix is None:
-            prefix = self.library_path
-        fdata = self.custom_column_num_map
-
-        FIELDS = set(['title', 'sort', 'authors', 'author_sort', 'publisher',
-            'rating', 'timestamp', 'size', 'tags', 'comments', 'series',
-            'series_index', 'uuid', 'pubdate', 'last_modified', 'identifiers',
-            'languages']).union(set(fdata))
-        for x, data in fdata.iteritems():
-            if data['datatype'] == 'series':
-                FIELDS.add('%d_index'%x)
-        data = []
-        for record in self.data:
-            if record is None:
-                continue
-            db_id = record[self.FIELD_MAP['id']]
-            if ids is not None and db_id not in ids:
-                continue
-            x = {}
-            for field in FIELDS:
-                x[field] = record[self.FIELD_MAP[field]]
-            data.append(x)
-            x['id'] = db_id
-            x['formats'] = []
-            isbn = self.isbn(db_id, index_is_id=True)
-            x['isbn'] = isbn if isbn else ''
-            if not x['authors']:
-                x['authors'] = _('Unknown')
-            x['authors'] = [i.replace('|', ',') for i in x['authors'].split(',')]
-            if authors_as_string:
-                x['authors'] = authors_to_string(x['authors'])
-            x['tags'] = [i.replace('|', ',').strip() for i in x['tags'].split(',')] if x['tags'] else []
-            path = os.path.join(prefix, self.path(record[self.FIELD_MAP['id']], index_is_id=True))
-            x['cover'] = os.path.join(path, 'cover.jpg')
-            if not record[self.FIELD_MAP['cover']]:
-                x['cover'] = None
-            formats = self.formats(record[self.FIELD_MAP['id']], index_is_id=True)
-            if formats:
-                for fmt in formats.split(','):
-                    path = self.format_abspath(x['id'], fmt, index_is_id=True)
-                    if path is None:
-                        continue
-                    if prefix != self.library_path:
-                        path = os.path.relpath(path, self.library_path)
-                        path = os.path.join(prefix, path)
-                    x['formats'].append(path)
-                    x['fmt_'+fmt.lower()] = path
-                x['available_formats'] = [i.upper() for i in formats.split(',')]
-
-        return data
-
     def migrate_old(self, db, progress):
         from PyQt4.QtCore import QCoreApplication
         header = _(u'<p>Migrating old database to ebook library in %s<br><center>')%self.library_path

From 34704c9735c1ce8a1d29ea580e205d19b28807e7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 11:37:46 +0530
Subject: [PATCH 0242/1154] find_identical_books()

---
 src/calibre/db/cache.py        | 62 +++++++++++++++++++++++++++++++---
 src/calibre/db/legacy.py       |  1 +
 src/calibre/db/search.py       | 10 +++---
 src/calibre/db/tests/legacy.py |  1 +
 4 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 46dc5df6d7..19e8d52134 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, traceback, random, shutil
+import os, traceback, random, shutil, re
 from io import BytesIO
 from collections import defaultdict
 from functools import wraps, partial
@@ -25,7 +25,7 @@ from calibre.db.tables import VirtualTable
 from calibre.db.write import get_series_values
 from calibre.db.lazy import FormatMetadata, FormatsList
 from calibre.ebooks import check_ebook_format
-from calibre.ebooks.metadata import string_to_authors, author_to_author_sort
+from calibre.ebooks.metadata import string_to_authors, author_to_author_sort, get_title_sort_pat
 from calibre.ebooks.metadata.book.base import Metadata
 from calibre.ebooks.metadata.opf2 import metadata_to_opf
 from calibre.ptempfile import (base_dir, PersistentTemporaryFile,
@@ -767,9 +767,8 @@ class Cache(object):
             return sorted(all_book_ids, key=partial(SortKey, fields, sort_keys))
 
     @read_api
-    def search(self, query, restriction, virtual_fields=None):
-        return self._search_api(self, query, restriction,
-                                virtual_fields=virtual_fields)
+    def search(self, query, restriction='', virtual_fields=None, book_ids=None):
+        return self._search_api(self, query, restriction, virtual_fields=virtual_fields, book_ids=book_ids)
 
     @read_api
     def get_categories(self, sort='name', book_ids=None, icon_map=None):
@@ -1452,6 +1451,59 @@ class Cache(object):
             return f.get_books_for_val(item_id_or_composite_value, self._get_metadata, self._all_book_ids())
         return self._books_for_field(f.name, item_id_or_composite_value)
 
+    @read_api
+    def find_identical_books(self, mi, search_restriction='', book_ids=None):
+        ''' Finds books that have a superset of the authors in mi and the same
+        title (title is fuzzy matched) '''
+        fuzzy_title_patterns = [(re.compile(pat, re.IGNORECASE) if
+            isinstance(pat, basestring) else pat, repl) for pat, repl in
+                [
+                    (r'[\[\](){}<>\'";,:#]', ''),
+                    (get_title_sort_pat(), ''),
+                    (r'[-._]', ' '),
+                    (r'\s+', ' ')
+                ]
+        ]
+
+        def fuzzy_title(title):
+            title = icu_lower(title.strip())
+            for pat, repl in fuzzy_title_patterns:
+                title = pat.sub(repl, title)
+            return title
+
+        identical_book_ids = set()
+        if mi.authors:
+            try:
+                quathors = mi.authors[:20]  # Too many authors causes parsing of
+                                            # the search expression to fail
+                query = ' and '.join('authors:"=%s"'%(a.replace('"', '')) for a in quathors)
+                qauthors = mi.authors[20:]
+            except ValueError:
+                return identical_book_ids
+            try:
+                book_ids = self._search(query, restriction=search_restriction, book_ids=book_ids)
+            except:
+                traceback.print_exc()
+                return identical_book_ids
+            if qauthors and book_ids:
+                matches = set()
+                qauthors = {icu_lower(x) for x in qauthors}
+                for book_id in book_ids:
+                    aut = self._field_for('authors', book_id)
+                    if aut:
+                        aut = {icu_lower(x) for x in aut}
+                        if aut.issuperset(qauthors):
+                            matches.add(book_id)
+                book_ids = matches
+
+            for book_id in book_ids:
+                fbook_title = self._field_for('title', book_id)
+                fbook_title = fuzzy_title(fbook_title)
+                mbook_title = fuzzy_title(mi.title)
+                if fbook_title == mbook_title:
+                    identical_book_ids.add(book_id)
+        return identical_book_ids
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 9c6071283e..48d1c8b78c 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -746,6 +746,7 @@ LibraryDatabase.isbn = MT(
 LibraryDatabase.get_books_for_category = MT(
     lambda self, category, id_:self.new_api.get_books_for_category(category, id_))
 LibraryDatabase.get_data_as_dict = MT(get_data_as_dict)
+LibraryDatabase.find_identical_books = MT(lambda self, mi:self.new_api.find_identical_books(mi))
 # }}}
 
 # Legacy setter API {{{
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 7b4ad90bc3..fbe1515920 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -661,7 +661,7 @@ class Search(object):
     def change_locations(self, newlocs):
         self.all_search_locations = newlocs
 
-    def __call__(self, dbcache, query, search_restriction, virtual_fields=None):
+    def __call__(self, dbcache, query, search_restriction, virtual_fields=None, book_ids=None):
         '''
         Return the set of ids of all records that match the specified
         query and restriction
@@ -674,17 +674,15 @@ class Search(object):
             if search_restriction:
                 q = u'(%s) and (%s)' % (search_restriction, query)
 
-        all_book_ids = dbcache._all_book_ids(type=set)
+        all_book_ids = dbcache._all_book_ids(type=set) if book_ids is None else set(book_ids)
         if not q:
             return all_book_ids
 
         if not isinstance(q, type(u'')):
             q = q.decode('utf-8')
 
-        # We construct a new parser instance per search as pyparsing is not
-        # thread safe. On my desktop, constructing a SearchQueryParser instance
-        # takes 0.000975 seconds and restoring it from a pickle takes
-        # 0.000974 seconds.
+        # We construct a new parser instance per search as the parse is not
+        # thread safe.
         sqp = Parser(
             dbcache, all_book_ids, dbcache._pref('grouped_search_terms'),
             self.date_search, self.num_search, self.bool_search,
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 3e1165e3f2..d3a672bee5 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -166,6 +166,7 @@ class LegacyTest(BaseTest):
         self.assertEqual(dict(db.prefs), dict(ndb.prefs))
 
         for meth, args in {
+            'find_identical_books': [(Metadata('title one', ['author one']),), (Metadata('unknown'),), (Metadata('xxxx'),)],
             'get_books_for_category': [('tags', newstag), ('#formats', 'FMT1')],
             'get_next_series_num_for': [('A Series One',)],
             'get_id_from_uuid':[('ddddd',), (db.uuid(1, True),)],

From 467dcf1a8711969358a7758c7c9a0e620a3d5b99 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 12:11:07 +0530
Subject: [PATCH 0243/1154] API coverage is now 100%

---
 src/calibre/db/backend.py          | 53 ++++++++++++++++++++++++++++++
 src/calibre/db/cache.py            | 12 +++++++
 src/calibre/db/legacy.py           |  2 ++
 src/calibre/db/tests/filesystem.py | 17 ++++++++++
 src/calibre/db/tests/legacy.py     |  1 +
 src/calibre/library/database2.py   |  6 ++--
 6 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index fc7d556dc0..4f33a917fa 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1452,6 +1452,59 @@ class DB(object):
         options = [(book_id, fmt.upper(), buffer(cPickle.dumps(data, -1))) for book_id, data in options.iteritems()]
         self.conn.executemany('INSERT OR REPLACE INTO conversion_options(book,format,data) VALUES (?,?,?)', options)
 
+    def get_top_level_move_items(self, all_paths):
+        items = set(os.listdir(self.library_path))
+        paths = set(all_paths)
+        paths.update({'metadata.db', 'metadata_db_prefs_backup.json'})
+        path_map = {x:x for x in paths}
+        if not self.is_case_sensitive:
+            for x in items:
+                path_map[x.lower()] = x
+            items = set(path_map)
+            paths = {x.lower() for x in paths}
+        items = items.intersection(paths)
+        return items, path_map
+
+    def move_library_to(self, all_paths, newloc, progress=lambda x: x):
+        if not os.path.exists(newloc):
+            os.makedirs(newloc)
+        old_dirs = set()
+        items, path_map = self.get_top_level_move_items(all_paths)
+        for x in items:
+            src = os.path.join(self.library_path, x)
+            dest = os.path.join(newloc, path_map[x])
+            if os.path.isdir(src):
+                if os.path.exists(dest):
+                    shutil.rmtree(dest)
+                shutil.copytree(src, dest)
+                old_dirs.add(src)
+            else:
+                if os.path.exists(dest):
+                    os.remove(dest)
+                shutil.copyfile(src, dest)
+            x = path_map[x]
+            if not isinstance(x, unicode):
+                x = x.decode(filesystem_encoding, 'replace')
+            progress(x)
+
+        dbpath = os.path.join(newloc, os.path.basename(self.dbpath))
+        opath = self.dbpath
+        self.conn.close()
+        self.library_path, self.dbpath = newloc, dbpath
+        if self._conn is not None:
+            self._conn.close()
+        self._conn = None
+        self.conn
+        try:
+            os.unlink(opath)
+        except:
+            pass
+        for loc in old_dirs:
+            try:
+                shutil.rmtree(loc)
+            except:
+                pass
+
    # }}}
 
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 19e8d52134..4faa819b42 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1504,6 +1504,18 @@ class Cache(object):
                     identical_book_ids.add(book_id)
         return identical_book_ids
 
+    @read_api
+    def get_top_level_move_items(self):
+        all_paths = {self._field_for('path', book_id).partition('/')[0] for book_id in self._all_book_ids()}
+        return self.backend.get_top_level_move_items(all_paths)
+
+    @write_api
+    def move_library_to(self, newloc, progress=None):
+        if progress is None:
+            progress = lambda x:x
+        all_paths = {self._field_for('path', book_id).partition('/')[0] for book_id in self._all_book_ids()}
+        self.backend.move_library_to(all_paths, newloc, progress=progress)
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 48d1c8b78c..97babb3b60 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -747,6 +747,7 @@ LibraryDatabase.get_books_for_category = MT(
     lambda self, category, id_:self.new_api.get_books_for_category(category, id_))
 LibraryDatabase.get_data_as_dict = MT(get_data_as_dict)
 LibraryDatabase.find_identical_books = MT(lambda self, mi:self.new_api.find_identical_books(mi))
+LibraryDatabase.get_top_level_move_items = MT(lambda self:self.new_api.get_top_level_move_items())
 # }}}
 
 # Legacy setter API {{{
@@ -878,6 +879,7 @@ for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
         return func
     setattr(LibraryDatabase, meth, MT(getter(meth)))
 
+LibraryDatabase.move_library_to = MT(lambda self, newloc, progress=None:self.new_api.move_library_to(newloc, progress=progress))
 # Cleaning is not required anymore
 LibraryDatabase.clean = LibraryDatabase.clean_custom = MT(lambda self:None)
 LibraryDatabase.clean_standard_field = MT(lambda self, field, commit=False:None)
diff --git a/src/calibre/db/tests/filesystem.py b/src/calibre/db/tests/filesystem.py
index 168eec53a4..c99f5ad512 100644
--- a/src/calibre/db/tests/filesystem.py
+++ b/src/calibre/db/tests/filesystem.py
@@ -79,4 +79,21 @@ class FilesystemTest(BaseTest):
         f.close()
         self.assertNotEqual(cache.field_for('title', 1), 'Moved', 'Title was changed despite file lock')
 
+    def test_library_move(self):
+        ' Test moving of library '
+        from calibre.ptempfile import TemporaryDirectory
+        cache = self.init_cache()
+        self.assertIn('metadata.db', cache.get_top_level_move_items()[0])
+        all_ids = cache.all_book_ids()
+        fmt1 = cache.format(1, 'FMT1')
+        cov = cache.cover(1)
+        with TemporaryDirectory('moved_lib') as tdir:
+            cache.move_library_to(tdir)
+            self.assertIn('moved_lib', cache.backend.library_path)
+            self.assertIn('moved_lib', cache.backend.dbpath)
+            cache.reload_from_db()
+            self.assertEqual(all_ids, cache.all_book_ids())
+            self.assertEqual(fmt1, cache.format(1, 'FMT1'))
+            self.assertEqual(cov, cache.cover(1))
+            cache.backend.close()
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index d3a672bee5..3e1a1457b3 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -167,6 +167,7 @@ class LegacyTest(BaseTest):
 
         for meth, args in {
             'find_identical_books': [(Metadata('title one', ['author one']),), (Metadata('unknown'),), (Metadata('xxxx'),)],
+            'get_top_level_move_items': [()],
             'get_books_for_category': [('tags', newstag), ('#formats', 'FMT1')],
             'get_next_series_num_for': [('A Series One',)],
             'get_id_from_uuid':[('ddddd',), (db.uuid(1, True),)],
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index e0cd9c613e..9022605024 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -3561,7 +3561,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             path = self.path(x, index_is_id=True)
             path = path.split(os.sep)[0]
             paths.add(path)
-        paths.add('metadata.db')
+        paths.update({'metadata.db', 'metadata_db_prefs_backup.json'})
         path_map = {}
         for x in paths:
             path_map[x] = x
@@ -3573,7 +3573,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         items = items.intersection(paths)
         return items, path_map
 
-    def move_library_to(self, newloc, progress=lambda x: x):
+    def move_library_to(self, newloc, progress=None):
+        if progress is None:
+            progress = lambda x:x
         if not os.path.exists(newloc):
             os.makedirs(newloc)
         old_dirs = set([])

From 72849dfee67665328ffab092382dd8a62369a304 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 12:12:14 +0530
Subject: [PATCH 0244/1154] ...

---
 src/calibre/db/tests/filesystem.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/filesystem.py b/src/calibre/db/tests/filesystem.py
index c99f5ad512..5367f62235 100644
--- a/src/calibre/db/tests/filesystem.py
+++ b/src/calibre/db/tests/filesystem.py
@@ -91,9 +91,9 @@ class FilesystemTest(BaseTest):
             cache.move_library_to(tdir)
             self.assertIn('moved_lib', cache.backend.library_path)
             self.assertIn('moved_lib', cache.backend.dbpath)
-            cache.reload_from_db()
-            self.assertEqual(all_ids, cache.all_book_ids())
             self.assertEqual(fmt1, cache.format(1, 'FMT1'))
             self.assertEqual(cov, cache.cover(1))
+            cache.reload_from_db()
+            self.assertEqual(all_ids, cache.all_book_ids())
             cache.backend.close()
 

From b60530fafef280db26467e1576c87186bd3b1078 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 13:28:27 +0530
Subject: [PATCH 0245/1154] Implement saved searches API

---
 src/calibre/db/cache.py                  | 12 ++++++++----
 src/calibre/db/legacy.py                 |  4 ++++
 src/calibre/db/search.py                 | 16 ++++++++++------
 src/calibre/db/tests/reading.py          |  2 --
 src/calibre/utils/search_query_parser.py |  7 ++++---
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 4faa819b42..c2d094eef0 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -89,7 +89,7 @@ class Cache(object):
         self.formatter_template_cache = {}
         self.dirtied_cache = {}
         self.dirtied_sequence = 0
-        self._search_api = Search(self.field_metadata.get_search_terms())
+        self._search_api = Search(self, 'saved_searches', self.field_metadata.get_search_terms())
 
         # Implement locking for all simple read/write API methods
         # An unlocked version of the method is stored with the name starting
@@ -127,9 +127,8 @@ class Cache(object):
                 except:
                     traceback.print_exc()
 
-        # TODO: Saved searches
-        # if len(saved_searches().names()):
-        #     self.field_metadata.add_search_category(label='search', name=_('Searches'))
+        if len(self._search_api.get_saved_searches().names()):
+            self.field_metadata.add_search_category(label='search', name=_('Searches'))
 
         self.field_metadata.add_grouped_search_terms(
                                     self._pref('grouped_search_terms', {}))
@@ -141,6 +140,11 @@ class Cache(object):
         if self.dirtied_cache:
             self.dirtied_sequence = max(self.dirtied_cache.itervalues())+1
 
+    @property
+    def prefs(self):
+        'For internal use only (used by SavedSearchQueries). For thread-safe access to the preferences, use the pref() and set_pref() methods.'
+        return self.backend.prefs
+
     @write_api
     def initialize_template_cache(self):
         self.formatter_template_cache = {}
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 97babb3b60..b938e7dddf 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -22,6 +22,7 @@ from calibre.db.categories import CATEGORY_SORTS
 from calibre.db.view import View
 from calibre.db.write import clean_identifier
 from calibre.utils.date import utcnow
+from calibre.utils.search_query_parser import set_saved_searches
 
 def cleanup_tags(tags):
     tags = [x.strip().replace(',', ';') for x in tags if x.strip()]
@@ -73,6 +74,9 @@ class LibraryDatabase(object):
 
         self.last_update_check = self.last_modified()
 
+        if not self.is_second_db:
+            set_saved_searches(self, 'saved_searches')
+
     def close(self):
         self.backend.close()
 
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index fbe1515920..013678e3b3 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -15,7 +15,7 @@ from calibre.utils.config_base import prefs
 from calibre.utils.date import parse_date, UNDEFINED_DATE, now
 from calibre.utils.icu import primary_find
 from calibre.utils.localization import lang_map, canonicalize_lang
-from calibre.utils.search_query_parser import SearchQueryParser, ParseException
+from calibre.utils.search_query_parser import SearchQueryParser, ParseException, SavedSearchQueries
 
 CONTAINS_MATCH = 0
 EQUALS_MATCH   = 1
@@ -392,7 +392,7 @@ class Parser(SearchQueryParser):
 
     def __init__(self, dbcache, all_book_ids, gst, date_search, num_search,
                  bool_search, keypair_search, limit_search_columns, limit_search_columns_to,
-                 locations, virtual_fields):
+                 locations, virtual_fields, get_saved_searches):
         self.dbcache, self.all_book_ids = dbcache, all_book_ids
         self.all_search_locations = frozenset(locations)
         self.grouped_search_terms = gst
@@ -403,7 +403,7 @@ class Parser(SearchQueryParser):
         self.virtual_fields = virtual_fields or {}
         if 'marked' not in self.virtual_fields:
             self.virtual_fields['marked'] = self
-        super(Parser, self).__init__(locations, optimize=True)
+        super(Parser, self).__init__(locations, optimize=True, get_saved_searches=get_saved_searches)
 
     @property
     def field_metadata(self):
@@ -651,12 +651,16 @@ class Parser(SearchQueryParser):
 
 class Search(object):
 
-    def __init__(self, all_search_locations=()):
+    def __init__(self, db, opt_name, all_search_locations=()):
         self.all_search_locations = all_search_locations
         self.date_search = DateSearch()
         self.num_search = NumericSearch()
         self.bool_search = BooleanSearch()
         self.keypair_search = KeyPairSearch()
+        self.saved_searches = SavedSearchQueries(db, opt_name)
+
+    def get_saved_searches(self):
+        return self.saved_searches
 
     def change_locations(self, newlocs):
         self.all_search_locations = newlocs
@@ -689,11 +693,11 @@ class Search(object):
             self.keypair_search,
             prefs['limit_search_columns'],
             prefs['limit_search_columns_to'], self.all_search_locations,
-            virtual_fields)
+            virtual_fields, self.get_saved_searches)
 
         try:
             ret = sqp.parse(q)
         finally:
-            sqp.dbcache = None
+            sqp.dbcache = sqp.get_saved_searches = None
         return ret
 
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 24d80d33c7..fcf309ea66 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -149,8 +149,6 @@ class ReadingTest(BaseTest):
             '#tags':[3, 2, 1],
             '#yesno':[3, 1, 2],
             '#comments':[3, 2, 1],
-            # TODO: Add an empty book to the db and ensure that empty
-            # fields sort the same as they do in db2
         }.iteritems():
             x = list(reversed(order))
             self.assertEqual(order, cache.multisort([(field, True)],
diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index 2682088681..dc2a7b51b8 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -40,7 +40,7 @@ class SavedSearchQueries(object):
             self.queries = {}
         try:
             self._db = weakref.ref(db)
-        except:
+        except TypeError:
             # db could be None
             self._db = lambda : None
 
@@ -292,9 +292,10 @@ class SearchQueryParser(object):
                 failed.append(test[0])
         return failed
 
-    def __init__(self, locations, test=False, optimize=False):
+    def __init__(self, locations, test=False, optimize=False, get_saved_searches=None):
         self.sqp_initialize(locations, test=test, optimize=optimize)
         self.parser = Parser()
+        self.get_saved_searches = saved_searches if get_saved_searches is None else get_saved_searches
 
     def sqp_change_locations(self, locations):
         self.sqp_initialize(locations, optimize=self.optimize)
@@ -367,7 +368,7 @@ class SearchQueryParser(object):
                     raise ParseException(_('Recursive saved search: {0}').format(query))
                 if self.recurse_level > 5:
                     self.searches_seen.add(query)
-                return self._parse(saved_searches().lookup(query), candidates)
+                return self._parse(self.get_saved_searches().lookup(query), candidates)
             except ParseException as e:
                 raise e
             except:  # convert all exceptions (e.g., missing key) to a parse error

From 437d5413062920b21e57a69399a93476515b3681 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 13:56:55 +0530
Subject: [PATCH 0246/1154] Migrate the rest of calibre to use the new saved
 searches API

---
 src/calibre/db/categories.py                    |  3 +--
 src/calibre/db/legacy.py                        |  3 +++
 src/calibre/gui2/dialogs/saved_search_editor.py |  3 ++-
 src/calibre/gui2/search_box.py                  |  6 +++++-
 src/calibre/gui2/search_restriction_mixin.py    |  4 +++-
 src/calibre/gui2/tag_browser/model.py           |  7 +++----
 src/calibre/gui2/tag_browser/view.py            |  2 +-
 src/calibre/gui2/ui.py                          | 10 ++++++++++
 src/calibre/library/cli.py                      |  4 +---
 src/calibre/library/database2.py                |  3 +++
 src/calibre/library/server/base.py              |  3 +--
 11 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/calibre/db/categories.py b/src/calibre/db/categories.py
index 3f7bbb9e61..df6c1402d2 100644
--- a/src/calibre/db/categories.py
+++ b/src/calibre/db/categories.py
@@ -16,7 +16,6 @@ from calibre.ebooks.metadata import author_to_author_sort
 from calibre.library.field_metadata import TagsIcons
 from calibre.utils.config_base import tweaks
 from calibre.utils.icu import sort_key
-from calibre.utils.search_query_parser import saved_searches
 
 CATEGORY_SORTS = ('name', 'popularity', 'rating')  # This has to be a tuple not a set
 
@@ -229,7 +228,7 @@ def get_categories(dbcache, sort='name', book_ids=None, icon_map=None):
     icon = None
     if icon_map and 'search' in icon_map:
         icon = icon_map['search']
-    ss = saved_searches()
+    ss = dbcache._search_api.get_saved_searches()
     for srch in ss.names():
         items.append(Tag(srch, tooltip=ss.lookup(srch),
                             sort=srch, icon=icon, category='search',
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b938e7dddf..838ccdfe21 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -120,6 +120,9 @@ class LibraryDatabase(object):
             self.new_api.reload_from_db()
         self.last_update_check = utcnow()
 
+    def get_saved_searches(self):
+        return self.new_api._search_api.get_saved_searches()
+
     @property
     def custom_column_num_map(self):
         return self.backend.custom_column_num_map
diff --git a/src/calibre/gui2/dialogs/saved_search_editor.py b/src/calibre/gui2/dialogs/saved_search_editor.py
index c9f843109a..669771e46e 100644
--- a/src/calibre/gui2/dialogs/saved_search_editor.py
+++ b/src/calibre/gui2/dialogs/saved_search_editor.py
@@ -7,7 +7,6 @@ from PyQt4.QtCore import SIGNAL
 from PyQt4.QtGui import QDialog
 
 from calibre.gui2.dialogs.saved_search_editor_ui import Ui_SavedSearchEditor
-from calibre.utils.search_query_parser import saved_searches
 from calibre.utils.icu import sort_key
 from calibre.gui2 import error_dialog
 from calibre.gui2.dialogs.confirm_delete import confirm
@@ -15,6 +14,7 @@ from calibre.gui2.dialogs.confirm_delete import confirm
 class SavedSearchEditor(QDialog, Ui_SavedSearchEditor):
 
     def __init__(self, parent, initial_search=None):
+        from calibre.gui2.ui import saved_searches
         QDialog.__init__(self, parent)
         Ui_SavedSearchEditor.__init__(self)
         self.setupUi(self)
@@ -98,6 +98,7 @@ class SavedSearchEditor(QDialog, Ui_SavedSearchEditor):
             self.search_text.setPlainText('')
 
     def accept(self):
+        from calibre.gui2.ui import saved_searches
         if self.current_search_name:
             self.searches[self.current_search_name] = unicode(self.search_text.toPlainText())
         for name in saved_searches().names():
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 85ddf533c4..b10fdd40ef 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -18,7 +18,6 @@ from calibre.gui2 import config, error_dialog
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.dialogs.saved_search_editor import SavedSearchEditor
 from calibre.gui2.dialogs.search import SearchDialog
-from calibre.utils.search_query_parser import saved_searches
 
 class SearchLineEdit(QLineEdit):  # {{{
     key_pressed = pyqtSignal(object)
@@ -309,6 +308,7 @@ class SavedSearchBox(QComboBox):  # {{{
             self.saved_search_selected(self.currentText())
 
     def saved_search_selected(self, qname):
+        from calibre.gui2.ui import saved_searches
         qname = unicode(qname)
         if qname is None or not qname.strip():
             self.search_box.clear()
@@ -322,12 +322,14 @@ class SavedSearchBox(QComboBox):  # {{{
         self.setToolTip(saved_searches().lookup(qname))
 
     def initialize_saved_search_names(self):
+        from calibre.gui2.ui import saved_searches
         qnames = saved_searches().names()
         self.addItems(qnames)
         self.setCurrentIndex(-1)
 
     # SIGNALed from the main UI
     def save_search_button_clicked(self):
+        from calibre.gui2.ui import saved_searches
         name = unicode(self.currentText())
         if not name.strip():
             name = unicode(self.search_box.text()).replace('"', '')
@@ -346,6 +348,7 @@ class SavedSearchBox(QComboBox):  # {{{
         self.changed.emit()
 
     def delete_current_search(self):
+        from calibre.gui2.ui import saved_searches
         idx = self.currentIndex()
         if idx <= 0:
             error_dialog(self, _('Delete current search'),
@@ -365,6 +368,7 @@ class SavedSearchBox(QComboBox):  # {{{
 
     # SIGNALed from the main UI
     def copy_search_button_clicked(self):
+        from calibre.gui2.ui import saved_searches
         idx = self.currentIndex()
         if idx < 0:
             return
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index b986a2a78e..71e0f2f392 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -17,7 +17,6 @@ from calibre.gui2.widgets import ComboBoxWithHelp
 from calibre.utils.config_base import tweaks
 from calibre.utils.icu import sort_key
 from calibre.utils.search_query_parser import ParseException
-from calibre.utils.search_query_parser import saved_searches
 
 class SelectNames(QDialog):  # {{{
 
@@ -179,6 +178,7 @@ class CreateVirtualLibrary(QDialog):  # {{{
         self.resize(self.sizeHint()+QSize(150, 25))
 
     def search_text_changed(self, txt):
+        from calibre.gui2.ui import saved_searches
         searches = [_('Saved searches recognized in the expression:')]
         txt = unicode(txt)
         while txt:
@@ -234,6 +234,7 @@ class CreateVirtualLibrary(QDialog):  # {{{
         self.vl_text.setText(self.original_search)
 
     def link_activated(self, url):
+        from calibre.gui2.ui import saved_searches
         db = self.gui.current_db
         f, txt = unicode(url).partition('.')[0::2]
         if f == 'search':
@@ -475,6 +476,7 @@ class SearchRestrictionMixin(object):
         return name[0:MAX_VIRTUAL_LIBRARY_NAME_LENGTH].strip()
 
     def build_search_restriction_list(self):
+        from calibre.gui2.ui import saved_searches
         m = self.ar_menu
         m.clear()
 
diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py
index 33d1235f8b..7dba7cfe7d 100644
--- a/src/calibre/gui2/tag_browser/model.py
+++ b/src/calibre/gui2/tag_browser/model.py
@@ -21,7 +21,6 @@ from calibre.utils.icu import sort_key, lower, strcmp, collation_order
 from calibre.library.field_metadata import TagsIcons, category_icon_map
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.utils.formatter import EvalFormatter
-from calibre.utils.search_query_parser import saved_searches
 
 TAG_SEARCH_STATES = {'clear': 0, 'mark_plus': 1, 'mark_plusplus': 2,
                      'mark_minus': 3, 'mark_minusminus': 4}
@@ -879,7 +878,7 @@ class TagsModel(QAbstractItemModel): # {{{
                     traceback.print_exc()
         self.db.data.change_search_locations(self.db.field_metadata.get_search_terms())
 
-        if len(saved_searches().names()):
+        if len(self.db.get_saved_searches().names()):
             tb_cats.add_search_category(label='search', name=_('Searches'))
 
         if self.filter_categories_by:
@@ -1005,11 +1004,11 @@ class TagsModel(QAbstractItemModel): # {{{
                         _('Author names cannot contain & characters.')).exec_()
                 return False
         if key == 'search':
-            if val in saved_searches().names():
+            if val in self.db.get_saved_searches().names():
                 error_dialog(self.gui_parent, _('Duplicate search name'),
                     _('The saved search name %s is already used.')%val).exec_()
                 return False
-            saved_searches().rename(unicode(item.data(role).toString()), val)
+            self.db.get_saved_searches().rename(unicode(item.data(role).toString()), val)
             item.tag.name = val
             self.search_item_renamed.emit() # Does a refresh
         else:
diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py
index cefa0f8975..d28b7ca848 100644
--- a/src/calibre/gui2/tag_browser/view.py
+++ b/src/calibre/gui2/tag_browser/view.py
@@ -20,7 +20,6 @@ from calibre.constants import config_dir
 from calibre.gui2.tag_browser.model import (TagTreeItem, TAG_SEARCH_STATES,
         TagsModel)
 from calibre.gui2 import config, gprefs, choose_files, pixmap_to_data
-from calibre.utils.search_query_parser import saved_searches
 from calibre.utils.icu import sort_key
 
 class TagDelegate(QStyledItemDelegate): # {{{
@@ -355,6 +354,7 @@ class TagsView(QTreeView): # {{{
                 self.delete_user_category.emit(key)
                 return
             if action == 'delete_search':
+                from calibre.gui2.ui import saved_searches
                 saved_searches().delete(key)
                 self.rebuild_saved_searches.emit()
                 return
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 229ed0933d..e54d06e671 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -98,6 +98,16 @@ _gui = None
 def get_gui():
     return _gui
 
+def saved_searches():
+    'Return the saved searches defined in the currently open library'
+    try:
+        return _gui.library_view.model().db.get_saved_searches()
+    except AttributeError:
+        # Happens during initialization of the gui
+        from calibre.utils.search_query_parser import saved_searches
+        return saved_searches()
+
+
 class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         TagBrowserMixin, CoverFlowMixin, LibraryViewMixin, SearchBoxMixin,
         SavedSearchBoxMixin, SearchRestrictionMixin, LayoutMixin, UpdateMixin,
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 547cc5bc08..7e7a234724 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -1028,10 +1028,8 @@ def command_saved_searches(args, dbpath):
         print
         prints(_('Error: You must specify an action (add|remove|list)'), file=sys.stderr)
         return 1
-    from calibre.utils.search_query_parser import saved_searches
     db = get_db(dbpath, opts)
-    db
-    ss = saved_searches()
+    ss = db.get_saved_searches()
     if args[0] == 'list':
         for name in ss.names():
             prints(_('Name:'), name)
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 9022605024..8ea7e75b59 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -537,6 +537,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         if self.user_version == 0:
             self.user_version = 1
 
+    def get_saved_searches(self):
+        return saved_searches()
+
     def last_modified(self):
         ''' Return last modified time as a UTC datetime object'''
         return utcfromtimestamp(os.stat(self.dbpath).st_mtime)
diff --git a/src/calibre/library/server/base.py b/src/calibre/library/server/base.py
index bbd5239b42..a677b991f9 100644
--- a/src/calibre/library/server/base.py
+++ b/src/calibre/library/server/base.py
@@ -25,7 +25,6 @@ from calibre.library.server.opds import OPDSServer
 from calibre.library.server.cache import Cache
 from calibre.library.server.browse import BrowseServer
 from calibre.library.server.ajax import AjaxServer
-from calibre.utils.search_query_parser import saved_searches
 from calibre import prints, as_unicode
 
 
@@ -210,7 +209,7 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
         if sr:
             if sr in virt_libs:
                 sr = virt_libs[sr]
-            elif sr not in saved_searches().names():
+            elif sr not in self.db.get_saved_searches().names():
                 prints('WARNING: Content server: search restriction ',
                        sr, ' does not exist')
                 sr = ''

From 96d3c4d2325cf730a2aae954cc8a2a6312fa4d28 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 17:07:40 +0530
Subject: [PATCH 0247/1154] Refactor saved search API to make it thread safe

---
 src/calibre/db/backend.py                     | 30 ++------
 src/calibre/db/cache.py                       | 35 +++++++--
 src/calibre/db/categories.py                  |  9 +--
 src/calibre/db/legacy.py                      |  9 ++-
 src/calibre/db/search.py                      | 76 +++++++++++++++++--
 src/calibre/db/tests/legacy.py                | 21 +++++
 .../gui2/dialogs/saved_search_editor.py       | 18 ++---
 src/calibre/gui2/search_box.py                | 37 +++++----
 src/calibre/gui2/search_restriction_mixin.py  | 15 ++--
 src/calibre/gui2/tag_browser/model.py         |  6 +-
 src/calibre/gui2/tag_browser/view.py          |  3 +-
 src/calibre/gui2/ui.py                        | 12 +--
 src/calibre/library/cli.py                    |  9 +--
 src/calibre/library/database2.py              | 19 ++++-
 src/calibre/library/server/base.py            |  2 +-
 src/calibre/utils/search_query_parser.py      | 14 +++-
 16 files changed, 213 insertions(+), 102 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 4f33a917fa..3241493af1 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -70,6 +70,10 @@ class DBPrefs(dict):  # {{{
         self.db = db
         self.defaults = {}
         self.disable_setting = False
+        self.load_from_db()
+
+    def load_from_db(self):
+        self.clear()
         for key, val in self.db.conn.get('SELECT key,val FROM preferences'):
             try:
                 val = self.raw_to_object(val)
@@ -136,28 +140,10 @@ class DBPrefs(dict):  # {{{
 
     @classmethod
     def read_serialized(cls, library_path, recreate_prefs=False):
-        try:
-            from_filename = os.path.join(library_path,
-                    'metadata_db_prefs_backup.json')
-            with open(from_filename, "rb") as f:
-                d = json.load(f, object_hook=from_json)
-                if not recreate_prefs:
-                    return d
-                cls.clear()
-                cls.db.conn.execute('DELETE FROM preferences')
-                for k,v in d.iteritems():
-                    raw = cls.to_raw(v)
-                    cls.db.conn.execute(
-                        'INSERT INTO preferences (key,val) VALUES (?,?)', (k, raw))
-                cls.db.conn.commit()
-                cls.clear()
-                cls.update(d)
-                return d
-        except:
-            import traceback
-            traceback.print_exc()
-            raise
-        return None
+        from_filename = os.path.join(library_path,
+                'metadata_db_prefs_backup.json')
+        with open(from_filename, "rb") as f:
+            return json.load(f, object_hook=from_json)
 # }}}
 
 # Extra collators {{{
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index c2d094eef0..ce8ce288ea 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -89,7 +89,6 @@ class Cache(object):
         self.formatter_template_cache = {}
         self.dirtied_cache = {}
         self.dirtied_sequence = 0
-        self._search_api = Search(self, 'saved_searches', self.field_metadata.get_search_terms())
 
         # Implement locking for all simple read/write API methods
         # An unlocked version of the method is stored with the name starting
@@ -105,6 +104,7 @@ class Cache(object):
                 lock = self.read_lock if ira else self.write_lock
                 setattr(self, name, wrap_simple(lock, func))
 
+        self._search_api = Search(self, 'saved_searches', self.field_metadata.get_search_terms())
         self.initialize_dynamic()
 
     @write_api
@@ -127,7 +127,7 @@ class Cache(object):
                 except:
                     traceback.print_exc()
 
-        if len(self._search_api.get_saved_searches().names()):
+        if len(self._search_api.saved_searches.names()) > 0:
             self.field_metadata.add_search_category(label='search', name=_('Searches'))
 
         self.field_metadata.add_grouped_search_terms(
@@ -140,11 +140,6 @@ class Cache(object):
         if self.dirtied_cache:
             self.dirtied_sequence = max(self.dirtied_cache.itervalues())+1
 
-    @property
-    def prefs(self):
-        'For internal use only (used by SavedSearchQueries). For thread-safe access to the preferences, use the pref() and set_pref() methods.'
-        return self.backend.prefs
-
     @write_api
     def initialize_template_cache(self):
         self.formatter_template_cache = {}
@@ -161,6 +156,8 @@ class Cache(object):
     def reload_from_db(self, clear_caches=True):
         if clear_caches:
             self._clear_caches()
+        self.backend.prefs.load_from_db()
+        self._search_api.saved_searches.load_from_db()
         for field in self.fields.itervalues():
             if hasattr(field, 'table'):
                 field.table.read(self.backend)  # Reread data from metadata.db
@@ -1520,6 +1517,30 @@ class Cache(object):
         all_paths = {self._field_for('path', book_id).partition('/')[0] for book_id in self._all_book_ids()}
         self.backend.move_library_to(all_paths, newloc, progress=progress)
 
+    @read_api
+    def saved_search_names(self):
+        return self._search_api.saved_searches.names()
+
+    @read_api
+    def saved_search_lookup(self, name):
+        return self._search_api.saved_searches.lookup(name)
+
+    @write_api
+    def saved_search_set_all(self, smap):
+        self._search_api.saved_searches.set_all(smap)
+
+    @write_api
+    def saved_search_delete(self, name):
+        self._search_api.saved_searches.delete(name)
+
+    @write_api
+    def saved_search_add(self, name, val):
+        self._search_api.saved_searches.add(name, val)
+
+    @write_api
+    def saved_search_rename(self, old_name, new_name):
+        self._search_api.saved_searches.rename(old_name, new_name)
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/categories.py b/src/calibre/db/categories.py
index df6c1402d2..f80bb52c08 100644
--- a/src/calibre/db/categories.py
+++ b/src/calibre/db/categories.py
@@ -228,11 +228,10 @@ def get_categories(dbcache, sort='name', book_ids=None, icon_map=None):
     icon = None
     if icon_map and 'search' in icon_map:
         icon = icon_map['search']
-    ss = dbcache._search_api.get_saved_searches()
-    for srch in ss.names():
-        items.append(Tag(srch, tooltip=ss.lookup(srch),
-                            sort=srch, icon=icon, category='search',
-                            is_editable=False))
+    queries = dbcache._search_api.saved_searches.queries
+    for srch in sorted(queries, key=sort_key):
+        items.append(Tag(srch, tooltip=queries[srch], sort=srch, icon=icon,
+                         category='search', is_editable=False))
     if len(items):
         categories['search'] = items
 
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 838ccdfe21..9de6d5ce1f 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -120,9 +120,6 @@ class LibraryDatabase(object):
             self.new_api.reload_from_db()
         self.last_update_check = utcnow()
 
-    def get_saved_searches(self):
-        return self.new_api._search_api.get_saved_searches()
-
     @property
     def custom_column_num_map(self):
         return self.backend.custom_column_num_map
@@ -887,6 +884,12 @@ for meth in ('get_next_series_num_for', 'has_book', 'author_sort_from_authors'):
     setattr(LibraryDatabase, meth, MT(getter(meth)))
 
 LibraryDatabase.move_library_to = MT(lambda self, newloc, progress=None:self.new_api.move_library_to(newloc, progress=progress))
+LibraryDatabase.saved_search_names = MT(lambda self:self.new_api.saved_search_names())
+LibraryDatabase.saved_search_lookup = MT(lambda self, x:self.new_api.saved_search_lookup(x))
+LibraryDatabase.saved_search_set_all = MT(lambda self, smap:self.new_api.saved_search_set_all(smap))
+LibraryDatabase.saved_search_delete = MT(lambda self, x:self.new_api.saved_search_delete(x))
+LibraryDatabase.saved_search_add = MT(lambda self, x, y:self.new_api.saved_search_add(x, y))
+LibraryDatabase.saved_search_rename = MT(lambda self, x, y:self.new_api.saved_search_rename(x, y))
 # Cleaning is not required anymore
 LibraryDatabase.clean = LibraryDatabase.clean_custom = MT(lambda self:None)
 LibraryDatabase.clean_standard_field = MT(lambda self, field, commit=False:None)
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 013678e3b3..f00b7102e7 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -7,15 +7,16 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import re
+import re, weakref
 from functools import partial
 from datetime import timedelta
 
+from calibre.constants import preferred_encoding
 from calibre.utils.config_base import prefs
 from calibre.utils.date import parse_date, UNDEFINED_DATE, now
-from calibre.utils.icu import primary_find
+from calibre.utils.icu import primary_find, sort_key
 from calibre.utils.localization import lang_map, canonicalize_lang
-from calibre.utils.search_query_parser import SearchQueryParser, ParseException, SavedSearchQueries
+from calibre.utils.search_query_parser import SearchQueryParser, ParseException
 
 CONTAINS_MATCH = 0
 EQUALS_MATCH   = 1
@@ -388,11 +389,72 @@ class KeyPairSearch(object):  # {{{
 
 # }}}
 
+class SavedSearchQueries(object):  # {{{
+    queries = {}
+    opt_name = ''
+
+    def __init__(self, db, _opt_name):
+        self.opt_name = _opt_name
+        try:
+            self._db = weakref.ref(db)
+        except TypeError:
+            # db could be None
+            self._db = lambda : None
+        self.load_from_db()
+
+    def load_from_db(self):
+        db = self.db
+        if db is not None:
+            self.queries = db._pref(self.opt_name, default={})
+        else:
+            self.queries = {}
+
+    @property
+    def db(self):
+        return self._db()
+
+    def force_unicode(self, x):
+        if not isinstance(x, unicode):
+            x = x.decode(preferred_encoding, 'replace')
+        return x
+
+    def add(self, name, value):
+        db = self.db
+        if db is not None:
+            self.queries[self.force_unicode(name)] = self.force_unicode(value).strip()
+            db._set_pref(self.opt_name, self.queries)
+
+    def lookup(self, name):
+        return self.queries.get(self.force_unicode(name), None)
+
+    def delete(self, name):
+        db = self.db
+        if db is not None:
+            self.queries.pop(self.force_unicode(name), False)
+            db._set_pref(self.opt_name, self.queries)
+
+    def rename(self, old_name, new_name):
+        db = self.db
+        if db is not None:
+            self.queries[self.force_unicode(new_name)] = self.queries.get(self.force_unicode(old_name), None)
+            self.queries.pop(self.force_unicode(old_name), False)
+            db._set_pref(self.opt_name, self.queries)
+
+    def set_all(self, smap):
+        db = self.db
+        if db is not None:
+            self.queries = smap
+            db._set_pref(self.opt_name, smap)
+
+    def names(self):
+        return sorted(self.queries.iterkeys(), key=sort_key)
+# }}}
+
 class Parser(SearchQueryParser):
 
     def __init__(self, dbcache, all_book_ids, gst, date_search, num_search,
                  bool_search, keypair_search, limit_search_columns, limit_search_columns_to,
-                 locations, virtual_fields, get_saved_searches):
+                 locations, virtual_fields, lookup_saved_search):
         self.dbcache, self.all_book_ids = dbcache, all_book_ids
         self.all_search_locations = frozenset(locations)
         self.grouped_search_terms = gst
@@ -403,7 +465,7 @@ class Parser(SearchQueryParser):
         self.virtual_fields = virtual_fields or {}
         if 'marked' not in self.virtual_fields:
             self.virtual_fields['marked'] = self
-        super(Parser, self).__init__(locations, optimize=True, get_saved_searches=get_saved_searches)
+        super(Parser, self).__init__(locations, optimize=True, lookup_saved_search=lookup_saved_search)
 
     @property
     def field_metadata(self):
@@ -693,11 +755,11 @@ class Search(object):
             self.keypair_search,
             prefs['limit_search_columns'],
             prefs['limit_search_columns_to'], self.all_search_locations,
-            virtual_fields, self.get_saved_searches)
+            virtual_fields, self.saved_searches.lookup)
 
         try:
             ret = sqp.parse(q)
         finally:
-            sqp.dbcache = sqp.get_saved_searches = None
+            sqp.dbcache = sqp.lookup_saved_search = None
         return ret
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 3e1a1457b3..0c4efb9f6e 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -751,3 +751,24 @@ class LegacyTest(BaseTest):
         db.close()
 
     # }}}
+
+    def test_legacy_saved_search(self):  # {{{
+        ' Test legacy saved search API '
+        db, ndb = self.init_old(), self.init_legacy()
+        run_funcs(self, db, ndb, (
+            ('saved_search_set_all', {'one':'a', 'two':'b'}),
+            ('saved_search_names',),
+            ('saved_search_lookup', 'one'),
+            ('saved_search_lookup', 'two'),
+            ('saved_search_lookup', 'xxx'),
+            ('saved_search_rename', 'one', '1'),
+            ('saved_search_names',),
+            ('saved_search_lookup', '1'),
+            ('saved_search_delete', '1'),
+            ('saved_search_names',),
+            ('saved_search_add', 'n', 'm'),
+            ('saved_search_names',),
+            ('saved_search_lookup', 'n'),
+        ))
+    # }}}
+
diff --git a/src/calibre/gui2/dialogs/saved_search_editor.py b/src/calibre/gui2/dialogs/saved_search_editor.py
index 669771e46e..40cd16c41d 100644
--- a/src/calibre/gui2/dialogs/saved_search_editor.py
+++ b/src/calibre/gui2/dialogs/saved_search_editor.py
@@ -14,7 +14,8 @@ from calibre.gui2.dialogs.confirm_delete import confirm
 class SavedSearchEditor(QDialog, Ui_SavedSearchEditor):
 
     def __init__(self, parent, initial_search=None):
-        from calibre.gui2.ui import saved_searches
+        from calibre.gui2.ui import get_gui
+        db = get_gui().current_db
         QDialog.__init__(self, parent)
         Ui_SavedSearchEditor.__init__(self)
         self.setupUi(self)
@@ -27,9 +28,9 @@ class SavedSearchEditor(QDialog, Ui_SavedSearchEditor):
 
         self.current_search_name = None
         self.searches = {}
-        for name in saved_searches().names():
-            self.searches[name] = saved_searches().lookup(name)
-        self.search_names = set([icu_lower(n) for n in saved_searches().names()])
+        for name in db.saved_search_names():
+            self.searches[name] = db.saved_search_lookup(name)
+        self.search_names = set([icu_lower(n) for n in db.saved_search_names()])
 
         self.populate_search_list()
         if initial_search is not None and initial_search in self.searches:
@@ -98,11 +99,10 @@ class SavedSearchEditor(QDialog, Ui_SavedSearchEditor):
             self.search_text.setPlainText('')
 
     def accept(self):
-        from calibre.gui2.ui import saved_searches
+        from calibre.gui2.ui import get_gui
+        db = get_gui().current_db
         if self.current_search_name:
             self.searches[self.current_search_name] = unicode(self.search_text.toPlainText())
-        for name in saved_searches().names():
-            saved_searches().delete(name)
-        for name in self.searches:
-            saved_searches().add(name, self.searches[name])
+        ss = {name:self.searches[name] for name in self.searches}
+        db.saved_search_set_all(ss)
         QDialog.accept(self)
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index b10fdd40ef..edd05168f4 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -308,28 +308,35 @@ class SavedSearchBox(QComboBox):  # {{{
             self.saved_search_selected(self.currentText())
 
     def saved_search_selected(self, qname):
-        from calibre.gui2.ui import saved_searches
+        from calibre.gui2.ui import get_gui
+        db = get_gui().current_db
         qname = unicode(qname)
         if qname is None or not qname.strip():
             self.search_box.clear()
             return
-        if not saved_searches().lookup(qname):
+        if not db.saved_search_lookup(qname):
             self.search_box.clear()
             self.setEditText(qname)
             return
         self.search_box.set_search_string(u'search:"%s"' % qname, emit_changed=False)
         self.setEditText(qname)
-        self.setToolTip(saved_searches().lookup(qname))
+        self.setToolTip(db.saved_search_lookup(qname))
 
     def initialize_saved_search_names(self):
-        from calibre.gui2.ui import saved_searches
-        qnames = saved_searches().names()
-        self.addItems(qnames)
+        from calibre.gui2.ui import get_gui
+        gui = get_gui()
+        try:
+            names = gui.current_db.saved_search_names()
+        except AttributeError:
+            # Happens during gui initialization
+            names = []
+        self.addItems(names)
         self.setCurrentIndex(-1)
 
     # SIGNALed from the main UI
     def save_search_button_clicked(self):
-        from calibre.gui2.ui import saved_searches
+        from calibre.gui2.ui import get_gui
+        db = get_gui().current_db
         name = unicode(self.currentText())
         if not name.strip():
             name = unicode(self.search_box.text()).replace('"', '')
@@ -337,8 +344,8 @@ class SavedSearchBox(QComboBox):  # {{{
             error_dialog(self, _('Create saved search'),
                          _('There is no search to save'), show=True)
             return
-        saved_searches().delete(name)
-        saved_searches().add(name, unicode(self.search_box.text()))
+        db.saved_search_delete(name)
+        db.saved_search_add(name, unicode(self.search_box.text()))
         # now go through an initialization cycle to ensure that the combobox has
         # the new search in it, that it is selected, and that the search box
         # references the new search instead of the text in the search.
@@ -348,7 +355,8 @@ class SavedSearchBox(QComboBox):  # {{{
         self.changed.emit()
 
     def delete_current_search(self):
-        from calibre.gui2.ui import saved_searches
+        from calibre.gui2.ui import get_gui
+        db = get_gui().current_db
         idx = self.currentIndex()
         if idx <= 0:
             error_dialog(self, _('Delete current search'),
@@ -358,21 +366,22 @@ class SavedSearchBox(QComboBox):  # {{{
                        '<b>permanently deleted</b>. Are you sure?')
                     +'</p>', 'saved_search_delete', self):
             return
-        ss = saved_searches().lookup(unicode(self.currentText()))
+        ss = db.saved_search_lookup(unicode(self.currentText()))
         if ss is None:
             return
-        saved_searches().delete(unicode(self.currentText()))
+        db.saved_search_delete(unicode(self.currentText()))
         self.clear()
         self.search_box.clear()
         self.changed.emit()
 
     # SIGNALed from the main UI
     def copy_search_button_clicked(self):
-        from calibre.gui2.ui import saved_searches
+        from calibre.gui2.ui import get_gui
+        db = get_gui().current_db
         idx = self.currentIndex()
         if idx < 0:
             return
-        self.search_box.set_search_string(saved_searches().lookup(unicode(self.currentText())))
+        self.search_box.set_search_string(db.saved_search_lookup(unicode(self.currentText())))
 
     # }}}
 
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 71e0f2f392..ceed4f1928 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -178,7 +178,7 @@ class CreateVirtualLibrary(QDialog):  # {{{
         self.resize(self.sizeHint()+QSize(150, 25))
 
     def search_text_changed(self, txt):
-        from calibre.gui2.ui import saved_searches
+        db = self.gui.current_db
         searches = [_('Saved searches recognized in the expression:')]
         txt = unicode(txt)
         while txt:
@@ -201,9 +201,9 @@ class CreateVirtualLibrary(QDialog):  # {{{
                     search_name = possible_search[0]
                     if search_name.startswith('='):
                         search_name = search_name[1:]
-                    if search_name in saved_searches().names():
+                    if search_name in db.saved_search_names():
                         searches.append(search_name + '=' +
-                                        saved_searches().lookup(search_name))
+                                        db.saved_search_lookup(search_name))
                 else:
                     txt = ''
             else:
@@ -234,18 +234,17 @@ class CreateVirtualLibrary(QDialog):  # {{{
         self.vl_text.setText(self.original_search)
 
     def link_activated(self, url):
-        from calibre.gui2.ui import saved_searches
         db = self.gui.current_db
         f, txt = unicode(url).partition('.')[0::2]
         if f == 'search':
-            names = saved_searches().names()
+            names = db.saved_search_names()
         else:
             names = getattr(db, 'all_%s_names'%f)()
         d = SelectNames(names, txt, parent=self)
         if d.exec_() == d.Accepted:
             prefix = f+'s' if f in {'tag', 'author'} else f
             if f == 'search':
-                search = ['(%s)'%(saved_searches().lookup(x)) for x in d.names]
+                search = ['(%s)'%(db.saved_search_lookup(x)) for x in d.names]
             else:
                 search = ['%s:"=%s"'%(prefix, x.replace('"', '\\"')) for x in d.names]
             if search:
@@ -476,7 +475,7 @@ class SearchRestrictionMixin(object):
         return name[0:MAX_VIRTUAL_LIBRARY_NAME_LENGTH].strip()
 
     def build_search_restriction_list(self):
-        from calibre.gui2.ui import saved_searches
+        from calibre.gui2.ui import get_gui
         m = self.ar_menu
         m.clear()
 
@@ -508,7 +507,7 @@ class SearchRestrictionMixin(object):
             add_action(current_restriction_text, 2)
             dex += 1
 
-        for n in sorted(saved_searches().names(), key=sort_key):
+        for n in sorted(get_gui().current_db.saved_search_names(), key=sort_key):
             add_action(n, dex)
             dex += 1
 
diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py
index 7dba7cfe7d..1b291930fd 100644
--- a/src/calibre/gui2/tag_browser/model.py
+++ b/src/calibre/gui2/tag_browser/model.py
@@ -878,7 +878,7 @@ class TagsModel(QAbstractItemModel): # {{{
                     traceback.print_exc()
         self.db.data.change_search_locations(self.db.field_metadata.get_search_terms())
 
-        if len(self.db.get_saved_searches().names()):
+        if len(self.db.saved_search_names()):
             tb_cats.add_search_category(label='search', name=_('Searches'))
 
         if self.filter_categories_by:
@@ -1004,11 +1004,11 @@ class TagsModel(QAbstractItemModel): # {{{
                         _('Author names cannot contain & characters.')).exec_()
                 return False
         if key == 'search':
-            if val in self.db.get_saved_searches().names():
+            if val in self.db.saved_search_names():
                 error_dialog(self.gui_parent, _('Duplicate search name'),
                     _('The saved search name %s is already used.')%val).exec_()
                 return False
-            self.db.get_saved_searches().rename(unicode(item.data(role).toString()), val)
+            self.db.saved_search_rename(unicode(item.data(role).toString()), val)
             item.tag.name = val
             self.search_item_renamed.emit() # Does a refresh
         else:
diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py
index d28b7ca848..a48cb502e4 100644
--- a/src/calibre/gui2/tag_browser/view.py
+++ b/src/calibre/gui2/tag_browser/view.py
@@ -354,8 +354,7 @@ class TagsView(QTreeView): # {{{
                 self.delete_user_category.emit(key)
                 return
             if action == 'delete_search':
-                from calibre.gui2.ui import saved_searches
-                saved_searches().delete(key)
+                self.model().db.saved_search_delete(key)
                 self.rebuild_saved_searches.emit()
                 return
             if action == 'delete_item_from_user_category':
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index e54d06e671..b4d103ca64 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -98,16 +98,6 @@ _gui = None
 def get_gui():
     return _gui
 
-def saved_searches():
-    'Return the saved searches defined in the currently open library'
-    try:
-        return _gui.library_view.model().db.get_saved_searches()
-    except AttributeError:
-        # Happens during initialization of the gui
-        from calibre.utils.search_query_parser import saved_searches
-        return saved_searches()
-
-
 class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         TagBrowserMixin, CoverFlowMixin, LibraryViewMixin, SearchBoxMixin,
         SavedSearchBoxMixin, SearchRestrictionMixin, LayoutMixin, UpdateMixin,
@@ -312,10 +302,10 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         ####################### Search boxes ########################
         SearchRestrictionMixin.__init__(self)
         SavedSearchBoxMixin.__init__(self)
-        SearchBoxMixin.__init__(self)
 
         ####################### Library view ########################
         LibraryViewMixin.__init__(self, db)
+        SearchBoxMixin.__init__(self)  # Requires current_db
 
         if show_gui:
             self.show()
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 7e7a234724..2978a4e169 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -1029,11 +1029,10 @@ def command_saved_searches(args, dbpath):
         prints(_('Error: You must specify an action (add|remove|list)'), file=sys.stderr)
         return 1
     db = get_db(dbpath, opts)
-    ss = db.get_saved_searches()
     if args[0] == 'list':
-        for name in ss.names():
+        for name in db.saved_search_names():
             prints(_('Name:'), name)
-            prints(_('Search string:'), ss.lookup(name))
+            prints(_('Search string:'), db.saved_search_lookup(name))
             print
     elif args[0] == 'add':
         if len(args) < 3:
@@ -1041,7 +1040,7 @@ def command_saved_searches(args, dbpath):
             print
             prints(_('Error: You must specify a name and a search string'), file=sys.stderr)
             return 1
-        ss.add(args[1], args[2])
+        db.saved_search_add(args[1], args[2])
         prints(args[1], _('added'))
     elif args[0] == 'remove':
         if len(args) < 2:
@@ -1049,7 +1048,7 @@ def command_saved_searches(args, dbpath):
             print
             prints(_('Error: You must specify a name'), file=sys.stderr)
             return 1
-        ss.delete(args[1])
+        db.saved_search_delete(args[1])
         prints(args[1], _('removed'))
     else:
         parser.print_help()
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 8ea7e75b59..677729a9e9 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -537,8 +537,23 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         if self.user_version == 0:
             self.user_version = 1
 
-    def get_saved_searches(self):
-        return saved_searches()
+    def saved_search_names(self):
+        return saved_searches().names()
+
+    def saved_search_rename(self, old_name, new_name):
+        saved_searches().rename(old_name, new_name)
+
+    def saved_search_lookup(self, name):
+        return saved_searches().lookup(name)
+
+    def saved_search_add(self, name, val):
+        saved_searches().add(name, val)
+
+    def saved_search_delete(self, name):
+        saved_searches().delete(name)
+
+    def saved_search_set_all(self, smap):
+        saved_searches().set_all(smap)
 
     def last_modified(self):
         ''' Return last modified time as a UTC datetime object'''
diff --git a/src/calibre/library/server/base.py b/src/calibre/library/server/base.py
index a677b991f9..f8608bd2d0 100644
--- a/src/calibre/library/server/base.py
+++ b/src/calibre/library/server/base.py
@@ -209,7 +209,7 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
         if sr:
             if sr in virt_libs:
                 sr = virt_libs[sr]
-            elif sr not in self.db.get_saved_searches().names():
+            elif sr not in self.db.saved_search_names():
                 prints('WARNING: Content server: search restriction ',
                        sr, ' does not exist')
                 sr = ''
diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index dc2a7b51b8..4406785bb1 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -76,6 +76,11 @@ class SavedSearchQueries(object):
             self.queries.pop(self.force_unicode(old_name), False)
             db.prefs[self.opt_name] = self.queries
 
+    def set_all(self, smap):
+        db = self.db
+        if db is not None:
+            self.queries = db.prefs[self.opt_name] = smap
+
     def names(self):
         return sorted(self.queries.keys(),key=sort_key)
 
@@ -93,6 +98,9 @@ def saved_searches():
     global ss
     return ss
 
+def global_lookup_saved_search(name):
+    return ss.lookup(name)
+
 '''
 Parse a search expression into a series of potentially recursive operations.
 
@@ -292,10 +300,10 @@ class SearchQueryParser(object):
                 failed.append(test[0])
         return failed
 
-    def __init__(self, locations, test=False, optimize=False, get_saved_searches=None):
+    def __init__(self, locations, test=False, optimize=False, lookup_saved_search=None):
         self.sqp_initialize(locations, test=test, optimize=optimize)
         self.parser = Parser()
-        self.get_saved_searches = saved_searches if get_saved_searches is None else get_saved_searches
+        self.lookup_saved_search = global_lookup_saved_search if lookup_saved_search is None else lookup_saved_search
 
     def sqp_change_locations(self, locations):
         self.sqp_initialize(locations, optimize=self.optimize)
@@ -368,7 +376,7 @@ class SearchQueryParser(object):
                     raise ParseException(_('Recursive saved search: {0}').format(query))
                 if self.recurse_level > 5:
                     self.searches_seen.add(query)
-                return self._parse(self.get_saved_searches().lookup(query), candidates)
+                return self._parse(self.lookup_saved_search(query), candidates)
             except ParseException as e:
                 raise e
             except:  # convert all exceptions (e.g., missing key) to a parse error

From e336d8a2b980d78c8b0e2d943b57dd10f9f77993 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 19 Jul 2013 14:00:35 +0200
Subject: [PATCH 0248/1154] Strip spaces off of function names before looking
 them up. They shouldn't ever be significant.

---
 src/calibre/utils/formatter.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py
index eff38203a0..2fa5901dde 100644
--- a/src/calibre/utils/formatter.py
+++ b/src/calibre/utils/formatter.py
@@ -137,6 +137,7 @@ class _Parser(object):
             # We have a function.
             # Check if it is a known one. We do this here so error reporting is
             # better, as it can identify the tokens near the problem.
+            id = id.strip()
             if id not in funcs:
                 self.error(_('unknown function {0}').format(id))
 
@@ -246,6 +247,7 @@ class _CompileParser(_Parser):
             # We have a function.
             # Check if it is a known one. We do this here so error reporting is
             # better, as it can identify the tokens near the problem.
+            id = id.strip()
             if id not in funcs:
                 self.error(_('unknown function {0}').format(id))
 
@@ -457,7 +459,7 @@ class TemplateFormatter(string.Formatter):
                     colon += 1
 
                 funcs = formatter_functions().get_functions()
-                fname = fmt[colon:p]
+                fname = fmt[colon:p].strip()
                 if fname in funcs:
                     func = funcs[fname]
                     if func.arg_count == 2:

From 29e2886267825443616a2310bb5b944c0a72cd6a Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 19 Jul 2013 14:01:47 +0200
Subject: [PATCH 0249/1154] Implement enforcement of unique custom template
 function names.

---
 src/calibre/ebooks/metadata/worker.py         |  2 +-
 .../gui2/preferences/template_functions.py    |  2 +-
 src/calibre/gui2/ui.py                        |  3 +
 src/calibre/library/database2.py              |  3 +-
 src/calibre/utils/formatter_functions.py      | 56 +++++++++++++++++--
 5 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/calibre/ebooks/metadata/worker.py b/src/calibre/ebooks/metadata/worker.py
index 660240571b..e8147958d8 100644
--- a/src/calibre/ebooks/metadata/worker.py
+++ b/src/calibre/ebooks/metadata/worker.py
@@ -318,7 +318,7 @@ def save_book(ids, dpath, plugboards, template_functions, path, recs,
     from calibre.library.save_to_disk import config, save_serialized_to_disk
     from calibre.customize.ui import apply_null_metadata
     from calibre.utils.formatter_functions import load_user_template_functions
-    load_user_template_functions(template_functions)
+    load_user_template_functions('', template_functions)
     opts = config().parse()
     for name in recs:
         setattr(opts, name, recs[name])
diff --git a/src/calibre/gui2/preferences/template_functions.py b/src/calibre/gui2/preferences/template_functions.py
index f5203e9cdd..4cc07fee3a 100644
--- a/src/calibre/gui2/preferences/template_functions.py
+++ b/src/calibre/gui2/preferences/template_functions.py
@@ -223,7 +223,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             if f in self.builtins:
                 continue
             func = self.funcs[f]
-            formatter_functions().register_function(func)
+            formatter_functions().register_function(self.db.library_id, func)
             pref_value.append((func.name, func.doc, func.arg_count, func.program_text))
         self.db.prefs.set('user_template_functions', pref_value)
 
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index e54d06e671..05f36c2709 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -580,6 +580,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             olddb = self.library_view.model().db
             if copy_structure:
                 default_prefs = olddb.prefs
+
+            from calibre.utils.formatter_functions import unload_user_template_functions
+            unload_user_template_functions(olddb.library_id )
         except:
             olddb = None
         try:
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 8ea7e75b59..7942c69574 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -325,7 +325,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             self.prefs.set('user_categories', user_cats)
 
         if not self.is_second_db:
-            load_user_template_functions(self.prefs.get('user_template_functions', []))
+            load_user_template_functions(self.library_id,
+                                         self.prefs.get('user_template_functions', []))
 
         # Load the format filename cache
         self.refresh_format_cache()
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index 73dad7422b..f8d62c367a 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -10,6 +10,7 @@ __docformat__ = 'restructuredtext en'
 
 import inspect, re, traceback
 from math import trunc
+from collections import defaultdict
 
 from calibre import human_readable
 from calibre.constants import DEBUG
@@ -25,6 +26,7 @@ class FormatterFunctions(object):
     def __init__(self):
         self._builtins = {}
         self._functions = {}
+        self._functions_from_library = defaultdict(list)
 
     def register_builtin(self, func_class):
         if not isinstance(func_class, FormatterFunction):
@@ -38,14 +40,24 @@ class FormatterFunctions(object):
         for a in func_class.aliases:
             self._functions[a] = func_class
 
-    def register_function(self, func_class):
+    def register_function(self, library_uuid, func_class, replace=False):
         if not isinstance(func_class, FormatterFunction):
             raise ValueError('Class %s is not an instance of FormatterFunction'%(
                                     func_class.__class__.__name__))
         name = func_class.name
-        if name in self._functions:
+        if not replace and name in self._functions:
             raise ValueError('Name %s already used'%name)
         self._functions[name] = func_class
+        self._functions_from_library[library_uuid].append(name)
+
+    def function_exists(self, name):
+        return self._functions.get(name, None)
+
+    def unregister_functions(self, library_uuid):
+        if library_uuid in self._functions_from_library:
+            for name in self._functions_from_library[library_uuid]:
+                self._functions.pop(name)
+            self._functions_from_library.pop(library_uuid)
 
     def get_builtins(self):
         return self._builtins
@@ -1259,11 +1271,45 @@ class UserFunction(FormatterUserFunction):
     cls = locals_['UserFunction'](name, doc, arg_count, eval_func)
     return cls
 
-def load_user_template_functions(funcs):
-    formatter_functions().reset_to_builtins()
+error_function_body = ('def evaluate(self, formatter, kwargs, mi, locals):\n'
+                       '\treturn "' +
+                            _('Duplicate user function name {0}. '
+                              'Change the name or ensure that the functions are identical')
+                                       + '"')
+
+def load_user_template_functions(library_uuid, funcs):
+    unload_user_template_functions(library_uuid)
+
     for func in funcs:
         try:
+            # Force a name conflict to test the logic
+            # if func[0] == 'myFunc2':
+            #     func[0] = 'myFunc3'
+
+            # Compile the function so that the tab processing is done on the
+            # source. This helps ensure that if the function already is defined
+            # then white space differences don't cause them to compare differently
+
             cls = compile_user_function(*func)
-            formatter_functions().register_function(cls)
+            f = formatter_functions().function_exists(cls.name)
+            replace = False
+            if f is not None:
+                existing_body = f.program_text
+                new_body = cls.program_text
+                if new_body != existing_body:
+                    # Change the body of the template function to one that will
+                    # return an error message. Also change the arg count to
+                    # -1 (variable) to avoid template compilation errors
+                    replace = True
+                    func[3] = error_function_body.format(func[0])
+                    func[2] = -1
+                    cls = compile_user_function(*func)
+                else:
+                    continue
+
+            formatter_functions().register_function(library_uuid, cls, replace=replace)
         except:
             traceback.print_exc()
+
+def unload_user_template_functions(library_uuid):
+    formatter_functions().unregister_functions(library_uuid)
\ No newline at end of file

From 97d0eed4520efd61e87f57be50d35aca228559e3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 18:25:01 +0530
Subject: [PATCH 0250/1154] Add loading of user template functions to the new
 backend

---
 src/calibre/db/__init__.py | 3 +--
 src/calibre/db/backend.py  | 3 +++
 src/calibre/db/legacy.py   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index a07fb8b5a3..5bc0437fb5 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -168,8 +168,7 @@ How this will proceed:
     work.
 
 Various things that require other things before they can be migrated:
-    1. From initialize_dynamic(): set_saved_searches,
-                    load_user_template_functions. Also add custom
+    1. From initialize_dynamic(): Also add custom
                     columns/categories/searches info into
                     self.field_metadata.
     2. Catching DatabaseException and sqlite.Error when creating new
diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 3241493af1..914248fedc 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -29,6 +29,7 @@ from calibre.utils.filenames import (is_case_sensitive, samefile, hardlink_file,
                                      WindowsAtomicFolderMove)
 from calibre.utils.magick.draw import save_cover_data_to
 from calibre.utils.recycle_bin import delete_tree, delete_file
+from calibre.utils.formatter_functions import load_user_template_functions
 from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable,
         SizeTable, FormatsTable, AuthorsTable, IdentifiersTable, PathTable,
         CompositeTable, UUIDTable)
@@ -372,6 +373,8 @@ class DB(object):
         self.initialize_prefs(default_prefs, restore_all_prefs, progress_callback)
         self.initialize_custom_columns()
         self.initialize_tables()
+        load_user_template_functions(self.library_id,
+                                        self.prefs.get('user_template_functions', []))
 
     def initialize_prefs(self, default_prefs, restore_all_prefs, progress_callback):  # {{{
         self.prefs = DBPrefs(self)
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 9de6d5ce1f..54f1fe5c1d 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -55,7 +55,7 @@ class LibraryDatabase(object):
             default_prefs=None, read_only=False, is_second_db=False,
             progress_callback=lambda x, y:True, restore_all_prefs=False):
 
-        self.is_second_db = is_second_db  # TODO: Use is_second_db
+        self.is_second_db = is_second_db
         self.listeners = set()
 
         backend = self.backend = DB(library_path, default_prefs=default_prefs,

From faa351c2087b8e588933fb9edffbd4b787469c08 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 19 Jul 2013 15:42:43 +0200
Subject: [PATCH 0251/1154] Fix problems creating template functions caused by
 the changes for the new single-name rule

---
 src/calibre/gui2/preferences/template_functions.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/preferences/template_functions.py b/src/calibre/gui2/preferences/template_functions.py
index 4cc07fee3a..6842e0798e 100644
--- a/src/calibre/gui2/preferences/template_functions.py
+++ b/src/calibre/gui2/preferences/template_functions.py
@@ -13,7 +13,8 @@ from calibre.gui2 import error_dialog, warning_dialog
 from calibre.gui2.preferences import ConfigWidgetBase, test_widget
 from calibre.gui2.preferences.template_functions_ui import Ui_Form
 from calibre.gui2.widgets import PythonHighlighter
-from calibre.utils.formatter_functions import formatter_functions, compile_user_function
+from calibre.utils.formatter_functions import (formatter_functions,
+                        compile_user_function, load_user_template_functions)
 
 
 class ConfigWidget(ConfigWidgetBase, Ui_Form):
@@ -21,7 +22,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
     def genesis(self, gui):
         self.gui = gui
         self.db = gui.library_view.model().db
-        self.current_plugboards = self.db.prefs.get('plugboards',{})
+
         help_text = _('''
         <p>Here you can add and remove functions used in template processing. A
         template function is written in python. It takes information from the
@@ -217,15 +218,15 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         pass
 
     def commit(self):
-        formatter_functions().reset_to_builtins()
+        # formatter_functions().reset_to_builtins()
         pref_value = []
         for f in self.funcs:
-            if f in self.builtins:
-                continue
             func = self.funcs[f]
-            formatter_functions().register_function(self.db.library_id, func)
             pref_value.append((func.name, func.doc, func.arg_count, func.program_text))
         self.db.prefs.set('user_template_functions', pref_value)
+        formatter_functions().unregister_functions(self.db.library_id)
+        load_user_template_functions(self.db.library_id, pref_value)
+        return False
 
 
 if __name__ == '__main__':

From d0b826c39ab0bcbb32ee7e33ef275166500a7c75 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 21:11:08 +0530
Subject: [PATCH 0252/1154] Allow using a tweak to switch db backends

---
 src/calibre/db/__init__.py                  | 69 +++++----------------
 src/calibre/gui2/actions/choose_library.py  | 17 +++--
 src/calibre/gui2/actions/copy_to_library.py |  4 +-
 src/calibre/gui2/dialogs/choose_library.py  |  7 ++-
 src/calibre/gui2/main.py                    | 27 ++++----
 src/calibre/gui2/ui.py                      | 12 ++--
 src/calibre/gui2/wizard/__init__.py         | 17 ++---
 src/calibre/library/__init__.py             |  7 ++-
 src/calibre/library/cli.py                  | 13 ++--
 src/calibre/library/move.py                 |  6 +-
 src/calibre/library/server/main.py          |  4 +-
 11 files changed, 80 insertions(+), 103 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 5bc0437fb5..b8e46b4ed2 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -118,65 +118,26 @@ def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None):
 
     return data
 
+def get_db_loader():
+    from calibre.utils.config_base import tweaks
+    if tweaks.get('use_new_db', False):
+        from calibre.db.legacy import LibraryDatabase as cls
+        import apsw
+        errs = (apsw.Error,)
+    else:
+        from calibre.library.database2 import LibraryDatabase2 as cls
+        from calibre.library.sqlite import sqlite, DatabaseException
+        errs = (sqlite.Error, DatabaseException)
+    return cls, errs
+
 '''
-Rewrite of the calibre database backend.
-
-Broad Objectives:
-
-    * Use the sqlite db only as a datastore. i.e. do not do
-      sorting/searching/concatenation or anything else in sqlite. Instead
-      mirror the sqlite tables in memory, create caches and lookup maps from
-      them and create a set_* API that updates the memory caches and the sqlite
-      correctly.
-
-    * Move from keeping a list of books in memory as a cache to a per table
-      cache. This allows much faster search and sort operations at the expense
-      of slightly slower lookup operations. That slowdown can be mitigated by
-      keeping lots of maps and updating them in the set_* API. Also
-      get_categories becomes blazingly fast.
-
-    * Separate the database layer from the cache layer more cleanly. Rather
-      than having the db layer refer to the cache layer and vice versa, the
-      cache layer will refer to the db layer only and the new API will be
-      defined on the cache layer.
-
-    * Get rid of index_is_id and other poor design decisions
-
-    * Minimize the API as much as possible and define it cleanly
-
-    * Do not change the on disk format of metadata.db at all (this is for
-      backwards compatibility)
-
-    * Get rid of the need for a separate db access thread by switching to apsw
-      to access sqlite, which is thread safe
-
-    * The new API will have methods to efficiently do bulk operations and will
-      use shared/exclusive/pending locks to serialize access to the in-mem data
-      structures. Use the same locking scheme as sqlite itself does.
-
-How this will proceed:
-
-    1. Create the new API
-    2. Create a test suite for it
-    3. Write a replacement for LibraryDatabase2 that uses the new API
-       internally
-    4. Lots of testing of calibre with the new LibraryDatabase2
-    5. Gradually migrate code to use the (much faster) new api wherever possible (the new api
-       will be exposed via db.new_api)
-
-    I plan to work on this slowly, in parallel to normal calibre development
-    work.
-
 Various things that require other things before they can be migrated:
     1. From initialize_dynamic(): Also add custom
                     columns/categories/searches info into
                     self.field_metadata.
-    2. Catching DatabaseException and sqlite.Error when creating new
-    libraries/switching/on calibre startup.
-    3. Port library/restore.py
-    4. Replace the metadatabackup thread with the new implementation when using the new backend.
-    5. grep the sources for TODO
-    6. Check that content server reloading on metadata,db change, metadata
+    2. Port library/restore.py
+    3. Replace the metadatabackup thread with the new implementation when using the new backend.
+    4. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
 '''
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 347b6862a0..6857454ae4 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -19,9 +19,12 @@ from calibre.utils.config import prefs, tweaks
 from calibre.utils.icu import sort_key
 from calibre.gui2 import (gprefs, warning_dialog, Dispatcher, error_dialog,
     question_dialog, info_dialog, open_local_file, choose_dir)
-from calibre.library.database2 import LibraryDatabase2
 from calibre.gui2.actions import InterfaceAction
 
+def db_class():
+    from calibre.db import get_db_loader
+    return get_db_loader()[0]
+
 class LibraryUsageStats(object):  # {{{
 
     def __init__(self):
@@ -139,7 +142,7 @@ class MovedDialog(QDialog):  # {{{
 
     def accept(self):
         newloc = unicode(self.loc.text())
-        if not LibraryDatabase2.exists_at(newloc):
+        if not db_class.exists_at(newloc):
             error_dialog(self, _('No library found'),
                     _('No existing calibre library found at %s')%newloc,
                     show=True)
@@ -313,6 +316,7 @@ class ChooseLibraryAction(InterfaceAction):
         self.qaction.setEnabled(enabled)
 
     def rename_requested(self, name, location):
+        LibraryDatabase = db_class()
         loc = location.replace('/', os.sep)
         base = os.path.dirname(loc)
         newname, ok = QInputDialog.getText(self.gui, _('Rename') + ' ' + name,
@@ -328,10 +332,10 @@ class ChooseLibraryAction(InterfaceAction):
                     _('The folder %s already exists. Delete it first.') %
                     newloc, show=True)
         if (iswindows and len(newloc) >
-                LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT):
+                LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT):
             return error_dialog(self.gui, _('Too long'),
                     _('Path to library too long. Must be less than'
-                    ' %d characters.')%LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT,
+                    ' %d characters.')%LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT,
                     show=True)
         if not os.path.exists(loc):
             error_dialog(self.gui, _('Not found'),
@@ -387,16 +391,17 @@ class ChooseLibraryAction(InterfaceAction):
               'rate of approximately 1 book every three seconds.'), show=True)
 
     def restore_database(self):
+        LibraryDatabase = db_class()
         m = self.gui.library_view.model()
         db = m.db
         if (iswindows and len(db.library_path) >
-                LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT):
+                LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT):
             return error_dialog(self.gui, _('Too long'),
                     _('Path to library too long. Must be less than'
                     ' %d characters. Move your library to a location with'
                     ' a shorter path using Windows Explorer, then point'
                     ' calibre to the new location and try again.')%
-                    LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT,
+                    LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT,
                     show=True)
 
         from calibre.gui2.dialogs.restore_library import restore_database
diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index 8465cb98f0..f32f060de7 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -55,8 +55,8 @@ class Worker(Thread):  # {{{
                         notify=False, replace=replace)
 
     def doit(self):
-        from calibre.library.database2 import LibraryDatabase2
-        newdb = LibraryDatabase2(self.loc, is_second_db=True)
+        from calibre.db import get_db_loader
+        newdb = get_db_loader()[0](self.loc, is_second_db=True)
         with closing(newdb):
             self._doit(newdb)
         newdb.break_cycles()
diff --git a/src/calibre/gui2/dialogs/choose_library.py b/src/calibre/gui2/dialogs/choose_library.py
index 91048e8ff1..52e8ef644a 100644
--- a/src/calibre/gui2/dialogs/choose_library.py
+++ b/src/calibre/gui2/dialogs/choose_library.py
@@ -15,7 +15,6 @@ from calibre.constants import (filesystem_encoding, iswindows,
         get_portable_base)
 from calibre import isbytestring, patheq, force_unicode
 from calibre.gui2.wizard import move_library
-from calibre.library.database2 import LibraryDatabase2
 
 class ChooseLibrary(QDialog, Ui_Dialog):
 
@@ -86,6 +85,8 @@ class ChooseLibrary(QDialog, Ui_Dialog):
                     show=True)
             return False
         if ac in ('new', 'move'):
+            from calibre.db import get_db_loader
+            LibraryDatabase = get_db_loader()[0]
             if not empty:
                 error_dialog(self, _('Not empty'),
                     _('The folder %s is not empty. Please choose an empty'
@@ -93,10 +94,10 @@ class ChooseLibrary(QDialog, Ui_Dialog):
                     show=True)
                 return False
             if (iswindows and len(loc) >
-                    LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT):
+                    LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT):
                 error_dialog(self, _('Too long'),
                     _('Path to library too long. Must be less than'
-                    ' %d characters.')%LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT,
+                    ' %d characters.')%LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT,
                     show=True)
                 return False
 
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index f35a9ca083..bcfc88d239 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -15,8 +15,6 @@ from calibre.gui2 import (ORG_NAME, APP_UID, initialize_file_icon_provider,
     Application, choose_dir, error_dialog, question_dialog, gprefs)
 from calibre.gui2.main_window import option_parser as _option_parser
 from calibre.utils.config import prefs, dynamic
-from calibre.library.database2 import LibraryDatabase2
-from calibre.library.sqlite import sqlite, DatabaseException
 
 if iswindows:
     winutil = plugins['winutil'][0]
@@ -51,7 +49,8 @@ path_to_ebook to the database.
 
 def find_portable_library():
     base = get_portable_base()
-    if base is None: return
+    if base is None:
+        return
     import glob
     candidates = [os.path.basename(os.path.dirname(x)) for x in glob.glob(
         os.path.join(base, u'*%smetadata.db'%os.sep))]
@@ -123,7 +122,7 @@ def get_default_library_path():
 
 def get_library_path(parent=None):
     library_path = prefs['library_path']
-    if library_path is None: # Need to migrate to new database layout
+    if library_path is None:  # Need to migrate to new database layout
         base = os.path.expanduser('~')
         if iswindows:
             base = winutil.special_folder_path(winutil.CSIDL_PERSONAL)
@@ -181,7 +180,7 @@ class GuiRunner(QObject):
         main = Main(self.opts, gui_debug=self.gui_debug)
         if self.splash_screen is not None:
             self.splash_screen.showMessage(_('Initializing user interface...'))
-        with gprefs: # Only write gui.json after initialization is complete
+        with gprefs:  # Only write gui.json after initialization is complete
             main.initialize(self.library_path, db, self.listener, self.actions)
         if self.splash_screen is not None:
             self.splash_screen.finish(main)
@@ -224,7 +223,7 @@ class GuiRunner(QObject):
 
             try:
                 self.library_path = candidate
-                db = LibraryDatabase2(candidate)
+                db = self.db_class(candidate)
             except:
                 error_dialog(self.splash_screen, _('Bad database location'),
                     _('Bad database location %r. calibre will now quit.'
@@ -235,10 +234,12 @@ class GuiRunner(QObject):
         self.start_gui(db)
 
     def initialize_db(self):
+        from calibre.db import get_db_loader
         db = None
+        self.db_class, errs = get_db_loader()
         try:
-            db = LibraryDatabase2(self.library_path)
-        except (sqlite.Error, DatabaseException):
+            db = self.db_class(self.library_path)
+        except errs:
             repair = question_dialog(self.splash_screen, _('Corrupted database'),
                     _('The library database at %s appears to be corrupted. Do '
                     'you want calibre to try and rebuild it automatically? '
@@ -249,7 +250,7 @@ class GuiRunner(QObject):
                     )
             if repair:
                 if repair_library(self.library_path):
-                    db = LibraryDatabase2(self.library_path)
+                    db = self.db_class(self.library_path)
         except:
             error_dialog(self.splash_screen, _('Bad database location'),
                     _('Bad database location %r. Will start with '
@@ -383,7 +384,7 @@ def shutdown_other(rc=None):
         rc = build_pipe(print_error=False)
         if rc.conn is None:
             prints(_('No running calibre found'))
-            return # No running instance found
+            return  # No running instance found
     from calibre.utils.lock import singleinstance
     rc.conn.send('shutdown:')
     prints(_('Shutdown command sent, waiting for shutdown...'))
@@ -441,7 +442,7 @@ def main(args=sys.argv):
     otherinstance = False
     try:
         listener = Listener(address=gui_socket_address())
-    except socket.error: # Good si is correct (on UNIX)
+    except socket.error:  # Good si is correct (on UNIX)
         otherinstance = True
     else:
         # On windows only singleinstance can be trusted
@@ -458,7 +459,8 @@ if __name__ == '__main__':
     try:
         sys.exit(main())
     except Exception as err:
-        if not iswindows: raise
+        if not iswindows:
+            raise
         tb = traceback.format_exc()
         from PyQt4.QtGui import QErrorMessage
         logfile = os.path.join(os.path.expanduser('~'), 'calibre.log')
@@ -470,3 +472,4 @@ if __name__ == '__main__':
                     unicode(tb).replace('\n', '<br>'),
                     log.replace('\n', '<br>')))
 
+
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 80aa66601b..5e4f75895a 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -22,7 +22,7 @@ from calibre import prints, force_unicode
 from calibre.constants import __appname__, isosx, filesystem_encoding
 from calibre.utils.config import prefs, dynamic
 from calibre.utils.ipc.server import Server
-from calibre.library.database2 import LibraryDatabase2
+from calibre.db import get_db_loader
 from calibre.customize.ui import interface_actions, available_store_plugins
 from calibre.gui2 import (error_dialog, GetMetadata, open_url,
         gprefs, max_available_height, config, info_dialog, Dispatcher,
@@ -42,7 +42,6 @@ from calibre.gui2.search_restriction_mixin import SearchRestrictionMixin
 from calibre.gui2.tag_browser.ui import TagBrowserMixin
 from calibre.gui2.keyboard import Manager
 from calibre.gui2.auto_add import AutoAdder
-from calibre.library.sqlite import sqlite, DatabaseException
 from calibre.gui2.proceed import ProceedQuestion
 from calibre.gui2.dialogs.message_box import JobError
 from calibre.gui2.job_indicator import Pointer
@@ -572,12 +571,13 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
                 default_prefs = olddb.prefs
 
             from calibre.utils.formatter_functions import unload_user_template_functions
-            unload_user_template_functions(olddb.library_id )
+            unload_user_template_functions(olddb.library_id)
         except:
             olddb = None
+        db_class, errs = get_db_loader()
         try:
-            db = LibraryDatabase2(newloc, default_prefs=default_prefs)
-        except (DatabaseException, sqlite.Error):
+            db = db_class(newloc, default_prefs=default_prefs)
+        except errs:
             if not allow_rebuild:
                 raise
             import traceback
@@ -591,7 +591,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             if repair:
                 from calibre.gui2.dialogs.restore_library import repair_library_at
                 if repair_library_at(newloc, parent=self):
-                    db = LibraryDatabase2(newloc, default_prefs=default_prefs)
+                    db = db_class(newloc, default_prefs=default_prefs)
                 else:
                     return
             else:
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index f813eed892..00fd3bdb29 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -14,7 +14,6 @@ from contextlib import closing
 from PyQt4.Qt import (QWizard, QWizardPage, QPixmap, Qt, QAbstractListModel,
     QVariant, QItemSelectionModel, SIGNAL, QObject, QTimer, pyqtSignal)
 from calibre import __appname__, patheq
-from calibre.library.database2 import LibraryDatabase2
 from calibre.library.move import MoveLibrary
 from calibre.constants import (filesystem_encoding, iswindows, plugins,
         isportable)
@@ -34,6 +33,10 @@ from calibre.customize.ui import device_plugins
 if iswindows:
     winutil = plugins['winutil'][0]
 
+def db_class():
+    from calibre.db import get_db_loader
+    return get_db_loader()[0]
+
 # Devices {{{
 
 class Device(object):
@@ -623,7 +626,7 @@ def move_library(oldloc, newloc, parent, callback_on_complete):
             if oldloc and os.access(os.path.join(oldloc, 'metadata.db'), os.R_OK):
                 # Move old library to new location
                 try:
-                    db = LibraryDatabase2(oldloc)
+                    db = db_class()(oldloc)
                 except:
                     return move_library(None, newloc, parent,
                         callback)
@@ -636,13 +639,13 @@ def move_library(oldloc, newloc, parent, callback_on_complete):
                     return
             else:
                 # Create new library at new location
-                db = LibraryDatabase2(newloc)
+                db = db_class()(newloc)
                 callback(newloc)
                 return
 
         # Try to load existing library at new location
         try:
-            LibraryDatabase2(newloc)
+            db_class()(newloc)
         except Exception as err:
             det = traceback.format_exc()
             error_dialog(parent, _('Invalid database'),
@@ -729,7 +732,7 @@ class LibraryPage(QWizardPage, LibraryUI):
 
     def is_library_dir_suitable(self, x):
         try:
-            return LibraryDatabase2.exists_at(x) or not os.listdir(x)
+            return db_class().exists_at(x) or not os.listdir(x)
         except:
             return False
 
@@ -745,10 +748,10 @@ class LibraryPage(QWizardPage, LibraryUI):
                          _('Select location for books'))
         if x:
             if (iswindows and len(x) >
-                    LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT):
+                    db_class().WINDOWS_LIBRARY_PATH_LIMIT):
                 return error_dialog(self, _('Too long'),
                     _('Path to library too long. Must be less than'
-                    ' %d characters.')%LibraryDatabase2.WINDOWS_LIBRARY_PATH_LIMIT,
+                    ' %d characters.')%(db_class().WINDOWS_LIBRARY_PATH_LIMIT),
                     show=True)
             if not os.path.exists(x):
                 try:
diff --git a/src/calibre/library/__init__.py b/src/calibre/library/__init__.py
index 3ae237c919..e219d764d5 100644
--- a/src/calibre/library/__init__.py
+++ b/src/calibre/library/__init__.py
@@ -3,13 +3,13 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 ''' Code to manage ebook library'''
 
 def db(path=None, read_only=False):
-    from calibre.library.database2 import LibraryDatabase2
+    from calibre.db import get_db_loader
     from calibre.utils.config import prefs
-    return LibraryDatabase2(path if path else prefs['library_path'],
+    return get_db_loader()[0](path if path else prefs['library_path'],
             read_only=read_only)
 
 
-def generate_test_db(library_path, # {{{
+def generate_test_db(library_path,  # {{{
         num_of_records=20000,
         num_of_authors=6000,
         num_of_tags=10000,
@@ -76,3 +76,4 @@ def current_library_name():
     if path:
         return posixpath.basename(path)
 
+
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 2978a4e169..2c6e7cd777 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -15,15 +15,18 @@ from calibre import preferred_encoding, prints, isbytestring
 from calibre.utils.config import OptionParser, prefs, tweaks
 from calibre.ebooks.metadata.meta import get_metadata
 from calibre.ebooks.metadata.book.base import field_from_string
-from calibre.library.database2 import LibraryDatabase2
 from calibre.ebooks.metadata.opf2 import OPFCreator, OPF
 from calibre.utils.date import isoformat
+from calibre.db import get_db_loader
 
 FIELDS = set(['title', 'authors', 'author_sort', 'publisher', 'rating',
     'timestamp', 'size', 'tags', 'comments', 'series', 'series_index',
     'formats', 'isbn', 'uuid', 'pubdate', 'cover', 'last_modified',
     'identifiers'])
 
+def db_class():
+    return get_db_loader()[0]
+
 do_notify = True
 def send_message(msg=''):
     global do_notify
@@ -62,7 +65,7 @@ def get_db(dbpath, options):
     dbpath = os.path.abspath(dbpath)
     if options.dont_notify_gui:
         do_notify = False
-    return LibraryDatabase2(dbpath)
+    return db_class()(dbpath)
 
 def do_list(db, fields, afields, sort_by, ascending, search_text, line_width, separator,
             prefix, limit, subtitle='Books in the calibre database'):
@@ -1101,7 +1104,7 @@ def command_backup_metadata(args, dbpath):
         dbpath = opts.library_path
     if isbytestring(dbpath):
         dbpath = dbpath.decode(preferred_encoding)
-    db = LibraryDatabase2(dbpath)
+    db = db_class()(dbpath)
     book_ids = None
     if opts.all:
         book_ids = db.all_ids()
@@ -1183,7 +1186,7 @@ def command_check_library(args, dbpath):
             for i in list:
                 print '    %-40.40s - %-40.40s'%(i[0], i[1])
 
-    db = LibraryDatabase2(dbpath)
+    db = db_class()(dbpath)
     checker = CheckLibrary(dbpath, db)
     checker.scan_library(names, exts)
     for check in checks:
@@ -1296,7 +1299,7 @@ def command_list_categories(args, dbpath):
     if isbytestring(dbpath):
         dbpath = dbpath.decode(preferred_encoding)
 
-    db = LibraryDatabase2(dbpath)
+    db = db_class()(dbpath)
     category_data = db.get_categories()
     data = []
     report_on = [c.strip() for c in opts.report.split(',') if c.strip()]
diff --git a/src/calibre/library/move.py b/src/calibre/library/move.py
index d162d962fe..ccebaa0302 100644
--- a/src/calibre/library/move.py
+++ b/src/calibre/library/move.py
@@ -10,14 +10,14 @@ import time, os
 from threading import Thread
 from Queue import Empty
 
-from calibre.library.database2 import LibraryDatabase2
 from calibre.utils.ipc.server import Server
 from calibre.utils.ipc.job import ParallelJob
 
 
-def move_library(from_, to, notification = lambda x:x):
+def move_library(from_, to, notification=lambda x:x):
+    from calibre.db import get_db_loader
     time.sleep(1)
-    old = LibraryDatabase2(from_)
+    old = get_db_loader()[0](from_)
     old.move_library_to(to, notification)
     return True
 
diff --git a/src/calibre/library/server/main.py b/src/calibre/library/server/main.py
index 486c0dbb68..a97eb53618 100644
--- a/src/calibre/library/server/main.py
+++ b/src/calibre/library/server/main.py
@@ -100,7 +100,7 @@ def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
 
 
 def main(args=sys.argv):
-    from calibre.library.database2 import LibraryDatabase2
+    from calibre.db import get_db_loader
     parser = option_parser()
     opts, args = parser.parse_args(args)
     if opts.daemonize and not iswindows:
@@ -116,7 +116,7 @@ def main(args=sys.argv):
         print('No saved library path. Use the --with-library option'
                 ' to specify the path to the library you want to use.')
         return 1
-    db = LibraryDatabase2(opts.with_library)
+    db = get_db_loader()[0](opts.with_library)
     server = LibraryServer(db, opts, show_tracebacks=opts.develop)
     server.start()
     return 0

From 934d4ba258fa71a23b6d3fe3b0748d11d5237e35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 21:15:02 +0530
Subject: [PATCH 0253/1154] Use the correct metadata backup implementation

---
 src/calibre/db/__init__.py         | 3 +--
 src/calibre/gui2/library/models.py | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index b8e46b4ed2..434d9ae317 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -136,8 +136,7 @@ Various things that require other things before they can be migrated:
                     columns/categories/searches info into
                     self.field_metadata.
     2. Port library/restore.py
-    3. Replace the metadatabackup thread with the new implementation when using the new backend.
-    4. Check that content server reloading on metadata,db change, metadata
+    3. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
 '''
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index af293b864d..738b42a669 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -21,7 +21,7 @@ from calibre.utils.date import dt_factory, qt_to_dt, as_local_time
 from calibre.utils.icu import sort_key
 from calibre.utils.search_query_parser import SearchQueryParser
 from calibre.db.search import _match, CONTAINS_MATCH, EQUALS_MATCH, REGEXP_MATCH
-from calibre.library.caches import (MetadataBackup, force_to_bool)
+from calibre.library.caches import force_to_bool
 from calibre.library.save_to_disk import find_plugboard
 from calibre import strftime, isbytestring
 from calibre.constants import filesystem_encoding, DEBUG, config_dir
@@ -234,6 +234,10 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.start_metadata_backup()
 
     def start_metadata_backup(self):
+        if hasattr(self.db, 'new_api'):
+            from calibre.db.backup import MetadataBackup
+        else:
+            from calibre.library.caches import MetadataBackup
         self.metadata_backup = MetadataBackup(self.db)
         self.metadata_backup.start()
 
@@ -1209,7 +1213,6 @@ class DeviceBooksModel(BooksModel):  # {{{
         self.book_in_library = None
         self.sync_icon = QIcon(I('sync.png'))
 
-
     def counts(self):
         return Counts(len(self.db), len(self.db), len(self.map))
 
@@ -1613,3 +1616,4 @@ class DeviceBooksModel(BooksModel):  # {{{
 # }}}
 
 
+

From e01a3a263daf17c0ff3da0f3f8d135899060b3c5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 21:24:39 +0530
Subject: [PATCH 0254/1154] Missing legacy API

---
 src/calibre/db/cache.py | 4 ++++
 src/calibre/db/view.py  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index ce8ce288ea..7a17f3468b 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1541,6 +1541,10 @@ class Cache(object):
     def saved_search_rename(self, old_name, new_name):
         self._search_api.saved_searches.rename(old_name, new_name)
 
+    @write_api
+    def change_search_locations(self, newlocs):
+        self._search_api.change_locations(newlocs)
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index bb9131e212..ffaa0ce746 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -290,6 +290,9 @@ class View(object):
     def get_search_restriction_book_count(self):
         return self.search_restriction_book_count
 
+    def change_search_locations(self, newlocs):
+        self.cache.change_search_locations(newlocs)
+
     def set_marked_ids(self, id_dict):
         '''
         ids in id_dict are "marked". They can be searched for by

From 1770f6b1e9accd9264cacce45f7f6fa956dd6a26 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 21:41:36 +0530
Subject: [PATCH 0255/1154] Replace use of db.conn.close() as it is not
 supported in the new backend

---
 src/calibre/db/__init__.py                  | 2 +-
 src/calibre/gui2/dialogs/check_library.py   | 4 ++--
 src/calibre/gui2/dialogs/restore_library.py | 2 +-
 src/calibre/gui2/ui.py                      | 2 +-
 src/calibre/library/restore.py              | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 434d9ae317..930b99f8bf 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -135,7 +135,7 @@ Various things that require other things before they can be migrated:
     1. From initialize_dynamic(): Also add custom
                     columns/categories/searches info into
                     self.field_metadata.
-    2. Port library/restore.py
+    2. Port library/restore.py, check_library.py and reinit_db() from debug.py
     3. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index f3c1022ba7..2fc90e5c94 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -45,7 +45,7 @@ class DBCheck(QDialog): # {{{
         self.user_version = self.db.user_version
         self.rejected = False
         self.db.clean()
-        self.db.conn.close()
+        self.db.close()
         self.closed_orig_conn = True
         t = DBThread(self.db.dbpath, False)
         t.connect()
@@ -80,7 +80,7 @@ class DBCheck(QDialog): # {{{
             self.pb.setMaximum(self.count)
             self.pb.setValue(0)
             self.msg.setText(_('Loading database from SQL'))
-            self.db.conn.close()
+            self.db.close()
             self.ndbpath = PersistentTemporaryFile('.db')
             self.ndbpath.close()
             self.ndbpath = self.ndbpath.name
diff --git a/src/calibre/gui2/dialogs/restore_library.py b/src/calibre/gui2/dialogs/restore_library.py
index 7ba852fb13..a460460120 100644
--- a/src/calibre/gui2/dialogs/restore_library.py
+++ b/src/calibre/gui2/dialogs/restore_library.py
@@ -103,7 +103,7 @@ def restore_database(db, parent=None):
                 'blank list of books.'
                 '<p>Do you want to restore the database?')):
         return False
-    db.conn.close()
+    db.close()
     d = DBRestore(parent, db.library_path)
     d.exec_()
     r = d.restorer
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 5e4f75895a..6f57ee060a 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -622,7 +622,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         if olddb is not None:
             try:
                 if call_close:
-                    olddb.conn.close()
+                    olddb.close()
             except:
                 import traceback
                 traceback.print_exc()
diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py
index ac1fce5783..f703451d2d 100644
--- a/src/calibre/library/restore.py
+++ b/src/calibre/library/restore.py
@@ -130,7 +130,7 @@ class Restore(Thread):
                                  restore_all_prefs=True,
                                  progress_callback=self.progress_callback)
             db.commit()
-            db.conn.close()
+            db.close()
             self.progress_callback(None, 1)
             if 'field_metadata' in prefs:
                 self.progress_callback(_('Finished restoring preferences and column metadata'), 1)
@@ -232,7 +232,7 @@ class Restore(Thread):
             for i,args in enumerate(self.custom_columns.values()):
                 db.create_custom_column(*args)
                 self.progress_callback(_('creating custom column ')+args[0], i+1)
-        db.conn.close()
+        db.close()
 
     def restore_books(self):
         self.progress_callback(None, len(self.books))
@@ -252,7 +252,7 @@ class Restore(Thread):
             db.conn.execute('UPDATE authors SET link=? WHERE name=?',
                             (link, author.replace(',', '|')))
         db.conn.commit()
-        db.conn.close()
+        db.close()
 
     def restore_book(self, book, db):
         db.create_book_entry(book['mi'], add_duplicates=True,

From f0ef5f0387049a96108298c3804f41bcb1a54192 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 21:51:48 +0530
Subject: [PATCH 0256/1154] ...

---
 src/calibre/db/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 930b99f8bf..a989e45dce 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -139,4 +139,5 @@ Various things that require other things before they can be migrated:
     3. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
+    4. Check for mem leaks when switching libraries
 '''

From f2f411f9399788162e68a56df15d921c3e572c00 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 19 Jul 2013 22:13:32 +0530
Subject: [PATCH 0257/1154] Accidentally ignored commit_dirty_cache()

---
 src/calibre/db/cache.py        | 6 ++++++
 src/calibre/db/legacy.py       | 6 +-----
 src/calibre/db/tests/legacy.py | 2 +-
 src/calibre/gui2/ui.py         | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 7a17f3468b..7cfe9bc4a6 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -800,6 +800,12 @@ class Cache(object):
             self.dirtied_sequence = max(new_dirtied.itervalues()) + 1
             self.dirtied_cache.update(new_dirtied)
 
+    @write_api
+    def commit_dirty_cache(self):
+        book_ids = [(x,) for x in self.dirtied_cache]
+        if book_ids:
+            self.backend.conn.executemany('INSERT OR IGNORE INTO metadata_dirtied (book) VALUES (?)', book_ids)
+
     @write_api
     def set_field(self, name, book_id_to_val_map, allow_case_change=True, do_path_update=True):
         f = self.fields[name]
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 54f1fe5c1d..8cf6007479 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -890,6 +890,7 @@ LibraryDatabase.saved_search_set_all = MT(lambda self, smap:self.new_api.saved_s
 LibraryDatabase.saved_search_delete = MT(lambda self, x:self.new_api.saved_search_delete(x))
 LibraryDatabase.saved_search_add = MT(lambda self, x, y:self.new_api.saved_search_add(x, y))
 LibraryDatabase.saved_search_rename = MT(lambda self, x, y:self.new_api.saved_search_rename(x, y))
+LibraryDatabase.commit_dirty_cache = MT(lambda self: self.new_api.commit_dirty_cache())
 # Cleaning is not required anymore
 LibraryDatabase.clean = LibraryDatabase.clean_custom = MT(lambda self:None)
 LibraryDatabase.clean_standard_field = MT(lambda self, field, commit=False:None)
@@ -899,8 +900,3 @@ LibraryDatabase.commit = MT(lambda self:None)
 
 del MT
 
-
-
-
-
-
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 0c4efb9f6e..f9caa7a304 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -396,7 +396,7 @@ class LegacyTest(BaseTest):
 
             # Internal API
             'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
-            'construct_path_name', 'clear_dirtied', 'commit_dirty_cache', 'initialize_database', 'initialize_dynamic',
+            'construct_path_name', 'clear_dirtied', 'initialize_database', 'initialize_dynamic',
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
             'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book', 'dirtied_sequence',
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 6f57ee060a..e2f02eb578 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -876,7 +876,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
                 try:
                     self.shutdown(write_settings=False)
                 except:
-                    pass
+                    import traceback
+                    traceback.print_exc()
                 e.accept()
             else:
                 e.ignore()

From 26fcfc70f1603dea6e61eac174d88cbc4e027106 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 10:07:49 +0530
Subject: [PATCH 0258/1154] Speed up book list rendering by using the new api
 to get values

---
 src/calibre/db/cache.py            |  10 +++
 src/calibre/db/fields.py           |  12 +++-
 src/calibre/db/tables.py           |   2 +-
 src/calibre/gui2/library/models.py | 111 ++++++++++++++++++++++++++++-
 4 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 7cfe9bc4a6..a478a23664 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -318,6 +318,16 @@ class Cache(object):
         except (KeyError, IndexError):
             return default_value
 
+    @read_api
+    def fast_field_for(self, field_obj, book_id, default_value=None):
+        ' Same as field_for, except that it avoids the extra lookup to get the field object '
+        if field_obj.is_composite:
+            return field_obj.get_value_with_cache(book_id, partial(self._get_metadata, get_user_categories=False))
+        try:
+            return field_obj.for_book(book_id, default_value=default_value)
+        except (KeyError, IndexError):
+            return default_value
+
     @read_api
     def composite_for(self, name, book_id, mi=None, default_value=''):
         try:
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index e028ff5d99..8c6d18a74d 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -23,6 +23,7 @@ class Field(object):
 
     is_many = False
     is_many_many = False
+    is_composite = False
 
     def __init__(self, name, table):
         self.name, self.table = name, table
@@ -148,6 +149,8 @@ class OneToOneField(Field):
 
 class CompositeField(OneToOneField):
 
+    is_composite = True
+
     def __init__(self, *args, **kwargs):
         OneToOneField.__init__(self, *args, **kwargs)
 
@@ -229,6 +232,14 @@ class OnDeviceField(OneToOneField):
         self.is_multiple = False
         self.cache = {}
         self._lock = Lock()
+        self._metadata = {
+            'table':None, 'column':None, 'datatype':'text', 'is_multiple':{},
+            'kind':'field', 'name':_('On Device'), 'search_terms':['ondevice'],
+            'is_custom':False, 'is_category':False, 'is_csp': False, 'display':{}}
+
+    @property
+    def metadata(self):
+        return self._metadata
 
     def clear_caches(self, book_ids=None):
         with self._lock:
@@ -330,7 +341,6 @@ class ManyToManyField(Field):
 
     def __init__(self, *args, **kwargs):
         Field.__init__(self, *args, **kwargs)
-        self.alphabetical_sort = self.name != 'authors'
 
     def for_book(self, book_id, default_value=None):
         ids = self.table.book_col_map.get(book_id, ())
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 9b9ff4e9e0..3e1db9400f 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -113,7 +113,7 @@ class SizeTable(OneToOneTable):
         for row in db.conn.execute(
                 'SELECT books.id, (SELECT MAX(uncompressed_size) FROM data '
                 'WHERE data.book=books.id) FROM books'):
-            self.book_col_map[row[0]] = self.unserialize(row[1])
+            self.book_col_map[row[0]] = self.unserialize(row[1] or 0)
 
     def update_sizes(self, size_map):
         self.book_col_map.update(size_map)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 738b42a669..4a1a1a3e88 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -227,7 +227,10 @@ class BooksModel(QAbstractTableModel):  # {{{
             elif col in self.custom_columns:
                 self.headers[col] = self.custom_columns[col]['name']
 
-        self.build_data_convertors()
+        if hasattr(self.db, 'new_api'):
+            self.build_new_data_convertors()
+        else:
+            self.build_data_convertors()
         self.reset()
         self.database_changed.emit(db)
         self.stop_metadata_backup()
@@ -634,6 +637,112 @@ class BooksModel(QAbstractTableModel):  # {{{
             img = self.default_image
         return img
 
+    def build_new_data_convertors(self):
+
+        def renderer(field, decorator=False):
+            idfunc = self.db.id
+            fffunc = self.db.new_api.fast_field_for
+            field_obj = self.db.new_api.fields[field]
+            m = field_obj.metadata.copy()
+            if 'display' not in m:
+                m['display'] = {}
+            dt = m['datatype']
+
+            if decorator == 'bool':
+                bt = self.db.new_api.pref('bools_are_tristate')
+                bn = self.bool_no_icon
+                by = self.bool_yes_icon
+                def func(idx):
+                    val = force_to_bool(fffunc(field_obj, idfunc(idx)))
+                    if val is None:
+                        return NONE if bt else bn
+                    return by if val else bn
+            elif field == 'size':
+                sz_mult = 1.0/(1024**2)
+                def func(idx):
+                    val = fffunc(field_obj, idfunc(idx), default_value=0)
+                    ans = u'%.1f' % (val * sz_mult)
+                    if val > 0 and ans == u'0.0':
+                        ans = u'<0.1'
+                    return QVariant(ans)
+            elif field == 'languages':
+                def func(idx):
+                    return QVariant(', '.join(calibre_langcode_to_name(x) for x in fffunc(field_obj, idfunc(idx))))
+            elif field == 'ondevice' and decorator:
+                by = self.bool_yes_icon
+                bb = self.bool_blank_icon
+                def func(idx):
+                    return by if fffunc(field_obj, idfunc(idx)) else bb
+            elif dt in {'text', 'comments', 'composite', 'enumeration'}:
+                if m['is_multiple']:
+                    jv = m['is_multiple']['list_to_ui']
+                    do_sort = field == 'tags'
+                    if do_sort:
+                        def func(idx):
+                            return QVariant(jv.join(sorted(fffunc(field_obj, idfunc(idx), default_value=()), key=sort_key)))
+                    else:
+                        def func(idx):
+                            return QVariant(jv.join(fffunc(field_obj, idfunc(idx), default_value=())))
+                else:
+                    if dt in {'text', 'composite', 'enumeration'} and m['display'].get('use_decorations', False):
+                        def func(idx):
+                            text = fffunc(field_obj, idfunc(idx))
+                            return QVariant(text) if force_to_bool(text) is None else NONE
+                    else:
+                        def func(idx):
+                            return QVariant(fffunc(field_obj, idfunc(idx), default_value=''))
+            elif dt == 'datetime':
+                def func(idx):
+                    return QVariant(fffunc(field_obj, idfunc(idx), default_value=UNDEFINED_QDATETIME))
+            elif dt == 'rating':
+                def func(idx):
+                    return QVariant(int(fffunc(field_obj, idfunc(idx), default_value=0)/2.0))
+            elif dt == 'series':
+                sidx_field = self.db.new_api.fields[field + '_index']
+                fffunc = self.db.new_api._fast_field_for
+                read_lock = self.db.new_api.read_lock
+                def func(idx):
+                    book_id = idfunc(idx)
+                    with read_lock:
+                        series = fffunc(field_obj, book_id, default_value=False)
+                        if series:
+                            return QVariant('%s [%s]' % (series, fmt_sidx(fffunc(sidx_field, book_id, default_value=1.0))))
+                    return NONE
+            elif dt in {'int', 'float'}:
+                fmt = m['display'].get('number_format', None)
+                def func(idx):
+                    val = fffunc(field_obj, idfunc(idx))
+                    if val is None:
+                        return NONE
+                    if fmt:
+                        try:
+                            return QVariant(fmt.format(val))
+                        except (TypeError, ValueError, AttributeError, IndexError):
+                            pass
+                    return QVariant(val)
+            else:
+                def func(idx):
+                    return NONE
+
+            return func
+
+        self.dc = {f:renderer(f) for f in 'title authors size timestamp pubdate last_modified rating publisher tags series ondevice languages'.split()}
+        self.dc_decorator = {f:renderer(f, True) for f in ('ondevice',)}
+
+        for col in self.custom_columns:
+            self.dc[col] = renderer(col)
+            m = self.custom_columns[col]
+            dt = m['datatype']
+            mult = m['is_multiple']
+            if dt in {'text', 'composite', 'enumeration'} and not mult and m['display'].get('use_decorations', False):
+                self.dc_decorator[col] = renderer(col, 'bool')
+            elif dt == 'bool':
+                self.dc_decorator[col] = renderer(col, 'bool')
+
+        # build a index column to data converter map, to remove the string lookup in the data loop
+        self.column_to_dc_map = [self.dc[col] for col in self.column_map]
+        self.column_to_dc_decorator_map = [self.dc_decorator.get(col, None) for col in self.column_map]
+
     def build_data_convertors(self):
         def authors(r, idx=-1):
             au = self.db.data[r][idx]

From fb450951533b53a5df956e279f6d32934408503b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 10:26:38 +0530
Subject: [PATCH 0259/1154] Clear the composites cache correctly

---
 src/calibre/db/cache.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index a478a23664..9a19f4bb73 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -83,7 +83,7 @@ class Cache(object):
     def __init__(self, backend):
         self.backend = backend
         self.fields = {}
-        self.composites = set()
+        self.composites = {}
         self.read_lock, self.write_lock = create_locks()
         self.format_metadata_cache = defaultdict(dict)
         self.formatter_template_cache = {}
@@ -144,6 +144,11 @@ class Cache(object):
     def initialize_template_cache(self):
         self.formatter_template_cache = {}
 
+    @write_api
+    def clear_composite_caches(self, book_ids=None):
+        for field in self.composites.itervalues():
+            field.clear_caches(book_ids=book_ids)
+
     @write_api
     def clear_caches(self, book_ids=None):
         self._initialize_template_cache()  # Clear the formatter template cache
@@ -265,7 +270,7 @@ class Cache(object):
             for field, table in self.backend.tables.iteritems():
                 self.fields[field] = create_field(field, table)
                 if table.metadata['datatype'] == 'composite':
-                    self.composites.add(field)
+                    self.composites[field] = self.fields[field]
 
             self.fields['ondevice'] = create_field('ondevice',
                     VirtualTable('ondevice'))
@@ -788,11 +793,13 @@ class Cache(object):
 
     @write_api
     def update_last_modified(self, book_ids, now=None):
-        if now is None:
-            now = nowf()
         if book_ids:
+            if now is None:
+                now = nowf()
             f = self.fields['last_modified']
             f.writer.set_books({book_id:now for book_id in book_ids}, self.backend)
+            if self.composites:
+                self._clear_composite_caches(book_ids)
 
     @write_api
     def mark_as_dirty(self, book_ids):
@@ -846,10 +853,6 @@ class Cache(object):
             sf = self.fields[f.name+'_index']
             dirtied |= sf.writer.set_books(simap, self.backend, allow_case_change=False)
 
-        if dirtied and self.composites:
-            for name in self.composites:
-                self.fields[name].clear_caches(book_ids=dirtied)
-
         if dirtied and update_path and do_path_update:
             self._update_path(dirtied, mark_as_dirtied=False)
 

From 4ffb8e22020bd50bf9250795e68f9deeb679eeba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 10:28:35 +0530
Subject: [PATCH 0260/1154] Restore getting the size value to old behavior

---
 src/calibre/db/tables.py           | 2 +-
 src/calibre/gui2/library/models.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 3e1db9400f..9b9ff4e9e0 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -113,7 +113,7 @@ class SizeTable(OneToOneTable):
         for row in db.conn.execute(
                 'SELECT books.id, (SELECT MAX(uncompressed_size) FROM data '
                 'WHERE data.book=books.id) FROM books'):
-            self.book_col_map[row[0]] = self.unserialize(row[1] or 0)
+            self.book_col_map[row[0]] = self.unserialize(row[1])
 
     def update_sizes(self, size_map):
         self.book_col_map.update(size_map)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 4a1a1a3e88..5705f57000 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -660,7 +660,7 @@ class BooksModel(QAbstractTableModel):  # {{{
             elif field == 'size':
                 sz_mult = 1.0/(1024**2)
                 def func(idx):
-                    val = fffunc(field_obj, idfunc(idx), default_value=0)
+                    val = fffunc(field_obj, idfunc(idx), default_value=0) or 0
                     ans = u'%.1f' % (val * sz_mult)
                     if val > 0 and ans == u'0.0':
                         ans = u'<0.1'

From f6d8c8f1cd14f4767ee6b504cdc055cd970340fa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 10:41:36 +0530
Subject: [PATCH 0261/1154] ...

---
 src/calibre/gui2/library/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 5705f57000..7320e36ee5 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -674,7 +674,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                 def func(idx):
                     return by if fffunc(field_obj, idfunc(idx)) else bb
             elif dt in {'text', 'comments', 'composite', 'enumeration'}:
-                if m['is_multiple']:
+                if m['is_multiple'] and not field_obj.is_composite:
                     jv = m['is_multiple']['list_to_ui']
                     do_sort = field == 'tags'
                     if do_sort:
@@ -717,7 +717,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                     if fmt:
                         try:
                             return QVariant(fmt.format(val))
-                        except (TypeError, ValueError, AttributeError, IndexError):
+                        except (TypeError, ValueError, AttributeError, IndexError, KeyError):
                             pass
                     return QVariant(val)
             else:

From 9f83d3b59d0fc6b5d0aa2f8a2e1b547714489fd1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 10:55:14 +0530
Subject: [PATCH 0262/1154] Fix refresh_ids() and rendering of size and
 datetime fields

---
 src/calibre/db/view.py             |  2 +-
 src/calibre/gui2/library/models.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index ffaa0ce746..a8cd75d2c2 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -321,7 +321,7 @@ class View(object):
         if self.search_restriction or self.base_restriction:
             self.search('', return_matches=False)
 
-    def refresh_ids(self, db, ids):
+    def refresh_ids(self, ids):
         self.cache.clear_caches(book_ids=ids)
         try:
             return list(map(self.id_to_index, ids))
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 7320e36ee5..e70122fd36 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -17,7 +17,7 @@ from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_autho
 from calibre.ebooks.metadata.book.formatter import SafeFormat
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.config import tweaks, device_prefs, prefs
-from calibre.utils.date import dt_factory, qt_to_dt, as_local_time
+from calibre.utils.date import dt_factory, qt_to_dt, as_local_time, UNDEFINED_DATE
 from calibre.utils.icu import sort_key
 from calibre.utils.search_query_parser import SearchQueryParser
 from calibre.db.search import _match, CONTAINS_MATCH, EQUALS_MATCH, REGEXP_MATCH
@@ -661,10 +661,10 @@ class BooksModel(QAbstractTableModel):  # {{{
                 sz_mult = 1.0/(1024**2)
                 def func(idx):
                     val = fffunc(field_obj, idfunc(idx), default_value=0) or 0
+                    if val is 0:
+                        return NONE
                     ans = u'%.1f' % (val * sz_mult)
-                    if val > 0 and ans == u'0.0':
-                        ans = u'<0.1'
-                    return QVariant(ans)
+                    return QVariant(u'<0.1' if ans == u'0.0' else ans)
             elif field == 'languages':
                 def func(idx):
                     return QVariant(', '.join(calibre_langcode_to_name(x) for x in fffunc(field_obj, idfunc(idx))))
@@ -693,7 +693,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                             return QVariant(fffunc(field_obj, idfunc(idx), default_value=''))
             elif dt == 'datetime':
                 def func(idx):
-                    return QVariant(fffunc(field_obj, idfunc(idx), default_value=UNDEFINED_QDATETIME))
+                    return QVariant(QDateTime(as_local_time(fffunc(field_obj, idfunc(idx), default_value=UNDEFINED_DATE))))
             elif dt == 'rating':
                 def func(idx):
                     return QVariant(int(fffunc(field_obj, idfunc(idx), default_value=0)/2.0))

From 067ed5b978089956cc4b5ad608af265c56163a3c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 11:40:56 +0530
Subject: [PATCH 0263/1154] Add tests for composite cache invalidation

---
 src/calibre/db/tests/writing.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 26f73964df..4f2bacf921 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -543,3 +543,32 @@ class WritingTest(BaseTest):
             self.assertEqual(c.field_for('#series_index', 1), 3.0)
             self.assertEqual(c.field_for('#series_index', 2), 4.0)
     # }}}
+
+    def test_composite(self):  # {{{
+        ' Test that the composite field cache is properly invalidated on writes '
+        cache = self.init_cache()
+        cache.create_custom_column('tc', 'TC', 'composite', False, display={
+            'composite_template':'{title} {author_sort} {title_sort} {formats} {tags} {series} {series_index}'})
+        cache = self.init_cache()
+
+        def test_invalidate():
+            c = self.init_cache()
+            for bid in cache.all_book_ids():
+                self.assertEqual(cache.field_for('#tc', bid), c.field_for('#tc', bid))
+
+        cache.set_field('title', {1:'xx', 3:'yy'})
+        test_invalidate()
+        cache.set_field('series_index', {1:9, 3:11})
+        test_invalidate()
+        cache.rename_items('tags', {cache.get_item_id('tags', 'Tag One'):'xxx', cache.get_item_id('tags', 'News'):'news'})
+        test_invalidate()
+        cache.remove_items('tags', (cache.get_item_id('tags', 'news'),))
+        test_invalidate()
+        cache.set_sort_for_authors({cache.get_item_id('authors', 'Author One'):'meow'})
+        test_invalidate()
+        cache.remove_formats({1:{'FMT1'}})
+        test_invalidate()
+        cache.add_format(1, 'ADD', BytesIO(b'xxxx'))
+        test_invalidate()
+    # }}}
+

From 9134866ad61c505b98d720bd134dcc18bfd5ba7e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 11:44:36 +0530
Subject: [PATCH 0264/1154] ...

---
 src/calibre/db/__init__.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index a989e45dce..ec98073776 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -132,12 +132,9 @@ def get_db_loader():
 
 '''
 Various things that require other things before they can be migrated:
-    1. From initialize_dynamic(): Also add custom
-                    columns/categories/searches info into
-                    self.field_metadata.
-    2. Port library/restore.py, check_library.py and reinit_db() from debug.py
-    3. Check that content server reloading on metadata,db change, metadata
+    1. Port library/restore.py, check_library.py and reinit_db() from debug.py
+    2. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
-    4. Check for mem leaks when switching libraries
+    3. Check for mem leaks when switching libraries
 '''

From c77613d615b4d20d2278463a73a6277c896c9ff8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 12:40:16 +0530
Subject: [PATCH 0265/1154] Implement reinit_db() with apsw

---
 src/calibre/db/__init__.py |  2 +-
 src/calibre/debug.py       | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index ec98073776..0628e7b51b 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -132,7 +132,7 @@ def get_db_loader():
 
 '''
 Various things that require other things before they can be migrated:
-    1. Port library/restore.py, check_library.py and reinit_db() from debug.py
+    1. Port library/restore.py, check_library.py
     2. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 7a1fe754fa..090e1d6ced 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -84,9 +84,47 @@ Everything after the -- is passed to the script.
 
     return parser
 
+def reinit_db_new(dbpath, callback=None, sql_dump=None):
+    from calibre.db.backend import Connection
+    import apsw
+    import shutil
+    from io import StringIO
+    from contextlib import closing
+    if callback is None:
+        callback = lambda x, y: None
+
+    with closing(Connection(dbpath)) as conn:
+        uv = conn.get('PRAGMA user_version;', all=False)
+        if sql_dump is None:
+            buf = StringIO()
+            shell = apsw.Shell(db=conn, stdout=buf)
+            shell.process_command('.dump')
+            sql = buf.getvalue().encode('utf-8')
+        else:
+            sql = open(sql_dump, 'rb').read()
+
+    dest = dbpath + '.tmp'
+    callback(1, True)
+    try:
+        with closing(Connection(dest)) as conn:
+            conn.execute(sql)
+            conn.execute('PRAGMA User_version=%d;'%int(uv))
+        os.remove(dbpath)
+        shutil.copyfile(dest, dbpath)
+    finally:
+        callback(1, False)
+        if os.path.exists(dest):
+            os.remove(dest)
+    prints('Database successfully re-initialized')
+
+
 def reinit_db(dbpath, callback=None, sql_dump=None):
     if not os.path.exists(dbpath):
         raise ValueError(dbpath + ' does not exist')
+    from calibre.utils.config_base import tweaks
+    if tweaks.get('use_new_db', False):
+        return reinit_db_new(dbpath, callback, sql_dump)
+
     from calibre.library.sqlite import connect
     from contextlib import closing
     import shutil

From 8ac82e6b47912fb549fe52aea72b731ef0cd19c8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 12:54:04 +0530
Subject: [PATCH 0266/1154] pep8

---
 src/calibre/gui2/dialogs/check_library.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index 2fc90e5c94..2769a422ac 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -17,7 +17,8 @@ from calibre import prints, as_unicode
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.library.sqlite import DBThread, OperationalError
 
-class DBCheck(QDialog): # {{{
+
+class DBCheck(QDialog):  # {{{
 
     def __init__(self, parent, db):
         QDialog.__init__(self, parent)
@@ -96,7 +97,6 @@ class DBCheck(QDialog): # {{{
             self.error = (as_unicode(e), traceback.format_exc())
             self.reject()
 
-
     def do_one_load(self):
         if self.rejected:
             return
@@ -338,7 +338,7 @@ class CheckLibraryDialog(QDialog):
 
         t = self.log
         t.clear()
-        t.setColumnCount(2);
+        t.setColumnCount(2)
         t.setHeaderLabels([_('Name'), _('Path from library')])
         self.all_items = []
         self.top_level_items = {}
@@ -396,7 +396,7 @@ class CheckLibraryDialog(QDialog):
         tl = self.top_level_items['missing_formats']
         child_count = tl.childCount()
         for i in range(0, child_count):
-            item = tl.child(i);
+            item = tl.child(i)
             id = item.data(0, Qt.UserRole).toInt()[0]
             all = self.db.formats(id, index_is_id=True, verify_formats=False)
             all = set([f.strip() for f in all.split(',')]) if all else set()
@@ -409,7 +409,7 @@ class CheckLibraryDialog(QDialog):
         tl = self.top_level_items['missing_covers']
         child_count = tl.childCount()
         for i in range(0, child_count):
-            item = tl.child(i);
+            item = tl.child(i)
             id = item.data(0, Qt.UserRole).toInt()[0]
             self.db.set_has_cover(id, False)
 
@@ -417,7 +417,7 @@ class CheckLibraryDialog(QDialog):
         tl = self.top_level_items['extra_covers']
         child_count = tl.childCount()
         for i in range(0, child_count):
-            item = tl.child(i);
+            item = tl.child(i)
             id = item.data(0, Qt.UserRole).toInt()[0]
             self.db.set_has_cover(id, True)
 
@@ -441,3 +441,4 @@ if __name__ == '__main__':
     from calibre.library import db
     d = CheckLibraryDialog(None, db())
     d.exec_()
+

From d05935ea2a9eb870c8d12218da3cb8b03ab05582 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 15:14:03 +0530
Subject: [PATCH 0267/1154] Minor fixes

---
 src/calibre/debug.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 090e1d6ced..906fe2f3c4 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -94,21 +94,21 @@ def reinit_db_new(dbpath, callback=None, sql_dump=None):
         callback = lambda x, y: None
 
     with closing(Connection(dbpath)) as conn:
-        uv = conn.get('PRAGMA user_version;', all=False)
+        uv = int(conn.get('PRAGMA user_version;', all=False))
         if sql_dump is None:
             buf = StringIO()
             shell = apsw.Shell(db=conn, stdout=buf)
             shell.process_command('.dump')
-            sql = buf.getvalue().encode('utf-8')
+            sql = buf.getvalue()
         else:
-            sql = open(sql_dump, 'rb').read()
+            sql = open(sql_dump, 'rb').read().decode('utf-8')
 
     dest = dbpath + '.tmp'
     callback(1, True)
     try:
         with closing(Connection(dest)) as conn:
             conn.execute(sql)
-            conn.execute('PRAGMA User_version=%d;'%int(uv))
+            conn.execute('PRAGMA user_version=%d;'%int(uv))
         os.remove(dbpath)
         shutil.copyfile(dest, dbpath)
     finally:

From 39425a15a33f3bdbdee15494b36bb41d0d9cf296 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 15:46:34 +0530
Subject: [PATCH 0268/1154] New API version of library check

---
 src/calibre/db/__init__.py                 |  2 +-
 src/calibre/db/backend.py                  | 39 ++++++++++++--
 src/calibre/db/cache.py                    |  4 ++
 src/calibre/gui2/actions/choose_library.py |  7 ++-
 src/calibre/gui2/dialogs/check_library.py  | 59 +++++++++++++++++++++-
 src/calibre/utils/filenames.py             | 10 +++-
 6 files changed, 112 insertions(+), 9 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 0628e7b51b..1fe7da1e04 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -132,7 +132,7 @@ def get_db_loader():
 
 '''
 Various things that require other things before they can be migrated:
-    1. Port library/restore.py, check_library.py
+    1. Port library/restore.py
     2. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 914248fedc..f203f5ed0c 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -16,7 +16,7 @@ import apsw
 from calibre import isbytestring, force_unicode, prints
 from calibre.constants import (iswindows, filesystem_encoding,
         preferred_encoding)
-from calibre.ptempfile import PersistentTemporaryFile
+from calibre.ptempfile import PersistentTemporaryFile, TemporaryFile
 from calibre.db import SPOOL_SIZE
 from calibre.db.schema_upgrades import SchemaUpgrade
 from calibre.db.errors import NoSuchFormat
@@ -25,8 +25,8 @@ from calibre.ebooks.metadata import title_sort, author_to_author_sort
 from calibre.utils.icu import sort_key
 from calibre.utils.config import to_json, from_json, prefs, tweaks
 from calibre.utils.date import utcfromtimestamp, parse_date
-from calibre.utils.filenames import (is_case_sensitive, samefile, hardlink_file, ascii_filename,
-                                     WindowsAtomicFolderMove)
+from calibre.utils.filenames import (
+    is_case_sensitive, samefile, hardlink_file, ascii_filename, WindowsAtomicFolderMove, atomic_rename)
 from calibre.utils.magick.draw import save_cover_data_to
 from calibre.utils.recycle_bin import delete_tree, delete_file
 from calibre.utils.formatter_functions import load_user_template_functions
@@ -967,10 +967,41 @@ class DB(object):
         self.conn.execute('UPDATE custom_columns SET mark_for_delete=1 WHERE id=?', (data['num'],))
 
     def close(self):
-        if self._conn is not None:
+        if getattr(self, '_conn', None) is not None:
             self._conn.close()
             del self._conn
 
+    def reopen(self):
+        self.close()
+        self._conn = None
+        self.conn
+
+    def dump_and_restore(self, callback=None, sql=None):
+        from io import StringIO
+        from contextlib import closing
+        if callback is None:
+            callback = lambda x: x
+        uv = int(self.user_version)
+
+        if sql is None:
+            callback(_('Dumping database to SQL') + '...')
+            buf = StringIO()
+            shell = apsw.Shell(db=self.conn, stdout=buf)
+            shell.process_command('.dump')
+            sql = buf.getvalue()
+
+        with TemporaryFile(suffix='_tmpdb.db', dir=os.path.dirname(self.dbpath)) as tmpdb:
+            callback(_('Restoring database from SQL') + '...')
+            with closing(Connection(tmpdb)) as conn:
+                conn.execute(sql)
+                conn.execute('PRAGMA user_version=%d;'%uv)
+
+            self.close()
+            try:
+                atomic_rename(tmpdb, self.dbpath)
+            finally:
+                self.reopen()
+
     @dynamic_property
     def user_version(self):
         doc = 'The user version of this database'
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 9a19f4bb73..37d0428046 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1564,6 +1564,10 @@ class Cache(object):
     def change_search_locations(self, newlocs):
         self._search_api.change_locations(newlocs)
 
+    @write_api
+    def dump_and_restore(self, callback=None, sql=None):
+        return self.backend.dump_and_restore(callback=callback, sql=sql)
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 6857454ae4..f85eb09f37 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -413,14 +413,17 @@ class ChooseLibraryAction(InterfaceAction):
             self.gui.library_moved(db.library_path, call_close=False)
 
     def check_library(self):
-        from calibre.gui2.dialogs.check_library import CheckLibraryDialog, DBCheck
+        from calibre.gui2.dialogs.check_library import CheckLibraryDialog, DBCheck, DBCheckNew
         self.gui.library_view.save_state()
         m = self.gui.library_view.model()
         m.stop_metadata_backup()
         db = m.db
         db.prefs.disable_setting = True
 
-        d = DBCheck(self.gui, db)
+        if hasattr(db, 'new_api'):
+            d = DBCheckNew(self.gui, db)
+        else:
+            d = DBCheck(self.gui, db)
         d.start()
         try:
             d.conn.close()
diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index 2769a422ac..c1f8ed4f18 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -4,11 +4,12 @@ __docformat__ = 'restructuredtext en'
 __license__   = 'GPL v3'
 
 import os, shutil
+from threading import Thread
 
 from PyQt4.Qt import (QDialog, QVBoxLayout, QHBoxLayout, QTreeWidget, QLabel,
             QPushButton, QDialogButtonBox, QApplication, QTreeWidgetItem,
             QLineEdit, Qt, QProgressBar, QSize, QTimer, QIcon, QTextEdit,
-            QSplitter, QWidget)
+            QSplitter, QWidget, pyqtSignal)
 
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.library.check_library import CheckLibrary, CHECKS
@@ -17,6 +18,62 @@ from calibre import prints, as_unicode
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.library.sqlite import DBThread, OperationalError
 
+class DBCheckNew(QDialog):  # {{{
+
+    update_msg = pyqtSignal(object)
+
+    def __init__(self, parent, db):
+        QDialog.__init__(self, parent)
+        self.l = QVBoxLayout()
+        self.setLayout(self.l)
+        self.l1 = QLabel(_('Checking database integrity') + ' ' +
+                         _('This will take a while, please wait...'))
+        self.setWindowTitle(_('Checking database integrity'))
+        self.l1.setWordWrap(True)
+        self.l.addWidget(self.l1)
+        self.msg = QLabel('')
+        self.update_msg.connect(self.msg.setText, type=Qt.QueuedConnection)
+        self.l.addWidget(self.msg)
+        self.msg.setWordWrap(True)
+        self.bb = QDialogButtonBox(QDialogButtonBox.Cancel)
+        self.l.addWidget(self.bb)
+        self.bb.rejected.connect(self.reject)
+        self.resize(self.sizeHint() + QSize(100, 50))
+        self.error = None
+        self.db = db.new_api
+        self.closed_orig_conn = False
+        self.rejected = False
+
+    def start(self):
+        t = self.thread = Thread(target=self.dump_and_restore)
+        t.daemon = True
+        t.start()
+        QTimer.singleShot(100, self.check)
+        self.exec_()
+
+    def dump_and_restore(self):
+        try:
+            self.db.dump_and_restore(self.update_msg.emit)
+        except Exception as e:
+            import traceback
+            self.error = (as_unicode(e), traceback.format_exc())
+
+    def reject(self):
+        self.rejected = True
+        return QDialog.reject(self)
+
+    def check(self):
+        if self.rejected:
+            return
+        if self.thread.is_alive():
+            QTimer.singleShot(100, self.check)
+        else:
+            self.accept()
+
+    def break_cycles(self):
+        self.db = self.thread = None
+
+# }}}
 
 class DBCheck(QDialog):  # {{{
 
diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index d756978040..23ac8fd43a 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -383,4 +383,12 @@ def hardlink_file(src, dest):
         return
     os.link(src, dest)
 
-
+def atomic_rename(oldpath, newpath):
+    '''Replace the file newpath with the file oldpath. Can fail if the files
+    are on different volumes. If succeeds, guaranteed to be atomic. newpath may
+    or may not exist. If it exists, it is replaced. '''
+    if iswindows:
+        import win32file
+        win32file.MoveFileEx(oldpath, newpath, win32file.MOVEFILE_REPLACE_EXISTING|win32file.MOVEFILE_WRITE_THROUGH)
+    else:
+        os.rename(oldpath, newpath)

From 1a11c09d3cc72c41a10bdc2877be44a110cdf308 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 09:12:37 +0530
Subject: [PATCH 0269/1154] When reloading on dn modification, re-open the
 connection

This ensures that the content server does not continue to use a deleted
metadata.db.
---
 src/calibre/db/legacy.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 8cf6007479..13edf47999 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -117,6 +117,7 @@ class LibraryDatabase(object):
 
     def check_if_modified(self):
         if self.last_modified() > self.last_update_check:
+            self.backend.reopen()
             self.new_api.reload_from_db()
         self.last_update_check = utcnow()
 

From e7777df9aecf94488c47618295a113bf70d92074 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 09:29:52 +0530
Subject: [PATCH 0270/1154] Update taz.de (RSS)

---
 recipes/taz_rss.recipe | 55 ++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/recipes/taz_rss.recipe b/recipes/taz_rss.recipe
index 0535b6ef3a..d4fc0237da 100644
--- a/recipes/taz_rss.recipe
+++ b/recipes/taz_rss.recipe
@@ -1,3 +1,4 @@
+
 __license__ = 'GPL v3'
 __copyright__ = '2013, Alexander Schremmer <alex@alexanderweb.de>, Robert Riemann <robert@riemann.cc>'
 
@@ -6,10 +7,15 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class TazRSSRecipe(BasicNewsRecipe):
     title = u'Taz - die Tageszeitung'
-    description = u'Taz.de - die tageszeitung'
+    description = u'Taz.de - die tageszeitung (Anpassung von Robert)'
     __author__ = 'Alexander Schremmer, Robert Riemann'
     language = 'de'
     lang = 'de-DE'
+    category = 'news, Germany'
+    timefmt = ' [%a, %d %b %Y]'
+    publication_type = 'newspaper'
+    remove_empty_feeds = True
+    use_embedded_content = False
     oldest_article = 7
     max_articles_per_feed = 100
     publisher = 'taz Entwicklungs GmbH & Co. Medien KG'
@@ -20,24 +26,37 @@ class TazRSSRecipe(BasicNewsRecipe):
                           'language': lang,
                         }
     feeds = [
-             (u'Schlagzeilen', u'http://www.taz.de/!p3270;rss/'),
-             (u'Politik', u'http://www.taz.de/Politik/!p2;rss/'),
-             (u'Zukunft', u'http://www.taz.de/Zukunft/!p4;rss/'),
-             (u'Netz', u'http://www.taz.de/Netz/!p5;rss/'),
-             (u'Debatte', u'http://www.taz.de/Debatte/!p9;rss/'),
-             (u'Leben', u'http://www.taz.de/Leben/!p10;rss/'),
-             (u'Sport', u'http://www.taz.de/Sport/!p12;rss/'),
-             (u'Wahrheit', u'http://www.taz.de/Wahrheit/!p13;rss/'),
-             (u'Berlin', u'http://www.taz.de/Berlin/!p14;rss/'),
-             (u'Nord', u'http://www.taz.de/Nord/!p11;rss/')
+            (u'Schlagzeilen', u'http://www.taz.de/!p3270;rss/'),
+            (u'Politik', u'http://www.taz.de/Politik/!p2;rss/'),
+            (u'Zukunft', u'http://www.taz.de/Zukunft/!p4;rss/'),
+            (u'Netz', u'http://www.taz.de/Netz/!p5;rss/'),
+            (u'Debatte', u'http://www.taz.de/Debatte/!p9;rss/'),
+            (u'Leben', u'http://www.taz.de/Leben/!p10;rss/'),
+            (u'Sport', u'http://www.taz.de/Sport/!p12;rss/'),
+            (u'Wahrheit', u'http://www.taz.de/Wahrheit/!p13;rss/'),
+            (u'Berlin', u'http://www.taz.de/Berlin/!p14;rss/'),
+            (u'Nord', u'http://www.taz.de/Nord/!p11;rss/')
             ]
+    # omit articles already linked in Schlagzeilen feed
+    ignore_duplicate_articles = {'title', 'url'}
+
+    # use the cover presented on the homepage
+    cover_url = 'http://www.taz.de/digitaz/.s1jpeg320'
+
     keep_only_tags = [dict(name='div', attrs={'class': 'sect sect_article'})]
     remove_tags = [
-                   dict(name=['div'], attrs={'class': 'artikelwerbung'}),
-                   dict(name=['ul'], attrs={'class': 'toolbar'}),
-                   # remove: taz paywall
-                   dict(name=['div'], attrs={'id': 'tzi_paywall'}),
-                   # remove: Artikel zum Thema (not working on Kindle)
-                   dict(name=['div'], attrs={'class': re.compile(r".*\bsect_seealso\b.*")}),
-                   dict(name=['div'], attrs={'class': 'sectfoot'})
+                  dict(name=['div'], attrs={'class': 'artikelwerbung'}),
+                  dict(name=['ul'], attrs={'class': 'toolbar'}),
+                  # remove: taz paywall
+                  dict(name=['div'], attrs={'id': 'tzi_paywall'}),
+                  # remove: Artikel zum Thema (not working on Kindle)
+                  dict(name=['div'], attrs={'class': re.compile(r".*\bsect_seealso\b.*")}),
+                  dict(name=['div'], attrs={'class': 'sectfoot'})
                   ]
+
+# with article pictures on Kindle super-slow
+#    def populate_article_metadata(self, article, soup, first):
+#        if first and hasattr(self, 'add_toc_thumbnail'):
+#            picdiv = soup.find('img')
+#            if picdiv is not None:
+#                self.add_toc_thumbnail(article,picdiv['src'])

From b5bc63617868fd5dd796ed6351d290e818cb13d4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 11:50:20 +0530
Subject: [PATCH 0271/1154] Fix queueing of all dirtied books

---
 src/calibre/db/legacy.py                   | 5 ++++-
 src/calibre/db/tests/legacy.py             | 2 +-
 src/calibre/gui2/actions/choose_library.py | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 13edf47999..5d41986fce 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -323,7 +323,10 @@ class LibraryDatabase(object):
             self.notify('delete', [id])
 
     def dirtied(self, book_ids, commit=True):
-        self.new_api.mark_as_dirty(book_ids)
+        self.new_api.mark_as_dirty(frozenset(book_ids) if book_ids is not None else book_ids)
+
+    def dirty_queue_length(self):
+        return self.new_api.dirty_queue_length()
 
     def dump_metadata(self, book_ids=None, remove_from_dirtied=True, commit=True, callback=None):
         self.new_api.dump_metadata(book_ids=book_ids, remove_from_dirtied=remove_from_dirtied, callback=callback)
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index f9caa7a304..a5f5f693fe 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -398,7 +398,7 @@ class LegacyTest(BaseTest):
             'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
             'construct_path_name', 'clear_dirtied', 'initialize_database', 'initialize_dynamic',
             'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
-            'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_queue_length', 'dirty_books_referencing',
+            'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_books_referencing',
             'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book', 'dirtied_sequence',
             'format_filename_cache', 'format_metadata_cache', 'filter', 'create_version1', 'normpath', 'custom_data_adapters',
             'custom_table_names', 'custom_columns_in_meta', 'custom_tables',
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index f85eb09f37..4010847109 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -376,7 +376,7 @@ class ChooseLibraryAction(InterfaceAction):
         dirty_text = 'no'
         try:
             dirty_text = \
-                  unicode(self.gui.library_view.model().db.dirty_queue_length())
+                  unicode(self.gui.current_db.dirty_queue_length())
         except:
             dirty_text = _('none')
         info_dialog(self.gui, _('Backup status'), '<p>'+

From 4b1a61d7cec2f54ff866f28a13cc868e5464d485 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 11:55:31 +0530
Subject: [PATCH 0272/1154] Fix backups not working in new backend

---
 src/calibre/db/backup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/backup.py b/src/calibre/db/backup.py
index 6410a347c6..18722e1cf8 100644
--- a/src/calibre/db/backup.py
+++ b/src/calibre/db/backup.py
@@ -26,7 +26,7 @@ class MetadataBackup(Thread):
     def __init__(self, db, interval=2, scheduling_interval=0.1):
         Thread.__init__(self)
         self.daemon = True
-        self._db = weakref.ref(db)
+        self._db = weakref.ref(db.new_api)
         self.stop_running = Event()
         self.interval = interval
         self.scheduling_interval = scheduling_interval

From 8a5c71f36a71bb2bfd3e437d0aa666fcae319938 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 21 Jul 2013 09:09:02 +0200
Subject: [PATCH 0273/1154] 1) Fix silly regression in template_functions
 preference that caused all functions to be added to the custom function
 preference.

2) Change function registration and deregistration to restore function bodies if the name conflict goes away.
---
 .../gui2/preferences/template_functions.py    |  7 +-
 src/calibre/utils/formatter_functions.py      | 67 ++++++++++---------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/src/calibre/gui2/preferences/template_functions.py b/src/calibre/gui2/preferences/template_functions.py
index 6842e0798e..241d5eef8c 100644
--- a/src/calibre/gui2/preferences/template_functions.py
+++ b/src/calibre/gui2/preferences/template_functions.py
@@ -220,11 +220,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
     def commit(self):
         # formatter_functions().reset_to_builtins()
         pref_value = []
-        for f in self.funcs:
-            func = self.funcs[f]
-            pref_value.append((func.name, func.doc, func.arg_count, func.program_text))
+        for name, cls in self.funcs.iteritems():
+            if name not in self.builtins:
+                pref_value.append((cls.name, cls.doc, cls.arg_count, cls.program_text))
         self.db.prefs.set('user_template_functions', pref_value)
-        formatter_functions().unregister_functions(self.db.library_id)
         load_user_template_functions(self.db.library_id, pref_value)
         return False
 
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index f8d62c367a..f2b973a1e7 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -10,7 +10,6 @@ __docformat__ = 'restructuredtext en'
 
 import inspect, re, traceback
 from math import trunc
-from collections import defaultdict
 
 from calibre import human_readable
 from calibre.constants import DEBUG
@@ -23,10 +22,16 @@ from calibre.utils.localization import calibre_langcode_to_name, canonicalize_la
 
 class FormatterFunctions(object):
 
+    error_function_body = ('def evaluate(self, formatter, kwargs, mi, locals):\n'
+                       '\treturn "' +
+                            _('Duplicate user function name {0}. '
+                              'Change the name or ensure that the functions are identical')
+                                       + '"')
+
     def __init__(self):
         self._builtins = {}
         self._functions = {}
-        self._functions_from_library = defaultdict(list)
+        self._functions_from_library = {}
 
     def register_builtin(self, func_class):
         if not isinstance(func_class, FormatterFunction):
@@ -40,7 +45,7 @@ class FormatterFunctions(object):
         for a in func_class.aliases:
             self._functions[a] = func_class
 
-    def register_function(self, library_uuid, func_class, replace=False):
+    def _register_function(self, func_class, replace=False):
         if not isinstance(func_class, FormatterFunction):
             raise ValueError('Class %s is not an instance of FormatterFunction'%(
                                     func_class.__class__.__name__))
@@ -48,16 +53,36 @@ class FormatterFunctions(object):
         if not replace and name in self._functions:
             raise ValueError('Name %s already used'%name)
         self._functions[name] = func_class
-        self._functions_from_library[library_uuid].append(name)
 
-    def function_exists(self, name):
-        return self._functions.get(name, None)
+    def register_functions(self, library_uuid, funcs):
+        self._functions_from_library[library_uuid] = funcs
+        self._register_functions()
+
+    def _register_functions(self):
+        for compiled_funcs in self._functions_from_library.itervalues():
+            for cls in compiled_funcs:
+                f = self._functions.get(cls.name, None)
+                replace = False
+                if f is not None:
+                    existing_body = f.program_text
+                    new_body = cls.program_text
+                    if new_body != existing_body:
+                        # Change the body of the template function to one that will
+                        # return an error message. Also change the arg count to
+                        # -1 (variable) to avoid template compilation errors
+                        replace = True
+                        func = [cls.name, '', -1, self.error_function_body.format(cls.name)]
+                        cls = compile_user_function(*func)
+                    else:
+                        continue
+                formatter_functions()._register_function(cls, replace=replace)
 
     def unregister_functions(self, library_uuid):
         if library_uuid in self._functions_from_library:
-            for name in self._functions_from_library[library_uuid]:
-                self._functions.pop(name)
+            for cls in self._functions_from_library[library_uuid]:
+                self._functions.pop(cls.name, None)
             self._functions_from_library.pop(library_uuid)
+            self._register_functions()
 
     def get_builtins(self):
         return self._builtins
@@ -1271,15 +1296,11 @@ class UserFunction(FormatterUserFunction):
     cls = locals_['UserFunction'](name, doc, arg_count, eval_func)
     return cls
 
-error_function_body = ('def evaluate(self, formatter, kwargs, mi, locals):\n'
-                       '\treturn "' +
-                            _('Duplicate user function name {0}. '
-                              'Change the name or ensure that the functions are identical')
-                                       + '"')
 
 def load_user_template_functions(library_uuid, funcs):
     unload_user_template_functions(library_uuid)
 
+    compiled_funcs = []
     for func in funcs:
         try:
             # Force a name conflict to test the logic
@@ -1290,26 +1311,10 @@ def load_user_template_functions(library_uuid, funcs):
             # source. This helps ensure that if the function already is defined
             # then white space differences don't cause them to compare differently
 
-            cls = compile_user_function(*func)
-            f = formatter_functions().function_exists(cls.name)
-            replace = False
-            if f is not None:
-                existing_body = f.program_text
-                new_body = cls.program_text
-                if new_body != existing_body:
-                    # Change the body of the template function to one that will
-                    # return an error message. Also change the arg count to
-                    # -1 (variable) to avoid template compilation errors
-                    replace = True
-                    func[3] = error_function_body.format(func[0])
-                    func[2] = -1
-                    cls = compile_user_function(*func)
-                else:
-                    continue
-
-            formatter_functions().register_function(library_uuid, cls, replace=replace)
+            compiled_funcs.append(compile_user_function(*func))
         except:
             traceback.print_exc()
+    formatter_functions().register_functions(library_uuid, compiled_funcs)
 
 def unload_user_template_functions(library_uuid):
     formatter_functions().unregister_functions(library_uuid)
\ No newline at end of file

From 176da67d82b3425c66996bba36ef1c1bdea34b06 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 12:40:53 +0530
Subject: [PATCH 0274/1154] Database restore now works with the new API

---
 src/calibre/db/__init__.py                  |  5 ++---
 src/calibre/db/backend.py                   |  4 ++++
 src/calibre/db/cache.py                     | 21 +++++++++++++++++++++
 src/calibre/db/legacy.py                    |  2 +-
 src/calibre/gui2/dialogs/restore_library.py |  8 ++++++--
 src/calibre/library/cli.py                  |  5 ++++-
 6 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 1fe7da1e04..c1b48cad0c 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -132,9 +132,8 @@ def get_db_loader():
 
 '''
 Various things that require other things before they can be migrated:
-    1. Port library/restore.py
-    2. Check that content server reloading on metadata,db change, metadata
+    1. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
-    3. Check for mem leaks when switching libraries
+    2. Check for mem leaks when switching libraries
 '''
diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index f203f5ed0c..9eb49ccd4c 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1525,6 +1525,10 @@ class DB(object):
             except:
                 pass
 
+    def restore_book(self, book_id, path, formats):
+        self.conn.execute('UPDATE books SET path=? WHERE id=?', (path.replace(os.sep, '/'), book_id))
+        vals = [(book_id, fmt, size, name) for fmt, size, name in formats]
+        self.conn.executemany('INSERT INTO data (book,format,uncompressed_size,name) VALUES (?,?,?,?)', vals)
    # }}}
 
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 37d0428046..16e6d59adb 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -423,6 +423,12 @@ class Cache(object):
         rmap = {icu_lower(v) if isinstance(v, unicode) else v:k for k, v in self.fields[field].table.id_map.iteritems()}
         return rmap.get(icu_lower(item_name) if isinstance(item_name, unicode) else item_name, None)
 
+    @read_api
+    def get_item_ids(self, field, item_names):
+        ' Return the item id for item_name (case-insensitive) '
+        rmap = {icu_lower(v) if isinstance(v, unicode) else v:k for k, v in self.fields[field].table.id_map.iteritems()}
+        return {name:rmap.get(icu_lower(name) if isinstance(name, unicode) else name, None) for name in item_names}
+
     @read_api
     def author_data(self, author_ids=None):
         '''
@@ -1568,6 +1574,21 @@ class Cache(object):
     def dump_and_restore(self, callback=None, sql=None):
         return self.backend.dump_and_restore(callback=callback, sql=sql)
 
+    @write_api
+    def close(self):
+        self.backend.close()
+
+    @write_api
+    def restore_book(self, book_id, mi, last_modified, path, formats):
+        ''' Restore the book entry in the database for a book that already exists on the filesystem '''
+        cover = mi.cover
+        mi.cover = None
+        self._create_book_entry(mi, add_duplicates=True,
+                force_id=book_id, apply_import_tags=False, preserve_uuid=True)
+        self._update_last_modified((book_id,), last_modified)
+        if cover and os.path.exists(cover):
+            self._set_field('cover', {book_id:1})
+        self.backend.restore_book(book_id, path, formats)
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 5d41986fce..94c35429b2 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -78,7 +78,7 @@ class LibraryDatabase(object):
             set_saved_searches(self, 'saved_searches')
 
     def close(self):
-        self.backend.close()
+        self.new_api.close()
 
     def break_cycles(self):
         delattr(self.backend, 'field_metadata')
diff --git a/src/calibre/gui2/dialogs/restore_library.py b/src/calibre/gui2/dialogs/restore_library.py
index a460460120..58731fa2d0 100644
--- a/src/calibre/gui2/dialogs/restore_library.py
+++ b/src/calibre/gui2/dialogs/restore_library.py
@@ -8,11 +8,11 @@ __docformat__ = 'restructuredtext en'
 from PyQt4.Qt import (QDialog, QLabel, QVBoxLayout, QDialogButtonBox,
         QProgressBar, QSize, QTimer, pyqtSignal, Qt)
 
-from calibre.library.restore import Restore
 from calibre.gui2 import (error_dialog, question_dialog, warning_dialog,
     info_dialog)
 from calibre import force_unicode
 from calibre.constants import filesystem_encoding
+from calibre.utils.config_base import tweaks
 
 class DBRestore(QDialog):
 
@@ -42,13 +42,16 @@ class DBRestore(QDialog):
         self.library_path = library_path
         self.update_signal.connect(self.do_update, type=Qt.QueuedConnection)
 
+        if tweaks.get('use_new_db', False):
+            from calibre.db.restore import Restore
+        else:
+            from calibre.library.restore import Restore
         self.restorer = Restore(library_path, self)
         self.restorer.daemon = True
 
         # Give the metadata backup thread time to stop
         QTimer.singleShot(2000, self.start)
 
-
     def start(self):
         self.restorer.start()
         QTimer.singleShot(10, self.update)
@@ -133,3 +136,4 @@ def repair_library_at(library_path, parent=None):
     return True
 
 
+
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 2c6e7cd777..5a888f672e 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -1214,7 +1214,6 @@ what is found in the OPF files.
     return parser
 
 def command_restore_database(args, dbpath):
-    from calibre.library.restore import Restore
     parser = restore_database_option_parser()
     opts, args = parser.parse_args(args)
     if len(args) != 0:
@@ -1242,6 +1241,10 @@ def command_restore_database(args, dbpath):
                 self.total = float(step)
             else:
                 prints(msg, '...', '%d%%'%int(100*(step/self.total)))
+    if tweaks.get('use_new_db', False):
+        from calibre.db.restore import Restore
+    else:
+        from calibre.library.restore import Restore
     r = Restore(dbpath, progress_callback=Progress())
     r.start()
     r.join()

From 7cf5da528f9c37ec51780768d9710cfe1e0fe410 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 12:41:36 +0530
Subject: [PATCH 0275/1154] oops, forgot one file in the last commit

---
 src/calibre/db/restore.py | 266 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 266 insertions(+)
 create mode 100644 src/calibre/db/restore.py

diff --git a/src/calibre/db/restore.py b/src/calibre/db/restore.py
new file mode 100644
index 0000000000..9569dbeab6
--- /dev/null
+++ b/src/calibre/db/restore.py
@@ -0,0 +1,266 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import re, os, traceback, shutil
+from threading import Thread
+from operator import itemgetter
+
+from calibre.ptempfile import TemporaryDirectory
+from calibre.ebooks.metadata.opf2 import OPF
+from calibre.db.backend import DB, DBPrefs
+from calibre.db.cache import Cache
+from calibre.constants import filesystem_encoding
+from calibre.utils.date import utcfromtimestamp
+from calibre import isbytestring
+
+NON_EBOOK_EXTENSIONS = frozenset([
+        'jpg', 'jpeg', 'gif', 'png', 'bmp',
+        'opf', 'swp', 'swo'
+        ])
+
+class Restorer(Cache):
+
+    def __init__(self, library_path, default_prefs=None, restore_all_prefs=False, progress_callback=lambda x, y:True):
+        backend = DB(library_path, default_prefs=default_prefs, restore_all_prefs=restore_all_prefs, progress_callback=progress_callback)
+        Cache.__init__(self, backend)
+        for x in ('update_path', 'mark_as_dirty'):
+            setattr(self, x, self.no_op)
+            setattr(self, '_' + x, self.no_op)
+        self.init()
+
+    def no_op(self, *args, **kwargs):
+        pass
+
+class Restore(Thread):
+
+    def __init__(self, library_path, progress_callback=None):
+        super(Restore, self).__init__()
+        if isbytestring(library_path):
+            library_path = library_path.decode(filesystem_encoding)
+        self.src_library_path = os.path.abspath(library_path)
+        self.progress_callback = progress_callback
+        self.db_id_regexp = re.compile(r'^.* \((\d+)\)$')
+        self.bad_ext_pat = re.compile(r'[^a-z0-9_]+')
+        if not callable(self.progress_callback):
+            self.progress_callback = lambda x, y: x
+        self.dirs = []
+        self.ignored_dirs = []
+        self.failed_dirs = []
+        self.books = []
+        self.conflicting_custom_cols = {}
+        self.failed_restores = []
+        self.mismatched_dirs = []
+        self.successes = 0
+        self.tb = None
+        self.authors_links = {}
+
+    @property
+    def errors_occurred(self):
+        return (self.failed_dirs or self.mismatched_dirs or
+                self.conflicting_custom_cols or self.failed_restores)
+
+    @property
+    def report(self):
+        ans = ''
+        failures = list(self.failed_dirs) + [(x['dirpath'], tb) for x, tb in
+                self.failed_restores]
+        if failures:
+            ans += 'Failed to restore the books in the following folders:\n'
+            for dirpath, tb in failures:
+                ans += '\t' + dirpath + ' with error:\n'
+                ans += '\n'.join('\t\t'+x for x in tb.splitlines())
+                ans += '\n\n'
+
+        if self.conflicting_custom_cols:
+            ans += '\n\n'
+            ans += 'The following custom columns have conflicting definitions ' \
+                    'and were not fully restored:\n'
+            for x in self.conflicting_custom_cols:
+                ans += '\t#'+x+'\n'
+                ans += '\tused:\t%s, %s, %s, %s\n'%(self.custom_columns[x][1],
+                                                    self.custom_columns[x][2],
+                                                    self.custom_columns[x][3],
+                                                    self.custom_columns[x][5])
+                for coldef in self.conflicting_custom_cols[x]:
+                    ans += '\tother:\t%s, %s, %s, %s\n'%(coldef[1], coldef[2],
+                                                         coldef[3], coldef[5])
+
+        if self.mismatched_dirs:
+            ans += '\n\n'
+            ans += 'The following folders were ignored:\n'
+            for x in self.mismatched_dirs:
+                ans += '\t'+x+'\n'
+
+        return ans
+
+    def run(self):
+        try:
+            with TemporaryDirectory('_library_restore') as tdir:
+                self.library_path = tdir
+                self.scan_library()
+                if not self.load_preferences():
+                    # Something went wrong with preferences restore. Start over
+                    # with a new database and attempt to rebuild the structure
+                    # from the metadata in the opf
+                    dbpath = os.path.join(self.library_path, 'metadata.db')
+                    if os.path.exists(dbpath):
+                        os.remove(dbpath)
+                    self.create_cc_metadata()
+                self.restore_books()
+                if self.successes == 0 and len(self.dirs) > 0:
+                    raise Exception(('Something bad happened'))
+                self.replace_db()
+        except:
+            self.tb = traceback.format_exc()
+
+    def load_preferences(self):
+        self.progress_callback(None, 1)
+        self.progress_callback(_('Starting restoring preferences and column metadata'), 0)
+        prefs_path = os.path.join(self.src_library_path, 'metadata_db_prefs_backup.json')
+        if not os.path.exists(prefs_path):
+            self.progress_callback(_('Cannot restore preferences. Backup file not found.'), 1)
+            return False
+        try:
+            prefs = DBPrefs.read_serialized(self.src_library_path, recreate_prefs=False)
+            db = Restorer(self.library_path, default_prefs=prefs,
+                                 restore_all_prefs=True,
+                                 progress_callback=self.progress_callback)
+            db.close()
+            self.progress_callback(None, 1)
+            if 'field_metadata' in prefs:
+                self.progress_callback(_('Finished restoring preferences and column metadata'), 1)
+                return True
+            self.progress_callback(_('Finished restoring preferences'), 1)
+            return False
+        except:
+            traceback.print_exc()
+            self.progress_callback(None, 1)
+            self.progress_callback(_('Restoring preferences and column metadata failed'), 0)
+        return False
+
+    def scan_library(self):
+        for dirpath, dirnames, filenames in os.walk(self.src_library_path):
+            leaf = os.path.basename(dirpath)
+            m = self.db_id_regexp.search(leaf)
+            if m is None or 'metadata.opf' not in filenames:
+                self.ignored_dirs.append(dirpath)
+                continue
+            self.dirs.append((dirpath, filenames, m.group(1)))
+
+        self.progress_callback(None, len(self.dirs))
+        for i, x in enumerate(self.dirs):
+            dirpath, filenames, book_id = x
+            try:
+                self.process_dir(dirpath, filenames, book_id)
+            except:
+                self.failed_dirs.append((dirpath, traceback.format_exc()))
+            self.progress_callback(_('Processed') + ' ' + dirpath, i+1)
+
+    def is_ebook_file(self, filename):
+        ext = os.path.splitext(filename)[1]
+        if not ext:
+            return False
+        ext = ext[1:].lower()
+        if ext in NON_EBOOK_EXTENSIONS or \
+                self.bad_ext_pat.search(ext) is not None:
+            return False
+        return True
+
+    def process_dir(self, dirpath, filenames, book_id):
+        book_id = int(book_id)
+        formats = filter(self.is_ebook_file, filenames)
+        fmts    = [os.path.splitext(x)[1][1:].upper() for x in formats]
+        sizes   = [os.path.getsize(os.path.join(dirpath, x)) for x in formats]
+        names   = [os.path.splitext(x)[0] for x in formats]
+        opf = os.path.join(dirpath, 'metadata.opf')
+        mi = OPF(opf, basedir=dirpath).to_book_metadata()
+        timestamp = os.path.getmtime(opf)
+        path = os.path.relpath(dirpath, self.src_library_path).replace(os.sep,
+                '/')
+
+        if int(mi.application_id) == book_id:
+            self.books.append({
+                'mi': mi,
+                'timestamp': timestamp,
+                'formats': list(zip(fmts, sizes, names)),
+                'id': book_id,
+                'dirpath': dirpath,
+                'path': path,
+            })
+        else:
+            self.mismatched_dirs.append(dirpath)
+
+        alm = mi.get('author_link_map', {})
+        for author, link in alm.iteritems():
+            existing_link, timestamp = self.authors_links.get(author, (None, None))
+            if existing_link is None or existing_link != link and timestamp < mi.timestamp:
+                self.authors_links[author] = (link, mi.timestamp)
+
+    def create_cc_metadata(self):
+        self.books.sort(key=itemgetter('timestamp'))
+        self.custom_columns = {}
+        fields = ('label', 'name', 'datatype', 'is_multiple', 'is_editable',
+                    'display')
+        for b in self.books:
+            for key in b['mi'].custom_field_keys():
+                cfm = b['mi'].metadata_for_field(key)
+                args = []
+                for x in fields:
+                    if x in cfm:
+                        if x == 'is_multiple':
+                            args.append(bool(cfm[x]))
+                        else:
+                            args.append(cfm[x])
+                if len(args) == len(fields):
+                    # TODO: Do series type columns need special handling?
+                    label = cfm['label']
+                    if label in self.custom_columns and args != self.custom_columns[label]:
+                        if label not in self.conflicting_custom_cols:
+                            self.conflicting_custom_cols[label] = []
+                        if self.custom_columns[label] not in self.conflicting_custom_cols[label]:
+                            self.conflicting_custom_cols[label].append(self.custom_columns[label])
+                    self.custom_columns[label] = args
+
+        db = Restorer(self.library_path)
+        self.progress_callback(None, len(self.custom_columns))
+        if len(self.custom_columns):
+            for i, args in enumerate(self.custom_columns.values()):
+                db.create_custom_column(*args)
+                self.progress_callback(_('Creating custom column ')+args[0], i+1)
+        db.close()
+
+    def restore_books(self):
+        self.progress_callback(None, len(self.books))
+        self.books.sort(key=itemgetter('id'))
+
+        db = Restorer(self.library_path)
+
+        for i, book in enumerate(self.books):
+            try:
+                db.restore_book(book['id'], book['mi'], utcfromtimestamp(book['timestamp']), book['path'], book['formats'])
+                self.successes += 1
+            except:
+                self.failed_restores.append((book, traceback.format_exc()))
+            self.progress_callback(book['mi'].title, i+1)
+
+        id_map = db.get_item_ids('authors', [author for author in self.authors_links])
+        link_map = {aid:self.authors_links[name][0] for name, aid in id_map.iteritems() if aid is not None}
+        if link_map:
+            db.set_link_for_authors(link_map)
+        db.close()
+
+    def replace_db(self):
+        dbpath = os.path.join(self.src_library_path, 'metadata.db')
+        ndbpath = os.path.join(self.library_path, 'metadata.db')
+
+        save_path = self.olddb = os.path.splitext(dbpath)[0]+'_pre_restore.db'
+        if os.path.exists(save_path):
+            os.remove(save_path)
+        os.rename(dbpath, save_path)
+        shutil.copyfile(ndbpath, dbpath)
+
+

From 30ee950706ee6c3ef7ef4f56240f0635ecc03e3b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 14:20:37 +0530
Subject: [PATCH 0276/1154] pep8

---
 src/calibre/gui2/dialogs/metadata_bulk.py | 38 +++++++++++++----------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 0e4b2a1572..007ff3b58f 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -4,6 +4,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 '''Dialog to edit metadata in bulk'''
 
 import re, os, inspect
+from collections import namedtuple
 
 from PyQt4.Qt import Qt, QDialog, QGridLayout, QVBoxLayout, QFont, QLabel, \
                      pyqtSignal, QDialogButtonBox, QInputDialog, QLineEdit, \
@@ -27,7 +28,7 @@ from calibre.utils.date import qt_to_dt
 from calibre.ptempfile import SpooledTemporaryFile
 from calibre.db import SPOOL_SIZE
 
-def get_cover_data(stream, ext): # {{{
+def get_cover_data(stream, ext):  # {{{
     from calibre.ebooks.metadata.meta import get_metadata
     old = prefs['read_file_metadata']
     if not old:
@@ -53,7 +54,11 @@ def get_cover_data(stream, ext): # {{{
     return cdata, area
 # }}}
 
-class MyBlockingBusy(QDialog): # {{{
+Settings = namedtuple('Settings', 'remove_all remove add au aus do_aus rating pub do_series do_autonumber do_remove_format '
+                      'remove_format do_swap_ta do_remove_conv do_auto_author series do_series_restart series_start_value '
+                      'do_title_case cover_action clear_series pubdate adddate do_title_sort languages clear_languages restore_original')
+
+class MyBlockingBusy(QDialog):  # {{{
 
     do_one_signal = pyqtSignal()
 
@@ -71,8 +76,8 @@ class MyBlockingBusy(QDialog): # {{{
         self._layout = QVBoxLayout()
         self.setLayout(self._layout)
         self.msg_text = msg
-        self.msg = QLabel(msg+'        ') # Ensure dialog is wide enough
-        #self.msg.setWordWrap(True)
+        self.msg = QLabel(msg+'        ')  # Ensure dialog is wide enough
+        # self.msg.setWordWrap(True)
         self.font = QFont()
         self.font.setPointSize(self.font.pointSize() + 8)
         self.msg.setFont(self.font)
@@ -140,7 +145,6 @@ class MyBlockingBusy(QDialog): # {{{
             pubdate, adddate, do_title_sort, languages, clear_languages, \
             restore_original = self.args
 
-
         # first loop: All changes that modify the filesystem and commit
         # immediately. We want to
         # try hard to keep the DB and the file system in sync, even in the face
@@ -199,7 +203,8 @@ class MyBlockingBusy(QDialog): # {{{
                     for fmt in fmts.split(','):
                         fmtf = self.db.format(id, fmt, index_is_id=True,
                                 as_file=True)
-                        if fmtf is None: continue
+                        if fmtf is None:
+                            continue
                         cdata, area = get_cover_data(fmtf, fmt)
                         if cdata:
                             covers.append((cdata, area))
@@ -264,7 +269,7 @@ class MyBlockingBusy(QDialog): # {{{
                 self.db.set_series(id, series, notify=False, commit=False)
                 if not series:
                     self.db.set_series_index(id, 1.0, notify=False, commit=False)
-                elif do_autonumber: # is True if do_series_restart is True
+                elif do_autonumber:  # is True if do_series_restart is True
                     self.db.set_series_index(id, next, notify=False, commit=False)
                 elif tweaks['series_index_auto_increment'] != 'no_change':
                     self.db.set_series_index(id, 1.0, notify=False, commit=False)
@@ -296,18 +301,18 @@ class MyBlockingBusy(QDialog): # {{{
 
 class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
 
-    s_r_functions = {       ''              : lambda x: x,
+    s_r_functions = {''              : lambda x: x,
                             _('Lower Case') : lambda x: icu_lower(x),
                             _('Upper Case') : lambda x: icu_upper(x),
                             _('Title Case') : lambda x: titlecase(x),
                             _('Capitalize') : lambda x: capitalize(x),
                     }
 
-    s_r_match_modes = [     _('Character match'),
+    s_r_match_modes = [_('Character match'),
                             _('Regular Expression'),
                       ]
 
-    s_r_replace_modes = [   _('Replace field'),
+    s_r_replace_modes = [_('Replace field'),
                             _('Prepend to field'),
                             _('Append to field'),
                         ]
@@ -559,8 +564,8 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
     def s_r_get_field(self, mi, field):
         if field:
             if field == '{template}':
-                v = SafeFormat().safe_format\
-                    (unicode(self.s_r_template.text()), mi, _('S/R TEMPLATE ERROR'), mi)
+                v = SafeFormat().safe_format(
+                    unicode(self.s_r_template.text()), mi, _('S/R TEMPLATE ERROR'), mi)
                 return [v]
             fm = self.db.metadata_for_field(field)
             if field == 'sort':
@@ -605,7 +610,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         self.template_label.setVisible(False)
         self.s_r_src_ident_label.setVisible(False)
         self.s_r_src_ident.setVisible(False)
-        if idx == 1: # Template
+        if idx == 1:  # Template
             self.s_r_template.setVisible(True)
             self.template_label.setVisible(True)
         elif self.s_r_sf_itemdata(idx) == 'identifiers':
@@ -998,7 +1003,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         elif self.cover_from_fmt.isChecked():
             cover_action = 'fromfmt'
 
-        args = (remove_all, remove, add, au, aus, do_aus, rating, pub, do_series,
+        args = Settings(remove_all, remove, add, au, aus, do_aus, rating, pub, do_series,
                 do_autonumber, do_remove_format, remove_format, do_swap_ta,
                 do_remove_conv, do_auto_author, series, do_series_restart,
                 series_start_value, do_title_case, cover_action, clear_series,
@@ -1146,9 +1151,9 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         set_index(self.search_field, 'search_field')
         set_text(self.s_r_template, 's_r_template')
 
-        self.s_r_template_changed() #simulate gain/loss of focus
+        self.s_r_template_changed()  # simulate gain/loss of focus
 
-        set_index(self.s_r_src_ident, 's_r_src_ident');
+        set_index(self.s_r_src_ident, 's_r_src_ident')
         set_text(self.s_r_dst_ident, 's_r_dst_ident')
         set_text(self.search_for, 'search_for')
         set_checked(self.case_sensitive, 'case_sensitive')
@@ -1179,3 +1184,4 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         self.starting_from.setValue(1)
         self.multiple_separator.setText(" ::: ")
 
+

From a5e32b4ad44032666e95e67dba5f6458b0c59d14 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 15:37:28 +0530
Subject: [PATCH 0277/1154] Some missing API

---
 src/calibre/db/legacy.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 94c35429b2..6992eab2b3 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -65,6 +65,7 @@ class LibraryDatabase(object):
         cache.init()
         self.data = View(cache)
         self.id = self.data.index_to_id
+        self.row = self.index = self.data.id_to_index
         for x in ('get_property', 'count', 'refresh_ids', 'set_marked_ids',
                   'multisort', 'search', 'search_getting_ids'):
             setattr(self, x, getattr(self.data, x))

From b2733f6052b79207fb6b6769d3eb2141f23d44f0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 15:48:42 +0530
Subject: [PATCH 0278/1154] Start work on porting the bulk metadata dialog to
 the new API

---
 src/calibre/db/cache.py                   |   6 ++
 src/calibre/gui2/dialogs/metadata_bulk.py | 110 +++++++++++++++++++++-
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 16e6d59adb..e6174015c5 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -333,6 +333,12 @@ class Cache(object):
         except (KeyError, IndexError):
             return default_value
 
+    @read_api
+    def all_field_for(self, field, book_ids, default_value=None):
+        ' Same as field_for, except that it operates on multiple books at once '
+        field_obj = self.fields[field]
+        return {book_id:self._fast_field_for(field_obj, book_id, default_value=default_value) for book_id in book_ids}
+
     @read_api
     def composite_for(self, name, book_id, mi=None, default_value=''):
         try:
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 007ff3b58f..31ba4d033a 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -5,6 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import re, os, inspect
 from collections import namedtuple
+from threading import Thread
 
 from PyQt4.Qt import Qt, QDialog, QGridLayout, QVBoxLayout, QFont, QLabel, \
                      pyqtSignal, QDialogButtonBox, QInputDialog, QLineEdit, \
@@ -58,6 +59,106 @@ Settings = namedtuple('Settings', 'remove_all remove add au aus do_aus rating pu
                       'remove_format do_swap_ta do_remove_conv do_auto_author series do_series_restart series_start_value '
                       'do_title_case cover_action clear_series pubdate adddate do_title_sort languages clear_languages restore_original')
 
+class MyBlockingBusyNew(QDialog):
+
+    all_done = pyqtSignal()
+
+    def __init__(self, args, ids, db, cc_widgets, s_r_func,
+                 parent=None, window_title=_('Working')):
+        QDialog.__init__(self, parent)
+
+        self._layout =  l = QVBoxLayout()
+        self.setLayout(l)
+
+        self.msg = QLabel(_('Processing %d books, please wait...') % len(ids))
+        self.font = QFont()
+        self.font.setPointSize(self.font.pointSize() + 8)
+        self.msg.setFont(self.font)
+        self.pi = ProgressIndicator(self)
+        self.pi.setDisplaySize(100)
+        self._layout.addWidget(self.pi, 0, Qt.AlignHCenter)
+        self._layout.addSpacing(15)
+        self._layout.addWidget(self.msg, 0, Qt.AlignHCenter)
+        self.setWindowTitle(window_title + '...')
+        self.setMinimumWidth(200)
+        self.resize(self.sizeHint())
+        self.error = None
+        self.all_done.connect(self.on_all_done, type=Qt.QueuedConnection)
+        self.args, self.ids, self.s_r_func = args, ids, s_r_func
+        self.db, self.cc_widgets = db, cc_widgets
+
+    def accept(self):
+        pass
+
+    def reject(self):
+        pass
+
+    def on_all_done(self):
+        QDialog.accept(self)
+
+    def exec_(self):
+        self.thread = Thread(target=self.do_it)
+        self.thread.start()
+        return QDialog.exec_(self)
+
+    def do_it(self):
+        try:
+            self.do_all()
+        except Exception as err:
+            import traceback
+            try:
+                err = unicode(err)
+            except:
+                err = repr(err)
+            self.error = (err, traceback.format_exc())
+
+        self.all_done.emit()
+
+    def do_all(self):
+        cache = self.db.new_api
+        args = self.args
+
+        # Title and authors
+        if args.do_swap_ta:
+            title_map = cache.all_field_for('title', self.ids)
+            authors_map = cache.all_field_for('authors', self.ids)
+            def new_title(authors):
+                ans = authors_to_string(authors)
+                return titlecase(ans) if args.do_title_case else ans
+            new_title_map = {bid:new_title(authors) for bid, authors in authors_map.iteritems()}
+            new_authors_map = {bid:string_to_authors(title) for bid, title in title_map.iteritems()}
+            cache.set_field('authors', new_authors_map)
+            cache.set_field('title', new_title_map)
+
+        if args.do_title_case and not args.do_swap_ta:
+            title_map = cache.all_field_for('title', self.ids)
+            cache.set_field('title', {bid:titlecase(title) for bid, title in title_map.iteritems()})
+
+        if args.do_title_sort:
+            lang_map = cache.all_field_for('languages', self.ids)
+            title_map = cache.all_field_for('title', self.ids)
+            def get_sort(book_id):
+                if args.languages:
+                    lang = args.languages[0]
+                else:
+                    try:
+                        lang = lang_map[book_id][0]
+                    except (KeyError, IndexError, TypeError, AttributeError):
+                        lang = 'eng'
+                return title_sort(title_map[book_id], lang=lang)
+            cache.set_field('sort', {bid:get_sort(bid) for bid in self.ids})
+
+        if args.au:
+            authors = string_to_authors(args.au)
+            cache.set_field('authors', {bid:authors for bid in self.ids})
+
+        if args.do_auto_author:
+            aus_map = cache.author_sort_strings_for_books(self.ids)
+            cache.set_field('author_sort', {book_id:' & '.join(aus_map[book_id]) for book_id in aus_map})
+
+        if args.aus and args.do_aus:
+            cache.set_field('author_sort', {bid:args.aus for bid in self.ids})
+
 class MyBlockingBusy(QDialog):  # {{{
 
     do_one_signal = pyqtSignal()
@@ -1010,7 +1111,12 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
                 pubdate, adddate, do_title_sort, languages, clear_languages,
                 restore_original)
 
-        bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.')
+        if hasattr(self.db, 'new_api'):
+            bb = MyBlockingBusyNew(args, self.ids, self.db,
+                getattr(self, 'custom_column_widgets', []),
+                self.do_search_replace, parent=self)
+        else:
+            bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.')
                 %len(self.ids), args, self.db, self.ids,
                 getattr(self, 'custom_column_widgets', []),
                 self.do_search_replace, parent=self)
@@ -1023,6 +1129,8 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         finally:
             self.model.start_metadata_backup()
 
+        bb.thread = bb.db = bb.cc_widgets = None
+
         if bb.error is not None:
             return error_dialog(self, _('Failed'),
                     bb.error[0], det_msg=bb.error[1],

From cd509fc9953ee5d153caf905699cc59a3baed661 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 15:52:08 +0530
Subject: [PATCH 0279/1154] ...

---
 src/calibre/db/legacy.py       | 2 +-
 src/calibre/db/tests/legacy.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 6992eab2b3..efb71223a2 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -65,7 +65,7 @@ class LibraryDatabase(object):
         cache.init()
         self.data = View(cache)
         self.id = self.data.index_to_id
-        self.row = self.index = self.data.id_to_index
+        self.row = self.data.id_to_index
         for x in ('get_property', 'count', 'refresh_ids', 'set_marked_ids',
                   'multisort', 'search', 'search_getting_ids'):
             setattr(self, x, getattr(self.data, x))
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index a5f5f693fe..2d8bf466f6 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -397,7 +397,7 @@ class LegacyTest(BaseTest):
             # Internal API
             'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
             'construct_path_name', 'clear_dirtied', 'initialize_database', 'initialize_dynamic',
-            'run_import_plugins', 'vacuum', 'set_path', 'row', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
+            'run_import_plugins', 'vacuum', 'set_path', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_books_referencing',
             'windows_check_if_files_in_use', 'get_metadata_for_dump', 'get_a_dirtied_book', 'dirtied_sequence',
             'format_filename_cache', 'format_metadata_cache', 'filter', 'create_version1', 'normpath', 'custom_data_adapters',

From 9a6c322d8781f25eac6f707931069724cc1374a6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 17:10:00 +0530
Subject: [PATCH 0280/1154] Sort plugins list case insensitively

---
 src/calibre/gui2/dialogs/plugin_updater.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py
index c5d79218f9..0b0885dc82 100644
--- a/src/calibre/gui2/dialogs/plugin_updater.py
+++ b/src/calibre/gui2/dialogs/plugin_updater.py
@@ -276,6 +276,7 @@ class DisplayPluginSortFilterModel(QSortFilterProxyModel):
     def __init__(self, parent):
         QSortFilterProxyModel.__init__(self, parent)
         self.setSortRole(Qt.UserRole)
+        self.setSortCaseSensitivity(Qt.CaseInsensitive)
         self.filter_criteria = FILTER_ALL
 
     def filterAcceptsRow(self, sourceRow, sourceParent):

From 8c24464ba665f2dc2a6cbe5d76ff443981eb076d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 17:10:29 +0530
Subject: [PATCH 0281/1154] Show [newdb] in the status bar when using the new
 backend

---
 src/calibre/gui2/init.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index d066f8aa01..feed5bb4ad 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -10,7 +10,7 @@ import functools
 from PyQt4.Qt import (Qt, QApplication, QStackedWidget, QMenu, QTimer,
         QSize, QSizePolicy, QStatusBar, QLabel, QFont)
 
-from calibre.utils.config import prefs
+from calibre.utils.config import prefs, tweaks
 from calibre.constants import (isosx, __appname__, preferred_encoding,
     get_version)
 from calibre.gui2 import config, is_widescreen, gprefs
@@ -161,8 +161,10 @@ class StatusBar(QStatusBar):  # {{{
 
     def __init__(self, parent=None):
         QStatusBar.__init__(self, parent)
-        self.base_msg = '%s %s' % (__appname__, get_version())
         self.version = get_version()
+        self.base_msg = '%s %s' % (__appname__, self.version)
+        if tweaks.get('use_new_db', False):
+            self.base_msg += ' [newdb]'
         self.device_string = ''
         self.update_label = UpdateLabel('')
         self.total = self.current = self.selected = self.library_total = 0

From 17b1cb5115103540136c035c089a967dc6a1095c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 17:31:14 +0530
Subject: [PATCH 0282/1154] Fix remove_formats() not actually removing the
 files

---
 src/calibre/db/cache.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index e6174015c5..a669b7017b 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1146,8 +1146,6 @@ class Cache(object):
     def remove_formats(self, formats_map, db_only=False):
         table = self.fields['formats'].table
         formats_map = {book_id:frozenset((f or '').upper() for f in fmts) for book_id, fmts in formats_map.iteritems()}
-        size_map = table.remove_formats(formats_map, self.backend)
-        self.fields['size'].table.update_sizes(size_map)
 
         for book_id, fmts in formats_map.iteritems():
             for fmt in fmts:
@@ -1167,6 +1165,8 @@ class Cache(object):
                     if name and path:
                         self.backend.remove_format(book_id, fmt, name, path)
 
+        size_map = table.remove_formats(formats_map, self.backend)
+        self.fields['size'].table.update_sizes(size_map)
         self._update_last_modified(tuple(formats_map.iterkeys()))
 
     @read_api

From b38e1c45fc3ac845046b159dc87c3bc35deb014e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 17:40:48 +0530
Subject: [PATCH 0283/1154] Covers and formats

---
 src/calibre/gui2/dialogs/metadata_bulk.py | 48 ++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 31ba4d033a..0b00574d15 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -159,6 +159,52 @@ class MyBlockingBusyNew(QDialog):
         if args.aus and args.do_aus:
             cache.set_field('author_sort', {bid:args.aus for bid in self.ids})
 
+        # Covers
+        if args.cover_action == 'remove':
+            cache.set_cover({bid:None for bid in self.ids})
+        elif args.cover_action == 'generate':
+            from calibre.ebooks import calibre_cover
+            from calibre.ebooks.metadata import fmt_sidx
+            from calibre.gui2 import config
+            for book_id in self.ids:
+                mi = self.db.get_metadata(book_id, index_is_id=True)
+                series_string = None
+                if mi.series:
+                    series_string = _('Book %(sidx)s of %(series)s')%dict(
+                        sidx=fmt_sidx(mi.series_index,
+                        use_roman=config['use_roman_numerals_for_series_number']),
+                        series=mi.series)
+
+                cdata = calibre_cover(mi.title, mi.format_field('authors')[-1],
+                        series_string=series_string)
+                cache.set_cover({book_id:cdata})
+        elif args.cover_action == 'fromfmt':
+            for book_id in self.ids:
+                fmts = cache.formats(book_id, verify_formats=False)
+                if fmts:
+                    covers = []
+                    for fmt in fmts:
+                        fmtf = cache.format(book_id, fmt, as_file=True)
+                        if fmtf is None:
+                            continue
+                        cdata, area = get_cover_data(fmtf, fmt)
+                        if cdata:
+                            covers.append((cdata, area))
+                    covers.sort(key=lambda x: x[1])
+                    if covers:
+                        cache.set_cover({book_id:covers[-1][0]})
+
+        # Formats
+        if args.do_remove_format:
+            cache.remove_formats({bid:(args.remove_format,) for bid in self.ids})
+
+        if args.restore_original:
+            for book_id in self.ids:
+                formats = cache.formats(book_id)
+                originals = tuple(x.upper() for x in formats if x.upper().startswith('ORIGINAL_'))
+                for ofmt in originals:
+                    cache.restore_original_format(book_id, ofmt)
+
 class MyBlockingBusy(QDialog):  # {{{
 
     do_one_signal = pyqtSignal()
@@ -438,7 +484,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
 
         self.initialize_combos()
 
-        for f in self.db.all_formats():
+        for f in sorted(self.db.all_formats()):
             self.remove_format.addItem(f)
 
         self.remove_format.setCurrentIndex(-1)

From 5b4e96e6b16af531394baf9a3e0429df3a26849c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 21:00:00 +0530
Subject: [PATCH 0284/1154] Finish off remaining bulk metadata fields

---
 src/calibre/gui2/dialogs/metadata_bulk.py | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 0b00574d15..f6cce35d67 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -94,11 +94,21 @@ class MyBlockingBusyNew(QDialog):
         pass
 
     def on_all_done(self):
+        if not self.error:
+            # The cc widgets can only be accessed in the GUI thread
+            try:
+                for w in self.cc_widgets:
+                    w.commit(self.ids)
+            except Exception as err:
+                import traceback
+                self.error = (err, traceback.format_exc())
+        self.pi.stopAnimation()
         QDialog.accept(self)
 
     def exec_(self):
         self.thread = Thread(target=self.do_it)
         self.thread.start()
+        self.pi.startAnimation()
         return QDialog.exec_(self)
 
     def do_it(self):
@@ -205,6 +215,46 @@ class MyBlockingBusyNew(QDialog):
                 for ofmt in originals:
                     cache.restore_original_format(book_id, ofmt)
 
+        # Various fields
+        if args.rating != -1:
+            cache.set_field('rating', {bid:args.rating*2 for bid in self.ids})
+
+        if args.pub:
+            cache.set_field('publisher', {bid:args.pub for bid in self.ids})
+
+        if args.clear_series:
+            cache.set_field('series', {bid:'' for bid in self.ids})
+
+        if args.pubdate is not None:
+            cache.set_field('pubdate', {bid:args.pubdate for bid in self.ids})
+
+        if args.adddate is not None:
+            cache.set_field('timestamp', {bid:args.adddate for bid in self.ids})
+
+        if args.do_series:
+            cache.set_field('series', {bid:args.series for bid in self.ids})
+            if not args.series:
+                cache.set_field('series_index', {bid:1.0 for bid in self.ids})
+            else:
+                sval = args.series_start_value if args.do_series_restart else cache.get_next_series_num_for(args.series)
+                smap = {bid:((sval + i) if args.do_autonumber else 1.0) for i, bid in enumerate(self.ids)}
+                if args.do_autonumber or tweaks['series_index_auto_increment'] != 'no_change':
+                    cache.set_field('series_index', smap)
+
+        if args.do_remove_conv:
+            cache.delete_conversion_options(self.ids)
+
+        if args.clear_languages:
+            cache.set_field('languages', {bid:() for bid in self.ids})
+        elif args.languages:
+            cache.set_field('languages', {bid:args.languages for bid in self.ids})
+
+        if args.remove_all:
+            cache.set_field('tags', {bid:() for bid in self.ids})
+        if args.add or args.remove:
+            self.db.bulk_modify_tags(self.ids, add=args.add, remove=args.remove)
+
+
 class MyBlockingBusy(QDialog):  # {{{
 
     do_one_signal = pyqtSignal()

From 5727ff9fa40318002d1aec509f83805b471cdfcc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jul 2013 21:32:15 +0530
Subject: [PATCH 0285/1154] Bulk metadata S&R

---
 src/calibre/gui2/dialogs/metadata_bulk.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index f6cce35d67..51845a3cf2 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -17,7 +17,7 @@ from calibre.ebooks.metadata import string_to_authors, authors_to_string, title_
 from calibre.ebooks.metadata.book.formatter import SafeFormat
 from calibre.gui2.custom_column_widgets import populate_metadata_page
 from calibre.gui2 import error_dialog, ResizableDialog, UNDEFINED_QDATETIME, \
-    gprefs, question_dialog
+    gprefs, question_dialog, FunctionDispatcher
 from calibre.gui2.progress_indicator import ProgressIndicator
 from calibre.gui2.metadata.basic_widgets import CalendarWidget
 from calibre.utils.config import dynamic, JSONConfig
@@ -63,8 +63,7 @@ class MyBlockingBusyNew(QDialog):
 
     all_done = pyqtSignal()
 
-    def __init__(self, args, ids, db, cc_widgets, s_r_func,
-                 parent=None, window_title=_('Working')):
+    def __init__(self, args, ids, db, cc_widgets, s_r_func, do_sr, parent=None, window_title=_('Working')):
         QDialog.__init__(self, parent)
 
         self._layout =  l = QVBoxLayout()
@@ -84,8 +83,10 @@ class MyBlockingBusyNew(QDialog):
         self.resize(self.sizeHint())
         self.error = None
         self.all_done.connect(self.on_all_done, type=Qt.QueuedConnection)
-        self.args, self.ids, self.s_r_func = args, ids, s_r_func
+        self.args, self.ids = args, ids
         self.db, self.cc_widgets = db, cc_widgets
+        self.s_r_func = FunctionDispatcher(s_r_func)
+        self.do_sr = do_sr
 
     def accept(self):
         pass
@@ -254,6 +255,10 @@ class MyBlockingBusyNew(QDialog):
         if args.add or args.remove:
             self.db.bulk_modify_tags(self.ids, add=args.add, remove=args.remove)
 
+        if self.do_sr:
+            for book_id in self.ids:
+                self.s_r_func(book_id)
+
 
 class MyBlockingBusy(QDialog):  # {{{
 
@@ -1016,7 +1021,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         if not dest:
             dest = source
         dfm = self.db.field_metadata[dest]
-        mi = self.db.get_metadata(id, index_is_id=True,)
+        mi = self.db.get_metadata(id, index_is_id=True)
         val = self.s_r_do_regexp(mi)
         val = self.s_r_do_destination(mi, val)
         if dfm['is_multiple']:
@@ -1208,9 +1213,11 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
                 restore_original)
 
         if hasattr(self.db, 'new_api'):
+            source = self.s_r_sf_itemdata(None)
+            do_sr = source and self.s_r_obj
             bb = MyBlockingBusyNew(args, self.ids, self.db,
                 getattr(self, 'custom_column_widgets', []),
-                self.do_search_replace, parent=self)
+                self.do_search_replace, do_sr, parent=self)
         else:
             bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.')
                 %len(self.ids), args, self.db, self.ids,

From 67b7aa8d117653e4c0940e7b228a28f1fba17a74 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 08:23:47 +0530
Subject: [PATCH 0286/1154] Respect series nunmbering increment tweak when bulk
 editing series

---
 src/calibre/db/cache.py                   |  4 +++-
 src/calibre/gui2/dialogs/metadata_bulk.py | 13 ++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index a669b7017b..d3aea991ac 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1170,7 +1170,7 @@ class Cache(object):
         self._update_last_modified(tuple(formats_map.iterkeys()))
 
     @read_api
-    def get_next_series_num_for(self, series, field='series'):
+    def get_next_series_num_for(self, series, field='series', current_indices=False):
         books = ()
         sf = self.fields[field]
         if series:
@@ -1180,6 +1180,8 @@ class Cache(object):
                     books = book_ids
                     break
         series_indices = sorted(self._field_for(sf.index_field.name, book_id) for book_id in books)
+        if current_indices:
+            return series_indices
         return _get_next_series_num_for_list(tuple(series_indices), unwrap=False)
 
     @read_api
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 51845a3cf2..277e887a09 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -27,7 +27,7 @@ from calibre.utils.config import prefs, tweaks
 from calibre.utils.magick.draw import identify_data
 from calibre.utils.date import qt_to_dt
 from calibre.ptempfile import SpooledTemporaryFile
-from calibre.db import SPOOL_SIZE
+from calibre.db import SPOOL_SIZE, _get_next_series_num_for_list
 
 def get_cover_data(stream, ext):  # {{{
     from calibre.ebooks.metadata.meta import get_metadata
@@ -237,8 +237,15 @@ class MyBlockingBusyNew(QDialog):
             if not args.series:
                 cache.set_field('series_index', {bid:1.0 for bid in self.ids})
             else:
-                sval = args.series_start_value if args.do_series_restart else cache.get_next_series_num_for(args.series)
-                smap = {bid:((sval + i) if args.do_autonumber else 1.0) for i, bid in enumerate(self.ids)}
+                sval = args.series_start_value if args.do_series_restart else list(cache.get_next_series_num_for(args.series, current_indices=True))
+                def next_series_num(i):
+                    if args.do_series_restart:
+                        return sval + i
+                    next_num = _get_next_series_num_for_list(sval, unwrap=False)
+                    sval.append(next_num)
+                    return next_num
+
+                smap = {bid:next_series_num(i) for i, bid in enumerate(self.ids)}
                 if args.do_autonumber or tweaks['series_index_auto_increment'] != 'no_change':
                     cache.set_field('series_index', smap)
 

From b4b97a1c17dc7445552feadaf060b880e2d76a58 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 08:35:15 +0530
Subject: [PATCH 0287/1154] More fixes to make bulk series editing behave like
 before

---
 src/calibre/gui2/dialogs/metadata_bulk.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 277e887a09..637e8d777e 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -233,11 +233,11 @@ class MyBlockingBusyNew(QDialog):
             cache.set_field('timestamp', {bid:args.adddate for bid in self.ids})
 
         if args.do_series:
+            sval = args.series_start_value if args.do_series_restart else list(cache.get_next_series_num_for(args.series, current_indices=True))
             cache.set_field('series', {bid:args.series for bid in self.ids})
             if not args.series:
                 cache.set_field('series_index', {bid:1.0 for bid in self.ids})
             else:
-                sval = args.series_start_value if args.do_series_restart else list(cache.get_next_series_num_for(args.series, current_indices=True))
                 def next_series_num(i):
                     if args.do_series_restart:
                         return sval + i
@@ -246,8 +246,10 @@ class MyBlockingBusyNew(QDialog):
                     return next_num
 
                 smap = {bid:next_series_num(i) for i, bid in enumerate(self.ids)}
-                if args.do_autonumber or tweaks['series_index_auto_increment'] != 'no_change':
+                if args.do_autonumber:
                     cache.set_field('series_index', smap)
+                elif tweaks['series_index_auto_increment'] != 'no_change':
+                    cache.set_field('series_index', {bid:1.0 for bid in self.ids})
 
         if args.do_remove_conv:
             cache.delete_conversion_options(self.ids)

From 51cc7275f368d834a5167b2440ebe0b7f0c90edd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 09:06:25 +0530
Subject: [PATCH 0288/1154] ...

---
 src/calibre/gui2/dialogs/metadata_bulk.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 637e8d777e..72ec1440a1 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -59,7 +59,7 @@ Settings = namedtuple('Settings', 'remove_all remove add au aus do_aus rating pu
                       'remove_format do_swap_ta do_remove_conv do_auto_author series do_series_restart series_start_value '
                       'do_title_case cover_action clear_series pubdate adddate do_title_sort languages clear_languages restore_original')
 
-class MyBlockingBusyNew(QDialog):
+class MyBlockingBusyNew(QDialog):  # {{{
 
     all_done = pyqtSignal()
 
@@ -267,7 +267,7 @@ class MyBlockingBusyNew(QDialog):
         if self.do_sr:
             for book_id in self.ids:
                 self.s_r_func(book_id)
-
+# }}}
 
 class MyBlockingBusy(QDialog):  # {{{
 

From b2d5b3abb034b9d53700c1b3d6859fc43d167385 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 09:17:50 +0530
Subject: [PATCH 0289/1154] ...

---
 src/calibre/gui2/actions/choose_library.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 4010847109..eb34aec6eb 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -498,7 +498,7 @@ class ChooseLibraryAction(InterfaceAction):
         # import weakref
         # from PyQt4.Qt import QTimer
         # self.dbref = weakref.ref(self.gui.library_view.model().db)
-        # self.before_mem = memory()/1024**2
+        # self.before_mem = memory()
         self.gui.library_moved(loc, allow_rebuild=True)
         # QTimer.singleShot(5000, self.debug_leak)
 
@@ -514,7 +514,7 @@ class ChooseLibraryAction(InterfaceAction):
                 print r
                 print
         print 'before:', self.before_mem
-        print 'after:', memory()/1024**2
+        print 'after:', memory()
         print
         self.dbref = self.before_mem = None
 

From 4a423ddaae33a7221214d1ec7089fd488c723941 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 09:55:40 +0530
Subject: [PATCH 0290/1154] mem usage behavior when switching libraries appears
 to be similar for both backends.

---
 src/calibre/db/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index c1b48cad0c..7a5c8d51d4 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -135,5 +135,4 @@ Various things that require other things before they can be migrated:
     1. Check that content server reloading on metadata,db change, metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
-    2. Check for mem leaks when switching libraries
 '''

From fa02915eb9a48be03bc9689c8a25c7c344da2fd0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 09:57:29 +0530
Subject: [PATCH 0291/1154] Fix various minor issues with the new API in the
 content server

---
 src/calibre/db/cache.py              |  2 +-
 src/calibre/db/view.py               |  6 +++++
 src/calibre/library/server/browse.py | 39 ++++++++++++++--------------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d3aea991ac..5a5e43bd70 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1483,7 +1483,7 @@ class Cache(object):
         if hasattr(f, 'get_books_for_val'):
             # Composite field
             return f.get_books_for_val(item_id_or_composite_value, self._get_metadata, self._all_book_ids())
-        return self._books_for_field(f.name, item_id_or_composite_value)
+        return self._books_for_field(f.name, int(item_id_or_composite_value))
 
     @read_api
     def find_identical_books(self, mi, search_restriction='', book_ids=None):
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index a8cd75d2c2..2a779a5af0 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -127,6 +127,9 @@ class View(object):
         book_id = id_or_index if index_is_id else self._map_filtered[id_or_index]
         return self._field_getters[loc](book_id)
 
+    def sanitize_sort_field_name(self, field):
+        return sanitize_sort_field_name(self.field_metadata, field)
+
     @property
     def field_metadata(self):
         return self.cache.field_metadata
@@ -154,6 +157,9 @@ class View(object):
         for book_id in sorted(self._map):
             yield book_id
 
+    def tablerow_for_id(self, book_id):
+        return TableRow(book_id, self)
+
     def get_field_map_field(self, row, col, index_is_id=True):
         '''
         Supports the legacy FIELD_MAP interface for getting metadata. Do not use
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index d25c34d52b..bffeb33829 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -28,7 +28,7 @@ def xml(*args, **kwargs):
     ans = prepare_string_for_xml(*args, **kwargs)
     return ans.replace('&apos;', '&#39;')
 
-def render_book_list(ids, prefix, suffix=''): # {{{
+def render_book_list(ids, prefix, suffix=''):  # {{{
     pages = []
     num = len(ids)
     pos = 0
@@ -113,13 +113,13 @@ def render_book_list(ids, prefix, suffix=''): # {{{
 
 # }}}
 
-def utf8(x): # {{{
+def utf8(x):  # {{{
     if isinstance(x, unicode):
         x = x.encode('utf-8')
     return x
 # }}}
 
-def render_rating(rating, url_prefix, container='span', prefix=None): # {{{
+def render_rating(rating, url_prefix, container='span', prefix=None):  # {{{
     if rating < 0.1:
         return '', ''
     added = 0
@@ -145,7 +145,7 @@ def render_rating(rating, url_prefix, container='span', prefix=None): # {{{
 
 # }}}
 
-def get_category_items(category, items, datatype, prefix): # {{{
+def get_category_items(category, items, datatype, prefix):  # {{{
 
     def item(i):
         templ = (u'<div title="{4}" class="category-item">'
@@ -179,7 +179,7 @@ def get_category_items(category, items, datatype, prefix): # {{{
 
 # }}}
 
-class Endpoint(object): # {{{
+class Endpoint(object):  # {{{
     'Manage encoding, mime-type, last modified, cookies, etc.'
 
     def __init__(self, mimetype='text/html; charset=utf-8', sort_type='category'):
@@ -194,7 +194,7 @@ class Endpoint(object): # {{{
             if 'json' not in eself.mimetype:
                 sort_val = None
                 cookie = cherrypy.request.cookie
-                if cookie.has_key(eself.sort_cookie_name):
+                if eself.sort_cookie_name in cookie:
                     sort_val = cookie[eself.sort_cookie_name].value
                 kwargs[eself.sort_kwarg] = sort_val
 
@@ -523,8 +523,6 @@ class BrowseServer(object):
             items = '\n\n'.join(items)
             items = u'<div id="groups">\n{0}</div>'.format(items)
 
-
-
         if cats:
             script = 'toplevel();category(%s);'%script
         else:
@@ -586,12 +584,11 @@ class BrowseServer(object):
                 datatype, self.opts.url_prefix)
         return json.dumps(entries, ensure_ascii=True)
 
-
     @Endpoint()
     def browse_catalog(self, category=None, category_sort=None):
         'Entry point for top-level, categories and sub-categories'
         prefix = '' if self.is_wsgi else self.opts.url_prefix
-        if category == None:
+        if category is None:
             ans = self.browse_toplevel()
         elif category == 'newest':
             raise cherrypy.InternalRedirect(prefix +
@@ -670,7 +667,10 @@ class BrowseServer(object):
                 ids = self.db.get_books_for_category(q, cid)
                 ids = [x for x in ids if x in all_ids]
 
-        items = [self.db.data._data[x] for x in ids]
+        if hasattr(self.db, 'new_api'):
+            items = [self.db.data.tablerow_for_id(x) for x in ids]
+        else:
+            items = [self.db.data._data[x] for x in ids]
         if category == 'newest':
             list_sort = 'timestamp'
         if dt == 'series':
@@ -770,7 +770,7 @@ class BrowseServer(object):
             if fmts and fmt:
                 other_fmts = [x for x in fmts if x.lower() != fmt.lower()]
                 if other_fmts:
-                    ofmts = [u'<a href="{4}/get/{0}/{1}_{2}.{0}" title="{3}">{3}</a>'\
+                    ofmts = [u'<a href="{4}/get/{0}/{1}_{2}.{0}" title="{3}">{3}</a>'
                             .format(f, fname, id_, f.upper(),
                                 self.opts.url_prefix) for f in
                             other_fmts]
@@ -783,7 +783,7 @@ class BrowseServer(object):
             if fmt:
                 href = self.opts.url_prefix + '/get/%s/%s_%d.%s'%(
                         fmt, fname, id_, fmt)
-                rt = xml(_('Read %(title)s in the %(fmt)s format')% \
+                rt = xml(_('Read %(title)s in the %(fmt)s format')%
                         {'title':args['title'], 'fmt':fmt.upper()}, True)
 
                 args['get_button'] = \
@@ -809,7 +809,6 @@ class BrowseServer(object):
 
             summs.append(self.browse_summary_template.format(**args))
 
-
         raw = json.dumps('\n'.join(summs), ensure_ascii=True)
         return raw
 
@@ -829,7 +828,7 @@ class BrowseServer(object):
                 args['get_url'] = ''
             args['formats'] = ''
             if fmts:
-                ofmts = [u'<a href="{4}/get/{0}/{1}_{2}.{0}" title="{3}">{3}</a>'\
+                ofmts = [u'<a href="{4}/get/{0}/{1}_{2}.{0}" title="{3}">{3}</a>'
                         .format(xfmt, fname, id_, xfmt.upper(),
                             self.opts.url_prefix) for xfmt in fmts]
                 ofmts = ', '.join(ofmts)
@@ -842,7 +841,7 @@ class BrowseServer(object):
                                 field not in displayed_custom_fields:
                     continue
                 if m['datatype'] == 'comments' or field == 'comments' or (
-                        m['datatype'] == 'composite' and \
+                        m['datatype'] == 'composite' and
                             m['display'].get('contains_html', False)):
                     val = mi.get(field, '')
                     if val and val.strip():
@@ -924,16 +923,17 @@ class BrowseServer(object):
         return self.browse_template('').format(
                 title='', script='book();', main=ans)
 
-
     # }}}
-
     # Search {{{
     @Endpoint(sort_type='list')
     def browse_search(self, query='', list_sort=None):
         if isbytestring(query):
             query = query.decode('UTF-8')
         ids = self.db.search_getting_ids(query.strip(), self.search_restriction)
-        items = [self.db.data._data[x] for x in ids]
+        if hasattr(self.db, 'new_api'):
+            items = [self.db.data.tablerow_for_id(x) for x in ids]
+        else:
+            items = [self.db.data._data[x] for x in ids]
         sort = self.browse_sort_book_list(items, list_sort)
         ids = [x[0] for x in items]
         html = render_book_list(ids, self.opts.url_prefix,
@@ -945,3 +945,4 @@ class BrowseServer(object):
     # }}}
 
 
+

From 39d06938166d7398fbafd1f30df45f5519bd122e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 09:58:43 +0530
Subject: [PATCH 0292/1154] Fix backup test broken

---
 src/calibre/db/backup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/backup.py b/src/calibre/db/backup.py
index 18722e1cf8..dc9f338fc9 100644
--- a/src/calibre/db/backup.py
+++ b/src/calibre/db/backup.py
@@ -26,7 +26,7 @@ class MetadataBackup(Thread):
     def __init__(self, db, interval=2, scheduling_interval=0.1):
         Thread.__init__(self)
         self.daemon = True
-        self._db = weakref.ref(db.new_api)
+        self._db = weakref.ref(getattr(db, 'new_api', db))
         self.stop_running = Event()
         self.interval = interval
         self.scheduling_interval = scheduling_interval

From 78bf4d14781de8a50f5021ed105f8cda8d900f4d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 10:02:57 +0530
Subject: [PATCH 0293/1154] Fix the remove_formats test

---
 src/calibre/db/tests/add_remove.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index 0047a0ec4f..a099ae5e84 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -116,18 +116,20 @@ class AddRemoveTest(BaseTest):
         # Test full removal of format
         af(cache.format(1, 'FMT1') is None)
         at(cache.has_format(1, 'FMT1'))
+        ap = cache.format_abspath(1, 'FMT1')
         cache.remove_formats({1:{'FMT1'}})
         at(cache.format(1, 'FMT1') is None)
         af(bool(cache.format_metadata(1, 'FMT1')))
         af(bool(cache.format_metadata(1, 'FMT1', allow_cache=False)))
         af('FMT1' in cache.formats(1))
         af(cache.has_format(1, 'FMT1'))
+        af(os.path.exists(ap))
 
         # Test db only removal
         at(cache.has_format(1, 'FMT2'))
         ap = cache.format_abspath(1, 'FMT2')
         if ap and os.path.exists(ap):
-            cache.remove_formats({1:{'FMT2'}})
+            cache.remove_formats({1:{'FMT2'}}, db_only=True)
             af(bool(cache.format_metadata(1, 'FMT2')))
             af(cache.has_format(1, 'FMT2'))
             at(os.path.exists(ap))

From f5eda364e6c16bc197e2d8dedef0d286241c1302 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 10:05:09 +0530
Subject: [PATCH 0294/1154] ...

---
 src/calibre/db/tests/add_remove.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index a099ae5e84..5cbac5deca 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -117,6 +117,7 @@ class AddRemoveTest(BaseTest):
         af(cache.format(1, 'FMT1') is None)
         at(cache.has_format(1, 'FMT1'))
         ap = cache.format_abspath(1, 'FMT1')
+        at(os.path.exists(ap))
         cache.remove_formats({1:{'FMT1'}})
         at(cache.format(1, 'FMT1') is None)
         af(bool(cache.format_metadata(1, 'FMT1')))

From 3b345d3ff50bc5049cc281862c29a04ec2fd5d62 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 10:46:29 +0530
Subject: [PATCH 0295/1154] On windows add a wait when hardlinking to account
 for broken network filesystems

---
 src/calibre/utils/filenames.py | 35 +++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index 23ac8fd43a..30645e7380 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -3,7 +3,7 @@ Make strings safe for use as ASCII filenames, while trying to preserve as much
 meaning as possible.
 '''
 
-import os, errno
+import os, errno, time
 from math import ceil
 
 from calibre import sanitize_file_name, isbytestring, force_unicode
@@ -257,6 +257,19 @@ def samefile(src, dst):
             os.path.normcase(os.path.abspath(dst)))
     return samestring
 
+def windows_get_size(path):
+    ''' On windows file sizes are only accurately stored in the actual file,
+    not in the directory entry (which could be out of date). So we open the
+    file, and get the actual size. '''
+    import win32file
+    h = win32file.CreateFile(
+        path, 0, win32file.FILE_SHARE_READ | win32file.FILE_SHARE_WRITE | win32file.FILE_SHARE_DELETE,
+        None, win32file.OPEN_EXISTING, 0, None)
+    try:
+        return win32file.GetFileSize(h)
+    finally:
+        win32file.CloseHandle(h)
+
 def windows_hardlink(src, dest):
     import win32file, pywintypes
     try:
@@ -264,17 +277,21 @@ def windows_hardlink(src, dest):
     except pywintypes.error as e:
         msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)
         raise Exception(msg % e)
+    src_size = os.path.getsize(src)
     # We open and close dest, to ensure its directory entry is updated
     # see http://blogs.msdn.com/b/oldnewthing/archive/2011/12/26/10251026.aspx
-    h = win32file.CreateFile(
-        dest, 0, win32file.FILE_SHARE_READ | win32file.FILE_SHARE_WRITE | win32file.FILE_SHARE_DELETE,
-        None, win32file.OPEN_EXISTING, 0, None)
-    try:
-        sz = win32file.GetFileSize(h)
-    finally:
-        win32file.CloseHandle(h)
+    for i in range(10):
+        # If we are on a network filesystem, we have to wait for some indeterminate time, since
+        # network file systems are the best thing since sliced bread
+        try:
+            if windows_get_size(dest) == src_size:
+                return
+        except EnvironmentError:
+            pass
+        time.sleep(0.3)
 
-    if sz != os.path.getsize(src):
+    sz = windows_get_size(dest)
+    if sz != src_size:
         msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)
         raise Exception(msg % ('hardlink size: %d not the same as source size' % sz))
 

From 6423745c0ca96fd4a8b8dbbf349b4510c4dad743 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 10:53:13 +0530
Subject: [PATCH 0296/1154] ...

---
 src/calibre/db/cache.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 5a5e43bd70..e49c719a62 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1613,5 +1613,3 @@ class SortKey(object):  # {{{
         return 0
 # }}}
 
-
-

From 8241d78c16967ae5c2360a185a33fce36148533c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 11:57:48 +0530
Subject: [PATCH 0297/1154] Handle case of bulk series changing index of
 existing book

---
 src/calibre/db/cache.py                   |  6 ++++--
 src/calibre/gui2/dialogs/metadata_bulk.py | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index e49c719a62..6cdb9419c6 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1179,9 +1179,11 @@ class Cache(object):
                 if q == icu_lower(val):
                     books = book_ids
                     break
-        series_indices = sorted(self._field_for(sf.index_field.name, book_id) for book_id in books)
+        idf = sf.index_field
+        index_map = {book_id:self._fast_field_for(idf, book_id, default_value=1.0) for book_id in books}
         if current_indices:
-            return series_indices
+            return index_map
+        series_indices = sorted(index_map.itervalues())
         return _get_next_series_num_for_list(tuple(series_indices), unwrap=False)
 
     @read_api
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 72ec1440a1..c72f1533a5 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -233,19 +233,19 @@ class MyBlockingBusyNew(QDialog):  # {{{
             cache.set_field('timestamp', {bid:args.adddate for bid in self.ids})
 
         if args.do_series:
-            sval = args.series_start_value if args.do_series_restart else list(cache.get_next_series_num_for(args.series, current_indices=True))
+            sval = args.series_start_value if args.do_series_restart else cache.get_next_series_num_for(args.series, current_indices=True)
             cache.set_field('series', {bid:args.series for bid in self.ids})
             if not args.series:
                 cache.set_field('series_index', {bid:1.0 for bid in self.ids})
             else:
-                def next_series_num(i):
+                def next_series_num(bid, i):
                     if args.do_series_restart:
                         return sval + i
-                    next_num = _get_next_series_num_for_list(sval, unwrap=False)
-                    sval.append(next_num)
+                    next_num = _get_next_series_num_for_list(sorted(sval.itervalues()), unwrap=False)
+                    sval[bid] = next_num
                     return next_num
 
-                smap = {bid:next_series_num(i) for i, bid in enumerate(self.ids)}
+                smap = {bid:next_series_num(bid, i) for i, bid in enumerate(self.ids)}
                 if args.do_autonumber:
                     cache.set_field('series_index', smap)
                 elif tweaks['series_index_auto_increment'] != 'no_change':

From d1609037ab3bf0aecc708b81d11a364e8eec9de4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 12:09:16 +0530
Subject: [PATCH 0298/1154] Handle number like values stored in datetime
 columns

---
 src/calibre/db/tables.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 9b9ff4e9e0..f71abe2a6d 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -29,6 +29,12 @@ def _c_convert_timestamp(val):
         return None
     try:
         ret = _c_speedup.parse_date(val.strip())
+    except AttributeError:
+        # If a value like 2001 is stored in the column, apsw will return it as
+        # an int
+        if isinstance(val, (int, float)):
+            return datetime(int(val), 1, 1, tzinfo=tzoffset(None, 0)).astimezone(local_tz)
+        ret = None
     except:
         ret = None
     if ret is None:

From 4f5764b1a81b154cf1dcbcb0e6f34d9a28f8a2d7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 12:20:52 +0530
Subject: [PATCH 0299/1154] Handle undecodable bytes in text columns

---
 src/calibre/db/tables.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index f71abe2a6d..34de470090 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -52,10 +52,16 @@ class Table(object):
         self.name, self.metadata = name, metadata
         self.sort_alpha = metadata.get('is_multiple', False) and metadata.get('display', {}).get('sort_alpha', False)
 
+        text = lambda x:x.decode('utf-8', 'replace') if isinstance(x, bytes) else x
+
         # self.unserialize() maps values from the db to python objects
         self.unserialize = \
             {
                 'datetime': _c_convert_timestamp,
+                'text': text,
+                'comments': text,
+                'series': text,
+                'enumeration': text,
                 'bool': bool
             }.get(
                 metadata['datatype'], lambda x: x)

From dcedc5b87db976d79972cdffece46162f1efe74f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 12:54:56 +0530
Subject: [PATCH 0300/1154] Proper fix for unicode sorting error

---
 src/calibre/db/fields.py | 2 +-
 src/calibre/db/tables.py | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 8c6d18a74d..933a4c861c 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -31,7 +31,7 @@ class Field(object):
         self.has_text_data = dt in {'text', 'comments', 'series', 'enumeration'}
         self.table_type = self.table.table_type
         self._sort_key = (sort_key if dt in ('text', 'series', 'enumeration') else lambda x: x)
-        self._default_sort_key = ''
+        self._default_sort_key = b''
         if dt in {'int', 'float', 'rating'}:
             self._default_sort_key = 0
         elif dt == 'bool':
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 34de470090..f71abe2a6d 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -52,16 +52,10 @@ class Table(object):
         self.name, self.metadata = name, metadata
         self.sort_alpha = metadata.get('is_multiple', False) and metadata.get('display', {}).get('sort_alpha', False)
 
-        text = lambda x:x.decode('utf-8', 'replace') if isinstance(x, bytes) else x
-
         # self.unserialize() maps values from the db to python objects
         self.unserialize = \
             {
                 'datetime': _c_convert_timestamp,
-                'text': text,
-                'comments': text,
-                'series': text,
-                'enumeration': text,
                 'bool': bool
             }.get(
                 metadata['datatype'], lambda x: x)

From d336d75a8161fa0363e8ee69723305a7d1395038 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 12:59:07 +0530
Subject: [PATCH 0301/1154] Add a comment explaining the use of a bytestring
 for default sort key

---
 src/calibre/db/fields.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 933a4c861c..403a76707c 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -31,7 +31,13 @@ class Field(object):
         self.has_text_data = dt in {'text', 'comments', 'series', 'enumeration'}
         self.table_type = self.table.table_type
         self._sort_key = (sort_key if dt in ('text', 'series', 'enumeration') else lambda x: x)
+
+        # This will be compared to the output of sort_key() which is a
+        # bytestring, therefore it is safer to have it be a bytestring.
+        # Coercing an empty bytestring to unicode will never fail, but the
+        # output of sort_key cannot be coerced to unicode
         self._default_sort_key = b''
+
         if dt in {'int', 'float', 'rating'}:
             self._default_sort_key = 0
         elif dt == 'bool':

From e105493d783bd2176c304f1a93a18bcebe7da942 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 13:17:10 +0530
Subject: [PATCH 0302/1154] Micro-optimizations when reading from the db

---
 src/calibre/db/tables.py | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index f71abe2a6d..2cd7d1502e 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -53,12 +53,10 @@ class Table(object):
         self.sort_alpha = metadata.get('is_multiple', False) and metadata.get('display', {}).get('sort_alpha', False)
 
         # self.unserialize() maps values from the db to python objects
-        self.unserialize = \
-            {
-                'datetime': _c_convert_timestamp,
-                'bool': bool
-            }.get(
-                metadata['datatype'], lambda x: x)
+        self.unserialize = {
+            'datetime': _c_convert_timestamp,
+            'bool': bool
+        }.get(metadata['datatype'], None)
         if name == 'authors':
             # Legacy
             self.unserialize = lambda x: x.replace('|', ',') if x else None
@@ -93,9 +91,13 @@ class OneToOneTable(Table):
     def read(self, db):
         self.book_col_map = {}
         idcol = 'id' if self.metadata['table'] == 'books' else 'book'
-        for row in db.conn.execute('SELECT {0}, {1} FROM {2}'.format(idcol,
-            self.metadata['column'], self.metadata['table'])):
-            self.book_col_map[row[0]] = self.unserialize(row[1])
+        query = db.conn.execute('SELECT {0}, {1} FROM {2}'.format(idcol,
+            self.metadata['column'], self.metadata['table']))
+        if self.unserialize is None:
+            self.book_col_map = {row[0]:row[1] for row in query}
+        else:
+            us = self.unserialize
+            self.book_col_map = {row[0]:us(row[1]) for row in query}
 
     def remove_books(self, book_ids, db):
         clean = set()
@@ -119,7 +121,7 @@ class SizeTable(OneToOneTable):
         for row in db.conn.execute(
                 'SELECT books.id, (SELECT MAX(uncompressed_size) FROM data '
                 'WHERE data.book=books.id) FROM books'):
-            self.book_col_map[row[0]] = self.unserialize(row[1])
+            self.book_col_map[row[0]] = row[1]
 
     def update_sizes(self, size_map):
         self.book_col_map.update(size_map)
@@ -180,9 +182,13 @@ class ManyToOneTable(Table):
         self.read_maps(db)
 
     def read_id_maps(self, db):
-        for row in db.conn.execute('SELECT id, {0} FROM {1}'.format(
-                self.metadata['column'], self.metadata['table'])):
-            self.id_map[row[0]] = self.unserialize(row[1])
+        query = db.conn.execute('SELECT id, {0} FROM {1}'.format(
+            self.metadata['column'], self.metadata['table']))
+        if self.unserialize is None:
+            self.id_map = {row[0]:row[1] for row in query}
+        else:
+            us = self.unserialize
+            self.id_map = {row[0]:us(row[1]) for row in query}
 
     def read_maps(self, db):
         for row in db.conn.execute(
@@ -348,11 +354,14 @@ class AuthorsTable(ManyToManyTable):
     def read_id_maps(self, db):
         self.alink_map = {}
         self.asort_map  = {}
+        self.id_map = {}
+        us = self.unserialize
         for row in db.conn.execute(
                 'SELECT id, name, sort, link FROM authors'):
-            self.id_map[row[0]] = self.unserialize(row[1])
+            val = us(row[1])
+            self.id_map[row[0]] = self.unserialize(val)
             self.asort_map[row[0]] = (row[2] if row[2] else
-                    author_to_author_sort(row[1]))
+                    author_to_author_sort(val))
             self.alink_map[row[0]] = row[3]
 
     def set_sort_names(self, aus_map, db):

From 98924814addee56a5a0dc2633bd8268b7463bc6d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 13:37:52 +0530
Subject: [PATCH 0303/1154] Fix metadata backup not being written if book
 directory does not exist

---
 src/calibre/db/backend.py | 9 +++++++--
 src/calibre/db/backup.py  | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 9eb49ccd4c..db5510d055 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1390,8 +1390,13 @@ class DB(object):
 
     def write_backup(self, path, raw):
         path = os.path.abspath(os.path.join(self.library_path, path, 'metadata.opf'))
-        with lopen(path, 'wb') as f:
-            f.write(raw)
+        try:
+            with lopen(path, 'wb') as f:
+                f.write(raw)
+        except EnvironmentError:
+            os.makedirs(os.path.dirname(path))
+            with lopen(path, 'wb') as f:
+                f.write(raw)
 
     def read_backup(self, path):
         path = os.path.abspath(os.path.join(self.library_path, path, 'metadata.opf'))
diff --git a/src/calibre/db/backup.py b/src/calibre/db/backup.py
index dc9f338fc9..1a6ff13412 100644
--- a/src/calibre/db/backup.py
+++ b/src/calibre/db/backup.py
@@ -100,11 +100,13 @@ class MetadataBackup(Thread):
             self.db.write_backup(book_id, raw)
         except:
             prints('Failed to write backup metadata for id:', book_id, 'once')
+            traceback.print_exc()
             self.wait(self.interval)
             try:
                 self.db.write_backup(book_id, raw)
             except:
                 prints('Failed to write backup metadata for id:', book_id, 'again, giving up')
+                traceback.print_exc()
                 return
 
         self.db.clear_dirtied(book_id, sequence)

From ef50b1a82386ee0a3a72e36bad4e944598c0bb92 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 13:49:21 +0530
Subject: [PATCH 0304/1154] More micro-optimizations

---
 src/calibre/db/tables.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 2cd7d1502e..412c937544 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -94,10 +94,10 @@ class OneToOneTable(Table):
         query = db.conn.execute('SELECT {0}, {1} FROM {2}'.format(idcol,
             self.metadata['column'], self.metadata['table']))
         if self.unserialize is None:
-            self.book_col_map = {row[0]:row[1] for row in query}
+            self.book_col_map = dict(query)
         else:
             us = self.unserialize
-            self.book_col_map = {row[0]:us(row[1]) for row in query}
+            self.book_col_map = {book_id:us(val) for book_id, val in query}
 
     def remove_books(self, book_ids, db):
         clean = set()
@@ -117,11 +117,10 @@ class PathTable(OneToOneTable):
 class SizeTable(OneToOneTable):
 
     def read(self, db):
-        self.book_col_map = {}
-        for row in db.conn.execute(
-                'SELECT books.id, (SELECT MAX(uncompressed_size) FROM data '
-                'WHERE data.book=books.id) FROM books'):
-            self.book_col_map[row[0]] = row[1]
+        query = db.conn.execute(
+            'SELECT books.id, (SELECT MAX(uncompressed_size) FROM data '
+            'WHERE data.book=books.id) FROM books')
+        self.book_col_map = dict(query)
 
     def update_sizes(self, size_map):
         self.book_col_map.update(size_map)
@@ -185,10 +184,10 @@ class ManyToOneTable(Table):
         query = db.conn.execute('SELECT id, {0} FROM {1}'.format(
             self.metadata['column'], self.metadata['table']))
         if self.unserialize is None:
-            self.id_map = {row[0]:row[1] for row in query}
+            self.id_map = dict(query)
         else:
             us = self.unserialize
-            self.id_map = {row[0]:us(row[1]) for row in query}
+            self.id_map = {book_id:us(val) for book_id, val in query}
 
     def read_maps(self, db):
         for row in db.conn.execute(

From c6bdca08aa6c980b776b7a35e34dc6c9443699e7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 14:10:48 +0530
Subject: [PATCH 0305/1154] Micro-optimization for get_categories() by using
 __slots__

---
 src/calibre/db/categories.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/db/categories.py b/src/calibre/db/categories.py
index f80bb52c08..ebd50750a3 100644
--- a/src/calibre/db/categories.py
+++ b/src/calibre/db/categories.py
@@ -21,6 +21,11 @@ CATEGORY_SORTS = ('name', 'popularity', 'rating')  # This has to be a tuple not
 
 class Tag(object):
 
+    if tweaks.get('use_new_db', False):
+        __slots__ = ('name', 'original_name', 'id', 'count', 'state', 'is_hierarchical',
+               'is_editable', 'is_searchable', 'id_set', 'avg_rating', 'sort',
+               'use_sort_as_name', 'tooltip', 'icon', 'category')
+
     def __init__(self, name, id=None, count=0, state=0, avg=0, sort=None,
                  tooltip=None, icon=None, category=None, id_set=None,
                  is_editable=True, is_searchable=True, use_sort_as_name=False):

From 61c170340264612a724371c02eea05774d7ff37b Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 22 Jul 2013 13:51:53 +0200
Subject: [PATCH 0306/1154] Remove broken code that does nothing useful

---
 src/calibre/devices/smart_device_app/driver.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 5fe60862e1..f8d679152d 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -140,21 +140,6 @@ class ConnectionListener(Thread):
                         self.driver.listen_socket.settimeout(None)
                         device_socket.settimeout(None)
 
-                        try:
-                            peer = self.driver.device_socket.getpeername()[0]
-                            attempts = self.drjver.connection_attempts.get(peer, 0)
-                            if attempts >= self.MAX_UNSUCCESSFUL_CONNECTS:
-                                self.driver._debug('too many connection attempts from', peer)
-                                device_socket.close()
-                                device_socket = None
-#                                raise InitialConnectionError(_('Too many connection attempts from %s') % peer)
-                            else:
-                                self.driver.connection_attempts[peer] = attempts + 1
-                        except InitialConnectionError:
-                            raise
-                        except:
-                            pass
-
                         try:
                             self.driver.connection_queue.put_nowait(device_socket)
                         except Queue.Full:

From e5007925866fac2a25094f1e18c3af6d8eac940d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Jul 2013 18:47:25 +0530
Subject: [PATCH 0307/1154] Conversion: Fix a regression in the last release
 that broke conversion of a few files with comments just before a chapter
 start. See #1188635

---
 src/calibre/ebooks/oeb/transforms/structure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/transforms/structure.py b/src/calibre/ebooks/oeb/transforms/structure.py
index 50ee4d011d..e5014194ff 100644
--- a/src/calibre/ebooks/oeb/transforms/structure.py
+++ b/src/calibre/ebooks/oeb/transforms/structure.py
@@ -35,7 +35,7 @@ def at_start(elem):
     for x in body.iter():
         if x is elem:
             return True
-        if getattr(x, 'tag', None) and x.tag.rpartition('}')[-1] in {'img', 'svg'}:
+        if hasattr(getattr(x, 'tag', None), 'rpartition') and x.tag.rpartition('}')[-1] in {'img', 'svg'}:
             return False
         if isspace(getattr(x, 'text', None)) and (x in ancestors or isspace(getattr(x, 'tail', None))):
             continue

From a1581e1433ec7a2f89af51b02a06192a35930007 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Jul 2013 08:16:55 +0530
Subject: [PATCH 0308/1154] Speed up reading the db

Principally by storing dates as UTC instead of local time. Includes some
micro optimizations in the code paths to build the maps.
---
 src/calibre/db/__init__.py                    |   7 +-
 src/calibre/db/search.py                      |   4 +-
 src/calibre/db/tables.py                      | 144 ++++++++----------
 src/calibre/db/tests/profiling.py             |  36 +++++
 src/calibre/db/tests/reading.py               |  18 +++
 .../library/catalogs/epub_mobi_builder.py     |   4 +-
 src/calibre/library/cli.py                    |   2 +-
 src/calibre/library/server/content.py         |   3 +-
 src/calibre/library/server/mobile.py          |   4 +-
 src/calibre/library/server/opds.py            |   3 +-
 src/calibre/utils/date.py                     |  91 ++++++++---
 src/calibre/utils/speedup.c                   |   3 +-
 12 files changed, 205 insertions(+), 114 deletions(-)
 create mode 100644 src/calibre/db/tests/profiling.py

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 7a5c8d51d4..bb0f679fd8 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -54,7 +54,7 @@ def _get_series_values(val):
             pass
     return (val, None)
 
-def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None):
+def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None, convert_to_local_tz=True):
     '''
     Return all metadata stored in the database as a dict. Includes paths to
     the cover and each format.
@@ -66,6 +66,7 @@ def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None):
     '''
     import os
     from calibre.ebooks.metadata import authors_to_string
+    from calibre.utils.date import as_local_time
     backend = getattr(self, 'backend', self)  # Works with both old and legacy interfaces
     if prefix is None:
         prefix = backend.library_path
@@ -88,6 +89,10 @@ def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None):
         x = {}
         for field in FIELDS:
             x[field] = record[self.FIELD_MAP[field]]
+        if convert_to_local_tz and hasattr(self, 'new_api'):
+            for tf in ('timestamp', 'pubdate', 'last_modified'):
+                x[tf] = as_local_time(x[tf])
+
         data.append(x)
         x['id'] = db_id
         x['formats'] = []
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index f00b7102e7..98886b8fc9 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -13,7 +13,7 @@ from datetime import timedelta
 
 from calibre.constants import preferred_encoding
 from calibre.utils.config_base import prefs
-from calibre.utils.date import parse_date, UNDEFINED_DATE, now
+from calibre.utils.date import parse_date, UNDEFINED_DATE, now, dt_as_local
 from calibre.utils.icu import primary_find, sort_key
 from calibre.utils.localization import lang_map, canonicalize_lang
 from calibre.utils.search_query_parser import SearchQueryParser, ParseException
@@ -211,7 +211,7 @@ class DateSearch(object):  # {{{
         for v, book_ids in field_iter():
             if isinstance(v, (str, unicode)):
                 v = parse_date(v)
-            if v is not None and relop(v, qd, field_count):
+            if v is not None and relop(dt_as_local(v), qd, field_count):
                 matches |= book_ids
 
         return matches
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 412c937544..c8d974fcf7 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -7,16 +7,37 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from collections import defaultdict
 
-from dateutil.tz import tzoffset
-
 from calibre.constants import plugins
-from calibre.utils.date import parse_date, local_tz, UNDEFINED_DATE
+from calibre.utils.date import parse_date, UNDEFINED_DATE, utc_tz
 from calibre.ebooks.metadata import author_to_author_sort
 
-_c_speedup = plugins['speedup'][0]
+_c_speedup = plugins['speedup'][0].parse_date
+
+def c_parse(val):
+    try:
+        year, month, day, hour, minutes, seconds, tzsecs = _c_speedup(val)
+    except (AttributeError, TypeError):
+        # If a value like 2001 is stored in the column, apsw will return it as
+        # an int
+        if isinstance(val, (int, float)):
+            return datetime(int(val), 1, 3, tzinfo=utc_tz)
+    except:
+        pass
+    else:
+        try:
+            ans = datetime(year, month, day, hour, minutes, seconds, tzinfo=utc_tz)
+            if tzsecs is not 0:
+                ans -= timedelta(seconds=tzsecs)
+        except OverflowError:
+            ans = UNDEFINED_DATE
+        return ans
+    try:
+        return parse_date(val, as_utc=True, assume_utc=True)
+    except ValueError:
+        return UNDEFINED_DATE
 
 ONE_ONE, MANY_ONE, MANY_MANY = xrange(3)
 
@@ -24,28 +45,6 @@ class Null:
     pass
 null = Null()
 
-def _c_convert_timestamp(val):
-    if not val:
-        return None
-    try:
-        ret = _c_speedup.parse_date(val.strip())
-    except AttributeError:
-        # If a value like 2001 is stored in the column, apsw will return it as
-        # an int
-        if isinstance(val, (int, float)):
-            return datetime(int(val), 1, 1, tzinfo=tzoffset(None, 0)).astimezone(local_tz)
-        ret = None
-    except:
-        ret = None
-    if ret is None:
-        return parse_date(val, as_utc=False)
-    year, month, day, hour, minutes, seconds, tzsecs = ret
-    try:
-        return datetime(year, month, day, hour, minutes, seconds,
-                tzinfo=tzoffset(None, tzsecs)).astimezone(local_tz)
-    except OverflowError:
-        return UNDEFINED_DATE.astimezone(local_tz)
-
 class Table(object):
 
     def __init__(self, name, metadata, link_table=None):
@@ -54,7 +53,7 @@ class Table(object):
 
         # self.unserialize() maps values from the db to python objects
         self.unserialize = {
-            'datetime': _c_convert_timestamp,
+            'datetime': c_parse,
             'bool': bool
         }.get(metadata['datatype'], None)
         if name == 'authors':
@@ -89,7 +88,6 @@ class OneToOneTable(Table):
     table_type = ONE_ONE
 
     def read(self, db):
-        self.book_col_map = {}
         idcol = 'id' if self.metadata['table'] == 'books' else 'book'
         query = db.conn.execute('SELECT {0}, {1} FROM {2}'.format(idcol,
             self.metadata['column'], self.metadata['table']))
@@ -175,7 +173,7 @@ class ManyToOneTable(Table):
 
     def read(self, db):
         self.id_map = {}
-        self.col_book_map = {}
+        self.col_book_map = defaultdict(set)
         self.book_col_map = {}
         self.read_id_maps(db)
         self.read_maps(db)
@@ -190,13 +188,13 @@ class ManyToOneTable(Table):
             self.id_map = {book_id:us(val) for book_id, val in query}
 
     def read_maps(self, db):
-        for row in db.conn.execute(
+        cbm = self.col_book_map
+        bcm = self.book_col_map
+        for book, item_id in db.conn.execute(
                 'SELECT book, {0} FROM {1}'.format(
                     self.metadata['link_column'], self.link_table)):
-            if row[1] not in self.col_book_map:
-                self.col_book_map[row[1]] = set()
-            self.col_book_map[row[1]].add(row[0])
-            self.book_col_map[row[0]] = row[1]
+            cbm[item_id].add(book)
+            bcm[book] = item_id
 
     def remove_books(self, book_ids, db):
         clean = set()
@@ -272,17 +270,14 @@ class ManyToManyTable(ManyToOneTable):
     do_clean_on_remove = True
 
     def read_maps(self, db):
-        for row in db.conn.execute(
-            self.selectq.format(self.metadata['link_column'], self.link_table)):
-            if row[1] not in self.col_book_map:
-                self.col_book_map[row[1]] = set()
-            self.col_book_map[row[1]].add(row[0])
-            if row[0] not in self.book_col_map:
-                self.book_col_map[row[0]] = []
-            self.book_col_map[row[0]].append(row[1])
+        bcm = defaultdict(list)
+        cbm = self.col_book_map
+        for book, item_id in db.conn.execute(
+                self.selectq.format(self.metadata['link_column'], self.link_table)):
+            cbm[item_id].add(book)
+            bcm[book].append(item_id)
 
-        for key in tuple(self.book_col_map.iterkeys()):
-            self.book_col_map[key] = tuple(self.book_col_map[key])
+        self.book_col_map = {k:tuple(v) for k, v in bcm.iteritems()}
 
     def remove_books(self, book_ids, db):
         clean = set()
@@ -351,17 +346,16 @@ class ManyToManyTable(ManyToOneTable):
 class AuthorsTable(ManyToManyTable):
 
     def read_id_maps(self, db):
-        self.alink_map = {}
-        self.asort_map  = {}
-        self.id_map = {}
+        self.alink_map = lm = {}
+        self.asort_map = sm = {}
+        self.id_map = im = {}
         us = self.unserialize
-        for row in db.conn.execute(
+        for aid, name, sort, link in db.conn.execute(
                 'SELECT id, name, sort, link FROM authors'):
-            val = us(row[1])
-            self.id_map[row[0]] = self.unserialize(val)
-            self.asort_map[row[0]] = (row[2] if row[2] else
-                    author_to_author_sort(val))
-            self.alink_map[row[0]] = row[3]
+            name = us(name)
+            im[aid] = name
+            sm[aid] = (sort or author_to_author_sort(name))
+            lm[aid] = link
 
     def set_sort_names(self, aus_map, db):
         aus_map = {aid:(a or '').strip() for aid, a in aus_map.iteritems()}
@@ -404,22 +398,20 @@ class FormatsTable(ManyToManyTable):
         pass
 
     def read_maps(self, db):
-        self.fname_map = defaultdict(dict)
-        self.size_map = defaultdict(dict)
-        for row in db.conn.execute('SELECT book, format, name, uncompressed_size FROM data'):
-            if row[1] is not None:
-                fmt = row[1].upper()
-                if fmt not in self.col_book_map:
-                    self.col_book_map[fmt] = set()
-                self.col_book_map[fmt].add(row[0])
-                if row[0] not in self.book_col_map:
-                    self.book_col_map[row[0]] = []
-                self.book_col_map[row[0]].append(fmt)
-                self.fname_map[row[0]][fmt] = row[2]
-                self.size_map[row[0]][fmt] = row[3]
+        self.fname_map = fnm = defaultdict(dict)
+        self.size_map = sm = defaultdict(dict)
+        self.col_book_map = cbm = defaultdict(set)
+        bcm = defaultdict(list)
 
-        for key in tuple(self.book_col_map.iterkeys()):
-            self.book_col_map[key] = tuple(sorted(self.book_col_map[key]))
+        for book, fmt, name, sz in db.conn.execute('SELECT book, format, name, uncompressed_size FROM data'):
+            if fmt is not None:
+                fmt = fmt.upper()
+                cbm[fmt].add(book)
+                bcm[book].append(fmt)
+                fnm[book][fmt] = name
+                sm[book][fmt] = sz
+
+        self.book_col_map = {k:tuple(sorted(v)) for k, v in bcm.iteritems()}
 
     def remove_books(self, book_ids, db):
         clean = ManyToManyTable.remove_books(self, book_ids, db)
@@ -485,14 +477,12 @@ class IdentifiersTable(ManyToManyTable):
         pass
 
     def read_maps(self, db):
-        for row in db.conn.execute('SELECT book, type, val FROM identifiers'):
-            if row[1] is not None and row[2] is not None:
-                if row[1] not in self.col_book_map:
-                    self.col_book_map[row[1]] = set()
-                self.col_book_map[row[1]].add(row[0])
-                if row[0] not in self.book_col_map:
-                    self.book_col_map[row[0]] = {}
-                self.book_col_map[row[0]][row[1]] = row[2]
+        self.book_col_map = defaultdict(dict)
+        self.col_book_map = defaultdict(set)
+        for book, typ, val in db.conn.execute('SELECT book, type, val FROM identifiers'):
+            if typ is not None and val is not None:
+                self.col_book_map[typ].add(book)
+                self.book_col_map[book][typ] = val
 
     def remove_books(self, book_ids, db):
         clean = set()
diff --git a/src/calibre/db/tests/profiling.py b/src/calibre/db/tests/profiling.py
new file mode 100644
index 0000000000..6cff57f990
--- /dev/null
+++ b/src/calibre/db/tests/profiling.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os, cProfile
+from tempfile import gettempdir
+
+from calibre.db.legacy import LibraryDatabase
+
+db = None
+def initdb(path):
+    global db
+    db = LibraryDatabase(os.path.expanduser(path))
+
+def show_stats(path):
+    from pstats import Stats
+    s = Stats(path)
+    s.sort_stats('cumulative')
+    s.print_stats(30)
+
+def main():
+    stats = os.path.join(gettempdir(), 'read_db.stats')
+    pr = cProfile.Profile()
+    pr.enable()
+    initdb('~/documents/largelib')
+    pr.disable()
+    pr.dump_stats(stats)
+    show_stats(stats)
+    print ('Stats saved to', stats)
+
+if __name__ == '__main__':
+    main()
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index fcf309ea66..eea8cd2eaa 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -385,3 +385,21 @@ class ReadingTest(BaseTest):
                 self.assertFalse(x.has_book(Metadata(title[:1])))
         db.close()
     # }}}
+
+    def test_datetime(self):
+        ' Test the reading of datetimes stored in the db '
+        from calibre.utils.date import parse_date
+        from calibre.db.tables import c_parse, UNDEFINED_DATE, _c_speedup
+
+        # First test parsing of string to UTC time
+        for raw in ('2013-07-22 15:18:29+05:30', '  2013-07-22 15:18:29+00:00', '2013-07-22 15:18:29', '2003-09-21 23:30:00-06:00'):
+            self.assertTrue(_c_speedup(raw))
+            ctime = c_parse(raw)
+            pytime = parse_date(raw, assume_utc=True)
+            self.assertEqual(ctime, pytime)
+
+        self.assertEqual(c_parse(2003).year, 2003)
+        for x in (None, '', 'abc'):
+            self.assertEqual(UNDEFINED_DATE, c_parse(x))
+
+
diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py
index e31b9808b0..50c29cdbab 100644
--- a/src/calibre/library/catalogs/epub_mobi_builder.py
+++ b/src/calibre/library/catalogs/epub_mobi_builder.py
@@ -18,7 +18,7 @@ from calibre.ebooks.metadata import author_to_author_sort
 from calibre.library.catalogs import AuthorSortMismatchException, EmptyCatalogException, \
                                      InvalidGenresSourceFieldException
 from calibre.ptempfile import PersistentTemporaryDirectory
-from calibre.utils.date import format_date, is_date_undefined, now as nowf
+from calibre.utils.date import format_date, is_date_undefined, now as nowf, as_local_time
 from calibre.utils.filenames import ascii_text, shorten_components_to
 from calibre.utils.icu import capitalize, collation_order, sort_key
 from calibre.utils.magick.draw import thumbnail
@@ -940,7 +940,7 @@ class CatalogBuilder(object):
             if is_date_undefined(record['pubdate']):
                 this_title['date'] = None
             else:
-                this_title['date'] = strftime(u'%B %Y', record['pubdate'].timetuple())
+                this_title['date'] = strftime(u'%B %Y', as_local_time(record['pubdate']).timetuple())
 
             this_title['timestamp'] = record['timestamp']
 
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 5a888f672e..012d88dace 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -74,7 +74,7 @@ def do_list(db, fields, afields, sort_by, ascending, search_text, line_width, se
         db.sort(sort_by, ascending)
     if search_text:
         db.search(search_text)
-    data = db.get_data_as_dict(prefix, authors_as_string=True)
+    data = db.get_data_as_dict(prefix, authors_as_string=True, convert_to_local_tz=False)
     if limit > -1:
         data = data[:limit]
     fields = ['id'] + fields
diff --git a/src/calibre/library/server/content.py b/src/calibre/library/server/content.py
index 45a46d6c56..cdc569f8b7 100644
--- a/src/calibre/library/server/content.py
+++ b/src/calibre/library/server/content.py
@@ -10,7 +10,7 @@ import re, os, posixpath
 import cherrypy
 
 from calibre import fit_image, guess_type
-from calibre.utils.date import fromtimestamp
+from calibre.utils.date import fromtimestamp, as_utc
 from calibre.library.caches import SortKeyGenerator
 from calibre.library.save_to_disk import find_plugboard
 from calibre.ebooks.metadata import authors_to_string
@@ -54,6 +54,7 @@ class ContentServer(object):
         Generates a locale independent, english timestamp from a datetime
         object
         '''
+        updated = as_utc(updated)
         lm = updated.strftime('day, %d month %Y %H:%M:%S GMT')
         day ={0:'Sun', 1:'Mon', 2:'Tue', 3:'Wed', 4:'Thu', 5:'Fri', 6:'Sat'}
         lm = lm.replace('day', day[int(updated.strftime('%w'))])
diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py
index 51bfca204a..767a48a9d9 100644
--- a/src/calibre/library/server/mobile.py
+++ b/src/calibre/library/server/mobile.py
@@ -19,7 +19,7 @@ from calibre.library.server.utils import strftime, format_tag_string
 from calibre.ebooks.metadata import fmt_sidx
 from calibre.constants import __appname__
 from calibre import human_readable, isbytestring
-from calibre.utils.date import utcfromtimestamp
+from calibre.utils.date import utcfromtimestamp, as_local_time
 from calibre.utils.filenames import ascii_filename
 from calibre.utils.icu import sort_key
 
@@ -254,7 +254,7 @@ class MobileServer(object):
                                              no_tag_count=True)
             book['title'] = record[FM['title']]
             for x in ('timestamp', 'pubdate'):
-                book[x] = strftime('%d %b, %Y', record[FM[x]])
+                book[x] = strftime('%d %b, %Y', as_local_time(record[FM[x]]))
             book['id'] = record[FM['id']]
             books.append(book)
             for key in CKEYS:
diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
index 36a65661d1..b4e5c7b265 100644
--- a/src/calibre/library/server/opds.py
+++ b/src/calibre/library/server/opds.py
@@ -22,6 +22,7 @@ from calibre.library.server import custom_fields_to_display
 from calibre.library.server.utils import format_tag_string, Offsets
 from calibre import guess_type, prepare_string_for_xml as xml
 from calibre.utils.icu import sort_key
+from calibre.utils.date import as_utc
 
 BASE_HREFS = {
         0 : '/stanza',
@@ -58,7 +59,7 @@ ID      = E.id
 ICON    = E.icon
 
 def UPDATED(dt, *args, **kwargs):
-    return E.updated(dt.strftime('%Y-%m-%dT%H:%M:%S+00:00'), *args, **kwargs)
+    return E.updated(as_utc(dt).strftime('%Y-%m-%dT%H:%M:%S+00:00'), *args, **kwargs)
 
 LINK = partial(E.link, type='application/atom+xml')
 NAVLINK = partial(E.link,
diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index 1a2289681c..0a8d779af8 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -6,23 +6,47 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import re
-from datetime import datetime, time, timedelta
+import re, time
+from datetime import datetime, time as dtime, timedelta
 from functools import partial
 
-from dateutil.tz import tzlocal, tzutc
+from dateutil.tz import tzlocal, tzutc, EPOCHORDINAL
 
 from calibre import strftime
 
 class SafeLocalTimeZone(tzlocal):
-    '''
-    Assume DST was not in effect for historical dates, if DST
-    data for the local timezone is not present in the operating system.
-    '''
 
     def _isdst(self, dt):
+        # We can't use mktime here. It is unstable when deciding if
+        # the hour near to a change is DST or not.
+        #
+        # timestamp = time.mktime((dt.year, dt.month, dt.day, dt.hour,
+        #                         dt.minute, dt.second, dt.weekday(), 0, -1))
+        # return time.localtime(timestamp).tm_isdst
+        #
+        # The code above yields the following result:
+        #
+        #>>> import tz, datetime
+        #>>> t = tz.tzlocal()
+        #>>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
+        #'BRDT'
+        #>>> datetime.datetime(2003,2,16,0,tzinfo=t).tzname()
+        #'BRST'
+        #>>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
+        #'BRST'
+        #>>> datetime.datetime(2003,2,15,22,tzinfo=t).tzname()
+        #'BRDT'
+        #>>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
+        #'BRDT'
+        #
+        # Here is a more stable implementation:
+        #
         try:
-            return tzlocal._isdst(self, dt)
+            timestamp = ((dt.toordinal() - EPOCHORDINAL) * 86400
+                        + dt.hour * 3600
+                        + dt.minute * 60
+                        + dt.second)
+            return time.localtime(timestamp+time.timezone).tm_isdst
         except ValueError:
             pass
         return False
@@ -150,6 +174,11 @@ def as_local_time(date_time, assume_utc=True):
                 _local_tz)
     return date_time.astimezone(_local_tz)
 
+def dt_as_local(dt):
+    if dt.tzinfo is local_tz:
+        return dt
+    return dt.astimezone(local_tz)
+
 def as_utc(date_time, assume_utc=True):
     if not hasattr(date_time, 'tzinfo'):
         return date_time
@@ -174,24 +203,27 @@ def utcfromtimestamp(stamp):
         traceback.print_exc()
         return utcnow()
 
-#### Format date functions
+# Format date functions
 
 def fd_format_hour(dt, strf, ampm, hr):
     l = len(hr)
     h = dt.hour
     if ampm:
         h = h%12
-    if l == 1: return '%d'%h
+    if l == 1:
+        return '%d'%h
     return '%02d'%h
 
 def fd_format_minute(dt, strf, ampm, min):
     l = len(min)
-    if l == 1: return '%d'%dt.minute
+    if l == 1:
+        return '%d'%dt.minute
     return '%02d'%dt.minute
 
 def fd_format_second(dt, strf, ampm, sec):
     l = len(sec)
-    if l == 1: return '%d'%dt.second
+    if l == 1:
+        return '%d'%dt.second
     return '%02d'%dt.second
 
 def fd_format_ampm(dt, strf, ampm, ap):
@@ -202,20 +234,27 @@ def fd_format_ampm(dt, strf, ampm, ap):
 
 def fd_format_day(dt, strf, ampm, dy):
     l = len(dy)
-    if l == 1: return '%d'%dt.day
-    if l == 2: return '%02d'%dt.day
-    if l == 3: return strf('%a')
+    if l == 1:
+        return '%d'%dt.day
+    if l == 2:
+        return '%02d'%dt.day
+    if l == 3:
+        return strf('%a')
     return strf('%A')
 
 def fd_format_month(dt, strf, ampm, mo):
     l = len(mo)
-    if l == 1: return '%d'%dt.month
-    if l == 2: return '%02d'%dt.month
-    if l == 3: return strf('%b')
+    if l == 1:
+        return '%d'%dt.month
+    if l == 2:
+        return '%02d'%dt.month
+    if l == 3:
+        return strf('%b')
     return strf('%B')
 
 def fd_format_year(dt, strf, ampm, yr):
-    if len(yr) == 2: return '%02d'%(dt.year % 100)
+    if len(yr) == 2:
+        return '%02d'%(dt.year % 100)
     return '%04d'%dt.year
 
 fd_function_index = {
@@ -240,7 +279,7 @@ def format_date(dt, format, assume_utc=False, as_utc=False):
         format = 'dd MMM yyyy'
 
     if not isinstance(dt, datetime):
-        dt = datetime.combine(dt, time())
+        dt = datetime.combine(dt, dtime())
 
     if hasattr(dt, 'tzinfo'):
         if dt.tzinfo is None:
@@ -260,7 +299,7 @@ def format_date(dt, format, assume_utc=False, as_utc=False):
         '(s{1,2})|(m{1,2})|(h{1,2})|(ap)|(AP)|(d{1,4}|M{1,4}|(?:yyyy|yy))',
         repl_func, format)
 
-#### Clean date functions
+# Clean date functions
 
 def cd_has_hour(tt, dt):
     tt['hour'] = dt.hour
@@ -307,7 +346,7 @@ def clean_date_for_sort(dt, format):
         format = 'yyMd'
 
     if not isinstance(dt, datetime):
-        dt = datetime.combine(dt, time())
+        dt = datetime.combine(dt, dtime())
 
     if hasattr(dt, 'tzinfo'):
         if dt.tzinfo is None:
@@ -340,7 +379,7 @@ def replace_months(datestr, clang):
         u'[sS]eptembre': u'sep',
         u'[Oo]ctobre': u'oct',
         u'[nN]ovembre': u'nov',
-        u'[dD].cembre': u'dec' }
+        u'[dD].cembre': u'dec'}
     detoen = {
         u'[jJ]anuar': u'jan',
         u'[fF]ebruar': u'feb',
@@ -353,7 +392,7 @@ def replace_months(datestr, clang):
         u'[sS]eptember': u'sep',
         u'[Oo]ktober': u'oct',
         u'[nN]ovember': u'nov',
-        u'[dD]ezember': u'dec' }
+        u'[dD]ezember': u'dec'}
 
     if clang == 'fr':
         dictoen = frtoen
@@ -364,6 +403,8 @@ def replace_months(datestr, clang):
 
     for k in dictoen.iterkeys():
         tmp = re.sub(k, dictoen[k], datestr)
-        if tmp != datestr: break
+        if tmp != datestr:
+            break
     return tmp
 
+
diff --git a/src/calibre/utils/speedup.c b/src/calibre/utils/speedup.c
index 171179a88a..b05d8ee3c1 100644
--- a/src/calibre/utils/speedup.c
+++ b/src/calibre/utils/speedup.c
@@ -13,12 +13,12 @@ speedup_parse_date(PyObject *self, PyObject *args) {
     long year, month, day, hour, minute, second, tzh = 0, tzm = 0, sign = 0;
     size_t len;
     if(!PyArg_ParseTuple(args, "s", &raw)) return NULL;
+    while ((*raw == ' ' || *raw == '\t' || *raw == '\n' || *raw == '\r' || *raw == '\f' || *raw == '\v') && *raw != 0) raw++;
     len = strlen(raw);
     if (len < 19) Py_RETURN_NONE;
 
     orig = raw;
 
-
     year = strtol(raw, &end, 10);
     if ((end - raw) != 4) Py_RETURN_NONE;
     raw += 5;
@@ -27,7 +27,6 @@ speedup_parse_date(PyObject *self, PyObject *args) {
     month = strtol(raw, &end, 10);
     if ((end - raw) != 2) Py_RETURN_NONE;
     raw += 3;
-    
 
     day = strtol(raw, &end, 10);
     if ((end - raw) != 2) Py_RETURN_NONE;

From e1ed5f679ffaaeda46342186624903698c2caeba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Jul 2013 08:47:01 +0530
Subject: [PATCH 0309/1154] Micro-optimization for get_categories()

---
 src/calibre/db/fields.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 403a76707c..ac96cb837d 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -114,6 +114,7 @@ class Field(object):
         if not self.is_many:
             return ans
 
+        id_map = self.table.id_map
         special_sort = hasattr(self, 'category_sort_value')
         for item_id, item_book_ids in self.table.col_book_map.iteritems():
             if book_ids is not None:
@@ -122,7 +123,7 @@ class Field(object):
                 ratings = tuple(r for r in (book_rating_map.get(book_id, 0) for
                                             book_id in item_book_ids) if r > 0)
                 avg = sum(ratings)/len(ratings) if ratings else 0
-                name = self.category_formatter(self.table.id_map[item_id])
+                name = self.category_formatter(id_map[item_id])
                 sval = (self.category_sort_value(item_id, item_book_ids, lang_map)
                         if special_sort else name)
                 c = tag_class(name, id=item_id, sort=sval, avg=avg,

From 2da2657345ccfdaf2197d8572ae22a6fd82abe44 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Jul 2013 08:57:10 +0530
Subject: [PATCH 0310/1154] pep8

---
 src/calibre/ebooks/metadata/book/base.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 0948ef544d..67c3fb1428 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -80,7 +80,7 @@ class Metadata(object):
                 self.title = title
             if authors:
                 # List of strings or []
-                self.author = list(authors) if authors else []# Needed for backward compatibility
+                self.author = list(authors) if authors else []  # Needed for backward compatibility
                 self.authors = list(authors) if authors else []
         from calibre.ebooks.metadata.book.formatter import SafeFormat
         self.formatter = SafeFormat()
@@ -429,8 +429,7 @@ class Metadata(object):
             try:
                 src = op[0]
                 dest = op[1]
-                val = formatter.safe_format\
-                    (src, other, 'PLUGBOARD TEMPLATE ERROR', other)
+                val = formatter.safe_format(src, other, 'PLUGBOARD TEMPLATE ERROR', other)
                 if dest == 'tags':
                     self.set(dest, [f.strip() for f in val.split(',') if f.strip()])
                 elif dest == 'authors':
@@ -476,7 +475,7 @@ class Metadata(object):
         if replace_metadata:
             # SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments', 'thumbnail'])
             for attr in SC_COPYABLE_FIELDS:
-                setattr(self, attr, getattr(other, attr, 1.0 if \
+                setattr(self, attr, getattr(other, attr, 1.0 if
                         attr == 'series_index' else None))
             self.tags = other.tags
             self.cover_data = getattr(other, 'cover_data',
@@ -507,8 +506,10 @@ class Metadata(object):
             if getattr(other, 'cover_data', False):
                 other_cover = other.cover_data[-1]
                 self_cover = self.cover_data[-1] if self.cover_data else ''
-                if not self_cover: self_cover = ''
-                if not other_cover: other_cover = ''
+                if not self_cover:
+                    self_cover = ''
+                if not other_cover:
+                    other_cover = ''
                 if len(other_cover) > len(self_cover):
                     self.cover_data = other.cover_data
 
@@ -517,7 +518,7 @@ class Metadata(object):
                     meta = other.get_user_metadata(x, make_copy=True)
                     if meta is not None:
                         self_tags = self.get(x, [])
-                        self.set_user_metadata(x, meta) # get... did the deepcopy
+                        self.set_user_metadata(x, meta)  # get... did the deepcopy
                         other_tags = other.get(x, [])
                         if meta['datatype'] == 'text' and meta['is_multiple']:
                             # Case-insensitive but case preserving merging
@@ -607,7 +608,7 @@ class Metadata(object):
 
         # Handle custom series index
         if key.startswith('#') and key.endswith('_index'):
-            tkey = key[:-6] # strip the _index
+            tkey = key[:-6]  # strip the _index
             cmeta = self.get_user_metadata(tkey, make_copy=False)
             if cmeta and cmeta['datatype'] == 'series':
                 if self.get(tkey):
@@ -698,7 +699,7 @@ class Metadata(object):
         if self.title_sort:
             fmt('Title sort', self.title_sort)
         if self.authors:
-            fmt('Author(s)',  authors_to_string(self.authors) + \
+            fmt('Author(s)',  authors_to_string(self.authors) +
                ((' [' + self.author_sort + ']')
                 if self.author_sort and self.author_sort != _('Unknown') else ''))
         if self.publisher:
@@ -805,3 +806,4 @@ def field_from_string(field, raw, field_metadata):
     return val
 
 
+

From 9b57e80e28d87356271db8198f311ac879969edf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Jul 2013 09:09:23 +0530
Subject: [PATCH 0311/1154] Micro-optimize mi.set_identifiers()

---
 src/calibre/ebooks/metadata/book/base.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 67c3fb1428..4427121f37 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -42,6 +42,8 @@ NULL_VALUES = {
 
 field_metadata = FieldMetadata()
 
+ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '')
+cv = lambda val: val.strip().replace(',', '|').replace(':', '|')
 
 class Metadata(object):
 
@@ -224,9 +226,9 @@ class Metadata(object):
 
     def _clean_identifier(self, typ, val):
         if typ:
-            typ = icu_lower(typ).strip().replace(':', '').replace(',', '')
+            typ = ck(typ)
         if val:
-            val = val.strip().replace(',', '|').replace(':', '|')
+            val = cv(val)
         return typ, val
 
     def set_identifiers(self, identifiers):
@@ -234,11 +236,7 @@ class Metadata(object):
         Set all identifiers. Note that if you previously set ISBN, calling
         this method will delete it.
         '''
-        cleaned = {}
-        for key, val in identifiers.iteritems():
-            key, val = self._clean_identifier(key, val)
-            if key and val:
-                cleaned[key] = val
+        cleaned = {ck(k):cv(v) for k, v in identifiers.iteritems() if k and v}
         object.__getattribute__(self, '_data')['identifiers'] = cleaned
 
     def set_identifier(self, typ, val):

From ef48091c23e0f80707977f778aaf477ea6c40998 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Jul 2013 09:48:26 +0530
Subject: [PATCH 0312/1154] ...

---
 src/calibre/db/fields.py          | 5 +++--
 src/calibre/db/tests/profiling.py | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index ac96cb837d..9becf82403 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -163,12 +163,13 @@ class CompositeField(OneToOneField):
 
         self._render_cache = {}
         self._lock = Lock()
+        self._composite_name = '#' + self.metadata['label']
 
     def render_composite(self, book_id, mi):
         with self._lock:
             ans = self._render_cache.get(book_id, None)
         if ans is None:
-            ans = mi.get('#'+self.metadata['label'])
+            ans = mi.get(self._composite_name)
             with self._lock:
                 self._render_cache[book_id] = ans
         return ans
@@ -186,7 +187,7 @@ class CompositeField(OneToOneField):
             ans = self._render_cache.get(book_id, None)
         if ans is None:
             mi = get_metadata(book_id)
-            ans = mi.get('#'+self.metadata['label'])
+            ans = mi.get(self._composite_name)
             with self._lock:
                 self._render_cache[book_id] = ans
         return ans
diff --git a/src/calibre/db/tests/profiling.py b/src/calibre/db/tests/profiling.py
index 6cff57f990..07365b1b75 100644
--- a/src/calibre/db/tests/profiling.py
+++ b/src/calibre/db/tests/profiling.py
@@ -25,8 +25,12 @@ def show_stats(path):
 def main():
     stats = os.path.join(gettempdir(), 'read_db.stats')
     pr = cProfile.Profile()
+    initdb('~/test library')
+    all_ids = db.new_api.all_book_ids()  # noqa
     pr.enable()
-    initdb('~/documents/largelib')
+    for book_id in all_ids:
+        db.new_api._composite_for('#isbn', book_id)
+        db.new_api._composite_for('#formats', book_id)
     pr.disable()
     pr.dump_stats(stats)
     show_stats(stats)

From bfa4c67dc91b6a24a818c5136b8cc7af5b08ccc1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Jul 2013 13:40:35 +0530
Subject: [PATCH 0313/1154] Search caching for the new backed with a simple LRU
 cache

---
 src/calibre/db/cache.py         |  23 ++++++-
 src/calibre/db/search.py        | 107 ++++++++++++++++++++++++++------
 src/calibre/db/tests/reading.py |  59 +++++++++++++++++-
 3 files changed, 166 insertions(+), 23 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 6cdb9419c6..52227a5b84 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -150,12 +150,22 @@ class Cache(object):
             field.clear_caches(book_ids=book_ids)
 
     @write_api
-    def clear_caches(self, book_ids=None):
-        self._initialize_template_cache()  # Clear the formatter template cache
+    def clear_search_caches(self):
+        self._search_api.clear_caches()
+
+    @write_api
+    def clear_caches(self, book_ids=None, template_cache=True):
+        if template_cache:
+            self._initialize_template_cache()  # Clear the formatter template cache
         for field in self.fields.itervalues():
             if hasattr(field, 'clear_caches'):
                 field.clear_caches(book_ids=book_ids)  # Clear the composite cache and ondevice caches
-        self.format_metadata_cache.clear()
+        if book_ids:
+            for book_id in book_ids:
+                self.format_metadata_cache.pop(book_id, None)
+        else:
+            self.format_metadata_cache.clear()
+        self._clear_search_caches()
 
     @write_api
     def reload_from_db(self, clear_caches=True):
@@ -497,6 +507,8 @@ class Cache(object):
     @write_api
     def set_pref(self, name, val):
         self.backend.prefs.set(name, val)
+        if name == 'grouped_search_terms':
+            self._clear_search_caches()
 
     @api
     def get_metadata(self, book_id,
@@ -812,6 +824,7 @@ class Cache(object):
             f.writer.set_books({book_id:now for book_id in book_ids}, self.backend)
             if self.composites:
                 self._clear_composite_caches(book_ids)
+            self._clear_search_caches()
 
     @write_api
     def mark_as_dirty(self, book_ids):
@@ -1286,6 +1299,7 @@ class Cache(object):
                 continue  # Some fields like ondevice do not have tables
             else:
                 table.remove_books(book_ids, self.backend)
+        self._clear_caches(book_ids=book_ids, template_cache=False)
 
     @read_api
     def author_sort_strings_for_books(self, book_ids):
@@ -1563,10 +1577,12 @@ class Cache(object):
     @write_api
     def saved_search_set_all(self, smap):
         self._search_api.saved_searches.set_all(smap)
+        self._clear_search_caches()
 
     @write_api
     def saved_search_delete(self, name):
         self._search_api.saved_searches.delete(name)
+        self._clear_search_caches()
 
     @write_api
     def saved_search_add(self, name, val):
@@ -1575,6 +1591,7 @@ class Cache(object):
     @write_api
     def saved_search_rename(self, old_name, new_name):
         self._search_api.saved_searches.rename(old_name, new_name)
+        self._clear_search_caches()
 
     @write_api
     def change_search_locations(self, newlocs):
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 98886b8fc9..07b3bde068 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -10,6 +10,7 @@ __docformat__ = 'restructuredtext en'
 import re, weakref
 from functools import partial
 from datetime import timedelta
+from collections import deque
 
 from calibre.constants import preferred_encoding
 from calibre.utils.config_base import prefs
@@ -711,6 +712,47 @@ class Parser(SearchQueryParser):
             return candidates - matches
         return matches
 
+class LRUCache(object):
+
+    'A simple Least-Recently-Used cache'
+
+    def __init__(self, limit=30):
+        self.item_map = {}
+        self.age_map = deque()
+        self.limit = limit
+
+    def _move_up(self, key):
+        if key != self.age_map[-1]:
+            self.age_map.remove(key)
+            self.age_map.append(key)
+
+    def add(self, key, val):
+        if key in self.item_map:
+            self._move_up(key)
+            return
+
+        if len(self.age_map) >= self.limit:
+            self.item_map.pop(self.age_map.popleft())
+
+        self.item_map[key] = val
+        self.age_map.append(key)
+
+    def get(self, key, default=None):
+        ans = self.item_map.get(key, default)
+        if ans is not default:
+            self._move_up(key)
+        return ans
+
+    def clear(self):
+        self.item_map.clear()
+        self.age_map.clear()
+
+    def __contains__(self, key):
+        return key in self.item_map
+
+    def __len__(self):
+        return len(self.age_map)
+
 class Search(object):
 
     def __init__(self, db, opt_name, all_search_locations=()):
@@ -720,46 +762,73 @@ class Search(object):
         self.bool_search = BooleanSearch()
         self.keypair_search = KeyPairSearch()
         self.saved_searches = SavedSearchQueries(db, opt_name)
+        self.cache = LRUCache()
 
     def get_saved_searches(self):
         return self.saved_searches
 
     def change_locations(self, newlocs):
+        if frozenset(newlocs) != frozenset(self.all_search_locations):
+            self.clear_caches()
         self.all_search_locations = newlocs
 
+    def clear_caches(self):
+        self.cache.clear()
+
     def __call__(self, dbcache, query, search_restriction, virtual_fields=None, book_ids=None):
         '''
         Return the set of ids of all records that match the specified
         query and restriction
         '''
-        q = ''
-        if not query or not query.strip():
-            q = search_restriction
-        else:
-            q = query
-            if search_restriction:
-                q = u'(%s) and (%s)' % (search_restriction, query)
-
-        all_book_ids = dbcache._all_book_ids(type=set) if book_ids is None else set(book_ids)
-        if not q:
-            return all_book_ids
-
-        if not isinstance(q, type(u'')):
-            q = q.decode('utf-8')
-
         # We construct a new parser instance per search as the parse is not
         # thread safe.
         sqp = Parser(
-            dbcache, all_book_ids, dbcache._pref('grouped_search_terms'),
+            dbcache, set(), dbcache._pref('grouped_search_terms'),
             self.date_search, self.num_search, self.bool_search,
             self.keypair_search,
             prefs['limit_search_columns'],
             prefs['limit_search_columns_to'], self.all_search_locations,
             virtual_fields, self.saved_searches.lookup)
-
         try:
-            ret = sqp.parse(q)
+            return self._do_search(sqp, query, search_restriction, dbcache, book_ids=book_ids)
         finally:
             sqp.dbcache = sqp.lookup_saved_search = None
-        return ret
+
+    def _do_search(self, sqp, query, search_restriction, dbcache, book_ids=None):
+        if isinstance(search_restriction, bytes):
+            search_restriction = search_restriction.decode('utf-8')
+
+        restricted_ids = all_book_ids = dbcache._all_book_ids(type=set)
+        if search_restriction and search_restriction.strip():
+            cached = self.cache.get(search_restriction.strip())
+            if cached is None:
+                sqp.all_book_ids = all_book_ids if book_ids is None else book_ids
+                restricted_ids = sqp.parse(search_restriction)
+                if sqp.all_book_ids is all_book_ids:
+                    self.cache.add(search_restriction.strip(), restricted_ids)
+            else:
+                restricted_ids = cached
+                if book_ids is not None:
+                    restricted_ids = book_ids.intersection(restricted_ids)
+        elif book_ids is not None:
+            restricted_ids = book_ids
+
+        if isinstance(query, bytes):
+            query = query.decode('utf-8')
+
+        if not query or not query.strip():
+            return restricted_ids
+
+        if restricted_ids is all_book_ids:
+            cached = self.cache.get(query.strip())
+            if cached is not None:
+                return cached
+
+        sqp.all_book_ids = restricted_ids
+        result = sqp.parse(query)
+
+        if sqp.all_book_ids is all_book_ids:
+            self.cache.add(query.strip(), result)
+
+        return result
 
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index eea8cd2eaa..28c499e150 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -386,7 +386,7 @@ class ReadingTest(BaseTest):
         db.close()
     # }}}
 
-    def test_datetime(self):
+    def test_datetime(self):  # {{{
         ' Test the reading of datetimes stored in the db '
         from calibre.utils.date import parse_date
         from calibre.db.tables import c_parse, UNDEFINED_DATE, _c_speedup
@@ -401,5 +401,62 @@ class ReadingTest(BaseTest):
         self.assertEqual(c_parse(2003).year, 2003)
         for x in (None, '', 'abc'):
             self.assertEqual(UNDEFINED_DATE, c_parse(x))
+    # }}}
 
+    def test_restrictions(self):  # {{{
+        ' Test searching with and without restrictions '
+        cache = self.init_cache()
+        self.assertSetEqual(cache.all_book_ids(), cache.search(''))
+        self.assertSetEqual({1, 2}, cache.search('', 'not authors:=Unknown'))
+        self.assertSetEqual(set(), cache.search('authors:=Unknown', 'not authors:=Unknown'))
+        self.assertSetEqual({2}, cache.search('not authors:"=Author Two"', 'not authors:=Unknown'))
+        self.assertSetEqual({2}, cache.search('not authors:"=Author Two"', book_ids={1, 2}))
+        self.assertSetEqual({2}, cache.search('not authors:"=Author Two"', 'not authors:=Unknown', book_ids={1,2,3}))
+        self.assertSetEqual(set(), cache.search('authors:=Unknown', 'not authors:=Unknown', book_ids={1,2,3}))
+    # }}}
+
+    def test_search_caching(self):  # {{{
+        ' Test caching of searches '
+        from calibre.db.search import LRUCache
+        class TestCache(LRUCache):
+            hit_counter = 0
+            miss_counter = 0
+            def get(self, key, default=None):
+                ans = LRUCache.get(self, key, default=default)
+                if ans is not None:
+                    self.hit_counter += 1
+                else:
+                    self.miss_counter += 1
+            @property
+            def cc(self):
+                self.hit_counter = self.miss_counter = 0
+            @property
+            def counts(self):
+                return self.hit_counter, self.miss_counter
+
+        cache = self.init_cache()
+        cache._search_api.cache = c = TestCache()
+
+        ae, at = self.assertEqual, self.assertTrue
+
+        def test(hit, result, *args):
+            c.cc
+            ae(cache.search(*args), result)
+            ae(c.counts, (1, 0) if hit else (0, 1))
+            c.cc
+
+        test(False, {3}, 'Unknown')
+        test(True, {3}, 'Unknown')
+        test(True, {3}, 'Unknown')
+        cache.set_field('title', {3:'xxx'})
+        test(False, {3}, 'Unknown')  # cache cleared
+        test(True, {3}, 'Unknown')
+        c.limit = 5
+        for i in range(6):
+            test(False, set(), 'nomatch_%s' % i)
+        test(False, {3}, 'Unknown')  # cached search expired
+        test(False, {3}, '', 'unknown')
+        test(True, {3}, '', 'unknown')
+        test(True, {3}, 'Unknown', 'unknown')
+    # }}}
 

From 5f3c10f91df30f2a8d5c2f5d6ca98c572251a4c0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Jul 2013 16:06:32 +0530
Subject: [PATCH 0314/1154] El Tribuno Salta and Jujuy by Darko Miletic

Fixes #1203724 [New recipes for El Tribuno Salta and Jujuy](https://bugs.launchpad.net/calibre/+bug/1203724)
---
 recipes/eltribuno_jujuy_impreso.recipe    | 127 ++++++++++++++++++++++
 recipes/eltribuno_salta_impreso.recipe    | 127 ++++++++++++++++++++++
 recipes/icons/eltribuno_jujuy_impreso.png | Bin 0 -> 592 bytes
 recipes/icons/eltribuno_salta_impreso.png | Bin 0 -> 592 bytes
 4 files changed, 254 insertions(+)
 create mode 100644 recipes/eltribuno_jujuy_impreso.recipe
 create mode 100644 recipes/eltribuno_salta_impreso.recipe
 create mode 100644 recipes/icons/eltribuno_jujuy_impreso.png
 create mode 100644 recipes/icons/eltribuno_salta_impreso.png

diff --git a/recipes/eltribuno_jujuy_impreso.recipe b/recipes/eltribuno_jujuy_impreso.recipe
new file mode 100644
index 0000000000..2b725231c9
--- /dev/null
+++ b/recipes/eltribuno_jujuy_impreso.recipe
@@ -0,0 +1,127 @@
+__license__   = 'GPL v3'
+__copyright__ = '2013, Darko Miletic <darko.miletic at gmail.com>'
+'''
+http://www.eltribuno.info/jujuy/edicion_impresa.aspx
+'''
+
+import urllib
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+from collections import OrderedDict
+
+class ElTribunoJujuyImpreso(BasicNewsRecipe):
+    title                   = 'El Tribuno Jujuy (Edición Impresa)'
+    __author__              = 'Darko Miletic'
+    description             = "Diario principal de Jujuy"
+    publisher               = 'Horizontes S.A.'
+    category                = 'news, politics, Jujuy, Argentina, World'
+    oldest_article          = 2
+    language                = 'es_AR'
+    max_articles_per_feed   = 250
+    no_stylesheets          = True
+    use_embedded_content    = False
+    encoding                = 'cp1252'
+    publication_type        = 'newspaper'
+    delay                   = 1
+    articles_are_obfuscated = True
+    temp_files              = []
+    PREFIX                  = 'http://www.eltribuno.info/jujuy/'
+    INDEX                   = PREFIX + 'edicion_impresa.aspx'
+    PRINTURL                = PREFIX + 'nota_print.aspx?%s'
+
+    conversion_options = {
+                          'comment'          : description
+                        , 'tags'             : category
+                        , 'publisher'        : publisher
+                        , 'language'         : language
+                        , 'linearize_tables' : True
+                        }
+
+    keep_only_tags = [dict(name='div' , attrs={'class':['notaHead', 'notaContent']})]
+    remove_tags = [
+                     dict(name=['meta','iframe','base','object','embed','link','img']),
+                     dict(name='ul', attrs={'class':'Tabs'})
+                  ]
+
+    extra_css = """
+                body{font-family: Arial,Helvetica,sans-serif}
+                .notaHead h4{text-transform: uppercase; color: gray}
+                img{margin-top: 0.8em; display: block}
+                """
+
+    def parse_index(self):
+        feeds = OrderedDict()
+        soup = None
+        count = 0
+        while (count < 5):
+            try:
+                soup = self.index_to_soup(self.INDEX)
+                count = 5
+            except:
+                print "Retrying download..."
+            count += 1
+        if not soup:
+            return []
+        alink = soup.find('a', href=True, attrs={'class':'ZoomTapa'})
+        if alink and 'href' in alink:
+            self.cover_url = alink['href']
+        sections = soup.findAll('div', attrs={'id':lambda x: x and x.startswith('Ediciones')})
+        for section in sections:
+            section_title = 'Sin titulo'
+            sectiont=section.find('h3', attrs={'class':'NombreSeccion'})
+            if sectiont:
+                section_title = self.tag_to_string(sectiont.span)
+
+            arts = section.findAll('div', attrs={'class':'Noticia NoticiaAB1'})
+            for article in arts:
+                articles = []
+                title=self.tag_to_string(article.div.h3.a)
+                url=article.div.h3.a['href']
+                description=self.tag_to_string(article.p)
+                articles.append({'title':title, 'url':url, 'description':description, 'date':''})
+
+                if articles:
+                    if section_title not in feeds:
+                        feeds[section_title] = []
+                    feeds[section_title] += articles
+
+        ans = [(key, val) for key, val in feeds.iteritems()]
+        return ans
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll('a'):
+            if item.string is not None:
+                str = item.string
+                item.replaceWith(str)
+            else:
+                str = self.tag_to_string(item)
+                item.replaceWith(str)
+        return soup
+
+    def get_masthead_title(self):
+        return 'El Tribuno'
+
+    def get_obfuscated_article(self, url):
+        count = 0
+        while (count < 10):
+            try:
+                response = self.browser.open(url)
+                html = response.read()
+                count = 10
+            except:
+                print "Retrying download..."
+            count += 1
+        tfile = PersistentTemporaryFile('_fa.html')
+        tfile.write(html)
+        tfile.close()
+        self.temp_files.append(tfile)
+        return tfile.name
+
+    def print_version(self, url):
+        right = url.rpartition('/')[2]
+        artid = right.partition('-')[0]
+        params = {'Note':artid}
+        return (self.PRINTURL % urllib.urlencode(params))
+
diff --git a/recipes/eltribuno_salta_impreso.recipe b/recipes/eltribuno_salta_impreso.recipe
new file mode 100644
index 0000000000..67cc073a7e
--- /dev/null
+++ b/recipes/eltribuno_salta_impreso.recipe
@@ -0,0 +1,127 @@
+__license__   = 'GPL v3'
+__copyright__ = '2013, Darko Miletic <darko.miletic at gmail.com>'
+'''
+http://www.eltribuno.info/salta/edicion_impresa.aspx
+'''
+
+import urllib
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+from collections import OrderedDict
+
+class ElTribunoSaltaImpreso(BasicNewsRecipe):
+    title                   = 'El Tribuno Salta (Edición Impresa)'
+    __author__              = 'Darko Miletic'
+    description             = "Diario principal de Salta"
+    publisher               = 'Horizontes S.A.'
+    category                = 'news, politics, Salta, Argentina, World'
+    oldest_article          = 2
+    language                = 'es_AR'
+    max_articles_per_feed   = 250
+    no_stylesheets          = True
+    use_embedded_content    = False
+    encoding                = 'cp1252'
+    publication_type        = 'newspaper'
+    delay                   = 1
+    articles_are_obfuscated = True
+    temp_files              = []
+    PREFIX                  = 'http://www.eltribuno.info/salta/'
+    INDEX                   = PREFIX + 'edicion_impresa.aspx'
+    PRINTURL                = PREFIX + 'nota_print.aspx?%s'
+
+    conversion_options = {
+                          'comment'          : description
+                        , 'tags'             : category
+                        , 'publisher'        : publisher
+                        , 'language'         : language
+                        , 'linearize_tables' : True
+                        }
+
+    keep_only_tags = [dict(name='div' , attrs={'class':['notaHead', 'notaContent']})]
+    remove_tags = [
+                     dict(name=['meta','iframe','base','object','embed','link','img']),
+                     dict(name='ul', attrs={'class':'Tabs'})
+                  ]
+
+    extra_css = """
+                body{font-family: Arial,Helvetica,sans-serif}
+                .notaHead h4{text-transform: uppercase; color: gray}
+                img{margin-top: 0.8em; display: block}
+                """
+
+    def parse_index(self):
+        feeds = OrderedDict()
+        soup = None
+        count = 0
+        while (count < 5):
+            try:
+                soup = self.index_to_soup(self.INDEX)
+                count = 5
+            except:
+                print "Retrying download..."
+            count += 1
+        if not soup:
+            return []
+        alink = soup.find('a', href=True, attrs={'class':'ZoomTapa'})
+        if alink and 'href' in alink:
+            self.cover_url = alink['href']
+        sections = soup.findAll('div', attrs={'id':lambda x: x and x.startswith('Ediciones')})
+        for section in sections:
+            section_title = 'Sin titulo'
+            sectiont=section.find('h3', attrs={'class':'NombreSeccion'})
+            if sectiont:
+                section_title = self.tag_to_string(sectiont.span)
+
+            arts = section.findAll('div', attrs={'class':'Noticia NoticiaAB1'})
+            for article in arts:
+                articles = []
+                title=self.tag_to_string(article.div.h3.a)
+                url=article.div.h3.a['href']
+                description=self.tag_to_string(article.p)
+                articles.append({'title':title, 'url':url, 'description':description, 'date':''})
+
+                if articles:
+                    if section_title not in feeds:
+                        feeds[section_title] = []
+                    feeds[section_title] += articles
+
+        ans = [(key, val) for key, val in feeds.iteritems()]
+        return ans
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll('a'):
+            if item.string is not None:
+                str = item.string
+                item.replaceWith(str)
+            else:
+                str = self.tag_to_string(item)
+                item.replaceWith(str)
+        return soup
+
+    def get_masthead_title(self):
+        return 'El Tribuno'
+
+    def get_obfuscated_article(self, url):
+        count = 0
+        while (count < 10):
+            try:
+                response = self.browser.open(url)
+                html = response.read()
+                count = 10
+            except:
+                print "Retrying download..."
+            count += 1
+        tfile = PersistentTemporaryFile('_fa.html')
+        tfile.write(html)
+        tfile.close()
+        self.temp_files.append(tfile)
+        return tfile.name
+
+    def print_version(self, url):
+        right = url.rpartition('/')[2]
+        artid = right.partition('-')[0]
+        params = {'Note':artid}
+        return (self.PRINTURL % urllib.urlencode(params))
+
diff --git a/recipes/icons/eltribuno_jujuy_impreso.png b/recipes/icons/eltribuno_jujuy_impreso.png
new file mode 100644
index 0000000000000000000000000000000000000000..8862b78d0c77b95c435de73b4bf78265bcc95815
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006PNkl<Zc$`g9
zJx|+E6!m*Awi8<-fyki=ZjmBXhKdTYM3FjG@CPz5GBB|)^GDd27#LZQ*eZ1(0|>el
z0jV;e3a3F)l(;f+?f9$by$7X7%GLGFz2}{CFUhh@5kNu+$pk2+sHAC11Y{2qM5?^N
zbzRv_=yNei63n2|>2zMlBu%&5t=H?wQ5u|_eBa!hSzBvdUSfzdrzvGj&QQsXZt!t>
zRUNh4=E{nDbp-{z!^0nYd!UKqcrX}nc4SZ-1Ob$2y6)ZI-)wLH1~(z`)04Tp{OR^K
z2}AJa^LcK__kCoDSrmPposATQ31`r2uC6vOE>M@27-PDw(_AhWh9Nh^*k{i(78f<k
zV)OGDu(!4{VOnB3opKNOK~*9*!r0vUdJ@NPcXu;Y9k$yUW66KuYn98A9Ezs7=jXa@
z2aZ#0G_sfaKfnUt5==`1s2tzjjjyj~n#~VKN8_`zKMxP#<0BrI^oV@GFbsL1{^@Cy
zrtfxktX7MfCf59AY3W<51xox|C={Y7;#t4n#{iuCJUDo>vGIO?Kk|Kk7O^pc$s|E5
zmMP`XYPDLaRG=^RypPAnp*Rq~dZ9oKgXlW)VzKBr4!02tc%D}-mw)wonevJ>2o!OU
z%EAJ=YqgrHszmM+FJgK$8rimu7>d*4M3!X@heLdpN+on-D@59rDsdVlnx;L!kfxK#
eL>G|V(Ek_WCy$~!G;g^80000<MNUMnLSTaF5)Xs`

literal 0
HcmV?d00001

diff --git a/recipes/icons/eltribuno_salta_impreso.png b/recipes/icons/eltribuno_salta_impreso.png
new file mode 100644
index 0000000000000000000000000000000000000000..8862b78d0c77b95c435de73b4bf78265bcc95815
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006PNkl<Zc$`g9
zJx|+E6!m*Awi8<-fyki=ZjmBXhKdTYM3FjG@CPz5GBB|)^GDd27#LZQ*eZ1(0|>el
z0jV;e3a3F)l(;f+?f9$by$7X7%GLGFz2}{CFUhh@5kNu+$pk2+sHAC11Y{2qM5?^N
zbzRv_=yNei63n2|>2zMlBu%&5t=H?wQ5u|_eBa!hSzBvdUSfzdrzvGj&QQsXZt!t>
zRUNh4=E{nDbp-{z!^0nYd!UKqcrX}nc4SZ-1Ob$2y6)ZI-)wLH1~(z`)04Tp{OR^K
z2}AJa^LcK__kCoDSrmPposATQ31`r2uC6vOE>M@27-PDw(_AhWh9Nh^*k{i(78f<k
zV)OGDu(!4{VOnB3opKNOK~*9*!r0vUdJ@NPcXu;Y9k$yUW66KuYn98A9Ezs7=jXa@
z2aZ#0G_sfaKfnUt5==`1s2tzjjjyj~n#~VKN8_`zKMxP#<0BrI^oV@GFbsL1{^@Cy
zrtfxktX7MfCf59AY3W<51xox|C={Y7;#t4n#{iuCJUDo>vGIO?Kk|Kk7O^pc$s|E5
zmMP`XYPDLaRG=^RypPAnp*Rq~dZ9oKgXlW)VzKBr4!02tc%D}-mw)wonevJ>2o!OU
z%EAJ=YqgrHszmM+FJgK$8rimu7>d*4M3!X@heLdpN+on-D@59rDsdVlnx;L!kfxK#
eL>G|V(Ek_WCy$~!G;g^80000<MNUMnLSTaF5)Xs`

literal 0
HcmV?d00001


From c1db04b373647ccd24534bc9b2022ccc71602f4d Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Wed, 24 Jul 2013 13:03:39 +1000
Subject: [PATCH 0315/1154] Update supported firmware version for Kobo to 2.8.1

No changes necessary except to bump the firmware version.
---
 src/calibre/devices/kobo/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index cb325efb07..278798160e 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -35,7 +35,7 @@ class KOBO(USBMS):
     gui_name = 'Kobo Reader'
     description = _('Communicate with the Kobo Reader')
     author = 'Timothy Legge and David Forrester'
-    version = (2, 0, 12)
+    version = (2, 0, 13)
 
     dbversion = 0
     fwversion = 0
@@ -1218,7 +1218,7 @@ class KOBOTOUCH(KOBO):
     min_dbversion_images_on_sdcard  = 77
     min_dbversion_activiy           = 77
 
-    max_supported_fwversion         = (2,6,1)
+    max_supported_fwversion         = (2,8,1)
     min_fwversion_images_on_sdcard  = (2,4,1)
 
     has_kepubs = True

From f37de3d33c93259fdefea1c720b4af68fbf9202d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 09:29:57 +0530
Subject: [PATCH 0316/1154] Small fixes to get_metadata()

---
 src/calibre/db/cache.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 52227a5b84..f927c1714a 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -203,7 +203,7 @@ class Cache(object):
         mi.author_link_map = aul
         mi.comments    = self._field_for('comments', book_id)
         mi.publisher   = self._field_for('publisher', book_id)
-        n = nowf()
+        n = utcnow()
         mi.timestamp   = self._field_for('timestamp', book_id, default_value=n)
         mi.pubdate     = self._field_for('pubdate', book_id, default_value=n)
         mi.uuid        = self._field_for('uuid', book_id,
@@ -223,6 +223,7 @@ class Cache(object):
             mi.format_metadata = FormatMetadata(self, book_id, formats)
             good_formats = FormatsList(formats, mi.format_metadata)
         mi.formats = good_formats
+        mi.db_approx_formats = formats
         mi.has_cover = _('Yes') if self._field_for('cover', book_id,
                 default_value=False) else ''
         mi.tags = list(self._field_for('tags', book_id, default_value=()))

From 70f1dbb832810bd63f129b4b0deeab2710268969 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 10:57:04 +0530
Subject: [PATCH 0317/1154] Speed up evaluation of composite columns

Use a ProxyMetadata object that lazily evaluates its fields on demand,
thereby avoiding the overhead of get_metadata() on every composite field
evaluation.
---
 src/calibre/db/cache.py         |  17 ++-
 src/calibre/db/lazy.py          | 236 +++++++++++++++++++++++++++++++-
 src/calibre/db/tests/reading.py |  26 ++++
 3 files changed, 271 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index f927c1714a..f909563fa5 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -23,7 +23,7 @@ from calibre.db.fields import create_field
 from calibre.db.search import Search
 from calibre.db.tables import VirtualTable
 from calibre.db.write import get_series_values
-from calibre.db.lazy import FormatMetadata, FormatsList
+from calibre.db.lazy import FormatMetadata, FormatsList, ProxyMetadata
 from calibre.ebooks import check_ebook_format
 from calibre.ebooks.metadata import string_to_authors, author_to_author_sort, get_title_sort_pat
 from calibre.ebooks.metadata.book.base import Metadata
@@ -338,7 +338,7 @@ class Cache(object):
     def fast_field_for(self, field_obj, book_id, default_value=None):
         ' Same as field_for, except that it avoids the extra lookup to get the field object '
         if field_obj.is_composite:
-            return field_obj.get_value_with_cache(book_id, partial(self._get_metadata, get_user_categories=False))
+            return field_obj.get_value_with_cache(book_id, self._get_proxy_metadata)
         try:
             return field_obj.for_book(book_id, default_value=default_value)
         except (KeyError, IndexError):
@@ -358,8 +358,7 @@ class Cache(object):
             return default_value
 
         if mi is None:
-            return f.get_value_with_cache(book_id, partial(self._get_metadata,
-                get_user_categories=False))
+            return f.get_value_with_cache(book_id, self._get_proxy_metadata)
         else:
             return f.render_composite(book_id, mi)
 
@@ -534,6 +533,10 @@ class Cache(object):
 
         return mi
 
+    @read_api
+    def get_proxy_metadata(self, book_id):
+        return ProxyMetadata(self, book_id)
+
     @api
     def cover(self, book_id,
             as_file=False, as_image=False, as_path=False):
@@ -781,7 +784,7 @@ class Cache(object):
         '''
         all_book_ids = frozenset(self._all_book_ids() if ids_to_sort is None
                 else ids_to_sort)
-        get_metadata = partial(self._get_metadata, get_user_categories=False)
+        get_metadata = self._get_proxy_metadata
         lang_map = self.fields['languages'].book_value_map
 
         fm = {'title':'sort', 'authors':'author_sort'}
@@ -1189,7 +1192,7 @@ class Cache(object):
         sf = self.fields[field]
         if series:
             q = icu_lower(series)
-            for val, book_ids in sf.iter_searchable_values(self._get_metadata, frozenset(self._all_book_ids())):
+            for val, book_ids in sf.iter_searchable_values(self._get_proxy_metadata, frozenset(self._all_book_ids())):
                 if q == icu_lower(val):
                     books = book_ids
                     break
@@ -1499,7 +1502,7 @@ class Cache(object):
         f = self.fields[category]
         if hasattr(f, 'get_books_for_val'):
             # Composite field
-            return f.get_books_for_val(item_id_or_composite_value, self._get_metadata, self._all_book_ids())
+            return f.get_books_for_val(item_id_or_composite_value, self._get_proxy_metadata, self._all_book_ids())
         return self._books_for_field(f.name, int(item_id_or_composite_value))
 
     @read_api
diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index be9334c056..4b1740154b 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -10,14 +10,19 @@ __docformat__ = 'restructuredtext en'
 import weakref
 from functools import wraps
 from collections import MutableMapping, MutableSequence
+from copy import deepcopy
 
+from calibre.ebooks.metadata.book.base import Metadata, SIMPLE_GET, TOP_LEVEL_IDENTIFIERS, NULL_VALUES
+from calibre.ebooks.metadata.book.formatter import SafeFormat
+from calibre.utils.date import utcnow
+
+# Lazy format metadata retrieval {{{
 '''
 Avoid doing stats on all files in a book when getting metadata for that book.
 Speeds up calibre startup with large libraries/libraries on a network share,
 with a composite custom column.
 '''
 
-# Lazy format metadata retrieval {{{
 def resolved(f):
     @wraps(f)
     def wrapper(self, *args, **kwargs):
@@ -97,3 +102,232 @@ class FormatsList(MutableBase, MutableSequence):
 
 # }}}
 
+# Lazy metadata getters {{{
+ga = object.__getattribute__
+sa = object.__setattr__
+
+def simple_getter(field, default_value=None):
+    def func(dbref, book_id, cache):
+        try:
+            return cache[field]
+        except KeyError:
+            db = dbref()
+            cache[field] = ret = db.field_for(field, book_id, default_value=default_value)
+            return ret
+    return func
+
+def pp_getter(field, postprocess, default_value=None):
+    def func(dbref, book_id, cache):
+        try:
+            return cache[field]
+        except KeyError:
+            db = dbref()
+            cache[field] = ret = postprocess(db.field_for(field, book_id, default_value=default_value))
+            return ret
+    return func
+
+def adata_getter(field):
+    def func(dbref, book_id, cache):
+        try:
+            author_ids, adata = cache['adata']
+        except KeyError:
+            db = dbref()
+            with db.read_lock:
+                author_ids = db._field_ids_for('authors', book_id)
+                adata = db._author_data(author_ids)
+            cache['adata'] = (author_ids, adata)
+        k = 'sort' if field == 'author_sort_map' else 'link'
+        return {adata[i]['name']:adata[i][k] for i in author_ids}
+    return func
+
+def dt_getter(field):
+    def func(dbref, book_id, cache):
+        try:
+            return cache[field]
+        except KeyError:
+            db = dbref()
+            cache[field] = ret = db.field_for(field, book_id, default_value=utcnow())
+            return ret
+    return func
+
+def item_getter(field, default_value=None, key=0):
+    def func(dbref, book_id, cache):
+        try:
+            return cache[field]
+        except KeyError:
+            db = dbref()
+            ret = cache[field] = db.field_for(field, book_id, default_value=default_value)
+            try:
+                return ret[key]
+            except (IndexError, KeyError):
+                return default_value
+    return func
+
+def fmt_getter(field):
+    def func(dbref, book_id, cache):
+        try:
+            format_metadata = cache['format_metadata']
+        except KeyError:
+            db = dbref()
+            format_metadata = {}
+            for fmt in db.formats(book_id, verify_formats=False):
+                m = db.format_metadata(book_id, fmt)
+                if m:
+                    format_metadata[fmt] = m
+        if field == 'formats':
+            return list(format_metadata) or None
+        return format_metadata
+    return func
+
+def approx_fmts_getter(dbref, book_id, cache):
+    try:
+        return cache['formats']
+    except KeyError:
+        db = dbref()
+        cache['formats'] = ret = list(db.field_for('formats', book_id))
+        return ret
+
+def series_index_getter(field='series'):
+    def func(dbref, book_id, cache):
+        try:
+            series = getters[field](dbref, book_id, cache)
+        except KeyError:
+            series = custom_getter(field, dbref, book_id, cache)
+        if series:
+            try:
+                return cache[field + '_index']
+            except KeyError:
+                db = dbref()
+                cache[field + '_index'] = ret = db.field_for(field + '_index', book_id, default_value=1.0)
+                return ret
+    return func
+
+def has_cover_getter(dbref, book_id, cache):
+    try:
+        return cache['has_cover']
+    except KeyError:
+        db = dbref()
+        cache['has_cover'] = ret = _('Yes') if db.field_for('cover', book_id, default_value=False) else ''
+        return ret
+
+fmt_custom = lambda x:list(x) if isinstance(x, tuple) else x
+def custom_getter(field, dbref, book_id, cache):
+    try:
+        return cache[field]
+    except KeyError:
+        db = dbref()
+        cache[field] = ret = fmt_custom(db.field_for(field, book_id))
+        return ret
+
+def composite_getter(mi, field, metadata, book_id, cache, formatter, template_cache):
+    try:
+        return cache[field]
+    except KeyError:
+        ret = cache[field] = formatter.safe_format(
+            metadata['display']['composite_template'],
+            mi,
+            _('TEMPLATE ERROR'),
+            mi, column_name=field,
+            template_cache=template_cache).strip()
+        return ret
+
+getters = {
+    'title':simple_getter('title', _('Unknown')),
+    'title_sort':simple_getter('sort', _('Unknown')),
+    'authors':pp_getter('authors', list, (_('Unknown'),)),
+    'author_sort':simple_getter('author_sort', _('Unknown')),
+    'uuid':simple_getter('uuid', 'dummy'),
+    'book_size':simple_getter('size', 0),
+    'ondevice_col':simple_getter('ondevice', ''),
+    'languages':pp_getter('languages', list),
+    'language':item_getter('languages', default_value=NULL_VALUES['language']),
+    'db_approx_formats': approx_fmts_getter,
+    'has_cover': has_cover_getter,
+    'tags':pp_getter('tags', list, (_('Unknown'),)),
+    'series_index':series_index_getter(),
+    'application_id':lambda x, book_id, y: book_id,
+    'id':lambda x, book_id, y: book_id,
+}
+
+for field in ('comments', 'publisher', 'identifiers', 'series', 'rating'):
+    getters[field] = simple_getter(field)
+
+for field in ('author_sort_map', 'author_link_map'):
+    getters[field] = adata_getter(field)
+
+for field in ('timestamp', 'pubdate', 'last_modified'):
+    getters[field] = dt_getter(field)
+
+for field in TOP_LEVEL_IDENTIFIERS:
+    getters[field] = item_getter('identifiers', key=field)
+
+for field in ('formats', 'format_metadata'):
+    getters[field] = fmt_getter(field)
+# }}}
+
+class ProxyMetadata(Metadata):
+
+    def __init__(self, db, book_id):
+        sa(self, 'template_cache', db.formatter_template_cache)
+        sa(self, 'formatter', SafeFormat())
+        sa(self, '_db', weakref.ref(db))
+        sa(self, '_book_id', book_id)
+        sa(self, '_cache', {'user_categories':{}, 'cover_data':(None,None), 'device_collections':[]})
+        sa(self, '_user_metadata', db.field_metadata)
+
+    def __getattribute__(self, field):
+        getter = getters.get(field, None)
+        if getter is not None:
+            return getter(ga(self, '_db'), ga(self, '_book_id'), ga(self, '_cache'))
+        if field in SIMPLE_GET:
+            return ga(self, '_cache').get(field, None)
+        try:
+            return ga(self, field)
+        except AttributeError:
+            pass
+        um = ga(self, '_user_metadata')
+        d = um.get(field, None)
+        if d is not None:
+            dt = d['datatype']
+            if dt != 'composite':
+                if field.endswith('_index') and dt == 'float':
+                    return series_index_getter(field[:-6])(ga(self, '_db'), ga(self, '_book_id'), ga(self, '_cache'))
+                return custom_getter(field, ga(self, '_db'), ga(self, '_book_id'), ga(self, '_cache'))
+            return composite_getter(self, field, d, ga(self, '_book_id'), ga(self, '_cache'), ga(self, 'formatter'), ga(self, 'template_cache'))
+
+        try:
+            return ga(self, '_cache')[field]
+        except KeyError:
+            raise AttributeError('Metadata object has no attribute named: %r' % field)
+
+    def __setattr__(self, field, val, extra=None):
+        cache = ga(self, '_cache')
+        cache[field] = val
+        if extra is not None:
+            cache[field + '_index'] = val
+
+    def get_user_metadata(self, field, make_copy=False):
+        um = ga(self, '_user_metadata')
+        try:
+            ans = um[field]
+        except KeyError:
+            pass
+        else:
+            if make_copy:
+                ans = deepcopy(ans)
+            return ans
+
+    def get_extra(self, field, default=None):
+        um = ga(self, '_user_metadata')
+        if field + '_index' in um:
+            try:
+                return getattr(self, field + '_index')
+            except AttributeError:
+                return default
+        raise AttributeError(
+                'Metadata object has no attribute named: '+ repr(field))
+
+    def custom_field_keys(self):
+        um = ga(self, '_user_metadata')
+        return iter(um.custom_field_keys())
+
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 28c499e150..521139b7b0 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -460,3 +460,29 @@ class ReadingTest(BaseTest):
         test(True, {3}, 'Unknown', 'unknown')
     # }}}
 
+    def test_proxy_metadata(self):  # {{{
+        ' Test the ProxyMetadata object used for composite columns '
+        from calibre.ebooks.metadata.book.base import STANDARD_METADATA_FIELDS
+        cache = self.init_cache()
+        for book_id in cache.all_book_ids():
+            mi = cache.get_metadata(book_id, get_user_categories=False)
+            pmi = cache.get_proxy_metadata(book_id)
+            self.assertSetEqual(set(mi.custom_field_keys()), set(pmi.custom_field_keys()))
+
+            for field in STANDARD_METADATA_FIELDS | {'#series_index'}:
+                f = lambda x: x
+                if field == 'formats':
+                    f = lambda x: x if x is None else set(x)
+                self.assertEqual(f(getattr(mi, field)), f(getattr(pmi, field)),
+                                'Standard field: %s not the same for book %s' % (field, book_id))
+                self.assertEqual(mi.format_field(field), pmi.format_field(field),
+                                'Standard field format: %s not the same for book %s' % (field, book_id))
+            for field, meta in cache.field_metadata.custom_iteritems():
+                if meta['datatype'] != 'composite':
+                    self.assertEqual(f(getattr(mi, field)), f(getattr(pmi, field)),
+                                    'Custom field: %s not the same for book %s' % (field, book_id))
+                    self.assertEqual(mi.format_field(field), pmi.format_field(field),
+                                    'Custom field format: %s not the same for book %s' % (field, book_id))
+
+    # }}}
+

From cbf2bb0c4e58ad787d1a638fc48cc43bb515ac0f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 11:35:48 +0530
Subject: [PATCH 0318/1154] Tentative {virtual_libraries} template support

This should allow the use of {virtual_libraries} in custom column
templates, with good performance, thanks to search caching.
---
 src/calibre/db/cache.py | 12 ++++++++++++
 src/calibre/db/lazy.py  | 10 ++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index f909563fa5..c8f28a1967 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1620,6 +1620,18 @@ class Cache(object):
         if cover and os.path.exists(cover):
             self._set_field('cover', {book_id:1})
         self.backend.restore_book(book_id, path, formats)
+
+    @read_api
+    def virtual_libraries_for_books(self, book_ids):
+        libraries = tuple(self._pref('virtual_libraries', {}).iterkeys())
+        ans = {book_id:[] for book_id in book_ids}
+        for lib in libraries:
+            books = self._search(lib)  # We deliberately dont use book_ids as we want to use the search cache
+            for book in book_ids:
+                if book in books:
+                    ans[book].append(lib)
+        return {k:tuple(sorted(v, key=sort_key)) for k, v in book_ids}
+
     # }}}
 
 class SortKey(object):  # {{{
diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 4b1740154b..74cf5af94b 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -231,6 +231,15 @@ def composite_getter(mi, field, metadata, book_id, cache, formatter, template_ca
             template_cache=template_cache).strip()
         return ret
 
+def virtual_libraries_getter(dbref, book_id, cache):
+    try:
+        return cache[field]
+    except KeyError:
+        db = dbref()
+        vls = db.virtual_libraries_for_books((book_id,))[book_id]
+        ret = cache[field] = ', '.join(vls)
+        return ret
+
 getters = {
     'title':simple_getter('title', _('Unknown')),
     'title_sort':simple_getter('sort', _('Unknown')),
@@ -247,6 +256,7 @@ getters = {
     'series_index':series_index_getter(),
     'application_id':lambda x, book_id, y: book_id,
     'id':lambda x, book_id, y: book_id,
+    'virtual_libraries':virtual_libraries_getter,
 }
 
 for field in ('comments', 'publisher', 'identifiers', 'series', 'rating'):

From f3af580d5e90280fc8e89ef7db72433a714ce717 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 12:16:08 +0530
Subject: [PATCH 0319/1154] Update taz.de (RSS)

---
 recipes/taz_rss.recipe | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/recipes/taz_rss.recipe b/recipes/taz_rss.recipe
index d4fc0237da..9f308d9739 100644
--- a/recipes/taz_rss.recipe
+++ b/recipes/taz_rss.recipe
@@ -1,4 +1,3 @@
-
 __license__ = 'GPL v3'
 __copyright__ = '2013, Alexander Schremmer <alex@alexanderweb.de>, Robert Riemann <robert@riemann.cc>'
 
@@ -43,15 +42,14 @@ class TazRSSRecipe(BasicNewsRecipe):
     # use the cover presented on the homepage
     cover_url = 'http://www.taz.de/digitaz/.s1jpeg320'
 
-    keep_only_tags = [dict(name='div', attrs={'class': 'sect sect_article'})]
+    no_stylesheets = True  # default value is False, but True makes process much faster
+    keep_only_tags = [
+                      dict(name=['div'], attrs={'class': re.compile(r".*\bsect_article\b.*")})
+                    ]
     remove_tags = [
-                  dict(name=['div'], attrs={'class': 'artikelwerbung'}),
-                  dict(name=['ul'], attrs={'class': 'toolbar'}),
+                  dict(name=['div'], attrs={'class': 'sectfoot'}),
                   # remove: taz paywall
-                  dict(name=['div'], attrs={'id': 'tzi_paywall'}),
-                  # remove: Artikel zum Thema (not working on Kindle)
-                  dict(name=['div'], attrs={'class': re.compile(r".*\bsect_seealso\b.*")}),
-                  dict(name=['div'], attrs={'class': 'sectfoot'})
+                  dict(name=['div'], attrs={'id': 'tzi_paywall'})
                   ]
 
 # with article pictures on Kindle super-slow

From 7460446395faa44213923320b76ea43fe53fe345 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 12:31:00 +0530
Subject: [PATCH 0320/1154] Handle recursive templates in composite columns

---
 src/calibre/db/lazy.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 74cf5af94b..1e65a7cc1d 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -223,6 +223,7 @@ def composite_getter(mi, field, metadata, book_id, cache, formatter, template_ca
     try:
         return cache[field]
     except KeyError:
+        cache[field] = 'RECURSIVE_COMPOSITE FIELD (Metadata) ' + field
         ret = cache[field] = formatter.safe_format(
             metadata['display']['composite_template'],
             mi,

From 821179170a390efdbbb1a199d95b1fe165c98b6b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 12:50:26 +0530
Subject: [PATCH 0321/1154] Add get_standard_metadata() to ProxyMetadata

---
 src/calibre/db/lazy.py          |  8 ++++++++
 src/calibre/db/tests/reading.py | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 1e65a7cc1d..0b73b51ac0 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -342,3 +342,11 @@ class ProxyMetadata(Metadata):
         um = ga(self, '_user_metadata')
         return iter(um.custom_field_keys())
 
+    def get_standard_metadata(self, field, make_copy=False):
+        field_metadata = ga(self, '_user_metadata')
+        if field in field_metadata and field_metadata[field]['kind'] == 'field':
+            if make_copy:
+                return deepcopy(field_metadata[field])
+            return field_metadata[field]
+        return None
+
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 521139b7b0..cfb9597550 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -477,6 +477,16 @@ class ReadingTest(BaseTest):
                                 'Standard field: %s not the same for book %s' % (field, book_id))
                 self.assertEqual(mi.format_field(field), pmi.format_field(field),
                                 'Standard field format: %s not the same for book %s' % (field, book_id))
+                def f(x):
+                    try:
+                        return x['label']
+                    except:
+                        return x
+                if field not in {'#series_index'}:
+                    v = pmi.get_standard_metadata(field)
+                    self.assertTrue(v is None or isinstance(v, dict))
+                    self.assertEqual(f(mi.get_standard_metadata(field, False)), f(v),
+                                     'get_standard_metadata() failed for field %s' % field)
             for field, meta in cache.field_metadata.custom_iteritems():
                 if meta['datatype'] != 'composite':
                     self.assertEqual(f(getattr(mi, field)), f(getattr(pmi, field)),

From dec8572513de07cc389bf5cf3ec9559a8ed92e7b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 12:55:15 +0530
Subject: [PATCH 0322/1154] ...

---
 src/calibre/db/tests/reading.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index cfb9597550..c242206539 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -479,9 +479,10 @@ class ReadingTest(BaseTest):
                                 'Standard field format: %s not the same for book %s' % (field, book_id))
                 def f(x):
                     try:
-                        return x['label']
+                        x.pop('rec_index', None)
                     except:
-                        return x
+                        pass
+                    return x
                 if field not in {'#series_index'}:
                     v = pmi.get_standard_metadata(field)
                     self.assertTrue(v is None or isinstance(v, dict))

From c7f6bc01001f5a37fac763ae1386bdf2a8cefa5a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 13:11:14 +0530
Subject: [PATCH 0323/1154] oops

---
 src/calibre/db/cache.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index c8f28a1967..39bc905c50 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1630,7 +1630,7 @@ class Cache(object):
             for book in book_ids:
                 if book in books:
                     ans[book].append(lib)
-        return {k:tuple(sorted(v, key=sort_key)) for k, v in book_ids}
+        return {k:tuple(sorted(v, key=sort_key)) for k, v in ans.iteritems()}
 
     # }}}
 

From d0b1001ee792f72a85a70aea15c425de551e1bfb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 14:02:06 +0530
Subject: [PATCH 0324/1154] Use a cache for search query parsing

---
 src/calibre/db/search.py                 | 12 +++++++++---
 src/calibre/utils/search_query_parser.py | 22 ++++++++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 07b3bde068..332842e6ae 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -455,7 +455,7 @@ class Parser(SearchQueryParser):
 
     def __init__(self, dbcache, all_book_ids, gst, date_search, num_search,
                  bool_search, keypair_search, limit_search_columns, limit_search_columns_to,
-                 locations, virtual_fields, lookup_saved_search):
+                 locations, virtual_fields, lookup_saved_search, parse_cache):
         self.dbcache, self.all_book_ids = dbcache, all_book_ids
         self.all_search_locations = frozenset(locations)
         self.grouped_search_terms = gst
@@ -466,7 +466,7 @@ class Parser(SearchQueryParser):
         self.virtual_fields = virtual_fields or {}
         if 'marked' not in self.virtual_fields:
             self.virtual_fields['marked'] = self
-        super(Parser, self).__init__(locations, optimize=True, lookup_saved_search=lookup_saved_search)
+        SearchQueryParser.__init__(self, locations, optimize=True, lookup_saved_search=lookup_saved_search, parse_cache=parse_cache)
 
     @property
     def field_metadata(self):
@@ -736,6 +736,7 @@ class LRUCache(object):
 
         self.item_map[key] = val
         self.age_map.append(key)
+    __setitem__  = add
 
     def get(self, key, default=None):
         ans = self.item_map.get(key, default)
@@ -753,6 +754,9 @@ class LRUCache(object):
     def __len__(self):
         return len(self.age_map)
 
+    def __getitem__(self, key):
+        return self.get(key)
+
 class Search(object):
 
     def __init__(self, db, opt_name, all_search_locations=()):
@@ -763,6 +767,7 @@ class Search(object):
         self.keypair_search = KeyPairSearch()
         self.saved_searches = SavedSearchQueries(db, opt_name)
         self.cache = LRUCache()
+        self.parse_cache = LRUCache(limit=100)
 
     def get_saved_searches(self):
         return self.saved_searches
@@ -770,6 +775,7 @@ class Search(object):
     def change_locations(self, newlocs):
         if frozenset(newlocs) != frozenset(self.all_search_locations):
             self.clear_caches()
+            self.parse_cache.clear()
         self.all_search_locations = newlocs
 
     def clear_caches(self):
@@ -788,7 +794,7 @@ class Search(object):
             self.keypair_search,
             prefs['limit_search_columns'],
             prefs['limit_search_columns_to'], self.all_search_locations,
-            virtual_fields, self.saved_searches.lookup)
+            virtual_fields, self.saved_searches.lookup, self.parse_cache)
         try:
             return self._do_search(sqp, query, search_restriction, dbcache, book_ids=book_ids)
         finally:
diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index 4406785bb1..12ac9b3931 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -300,25 +300,28 @@ class SearchQueryParser(object):
                 failed.append(test[0])
         return failed
 
-    def __init__(self, locations, test=False, optimize=False, lookup_saved_search=None):
+    def __init__(self, locations, test=False, optimize=False, lookup_saved_search=None, parse_cache=None):
         self.sqp_initialize(locations, test=test, optimize=optimize)
         self.parser = Parser()
         self.lookup_saved_search = global_lookup_saved_search if lookup_saved_search is None else lookup_saved_search
+        self.sqp_parse_cache = parse_cache
 
     def sqp_change_locations(self, locations):
         self.sqp_initialize(locations, optimize=self.optimize)
+        if self.sqp_parse_cache is not None:
+            self.sqp_parse_cache.clear()
 
     def sqp_initialize(self, locations, test=False, optimize=False):
         self.locations = locations
         self._tests_failed = False
         self.optimize = optimize
 
-    def parse(self, query):
+    def parse(self, query, candidates=None):
         # empty the list of searches used for recursion testing
         self.recurse_level = 0
         self.searches_seen = set([])
         candidates = self.universal_set()
-        return self._parse(query, candidates)
+        return self._parse(query, candidates=candidates)
 
     # this parse is used internally because it doesn't clear the
     # recursive search test list. However, we permit seeing the
@@ -327,9 +330,16 @@ class SearchQueryParser(object):
     def _parse(self, query, candidates=None):
         self.recurse_level += 1
         try:
-            res = self.parser.parse(query, self.locations)
-        except RuntimeError:
-            raise ParseException(_('Failed to parse query, recursion limit reached: %s')%repr(query))
+            res = self.sqp_parse_cache.get(query, None)
+        except AttributeError:
+            res = None
+        if res is None:
+            try:
+                res = self.parser.parse(query, self.locations)
+            except RuntimeError:
+                raise ParseException(_('Failed to parse query, recursion limit reached: %s')%repr(query))
+            if self.sqp_parse_cache is not None:
+                self.sqp_parse_cache[query] = res
         if candidates is None:
             candidates = self.universal_set()
         t = self.evaluate(res, candidates)

From 415dc21588edc32f3ab5e7b781b2df12644dc8e5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 14:09:46 +0530
Subject: [PATCH 0325/1154] Fix handling of recursive templates in
 ProxyMetadata

---
 src/calibre/db/lazy.py          | 7 ++++++-
 src/calibre/db/tests/reading.py | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 0b73b51ac0..566e51b32a 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -12,7 +12,7 @@ from functools import wraps
 from collections import MutableMapping, MutableSequence
 from copy import deepcopy
 
-from calibre.ebooks.metadata.book.base import Metadata, SIMPLE_GET, TOP_LEVEL_IDENTIFIERS, NULL_VALUES
+from calibre.ebooks.metadata.book.base import Metadata, SIMPLE_GET, TOP_LEVEL_IDENTIFIERS, NULL_VALUES, ALL_METADATA_FIELDS
 from calibre.ebooks.metadata.book.formatter import SafeFormat
 from calibre.utils.date import utcnow
 
@@ -350,3 +350,8 @@ class ProxyMetadata(Metadata):
             return field_metadata[field]
         return None
 
+    def all_field_keys(self):
+        um = ga(self, '_user_metadata')
+        return frozenset(ALL_METADATA_FIELDS.union(um.iterkeys()))
+
+
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index c242206539..dbeda9f6b0 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -495,5 +495,13 @@ class ReadingTest(BaseTest):
                     self.assertEqual(mi.format_field(field), pmi.format_field(field),
                                     'Custom field format: %s not the same for book %s' % (field, book_id))
 
+        # Test handling of recursive templates
+        cache.create_custom_column('comp2', 'comp2', 'composite', False, display={'composite_template':'{title}'})
+        cache.create_custom_column('comp1', 'comp1', 'composite', False, display={'composite_template':'foo{#comp2}'})
+        cache.close()
+        cache = self.init_cache()
+        mi, pmi = cache.get_metadata(1), cache.get_proxy_metadata(1)
+        self.assertEqual(mi.get('#comp1'), pmi.get('#comp1'))
+
     # }}}
 

From 1cb2bd10de09b7bc90fffa91466ab6158e4de019 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 18:45:47 +0530
Subject: [PATCH 0326/1154] Update instead of invalidating search caches

Updating is cheap when only a few books are affected.
---
 src/calibre/db/cache.py         |  9 ++---
 src/calibre/db/search.py        | 64 ++++++++++++++++++++++++++++-----
 src/calibre/db/tests/reading.py |  6 ++++
 3 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 39bc905c50..23e4498e72 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -150,8 +150,8 @@ class Cache(object):
             field.clear_caches(book_ids=book_ids)
 
     @write_api
-    def clear_search_caches(self):
-        self._search_api.clear_caches()
+    def clear_search_caches(self, book_ids=None):
+        self._search_api.update_or_clear(self, book_ids)
 
     @write_api
     def clear_caches(self, book_ids=None, template_cache=True):
@@ -165,7 +165,7 @@ class Cache(object):
                 self.format_metadata_cache.pop(book_id, None)
         else:
             self.format_metadata_cache.clear()
-        self._clear_search_caches()
+        self._clear_search_caches(book_ids)
 
     @write_api
     def reload_from_db(self, clear_caches=True):
@@ -828,7 +828,7 @@ class Cache(object):
             f.writer.set_books({book_id:now for book_id in book_ids}, self.backend)
             if self.composites:
                 self._clear_composite_caches(book_ids)
-            self._clear_search_caches()
+            self._clear_search_caches(book_ids)
 
     @write_api
     def mark_as_dirty(self, book_ids):
@@ -1407,6 +1407,7 @@ class Cache(object):
     @write_api
     def refresh_ondevice(self):
         self.fields['ondevice'].clear_caches()
+        self.clear_search_caches()
 
     @read_api
     def tags_older_than(self, tag, delta=None, must_have_tag=None, must_have_authors=None):
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 332842e6ae..3b441e6b2f 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -451,7 +451,7 @@ class SavedSearchQueries(object):  # {{{
         return sorted(self.queries.iterkeys(), key=sort_key)
 # }}}
 
-class Parser(SearchQueryParser):
+class Parser(SearchQueryParser):  # {{{
 
     def __init__(self, dbcache, all_book_ids, gst, date_search, num_search,
                  bool_search, keypair_search, limit_search_columns, limit_search_columns_to,
@@ -711,8 +711,9 @@ class Parser(SearchQueryParser):
         if query == 'false':
             return candidates - matches
         return matches
+# }}}
 
-class LRUCache(object):
+class LRUCache(object):  # {{{
 
     'A simple Least-Recently-Used cache'
 
@@ -748,6 +749,13 @@ class LRUCache(object):
         self.item_map.clear()
         self.age_map.clear()
 
+    def pop(self, key, default=None):
+        self.item_map.pop(key, default)
+        try:
+            self.age_map.remove(key)
+        except ValueError:
+            pass
+
     def __contains__(self, key):
         return key in self.item_map
 
@@ -757,8 +765,14 @@ class LRUCache(object):
     def __getitem__(self, key):
         return self.get(key)
 
+    def __iter__(self):
+        return self.item_map.iteritems()
+# }}}
+
 class Search(object):
 
+    MAX_CACHE_UPDATE = 50
+
     def __init__(self, db, opt_name, all_search_locations=()):
         self.all_search_locations = all_search_locations
         self.date_search = DateSearch()
@@ -778,9 +792,47 @@ class Search(object):
             self.parse_cache.clear()
         self.all_search_locations = newlocs
 
+    def update_or_clear(self, dbcache, book_ids=None):
+        if book_ids and (len(book_ids) * len(self.cache)) <= self.MAX_CACHE_UPDATE:
+            self.update_caches(dbcache, book_ids)
+        else:
+            self.clear_caches()
+
     def clear_caches(self):
         self.cache.clear()
 
+    def update_caches(self, dbcache, book_ids):
+        sqp = self.create_parser(dbcache)
+        try:
+            return self._update_caches(sqp, book_ids)
+        finally:
+            sqp.dbcache = sqp.lookup_saved_search = None
+
+    def _update_caches(self, sqp, book_ids):
+        book_ids = sqp.all_book_ids = set(book_ids)
+        remove = set()
+        for query, result in self.cache:
+            try:
+                matches = sqp.parse(query)
+            except ParseException:
+                remove.add(query)
+            else:
+                # remove books that no longer match
+                result.difference_update(book_ids - matches)
+                # add books that now match but did not before
+                result.update(matches)
+        for query in remove:
+            self.cache.pop(query)
+
+    def create_parser(self, dbcache, virtual_fields=None):
+        return Parser(
+            dbcache, set(), dbcache._pref('grouped_search_terms'),
+            self.date_search, self.num_search, self.bool_search,
+            self.keypair_search,
+            prefs['limit_search_columns'],
+            prefs['limit_search_columns_to'], self.all_search_locations,
+            virtual_fields, self.saved_searches.lookup, self.parse_cache)
+
     def __call__(self, dbcache, query, search_restriction, virtual_fields=None, book_ids=None):
         '''
         Return the set of ids of all records that match the specified
@@ -788,13 +840,7 @@ class Search(object):
         '''
         # We construct a new parser instance per search as the parse is not
         # thread safe.
-        sqp = Parser(
-            dbcache, set(), dbcache._pref('grouped_search_terms'),
-            self.date_search, self.num_search, self.bool_search,
-            self.keypair_search,
-            prefs['limit_search_columns'],
-            prefs['limit_search_columns_to'], self.all_search_locations,
-            virtual_fields, self.saved_searches.lookup, self.parse_cache)
+        sqp = self.create_parser(dbcache, virtual_fields)
         try:
             return self._do_search(sqp, query, search_restriction, dbcache, book_ids=book_ids)
         finally:
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index dbeda9f6b0..2006348862 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -448,6 +448,7 @@ class ReadingTest(BaseTest):
         test(False, {3}, 'Unknown')
         test(True, {3}, 'Unknown')
         test(True, {3}, 'Unknown')
+        cache._search_api.MAX_CACHE_UPDATE = 0
         cache.set_field('title', {3:'xxx'})
         test(False, {3}, 'Unknown')  # cache cleared
         test(True, {3}, 'Unknown')
@@ -458,6 +459,11 @@ class ReadingTest(BaseTest):
         test(False, {3}, '', 'unknown')
         test(True, {3}, '', 'unknown')
         test(True, {3}, 'Unknown', 'unknown')
+        cache._search_api.MAX_CACHE_UPDATE = 100
+        test(False, {2, 3}, 'title:=xxx or title:"=Title One"')
+        cache.set_field('publisher', {3:'ppppp', 2:'other'})
+        # Test cache update worked
+        test(True, {2, 3}, 'title:=xxx or title:"=Title One"')
     # }}}
 
     def test_proxy_metadata(self):  # {{{

From 474abe15c24466ac14c8de8eae633ef2f50774a0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 18:47:23 +0530
Subject: [PATCH 0327/1154] Invalidate search caches when marked ids change

---
 src/calibre/db/view.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 2a779a5af0..602a2fbeaf 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -310,6 +310,7 @@ class View(object):
         a mapping is provided, then the search can be used to search for
         particular values: ``marked:value``
         '''
+        old_marked_ids = set(self.marked_ids)
         if not hasattr(id_dict, 'items'):
             # Simple list. Make it a dict of string 'true'
             self.marked_ids = dict.fromkeys(id_dict, u'true')
@@ -317,6 +318,9 @@ class View(object):
             # Ensure that all the items in the dict are text
             self.marked_ids = dict(izip(id_dict.iterkeys(), imap(unicode,
                 id_dict.itervalues())))
+        # This invalidates all searches in the cache even though the cache may
+        # be shared by multiple views. This is not ideal, but...
+        self.cache.clear_search_caches(old_marked_ids | set(self.marked_ids))
 
     def refresh(self, field=None, ascending=True):
         self._map = tuple(self.cache.all_book_ids())

From 114e5cf3a771c64421108ae65e839e6c6b65b5f0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jul 2013 18:55:39 +0530
Subject: [PATCH 0328/1154] Ensure that removing books does not cause errors
 when updating search caches

---
 src/calibre/db/cache.py  | 8 +++++---
 src/calibre/db/search.py | 5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 23e4498e72..ef4c8854b4 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -154,7 +154,7 @@ class Cache(object):
         self._search_api.update_or_clear(self, book_ids)
 
     @write_api
-    def clear_caches(self, book_ids=None, template_cache=True):
+    def clear_caches(self, book_ids=None, template_cache=True, search_cache=True):
         if template_cache:
             self._initialize_template_cache()  # Clear the formatter template cache
         for field in self.fields.itervalues():
@@ -165,7 +165,8 @@ class Cache(object):
                 self.format_metadata_cache.pop(book_id, None)
         else:
             self.format_metadata_cache.clear()
-        self._clear_search_caches(book_ids)
+        if search_cache:
+            self._clear_search_caches(book_ids)
 
     @write_api
     def reload_from_db(self, clear_caches=True):
@@ -1303,7 +1304,8 @@ class Cache(object):
                 continue  # Some fields like ondevice do not have tables
             else:
                 table.remove_books(book_ids, self.backend)
-        self._clear_caches(book_ids=book_ids, template_cache=False)
+        self._search_api.discard_books(book_ids)
+        self._clear_caches(book_ids=book_ids, template_cache=False, search_cache=False)
 
     @read_api
     def author_sort_strings_for_books(self, book_ids):
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 3b441e6b2f..759b76fdb8 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -808,6 +808,11 @@ class Search(object):
         finally:
             sqp.dbcache = sqp.lookup_saved_search = None
 
+    def discard_books(self, book_ids):
+        book_ids = set(book_ids)
+        for query, result in self.cache:
+            result.difference_update(book_ids)
+
     def _update_caches(self, sqp, book_ids):
         book_ids = sqp.all_book_ids = set(book_ids)
         remove = set()

From 9a6073fcfb7110e714c1252034642ae51352e0b9 Mon Sep 17 00:00:00 2001
From: intromatyk <artur.stachecki@gmail.com>
Date: Wed, 24 Jul 2013 21:07:29 +0200
Subject: [PATCH 0329/1154] fixed antyweb recipe

---
 recipes/antyweb.recipe | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/recipes/antyweb.recipe b/recipes/antyweb.recipe
index b7d3d2583c..d85ed4adcc 100644
--- a/recipes/antyweb.recipe
+++ b/recipes/antyweb.recipe
@@ -21,21 +21,9 @@ class AntywebRecipe(BasicNewsRecipe):
     simultaneous_downloads = 3
 
     keep_only_tags =[]
-    keep_only_tags.append(dict(name = 'h1', attrs = { 'class' : 'mm-article-title'}))
-    keep_only_tags.append(dict(name = 'div', attrs = {'class' : 'mm-article-content'}))
-
-
-    remove_tags =[]
-    remove_tags.append(dict(name = 'h2', attrs = {'class' : 'widgettitle'}))
-    remove_tags.append(dict(name = 'img', attrs = {'class' : 'alignleft'}))
-    remove_tags.append(dict(name = 'div', attrs = {'class' : 'float: right;margin-left:1em;margin-bottom: 0.5em;padding-bottom: 3px; width: 72px;'}))
-    remove_tags.append(dict(name = 'img', attrs = {'src' : 'http://antyweb.pl/wp-content/uploads/2011/09/HOSTERSI_testy_pasek600x30.gif'}))
-    remove_tags.append(dict(name = 'div', attrs = {'class' : 'podwpisowe'}))
-
-
-    extra_css = '''
-                    body {font-family: verdana, arial, helvetica, geneva, sans-serif ;}
-                       '''
+    keep_only_tags.append(dict(name = 'h1', attrs = { 'class' : 'entry-title '}))
+    keep_only_tags.append(dict(name = 'div', attrs = {'class' : 'news-content'}))
+    extra_css = '''body {font-family: verdana, arial, helvetica, geneva, sans-serif ;}'''
 
     feeds          = [
                             (u'Artykuly', u'feed://feeds.feedburner.com/Antyweb?format=xml'),

From f555ab52792596815b73a044c19b8b51d42b4c6b Mon Sep 17 00:00:00 2001
From: intromatyk <artur.stachecki@gmail.com>
Date: Wed, 24 Jul 2013 22:32:54 +0200
Subject: [PATCH 0330/1154] update Dilbert recipe

---
 recipes/dilbert.recipe | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/recipes/dilbert.recipe b/recipes/dilbert.recipe
index ed2771debf..d64f6e6882 100644
--- a/recipes/dilbert.recipe
+++ b/recipes/dilbert.recipe
@@ -16,7 +16,7 @@ class DilbertBig(BasicNewsRecipe):
     oldest_article         = 15
     max_articles_per_feed  = 100
     no_stylesheets         = True
-    use_embedded_content   = True
+    use_embedded_content   = False
     encoding               = 'utf-8'
     publisher              = 'UNITED FEATURE SYNDICATE, INC.'
     category               = 'comic'
@@ -30,25 +30,13 @@ class DilbertBig(BasicNewsRecipe):
                             ,'publisher'       : publisher
                          }
 
-    feeds = [(u'Dilbert', u'http://feed.dilbert.com/dilbert/daily_strip' )]
-
-    def get_article_url(self, article):
-        return article.get('feedburner_origlink', None)
+    feeds = [(u'Dilbert', u'http://feed.dilbert.com/dilbert/daily_strip')]
 
     preprocess_regexps = [
         (re.compile('strip\..*\.gif', re.DOTALL|re.IGNORECASE), lambda match: 'strip.zoom.gif')
         ]
 
     def preprocess_html(self, soup):
-       for tag in soup.findAll(name='a'):
-           if tag['href'].find('http://feedads') >= 0:
-              tag.extract()
-       return soup
-
-    extra_css = '''
-                    h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
-                    h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
-                    img {max-width:100%; min-width:100%;}
-                    p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
-                    body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
-		'''
+       for tag in soup.findAll(name='input'):
+           image = BeautifulSoup('<img src=' + tag['value'] + '></img>')
+       return image

From ced9a68a3090f9f8d5c9d281c3cfed2640a6a226 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 07:42:14 +0530
Subject: [PATCH 0331/1154] Update Scientific American

---
 recipes/scientific_american.recipe | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/recipes/scientific_american.recipe b/recipes/scientific_american.recipe
index 2ea865517e..08f0a3b2b7 100644
--- a/recipes/scientific_american.recipe
+++ b/recipes/scientific_american.recipe
@@ -30,11 +30,13 @@ class ScientificAmerican(BasicNewsRecipe):
                 ,dict(name='p', attrs={'id':'articleDek'})
                 ,dict(name='p', attrs={'class':'articleInfo'})
                 ,dict(name='div', attrs={'id':['articleContent']})
-                ,dict(name='img', attrs={'src':re.compile(r'/media/inline/blog/Image/', re.DOTALL|re.IGNORECASE)}) 
+                ,dict(name='img', attrs={'src':re.compile(r'/media/inline/blog/Image/', re.DOTALL|re.IGNORECASE)})
                 ]
 
-    remove_tags = [dict(name='a', attrs={'class':'tinyCommentCount'})]
-
+    remove_tags = [dict(name='a', attrs={'class':'tinyCommentCount'})
+                                ,dict(name='div', attrs={'id':'bigCoverModule'})
+                                ,dict(name='div', attrs={'class':'addInfo'})
+                                ]
     def parse_index(self):
         soup = self.index_to_soup('http://www.scientificamerican.com/sciammag/')
         issuetag = soup.find('p',attrs={'id':'articleDek'})
@@ -43,8 +45,9 @@ class ScientificAmerican(BasicNewsRecipe):
         if img is not None:
             self.cover_url = img['src']
         features, feeds = [], []
-        for a in soup.find(attrs={'class':'primaryCol'}).findAll('a',attrs={'title':'Feature'}):
-            if a is None: continue
+        for a in soup.find(attrs={'class':'doubleWide'}).find(attrs={'class':'primaryCol'}).findAll('a',attrs={'title':'Feature'}):
+            if a is None:
+                continue
             desc = ''
             s = a.parent.parent.find(attrs={'class':'dek'})
             desc = self.tag_to_string(s)
@@ -89,3 +92,4 @@ class ScientificAmerican(BasicNewsRecipe):
                 h2{font-size:large; font-family:Arial,Helvetica,sans-serif;}
                 h3{font-size:x-small;font-family:Arial,Helvetica,sans-serif;}
                 '''
+

From be4dbafc9d9fde1e5939bd9c37bb6c3c3d786608 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 08:48:52 +0530
Subject: [PATCH 0332/1154] Viewer: Refactor the bookmarks manager to make it a
 little prettier

---
 src/calibre/gui2/viewer/bookmarkmanager.py |  59 +++++------
 src/calibre/gui2/viewer/bookmarkmanager.ui | 108 ++++++++++++---------
 2 files changed, 93 insertions(+), 74 deletions(-)

diff --git a/src/calibre/gui2/viewer/bookmarkmanager.py b/src/calibre/gui2/viewer/bookmarkmanager.py
index c3686bd81e..073087f1e3 100644
--- a/src/calibre/gui2/viewer/bookmarkmanager.py
+++ b/src/calibre/gui2/viewer/bookmarkmanager.py
@@ -5,8 +5,8 @@ __copyright__ = '2009, John Schember <john@nachtimwald.com>'
 
 import cPickle, os
 
-from PyQt4.Qt import Qt, QDialog, QAbstractTableModel, QVariant, SIGNAL, \
-    QModelIndex, QInputDialog, QLineEdit, QFileDialog
+from PyQt4.Qt import (Qt, QDialog, QAbstractListModel, QVariant,
+    QModelIndex, QInputDialog, QLineEdit, QFileDialog, QItemSelectionModel)
 
 from calibre.gui2.viewer.bookmarkmanager_ui import Ui_BookmarkManager
 from calibre.gui2 import NONE
@@ -20,28 +20,32 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
         self.bookmarks = bookmarks[:]
         self.set_bookmarks()
 
-        self.connect(self.button_revert, SIGNAL('clicked()'), self.set_bookmarks)
-        self.connect(self.button_delete, SIGNAL('clicked()'), self.delete_bookmark)
-        self.connect(self.button_edit, SIGNAL('clicked()'), self.edit_bookmark)
-        self.connect(self.button_export, SIGNAL('clicked()'), self.export_bookmarks)
-        self.connect(self.button_import, SIGNAL('clicked()'), self.import_bookmarks)
+        self.button_revert.clicked.connect(lambda :self.set_bookmarks())
+        self.button_delete.clicked.connect(self.delete_bookmark)
+        self.button_edit.clicked.connect(self.edit_bookmark)
+        self.button_export.clicked.connect(self.export_bookmarks)
+        self.button_import.clicked.connect(self.import_bookmarks)
+        self.bookmarks_list.setStyleSheet('QListView::item { padding: 0.5ex }')
+        self.resize(600, 500)
 
     def set_bookmarks(self, bookmarks=None):
-        if bookmarks == None:
+        if bookmarks is None:
             bookmarks = self.bookmarks[:]
-        self._model = BookmarkTableModel(self, bookmarks)
-        self.bookmarks_table.setModel(self._model)
-        self.bookmarks_table.resizeColumnsToContents()
+        self._model = BookmarkListModel(self, bookmarks)
+        self.bookmarks_list.setModel(self._model)
+        if self._model.rowCount(QModelIndex()) > 0:
+            self.bookmarks_list.selectionModel().select(self._model.index(0), QItemSelectionModel.SelectCurrent)
 
     def delete_bookmark(self):
-        indexes = self.bookmarks_table.selectionModel().selectedIndexes()
-        if indexes != []:
+        indexes = list(self.bookmarks_list.selectionModel().selectedIndexes())
+        if indexes:
             self._model.remove_row(indexes[0].row())
 
     def edit_bookmark(self):
-        indexes = self.bookmarks_table.selectionModel().selectedIndexes()
-        if indexes != []:
-            title, ok = QInputDialog.getText(self, _('Edit bookmark'), _('New title for bookmark:'), QLineEdit.Normal, self._model.data(indexes[0], Qt.DisplayRole).toString())
+        indexes = list(self.bookmarks_list.selectionModel().selectedIndexes())
+        if indexes:
+            title, ok = QInputDialog.getText(self, _('Edit bookmark'), _(
+                'New title for bookmark:'), QLineEdit.Normal, self._model.data(indexes[0], Qt.DisplayRole).toString())
             title = QVariant(unicode(title).strip())
             if ok and title:
                 self._model.setData(indexes[0], title, Qt.EditRole)
@@ -68,7 +72,7 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
         with open(filename, 'r') as fileobj:
             imported = cPickle.load(fileobj)
 
-        if imported != None:
+        if imported is not None:
             bad = False
             try:
                 for bm in imported:
@@ -86,11 +90,10 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
                 self.set_bookmarks(bookmarks)
 
 
-class BookmarkTableModel(QAbstractTableModel):
-    headers = [_("Name")]
+class BookmarkListModel(QAbstractListModel):
 
     def __init__(self, parent, bookmarks):
-        QAbstractTableModel.__init__(self, parent)
+        QAbstractListModel.__init__(self, parent)
 
         self.bookmarks = bookmarks[:]
 
@@ -99,11 +102,6 @@ class BookmarkTableModel(QAbstractTableModel):
             return 0
         return len(self.bookmarks)
 
-    def columnCount(self, parent):
-        if parent and parent.isValid():
-            return 0
-        return len(self.headers)
-
     def data(self, index, role):
         if role in (Qt.DisplayRole, Qt.EditRole):
             ans = self.bookmarks[index.row()]['title']
@@ -114,12 +112,12 @@ class BookmarkTableModel(QAbstractTableModel):
         if role == Qt.EditRole:
             bm = self.bookmarks[index.row()]
             bm['title'] = unicode(value.toString()).strip()
-            self.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), index, index)
+            self.dataChanged.emit(index, index)
             return True
         return False
 
     def flags(self, index):
-        flags = QAbstractTableModel.flags(self, index)
+        flags = QAbstractListModel.flags(self, index)
         flags |= Qt.ItemIsEditable
         return flags
 
@@ -136,3 +134,10 @@ class BookmarkTableModel(QAbstractTableModel):
         del self.bookmarks[row]
         self.endRemoveRows()
 
+if __name__ == '__main__':
+    from PyQt4.Qt import QApplication
+    app = QApplication([])
+    d = BookmarkManager(None, [{'title':'Bookmark #%d' % i} for i in range(1, 50)])
+    d.exec_()
+
+
diff --git a/src/calibre/gui2/viewer/bookmarkmanager.ui b/src/calibre/gui2/viewer/bookmarkmanager.ui
index 110b5db841..44c746038c 100644
--- a/src/calibre/gui2/viewer/bookmarkmanager.ui
+++ b/src/calibre/gui2/viewer/bookmarkmanager.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BookmarkManager</class>
- <widget class="QDialog" name="BookmarkManager" >
-  <property name="geometry" >
+ <widget class="QDialog" name="BookmarkManager">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,80 +10,93 @@
     <height>363</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Bookmark Manager</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Actions</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QPushButton" name="button_edit" >
-        <property name="text" >
+       <widget class="QPushButton" name="button_edit">
+        <property name="text">
          <string>Edit</string>
         </property>
+        <property name="icon">
+         <iconset resource="../../../../resources/images.qrc">
+          <normaloff>:/images/edit_input.png</normaloff>:/images/edit_input.png</iconset>
+        </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="button_delete" >
-        <property name="text" >
+       <widget class="QPushButton" name="button_delete">
+        <property name="text">
          <string>Delete</string>
         </property>
+        <property name="icon">
+         <iconset resource="../../../../resources/images.qrc">
+          <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
+        </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="button_revert" >
-        <property name="text" >
+       <widget class="QPushButton" name="button_revert">
+        <property name="text">
          <string>Reset</string>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="button_export" >
-        <property name="text" >
-         <string>Export</string>
+        <property name="icon">
+         <iconset resource="../../../../resources/images.qrc">
+          <normaloff>:/images/edit-undo.png</normaloff>:/images/edit-undo.png</iconset>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="button_import" >
-        <property name="text" >
+       <widget class="QPushButton" name="button_export">
+        <property name="text">
+         <string>Export</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../../resources/images.qrc">
+          <normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="button_import">
+        <property name="text">
          <string>Import</string>
         </property>
+        <property name="icon">
+         <iconset resource="../../../../resources/images.qrc">
+          <normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
+        </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QTableView" name="bookmarks_table" >
-     <property name="showDropIndicator" stdset="0" >
-      <bool>false</bool>
-     </property>
-     <property name="alternatingRowColors" >
+   <item row="0" column="1">
+    <widget class="QListView" name="bookmarks_list">
+     <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
-     <property name="selectionMode" >
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-     <property name="sortingEnabled" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
     </widget>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../../../resources/images.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
@@ -90,11 +104,11 @@
    <receiver>BookmarkManager</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>225</x>
      <y>337</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>225</x>
      <y>181</y>
     </hint>
@@ -106,11 +120,11 @@
    <receiver>BookmarkManager</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>225</x>
      <y>337</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>225</x>
      <y>181</y>
     </hint>

From ce5821eec85972d55192966b9911f16b660b6341 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 10:29:25 +0530
Subject: [PATCH 0333/1154] Complete rewrite of viewer bookmarks manager

Ebook-viewer: Allow re-ordering bookmarks in the bookmarks manager by
drag and drop.
---
 src/calibre/gui2/viewer/bookmarkmanager.py | 127 +++++++++------------
 src/calibre/gui2/viewer/bookmarkmanager.ui |  25 ++--
 2 files changed, 71 insertions(+), 81 deletions(-)

diff --git a/src/calibre/gui2/viewer/bookmarkmanager.py b/src/calibre/gui2/viewer/bookmarkmanager.py
index 073087f1e3..acd00c3a6f 100644
--- a/src/calibre/gui2/viewer/bookmarkmanager.py
+++ b/src/calibre/gui2/viewer/bookmarkmanager.py
@@ -1,15 +1,17 @@
-from __future__ import with_statement
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
 
-__license__   = 'GPL v3'
-__copyright__ = '2009, John Schember <john@nachtimwald.com>'
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import cPickle, os
 
-from PyQt4.Qt import (Qt, QDialog, QAbstractListModel, QVariant,
-    QModelIndex, QInputDialog, QLineEdit, QFileDialog, QItemSelectionModel)
+from PyQt4.Qt import (
+    Qt, QDialog, QListWidgetItem, QFileDialog, QItemSelectionModel)
 
 from calibre.gui2.viewer.bookmarkmanager_ui import Ui_BookmarkManager
-from calibre.gui2 import NONE
 
 class BookmarkManager(QDialog, Ui_BookmarkManager):
     def __init__(self, parent, bookmarks):
@@ -17,7 +19,7 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
 
         self.setupUi(self)
 
-        self.bookmarks = bookmarks[:]
+        self.original_bookmarks = bookmarks
         self.set_bookmarks()
 
         self.button_revert.clicked.connect(lambda :self.set_bookmarks())
@@ -26,46 +28,68 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
         self.button_export.clicked.connect(self.export_bookmarks)
         self.button_import.clicked.connect(self.import_bookmarks)
         self.bookmarks_list.setStyleSheet('QListView::item { padding: 0.5ex }')
+        self.bookmarks_list.viewport().setAcceptDrops(True)
+        self.bookmarks_list.setDropIndicatorShown(True)
+        self.bookmarks_list.itemChanged.connect(self.item_changed)
         self.resize(600, 500)
+        self.bookmarks_list.setFocus(Qt.OtherFocusReason)
 
     def set_bookmarks(self, bookmarks=None):
         if bookmarks is None:
-            bookmarks = self.bookmarks[:]
-        self._model = BookmarkListModel(self, bookmarks)
-        self.bookmarks_list.setModel(self._model)
-        if self._model.rowCount(QModelIndex()) > 0:
-            self.bookmarks_list.selectionModel().select(self._model.index(0), QItemSelectionModel.SelectCurrent)
+            bookmarks = self.original_bookmarks
+        self.bookmarks_list.clear()
+        for bm in bookmarks:
+            i = QListWidgetItem(bm['title'])
+            i.setData(Qt.UserRole, self.bm_to_item(bm))
+            i.setFlags(i.flags() | Qt.ItemIsEditable)
+            self.bookmarks_list.addItem(i)
+        if len(bookmarks) > 0:
+            self.bookmarks_list.setCurrentItem(self.bookmarks_list.item(0), QItemSelectionModel.ClearAndSelect)
+
+    def item_changed(self, item):
+        self.bookmarks_list.blockSignals(True)
+        title = unicode(item.data(Qt.DisplayRole).toString())
+        if not title:
+            title = _('Unknown')
+            item.setData(Qt.DisplayRole, title)
+        bm = self.item_to_bm(item)
+        bm['title'] = title
+        item.setData(Qt.UserRole, self.bm_to_item(bm))
+        self.bookmarks_list.blockSignals(False)
 
     def delete_bookmark(self):
-        indexes = list(self.bookmarks_list.selectionModel().selectedIndexes())
-        if indexes:
-            self._model.remove_row(indexes[0].row())
+        row = self.bookmarks_list.currentRow()
+        if row > -1:
+            self.bookmarks_list.takeItem(row)
 
     def edit_bookmark(self):
-        indexes = list(self.bookmarks_list.selectionModel().selectedIndexes())
-        if indexes:
-            title, ok = QInputDialog.getText(self, _('Edit bookmark'), _(
-                'New title for bookmark:'), QLineEdit.Normal, self._model.data(indexes[0], Qt.DisplayRole).toString())
-            title = QVariant(unicode(title).strip())
-            if ok and title:
-                self._model.setData(indexes[0], title, Qt.EditRole)
+        item = self.bookmarks_list.currentItem()
+        if item is not None:
+            self.bookmarks_list.editItem(item)
+
+    def bm_to_item(self, bm):
+        return bytearray(cPickle.dumps(bm, -1))
+
+    def item_to_bm(self, item):
+        return cPickle.loads(bytes(item.data(Qt.UserRole).toPyObject()))
 
     def get_bookmarks(self):
-        return self._model.bookmarks
+        l = self.bookmarks_list
+        return [self.item_to_bm(l.item(i)) for i in xrange(l.count())]
 
     def export_bookmarks(self):
         filename = QFileDialog.getSaveFileName(self, _("Export Bookmarks"),
                 '%s%suntitled.pickle' % (os.getcwdu(), os.sep),
                 _("Saved Bookmarks (*.pickle)"))
-        if filename == '':
+        if not filename:
             return
 
         with open(filename, 'w') as fileobj:
-            cPickle.dump(self._model.bookmarks, fileobj)
+            cPickle.dump(self.get_bookmarks(), fileobj)
 
     def import_bookmarks(self):
         filename = QFileDialog.getOpenFileName(self, _("Import Bookmarks"), '%s' % os.getcwdu(), _("Pickled Bookmarks (*.pickle)"))
-        if filename == '':
+        if not filename:
             return
 
         imported = None
@@ -83,61 +107,18 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
                 pass
 
             if not bad:
-                bookmarks = self._model.bookmarks[:]
+                bookmarks = self.get_bookmarks()
                 for bm in imported:
                     if bm not in bookmarks and bm['title'] != 'calibre_current_page_bookmark':
                         bookmarks.append(bm)
                 self.set_bookmarks(bookmarks)
 
-
-class BookmarkListModel(QAbstractListModel):
-
-    def __init__(self, parent, bookmarks):
-        QAbstractListModel.__init__(self, parent)
-
-        self.bookmarks = bookmarks[:]
-
-    def rowCount(self, parent):
-        if parent and parent.isValid():
-            return 0
-        return len(self.bookmarks)
-
-    def data(self, index, role):
-        if role in (Qt.DisplayRole, Qt.EditRole):
-            ans = self.bookmarks[index.row()]['title']
-            return NONE if ans is None else QVariant(ans)
-        return NONE
-
-    def setData(self, index, value, role):
-        if role == Qt.EditRole:
-            bm = self.bookmarks[index.row()]
-            bm['title'] = unicode(value.toString()).strip()
-            self.dataChanged.emit(index, index)
-            return True
-        return False
-
-    def flags(self, index):
-        flags = QAbstractListModel.flags(self, index)
-        flags |= Qt.ItemIsEditable
-        return flags
-
-    def headerData(self, section, orientation, role):
-        if role != Qt.DisplayRole:
-            return NONE
-        if orientation == Qt.Horizontal:
-            return QVariant(self.headers[section])
-        else:
-            return QVariant(section+1)
-
-    def remove_row(self, row):
-        self.beginRemoveRows(QModelIndex(), row, row)
-        del self.bookmarks[row]
-        self.endRemoveRows()
-
 if __name__ == '__main__':
     from PyQt4.Qt import QApplication
     app = QApplication([])
-    d = BookmarkManager(None, [{'title':'Bookmark #%d' % i} for i in range(1, 50)])
+    d = BookmarkManager(None, [{'title':'Bookmark #%d' % i, 'data':b'xxxxx'} for i in range(1, 5)])
     d.exec_()
+    import pprint
+    pprint.pprint(d.get_bookmarks())
 
 
diff --git a/src/calibre/gui2/viewer/bookmarkmanager.ui b/src/calibre/gui2/viewer/bookmarkmanager.ui
index 44c746038c..5d7f6a67d7 100644
--- a/src/calibre/gui2/viewer/bookmarkmanager.ui
+++ b/src/calibre/gui2/viewer/bookmarkmanager.ui
@@ -14,13 +14,6 @@
    <string>Bookmark Manager</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0" colspan="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -85,8 +78,24 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="1">
-    <widget class="QListView" name="bookmarks_list">
+    <widget class="QListWidget" name="bookmarks_list">
+     <property name="dragEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::InternalMove</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::MoveAction</enum>
+     </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>

From 2b8dc4505d70e5a5cf9d859212790e254adc46ad Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 10:50:39 +0530
Subject: [PATCH 0334/1154] PDF Output: Do not error out when subsetting fails

PDF Output: Do not error out when the input document uses a font that
cannot be subset, such as the Symbol font. Instead print a warning and
embed the full font. Fixes #1203449 [EPUB to PDF conversion fails](https://bugs.launchpad.net/calibre/+bug/1203449)
---
 src/calibre/ebooks/pdf/render/fonts.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/pdf/render/fonts.py b/src/calibre/ebooks/pdf/render/fonts.py
index 9a1167021c..ea8fd03c10 100644
--- a/src/calibre/ebooks/pdf/render/fonts.py
+++ b/src/calibre/ebooks/pdf/render/fonts.py
@@ -16,7 +16,7 @@ from future_builtins import map
 from calibre import as_unicode
 from calibre.ebooks.pdf.render.common import (Array, String, Stream,
     Dictionary, Name)
-from calibre.utils.fonts.sfnt.subset import pdf_subset, UnsupportedFont
+from calibre.utils.fonts.sfnt.subset import pdf_subset, UnsupportedFont, NoGlyphs
 
 STANDARD_FONTS = {
     'Times-Roman', 'Helvetica', 'Courier', 'Symbol', 'Times-Bold',
@@ -84,7 +84,6 @@ class CMap(Stream):
         end
         ''')
 
-
     def __init__(self, name, glyph_map, compress=False):
         Stream.__init__(self, compress)
         current_map = OrderedDict()
@@ -118,7 +117,7 @@ class Font(object):
         self.font_descriptor = Dictionary({
             'Type': Name('FontDescriptor'),
             'FontName': Name('%s+%s'%(self.subset_tag, metrics.postscript_name)),
-            'Flags': 0b100, # Symbolic font
+            'Flags': 0b100,  # Symbolic font
             'FontBBox': Array(metrics.pdf_bbox),
             'ItalicAngle': metrics.post.italic_angle,
             'Ascent': metrics.pdf_ascent,
@@ -161,6 +160,11 @@ class Font(object):
         except UnsupportedFont as e:
             debug('Subsetting of %s not supported, embedding full font. Error: %s'%(
                 self.metrics.names.get('full_name', 'Unknown'), as_unicode(e)))
+        except NoGlyphs:
+            if self.used_glyphs:
+                debug(
+                    'Subsetting of %s failed, font appears to have no glyphs for the %d characters it is used with, some text may not be rendered in the PDF' %
+                    (self.metrics.names.get('full_name', 'Unknown'), len(self.used_glyphs)))
         if self.is_otf:
             self.font_stream.write(self.metrics.sfnt['CFF '].raw)
         else:
@@ -184,7 +188,7 @@ class Font(object):
         widths = {g:w for g, w in widths.iteritems() if w != most_common}
 
         groups = Array()
-        for k, g in groupby(enumerate(widths.iterkeys()), lambda (i,x):i-x):
+        for k, g in groupby(enumerate(widths.iterkeys()), lambda i_x:i_x[0]-i_x[1]):
             group = list(map(itemgetter(1), g))
             gwidths = [widths[g] for g in group]
             if len(set(gwidths)) == 1 and len(group) > 1:
@@ -230,3 +234,4 @@ class FontManager(object):
         for font in self.fonts:
             font.embed(self.objects, debug)
 
+

From c73123fceea166c7ff1a0d096ad7d576abb4820c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 11:26:38 +0530
Subject: [PATCH 0335/1154] Fix deleting books in newdb

---
 src/calibre/db/legacy.py |  3 ++-
 src/calibre/db/view.py   | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index efb71223a2..b2ac69c13a 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -320,8 +320,9 @@ class LibraryDatabase(object):
 
     def delete_book(self, book_id, notify=True, commit=True, permanent=False, do_clean=True):
         self.new_api.remove_books((book_id,), permanent=permanent)
+        self.data.books_deleted((book_id,))
         if notify:
-            self.notify('delete', [id])
+            self.notify('delete', [book_id])
 
     def dirtied(self, book_ids, commit=True):
         self.new_api.mark_as_dirty(frozenset(book_ids) if book_ids is not None else book_ids)
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 602a2fbeaf..8c99cf41cf 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -339,3 +339,17 @@ class View(object):
             pass
         return None
 
+    def remove(self, book_id):
+        try:
+            self._map = tuple(bid for bid in self._map if bid != book_id)
+        except ValueError:
+            pass
+        try:
+            self._map_filtered = tuple(bid for bid in self._map_filtered if bid != book_id)
+        except ValueError:
+            pass
+
+    def books_deleted(self, ids):
+        for book_id in ids:
+            self.remove(book_id)
+

From 179c28e32850c5be50d5853394f8b18b063d0aae Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 11:45:40 +0530
Subject: [PATCH 0336/1154] Fix adding of books in newdb

---
 src/calibre/db/legacy.py | 14 +++++++++++---
 src/calibre/db/view.py   |  5 +++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b2ac69c13a..f85340aacd 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -200,7 +200,9 @@ class LibraryDatabase(object):
 
     # Adding books {{{
     def create_book_entry(self, mi, cover=None, add_duplicates=True, force_id=None):
-        return self.new_api.create_book_entry(mi, cover=cover, add_duplicates=add_duplicates, force_id=force_id)
+        ret = self.new_api.create_book_entry(mi, cover=cover, add_duplicates=add_duplicates, force_id=force_id)
+        self.data.books_added((ret,))
+        return ret
 
     def add_books(self, paths, formats, metadata, add_duplicates=True, return_ids=False):
         books = [(mi, {fmt:path}) for mi, path, fmt in zip(metadata, paths, formats)]
@@ -214,6 +216,7 @@ class LibraryDatabase(object):
                     paths.append(path)
             duplicates = (paths, formats, metadata)
         ids = book_ids if return_ids else len(book_ids)
+        self.data.books_added(book_ids)
         return duplicates or None, ids
 
     def import_book(self, mi, formats, notify=True, import_hooks=True, apply_import_tags=True, preserve_uuid=False):
@@ -225,6 +228,7 @@ class LibraryDatabase(object):
             format_map[ext] = path
         book_ids, duplicates = self.new_api.add_books(
             [(mi, format_map)], add_duplicates=True, apply_import_tags=apply_import_tags, preserve_uuid=preserve_uuid, dbapi=self, run_hooks=import_hooks)
+        self.data.books_added(book_ids)
         if notify:
             self.notify('add', book_ids)
         return book_ids[0]
@@ -244,10 +248,14 @@ class LibraryDatabase(object):
         return recursive_import(self, root, single_book_per_directory=single_book_per_directory, callback=callback, added_ids=added_ids)
 
     def add_catalog(self, path, title):
-        return add_catalog(self.new_api, path, title)
+        book_id = add_catalog(self.new_api, path, title)
+        self.data.books_added((book_id,))
+        return book_id
 
     def add_news(self, path, arg):
-        return add_news(self.new_api, path, arg)
+        book_id = add_news(self.new_api, path, arg)
+        self.data.books_added((book_id,))
+        return book_id
 
     def add_format(self, index, fmt, stream, index_is_id=False, path=None, notify=True, replace=True, copy_function=None):
         ''' path and copy_function are ignored by the new API '''
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 8c99cf41cf..48d53e06a8 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -353,3 +353,8 @@ class View(object):
         for book_id in ids:
             self.remove(book_id)
 
+    def books_added(self, ids):
+        ids = tuple(ids)
+        self._map = ids + self._map
+        self._map_filtered = ids + self._map_filtered
+

From 9ae9cf219ecd17d4552e25fcb4c466c5f35778ec Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 12:12:46 +0530
Subject: [PATCH 0337/1154] newdb: Fix reloading of content server on
 metadata.db change

---
 src/calibre/db/__init__.py | 2 +-
 src/calibre/db/legacy.py   | 1 +
 src/calibre/db/view.py     | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index bb0f679fd8..ceb6485efc 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -137,7 +137,7 @@ def get_db_loader():
 
 '''
 Various things that require other things before they can be migrated:
-    1. Check that content server reloading on metadata,db change, metadata
+    1. Check that metadata
     backup, refresh gui on calibredb add and moving libraries all work (check
     them on windows as well for file locking issues)
 '''
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index f85340aacd..3da725fe7e 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -120,6 +120,7 @@ class LibraryDatabase(object):
         if self.last_modified() > self.last_update_check:
             self.backend.reopen()
             self.new_api.reload_from_db()
+            self.data.refresh(clear_caches=False)  # caches are already cleared by reload_from_db()
         self.last_update_check = utcnow()
 
     @property
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 48d53e06a8..f679fc2416 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -322,10 +322,11 @@ class View(object):
         # be shared by multiple views. This is not ideal, but...
         self.cache.clear_search_caches(old_marked_ids | set(self.marked_ids))
 
-    def refresh(self, field=None, ascending=True):
+    def refresh(self, field=None, ascending=True, clear_caches=True):
         self._map = tuple(self.cache.all_book_ids())
         self._map_filtered = tuple(self._map)
-        self.cache.clear_caches()
+        if clear_caches:
+            self.cache.clear_caches()
         if field is not None:
             self.sort(field, ascending)
         if self.search_restriction or self.base_restriction:

From 6975543207a0b8eae74fa74428815e34061f6fe0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 12:39:03 +0530
Subject: [PATCH 0338/1154] newdb: calibredb add calibre file.ebook tested

---
 src/calibre/db/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index ceb6485efc..d501883d30 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -137,7 +137,6 @@ def get_db_loader():
 
 '''
 Various things that require other things before they can be migrated:
-    1. Check that metadata
-    backup, refresh gui on calibredb add and moving libraries all work (check
+    1. Check that metadata backup, and moving libraries all work (check
     them on windows as well for file locking issues)
 '''

From 6a488a332033d17bfbf31f51c2237f96a0fcbc40 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 25 Jul 2013 10:50:58 +0200
Subject: [PATCH 0339/1154] First stage: adding a ProxyMetadata object to
 get_metadata

---
 src/calibre/db/cache.py                  |  3 +++
 src/calibre/db/lazy.py                   |  5 +++--
 src/calibre/ebooks/metadata/book/base.py |  6 ++++--
 src/calibre/utils/formatter_functions.py | 22 +++++++++++++++++++++-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index ef4c8854b4..1c224bce7e 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -184,6 +184,9 @@ class Cache(object):
 
     def _get_metadata(self, book_id, get_user_categories=True):  # {{{
         mi = Metadata(None, template_cache=self.formatter_template_cache)
+
+        mi._proxy_metadata = ProxyMetadata(self, book_id, formatter=mi.formatter)
+
         author_ids = self._field_ids_for('authors', book_id)
         adata = self._author_data(author_ids)
         aut_list = [adata[i] for i in author_ids]
diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 566e51b32a..303d47b697 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -278,9 +278,10 @@ for field in ('formats', 'format_metadata'):
 
 class ProxyMetadata(Metadata):
 
-    def __init__(self, db, book_id):
+    def __init__(self, db, book_id, formatter=None):
         sa(self, 'template_cache', db.formatter_template_cache)
-        sa(self, 'formatter', SafeFormat())
+        if formatter is None:
+            sa(self, 'formatter', SafeFormat())
         sa(self, '_db', weakref.ref(db))
         sa(self, '_book_id', book_id)
         sa(self, '_cache', {'user_categories':{}, 'cover_data':(None,None), 'device_collections':[]})
diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 4427121f37..93253b1dcc 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -66,7 +66,8 @@ class Metadata(object):
     becomes a reserved field name.
     '''
 
-    def __init__(self, title, authors=(_('Unknown'),), other=None, template_cache=None):
+    def __init__(self, title, authors=(_('Unknown'),), other=None, template_cache=None,
+                 formatter=None):
         '''
         @param title: title or ``_('Unknown')``
         @param authors: List of strings or []
@@ -85,7 +86,8 @@ class Metadata(object):
                 self.author = list(authors) if authors else []  # Needed for backward compatibility
                 self.authors = list(authors) if authors else []
         from calibre.ebooks.metadata.book.formatter import SafeFormat
-        self.formatter = SafeFormat()
+        if formatter is None:
+            self.formatter = SafeFormat()
         self.template_cache = template_cache
 
     def is_null(self, field):
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index f2b973a1e7..606fe3b11b 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -1246,6 +1246,26 @@ class BuiltinFinishFormatting(BuiltinFormatterFunction):
             return val
         return prefix + formatter._do_format(val, fmt) + suffix
 
+class BuiltinVirtualLibraries(BuiltinFormatterFunction):
+    name = 'virtual_libraries'
+    arg_count = 0
+    category = 'Get values from metadata'
+    __doc__ = doc = _('virtual_libraries() -- return a comma-separated list of '
+                      'virtual libraries that contain this book. This function '
+                      'works only in the GUI. If you want to use these values '
+                      'in save-to-disk or send-to-device templates then you '
+                      'must make a custom "Column built from other columns", use '
+                      'the function in that column\'s template, and use that '
+                      'column\'s value in your save/send templates')
+
+    def evaluate(self, formatter, kwargs, mi, locals_):
+        from calibre.db.lazy import ProxyMetadata
+        if isinstance(mi, ProxyMetadata):
+            return mi.virtual_libraries
+        if hasattr(mi, '_proxy_metadata'):
+            return mi._proxy_metadata.virtual_libraries
+        return _('This function can be used only in the GUI')
+
 _formatter_builtins = [
     BuiltinAdd(), BuiltinAnd(), BuiltinApproximateFormats(),
     BuiltinAssign(), BuiltinBooksize(),
@@ -1267,7 +1287,7 @@ _formatter_builtins = [
     BuiltinStrcmp(), BuiltinStrInList(), BuiltinStrlen(), BuiltinSubitems(),
     BuiltinSublist(),BuiltinSubstr(), BuiltinSubtract(), BuiltinSwapAroundComma(),
     BuiltinSwitch(), BuiltinTemplate(), BuiltinTest(), BuiltinTitlecase(),
-    BuiltinToday(), BuiltinUppercase(),
+    BuiltinToday(), BuiltinUppercase(), BuiltinVirtualLibraries()
 ]
 
 class FormatterUserFunction(FormatterFunction):

From afbfa22fe298390cc2a478e9ac2cee997a933226 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 15:01:42 +0530
Subject: [PATCH 0340/1154] newdb: basic testing complete

---
 src/calibre/db/__init__.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index d501883d30..78f05da8ac 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -135,8 +135,4 @@ def get_db_loader():
         errs = (sqlite.Error, DatabaseException)
     return cls, errs
 
-'''
-Various things that require other things before they can be migrated:
-    1. Check that metadata backup, and moving libraries all work (check
-    them on windows as well for file locking issues)
-'''
+

From 8467baea332a099a69ee6e3147da7c68be48833b Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 25 Jul 2013 11:36:34 +0200
Subject: [PATCH 0341/1154] Use ProxyMetadata in formatter functions for virt
 libs, ondevice, book_size, and approximate_formats. This saves the assignment
 in get_metadata()

---
 src/calibre/db/cache.py                  |  7 ++--
 src/calibre/db/lazy.py                   |  4 +-
 src/calibre/gui2/library/models.py       |  2 +-
 src/calibre/utils/formatter_functions.py | 53 ++++++++++++++++--------
 4 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 1c224bce7e..0f187f0400 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -214,8 +214,8 @@ class Cache(object):
                 default_value='dummy')
         mi.title_sort  = self._field_for('sort', book_id,
                 default_value=_('Unknown'))
-        mi.book_size   = self._field_for('size', book_id, default_value=0)
-        mi.ondevice_col = self._field_for('ondevice', book_id, default_value='')
+#         mi.book_size   = self._field_for('size', book_id, default_value=0)
+#         mi.ondevice_col = self._field_for('ondevice', book_id, default_value='')
         mi.last_modified = self._field_for('last_modified', book_id,
                 default_value=n)
         formats = self._field_for('formats', book_id)
@@ -227,7 +227,7 @@ class Cache(object):
             mi.format_metadata = FormatMetadata(self, book_id, formats)
             good_formats = FormatsList(formats, mi.format_metadata)
         mi.formats = good_formats
-        mi.db_approx_formats = formats
+#         mi.db_approx_formats = formats
         mi.has_cover = _('Yes') if self._field_for('cover', book_id,
                 default_value=False) else ''
         mi.tags = list(self._field_for('tags', book_id, default_value=()))
@@ -1413,6 +1413,7 @@ class Cache(object):
     def refresh_ondevice(self):
         self.fields['ondevice'].clear_caches()
         self.clear_search_caches()
+        self.clear_composite_caches()
 
     @read_api
     def tags_older_than(self, tag, delta=None, must_have_tag=None, must_have_authors=None):
diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 303d47b697..f522bc1cc1 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -355,4 +355,6 @@ class ProxyMetadata(Metadata):
         um = ga(self, '_user_metadata')
         return frozenset(ALL_METADATA_FIELDS.union(um.iterkeys()))
 
-
+    @property
+    def _proxy_metadata(self):
+        return self
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index e70122fd36..5f9e7bfdc6 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -453,7 +453,7 @@ class BooksModel(QAbstractTableModel):  # {{{
 
     def get_book_display_info(self, idx):
         mi = self.db.get_metadata(idx)
-        mi.size = mi.book_size
+        mi.size = mi._proxy_metadata.book_size
         mi.cover_data = ('jpg', self.cover(idx))
         mi.id = self.db.id(idx)
         mi.field_metadata = self.db.field_metadata
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index 606fe3b11b..8fcc35e3bb 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -640,15 +640,22 @@ class BuiltinApproximateFormats(BuiltinFormatterFunction):
                   'although it probably is. '
                   'This function can be called in template program mode using '
                   'the template "{:\'approximate_formats()\'}". '
-                  'Note that format names are always uppercase, as in EPUB.'
+                  'Note that format names are always uppercase, as in EPUB. '
+                  'This function works only in the GUI. If you want to use these values '
+                  'in save-to-disk or send-to-device templates then you '
+                  'must make a custom "Column built from other columns", use '
+                  'the function in that column\'s template, and use that '
+                  'column\'s value in your save/send templates'
             )
 
     def evaluate(self, formatter, kwargs, mi, locals):
-        fmt_data = mi.get('db_approx_formats', [])
-        if not fmt_data:
-            return ''
-        data = sorted(fmt_data)
-        return ','.join(v.upper() for v in data)
+        if hasattr(mi, '_proxy_metadata'):
+            fmt_data = mi._proxy_metadata.db_approx_formats
+            if not fmt_data:
+                return ''
+            data = sorted(fmt_data)
+            return ','.join(v.upper() for v in data)
+        return _('This function can be used only in the GUI')
 
 class BuiltinFormatsModtimes(BuiltinFormatterFunction):
     name = 'formats_modtimes'
@@ -902,27 +909,42 @@ class BuiltinBooksize(BuiltinFormatterFunction):
     name = 'booksize'
     arg_count = 0
     category = 'Get values from metadata'
-    __doc__ = doc = _('booksize() -- return value of the size field')
+    __doc__ = doc = _('booksize() -- return value of the size field. '
+                'This function works only in the GUI. If you want to use this value '
+                'in save-to-disk or send-to-device templates then you '
+                'must make a custom "Column built from other columns", use '
+                'the function in that column\'s template, and use that '
+                'column\'s value in your save/send templates')
 
     def evaluate(self, formatter, kwargs, mi, locals):
-        if mi.book_size is not None:
+        if hasattr(mi, '_proxy_metadata'):
             try:
-                return str(mi.book_size)
+                v = mi._proxy_metadata.book_size
+                if v is not None:
+                    return str(mi._proxy_metadata.book_size)
+                return ''
             except:
                 pass
-        return ''
+            return ''
+        return _('This function can be used only in the GUI')
 
 class BuiltinOndevice(BuiltinFormatterFunction):
     name = 'ondevice'
     arg_count = 0
     category = 'Get values from metadata'
     __doc__ = doc = _('ondevice() -- return Yes if ondevice is set, otherwise return '
-            'the empty string')
+              'the empty string. This function works only in the GUI. If you want to '
+              'use this value in save-to-disk or send-to-device templates then you '
+              'must make a custom "Column built from other columns", use '
+              'the function in that column\'s template, and use that '
+              'column\'s value in your save/send templates')
 
     def evaluate(self, formatter, kwargs, mi, locals):
-        if mi.ondevice_col:
-            return _('Yes')
-        return ''
+        if hasattr(mi, '_proxy_metadata'):
+            if mi._proxy_metadata.ondevice_col:
+                return _('Yes')
+            return ''
+        return _('This function can be used only in the GUI')
 
 class BuiltinSeriesSort(BuiltinFormatterFunction):
     name = 'series_sort'
@@ -1259,9 +1281,6 @@ class BuiltinVirtualLibraries(BuiltinFormatterFunction):
                       'column\'s value in your save/send templates')
 
     def evaluate(self, formatter, kwargs, mi, locals_):
-        from calibre.db.lazy import ProxyMetadata
-        if isinstance(mi, ProxyMetadata):
-            return mi.virtual_libraries
         if hasattr(mi, '_proxy_metadata'):
             return mi._proxy_metadata.virtual_libraries
         return _('This function can be used only in the GUI')

From 9c0a1ca2f3a72f6fdb722e3f153a478f91916ba6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 15:24:29 +0530
Subject: [PATCH 0342/1154] Add a button to clear the current virtual library
 easily

---
 src/calibre/gui2/layout.py                   | 8 ++++++++
 src/calibre/gui2/search_restriction_mixin.py | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 20c2588bb4..a1c8063dd8 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -184,6 +184,14 @@ class SearchBar(QWidget):  # {{{
         l.addWidget(x)
         parent.virtual_library = x
 
+        x = QToolButton(self)
+        x.setIcon(QIcon(I('minus.png')))
+        x.setObjectName('clear_vl')
+        l.addWidget(x)
+        x.setVisible(False)
+        x.setToolTip(_('Close the Virtual Library'))
+        parent.clear_vl = x
+
         x = QLabel(self)
         x.setObjectName("search_count")
         l.addWidget(x)
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index ceed4f1928..528289e320 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -316,6 +316,7 @@ class SearchRestrictionMixin(object):
         self.virtual_library_menu = QMenu()
 
         self.virtual_library.clicked.connect(self.virtual_library_clicked)
+        self.clear_vl.clicked.connect(lambda x: (self.apply_virtual_library(), self.clear_additional_restriction()))
 
         self.virtual_library_tooltip = \
             _('Use a "virtual library" to show only a subset of the books present in this library')
@@ -589,10 +590,12 @@ class SearchRestrictionMixin(object):
             self.search_count.setStyleSheet(
                     'QLabel { border-radius: 6px; background-color: %s }' %
                     tweaks['highlight_virtual_library'])
+            self.clear_vl.setVisible(True)
         else:  # No restriction or not library view
             t = ''
             self.search_count.setStyleSheet(
                     'QLabel { background-color: transparent; }')
+            self.clear_vl.setVisible(False)
         self.search_count.setText(t)
 
 if __name__ == '__main__':

From 6315a05142ac16d017bbf7382674ab5045de0273 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 25 Jul 2013 12:20:12 +0200
Subject: [PATCH 0343/1154] correctly handle the formatter parameter in the
 cache and in Metadata

---
 src/calibre/db/lazy.py                   | 3 +--
 src/calibre/ebooks/metadata/book/base.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index f522bc1cc1..166627c438 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -280,8 +280,7 @@ class ProxyMetadata(Metadata):
 
     def __init__(self, db, book_id, formatter=None):
         sa(self, 'template_cache', db.formatter_template_cache)
-        if formatter is None:
-            sa(self, 'formatter', SafeFormat())
+        sa(self, 'formatter', SafeFormat() if formatter is None else formatter)
         sa(self, '_db', weakref.ref(db))
         sa(self, '_book_id', book_id)
         sa(self, '_cache', {'user_categories':{}, 'cover_data':(None,None), 'device_collections':[]})
diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 93253b1dcc..9e94678844 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -87,7 +87,7 @@ class Metadata(object):
                 self.authors = list(authors) if authors else []
         from calibre.ebooks.metadata.book.formatter import SafeFormat
         if formatter is None:
-            self.formatter = SafeFormat()
+            self.formatter = SafeFormat() if formatter is  None else formatter
         self.template_cache = template_cache
 
     def is_null(self, field):

From c3301f8cc339c485c7807ac666fd8e73d0172797 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 15:56:47 +0530
Subject: [PATCH 0344/1154] Allow Virtual Library removal confirmation dialog
 to be skipped

---
 src/calibre/gui2/search_restriction_mixin.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 528289e320..e8f7cd51ae 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -13,6 +13,7 @@ from PyQt4.Qt import (
     QDialogButtonBox, QSize, QVBoxLayout, QListWidget, QStringList, QRadioButton)
 
 from calibre.gui2 import error_dialog, question_dialog
+from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.widgets import ComboBoxWithHelp
 from calibre.utils.config_base import tweaks
 from calibre.utils.icu import sort_key
@@ -457,10 +458,9 @@ class SearchRestrictionMixin(object):
             menu.setEnabled(False)
 
     def remove_vl_triggered(self, name=None):
-        if not question_dialog(self, _('Are you sure?'),
-                     _('Are you sure you want to remove '
-                       'the virtual library {0}').format(name),
-                        default_yes=False):
+        if not confirm(
+            _('Are you sure you want to remove the virtual library <b>{0}</b>?').format(name),
+            'confirm_vl_removal', parent=self):
             return
         self._remove_vl(name, reapply=True)
 

From a2eb5554562c4dae34ca8732742d0258ddff9c3b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 16:03:50 +0530
Subject: [PATCH 0345/1154] Scroll the list of tweaks when using the keyboard

---
 src/calibre/gui2/preferences/tweaks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/preferences/tweaks.py b/src/calibre/gui2/preferences/tweaks.py
index 404648b90a..d6be773b9e 100644
--- a/src/calibre/gui2/preferences/tweaks.py
+++ b/src/calibre/gui2/preferences/tweaks.py
@@ -374,6 +374,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             self.changed()
 
     def current_changed(self, current, previous):
+        self.tweaks_view.scrollTo(current)
         tweak = self.tweaks.data(current, Qt.UserRole)
         self.help.setPlainText(tweak.doc)
         self.edit_tweak.setPlainText(tweak.edit_text)

From 1c5401db7b342648bc340d5c260b265f872b4021 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 16:04:42 +0530
Subject: [PATCH 0346/1154] pep8

---
 src/calibre/gui2/preferences/tweaks.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/preferences/tweaks.py b/src/calibre/gui2/preferences/tweaks.py
index d6be773b9e..b3122d3940 100644
--- a/src/calibre/gui2/preferences/tweaks.py
+++ b/src/calibre/gui2/preferences/tweaks.py
@@ -25,7 +25,7 @@ from PyQt4.Qt import (QAbstractListModel, Qt, QStyledItemDelegate, QStyle,
 
 ROOT = QModelIndex()
 
-class Delegate(QStyledItemDelegate): # {{{
+class Delegate(QStyledItemDelegate):  # {{{
     def __init__(self, view):
         QStyledItemDelegate.__init__(self, view)
         self.view = view
@@ -39,7 +39,7 @@ class Delegate(QStyledItemDelegate): # {{{
 
 # }}}
 
-class Tweak(object): # {{{
+class Tweak(object):  # {{{
 
     def __init__(self, name, doc, var_names, defaults, custom):
         translate = _
@@ -98,7 +98,7 @@ class Tweak(object): # {{{
 
 # }}}
 
-class Tweaks(QAbstractListModel, SearchQueryParser): # {{{
+class Tweaks(QAbstractListModel, SearchQueryParser):  # {{{
 
     def __init__(self, parent=None):
         QAbstractListModel.__init__(self, parent)
@@ -190,7 +190,7 @@ class Tweaks(QAbstractListModel, SearchQueryParser): # {{{
         if not var_names:
             raise ValueError('Failed to find any variables for %r'%name)
         self.tweaks.append(Tweak(name, doc, var_names, defaults, custom))
-        #print '\n\n', self.tweaks[-1]
+        # print '\n\n', self.tweaks[-1]
         return pos
 
     def restore_to_default(self, idx):
@@ -289,7 +289,7 @@ class Tweaks(QAbstractListModel, SearchQueryParser): # {{{
 
 # }}}
 
-class PluginTweaks(QDialog): # {{{
+class PluginTweaks(QDialog):  # {{{
 
     def __init__(self, raw, parent=None):
         QDialog.__init__(self, parent)
@@ -353,7 +353,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         return True
 
     def copy_item_to_clipboard(self, val):
-        cb = QApplication.clipboard();
+        cb = QApplication.clipboard()
         cb.clear()
         cb.setText(val)
 
@@ -448,7 +448,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.highlight_index(idx)
 
     def highlight_index(self, idx):
-        if not idx.isValid(): return
+        if not idx.isValid():
+            return
         self.view.scrollTo(idx)
         self.view.selectionModel().select(idx,
                 self.view.selectionModel().ClearAndSelect)
@@ -473,7 +474,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
 if __name__ == '__main__':
     app = QApplication([])
-    #Tweaks()
-    #test_widget
+    # Tweaks()
+    # test_widget
     test_widget('Advanced', 'Tweaks')
 
+

From 805421573dd2f6f9be3fdcc8c090075e7d1a7855 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 18:42:24 +0530
Subject: [PATCH 0347/1154] Update mediapart.fr

---
 recipes/mediapart.recipe | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/recipes/mediapart.recipe b/recipes/mediapart.recipe
index a457b713f2..0dbe8bcd72 100644
--- a/recipes/mediapart.recipe
+++ b/recipes/mediapart.recipe
@@ -1,10 +1,10 @@
 __license__   = 'GPL v3'
-__copyright__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf.fr>'
+__copyright__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf dot fr>'
 '''
 Mediapart
 '''
 
-__author__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf.fr>'
+__author__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf dot fr>'
 
 import re
 from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
@@ -29,19 +29,26 @@ class Mediapart(BasicNewsRecipe):
         ('Les articles', 'http://www.mediapart.fr/articles/feed'),
     ]
 
-# -- print-version
+# -- full-page-version
 
-    conversion_options = { 'smarten_punctuation' : True }
+    conversion_options = {'smarten_punctuation' : True}
 
-    remove_tags = [ dict(name='div', attrs={'class':'print-source_url'}) ]
+    keep_only_tags = [
+        dict(name='div', attrs={'class':'col-left fractal-desktop fractal-10-desktop collapse-7-desktop fractal-tablet fractal-6-tablet collapse-4-tablet'}),
+        dict(name='div', attrs={'id':'pageFirstContent'})
+    ]
+    remove_tags = [
+        dict(name='div', attrs={'id':'lire-aussi'}),
+        dict(name='div', attrs={'class':'col-right-content'})
+    ]
 
     def print_version(self, url):
         raw = self.browser.open(url).read()
         soup = BeautifulSoup(raw.decode('utf8', 'replace'))
-        link = soup.find('a', {'href':re.compile('^/print/[0-9]+')})
+        link = soup.find('a', {'href':re.compile('^.*?onglet=full$')})
         if link is None:
             return None
-        return 'http://www.mediapart.fr' + link['href']
+        return link['href']
 
 # -- Handle login
 
@@ -62,3 +69,4 @@ class Mediapart(BasicNewsRecipe):
             legend.insert(0, Tag(soup, 'br', []))
             legend.name = 'small'
         return soup
+

From 3bd18463700b2124cd5f7be75c4bc856b3695434 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 18:47:14 +0530
Subject: [PATCH 0348/1154] Driver for Surtab Ventos

Fixes #1204885 [Trekstor Surftab not recognized](https://bugs.launchpad.net/calibre/+bug/1204885)
---
 src/calibre/devices/android/driver.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index a0eb021289..055fd32f88 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -55,7 +55,10 @@ class ANDROID(USBMS):
             0x040d : {0x8510 : [0x0001], 0x0851 : [0x1]},
 
             # Trekstor
-            0x1e68 : {0x006a : [0x0231]},
+            0x1e68 : {
+                0x006a : [0x0231],
+                0x0062 : [0x222],  # Surftab ventos https://bugs.launchpad.net/bugs/1204885
+            },
 
             # Motorola
             0x22b8 : {0x41d9 : [0x216], 0x2d61 : [0x100], 0x2d67 : [0x100],
@@ -220,7 +223,9 @@ class ANDROID(USBMS):
             'POCKET', 'ONDA_MID', 'ZENITHIN', 'INGENIC', 'PMID701C', 'PD',
             'PMP5097C', 'MASS', 'NOVO7', 'ZEKI', 'COBY', 'SXZ', 'USB_2.0',
             'COBY_MID', 'VS', 'AINOL', 'TOPWISE', 'PAD703', 'NEXT8D12',
-            'MEDIATEK', 'KEENHI', 'TECLAST', 'SURFTAB', 'XENTA', 'OBREEY_S']
+            'MEDIATEK', 'KEENHI', 'TECLAST', 'SURFTAB', 'XENTA', 'OBREEY_S',
+            'SURFTAB_',
+    ]
     WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'A953', 'INC.NEXUS_ONE',
             '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897',
             'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID',
@@ -242,7 +247,7 @@ class ANDROID(USBMS):
             'S5830I_CARD', 'MID7042', 'LINK-CREATE', '7035', 'VIEWPAD_7E',
             'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS',
             'ICS', 'E400', '__FILE-STOR_GADG', 'ST80208-1', 'GT-S5660M_CARD', 'XT894', '_USB',
-            'PROD_TAB13-201', 'URFPAD2', 'MID1126',
+            'PROD_TAB13-201', 'URFPAD2', 'MID1126', 'ST10216-1',
     ]
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
@@ -256,6 +261,7 @@ class ANDROID(USBMS):
             'USB_FLASH_DRIVER', 'ANDROID', 'MID7042', '7035', 'VIEWPAD_7E',
             'NOVO7', 'ADVANCED', 'TABLET_PC', 'F', 'E400_SD_CARD', 'ST80208-1', 'XT894',
             '_USB', 'PROD_TAB13-201', 'URFPAD2', 'MID1126', 'ANDROID_PLATFORM',
+            'ST10216-1',
     ]
 
     OSX_MAIN_MEM = 'Android Device Main Memory'

From d7c8bfa91692c6b3e95d0e679c1617dd0003a518 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jul 2013 20:58:59 +0530
Subject: [PATCH 0349/1154] No names, No jackets by Armin Geller

---
 recipes/no_names_no_jackets.recipe | 57 ++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 recipes/no_names_no_jackets.recipe

diff --git a/recipes/no_names_no_jackets.recipe b/recipes/no_names_no_jackets.recipe
new file mode 100644
index 0000000000..672a913270
--- /dev/null
+++ b/recipes/no_names_no_jackets.recipe
@@ -0,0 +1,57 @@
+#
+# Written:      July 2013
+# Last Edited:  2013-07-25
+# Version:      1.0
+# Last update:  2013-07-25
+#
+
+__license__   = 'GPL v3'
+__copyright__ = '2013, Armin Geller'
+
+'''
+Fetch blindenbuch.de
+'''
+
+from calibre.web.feeds.recipes import BasicNewsRecipe
+class AdvancedUserRecipe1303841067(BasicNewsRecipe):
+
+    title                 = u'No Names, No Jackets'
+    __author__            = 'Armin Geller'  # AGe 2013-07-25
+    description           = u'One chapter. Just the writing. Discover something new.'
+    publisher             = 'nonamesnojackets.com/'
+    publication_type      = 'ebook news'
+    tags                  = 'Books, Literature, E-Books, US'
+    timefmt               = ' [%a, %d %b %Y]'
+    publication_type      = 'Feed'
+    language              = 'en'
+    encoding              = 'utf-8'
+
+    oldest_article        = 14
+    max_articles_per_feed = 100
+
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_javascript     = True
+
+    conversion_options    = {'title'       : title,
+                              'comments'    : description,
+                              'tags'        : tags,
+                              'language'    : language,
+                              'publisher'   : publisher,
+                              'authors'     : publisher,
+                             }
+
+#    cover_url = ''
+#    masthead_url = ''
+
+    extra_css = '''
+                    h1,h2 {font-weight:bold;font-size:large;}
+                    .entry-meta {font-size: 1em;text-align: left; font-style: italic}
+                '''
+
+    keep_only_tags    = [
+                          dict(name='article')
+                        ]
+
+    feeds          = [(u'No Names, No Jackets', u'http://www.nonamesnojackets.com/feed/')]
+

From bc2220a26e1ec3e162bdc3f21ca95734f341a681 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 26 Jul 2013 09:25:58 +0530
Subject: [PATCH 0350/1154] Blindbuch by Armin Geller

---
 recipes/blind_buch_de.recipe | 63 ++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 recipes/blind_buch_de.recipe

diff --git a/recipes/blind_buch_de.recipe b/recipes/blind_buch_de.recipe
new file mode 100644
index 0000000000..9ec24fb5d2
--- /dev/null
+++ b/recipes/blind_buch_de.recipe
@@ -0,0 +1,63 @@
+#
+# Written:      July 2013
+# Last Edited:  2013-07-11
+# Version:      1.0
+# Last update:  2013-07-25
+#
+
+__license__   = 'GPL v3'
+__copyright__ = '2013, Armin Geller'
+
+'''
+Fetch blindenbuch.de
+'''
+
+from calibre.web.feeds.recipes import BasicNewsRecipe
+class AdvancedUserRecipe1303841067(BasicNewsRecipe):
+
+    title                 = u'Blindbuch - Bücher neu entdecken'
+    __author__            = 'Armin Geller'  # AGe 2013-07-11
+    description           = u'Bücher blind präsentiert'
+    publisher             = 'blindbuch.de'
+    publication_type      = 'ebook news'
+    tags                  = 'Bücher, Literatur, E-Books, Germany'
+    timefmt               = ' [%a, %d %b %Y]'
+    publication_type      = 'Feed'
+    language              = 'de-DE'
+    encoding              = 'utf-8'
+
+    oldest_article        = 14
+    max_articles_per_feed = 100
+
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_javascript     = True
+
+    conversion_options    = {'title'       : title,
+                              'comments'    : description,
+                              'tags'        : tags,
+                              'language'    : language,
+                              'publisher'   : publisher,
+                              'authors'     : publisher,
+                             }
+
+    cover_url             = 'http://blindbuch.de/img/blindbuch_calibre.png'
+    masthead_url          = 'http://www.blindbuch.de/img/Masterhead.JPG'
+
+    extra_css = '''
+                    h1{font-weight:bold;font-size:large;}
+                    .post-meta {font-size: 1em;text-align: left; font-style: italic}
+                '''
+
+    keep_only_tags = [
+                       dict(name='article')
+                     ]
+
+    remove_tags = [
+                    dict(name='div', attrs={'class':['su-spoiler su-spoiler-style-1','post-comments comments',]}),
+                    dict(name='span', attrs={'class':['post-comments comments',]}),
+                    dict(name='div', attrs={'addthis':['title',]}),
+                  ]
+
+    feeds = [(u'Blindbuch', u'http://www.blindbuch.de/feed/')]
+

From 76b3c38e035f0bac2cad88ba996aba555bb3c808 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 26 Jul 2013 10:47:56 +0530
Subject: [PATCH 0351/1154] Document the danger of using parse_css in the
 polish books container

---
 src/calibre/ebooks/oeb/polish/container.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 63230b899b..6cd9e47b5b 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -202,6 +202,9 @@ class Container(object):
         return data
 
     def parse_css(self, data, fname):
+        ''' WARNING: This modifies the CSS tripping out @page rules, comments
+        etc. If you wish to write back the css, you should override the
+        css_preprocessor with a dummy one. '''
         from cssutils import CSSParser, log
         log.setLevel(logging.WARN)
         log.raiseExceptions = False

From ed1d8a30c307bcf0f64a2271dc231f23914aab5b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 26 Jul 2013 11:52:17 +0530
Subject: [PATCH 0352/1154] Polish books: Fix @page rules being removed

Book polishing: Fix page margins being removed if an unused font was
found during subsetting of embedded fonts.
---
 src/calibre/ebooks/oeb/polish/container.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 6cd9e47b5b..6fb8fcb4dd 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -21,7 +21,7 @@ from calibre.customize.ui import (plugin_for_input_format,
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre.ebooks.conversion.plugins.epub_input import (
     ADOBE_OBFUSCATION, IDPF_OBFUSCATION, decrypt_font)
-from calibre.ebooks.conversion.preprocess import HTMLPreProcessor, CSSPreProcessor
+from calibre.ebooks.conversion.preprocess import HTMLPreProcessor, CSSPreProcessor as cssp
 from calibre.ebooks.mobi import MobiError
 from calibre.ebooks.mobi.reader.headers import MetadataHeader
 from calibre.ebooks.mobi.tweak import set_cover
@@ -42,6 +42,11 @@ def guess_type(x):
 OEB_FONTS = {guess_type('a.ttf'), guess_type('b.ttf')}
 OPF_NAMESPACES = {'opf':OPF2_NS, 'dc':DC11_NS}
 
+class CSSPreProcessor(cssp):
+
+    def __call__(self, data):
+        return self.MS_PAT.sub(self.ms_sub, data)
+
 class Container(object):
 
     '''
@@ -202,14 +207,11 @@ class Container(object):
         return data
 
     def parse_css(self, data, fname):
-        ''' WARNING: This modifies the CSS tripping out @page rules, comments
-        etc. If you wish to write back the css, you should override the
-        css_preprocessor with a dummy one. '''
         from cssutils import CSSParser, log
         log.setLevel(logging.WARN)
         log.raiseExceptions = False
         data = self.decode(data)
-        data = self.css_preprocessor(data, add_namespace=False)
+        data = self.css_preprocessor(data)
         parser = CSSParser(loglevel=logging.WARNING,
                            # We dont care about @import rules
                            fetcher=lambda x: (None, None), log=_css_logger)

From 517250e05e5ed285199dc26e25aa85e9b7ec77e8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 26 Jul 2013 15:23:43 +0530
Subject: [PATCH 0353/1154] Update Spektrum der Wissenschaft

---
 recipes/spektrum.recipe | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/spektrum.recipe b/recipes/spektrum.recipe
index fa60b56560..4ce7a7742b 100644
--- a/recipes/spektrum.recipe
+++ b/recipes/spektrum.recipe
@@ -6,7 +6,7 @@ Fetch RSS-Feeds spektrum.de
 from calibre.web.feeds.recipes import BasicNewsRecipe
 class AdvancedUserRecipe1303841067(BasicNewsRecipe):
     title                 = u'Spektrum der Wissenschaft'
-    __author__            = 'Armin Geller, Bratzzo, Rainer Zenz' # Update Bratzzo & AGE 2012-10-12
+    __author__            = 'Armin Geller, Bratzzo, Rainer Zenz'  # Update AGE 2013-07-26
     description           = u'German  online portal of Spektrum der Wissenschaft'
     publisher             = 'Spektrum der Wissenschaft Verlagsgesellschaft mbH'
     category              = 'science news, Germany'
@@ -20,8 +20,8 @@ class AdvancedUserRecipe1303841067(BasicNewsRecipe):
 
     #conversion_options    = {'base_font_size': 20}
 
-    # cover_url = 'http://upload.wikimedia.org/wikipedia/de/3/3b/Spektrum_der_Wissenschaft_Logo.svg' # old logo
-    cover_url             = 'http://upload.wikimedia.org/wikipedia/de/5/59/Spektrum-cover.jpg' # from Rainer Zenz
+    # cover_url             = 'http://upload.wikimedia.org/wikipedia/de/5/59/Spektrum-cover.jpg' # from Rainer Zenz
+    cover_url             = 'http://www16.zippyshare.com/scaled/52219516/file.html'  # AGE 2013-07-26 new cover location
 
     masthead_url          = 'http://www.spektrum.de/fm/861/spektrum.de.png'
 
@@ -53,5 +53,6 @@ class AdvancedUserRecipe1303841067(BasicNewsRecipe):
 
     remove_tags = [
                     dict(attrs={'id':['recommend-article', 'dossierbox', 'cover', 'toc']}),
-                    dict(attrs={'class':['sidebar-box-full clearfix', 'linktotop' ]}),
+                    dict(attrs={'class':['sidebar-box-full clearfix', 'linktotop']}),
                   ]
+

From c32dc18eb156c63a2b49d65e30375245b997ba32 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 26 Jul 2013 16:52:53 +0530
Subject: [PATCH 0354/1154] McAfee have fixed their SiteAdvisor rating

---
 manual/faq.rst | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index 46d675da13..e5a6342cf8 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -840,19 +840,6 @@ If you still cannot get the installer to work and you are on windows, you can us
 My antivirus program claims |app| is a virus/trojan?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note :: 
-    As of July, 2013 McAfee Site Advisor has started warning that
-    http://calibre-ebook.com is unsafe, with no stated reason or justification.
-    McAfee is wrong, the mistake has been reported to them, by several people,
-    but they have not corrected it. McAfee SiteAdvisor is a notoriously
-    unreliable service, see for example
-    `this page <http://www.naturalnews.com/041170_McAfee_Site_Advisor_false_information.html>`_ or
-    `this page <http://www.snapfiles.com/siteadvisor.html>`_ or
-    `this Wikipedia entry <http://en.wikipedia.org/wiki/McAfee_SiteAdvisor#Criticism>`_.
-    We strongly urge you to stop using McAfee products, find a more competent security provider
-    to give your business to.
-    Instructions on how to `uninstall McAfee SiteAdvisor <http://service.mcafee.com/faqdocument.aspx?id=TS100162>`_.
-
 The first thing to check is that you are downloading |app| from the official
 website: `<http://calibre-ebook.com/download>`_. |app| is a very popular program
 and unscrupulous people try to setup websites offering it for download to fool

From 0ca5ffc49f1432d95ba5519f5b6e457c2dc24f5b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 26 Jul 2013 21:36:18 +0530
Subject: [PATCH 0355/1154] Content server: Fix search query not being fully
 sanitized in results page

Fixes #1205385 [Private bug](https://bugs.launchpad.net/calibre/+bug/1205385)
---
 src/calibre/library/server/browse.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index bffeb33829..ef6b8f3f3c 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -291,7 +291,7 @@ class BrowseServer(object):
             lp = force_unicode(lp, filesystem_encoding)
         ans = ans.replace('{library_name}', xml(os.path.basename(lp)))
         ans = ans.replace('{library_path}', xml(lp, True))
-        ans = ans.replace('{initial_search}', initial_search)
+        ans = ans.replace('{initial_search}', xml(initial_search, attribute=True))
         return ans
 
     @property

From 2a0f6bbeaea9a16b5b1c207cea3ef35afbe00b0b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 27 Jul 2013 07:42:51 +0530
Subject: [PATCH 0356/1154] Update Something Awful

---
 recipes/something_awful.recipe | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/recipes/something_awful.recipe b/recipes/something_awful.recipe
index 006cfdc9b2..636d306a6d 100644
--- a/recipes/something_awful.recipe
+++ b/recipes/something_awful.recipe
@@ -1,4 +1,3 @@
-import re
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class SomethingAwfulRecipe(BasicNewsRecipe):
@@ -6,8 +5,7 @@ class SomethingAwfulRecipe(BasicNewsRecipe):
     __author__ = 'atordo'
     description = 'The Internet Makes You Stupid'
     cover_url = 'http://i.somethingawful.com/core/head-logo-bluegren.png'
-    masthead_url = 'http://i.somethingawful.com/core/head-logo-bluegren.png'
-    oldest_article = 7
+    oldest_article = 15
     max_articles_per_feed = 50
     auto_cleanup = False
     no_stylesheets = True
@@ -16,27 +14,21 @@ class SomethingAwfulRecipe(BasicNewsRecipe):
     use_embedded_content  = False
     remove_empty_feeds = True
     publication_type = 'magazine'
+    reverse_article_order = True
 
     recursions = 1
-    match_regexps = [r'\?page=\d+$']
+    match_regexps = [r'^http://www.somethingawful.com/.+/.+/\d{1,2}/$']
 
-    preprocess_regexps = [
-        (re.compile(r'<!-- content end-->.*</body>', re.DOTALL), lambda match: '</body>')
-    ]
-
-    remove_attributes = [ 'align', 'alt', 'valign' ]
+    remove_attributes = ['align', 'alt', 'valign']
 
     keep_only_tags = [
-        dict(name='div', attrs={'class':'content_area'})
-#       ,dict(name='p', attrs={'class':'pagebar'})
-    ]
-    remove_tags = [
-        dict(name='div', attrs={'class':['column_box','featurenav','social']})
-       ,dict(name='div', attrs={'id':'sidebar'})
-       ,dict(name='a', attrs={'class':'curpage'})
+        dict(name='div', attrs={'class':'article_head'})
+       ,dict(name='div', attrs={'class':'organ article'})
+       ,dict(name='ul', attrs={'class':'pager'})
     ]
 
     extra_css = '''
+        .author{font-size:small} .date{font-size:small}
         .byline{font-size:small} .font_big{font-size:large}
         .compat5{font-weight:bold} .accentbox{background-color:#E3E3E3; border:solid black}
         img{margin-bottom:0.4em; display:block; margin-left: auto; margin-right:auto}
@@ -53,7 +45,7 @@ class SomethingAwfulRecipe(BasicNewsRecipe):
         ,('The Great Goon Database', 'http://www.somethingawful.com/rss/great-goon-database.rss.xml')
         ,('Livejournal Theater', 'http://www.somethingawful.com/rss/livejournal-theater.rss.xml')
         ,('Joystick Token Healthpack', 'http://www.somethingawful.com/rss/token-healthpack.rss.xml')
-        #,('Webcam Ward', 'http://www.somethingawful.com/rss/webcam-ward.rss.xml')
+        ,('Webcam Ward', 'http://www.somethingawful.com/rss/webcam-ward.rss.xml')
         ,('Features / Articles', 'http://www.somethingawful.com/rss/feature-articles.rss.xml')
         ,('Guides', 'http://www.somethingawful.com/rss/guides.rss.xml')
         ,('Legal Threats', 'http://www.somethingawful.com/rss/legal-threats.rss.xml')
@@ -77,6 +69,7 @@ class SomethingAwfulRecipe(BasicNewsRecipe):
         ,('Johnston Checks In', 'http://www.somethingawful.com/rss/levi-johnston.rss.xml')
         ,('Twitter Tuesday', 'http://www.somethingawful.com/rss/twitter-tuesday.rss.xml')
         ,('Music Article', 'http://www.somethingawful.com/rss/music-article.rss.xml')
+        ,('The Everdraed Showcase', 'http://www.somethingawful.com/rss/everdraed-showcase.xml')
         ,('Reviews [Games]', 'http://www.somethingawful.com/rss/game-reviews.rss.xml')
         ,('Reviews [Movies]', 'http://www.somethingawful.com/rss/movie-reviews.rss.xml')
         ,('Rom Pit', 'http://www.somethingawful.com/rss/rom-pit.rss.xml')
@@ -92,4 +85,6 @@ class SomethingAwfulRecipe(BasicNewsRecipe):
         ,('Garbage Day', 'http://www.somethingawful.com/rss/garbage-day.rss.xml')
         ,('WTF, D&D!?', 'http://www.somethingawful.com/rss/dungeons-and-dragons.rss.xml')
         ,('Current Releases', 'http://www.somethingawful.com/rss/current-movie-reviews.rss.xml')
+        ,('Awful Things for Sale', 'http://www.somethingawful.com/rss/awful-things-sale.xml')
     ]
+

From 6afb55fdfb0a56d17fbddf2904e5d7094aa20ac3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 27 Jul 2013 08:09:26 +0530
Subject: [PATCH 0357/1154] DOCX Input: Fix conversion breaking for files that
 use heading style paragraphs to insert line rules

---
 src/calibre/ebooks/docx/cleanup.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/calibre/ebooks/docx/cleanup.py b/src/calibre/ebooks/docx/cleanup.py
index 10bfd9a78f..33f869faca 100644
--- a/src/calibre/ebooks/docx/cleanup.py
+++ b/src/calibre/ebooks/docx/cleanup.py
@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os
 
-from calibre.ebooks.docx.names import ancestor
+from calibre.ebooks.docx.names import XPath
 
 def mergeable(previous, current):
     if previous.tail or current.tail:
@@ -100,14 +100,17 @@ def before_count(root, tag, limit=10):
 
 def cleanup_markup(log, root, styles, dest_dir, detect_cover):
     # Move <hr>s outside paragraphs, if possible.
+    pancestor = XPath('|'.join('ancestor::%s[1]' % x for x in ('p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6')))
     for hr in root.xpath('//span/hr'):
-        p = ancestor(hr, 'p')
-        descendants = tuple(p.iterdescendants())
-        if descendants[-1] is hr:
-            parent = p.getparent()
-            idx = parent.index(p)
-            parent.insert(idx+1, hr)
-            hr.tail = '\n\t'
+        p = pancestor(hr)
+        if p:
+            p = p[0]
+            descendants = tuple(p.iterdescendants())
+            if descendants[-1] is hr:
+                parent = p.getparent()
+                idx = parent.index(p)
+                parent.insert(idx+1, hr)
+                hr.tail = '\n\t'
 
     # Merge consecutive spans that have the same styling
     current_run = []
@@ -176,5 +179,3 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
                     img.getparent().remove(img)
                     return path
 
-
-

From 9386518ff78207b9635161a64f17a251fac4dcf6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 27 Jul 2013 08:45:40 +0530
Subject: [PATCH 0358/1154] version 0.9.41

---
 Changelog.yaml           | 41 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 2cbe422226..b379e92416 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,47 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.41
+  date: 2013-07-27
+
+  new features:
+    - title: "Add a button to clear the current virtual library easily"
+
+    - title: "Driver for Surftab Ventos"
+      tickets: [1204885]
+
+    - title: "Ebook-viewer: Allow re-ordering bookmarks in the bookmarks manager by drag and drop."
+ 
+  bug fixes:
+    - title: "DOCX Input: Fix conversion breaking for files that use heading style paragraphs to insert line rules"
+
+    - title: "Content server: Fix last search query not being fully sanitized in results page"
+      tickets: [1205385]
+
+    - title: "Book polishing: Fix page margins being removed if an unused font was found during subsetting of embedded fonts."
+
+    - title: "PDF Output: Do not error out when the input document uses a font that cannot be subset, such as the Symbol font. Instead print a warning and embed the full font."
+      tickets: [1203449]
+
+    - title: "Conversion: Fix a regression in the last release that broke conversion of a few files with comments just before a chapter start."
+      tickets: [1188635]
+
+  improved recipes:
+    - Something Awful
+    - Spektrum der Wissenschaft
+    - mediapart.fr
+    - Dilbert 
+    - Antyweb
+    - Scientific American
+    - taz.de (RSS)
+
+  new recipes:
+    - title: Blindbuch and No names, No jackets
+      author: Armin Geller
+
+    - title: El Tribuno Salta and Jujuy 
+      author: Darko Miletic
+
 - version: 0.9.40
   date: 2013-07-19
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 1e0b2a1a83..d161a85b3c 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 40)
+numeric_version = (0, 9, 41)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 748eb921c5294e5f3a2558f968d7684fed0e1d5c Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 27 Jul 2013 10:32:49 +0200
Subject: [PATCH 0359/1154] Prevent exception when deleting a non-existent
 book.

---
 src/calibre/library/caches.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index e552ead591..022ba9402e 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -920,7 +920,8 @@ class ResultCache(SearchQueryParser):  # {{{
 
     def remove(self, id):
         try:
-            self._uuid_map.pop(self._data[id][self._uuid_column_index], None)
+            if self._data[id] is not None:
+                self._uuid_map.pop(self._data[id][self._uuid_column_index], None)
         except IndexError:
             pass  # id is out of bounds -- no uuid in the map to remove
         try:

From d47603bdacfe7fc92b552de59e763b52ef800cb8 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 27 Jul 2013 10:33:14 +0200
Subject: [PATCH 0360/1154] Allow an empty field specifier in calibredb,
 permitting one to get a list of ids

---
 src/calibre/library/cli.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 012d88dace..a6ecca3721 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -199,15 +199,18 @@ def command_list(args, dbpath):
             afields.add('*'+f)
             if data['datatype'] == 'series':
                 afields.add('*'+f+'_index')
-    fields = [str(f.strip().lower()) for f in opts.fields.split(',')]
-    if 'all' in fields:
-        fields = sorted(list(afields))
-    if not set(fields).issubset(afields):
-        parser.print_help()
-        print
-        prints(_('Invalid fields. Available fields:'),
-                ','.join(sorted(afields)), file=sys.stderr)
-        return 1
+    if opts.fields.strip():
+        fields = [str(f.strip().lower()) for f in opts.fields.split(',')]
+        if 'all' in fields:
+            fields = sorted(list(afields))
+        if not set(fields).issubset(afields):
+            parser.print_help()
+            print
+            prints(_('Invalid fields. Available fields:'),
+                    ','.join(sorted(afields)), file=sys.stderr)
+            return 1
+    else:
+        fields = []
 
     if not opts.sort_by in afields and opts.sort_by is not None:
         parser.print_help()

From 7f3b6c1f7d30f2183298af23f4fb0ac36b9e3b1d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Jul 2013 09:34:58 +0530
Subject: [PATCH 0361/1154] MOBI metadata: Handle cover/thumbnail exth fields
 with null pointers

MOBI metadata: Do not fail to set metadata in MOBI files if they have
EXTH fields with NULL pointers to a cover or thumbnail. Fixes #1205757 [Metadata edits not sticking](https://bugs.launchpad.net/calibre/+bug/1205757)
---
 src/calibre/ebooks/metadata/mobi.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/metadata/mobi.py b/src/calibre/ebooks/metadata/mobi.py
index 7ad9a01962..ac675b1d84 100644
--- a/src/calibre/ebooks/metadata/mobi.py
+++ b/src/calibre/ebooks/metadata/mobi.py
@@ -169,10 +169,11 @@ class MetadataUpdater(object):
                 self.timestamp = content
             elif id == 201:
                 rindex, = self.cover_rindex, = unpack('>I', content)
-                self.cover_record = self.record(rindex + image_base)
+                if rindex != 0xffffffff:
+                    self.cover_record = self.record(rindex + image_base)
             elif id == 202:
                 rindex, = self.thumbnail_rindex, = unpack('>I', content)
-                if rindex > 0 :
+                if rindex > 0 and rindex != 0xffffffff:
                     self.thumbnail_record = self.record(rindex + image_base)
 
     def patch(self, off, new_record0):

From fac9845f90d65dda0c58209a261d6d6199f5171d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Jul 2013 09:35:53 +0530
Subject: [PATCH 0362/1154] pep8

---
 src/calibre/ebooks/metadata/mobi.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/calibre/ebooks/metadata/mobi.py b/src/calibre/ebooks/metadata/mobi.py
index ac675b1d84..5b45722383 100644
--- a/src/calibre/ebooks/metadata/mobi.py
+++ b/src/calibre/ebooks/metadata/mobi.py
@@ -265,7 +265,7 @@ class MetadataUpdater(object):
 
         # Pad to a 4-byte boundary
         trail = len(new_record0.getvalue()) % 4
-        pad = '\0' * (4 - trail) # Always pad w/ at least 1 byte
+        pad = '\0' * (4 - trail)  # Always pad w/ at least 1 byte
         new_record0.write(pad)
         new_record0.write('\0'*(1024*8))
 
@@ -278,7 +278,8 @@ class MetadataUpdater(object):
     def hexdump(self, src, length=16):
         # Diagnostic
         FILTER=''.join([(len(repr(chr(x)))==3) and chr(x) or '.' for x in range(256)])
-        N=0; result=''
+        N=0
+        result=''
         while src:
             s,src = src[:length],src[length:]
             hexa = ' '.join(["%02X"%ord(x) for x in s])
@@ -292,7 +293,7 @@ class MetadataUpdater(object):
         for i in xrange(self.nrecs):
             offset, a1,a2,a3,a4 = unpack('>LBBBB', self.data[78+i*8:78+i*8+8])
             flags, val = a1, a2<<16|a3<<8|a4
-            pdbrecords.append( [offset, flags, val] )
+            pdbrecords.append([offset, flags, val])
         return pdbrecords
 
     def update_pdbrecords(self, updated_pdbrecords):
@@ -422,7 +423,7 @@ class MetadataUpdater(object):
             exth.write(data)
         exth = exth.getvalue()
         trail = len(exth) % 4
-        pad = '\0' * (4 - trail) # Always pad w/ at least 1 byte
+        pad = '\0' * (4 - trail)  # Always pad w/ at least 1 byte
         exth = ['EXTH', pack('>II', len(exth) + 12, len(recs)), exth, pad]
         exth = ''.join(exth)
 
@@ -474,7 +475,6 @@ def get_metadata(stream):
     except ImportError:
         import Image as PILImage
 
-
     stream.seek(0)
     try:
         raw = stream.read(3)
@@ -530,5 +530,3 @@ def get_metadata(stream):
         im.convert('RGB').save(obuf, format='JPEG')
         mi.cover_data = ('jpg', obuf.getvalue())
     return mi
-
-

From f8ad733e2593d7058a500fe3ca10270c372a9d9d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Jul 2013 09:44:45 +0530
Subject: [PATCH 0363/1154] calibredb: Add a new clone command

calibredb: Add a new clone command to create clones of libraries with
the same custom columns, virtual libraries, etc. as the current library.
---
 src/calibre/library/cli.py | 49 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index a6ecca3721..37a690632d 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -11,7 +11,8 @@ import sys, os, cStringIO, re
 import unicodedata
 from textwrap import TextWrapper
 
-from calibre import preferred_encoding, prints, isbytestring
+from calibre import preferred_encoding, prints, isbytestring, patheq
+from calibre.constants import iswindows
 from calibre.utils.config import OptionParser, prefs, tweaks
 from calibre.ebooks.metadata.meta import get_metadata
 from calibre.ebooks.metadata.book.base import field_from_string
@@ -1389,12 +1390,55 @@ def command_list_categories(args, dbpath):
     else:
         do_list()
 
+    return parser
+
+def command_clone(args, dbpath):
+    parser = get_parser(_(
+    '''\
+%prog clone path/to/new/library
+
+Create a clone of the current library. This creates a new, empty library that has all the
+same custom columns, virtual libraries and other settings as the current library.
+
+The cloned library will contain no books. If you want to create a full duplicate, including
+all books, then simply use your filesystem tools to copy the library folder.
+    '''))
+    opts, args = parser.parse_args(args)
+    if len(args) < 1:
+        parser.print_help()
+        print
+        prints(_('Error: You must specify the path to the cloned library'))
+        return 1
+    db = get_db(dbpath, opts)
+    loc = args[0]
+    if not os.path.exists(loc):
+        os.makedirs(loc)
+    loc = os.path.abspath(loc)
+
+    if patheq(loc, db.library_path):
+        prints(_('The location for the new library is the same as the current library'))
+        return 1
+    empty = not os.listdir(loc)
+    if not empty:
+        prints(_('%s is not empty. You must choose an empty directory for the new library.') % loc)
+        return 1
+    from calibre.db import get_db_loader
+    LibraryDatabase = get_db_loader()[0]
+    if iswindows and len(loc) > LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT:
+        prints(_('Path to library too long. Must be less than'
+                    ' %d characters.')%LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT)
+        return 1
+    dbprefs = dict(db.prefs)
+    db.close()
+    LibraryDatabase(loc, default_prefs=dbprefs)
+
 
 COMMANDS = ('list', 'add', 'remove', 'add_format', 'remove_format',
             'show_metadata', 'set_metadata', 'export', 'catalog',
             'saved_searches', 'add_custom_column', 'custom_columns',
             'remove_custom_column', 'set_custom', 'restore_database',
-            'check_library', 'list_categories', 'backup_metadata')
+            'check_library', 'list_categories', 'backup_metadata',
+            'clone')
 
 
 def option_parser():
@@ -1432,3 +1476,4 @@ def main(args=sys.argv):
 
 if __name__ == '__main__':
     sys.exit(main())
+

From 49c82ededa935326f84b9164ed7b5a0795eb6d0c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Jul 2013 11:30:41 +0530
Subject: [PATCH 0364/1154] Add has_id() to db.data in the new backend

Also speed up has_id() and all_book_ids()
---
 src/calibre/db/cache.py  | 6 +++++-
 src/calibre/db/legacy.py | 4 ++--
 src/calibre/db/view.py   | 9 ++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d5e6bb25aa..0be9f9f9ef 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -401,7 +401,7 @@ class Cache(object):
         '''
         Frozen set of all known book ids.
         '''
-        return type(self.fields['uuid'])
+        return type(self.fields['uuid'].table.book_col_map)
 
     @read_api
     def all_field_ids(self, name):
@@ -1236,6 +1236,10 @@ class Cache(object):
                     return True
         return False
 
+    @read_api
+    def has_id(self, book_id):
+        return book_id in self.fields['title'].table.book_col_map
+
     @write_api
     def create_book_entry(self, mi, cover=None, add_duplicates=True, force_id=None, apply_import_tags=True, preserve_uuid=False):
         if mi.tags:
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 3da725fe7e..bd595fb36f 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -143,7 +143,7 @@ class LibraryDatabase(object):
         self.data.cache.initialize_template_cache()
 
     def all_ids(self):
-        for book_id in self.data.cache.all_book_ids():
+        for book_id in self.new_api.all_book_ids():
             yield book_id
 
     def is_empty(self):
@@ -510,7 +510,7 @@ class LibraryDatabase(object):
                 self.new_api._remove_items('tags', tag_ids)
 
     def has_id(self, book_id):
-        return book_id in self.new_api.all_book_ids()
+        return self.new_api.has_id(book_id)
 
     def format(self, index, fmt, index_is_id=False, as_file=False, mode='r+b', as_path=False, preserve_filename=False):
         book_id = index if index_is_id else self.id(index)
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index f679fc2416..7468ec11b2 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -135,10 +135,13 @@ class View(object):
         return self.cache.field_metadata
 
     def _get_id(self, idx, index_is_id=True):
-        if index_is_id and idx not in self.cache.all_book_ids():
+        if index_is_id and not self.cache.has_id(idx):
             raise IndexError('No book with id %s present'%idx)
         return idx if index_is_id else self.index_to_id(idx)
 
+    def has_id(self, book_id):
+        return self.cache.has_id(book_id)
+
     def __getitem__(self, row):
         return TableRow(self._map_filtered[row], self)
 
@@ -177,7 +180,7 @@ class View(object):
 
     def _get(self, field, idx, index_is_id=True, default_value=None, fmt=lambda x:x):
         id_ = idx if index_is_id else self.index_to_id(idx)
-        if index_is_id and id_ not in self.cache.all_book_ids():
+        if index_is_id and not self.cache.has_id(id_):
             raise IndexError('No book with id %s present'%idx)
         return fmt(self.cache.field_for(field, id_, default_value=default_value))
 
@@ -323,7 +326,7 @@ class View(object):
         self.cache.clear_search_caches(old_marked_ids | set(self.marked_ids))
 
     def refresh(self, field=None, ascending=True, clear_caches=True):
-        self._map = tuple(self.cache.all_book_ids())
+        self._map = tuple(sorted(self.cache.all_book_ids()))
         self._map_filtered = tuple(self._map)
         if clear_caches:
             self.cache.clear_caches()

From 4d90d171923a62dd1b2e4128d0af77c2af5e93c7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Jul 2013 11:33:24 +0530
Subject: [PATCH 0365/1154] Fix test failures caused by removal of virtual
 fields from get_metadata

---
 src/calibre/db/tests/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index dd87ab1583..7a44897600 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -95,7 +95,7 @@ class BaseTest(unittest.TestCase):
                     'ondevice_col', 'last_modified', 'has_cover',
                     'cover_data'}.union(allfk1)
         for attr in all_keys:
-            if attr == 'user_metadata' or attr in exclude:
+            if attr in {'user_metadata', 'book_size', 'ondevice_col', 'db_approx_formats'} or attr in exclude:
                 continue
             attr1, attr2 = getattr(mi1, attr), getattr(mi2, attr)
             if attr == 'formats':

From 0b032222865ef10a6982dfffb723bdd386177837 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Jul 2013 16:41:55 +0530
Subject: [PATCH 0366/1154] ...

---
 manual/customize.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manual/customize.rst b/manual/customize.rst
index 59475e91f2..5dde2b226d 100644
--- a/manual/customize.rst
+++ b/manual/customize.rst
@@ -34,6 +34,8 @@ Environment variables
     * ``SYSFS_PATH`` - Use if sysfs is mounted somewhere other than /sys
     * ``http_proxy`` - Used on linux to specify an HTTP proxy
 
+See `How to set environment variables in windows <http://www.computerhope.com/issues/ch000549.htm>`_.
+
 Tweaks
 ------------
 

From 0356894fca6f2b680e1c39067960fdee8d47476b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 08:35:34 +0530
Subject: [PATCH 0367/1154] Fix apsw not included in linux binary builds

---
 setup/installer/linux/freeze2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index 6167109d97..184d7229e8 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -16,7 +16,7 @@ SITE_PACKAGES = ['PIL', 'dateutil', 'dns', 'PyQt4', 'mechanize',
         'sip.so', 'BeautifulSoup.py', 'cssutils', 'encutils', 'lxml',
         'sipconfig.py', 'xdg', 'dbus', '_dbus_bindings.so', 'dbus_bindings.py',
         '_dbus_glib_bindings.so', 'netifaces.so', '_psutil_posix.so',
-        '_psutil_linux.so', 'psutil', 'cssselect']
+        '_psutil_linux.so', 'psutil', 'cssselect', 'apsw']
 
 QTDIR          = '/usr/lib/qt4'
 QTDLLS         = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit', 'QtDBus')

From 6cffe0d105843941c0f06a2b968cc08391bde623 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 08:46:49 +0530
Subject: [PATCH 0368/1154] newdb: Fix undefined custom dates not displaying as
 blank, depending on time zone

---
 src/calibre/gui2/library/delegates.py | 24 ++++++++++++------------
 src/calibre/utils/date.py             |  7 ++++++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index ae40352aee..c1b4248c26 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -15,7 +15,7 @@ from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog, rating_font
 from calibre.constants import iswindows
 from calibre.gui2.widgets import EnLineEdit
 from calibre.gui2.complete2 import EditWithComplete
-from calibre.utils.date import now, format_date, qt_to_dt
+from calibre.utils.date import now, format_date, qt_to_dt, is_date_undefined
 from calibre.utils.config import tweaks
 from calibre.utils.formatter import validation_formatter
 from calibre.utils.icu import sort_key
@@ -91,10 +91,10 @@ class DateDelegate(QStyledItemDelegate):  # {{{
             self.format = default_format
 
     def displayText(self, val, locale):
-        d = val.toDateTime()
-        if d <= UNDEFINED_QDATETIME:
+        d = qt_to_dt(val.toDateTime())
+        if is_date_undefined(d):
             return ''
-        return format_date(qt_to_dt(d, as_utc=False), self.format)
+        return format_date(d, self.format)
 
     def createEditor(self, parent, option, index):
         return DateTimeEdit(parent, self.format)
@@ -110,17 +110,17 @@ class PubDateDelegate(QStyledItemDelegate):  # {{{
             self.format = 'MMM yyyy'
 
     def displayText(self, val, locale):
-        d = val.toDateTime()
-        if d <= UNDEFINED_QDATETIME:
+        d = qt_to_dt(val.toDateTime())
+        if is_date_undefined(d):
             return ''
-        return format_date(qt_to_dt(d, as_utc=False), self.format)
+        return format_date(d, self.format)
 
     def createEditor(self, parent, option, index):
         return DateTimeEdit(parent, self.format)
 
     def setEditorData(self, editor, index):
         val = index.data(Qt.EditRole).toDate()
-        if val == UNDEFINED_QDATETIME.date():
+        if is_date_undefined(val):
             val = QDate(2000, 1, 1)
         editor.setDate(val)
 
@@ -234,10 +234,10 @@ class CcDateDelegate(QStyledItemDelegate):  # {{{
             self.format = format
 
     def displayText(self, val, locale):
-        d = val.toDateTime()
-        if d <= UNDEFINED_QDATETIME:
+        d = qt_to_dt(val.toDateTime())
+        if is_date_undefined(d):
             return ''
-        return format_date(qt_to_dt(d, as_utc=False), self.format)
+        return format_date(d, self.format)
 
     def createEditor(self, parent, option, index):
         return DateTimeEdit(parent, self.format)
@@ -253,7 +253,7 @@ class CcDateDelegate(QStyledItemDelegate):  # {{{
 
     def setModelData(self, editor, model, index):
         val = editor.dateTime()
-        if val <= UNDEFINED_QDATETIME:
+        if is_date_undefined(val):
             val = None
         model.setData(index, QVariant(val), Qt.EditRole)
 
diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index 0a8d779af8..dc8adc6b97 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -75,7 +75,12 @@ def is_date_undefined(qt_or_dt):
     if d is None:
         return True
     if hasattr(d, 'toString'):
-        d = datetime(d.year(), d.month(), d.day(), tzinfo=utc_tz)
+        if hasattr(d, 'date'):
+            d = d.date()
+        try:
+            d = datetime(d.year(), d.month(), d.day(), tzinfo=utc_tz)
+        except ValueError:
+            return True  # Undefined QDate
     return d.year < UNDEFINED_DATE.year or (
             d.year == UNDEFINED_DATE.year and
             d.month == UNDEFINED_DATE.month and

From 2831d39da4fc94cb34decb9f2409689e78e64a19 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 12:51:16 +0530
Subject: [PATCH 0369/1154] newdb: Enable sorting on the marked field for the
 find duplicated plugin

---
 src/calibre/db/cache.py         | 11 ++++++++---
 src/calibre/db/tests/reading.py | 11 +++++++++++
 src/calibre/db/view.py          |  5 ++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 0be9f9f9ef..6bd7c1a3cf 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -781,7 +781,7 @@ class Cache(object):
         return ret
 
     @read_api
-    def multisort(self, fields, ids_to_sort=None):
+    def multisort(self, fields, ids_to_sort=None, virtual_fields=None):
         '''
         Return a list of sorted book ids. If ids_to_sort is None, all book ids
         are returned.
@@ -794,6 +794,7 @@ class Cache(object):
                 else ids_to_sort)
         get_metadata = self._get_proxy_metadata
         lang_map = self.fields['languages'].book_value_map
+        virtual_fields = virtual_fields or {}
 
         fm = {'title':'sort', 'authors':'author_sort'}
 
@@ -801,8 +802,12 @@ class Cache(object):
             'Handle series type fields'
             idx = field + '_index'
             is_series = idx in self.fields
-            ans = self.fields[fm.get(field, field)].sort_keys_for_books(
-                get_metadata, lang_map, all_book_ids,)
+            try:
+                ans = self.fields[fm.get(field, field)].sort_keys_for_books(
+                    get_metadata, lang_map, all_book_ids)
+            except KeyError:
+                ans = virtual_fields[fm.get(field, field)].sort_keys_for_books(
+                    get_metadata, lang_map, all_book_ids)
             if is_series:
                 idx_ans = self.fields[idx].sort_keys_for_books(
                     get_metadata, lang_map, all_book_ids)
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 2006348862..66b1dacec4 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -511,3 +511,14 @@ class ReadingTest(BaseTest):
 
     # }}}
 
+    def test_marked_field(self):  # {{{
+        ' Test the marked field '
+        db = self.init_legacy()
+        db.set_marked_ids({3:1, 2:3})
+        ids = [1,2,3]
+        db.multisort([('marked', True)], only_ids=ids)
+        self.assertListEqual([1, 3, 2], ids)
+        db.multisort([('marked', False)], only_ids=ids)
+        self.assertListEqual([2, 3, 1], ids)
+    # }}}
+
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 7468ec11b2..0e8d4081e5 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -30,6 +30,9 @@ class MarkedVirtualField(object):
         for book_id in candidates:
             yield self.marked_ids.get(book_id, default_value), {book_id}
 
+    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
+        return {bid:self.marked_ids.get(bid, None) for bid in all_book_ids}
+
 class TableRow(object):
 
     def __init__(self, book_id, view):
@@ -219,7 +222,7 @@ class View(object):
         if not fields:
             fields = [('timestamp', False)]
 
-        sorted_book_ids = self.cache.multisort(fields, ids_to_sort=only_ids)
+        sorted_book_ids = self.cache.multisort(fields, ids_to_sort=only_ids, virtual_fields={'marked':MarkedVirtualField(self.marked_ids)})
         if only_ids is None:
             self._map = tuple(sorted_book_ids)
             if len(self._map_filtered) == len(self._map):

From c07f612f6b1432ab84dd0eadecbcecb1fd6f8859 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 14:20:38 +0530
Subject: [PATCH 0370/1154] newdb: Do not cache searches that search on virtual
 fields like marked, since there is no safe way to update such a cache.

---
 src/calibre/db/search.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 759b76fdb8..d5a620ba58 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -481,12 +481,17 @@ class Parser(SearchQueryParser):  # {{{
             field = self.dbcache.fields[name]
         except KeyError:
             field = self.virtual_fields[name]
+            self.virtual_field_used = True
         return field.iter_searchable_values(get_metadata, candidates)
 
     def iter_searchable_values(self, *args, **kwargs):
-        for x in []:
+        for x in ():
             yield x, set()
 
+    def parse(self, *args, **kwargs):
+        self.virtual_field_used = False
+        return SearchQueryParser.parse(self, *args, **kwargs)
+
     def get_matches(self, location, query, candidates=None,
                     allow_recursion=True):
         # If candidates is not None, it must not be modified. Changing its
@@ -852,6 +857,8 @@ class Search(object):
             sqp.dbcache = sqp.lookup_saved_search = None
 
     def _do_search(self, sqp, query, search_restriction, dbcache, book_ids=None):
+        ''' Do the search, caching the results. Results are cached only if the
+        search is on the full library and no virtual field is searched on '''
         if isinstance(search_restriction, bytes):
             search_restriction = search_restriction.decode('utf-8')
 
@@ -861,7 +868,7 @@ class Search(object):
             if cached is None:
                 sqp.all_book_ids = all_book_ids if book_ids is None else book_ids
                 restricted_ids = sqp.parse(search_restriction)
-                if sqp.all_book_ids is all_book_ids:
+                if not sqp.virtual_field_used and sqp.all_book_ids is all_book_ids:
                     self.cache.add(search_restriction.strip(), restricted_ids)
             else:
                 restricted_ids = cached
@@ -884,7 +891,7 @@ class Search(object):
         sqp.all_book_ids = restricted_ids
         result = sqp.parse(query)
 
-        if sqp.all_book_ids is all_book_ids:
+        if not sqp.virtual_field_used and sqp.all_book_ids is all_book_ids:
             self.cache.add(query.strip(), result)
 
         return result

From a68fe4409fcee3e189b8d1db1aa810c1a42da47f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 15:41:01 +0530
Subject: [PATCH 0371/1154] Do not search virtual fields on when searching
 'all'

Searching virtual fields (such as marked) ona prefix less search
disables search caching.
---
 src/calibre/db/search.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index d5a620ba58..9eeacc24b5 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -619,7 +619,10 @@ class Parser(SearchQueryParser):  # {{{
             if x.startswith('@'):
                 continue
             if fm['search_terms'] and x != 'series_sort':
-                all_locs.add(x)
+                if x not in self.virtual_fields:
+                    # We dont search virtual fields because if we do, search
+                    # caching will not be used
+                    all_locs.add(x)
                 field_metadata[x] = fm
                 if fm['datatype'] in {'composite', 'text', 'comments', 'series', 'enumeration'}:
                     text_fields.add(x)

From 3490af8df7740172e3ca05fa01fa5fc11214c454 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 15:42:10 +0530
Subject: [PATCH 0372/1154] Ensure that undefined datetimes are always written
 as UNDEFINED_DATE to the db

---
 src/calibre/db/write.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 5b35248353..58c642e59c 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -13,8 +13,8 @@ from datetime import datetime
 
 from calibre.constants import preferred_encoding, ispy3
 from calibre.ebooks.metadata import author_to_author_sort, title_sort
-from calibre.utils.date import (parse_only_date, parse_date, UNDEFINED_DATE,
-                                isoformat)
+from calibre.utils.date import (
+    parse_only_date, parse_date, UNDEFINED_DATE, isoformat, is_date_undefined)
 from calibre.utils.localization import canonicalize_lang
 from calibre.utils.icu import strcmp
 
@@ -67,12 +67,14 @@ def multiple_text(sep, ui_sep, x):
 def adapt_datetime(x):
     if isinstance(x, (unicode, bytes)):
         x = parse_date(x, assume_utc=False, as_utc=False)
+    if x and is_date_undefined(x):
+        x = UNDEFINED_DATE
     return x
 
 def adapt_date(x):
     if isinstance(x, (unicode, bytes)):
         x = parse_only_date(x)
-    if x is None:
+    if x is None or is_date_undefined(x):
         x = UNDEFINED_DATE
     return x
 

From fa4506a0197122b7ef908d8e10522091391778c5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 18:36:21 +0530
Subject: [PATCH 0373/1154] oops

---
 setup/installer/linux/freeze2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index 184d7229e8..deab85b6da 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -16,7 +16,7 @@ SITE_PACKAGES = ['PIL', 'dateutil', 'dns', 'PyQt4', 'mechanize',
         'sip.so', 'BeautifulSoup.py', 'cssutils', 'encutils', 'lxml',
         'sipconfig.py', 'xdg', 'dbus', '_dbus_bindings.so', 'dbus_bindings.py',
         '_dbus_glib_bindings.so', 'netifaces.so', '_psutil_posix.so',
-        '_psutil_linux.so', 'psutil', 'cssselect', 'apsw']
+        '_psutil_linux.so', 'psutil', 'cssselect', 'apsw.so']
 
 QTDIR          = '/usr/lib/qt4'
 QTDLLS         = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit', 'QtDBus')

From 9c562b35c3956a8ba07d564ca7c59bce6c9bb4c2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 21:20:55 +0530
Subject: [PATCH 0374/1154] ...

---
 setup/installer/linux/freeze2.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index deab85b6da..220f28ba82 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -191,8 +191,10 @@ class LinuxFreeze(Command):
             if os.path.isdir(x):
                 shutil.copytree(x, self.j(dest, self.b(x)),
                         ignore=ignore_in_lib)
-            if os.path.isfile(x) and ext in ('.py', '.so'):
+            elif os.path.isfile(x) and ext in ('.py', '.so'):
                 shutil.copy2(x, dest)
+            else:
+                raise ValueError('%s does not exist in site-packages' % x)
 
         for x in os.listdir(self.SRC):
             shutil.copytree(self.j(self.SRC, x), self.j(dest, x),

From 0fdbe5a753fad2d241057897809157a06caa2462 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 22:07:12 +0530
Subject: [PATCH 0375/1154] Device drivers: Explicitly fsync() all files when
 writing to devices

---
 src/calibre/__init__.py                  |  4 ++++
 src/calibre/devices/android/driver.py    |  3 +++
 src/calibre/devices/cli.py               |  3 ++-
 src/calibre/devices/cybook/driver.py     |  2 ++
 src/calibre/devices/hanvon/driver.py     |  2 ++
 src/calibre/devices/kindle/apnx.py       |  3 ++-
 src/calibre/devices/kindle/driver.py     |  3 ++-
 src/calibre/devices/kobo/driver.py       | 12 +++++++-----
 src/calibre/devices/misc.py              |  7 +++++--
 src/calibre/devices/nook/driver.py       |  2 ++
 src/calibre/devices/prs505/driver.py     |  2 ++
 src/calibre/devices/prs505/sony_cache.py |  5 ++++-
 src/calibre/devices/prst1/driver.py      |  2 ++
 src/calibre/devices/udisks.py            |  4 ++--
 src/calibre/devices/usbms/cli.py         |  6 ++++--
 src/calibre/devices/usbms/driver.py      |  5 ++++-
 16 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 5d938ecc55..eaf5102aa1 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -710,3 +710,7 @@ def ipython(user_ns=None):
     from calibre.utils.ipython import ipython
     ipython(user_ns=user_ns)
 
+def fsync(fileobj):
+    fileobj.flush()
+    os.fsync(fileobj.fileno())
+
diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 055fd32f88..28f55751e2 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -8,6 +8,7 @@ import os
 
 import cStringIO
 
+from calibre import fsync
 from calibre.devices.usbms.driver import USBMS
 
 HTC_BCDS = [0x100, 0x0222, 0x0224, 0x0226, 0x227, 0x228, 0x229, 0x0231, 0x9999]
@@ -400,6 +401,7 @@ class WEBOS(USBMS):
 
         with open(os.path.join(path, 'coverCache', filename + '-medium.jpg'), 'wb') as coverfile:
             coverfile.write(coverdata)
+            fsync(coverfile)
 
         coverdata = getattr(metadata, 'thumbnail', None)
         if coverdata and coverdata[2]:
@@ -423,6 +425,7 @@ class WEBOS(USBMS):
         with open(os.path.join(path, 'coverCache', filename +
             '-small.jpg'), 'wb') as coverfile:
             coverfile.write(coverdata)
+            fsync(coverfile)
 
 
 
diff --git a/src/calibre/devices/cli.py b/src/calibre/devices/cli.py
index e1a5375b6b..6defc27541 100755
--- a/src/calibre/devices/cli.py
+++ b/src/calibre/devices/cli.py
@@ -9,7 +9,7 @@ For usage information run the script.
 import StringIO, sys, time, os
 from optparse import OptionParser
 
-from calibre import __version__, __appname__, human_readable
+from calibre import __version__, __appname__, human_readable, fsync
 from calibre.devices.errors import PathError
 from calibre.devices.errors import ArgumentError, DeviceError, DeviceLocked
 from calibre.customize.ui import device_plugins
@@ -293,6 +293,7 @@ def main():
                     parser.print_help()
                     return 1
                 dev.get_file(path, outfile)
+                fsync(outfile)
                 outfile.close()
             elif args[1].startswith("dev:"):
                 try:
diff --git a/src/calibre/devices/cybook/driver.py b/src/calibre/devices/cybook/driver.py
index 0dd88263f0..64bd37b196 100644
--- a/src/calibre/devices/cybook/driver.py
+++ b/src/calibre/devices/cybook/driver.py
@@ -11,6 +11,7 @@ Device driver for Bookeen's Cybook Gen 3 and Opus and Orizon
 import os
 import re
 
+from calibre import fsync
 from calibre.constants import isunix
 from calibre.devices.usbms.driver import USBMS
 import calibre.devices.cybook.t2b as t2b
@@ -50,6 +51,7 @@ class CYBOOK(USBMS):
             coverdata = None
         with open('%s_6090.t2b' % os.path.join(path, filename), 'wb') as t2bfile:
             t2b.write_t2b(t2bfile, coverdata)
+            fsync(t2bfile)
 
     @classmethod
     def can_handle(cls, device_info, debug=False):
diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py
index c967f2c54c..ea13e5a6d0 100644
--- a/src/calibre/devices/hanvon/driver.py
+++ b/src/calibre/devices/hanvon/driver.py
@@ -9,6 +9,7 @@ Device driver for Hanvon devices
 '''
 import re, os
 
+from calibre import fsync
 from calibre.devices.usbms.driver import USBMS
 
 def is_alex(device_info):
@@ -123,6 +124,7 @@ class ALEX(N516):
             os.makedirs(cdir)
         with open(cpath, 'wb') as coverfile:
             coverfile.write(cover)
+            fsync(coverfile)
 
     def delete_books(self, paths, end_session=True):
         for i, path in enumerate(paths):
diff --git a/src/calibre/devices/kindle/apnx.py b/src/calibre/devices/kindle/apnx.py
index d6fec9ffd1..faad3c6cd7 100644
--- a/src/calibre/devices/kindle/apnx.py
+++ b/src/calibre/devices/kindle/apnx.py
@@ -14,7 +14,7 @@ from calibre.ebooks.mobi.reader.mobi6 import MobiReader
 from calibre.ebooks.pdb.header import PdbHeaderReader
 from calibre.ebooks.mobi.reader.headers import MetadataHeader
 from calibre.utils.logging import default_log
-from calibre import prints
+from calibre import prints, fsync
 from calibre.constants import DEBUG
 
 class APNXBuilder(object):
@@ -80,6 +80,7 @@ class APNXBuilder(object):
         # Write the APNX.
         with open(apnx_path, 'wb') as apnxf:
             apnxf.write(apnx)
+            fsync(apnxf)
 
     def generate_apnx(self, pages, apnx_meta):
         apnx = ''
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index 461176b95c..4e083fbe04 100644
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -12,7 +12,7 @@ import datetime, os, re, sys, json, hashlib
 
 from calibre.devices.kindle.bookmark import Bookmark
 from calibre.devices.usbms.driver import USBMS
-from calibre import strftime
+from calibre import strftime, fsync
 
 '''
 Notes on collections:
@@ -410,6 +410,7 @@ class KINDLE2(KINDLE):
                     uuid=mh.exth.uuid, cdetype=mh.exth.cdetype))
         with open(thumbfile, 'wb') as f:
             f.write(coverdata[2])
+            fsync(f)
 
     def upload_apnx(self, path, filename, metadata, filepath):
         from calibre.devices.kindle.apnx import APNXBuilder
diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 278798160e..feedab0127 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -23,7 +23,7 @@ from calibre.devices.kobo.books import Book
 from calibre.devices.kobo.books import ImageWrapper
 from calibre.devices.mime import mime_type_ext
 from calibre.devices.usbms.driver import USBMS, debug_print
-from calibre import prints
+from calibre import prints, fsync
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.constants import DEBUG
 from calibre.utils.config_base import prefs
@@ -974,6 +974,7 @@ class KOBO(USBMS):
 
                             with open(fpath, 'wb') as f:
                                 f.write(data)
+                                fsync(f)
 
                 else:
                     debug_print("ImageID could not be retreived from the database")
@@ -1621,7 +1622,7 @@ class KOBOTOUCH(KOBO):
             debug_print("KoboTouch:books - shelf list:", self.bookshelvelist)
 
             opts = self.settings()
-            
+
             columns = 'Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ImageID, ReadStatus'
             if self.dbversion >= 16:
                 columns += ', ___ExpirationStatus, FavouritesIndex, Accessibility'
@@ -1635,7 +1636,7 @@ class KOBOTOUCH(KOBO):
                 columns += ", Series, SeriesNumber, ___UserID, ExternalId"
             else:
                 columns += ', null as Series, null as SeriesNumber, ___UserID, null as ExternalId'
-            
+
             where_clause = ''
             if self.supports_kobo_archive():
                 where_clause = (" where BookID is Null " \
@@ -1670,13 +1671,13 @@ class KOBOTOUCH(KOBO):
             else:
                 where_clause = ' where BookID is Null'
 
-            # Note: The card condition should not need the contentId test for the SD card. But the ExternalId does not get set for sideloaded kepubs on the SD card.  
+            # Note: The card condition should not need the contentId test for the SD card. But the ExternalId does not get set for sideloaded kepubs on the SD card.
             card_condition = ''
             if self.has_externalid():
                 card_condition = " AND (externalId IS NOT NULL AND externalId <> '' OR contentId LIKE 'file:///mnt/sd/%')" if oncard == 'carda' else " AND (externalId IS NULL OR externalId = '') AND contentId NOT LIKE 'file:///mnt/sd/%'"
             else:
                 card_condition = " AND contentId LIKE 'file:///mnt/sd/%'" if oncard == 'carda' else " AND contentId NOT LIKE'file:///mnt/sd/%'"
-                
+
 
             query = 'SELECT ' + columns + ' FROM content ' + where_clause + card_condition
             debug_print("KoboTouch:books - query=", query)
@@ -2283,6 +2284,7 @@ class KOBOTOUCH(KOBO):
 
                                 with open(fpath, 'wb') as f:
                                     f.write(data)
+                                    fsync(f)
                 except Exception as e:
                     err = str(e)
                     debug_print("KoboTouch:_upload_cover - Exception string: %s"%err)
diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index 13ae870fd1..3338a98eac 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -9,8 +9,7 @@ __docformat__ = 'restructuredtext en'
 import os
 
 from calibre.devices.usbms.driver import USBMS
-from calibre import prints
-prints
+from calibre import fsync
 
 class PALMPRE(USBMS):
 
@@ -100,6 +99,7 @@ class PDNOVEL(USBMS):
         if coverdata and coverdata[2]:
             with open('%s.jpg' % os.path.join(path, filename), 'wb') as coverfile:
                 coverfile.write(coverdata[2])
+                fsync(coverfile)
 
 class PDNOVEL_KOBO(PDNOVEL):
     name = 'Pandigital Kobo device interface'
@@ -118,6 +118,7 @@ class PDNOVEL_KOBO(PDNOVEL):
                 os.makedirs(dirpath)
             with open(os.path.join(dirpath, filename+'.jpg'), 'wb') as coverfile:
                 coverfile.write(coverdata[2])
+                fsync(coverfile)
 
 
 class VELOCITYMICRO(USBMS):
@@ -190,6 +191,7 @@ class LUMIREAD(USBMS):
                 os.makedirs(pdir)
             with open(cfilepath+'.jpg', 'wb') as f:
                 f.write(metadata.thumbnail[-1])
+                fsync(f)
 
 class ALURATEK_COLOR(USBMS):
 
@@ -334,6 +336,7 @@ class NEXTBOOK(USBMS):
                 os.makedirs(thumbnail_dir)
             with open(os.path.join(thumbnail_dir, filename+'.jpg'), 'wb') as f:
                 f.write(metadata.thumbnail[-1])
+                fsync(f)
     '''
 
 class MOOVYBOOK(USBMS):
diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py
index 09924a8204..e24950359c 100644
--- a/src/calibre/devices/nook/driver.py
+++ b/src/calibre/devices/nook/driver.py
@@ -12,6 +12,7 @@ import os
 
 import cStringIO
 
+from calibre import fsync
 from calibre.constants import isosx
 from calibre.devices.usbms.driver import USBMS
 
@@ -76,6 +77,7 @@ class NOOK(USBMS):
 
         with open('%s.jpg' % os.path.join(path, filename), 'wb') as coverfile:
             coverfile.write(coverdata)
+            fsync(coverfile)
 
     def sanitize_path_components(self, components):
         return [x.replace('#', '_') for x in components]
diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index a1c7c78d18..10cb7df22c 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -8,6 +8,7 @@ Device driver for the SONY devices
 
 import os, time, re
 
+from calibre import fsync
 from calibre.devices.usbms.driver import USBMS, debug_print
 from calibre.devices.prs505 import MEDIA_XML, MEDIA_EXT, CACHE_XML, CACHE_EXT, \
             MEDIA_THUMBNAIL, CACHE_THUMBNAIL
@@ -142,6 +143,7 @@ class PRS505(USBMS):
                             <cache xmlns="http://www.kinoma.com/FskCache/1">
                             </cache>
                             '''.encode('utf8'))
+                        fsync(f)
                 return True
             except:
                 import traceback
diff --git a/src/calibre/devices/prs505/sony_cache.py b/src/calibre/devices/prs505/sony_cache.py
index 979940229a..86a1b50582 100644
--- a/src/calibre/devices/prs505/sony_cache.py
+++ b/src/calibre/devices/prs505/sony_cache.py
@@ -9,7 +9,7 @@ import os, time
 from base64 import b64decode
 from datetime import date
 
-from calibre import prints, guess_type, isbytestring
+from calibre import prints, guess_type, isbytestring, fsync
 from calibre.devices.errors import DeviceError
 from calibre.devices.usbms.driver import debug_print
 from calibre.constants import DEBUG, preferred_encoding
@@ -122,6 +122,7 @@ class XMLCache(object):
                 try:
                     with open(path, 'wb') as f:
                         f.write(EMPTY_EXT_CACHE)
+                        fsync(f)
                 except:
                     pass
             if os.access(path, os.W_OK):
@@ -726,6 +727,7 @@ class XMLCache(object):
                     '<?xml version="1.0" encoding="UTF-8"?>')
             with open(path, 'wb') as f:
                 f.write(raw)
+                fsync(f)
 
         for i, path in self.ext_paths.items():
             try:
@@ -737,6 +739,7 @@ class XMLCache(object):
                     '<?xml version="1.0" encoding="UTF-8"?>')
             with open(path, 'wb') as f:
                 f.write(raw)
+                fsync(f)
 
     # }}}
 
diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py
index 9c76eb096f..d2482d51a0 100644
--- a/src/calibre/devices/prst1/driver.py
+++ b/src/calibre/devices/prst1/driver.py
@@ -15,6 +15,7 @@ import os, time, re
 from contextlib import closing
 from datetime import date
 
+from calibre import fsync
 from calibre.devices.errors import DeviceError
 from calibre.devices.usbms.driver import USBMS, debug_print
 from calibre.devices.usbms.device import USBDevice
@@ -761,6 +762,7 @@ class PRST1(USBMS):
 
         with open(thumbnail_file_path, 'wb') as f:
             f.write(book.thumbnail[-1])
+            fsync(f)
 
         query = 'UPDATE books SET thumbnail = ? WHERE _id = ?'
         t = (thumbnail_path, book.bookId,)
diff --git a/src/calibre/devices/udisks.py b/src/calibre/devices/udisks.py
index b9ab4be498..8156fb227b 100644
--- a/src/calibre/devices/udisks.py
+++ b/src/calibre/devices/udisks.py
@@ -46,7 +46,7 @@ class UDisks(object):
         try:
             return unicode(d.FilesystemMount('',
                 ['auth_no_user_interaction', 'rw', 'noexec', 'nosuid',
-                'sync', 'nodev', 'uid=%d'%os.geteuid(), 'gid=%d'%os.getegid()]))
+                 'nodev', 'uid=%d'%os.geteuid(), 'gid=%d'%os.getegid()]))
         except:
             # May be already mounted, check
             mp = node_mountpoint(str(device_node_path))
@@ -123,7 +123,7 @@ class UDisks2(object):
     def mount(self, device_node_path):
         d = self.device(device_node_path)
         mount_options = ['rw', 'noexec', 'nosuid',
-                'sync', 'nodev', 'uid=%d'%os.geteuid(), 'gid=%d'%os.getegid()]
+                'nodev', 'uid=%d'%os.geteuid(), 'gid=%d'%os.getegid()]
         try:
             return unicode(d.Mount(
                 {
diff --git a/src/calibre/devices/usbms/cli.py b/src/calibre/devices/usbms/cli.py
index 4ff9efef8b..6482a5b12b 100644
--- a/src/calibre/devices/usbms/cli.py
+++ b/src/calibre/devices/usbms/cli.py
@@ -6,6 +6,7 @@ __docformat__ = 'restructuredtext en'
 
 import os, shutil, time
 
+from calibre import fsync
 from calibre.devices.errors import PathError
 from calibre.utils.filenames import case_preserving_open_file
 
@@ -58,14 +59,15 @@ class CLI(object):
                 dest.seek(0)
                 dest.truncate()
                 shutil.copyfileobj(infile, dest)
+            fsync(dest)
             #if not check_transfer(infile, dest): raise Exception('Transfer failed')
         if close:
             infile.close()
         return actual_path
 
     def munge_path(self, path):
-        if path.startswith('/') and not (path.startswith(self._main_prefix) or \
-            (self._card_a_prefix and path.startswith(self._card_a_prefix)) or \
+        if path.startswith('/') and not (path.startswith(self._main_prefix) or
+            (self._card_a_prefix and path.startswith(self._card_a_prefix)) or
             (self._card_b_prefix and path.startswith(self._card_b_prefix))):
             path = self._main_prefix + path[1:]
         elif path.startswith('carda:'):
diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index f367e549e2..9dbb718fc0 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -14,7 +14,7 @@ import os, time, json, shutil
 from itertools import cycle
 
 from calibre.constants import numeric_version
-from calibre import prints, isbytestring
+from calibre import prints, isbytestring, fsync
 from calibre.constants import filesystem_encoding, DEBUG
 from calibre.devices.usbms.cli import CLI
 from calibre.devices.usbms.device import Device
@@ -85,10 +85,12 @@ class USBMS(CLI, Device):
                                                           location_code, name)
             with open(os.path.join(prefix, self.DRIVEINFO), 'wb') as f:
                 f.write(json.dumps(driveinfo, default=to_json))
+                fsync(f)
         else:
             driveinfo = self._update_driveinfo_record({}, prefix, location_code, name)
             with open(os.path.join(prefix, self.DRIVEINFO), 'wb') as f:
                 f.write(json.dumps(driveinfo, default=to_json))
+                fsync(f)
         return driveinfo
 
     def get_device_information(self, end_session=True):
@@ -388,6 +390,7 @@ class USBMS(CLI, Device):
                     os.makedirs(self.normalize_path(prefix))
                 with open(self.normalize_path(os.path.join(prefix, self.METADATA_CACHE)), 'wb') as f:
                     json_codec.encode_to_file(f, booklists[listid])
+                    fsync(f)
         write_prefix(self._main_prefix, 0)
         write_prefix(self._card_a_prefix, 1)
         write_prefix(self._card_b_prefix, 2)

From 99d9db82f7976ef5a03c1e99894109e256828ee9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 29 Jul 2013 22:17:14 +0530
Subject: [PATCH 0376/1154] ...

---
 setup/hosting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/hosting.py b/setup/hosting.py
index d97373cdbc..273da37706 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -507,7 +507,7 @@ def upload_to_servers(files, version):  # {{{
 # }}}
 
 def upload_to_dbs(files, version):  # {{{
-    print('Uploading to downloadbestsoftware.com')
+    print('Uploading to fosshub.com')
     server = 'www.downloadbestsoft-mirror1.com'
     rdir = 'release/'
     check_call(['ssh', 'kovid@%s' % server, 'rm -f release/*'])

From e9e3114b230da9e85e7a05b2ecb443c76d305627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Tue, 30 Jul 2013 00:39:25 +0200
Subject: [PATCH 0377/1154] plugin for ebooki.allegro.pl

---
 src/calibre/customize/builtins.py             | 12 +++
 .../gui2/store/stores/allegro_plugin.py       | 83 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 src/calibre/gui2/store/stores/allegro_plugin.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 8fce645c6e..ef18db862c 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1199,6 +1199,17 @@ plugins += [LookAndFeel, Behavior, Columns, Toolbar, Search, InputOptions,
 #}}}
 
 # Store plugins {{{
+class StoreAllegroStore(StoreBase):
+    name = 'Ebooki Allegro'
+    author = u'Tomasz Długosz'
+    description = u'Platforma Grupy Allegro sprzedająca ebooki zabezpieczone znakiem wodnym.'
+    actual_plugin = 'calibre.gui2.store.stores.allegro_plugin:AllegroStore'
+
+    drm_free_only = True
+    headquarters = 'PL'
+    formats = ['EPUB', 'MOBI', 'PDF']
+    affiliate = True
+
 class StoreAmazonKindleStore(StoreBase):
     name = 'Amazon Kindle'
     description = u'Kindle books from Amazon.'
@@ -1675,6 +1686,7 @@ class XinXiiStore(StoreBase):
     formats = ['EPUB', 'PDF']
 
 plugins += [
+    StoreAllegroStore,
     StoreArchiveOrgStore,
     StoreAmazonKindleStore,
     StoreAmazonDEKindleStore,
diff --git a/src/calibre/gui2/store/stores/allegro_plugin.py b/src/calibre/gui2/store/stores/allegro_plugin.py
new file mode 100644
index 0000000000..f7944e082a
--- /dev/null
+++ b/src/calibre/gui2/store/stores/allegro_plugin.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (division, absolute_import, print_function)
+store_version = 1  # Needed for dynamic plugin loading
+
+__license__ = 'GPL 3'
+__copyright__ = '2013, Tomasz Długosz <tomek3d@gmail.com>'
+__docformat__ = 'restructuredtext en'
+
+import urllib
+from base64 import b64encode
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser, url_slash_cleaner
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.search_result import SearchResult
+from calibre.gui2.store.web_store_dialog import WebStoreDialog
+
+class AllegroStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+        aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/34/58/'
+
+        url = 'http://www.koobe.pl/'
+
+        aff_url = aff_root + str(b64encode(url))
+
+        detail_url = None
+        if detail_item:
+            detail_url = aff_root + str(b64encode(detail_item))
+
+        if external or self.config.get('open_external', False):
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else aff_url)))
+        else:
+            d = WebStoreDialog(self.gui, url, parent, detail_url if detail_url else aff_url)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+
+        br = browser()
+        page=1
+
+        counter = max_results
+        while counter:
+            with closing(br.open('http://ebooki.allegro.pl/szukaj?fraza=' + urllib.quote(query) + '&strona=' + str(page), timeout=timeout)) as f:
+                doc = html.fromstring(f.read().decode('utf-8'))
+                for data in doc.xpath('//div[@class="listing-list"]/div[@class="listing-list-item"]'):
+                    if counter <= 0:
+                        break
+
+                    id = ''.join(data.xpath('.//div[@class="listing-cover-wrapper"]/a/@href'))
+                    if not id:
+                        continue
+
+                    cover_url = ''.join(data.xpath('.//div[@class="listing-cover-wrapper"]/a/img/@src'))
+                    title = ''.join(data.xpath('.//div[@class="listing-info"]/div[1]/a/text()'))
+                    author = ', '.join(data.xpath('.//div[@class="listing-info"]/div[2]/a/text()'))
+                    price = ''.join(data.xpath('.//div[@class="book-price"]/text()'))
+                    formats = ', '.join(data.xpath('.//div[@class="listing-buy-formats"]//div[@class="devices-wrapper"]/span[@class="device-label"]/span/text()'))
+
+                    counter -= 1
+
+                    s = SearchResult()
+                    s.cover_url = 'http://ebooki.allegro.pl/' + cover_url
+                    s.title = title.strip()
+                    s.author = author.strip()
+                    s.price = price
+                    s.detail_item = 'http://ebooki.allegro.pl/' + id[1:]
+                    s.formats = formats.upper()
+                    s.drm = SearchResult.DRM_UNLOCKED
+
+                    yield s
+                if not doc.xpath('//a[@class="paging-arrow right-paging-arrow"]'):
+                    break
+            page+=1

From f731f2803b935fec3a0a0163f414afe019023a27 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 09:25:48 +0530
Subject: [PATCH 0378/1154] newdb: Fix sorting of view not stable

---
 src/calibre/db/cache.py | 5 +++--
 src/calibre/db/view.py  | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 6bd7c1a3cf..5c0a7fda59 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -792,6 +792,7 @@ class Cache(object):
         '''
         all_book_ids = frozenset(self._all_book_ids() if ids_to_sort is None
                 else ids_to_sort)
+        ids_to_sort = all_book_ids if ids_to_sort is None else ids_to_sort
         get_metadata = self._get_proxy_metadata
         lang_map = self.fields['languages'].book_value_map
         virtual_fields = virtual_fields or {}
@@ -818,10 +819,10 @@ class Cache(object):
 
         if len(sort_keys) == 1:
             sk = sort_keys[0]
-            return sorted(all_book_ids, key=lambda i:sk[i], reverse=not
+            return sorted(ids_to_sort, key=lambda i:sk[i], reverse=not
                     fields[0][1])
         else:
-            return sorted(all_book_ids, key=partial(SortKey, fields, sort_keys))
+            return sorted(ids_to_sort, key=partial(SortKey, fields, sort_keys))
 
     @read_api
     def search(self, query, restriction='', virtual_fields=None, book_ids=None):
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 0e8d4081e5..2a578215ce 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -222,7 +222,9 @@ class View(object):
         if not fields:
             fields = [('timestamp', False)]
 
-        sorted_book_ids = self.cache.multisort(fields, ids_to_sort=only_ids, virtual_fields={'marked':MarkedVirtualField(self.marked_ids)})
+        sorted_book_ids = self.cache.multisort(
+            fields, ids_to_sort=self._map if only_ids is None else only_ids,
+            virtual_fields={'marked':MarkedVirtualField(self.marked_ids)})
         if only_ids is None:
             self._map = tuple(sorted_book_ids)
             if len(self._map_filtered) == len(self._map):

From c6daf258be91951ee667ded57829341238d0563f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 10:32:51 +0530
Subject: [PATCH 0379/1154] Factor out the code to update the GUI, so it can be
 re-used

---
 src/calibre/gui2/actions/edit_metadata.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 4817db953c..dcf86923dd 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -700,13 +700,7 @@ class EditMetadataAction(InterfaceAction):
                 _('Failed to apply updated metadata for some books'
                     ' in your library. Click "Show Details" to see '
                     'details.'), det_msg='\n\n'.join(msg), show=True)
-        if self.applied_ids:
-            cr = self.gui.library_view.currentIndex().row()
-            self.gui.library_view.model().refresh_ids(
-                list(self.applied_ids), cr)
-            if self.gui.cover_flow:
-                self.gui.cover_flow.dataChanged()
-            self.gui.tags_view.recount()
+        self.refresh_gui(self.applied_ids)
 
         self.apply_id_map = []
         self.apply_pd = None
@@ -716,5 +710,15 @@ class EditMetadataAction(InterfaceAction):
         finally:
             self.apply_callback = None
 
+    def refresh_gui(self, book_ids, covers_changed=True, tag_browser_changed=True):
+        if book_ids:
+            cr = self.gui.library_view.currentIndex().row()
+            self.gui.library_view.model().refresh_ids(
+                list(book_ids), cr)
+            if covers_changed and self.gui.cover_flow:
+                self.gui.cover_flow.dataChanged()
+            if tag_browser_changed:
+                self.gui.tags_view.recount()
+
     # }}}
 

From 82d7bd3d571ce3464156938657564bb352c2a21c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 10:56:04 +0530
Subject: [PATCH 0380/1154] newdb: Speed up set_metadata() by not committing
 the db after individual field writes

---
 src/calibre/db/cache.py | 77 +++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 5c0a7fda59..d311cbadde 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1084,11 +1084,6 @@ class Cache(object):
                 else:
                     raise
 
-        for field in ('rating', 'series_index', 'timestamp'):
-            val = getattr(mi, field)
-            if val is not None:
-                protected_set_field(field, val)
-
         # force_changes has no effect on cover manipulation
         cdata = mi.cover_data[1]
         if cdata is None and isinstance(mi.cover, basestring) and mi.cover and os.access(mi.cover, os.R_OK):
@@ -1099,42 +1094,48 @@ class Cache(object):
         if cdata is not None:
             self._set_cover({book_id: cdata})
 
-        for field in ('author_sort', 'publisher', 'series', 'tags', 'comments',
-            'languages', 'pubdate'):
-            val = mi.get(field, None)
-            if (force_changes and val is not None) or not mi.is_null(field):
-                protected_set_field(field, val)
+        with self.backend.conn:  # Speed up set_metadata by not operating in autocommit mode
+            for field in ('rating', 'series_index', 'timestamp'):
+                val = getattr(mi, field)
+                if val is not None:
+                    protected_set_field(field, val)
 
-        val = mi.get('title_sort', None)
-        if (force_changes and val is not None) or not mi.is_null('title_sort'):
-            protected_set_field('sort', val)
+            for field in ('author_sort', 'publisher', 'series', 'tags', 'comments',
+                'languages', 'pubdate'):
+                val = mi.get(field, None)
+                if (force_changes and val is not None) or not mi.is_null(field):
+                    protected_set_field(field, val)
 
-        # identifiers will always be replaced if force_changes is True
-        mi_idents = mi.get_identifiers()
-        if force_changes:
-            protected_set_field('identifiers', mi_idents)
-        elif mi_idents:
-            identifiers = self._field_for('identifiers', book_id, default_value={})
-            for key, val in mi_idents.iteritems():
-                if val and val.strip():  # Don't delete an existing identifier
-                    identifiers[icu_lower(key)] = val
-            protected_set_field('identifiers', identifiers)
+            val = mi.get('title_sort', None)
+            if (force_changes and val is not None) or not mi.is_null('title_sort'):
+                protected_set_field('sort', val)
 
-        user_mi = mi.get_all_user_metadata(make_copy=False)
-        fm = self.field_metadata
-        for key in user_mi.iterkeys():
-            if (key in fm and
-                    user_mi[key]['datatype'] == fm[key]['datatype'] and
-                    (user_mi[key]['datatype'] != 'text' or
-                     user_mi[key]['is_multiple'] == fm[key]['is_multiple'])):
-                val = mi.get(key, None)
-                if force_changes or val is not None:
-                    protected_set_field(key, val)
-                    idx = key + '_index'
-                    if idx in self.fields:
-                        extra = mi.get_extra(key)
-                        if extra is not None or force_changes:
-                            protected_set_field(idx, extra)
+            # identifiers will always be replaced if force_changes is True
+            mi_idents = mi.get_identifiers()
+            if force_changes:
+                protected_set_field('identifiers', mi_idents)
+            elif mi_idents:
+                identifiers = self._field_for('identifiers', book_id, default_value={})
+                for key, val in mi_idents.iteritems():
+                    if val and val.strip():  # Don't delete an existing identifier
+                        identifiers[icu_lower(key)] = val
+                protected_set_field('identifiers', identifiers)
+
+            user_mi = mi.get_all_user_metadata(make_copy=False)
+            fm = self.field_metadata
+            for key in user_mi.iterkeys():
+                if (key in fm and
+                        user_mi[key]['datatype'] == fm[key]['datatype'] and
+                        (user_mi[key]['datatype'] != 'text' or
+                        user_mi[key]['is_multiple'] == fm[key]['is_multiple'])):
+                    val = mi.get(key, None)
+                    if force_changes or val is not None:
+                        protected_set_field(key, val)
+                        idx = key + '_index'
+                        if idx in self.fields:
+                            extra = mi.get_extra(key)
+                            if extra is not None or force_changes:
+                                protected_set_field(idx, extra)
 
     @write_api
     def add_format(self, book_id, fmt, stream_or_path, replace=True, run_hooks=True, dbapi=None):

From 2fd8022e9e7fecbcd2c60ca7ec04adf2eae2a68c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 11:46:54 +0530
Subject: [PATCH 0381/1154] Ensure that an error in set_metadata does not cause
 the memory and disk data to diverge

---
 src/calibre/db/cache.py | 80 +++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d311cbadde..4b334fb794 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1094,48 +1094,52 @@ class Cache(object):
         if cdata is not None:
             self._set_cover({book_id: cdata})
 
-        with self.backend.conn:  # Speed up set_metadata by not operating in autocommit mode
-            for field in ('rating', 'series_index', 'timestamp'):
-                val = getattr(mi, field)
-                if val is not None:
-                    protected_set_field(field, val)
+        try:
+            with self.backend.conn:  # Speed up set_metadata by not operating in autocommit mode
+                for field in ('rating', 'series_index', 'timestamp'):
+                    val = getattr(mi, field)
+                    if val is not None:
+                        protected_set_field(field, val)
 
-            for field in ('author_sort', 'publisher', 'series', 'tags', 'comments',
-                'languages', 'pubdate'):
-                val = mi.get(field, None)
-                if (force_changes and val is not None) or not mi.is_null(field):
-                    protected_set_field(field, val)
+                for field in ('author_sort', 'publisher', 'series', 'tags', 'comments',
+                    'languages', 'pubdate'):
+                    val = mi.get(field, None)
+                    if (force_changes and val is not None) or not mi.is_null(field):
+                        protected_set_field(field, val)
 
-            val = mi.get('title_sort', None)
-            if (force_changes and val is not None) or not mi.is_null('title_sort'):
-                protected_set_field('sort', val)
+                val = mi.get('title_sort', None)
+                if (force_changes and val is not None) or not mi.is_null('title_sort'):
+                    protected_set_field('sort', val)
 
-            # identifiers will always be replaced if force_changes is True
-            mi_idents = mi.get_identifiers()
-            if force_changes:
-                protected_set_field('identifiers', mi_idents)
-            elif mi_idents:
-                identifiers = self._field_for('identifiers', book_id, default_value={})
-                for key, val in mi_idents.iteritems():
-                    if val and val.strip():  # Don't delete an existing identifier
-                        identifiers[icu_lower(key)] = val
-                protected_set_field('identifiers', identifiers)
+                # identifiers will always be replaced if force_changes is True
+                mi_idents = mi.get_identifiers()
+                if force_changes:
+                    protected_set_field('identifiers', mi_idents)
+                elif mi_idents:
+                    identifiers = self._field_for('identifiers', book_id, default_value={})
+                    for key, val in mi_idents.iteritems():
+                        if val and val.strip():  # Don't delete an existing identifier
+                            identifiers[icu_lower(key)] = val
+                    protected_set_field('identifiers', identifiers)
 
-            user_mi = mi.get_all_user_metadata(make_copy=False)
-            fm = self.field_metadata
-            for key in user_mi.iterkeys():
-                if (key in fm and
-                        user_mi[key]['datatype'] == fm[key]['datatype'] and
-                        (user_mi[key]['datatype'] != 'text' or
-                        user_mi[key]['is_multiple'] == fm[key]['is_multiple'])):
-                    val = mi.get(key, None)
-                    if force_changes or val is not None:
-                        protected_set_field(key, val)
-                        idx = key + '_index'
-                        if idx in self.fields:
-                            extra = mi.get_extra(key)
-                            if extra is not None or force_changes:
-                                protected_set_field(idx, extra)
+                user_mi = mi.get_all_user_metadata(make_copy=False)
+                fm = self.field_metadata
+                for key in user_mi.iterkeys():
+                    if (key in fm and
+                            user_mi[key]['datatype'] == fm[key]['datatype'] and
+                            (user_mi[key]['datatype'] != 'text' or
+                            user_mi[key]['is_multiple'] == fm[key]['is_multiple'])):
+                        val = mi.get(key, None)
+                        if force_changes or val is not None:
+                            protected_set_field(key, val)
+                            idx = key + '_index'
+                            if idx in self.fields:
+                                extra = mi.get_extra(key)
+                                if extra is not None or force_changes:
+                                    protected_set_field(idx, extra)
+        except:
+            self._reload_from_db()
+            raise
 
     @write_api
     def add_format(self, book_id, fmt, stream_or_path, replace=True, run_hooks=True, dbapi=None):

From 47b927f5bc88cfb248cccb1e10e2d3b263cffb3d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 11:52:51 +0530
Subject: [PATCH 0382/1154] Make ignore_errors also work for setting covers

---
 src/calibre/db/cache.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 4b334fb794..505342173f 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1085,14 +1085,18 @@ class Cache(object):
                     raise
 
         # force_changes has no effect on cover manipulation
-        cdata = mi.cover_data[1]
-        if cdata is None and isinstance(mi.cover, basestring) and mi.cover and os.access(mi.cover, os.R_OK):
-            with lopen(mi.cover, 'rb') as f:
-                raw = f.read()
-                if raw:
-                    cdata = raw
-        if cdata is not None:
-            self._set_cover({book_id: cdata})
+        try:
+            cdata = mi.cover_data[1]
+            if cdata is None and isinstance(mi.cover, basestring) and mi.cover and os.access(mi.cover, os.R_OK):
+                with lopen(mi.cover, 'rb') as f:
+                    cdata = f.read() or None
+            if cdata is not None:
+                self._set_cover({book_id: cdata})
+        except:
+            if ignore_errors:
+                traceback.print_exc()
+            else:
+                raise
 
         try:
             with self.backend.conn:  # Speed up set_metadata by not operating in autocommit mode

From 4dbf49855a39060a4e52a396d2049806f435aa58 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 11:55:58 +0530
Subject: [PATCH 0383/1154] ...

---
 src/calibre/db/cache.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 505342173f..8d19c7e9f8 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1142,6 +1142,9 @@ class Cache(object):
                                 if extra is not None or force_changes:
                                     protected_set_field(idx, extra)
         except:
+            # sqlite will rollback the entire transaction, thanks to the with
+            # statement, so we have to re-read everything form the db to ensure
+            # the db and Cache are in sync
             self._reload_from_db()
             raise
 

From 11ab7672662555226d833529742f3b8ec25ceb14 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 13:38:56 +0530
Subject: [PATCH 0384/1154] Fix drag 'n drop of cover onto conversion dialog
 not working

---
 src/calibre/gui2/convert/metadata.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/convert/metadata.py b/src/calibre/gui2/convert/metadata.py
index 1d354a7881..f0ff1f8af7 100644
--- a/src/calibre/gui2/convert/metadata.py
+++ b/src/calibre/gui2/convert/metadata.py
@@ -61,6 +61,11 @@ class MetadataWidget(Widget, Ui_Form):
         self.initialize_options(get_option, get_help, db, book_id)
         self.connect(self.cover_button, SIGNAL("clicked()"), self.select_cover)
         self.comment.hide_toolbars()
+        self.cover.cover_changed.connect(self.change_cover)
+
+    def change_cover(self, data):
+        self.cover_changed = True
+        self.cover_data = data
 
     def deduce_author_sort(self, *args):
         au = unicode(self.author.currentText())
@@ -68,7 +73,6 @@ class MetadataWidget(Widget, Ui_Form):
         authors = string_to_authors(au)
         self.author_sort.setText(self.db.author_sort_from_authors(authors))
 
-
     def initialize_metadata_options(self):
         self.initialize_combos()
         self.author.editTextChanged.connect(self.deduce_author_sort)
@@ -210,7 +214,6 @@ class MetadataWidget(Widget, Ui_Form):
                     bool(self.opt_prefer_metadata_cover.isChecked()),
                 }
 
-
     def commit(self, save_defaults=False):
         '''
         Settings are stored in two attributes: `opf_file` and `cover_file`.
@@ -242,3 +245,4 @@ class MetadataWidget(Widget, Ui_Form):
                 self.cover_file = cf
         return recs
 
+

From e2db758aceb52dd12c7ec101f3799ea8923f345f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Tue, 30 Jul 2013 10:25:18 +0200
Subject: [PATCH 0385/1154] improve allegro plugin

---
 src/calibre/gui2/store/stores/allegro_plugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/store/stores/allegro_plugin.py b/src/calibre/gui2/store/stores/allegro_plugin.py
index f7944e082a..61fc7dc409 100644
--- a/src/calibre/gui2/store/stores/allegro_plugin.py
+++ b/src/calibre/gui2/store/stores/allegro_plugin.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (division, absolute_import, print_function)
+from __future__ import (division, absolute_import, print_function, unicode_literals)
 store_version = 1  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
@@ -27,7 +27,7 @@ class AllegroStore(BasicStoreConfig, StorePlugin):
     def open(self, parent=None, detail_item=None, external=False):
         aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/34/58/'
 
-        url = 'http://www.koobe.pl/'
+        url = 'http://ebooki.allegro.pl/'
 
         aff_url = aff_root + str(b64encode(url))
 

From 60cf6c4c5de5f9d41b4aeee600d0f097ee92d895 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 14:33:20 +0530
Subject: [PATCH 0386/1154] newdb: Fix book_id->row mapping broken when asearch
 is in effect

---
 src/calibre/db/tests/legacy.py | 7 +++++++
 src/calibre/db/view.py         | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 2d8bf466f6..c936367ba4 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -192,6 +192,7 @@ class LegacyTest(BaseTest):
             'has_id':[(1,), (2,), (3,), (9999,)],
             'id':[(1,), (2,), (0,),],
             'index':[(1,), (2,), (3,), ],
+            'row':[(1,), (2,), (3,), ],
             'is_empty':[()],
             'count':[()],
             'all_author_names':[()],
@@ -254,6 +255,12 @@ class LegacyTest(BaseTest):
             o = {type('')(k) if isinstance(k, bytes) else k:set(v) if isinstance(v, list) else v for k, v in o.iteritems()}
             n = {k:set(v) if isinstance(v, list) else v for k, v in n.iteritems()}
             self.assertEqual(o, n)
+
+        ndb.search('title:Unknown')
+        db.search('title:Unknown')
+        self.assertEqual(db.row(3), ndb.row(3))
+        self.assertRaises(ValueError, ndb.row, 2)
+        self.assertRaises(ValueError, db.row, 2)
         db.close()
         # }}}
 
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 2a578215ce..43243318d5 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -178,9 +178,13 @@ class View(object):
         return self._map_filtered[idx]
 
     def id_to_index(self, book_id):
-        return self._map.index(book_id)
+        return self._map_filtered.index(book_id)
     row = index_to_id
 
+    def index(self, book_id, cache=False):
+        x = self._map if cache else self._map_filtered
+        return x.index(book_id)
+
     def _get(self, field, idx, index_is_id=True, default_value=None, fmt=lambda x:x):
         id_ = idx if index_is_id else self.index_to_id(idx)
         if index_is_id and not self.cache.has_id(id_):

From 1d9a3dcb5f17e867568d35cc4b301d071e0a6a4c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 17:30:27 +0530
Subject: [PATCH 0387/1154] newdb: Fix displaying the languages column

Displaying the languages column for a book with no languages
was causing an error.
---
 src/calibre/db/cache.py  | 4 +++-
 src/calibre/db/fields.py | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 8d19c7e9f8..283773ac58 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -336,7 +336,7 @@ class Cache(object):
         except KeyError:
             return default_value
         if field.is_multiple:
-            default_value = {} if name == 'identifiers' else ()
+            default_value = field.default_value
         try:
             return field.for_book(book_id, default_value=default_value)
         except (KeyError, IndexError):
@@ -347,6 +347,8 @@ class Cache(object):
         ' Same as field_for, except that it avoids the extra lookup to get the field object '
         if field_obj.is_composite:
             return field_obj.get_value_with_cache(book_id, self._get_proxy_metadata)
+        if field_obj.is_multiple:
+            default_value = field_obj.default_value
         try:
             return field_obj.for_book(book_id, default_value=default_value)
         except (KeyError, IndexError):
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 9becf82403..50fa658b29 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -48,6 +48,7 @@ class Field(object):
             self._sort_key = lambda x:sort_key(calibre_langcode_to_name(x))
         self.is_multiple = (bool(self.metadata['is_multiple']) or self.name ==
                 'formats')
+        self.default_value = {} if name == 'identifiers' else () if self.is_multiple else None
         self.category_formatter = type(u'')
         if dt == 'rating':
             self.category_formatter = lambda x:'\u2605'*int(x/2)

From a6048a6ba74b7601fce9a32272a7315a445922c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 31 Jul 2013 00:45:25 +0200
Subject: [PATCH 0388/1154] cdp plugin

---
 src/calibre/customize/builtins.py           | 11 +++
 src/calibre/gui2/store/stores/cdp_plugin.py | 79 +++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 src/calibre/gui2/store/stores/cdp_plugin.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index ef18db862c..3e573be026 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1342,6 +1342,16 @@ class StoreBookotekaStore(StoreBase):
     headquarters = 'PL'
     formats = ['EPUB', 'PDF']
 
+class StoreCdpStore(StoreBase):
+    name = 'Cdp.pl'
+    author = u'Tomasz Długosz'
+    description = u'Ebooki w wielu formatach zabezpieczone znakiem wodnym RuneMark'
+    actual_plugin = 'calibre.gui2.store.stores.cdp_plugin:CdpStore'
+
+    drm_free_only = True
+    headquarters = 'PL'
+    formats = ['EPUB', 'MOBI', 'PDF']
+
 class StoreChitankaStore(StoreBase):
     name = u'Моята библиотека'
     author = 'Alex Stanev'
@@ -1700,6 +1710,7 @@ plugins += [
     StoreBiblioStore,
     StoreBookotekaStore,
     StoreChitankaStore,
+    StoreCdpStore,
     StoreDieselEbooksStore,
     StoreEbookNLStore,
     StoreEbookpointStore,
diff --git a/src/calibre/gui2/store/stores/cdp_plugin.py b/src/calibre/gui2/store/stores/cdp_plugin.py
new file mode 100644
index 0000000000..51b8de6448
--- /dev/null
+++ b/src/calibre/gui2/store/stores/cdp_plugin.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+store_version = 1 # Needed for dynamic plugin loading
+
+__license__ = 'GPL 3'
+__copyright__ = '2013, Tomasz Długosz <tomek3d@gmail.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+import urllib
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser, url_slash_cleaner
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.search_result import SearchResult
+from calibre.gui2.store.web_store_dialog import WebStoreDialog
+
+class CdpStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+
+        url = 'https://cdp.pl/ksiazki'
+
+        if external or self.config.get('open_external', False):
+            open_url(QUrl(url_slash_cleaner(detail_item if detail_item else url)))
+        else:
+            d = WebStoreDialog(self.gui, url, parent, detail_item if detail_item else url)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        page=1
+
+        br = browser()
+
+        counter = max_results
+
+        while counter:
+            with closing(br.open(u'https://cdp.pl/products/search?utf8=✓&keywords=' + urllib.quote_plus(query) + '&page=' + str(page), timeout=timeout)) as f:
+                doc = html.fromstring(f.read())
+                for data in doc.xpath('//ul[@id="products"]/li'):
+                    if counter <= 0:
+                        break
+
+                    id = ''.join(data.xpath('.//div[@class="product-image"]/a[1]/@href'))
+                    if not id:
+                        continue
+                    if 'ksiazki' not in id:
+                        continue
+
+                    cover_url = ''.join(data.xpath('.//div[@class="product-image"]/a[1]/@data-background'))
+                    cover_url = cover_url.split('\'')[1]
+                    title = ''.join(data.xpath('.//div[@class="product-description"]/h2/a/text()'))
+                    author = ''.join(data.xpath('.//div[@class="product-description"]//ul[@class="taxons"]/li[2]/a/text()'))
+                    price = ''.join(data.xpath('.//span[@itemprop="price"]/text()'))
+
+                    counter -= 1
+
+                    s = SearchResult()
+                    s.cover_url = cover_url
+                    s.title = title.strip()
+                    s.author = author.strip()
+                    s.price = price
+                    s.detail_item = id.strip()
+                    s.drm = SearchResult.DRM_UNLOCKED
+                    #s.formats = formats.upper().strip()
+
+                    yield s
+                if not doc.xpath('//span[@class="next"]/a'):
+                    break
+            page+=1

From 1c5cb3914106150eff2fe29d2969307c30d62490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 31 Jul 2013 00:58:30 +0200
Subject: [PATCH 0389/1154] detect formats in cdp

---
 src/calibre/gui2/store/stores/cdp_plugin.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/store/stores/cdp_plugin.py b/src/calibre/gui2/store/stores/cdp_plugin.py
index 51b8de6448..738ee5e3d5 100644
--- a/src/calibre/gui2/store/stores/cdp_plugin.py
+++ b/src/calibre/gui2/store/stores/cdp_plugin.py
@@ -62,6 +62,11 @@ class CdpStore(BasicStoreConfig, StorePlugin):
                     author = ''.join(data.xpath('.//div[@class="product-description"]//ul[@class="taxons"]/li[2]/a/text()'))
                     price = ''.join(data.xpath('.//span[@itemprop="price"]/text()'))
 
+                    with closing(br.open(id.strip(), timeout=timeout/4)) as nf:
+                        idata = html.fromstring(nf.read())
+                        formats = ', '.join(idata.xpath('//div[@id="product-bonus"]/div/ul/li/text()'))
+
+
                     counter -= 1
 
                     s = SearchResult()
@@ -71,7 +76,7 @@ class CdpStore(BasicStoreConfig, StorePlugin):
                     s.price = price
                     s.detail_item = id.strip()
                     s.drm = SearchResult.DRM_UNLOCKED
-                    #s.formats = formats.upper().strip()
+                    s.formats = formats.upper()
 
                     yield s
                 if not doc.xpath('//span[@class="next"]/a'):

From 1e163cbe102411f28a4f42a73c644eefdb881201 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2013 09:37:26 +0530
Subject: [PATCH 0390/1154] Fix crash when using %e with strftime on windows

Fixes #1206705 [strftime crashes under Windows with %e](https://bugs.launchpad.net/calibre/+bug/1206705)
---
 src/calibre/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index eaf5102aa1..1383fae540 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -509,6 +509,7 @@ def strftime(fmt, t=None):
     if iswindows:
         if isinstance(fmt, unicode):
             fmt = fmt.encode('mbcs')
+        fmt = fmt.replace(b'%e', b'%#d')
         ans = plugins['winutil'][0].strftime(fmt, t)
     else:
         ans = time.strftime(fmt, t).decode(preferred_encoding, 'replace')

From 929fa49d7a6b2195d1452a921f67667d57c480ad Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2013 13:33:58 +0530
Subject: [PATCH 0391/1154] Move mirror domain name to fosshub.com

---
 setup/file_hosting_servers.rst | 2 +-
 setup/hosting.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index 5b494cf066..ece966490c 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -46,7 +46,7 @@ Services
 SSH into sourceforge and downloadbestsoftware so that their host keys are
 stored.
 
-   ssh -oStrictHostKeyChecking=no kovid@www.downloadbestsoft-mirror1.com
+   ssh -oStrictHostKeyChecking=no kovid@mirror1.fosshub.com
    ssh -oStrictHostKeyChecking=no kovidgoyal,calibre@frs.sourceforge.net
    ssh -oStrictHostKeyChecking=no files.calibre-ebook.com (and whatever other mirrors are present)
 
diff --git a/setup/hosting.py b/setup/hosting.py
index 273da37706..7d16354bd4 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -508,7 +508,7 @@ def upload_to_servers(files, version):  # {{{
 
 def upload_to_dbs(files, version):  # {{{
     print('Uploading to fosshub.com')
-    server = 'www.downloadbestsoft-mirror1.com'
+    server = 'mirror1.fosshub.com'
     rdir = 'release/'
     check_call(['ssh', 'kovid@%s' % server, 'rm -f release/*'])
     for x in files:

From 34f57e27ebe1f018bb554a60ad0e213a4e7f9ff5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2013 13:57:47 +0530
Subject: [PATCH 0392/1154] Nicer interface to library metadata backups

---
 src/calibre/gui2/actions/choose_library.py | 65 +++++++++++++++++-----
 1 file changed, 50 insertions(+), 15 deletions(-)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index eb34aec6eb..f50aa95443 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -5,12 +5,12 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, posixpath
+import os, posixpath, weakref
 from functools import partial
 
 from PyQt4.Qt import (QMenu, Qt, QInputDialog, QToolButton, QDialog,
         QDialogButtonBox, QGridLayout, QLabel, QLineEdit, QIcon, QSize,
-        QCoreApplication, pyqtSignal)
+        QCoreApplication, pyqtSignal, QVBoxLayout, QTimer)
 
 from calibre import isbytestring, sanitize_file_name_unicode
 from calibre.constants import (filesystem_encoding, iswindows,
@@ -152,6 +152,52 @@ class MovedDialog(QDialog):  # {{{
         QDialog.accept(self)
 # }}}
 
+class BackupStatus(QDialog):  # {{{
+
+    def __init__(self, gui):
+        QDialog.__init__(self, gui)
+        self.l = l = QVBoxLayout(self)
+        self.msg = QLabel('')
+        self.msg.setWordWrap(True)
+        l.addWidget(self.msg)
+        self.bb = bb = QDialogButtonBox(QDialogButtonBox.Close)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+        b = bb.addButton(_('Queue &all books for backup'), bb.ActionRole)
+        b.clicked.connect(self.mark_all_dirty)
+        b.setIcon(QIcon(I('lt.png')))
+        l.addWidget(bb)
+        self.db = weakref.ref(gui.current_db)
+        self.setResult(9)
+        self.setWindowTitle(_('Backup status'))
+        self.update()
+        self.resize(self.sizeHint())
+
+    def update(self):
+        db = self.db()
+        if db is None:
+            return
+        if self.result() != 9:
+            return
+        dirty_text = 'no'
+        try:
+            dirty_text = '%s' % db.dirty_queue_length()
+        except:
+            dirty_text = _('none')
+        self.msg.setText('<p>' +
+                _('Book metadata files remaining to be written: %s') % dirty_text)
+        QTimer.singleShot(1000, self.update)
+
+    def mark_all_dirty(self):
+        db = self.db()
+        if hasattr(db, 'new_api'):
+            db.new_api.mark_as_dirty(db.new_api.all_book_ids())
+        else:
+            db.dirtied(list(db.data.iterallids()))
+
+# }}}
+
+
 class ChooseLibraryAction(InterfaceAction):
 
     name = 'Choose Library'
@@ -212,10 +258,6 @@ class ChooseLibraryAction(InterfaceAction):
                         'lt.png', None, None), attr='action_backup_status')
         ac.triggered.connect(self.backup_status, type=Qt.QueuedConnection)
         self.maintenance_menu.addAction(ac)
-        ac = self.create_action(spec=(_('Start backing up metadata of all books'),
-                        'lt.png', None, None), attr='action_backup_metadata')
-        ac.triggered.connect(self.mark_dirty, type=Qt.QueuedConnection)
-        self.maintenance_menu.addAction(ac)
         ac = self.create_action(spec=(_('Check library'), 'lt.png',
                                       None, None), attr='action_check_library')
         ac.triggered.connect(self.check_library, type=Qt.QueuedConnection)
@@ -373,15 +415,8 @@ class ChooseLibraryAction(InterfaceAction):
             open_local_file(loc)
 
     def backup_status(self, location):
-        dirty_text = 'no'
-        try:
-            dirty_text = \
-                  unicode(self.gui.current_db.dirty_queue_length())
-        except:
-            dirty_text = _('none')
-        info_dialog(self.gui, _('Backup status'), '<p>'+
-                _('Book metadata files remaining to be written: %s') % dirty_text,
-                show=True)
+        self.__backup_status_dialog = d = BackupStatus(self.gui)
+        d.show()
 
     def mark_dirty(self):
         db = self.gui.library_view.model().db

From ca77e7561724083b3417f343b790fd00b6e0acdd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2013 17:30:03 +0530
Subject: [PATCH 0393/1154] ...

---
 manual/faq.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index e5a6342cf8..9809d4f22c 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -841,9 +841,10 @@ My antivirus program claims |app| is a virus/trojan?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The first thing to check is that you are downloading |app| from the official
-website: `<http://calibre-ebook.com/download>`_. |app| is a very popular program
-and unscrupulous people try to setup websites offering it for download to fool
-the unwary.
+website: `<http://calibre-ebook.com/download>`_. Make sure you are clicking the
+download links on the left, not the advertisements on the right. |app| is a
+very popular program and unscrupulous people try to setup websites offering it
+for download to fool the unwary.
 
 If you have the official download and your antivirus program is still claiming
 |app| is a virus, then, your antivirus program is wrong. Antivirus programs use

From 66fdd41e703ee33fb4a6727a5f7639fbe69681c5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2013 17:32:07 +0530
Subject: [PATCH 0394/1154] ...

---
 src/calibre/library/cli.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 37a690632d..325fa6cefe 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -1392,8 +1392,8 @@ def command_list_categories(args, dbpath):
 
     return parser
 
-def command_clone(args, dbpath):
-    parser = get_parser(_(
+def clone_option_parser():
+    return get_parser(_(
     '''\
 %prog clone path/to/new/library
 
@@ -1403,6 +1403,9 @@ same custom columns, virtual libraries and other settings as the current library
 The cloned library will contain no books. If you want to create a full duplicate, including
 all books, then simply use your filesystem tools to copy the library folder.
     '''))
+
+def command_clone(args, dbpath):
+    parser = clone_option_parser()
     opts, args = parser.parse_args(args)
     if len(args) < 1:
         parser.print_help()

From c075b6b401867b769976263919d368724dec1459 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2013 17:40:52 +0530
Subject: [PATCH 0395/1154] ...

---
 manual/custom.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manual/custom.py b/manual/custom.py
index 30ca28ec96..bffe3d914b 100644
--- a/manual/custom.py
+++ b/manual/custom.py
@@ -83,7 +83,6 @@ def generate_calibredb_help(preamble, info):
 
     global_options = '\n'.join(render_options('calibredb', groups, False, False))
 
-
     lines, toc = [], []
     for cmd in COMMANDS:
         args = []
@@ -99,7 +98,7 @@ def generate_calibredb_help(preamble, info):
         usage = [i for i in usage.replace('%prog', 'calibredb').splitlines()]
         cmdline = '    '+usage[0]
         usage = usage[1:]
-        usage = [i.replace(cmd, ':command:`%s`'%cmd) for i in usage]
+        usage = [re.sub(r'(%s)([^a-zA-Z0-9])'%cmd, r':command:`\1`\2', i) for i in usage]
         lines += ['.. code-block:: none', '', cmdline, '']
         lines += usage
         groups = [(None, None, parser.option_list)]
@@ -152,7 +151,6 @@ def generate_ebook_convert_help(preamble, info):
         prog = 'ebook-convert-'+(pl.name.lower().replace(' ', '-'))
         raw += '\n\n' + '\n'.join(render_options(prog, groups, False, True))
 
-
     update_cli_doc(os.path.join('cli', 'ebook-convert.rst'), raw, info)
 
 def update_cli_doc(path, raw, info):
@@ -200,7 +198,8 @@ def cli_docs(app):
     for script in entry_points['console_scripts'] + entry_points['gui_scripts']:
         module = script[script.index('=')+1:script.index(':')].strip()
         cmd = script[:script.index('=')].strip()
-        if cmd in ('calibre-complete', 'calibre-parallel'): continue
+        if cmd in ('calibre-complete', 'calibre-parallel'):
+            continue
         module = __import__(module, fromlist=[module.split('.')[-1]])
         if hasattr(module, 'option_parser'):
             documented_cmds.append((cmd, getattr(module, 'option_parser')()))
@@ -260,3 +259,4 @@ def setup(app):
 def finished(app, exception):
     pass
 
+

From 8713ebb0b17c2b8ac6d1cfad9dcc1f4796c1bcbe Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2013 18:00:10 +0530
Subject: [PATCH 0396/1154] newdb: Fix duplicates during adding creating blank
 book record

Fixes #1206830 [Problem when adding duplicate title](https://bugs.launchpad.net/calibre/+bug/1206830)
---
 src/calibre/db/legacy.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index bd595fb36f..a97e107c0e 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -202,7 +202,8 @@ class LibraryDatabase(object):
     # Adding books {{{
     def create_book_entry(self, mi, cover=None, add_duplicates=True, force_id=None):
         ret = self.new_api.create_book_entry(mi, cover=cover, add_duplicates=add_duplicates, force_id=force_id)
-        self.data.books_added((ret,))
+        if ret is not None:
+            self.data.books_added((ret,))
         return ret
 
     def add_books(self, paths, formats, metadata, add_duplicates=True, return_ids=False):
@@ -217,7 +218,8 @@ class LibraryDatabase(object):
                     paths.append(path)
             duplicates = (paths, formats, metadata)
         ids = book_ids if return_ids else len(book_ids)
-        self.data.books_added(book_ids)
+        if book_ids:
+            self.data.books_added(book_ids)
         return duplicates or None, ids
 
     def import_book(self, mi, formats, notify=True, import_hooks=True, apply_import_tags=True, preserve_uuid=False):
@@ -229,7 +231,8 @@ class LibraryDatabase(object):
             format_map[ext] = path
         book_ids, duplicates = self.new_api.add_books(
             [(mi, format_map)], add_duplicates=True, apply_import_tags=apply_import_tags, preserve_uuid=preserve_uuid, dbapi=self, run_hooks=import_hooks)
-        self.data.books_added(book_ids)
+        if book_ids:
+            self.data.books_added(book_ids)
         if notify:
             self.notify('add', book_ids)
         return book_ids[0]
@@ -250,12 +253,14 @@ class LibraryDatabase(object):
 
     def add_catalog(self, path, title):
         book_id = add_catalog(self.new_api, path, title)
-        self.data.books_added((book_id,))
+        if book_id is not None:
+            self.data.books_added((book_id,))
         return book_id
 
     def add_news(self, path, arg):
         book_id = add_news(self.new_api, path, arg)
-        self.data.books_added((book_id,))
+        if book_id is not None:
+            self.data.books_added((book_id,))
         return book_id
 
     def add_format(self, index, fmt, stream, index_is_id=False, path=None, notify=True, replace=True, copy_function=None):

From bd456d1b860f02c312570586053c9f119997ee91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 31 Jul 2013 16:53:27 +0200
Subject: [PATCH 0397/1154] add unicode_literals in koobe plugin

---
 src/calibre/gui2/store/stores/koobe_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/store/stores/koobe_plugin.py b/src/calibre/gui2/store/stores/koobe_plugin.py
index 52bdd41e54..b8b7386593 100644
--- a/src/calibre/gui2/store/stores/koobe_plugin.py
+++ b/src/calibre/gui2/store/stores/koobe_plugin.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (division, absolute_import, print_function)
+from __future__ import (unicode_literals, division, absolute_import, print_function)
 store_version = 3  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'

From ccb3eff05b65d4ee5680ee08a4b7b01f4340b50e Mon Sep 17 00:00:00 2001
From: Adam Victor Nazareth Brandizzi <adam@brandizzi.com.br>
Date: Wed, 31 Jul 2013 22:18:40 -0300
Subject: [PATCH 0398/1154] Fix the issue of renaming user categories to the
 same name it already has resulting in deletion of the category (see
 https://bugs.launchpad.net/calibre/+bug/1207131)

---
 src/calibre/gui2/tag_browser/model.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py
index 1b291930fd..ea0e5f5f68 100644
--- a/src/calibre/gui2/tag_browser/model.py
+++ b/src/calibre/gui2/tag_browser/model.py
@@ -971,6 +971,10 @@ class TagsModel(QAbstractItemModel): # {{{
             else:
                 nkey = ckey[:dotpos+1] + val
             nkey_lower = icu_lower(nkey)
+
+            if ckey == nkey:
+                return True
+
             for c in sorted(user_cats.keys(), key=sort_key):
                 if icu_lower(c).startswith(ckey_lower):
                     if len(c) == len(ckey):

From e2c3bb40a51a3f11137a047fbfe0d2d2edbb81e4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 07:41:49 +0530
Subject: [PATCH 0399/1154] newdb: Fix default value for identifiers is mutable

---
 src/calibre/db/fields.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 50fa658b29..e47e366c9b 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -410,7 +410,10 @@ class IdentifiersField(ManyToManyField):
     def for_book(self, book_id, default_value=None):
         ids = self.table.book_col_map.get(book_id, ())
         if not ids:
-            ids = default_value
+            try:
+                ids = default_value.copy()  # in case default_value is a mutable dict
+            except AttributeError:
+                ids = default_value
         return ids
 
     def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):

From d62006bc11e16235170e37ff5bfa139e22ec1f92 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 08:23:06 +0530
Subject: [PATCH 0400/1154] QDateTime->datetime faster and more robust

Fix editing of book metadata failing when its timestamp is out of range
for the system. Fixes #1191599 [Cannot edit simple ebook metadatas](https://bugs.launchpad.net/calibre/+bug/1191599)
---
 src/calibre/utils/date.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index dc8adc6b97..a0c1c77a7a 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -7,7 +7,7 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import re, time
-from datetime import datetime, time as dtime, timedelta
+from datetime import datetime, time as dtime, timedelta, MINYEAR, MAXYEAR
 from functools import partial
 
 from dateutil.tz import tzlocal, tzutc, EPOCHORDINAL
@@ -141,14 +141,26 @@ def dt_factory(time_t, assume_utc=False, as_utc=True):
         dt = dt.replace(tzinfo=_utc_tz if assume_utc else _local_tz)
     return dt.astimezone(_utc_tz if as_utc else _local_tz)
 
+safeyear = lambda x: min(max(x, MINYEAR), MAXYEAR)
+
 def qt_to_dt(qdate_or_qdatetime, as_utc=True):
-    from PyQt4.Qt import Qt
     o = qdate_or_qdatetime
     if hasattr(o, 'toUTC'):
         # QDateTime
-        o = unicode(o.toUTC().toString(Qt.ISODate))
-        return parse_date(o, assume_utc=True, as_utc=as_utc)
-    dt = datetime(o.year(), o.month(), o.day()).replace(tzinfo=_local_tz)
+        o = o.toUTC()
+        d, t = o.date(), o.time()
+        try:
+            ans = datetime(safeyear(d.year()), d.month(), d.day(), t.hour(), t.minute(), t.second(), t.msec()*1000, utc_tz)
+        except ValueError:
+            ans = datetime(safeyear(d.year()), d.month(), 1, t.hour(), t.minute(), t.second(), t.msec()*1000, utc_tz)
+        if not as_utc:
+            ans = ans.astimezone(local_tz)
+        return ans
+
+    try:
+        dt = datetime(safeyear(o.year()), o.month(), o.day()).replace(tzinfo=_local_tz)
+    except ValueError:
+        dt = datetime(safeyear(o.year()), o.month(), 1).replace(tzinfo=_local_tz)
     return dt.astimezone(_utc_tz if as_utc else _local_tz)
 
 def fromtimestamp(ctime, as_utc=True):

From 49eb89a59aacc719636ddd945e844e63e481c218 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 08:27:30 +0530
Subject: [PATCH 0401/1154] Update PC World

---
 recipes/pc_world.recipe | 49 ++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/recipes/pc_world.recipe b/recipes/pc_world.recipe
index 9b40b2e94b..714c205251 100644
--- a/recipes/pc_world.recipe
+++ b/recipes/pc_world.recipe
@@ -41,7 +41,7 @@ class pcWorld(BasicNewsRecipe):
         br = self.get_browser()
         br.open(url+'&print')
 
-        response = br.follow_link(url, nr = 0)
+        response = br.follow_link(url, nr=0)
         html = response.read()
 
         self.temp_files.append(PersistentTemporaryFile('_fa.html'))
@@ -49,10 +49,10 @@ class pcWorld(BasicNewsRecipe):
         self.temp_files[-1].close()
         return self.temp_files[-1].name
 
-    #keep_only_tags     = [
+    # keep_only_tags     = [
                             #dict(name='div', attrs={'class':'article'})
                         #]
-    #remove_tags        = [
+    # remove_tags        = [
                             #dict(name='div', attrs={'class':['toolBar','mac_tags','toolBar  btmTools','recommend longRecommend','recommend shortRecommend','textAds']}),
                             #dict(name='div', attrs={'id':['sidebar','comments','mac_tags']}),
                             #dict(name='ul', attrs={'class':['tools', 'tools clearfix']}),
@@ -60,28 +60,26 @@ class pcWorld(BasicNewsRecipe):
                             #dict(name='p', attrs={'id':'userDesire'})
                         #]
     feeds          = [
-                       (u'PCWorld Headlines', u'http://feeds.pcworld.com/pcworld/latestnews'),
-                       (u'How-To', u'http://feeds.pcworld.com/pcworld/update/howto'),
-                       (u'Today@PCWorld', u'http://feeds.pcworld.com/pcworld/blogs/todayatpcw'),
-                       (u'Reviews', u'http://feeds.pcworld.com/pcworld/update/reviews'),
-                       (u'Most Popular Downloads', u'http://feeds.pcworld.com/pcworld/downloads/monthly'),
-                       (u'Answer Lines', u'http://feeds.pcworld.com/pcworld/blogs/answer_line'),
-                       (u'Digital Focus', u'http://feeds.pcworld.com/pcworld/blogs/digital_focus'),
-                       (u'Download this', u'http://feeds.pcworld.com/pcworld/blogs/download_this/'),
-                       (u'Game on', u'http://feeds.pcworld.com/pcworld/blogs/game_on'),
-                       (u'Geek tech', u'http://feeds.pcworld.com/pcworld/blogs/geektech/'),
-                       (u'Hassle free PC', u'http://feeds.pcworld.com/pcworld/blogs/hassle-free_pc'),
-                       (u'Mobile computing', u'http://feeds.pcworld.com/pcworld/blogs/mobile_computing'),
-                       (u'Security alert', u'http://feeds.pcworld.com/pcworld/blogs/security_alert/'),
-                       (u'BizFeed', u'http://feeds.pcworld.com/pcworld/businesscenter/bizfeed/'),
-                       (u'The Cost Cutter', u'http://feeds.pcworld.com/pcworld/businesscenter/cost_cutter/'),
-                       (u'Linux line', u'http://feeds.pcworld.com/pcworld/businesscenter/linuxline/'),
-                       (u'Net Work', u'http://feeds.pcworld.com/pcworld/businesscenter/network/'),
-                       (u'Peer-to-Peer', u'http://feeds.pcworld.com/pcworld/businesscenter/peertopeer/'),
-                       (u'Tech inciter', u'http://feeds.pcworld.com/pcworld/businesscenter/tech_inciter/'),
-                       (u'Gadgets and gear', u'http://feeds.pcworld.com/pcworld/update/gadgets'),
-                       (u'Home Entertainment', u'http://feeds.pcworld.com/pcworld/update/home-entertainment'),
-                       (u'Mobile Devices', u'http://feeds.pcworld.com/pcworld/update/mobile-devices')
+                       (u'All Stories', u'http://www.pcworld.com/index.rss'),
+                       (u'Reviews', u'http://www.pcworld.com/reviews/index.rss'),
+                       (u'How-To', u'http://www.pcworld.com/howto/index.rss'),
+                       (u'Video', u'http://www.pcworld.com/video/index.rss'),
+                       (u'Game On', u'http://www.pcworld.com/column/game-on/index.rss'),
+                       (u'Hassle free PC', u'http://www.pcworld.com/column/hassle-free-pc/index.rss'),
+                       (u'Go Social', u'http://www.pcworld.com/column/go-social/index.rss'),
+                       (u'Linux Line', u'http://www.pcworld.com/column/linux-line/index.rss'),
+                       (u'Net Work', u'http://www.pcworld.com/column/net-work/index.rss'),
+                       (u'Security Alert', u'http://www.pcworld.com/column/security-alert/index.rss'),
+                       (u'Simply Business', u'http://www.pcworld.com/column/simply-business/index.rss'),
+                       (u'Business', u'http://www.pcworld.com/category/business/index.rss'),
+                       (u'Security & Privacy', u'http://www.pcworld.com/category/privacy/index.rss'),
+                       (u'Windows', u'http://www.pcworld.com/category/windows/index.rss'),
+                       (u'Laptops', u'http://www.pcworld.com/category/laptop-computers/index.rss'),
+                       (u'Software', u'http://www.pcworld.com/category/software/index.rss'),
+                       (u'Desktops', u'http://www.pcworld.com/category/desktop-computers/index.rss'),
+                       (u'Printers', u'http://www.pcworld.com/category/printers/index.rss'),
+                       (u'Phones', u'http://www.pcworld.com/category/phones/index.rss'),
+                       (u'Tablets', u'http://www.pcworld.com/category/tablets/index.rss')
                      ]
 
     extra_css = '''
@@ -103,3 +101,4 @@ class pcWorld(BasicNewsRecipe):
                 #articleHead p {font-size:15px;font-weight:bold;margin:0px;padding:0px;}
                 #articleHead .date {color:#999;margin:0px 0px 20px;padding:0px;}
                 '''
+

From 20f414a7f51e7a7c402e5bf53b2f01a9d5fe8afc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 09:10:40 +0530
Subject: [PATCH 0402/1154] Avoid unnecessary tracebacks when backing up
 metadata for deleted books

---
 src/calibre/db/backup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/backup.py b/src/calibre/db/backup.py
index 1a6ff13412..f0f2b07a54 100644
--- a/src/calibre/db/backup.py
+++ b/src/calibre/db/backup.py
@@ -81,6 +81,7 @@ class MetadataBackup(Thread):
 
         if mi is None:
             self.db.clear_dirtied(book_id, sequence)
+            return
 
         # Give the GUI thread a chance to do something. Python threads don't
         # have priorities, so this thread would naturally keep the processor

From fda8ce7abb0a007b2b53be2259fc89ea78e36e8d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 09:31:02 +0530
Subject: [PATCH 0403/1154] newdb: get_metadata() should have sorted formats
 list in mi.formats

---
 src/calibre/db/cache.py         | 2 +-
 src/calibre/db/lazy.py          | 2 +-
 src/calibre/db/tests/reading.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 283773ac58..28058d7e8a 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -223,7 +223,7 @@ class Cache(object):
             good_formats = None
         else:
             mi.format_metadata = FormatMetadata(self, book_id, formats)
-            good_formats = FormatsList(formats, mi.format_metadata)
+            good_formats = FormatsList(sorted(formats), mi.format_metadata)
         # These three attributes are returned by the db2 get_metadata(),
         # however, we dont actually use them anywhere other than templates, so
         # they have been removed, to avoid unnecessary overhead. The templates
diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 166627c438..73260c8ae7 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -175,7 +175,7 @@ def fmt_getter(field):
                 if m:
                     format_metadata[fmt] = m
         if field == 'formats':
-            return list(format_metadata) or None
+            return sorted(format_metadata) or None
         return format_metadata
     return func
 
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 66b1dacec4..56866f5aa7 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -478,7 +478,7 @@ class ReadingTest(BaseTest):
             for field in STANDARD_METADATA_FIELDS | {'#series_index'}:
                 f = lambda x: x
                 if field == 'formats':
-                    f = lambda x: x if x is None else set(x)
+                    f = lambda x: x if x is None else tuple(x)
                 self.assertEqual(f(getattr(mi, field)), f(getattr(pmi, field)),
                                 'Standard field: %s not the same for book %s' % (field, book_id))
                 self.assertEqual(mi.format_field(field), pmi.format_field(field),

From d38dffa86d5a4d3b2268be61b733db24aa778f80 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 10:35:31 +0530
Subject: [PATCH 0404/1154] Download tags from Amazon

When downloading metadata from Amazon, convert the amazon categories into
tags. You can turn this off by going to Preferences->Metadata download
and configuring the Amazon source. Fixes #1206763 [[Enhancement] Get tags from Amazon](https://bugs.launchpad.net/calibre/+bug/1206763)
---
 src/calibre/ebooks/metadata/sources/amazon.py | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 028bad6922..bc9b67c219 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -162,6 +162,18 @@ class Worker(Thread):  # Get details {{{
             '''
         self.language_names = {'Language', 'Sprache', 'Lingua', 'Idioma', 'Langue', '言語'}
 
+        self.tags_xpath = '''
+            descendant::h2[
+                text() = "Look for Similar Items by Category" or
+                text() = "Ähnliche Artikel finden" or
+                text() = "Buscar productos similares por categoría" or
+                text() = "Ricerca articoli simili per categoria" or
+                text() = "Rechercher des articles similaires par rubrique" or
+                text() = "Procure por itens similares por categoria" or
+                text() = "関連商品を探す"
+            ]/../descendant::ul/li
+        '''
+
         self.ratings_pat = re.compile(
             r'([0-9.]+) ?(out of|von|su|étoiles sur|つ星のうち|de un máximo de|de) ([\d\.]+)( (stars|Sternen|stelle|estrellas|estrelas)){0,1}')
 
@@ -312,6 +324,11 @@ class Worker(Thread):  # Get details {{{
         except:
             self.log.exception('Error parsing series for url: %r'%self.url)
 
+        try:
+            mi.tags = self.parse_tags(root)
+        except:
+            self.log.exception('Error parsing tags for url: %r'%self.url)
+
         try:
             self.cover_url = self.parse_cover(root, raw)
         except:
@@ -490,6 +507,23 @@ class Worker(Thread):  # Get details {{{
                     ans = (s, i)
         return ans
 
+    def parse_tags(self, root):
+        ans = []
+        exclude_tokens = {'kindle', 'a-z'}
+        exclude = {'special features', 'by authors', 'authors & illustrators', 'books', 'new; used & rental textbooks'}
+        seen = set()
+        for li in root.xpath(self.tags_xpath):
+            for i, a in enumerate(li.iterdescendants('a')):
+                if i > 0:
+                    # we ignore the first category since it is almost always too broad
+                    raw = (a.text or '').strip().replace(',', ';')
+                    lraw = icu_lower(raw)
+                    tokens = frozenset(lraw.split())
+                    if raw and lraw not in exclude and not tokens.intersection(exclude_tokens) and lraw not in seen:
+                        ans.append(raw)
+                        seen.add(lraw)
+        return ans
+
     def parse_cover(self, root, raw=b""):
         imgs = root.xpath('//img[(@id="prodImage" or @id="original-main-image" or @id="main-image") and @src]')
         if not imgs:
@@ -588,7 +622,7 @@ class Amazon(Source):
     capabilities = frozenset(['identify', 'cover'])
     touched_fields = frozenset(['title', 'authors', 'identifier:amazon',
         'identifier:isbn', 'rating', 'comments', 'publisher', 'pubdate',
-        'languages', 'series'])
+        'languages', 'series', 'tags'])
     has_html_comments = True
     supports_gzip_transfer_encoding = True
 

From 7cbad00c25bd26ecbc9170222889a21baeba68db Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Thu, 1 Aug 2013 12:25:51 +1000
Subject: [PATCH 0405/1154] Append and modify CSS when sending epubs to Kobo
 devices

This allows users to have a "kobo_extra.css" file in the root of their
device containing CSS rules. This will be appended to all stylesheets in
the epub. As well, if the extra rules contain an @page rule, any
existing @page rules will be stripped from the stylesheets. Finally, if
any of the extra rules include "widows" and "orphans" settings, these
are stripped from the rules in the stylesheets.
---
 src/calibre/devices/kobo/driver.py | 123 +++++++++++++++++++++++++++--
 1 file changed, 118 insertions(+), 5 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index feedab0127..89b6b39549 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -28,6 +28,15 @@ from calibre.ptempfile import PersistentTemporaryFile
 from calibre.constants import DEBUG
 from calibre.utils.config_base import prefs
 
+EPUB_EXT = '.epub'
+
+
+class DummyCSSPreProcessor(object):
+
+    def __call__(self, data, add_namespace=False):
+
+        return data
+
 
 class KOBO(USBMS):
 
@@ -35,7 +44,7 @@ class KOBO(USBMS):
     gui_name = 'Kobo Reader'
     description = _('Communicate with the Kobo Reader')
     author = 'Timothy Legge and David Forrester'
-    version = (2, 0, 13)
+    version = (2, 1, 0)
 
     dbversion = 0
     fwversion = 0
@@ -1228,6 +1237,7 @@ class KOBOTOUCH(KOBO):
     book_class = Book
 
     MAX_PATH_LEN = 185  # 250 - (len(" - N3_LIBRARY_SHELF.parsed") + len("F:\.kobo\images\"))
+    KOBO_EXTRA_CSSFILE = 'kobo_extra.css'
 
     EXTRA_CUSTOMIZATION_MESSAGE = [
             _('The Kobo Touch from firmware V2.0.0 supports bookshelves.')+\
@@ -1259,6 +1269,11 @@ class KOBOTOUCH(KOBO):
                     'This is not read by the device from the sideloaded books. '
                     'Series information can only be added to the device after the book has been processed by the device. '
                     'Enable if you wish to set series information.'),
+            _('Modify CSS') +
+            ':::'+_('This allows addition of user CSS rules and removal of some CSS. '
+                    'When sending a book, the driver adds the contents of ' + KOBO_EXTRA_CSSFILE + ' to all stylesheets in the ePub. '
+                    'This file is searched for in the root directory of the main memory of the device. '
+                    'As well as this, if the file contains settings for the "orphans" or "widows", these are removed for all styles in the original stylesheet.'),
             _('Attempt to support newer firmware') +
             ':::'+_('Kobo routinely updates the firmware and the '
                 'database version.  With this option Calibre will attempt '
@@ -1284,6 +1299,7 @@ class KOBOTOUCH(KOBO):
             False,
             False,
             False,
+            False,
             u''
             ]
 
@@ -1297,8 +1313,9 @@ class KOBOTOUCH(KOBO):
     OPT_SHOW_PREVIEWS               = 7
     OPT_SHOW_RECOMMENDATIONS        = 8
     OPT_UPDATE_SERIES_DETAILS       = 9
-    OPT_SUPPORT_NEWER_FIRMWARE      = 10
-    OPT_DEBUGGING_TITLE             = 11
+    OPT_MODIFY_CSS                  = 10
+    OPT_SUPPORT_NEWER_FIRMWARE      = 11
+    OPT_DEBUGGING_TITLE             = 12
 
     opts = None
 
@@ -1805,11 +1822,41 @@ class KOBOTOUCH(KOBO):
             debug_print("KoboTouch:imagefilename_from_imageID - no cover image found - ImageID=%s" % (ImageID))
         return None
 
+
+    def get_extra_css(self):
+        extra_sheet = None
+        
+        if self.modifying_css():
+            extra_css_path = os.path.join(self._main_prefix, self.KOBO_EXTRA_CSSFILE)
+            if os.path.exists(extra_css_path):
+                from cssutils import parseFile as cssparseFile
+                try:
+                    extra_sheet = cssparseFile(extra_css_path)
+                    debug_print("KoboTouch:get_extra_css: Using extra CSS in {0} ({1} rules)".format(extra_css_path, len(extra_sheet.cssRules)))
+                except Exception as e:
+                    debug_print("KoboTouch:get_extra_css: Problem parsing extra CSS file {0}".format(extra_css_path))
+                    debug_print("KoboTouch:get_extra_css: Exception {0}".format(e))
+        return extra_sheet
+
+
     def upload_books(self, files, names, on_card=None, end_session=True,
                      metadata=None):
         debug_print('KoboTouch:upload_books - %d books'%(len(files)))
         debug_print('KoboTouch:upload_books - files=', files)
 
+        if self.modifying_epub():
+            self.extra_sheet = self.get_extra_css()
+            i = 0
+            for file, n, mi in zip(files, names, metadata):
+                debug_print("KoboTouch:upload_books: Processing book: {0} by {1}".format(mi.title, " and ".join(mi.authors)))
+                debug_print("KoboTouch:upload_books: file=%s, name=%s" % (file, n))
+                self.report_progress(i / float(len(files)), "Processing book: {0} by {1}".format(mi.title, " and ".join(mi.authors)))
+                mi.kte_calibre_name = n
+                self._modify_epub(file, mi)
+                i += 1
+
+        self.report_progress(0, 'Working...')
+
         result = super(KOBOTOUCH, self).upload_books(files, names, on_card, end_session, metadata)
 #        debug_print('KoboTouch:upload_books - result=', result)
 
@@ -1848,6 +1895,65 @@ class KOBOTOUCH(KOBO):
         return result
 
 
+    def _modify_epub(self, file, metadata, container=None):
+        debug_print("KoboTouch:_modify_epub:Processing {0} - {1}".format(metadata.author_sort, metadata.title))
+        
+        # Currently only modifying CSS, so if no stylesheet, don't do anything
+        if not self.extra_sheet:
+            return True
+
+        commit_container = False
+        if not container:
+            commit_container = True
+            try:
+                from calibre.ebooks.oeb.polish.container import get_container
+                debug_print("KoboTouch:_modify_epub: creating container")
+                container = get_container(file)
+                container.css_preprocessor = DummyCSSPreProcessor()
+            except Exception as e:
+                debug_print("KoboTouch:_modify_epub: exception from get_container {0} - {1}".format(metadata.author_sort, metadata.title))
+                debug_print("KoboTouch:_modify_epub: exception is: {0}".format(e))
+                return False
+        else:
+            debug_print("KoboTouch:_modify_epub: received container")
+
+        cssnames = [n for n in container.name_path_map if n.endswith('.css')]
+        for cssname in cssnames:
+            newsheet = container.parsed(cssname)
+            oldrules = len(newsheet.cssRules)
+            # remove any existing @page rules in epub css 
+            # if css to be appended contains an @page rule
+            if self.extra_sheet and len([r for r in self.extra_sheet if r.type == r.PAGE_RULE]):
+                page_rules = [r for r in newsheet if r.type == r.PAGE_RULE]
+                if len(page_rules) > 0:
+                    debug_print("KoboTouch:_modify_epub:Removing existing @page rules")
+                    for rule in page_rules:
+                        rule.style = ''
+            # remove any existing widow/orphan settings in epub css 
+            # if css to be appended contains a widow/orphan rule or we there is no extra CSS file 
+            if (len([r for r in self.extra_sheet if r.type == r.STYLE_RULE \
+                and (r.style['widows'] or r.style['orphans'])]) > 0):
+                widow_orphan_rules = [r for r in newsheet if r.type == r.STYLE_RULE \
+                    and (r.style['widows'] or r.style['orphans'])]
+                if len(widow_orphan_rules) > 0:
+                    debug_print("KoboTouch:_modify_epub:Removing existing widows/orphans attribs")
+                    for rule in widow_orphan_rules:
+                        rule.style.removeProperty('widows')
+                        rule.style.removeProperty('orphans')
+            # append all rules from kobo extra css stylesheet
+            for addrule in [r for r in self.extra_sheet.cssRules]:
+                newsheet.insertRule(addrule, len(newsheet.cssRules))
+            debug_print("KoboTouch:_modify_epub:CSS rules {0} -> {1} ({2})".format(oldrules, len(newsheet.cssRules), cssname))
+            container.dirty(cssname)
+
+        if commit_container:
+            debug_print("KoboTouch:_modify_epub: committing container.")
+            os.unlink(file)
+            container.commit(file)
+
+        return True
+
+
     def delete_via_sql(self, ContentID, ContentType):
         imageId = super(KOBOTOUCH, self).delete_via_sql(ContentID, ContentType)
 
@@ -1872,11 +1978,11 @@ class KOBOTOUCH(KOBO):
                     cursor.execute('delete from content where BookID is Null and ContentID =?',t)
 
                     # Remove the content_settings entry
-                    debug_print('KoboTouch:delete_via_sql: detete from content_settings')
+                    debug_print('KoboTouch:delete_via_sql: delete from content_settings')
                     cursor.execute('delete from content_settings where ContentID =?',t)
 
                     # Remove the ratings entry
-                    debug_print('KoboTouch:delete_via_sql: detete from ratings')
+                    debug_print('KoboTouch:delete_via_sql: delete from ratings')
                     cursor.execute('delete from ratings where ContentID =?',t)
 
                     # Remove any entries for the Activity table - removes tile from new home page
@@ -2636,6 +2742,13 @@ class KOBOTOUCH(KOBO):
         opts = self.settings()
         return opts.extra_customization[self.OPT_KEEP_COVER_ASPECT_RATIO]
 
+    def modifying_epub(self):
+        return self.modifying_css()
+
+    def modifying_css(self):
+        opts = self.settings()
+        return opts.extra_customization[self.OPT_MODIFY_CSS]
+
 
     def supports_bookshelves(self):
         return self.dbversion >= self.min_supported_dbversion

From 08819cb34086a19e304943b35e97a35539682c15 Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Thu, 1 Aug 2013 14:53:42 +1000
Subject: [PATCH 0406/1154] Kobo driver CSS modification should use mimetype

---
 src/calibre/devices/kobo/driver.py | 59 ++++++++++++++++--------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 89b6b39549..ec00ca8d57 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -1917,34 +1917,37 @@ class KOBOTOUCH(KOBO):
         else:
             debug_print("KoboTouch:_modify_epub: received container")
 
-        cssnames = [n for n in container.name_path_map if n.endswith('.css')]
-        for cssname in cssnames:
-            newsheet = container.parsed(cssname)
-            oldrules = len(newsheet.cssRules)
-            # remove any existing @page rules in epub css 
-            # if css to be appended contains an @page rule
-            if self.extra_sheet and len([r for r in self.extra_sheet if r.type == r.PAGE_RULE]):
-                page_rules = [r for r in newsheet if r.type == r.PAGE_RULE]
-                if len(page_rules) > 0:
-                    debug_print("KoboTouch:_modify_epub:Removing existing @page rules")
-                    for rule in page_rules:
-                        rule.style = ''
-            # remove any existing widow/orphan settings in epub css 
-            # if css to be appended contains a widow/orphan rule or we there is no extra CSS file 
-            if (len([r for r in self.extra_sheet if r.type == r.STYLE_RULE \
-                and (r.style['widows'] or r.style['orphans'])]) > 0):
-                widow_orphan_rules = [r for r in newsheet if r.type == r.STYLE_RULE \
-                    and (r.style['widows'] or r.style['orphans'])]
-                if len(widow_orphan_rules) > 0:
-                    debug_print("KoboTouch:_modify_epub:Removing existing widows/orphans attribs")
-                    for rule in widow_orphan_rules:
-                        rule.style.removeProperty('widows')
-                        rule.style.removeProperty('orphans')
-            # append all rules from kobo extra css stylesheet
-            for addrule in [r for r in self.extra_sheet.cssRules]:
-                newsheet.insertRule(addrule, len(newsheet.cssRules))
-            debug_print("KoboTouch:_modify_epub:CSS rules {0} -> {1} ({2})".format(oldrules, len(newsheet.cssRules), cssname))
-            container.dirty(cssname)
+#        cssnames = [n for n in container.name_path_map if n.endswith('.css')]
+#        for cssname in cssnames:
+        from calibre.ebooks.oeb.base import OEB_STYLES
+        for cssname, mt in container.mime_map.iteritems():
+            if mt in OEB_STYLES:
+                newsheet = container.parsed(cssname)
+                oldrules = len(newsheet.cssRules)
+                # remove any existing @page rules in epub css 
+                # if css to be appended contains an @page rule
+                if self.extra_sheet and len([r for r in self.extra_sheet if r.type == r.PAGE_RULE]):
+                    page_rules = [r for r in newsheet if r.type == r.PAGE_RULE]
+                    if len(page_rules) > 0:
+                        debug_print("KoboTouch:_modify_epub:Removing existing @page rules")
+                        for rule in page_rules:
+                            rule.style = ''
+                # remove any existing widow/orphan settings in epub css 
+                # if css to be appended contains a widow/orphan rule or we there is no extra CSS file 
+                if (len([r for r in self.extra_sheet if r.type == r.STYLE_RULE \
+                    and (r.style['widows'] or r.style['orphans'])]) > 0):
+                    widow_orphan_rules = [r for r in newsheet if r.type == r.STYLE_RULE \
+                        and (r.style['widows'] or r.style['orphans'])]
+                    if len(widow_orphan_rules) > 0:
+                        debug_print("KoboTouch:_modify_epub:Removing existing widows/orphans attribs")
+                        for rule in widow_orphan_rules:
+                            rule.style.removeProperty('widows')
+                            rule.style.removeProperty('orphans')
+                # append all rules from kobo extra css stylesheet
+                for addrule in [r for r in self.extra_sheet.cssRules]:
+                    newsheet.insertRule(addrule, len(newsheet.cssRules))
+                debug_print("KoboTouch:_modify_epub:CSS rules {0} -> {1} ({2})".format(oldrules, len(newsheet.cssRules), cssname))
+                container.dirty(cssname)
 
         if commit_container:
             debug_print("KoboTouch:_modify_epub: committing container.")

From 20caf3ac996e6aae26fadcdd29e4ff602521a9d6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 11:21:52 +0530
Subject: [PATCH 0407/1154] pep8 cleanup of kobo/driver.py

Kobo driver: Add an option to modify the styling in books being sent to
the device, based on a template on the device. Fixes #1207151 [Append and modify CSS when sending epubs to Kobo devices](https://bugs.launchpad.net/calibre/+bug/1207151)
---
 src/calibre/devices/kobo/driver.py | 244 ++++++++++++++---------------
 1 file changed, 117 insertions(+), 127 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index ec00ca8d57..907a8b309a 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -75,8 +75,8 @@ class KOBO(USBMS):
     VIRTUAL_BOOK_EXTENSIONS = frozenset(['kobo', ''])
 
     EXTRA_CUSTOMIZATION_MESSAGE = [
-            _('The Kobo supports several collections including ')+\
-                    'Read, Closed, Im_Reading. ' +\
+            _('The Kobo supports several collections including ')+
+                    'Read, Closed, Im_Reading. ' +
             _('Create tags for automatic management'),
             _('Upload covers for books (newer readers)') +
             ':::'+_('Normally, the KOBO readers get the cover image from the'
@@ -220,7 +220,7 @@ class KOBO(USBMS):
                             # Try the Touch version if the image does not exist
                             imagename = self.normalize_path(self._main_prefix + '.kobo/images/' + ImageID + ' - N3_LIBRARY_FULL.parsed')
 
-                        #print "Image name Normalized: " + imagename
+                        # print "Image name Normalized: " + imagename
                         if not os.path.exists(imagename):
                             debug_print("Strange - The image name does not exist - title: ", title)
                         if imagename is not None:
@@ -248,16 +248,16 @@ class KOBO(USBMS):
                                 book =  Book(prefix, lpath, title, authors, mime, date, ContentType, ImageID, size=1048576)
 
                         except:
-                            debug_print("prefix: ", prefix, "lpath: ", lpath, "title: ", title, "authors: ", authors, \
+                            debug_print("prefix: ", prefix, "lpath: ", lpath, "title: ", title, "authors: ", authors,
                                         "mime: ", mime, "date: ", date, "ContentType: ", ContentType, "ImageID: ", ImageID)
                             raise
 
                     # print 'Update booklist'
-                    book.device_collections = playlist_map.get(lpath,[])# if lpath in playlist_map else []
+                    book.device_collections = playlist_map.get(lpath,[])  # if lpath in playlist_map else []
 
                     if bl.add_book(book, replace_metadata=False):
                         changed = True
-            except: # Probably a path encoding error
+            except:  # Probably a path encoding error
                 import traceback
                 traceback.print_exc()
             return changed
@@ -280,35 +280,35 @@ class KOBO(USBMS):
 
             opts = self.settings()
             if self.dbversion >= 33:
-                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
-                    'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, IsDownloaded from content where ' \
-                    'BookID is Null %(previews)s %(recomendations)s and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
-                    if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')', \
-                    previews=' and Accessibility <> 6' \
-                    if opts.extra_customization[self.OPT_SHOW_PREVIEWS] == False else '', \
-                    recomendations=' and IsDownloaded in (\'true\', 1)' \
+                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
+                    'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, IsDownloaded from content where '
+                    'BookID is Null %(previews)s %(recomendations)s and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)'
+                    if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')',
+                    previews=' and Accessibility <> 6'
+                    if opts.extra_customization[self.OPT_SHOW_PREVIEWS] == False else '',
+                    recomendations=' and IsDownloaded in (\'true\', 1)'
                     if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] == False else '')
             elif self.dbversion >= 16 and self.dbversion < 33:
-                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
-                    'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, "1" as IsDownloaded from content where ' \
-                    'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
+                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
+                    'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, "1" as IsDownloaded from content where '
+                    'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)'
                     if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
             elif self.dbversion < 16 and self.dbversion >= 14:
-                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
-                    'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where ' \
-                    'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
+                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
+                    'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where '
+                    'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)'
                     if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
             elif self.dbversion < 14 and self.dbversion >= 8:
-                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
-                    'ImageID, ReadStatus, ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where ' \
-                    'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
+                query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
+                    'ImageID, ReadStatus, ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where '
+                    'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)'
                     if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
             else:
                 query= 'select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
                     'ImageID, ReadStatus, "-1" as ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where BookID is Null'
 
             try:
-                cursor.execute (query)
+                cursor.execute(query)
             except Exception as e:
                 err = str(e)
                 if not ('___ExpirationStatus' in err or 'FavouritesIndex' in err or
@@ -349,9 +349,9 @@ class KOBO(USBMS):
                 need_sync = True
                 del bl[idx]
 
-        #print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \
+        # print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \
         #      (len(bl_cache), len(bl), need_sync)
-        if need_sync: #self.count_found_in_bl != len(bl) or need_sync:
+        if need_sync:  # self.count_found_in_bl != len(bl) or need_sync:
             if oncard == 'cardb':
                 self.sync_booklists((None, None, bl))
             elif oncard == 'carda':
@@ -391,7 +391,7 @@ class KOBO(USBMS):
                 # Delete the shortcover_pages first
                 cursor.execute('delete from shortcover_page where shortcoverid in (select ContentID from content where BookID = ?)', t)
 
-            #Delete the volume_shortcovers second
+            # Delete the volume_shortcovers second
             cursor.execute('delete from volume_shortcovers where volumeid = ?', t)
 
             # Delete the rows from content_keys
@@ -405,18 +405,18 @@ class KOBO(USBMS):
             cursor.execute('delete from content where BookID = ?', t)
             if ContentType == 6:
                 try:
-                    cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\', ___PercentRead=0, ___ExpirationStatus=3 ' \
+                    cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\', ___PercentRead=0, ___ExpirationStatus=3 '
                         'where BookID is Null and ContentID =?',t)
                 except Exception as e:
                     if 'no such column' not in str(e):
                         raise
                     try:
-                        cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\', ___PercentRead=0 ' \
+                        cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\', ___PercentRead=0 '
                             'where BookID is Null and ContentID =?',t)
                     except Exception as e:
                         if 'no such column' not in str(e):
                             raise
-                        cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\' ' \
+                        cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\' '
                             'where BookID is Null and ContentID =?',t)
             else:
                 cursor.execute('delete from content where BookID is Null and ContentID =?',t)
@@ -436,7 +436,8 @@ class KOBO(USBMS):
             path_prefix = '.kobo/images/'
             path = self._main_prefix + path_prefix + ImageID
 
-            file_endings = (' - iPhoneThumbnail.parsed', ' - bbMediumGridList.parsed', ' - NickelBookCover.parsed', ' - N3_LIBRARY_FULL.parsed', ' - N3_LIBRARY_GRID.parsed', ' - N3_LIBRARY_LIST.parsed', ' - N3_SOCIAL_CURRENTREAD.parsed', ' - N3_FULL.parsed',)
+            file_endings = (' - iPhoneThumbnail.parsed', ' - bbMediumGridList.parsed', ' - NickelBookCover.parsed', ' - N3_LIBRARY_FULL.parsed',
+                            ' - N3_LIBRARY_GRID.parsed', ' - N3_LIBRARY_LIST.parsed', ' - N3_SOCIAL_CURRENTREAD.parsed', ' - N3_FULL.parsed',)
 
             for ending in file_endings:
                 fpath = path + ending
@@ -460,7 +461,7 @@ class KOBO(USBMS):
             ContentID = self.contentid_from_path(path, ContentType)
 
             ImageID = self.delete_via_sql(ContentID, ContentType)
-            #print " We would now delete the Images for" + ImageID
+            # print " We would now delete the Images for" + ImageID
             self.delete_images(ImageID, path)
 
             if os.path.exists(path):
@@ -493,9 +494,9 @@ class KOBO(USBMS):
             self.report_progress((i+1) / float(len(paths)), _('Removing books from device metadata listing...'))
             for bl in booklists:
                 for book in bl:
-                    #print "Book Path: " + book.path
+                    # print "Book Path: " + book.path
                     if path.endswith(book.path):
-                        #print "    Remove: " + book.path
+                        # print "    Remove: " + book.path
                         bl.remove_book(book)
         self.report_progress(1.0, _('Removing books from device metadata listing...'))
 
@@ -524,12 +525,12 @@ class KOBO(USBMS):
                 prints('in add_books_to_metadata. Prefix is None!', path,
                         self._main_prefix)
                 continue
-            #print "Add book to metatdata: "
-            #print "prefix: " + prefix
+            # print "Add book to metatdata: "
+            # print "prefix: " + prefix
             lpath = path.partition(prefix)[2]
             if lpath.startswith('/') or lpath.startswith('\\'):
                 lpath = lpath[1:]
-            #print "path: " + lpath
+            # print "path: " + lpath
             book = self.book_class(prefix, lpath, other=info)
             if book.size is None or book.size == 0:
                 book.size = os.stat(self.normalize_path(path)).st_size
@@ -551,12 +552,12 @@ class KOBO(USBMS):
 
             if self._card_a_prefix is not None:
                 ContentID = ContentID.replace(self._card_a_prefix, '')
-        elif ContentType == 999: # HTML Files
+        elif ContentType == 999:  # HTML Files
             ContentID = path
             ContentID = ContentID.replace(self._main_prefix, "/mnt/onboard/")
             if self._card_a_prefix is not None:
                 ContentID = ContentID.replace(self._card_a_prefix, "/mnt/sd/")
-        else: # ContentType = 16
+        else:  # ContentType = 16
             ContentID = path
             ContentID = ContentID.replace(self._main_prefix, "file:///mnt/onboard/")
             if self._card_a_prefix is not None:
@@ -574,7 +575,7 @@ class KOBO(USBMS):
     def get_content_type_from_extension(self, extension):
         if extension == '.kobo':
             # Kobo books do not have book files.  They do have some images though
-            #print "kobo book"
+            # print "kobo book"
             ContentType = 6
         elif extension == '.pdf' or extension == '.epub':
             # print "ePub or pdf"
@@ -585,8 +586,8 @@ class KOBO(USBMS):
                 ContentType = 999
             else:
                 ContentType = 901
-        else: # if extension == '.html' or extension == '.txt':
-            ContentType = 901 # Yet another hack: to get around Kobo changing how ContentID is stored
+        else:  # if extension == '.html' or extension == '.txt':
+            ContentType = 901  # Yet another hack: to get around Kobo changing how ContentID is stored
         return ContentType
 
     def path_from_contentid(self, ContentID, ContentType, MimeType, oncard):
@@ -706,7 +707,7 @@ class KOBO(USBMS):
             query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ContentID not like \'file:///mnt/sd/%\''
 
         try:
-            cursor.execute (query)
+            cursor.execute(query)
         except:
             debug_print('    Database Exception:  Unable to reset ReadStatus list')
             raise
@@ -747,7 +748,7 @@ class KOBO(USBMS):
 
         cursor = connection.cursor()
         try:
-            cursor.execute (query)
+            cursor.execute(query)
         except Exception as e:
             debug_print('    Database Exception:  Unable to reset Shortlist list')
             if 'no such column' not in str(e):
@@ -847,7 +848,7 @@ class KOBO(USBMS):
                             elif category in accessibilitylist.keys():
                                 # Do not manage the Accessibility List
                                 pass
-            else: # No collections
+            else:  # No collections
                 # Since no collections exist the ReadStatus needs to be reset to 0 (Unread)
                 debug_print("No Collections - reseting ReadStatus")
                 self.reset_readstatus(connection, oncard)
@@ -857,7 +858,6 @@ class KOBO(USBMS):
 
 #        debug_print('Finished update_device_database_collections', collections_attributes)
 
-
     def get_collections_attributes(self):
         collections = []
         opts = self.settings()
@@ -1107,15 +1107,15 @@ class KOBO(USBMS):
         spanTag['style'] = 'font-weight:normal'
         if bookmark.book_format == 'epub':
             spanTag.insert(0,NavigableString(
-                _("<hr /><b>Book Last Read:</b> %(time)s<br /><b>Percentage Read:</b> %(pr)d%%<hr />") % \
+                _("<hr /><b>Book Last Read:</b> %(time)s<br /><b>Percentage Read:</b> %(pr)d%%<hr />") %
                             dict(time=last_read,
-                            #loc=last_read_location,
+                            # loc=last_read_location,
                             pr=percent_read)))
         else:
             spanTag.insert(0,NavigableString(
-                _("<hr /><b>Book Last Read:</b> %(time)s<br /><b>Percentage Read:</b> %(pr)d%%<hr />") % \
+                _("<hr /><b>Book Last Read:</b> %(time)s<br /><b>Percentage Read:</b> %(pr)d%%<hr />") %
                             dict(time=last_read,
-                            #loc=last_read_location,
+                            # loc=last_read_location,
                             pr=percent_read)))
 
         divTag.insert(dtc, spanTag)
@@ -1131,7 +1131,7 @@ class KOBO(USBMS):
             for location in sorted(user_notes):
                 if user_notes[location]['type'] == 'Bookmark':
                     annotations.append(
-                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br />%(annotation)s<br /><hr />') % \
+                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br />%(annotation)s<br /><hr />') %
                             dict(chapter=user_notes[location]['chapter'],
                                 dl=user_notes[location]['displayed_location'],
                                 typ=user_notes[location]['type'],
@@ -1140,7 +1140,7 @@ class KOBO(USBMS):
                                 annotation=user_notes[location]['annotation'] if user_notes[location]['annotation'] is not None else ""))
                 elif user_notes[location]['type'] == 'Highlight':
                     annotations.append(
-                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><hr />') % \
+                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><hr />') %
                             dict(chapter=user_notes[location]['chapter'],
                                 dl=user_notes[location]['displayed_location'],
                                 typ=user_notes[location]['type'],
@@ -1149,7 +1149,7 @@ class KOBO(USBMS):
                                 text=user_notes[location]['text']))
                 elif user_notes[location]['type'] == 'Annotation':
                     annotations.append(
-                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><b>Notes:</b> %(annotation)s<br /><hr />') % \
+                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><b>Notes:</b> %(annotation)s<br /><hr />') %
                             dict(chapter=user_notes[location]['chapter'],
                                 dl=user_notes[location]['displayed_location'],
                                 typ=user_notes[location]['type'],
@@ -1159,13 +1159,13 @@ class KOBO(USBMS):
                                 annotation=user_notes[location]['annotation']))
                 else:
                     annotations.append(
-                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><b>Notes:</b> %(annotation)s<br /><hr />') % \
+                        _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><b>Notes:</b> %(annotation)s<br /><hr />') %
                             dict(chapter=user_notes[location]['chapter'],
                                 dl=user_notes[location]['displayed_location'],
                                 typ=user_notes[location]['type'],
                                 chapter_title=user_notes[location]['chapter_title'],
                                 chapter_progress=user_notes[location]['chapter_progress'],
-                                text=user_notes[location]['text'], \
+                                text=user_notes[location]['text'],
                                 annotation=user_notes[location]['annotation']))
 
             for annotation in annotations:
@@ -1240,8 +1240,8 @@ class KOBOTOUCH(KOBO):
     KOBO_EXTRA_CSSFILE = 'kobo_extra.css'
 
     EXTRA_CUSTOMIZATION_MESSAGE = [
-            _('The Kobo Touch from firmware V2.0.0 supports bookshelves.')+\
-                    'These are created on the Kobo Touch. ' +\
+            _('The Kobo Touch from firmware V2.0.0 supports bookshelves.')+
+                    'These are created on the Kobo Touch. ' +
                     _('Specify a tags type column for automatic management'),
             _('Create Bookshelves') +
             ':::'+_('Create new bookshelves on the Kobo Touch if they do not exist. This is only for firmware V2.0.0 or later.'),
@@ -1346,20 +1346,19 @@ class KOBOTOUCH(KOBO):
                           }
     AURA_HD_COVER_FILE_ENDINGS = {
                           ' - N3_FULL.parsed':        [(1080,1440), 0, 99,True,],  # Used for screensaver, home screen
-                          ' - N3_LIBRARY_FULL.parsed':[(355,  471), 0, 99,False,], # Used for Details screen
-                          ' - N3_LIBRARY_GRID.parsed':[(149,  198), 0, 99,False,], # Used for library lists
+                          ' - N3_LIBRARY_FULL.parsed':[(355,  471), 0, 99,False,],  # Used for Details screen
+                          ' - N3_LIBRARY_GRID.parsed':[(149,  198), 0, 99,False,],  # Used for library lists
                           }
-    #Following are the sizes used with pre2.1.4 firmware
+    # Following are the sizes used with pre2.1.4 firmware
 #    COVER_FILE_ENDINGS = {
-#                          ' - N3_LIBRARY_FULL.parsed':[(355,530),0, 99,],   # Used for Details screen
-##                          ' - N3_LIBRARY_FULL.parsed':[(600,800),0, 99,],
-#                          ' - N3_LIBRARY_GRID.parsed':[(149,233),0, 99,],   # Used for library lists
+# ' - N3_LIBRARY_FULL.parsed':[(355,530),0, 99,],   # Used for Details screen
+# ' - N3_LIBRARY_FULL.parsed':[(600,800),0, 99,],
+# ' - N3_LIBRARY_GRID.parsed':[(149,233),0, 99,],   # Used for library lists
 #                          ' - N3_LIBRARY_LIST.parsed':[(60,90),0, 53,],
 #                          ' - N3_LIBRARY_SHELF.parsed': [(40,60),0, 52,],
-#                          ' - N3_FULL.parsed':[(600,800),0, 99,],           # Used for screensaver if "Full screen" is checked.
+# ' - N3_FULL.parsed':[(600,800),0, 99,],           # Used for screensaver if "Full screen" is checked.
 #                          }
 
-
     def initialize(self):
         super(KOBOTOUCH, self).initialize()
         self.bookshelvelist = []
@@ -1368,7 +1367,6 @@ class KOBOTOUCH(KOBO):
         self.set_device_name()
         return super(KOBOTOUCH, self).get_device_information(end_session)
 
-
     def books(self, oncard=None, end_session=True):
         debug_print("KoboTouch:books - oncard='%s'"%oncard)
         from calibre.ebooks.metadata.meta import path_to_ext
@@ -1415,7 +1413,7 @@ class KOBOTOUCH(KOBO):
         debug_print("KoboTouch:books - prefs['manage_device_metadata']=", prefs['manage_device_metadata'])
         if opts.extra_customization:
             debugging_title = opts.extra_customization[self.OPT_DEBUGGING_TITLE]
-            debug_print("KoboTouch:books - set_debugging_title to '%s'" % debugging_title )
+            debug_print("KoboTouch:books - set_debugging_title to '%s'" % debugging_title)
             bl.set_debugging_title(debugging_title)
         debug_print("KoboTouch:books - length bl=%d"%len(bl))
         need_sync = self.parse_metadata_cache(bl, prefix, self.METADATA_CACHE)
@@ -1431,7 +1429,8 @@ class KOBOTOUCH(KOBO):
 #            show_debug = authors == 'L. Frank Baum'
             if show_debug:
                 debug_print("KoboTouch:update_booklist - title='%s'"%title, "ContentType=%s"%ContentType, "isdownloaded=", isdownloaded)
-                debug_print("         prefix=%s, mime=%s, date=%s, readstatus=%d, MimeType=%s, expired=%d, favouritesindex=%d, accessibility=%d, isdownloaded=%s"%
+                debug_print(
+                    "         prefix=%s, mime=%s, date=%s, readstatus=%d, MimeType=%s, expired=%d, favouritesindex=%d, accessibility=%d, isdownloaded=%s"%
                 (prefix, mime, date, readstatus, MimeType, expired, favouritesindex, accessibility, isdownloaded,))
             changed = False
             try:
@@ -1503,7 +1502,7 @@ class KOBOTOUCH(KOBO):
                 # print "Normalized FileName: " + path
 
                 idx = bl_cache.get(lpath, None)
-                if idx is not None:# and not (accessibility == 1 and isdownloaded == 'false'):
+                if idx is not None:  # and not (accessibility == 1 and isdownloaded == 'false'):
                     if show_debug:
                         self.debug_index = idx
                         debug_print("KoboTouch:update_booklist - idx=%d"%idx)
@@ -1556,7 +1555,7 @@ class KOBOTOUCH(KOBO):
                         if os.path.exists(self.normalize_path(os.path.join(prefix, lpath))):
                             book = self.book_from_path(prefix, lpath, title, authors, mime, date, ContentType, ImageID)
                         else:
-                            if isdownloaded == 'true': # A recommendation or preview is OK to not have a file
+                            if isdownloaded == 'true':  # A recommendation or preview is OK to not have a file
                                 debug_print("    Strange:  The file: ", prefix, lpath, " does not exist!")
                                 title = "FILE MISSING: " + title
                             book =  self.book_class(prefix, lpath, title, authors, mime, date, ContentType, ImageID, size=0)
@@ -1565,7 +1564,7 @@ class KOBOTOUCH(KOBO):
 
                     except Exception as e:
                         debug_print("KoboTouch:update_booklist - exception creating book: '%s'"%str(e))
-                        debug_print("        prefix: ", prefix, "lpath: ", lpath, "title: ", title, "authors: ", authors, \
+                        debug_print("        prefix: ", prefix, "lpath: ", lpath, "title: ", title, "authors: ", authors,
                                     "mime: ", mime, "date: ", date, "ContentType: ", ContentType, "ImageID: ", ImageID)
                         raise
 
@@ -1580,7 +1579,7 @@ class KOBOTOUCH(KOBO):
                         debug_print("    kobo_collections:", kobo_collections)
 
                     # print 'Update booklist'
-                    book.device_collections = playlist_map.get(lpath,[])# if lpath in playlist_map else []
+                    book.device_collections = playlist_map.get(lpath,[])  # if lpath in playlist_map else []
                     book.current_shelves    = bookshelves
                     book.kobo_collections   = kobo_collections
                     book.contentID          = ContentID
@@ -1594,7 +1593,7 @@ class KOBOTOUCH(KOBO):
                     if show_debug:
                         debug_print('        book.device_collections', book.device_collections)
                         debug_print('        book.title', book.title)
-            except: # Probably a path encoding error
+            except:  # Probably a path encoding error
                 import traceback
                 traceback.print_exc()
             return changed
@@ -1656,50 +1655,53 @@ class KOBOTOUCH(KOBO):
 
             where_clause = ''
             if self.supports_kobo_archive():
-                where_clause = (" where BookID is Null " \
-                    " and ((Accessibility = -1 and IsDownloaded in ('true', 1 )) or (Accessibility in (1,2) %(expiry)s) " \
-                    "    %(previews)s %(recomendations)s )" \
+                where_clause = (" where BookID is Null "
+                    " and ((Accessibility = -1 and IsDownloaded in ('true', 1 )) or (Accessibility in (1,2) %(expiry)s) "
+                    "    %(previews)s %(recomendations)s )"
                     " and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) and ContentType = 6)") % \
-                        dict(\
-                             expiry="" if opts.extra_customization[self.OPT_SHOW_ARCHIVED_BOOK_RECORDS] else "and IsDownloaded in ('true', 1)", \
-                             previews=" or (Accessibility in (6) and ___UserID <> '')" if opts.extra_customization[self.OPT_SHOW_PREVIEWS] else "", \
-                             recomendations=" or (Accessibility in (-1, 4, 6) and ___UserId = '')" if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] else "" \
+                        dict(
+                             expiry="" if opts.extra_customization[self.OPT_SHOW_ARCHIVED_BOOK_RECORDS] else "and IsDownloaded in ('true', 1)",
+                             previews=" or (Accessibility in (6) and ___UserID <> '')" if opts.extra_customization[self.OPT_SHOW_PREVIEWS] else "",
+                             recomendations=" or (Accessibility in (-1, 4, 6) and ___UserId = '')" if opts.extra_customization[
+                                                  self.OPT_SHOW_RECOMMENDATIONS] else ""
                              )
             elif self.supports_series():
-                where_clause = (" where BookID is Null " \
-                    " and ((Accessibility = -1 and IsDownloaded in ('true', 1)) or (Accessibility in (1,2)) %(previews)s %(recomendations)s )" \
+                where_clause = (" where BookID is Null "
+                    " and ((Accessibility = -1 and IsDownloaded in ('true', 1)) or (Accessibility in (1,2)) %(previews)s %(recomendations)s )"
                     " and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s)") % \
-                        dict(\
-                             expiry=" and ContentType = 6" if opts.extra_customization[self.OPT_SHOW_ARCHIVED_BOOK_RECORDS] else "", \
-                             previews=" or (Accessibility in (6) and ___UserID <> '')" if opts.extra_customization[self.OPT_SHOW_PREVIEWS] else "", \
-                             recomendations=" or (Accessibility in (-1, 4, 6) and ___UserId = '')" if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] else "" \
+                        dict(
+                             expiry=" and ContentType = 6" if opts.extra_customization[self.OPT_SHOW_ARCHIVED_BOOK_RECORDS] else "",
+                             previews=" or (Accessibility in (6) and ___UserID <> '')" if opts.extra_customization[self.OPT_SHOW_PREVIEWS] else "",
+                             recomendations=" or (Accessibility in (-1, 4, 6) and ___UserId = '')" if opts.extra_customization[
+                                                  self.OPT_SHOW_RECOMMENDATIONS] else ""
                              )
             elif self.dbversion >= 33:
                 where_clause = (' where BookID is Null %(previews)s %(recomendations)s and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s)') % \
-                        dict(\
-                             expiry=' and ContentType = 6' if opts.extra_customization[self.OPT_SHOW_ARCHIVED_BOOK_RECORDS] else '', \
-                             previews=' and Accessibility <> 6' if opts.extra_customization[self.OPT_SHOW_PREVIEWS] == False else '', \
-                             recomendations=' and IsDownloaded in (\'true\', 1)' if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] == False else ''\
+                        dict(
+                             expiry=' and ContentType = 6' if opts.extra_customization[self.OPT_SHOW_ARCHIVED_BOOK_RECORDS] else '',
+                             previews=' and Accessibility <> 6' if opts.extra_customization[self.OPT_SHOW_PREVIEWS] == False else '',
+                             recomendations=' and IsDownloaded in (\'true\', 1)' if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] == False else ''
                              )
             elif self.dbversion >= 16:
-                where_clause = (' where BookID is Null ' \
+                where_clause = (' where BookID is Null '
                     'and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s)') % \
                         dict(expiry=' and ContentType = 6' if opts.extra_customization[self.OPT_SHOW_ARCHIVED_BOOK_RECORDS] else '')
             else:
                 where_clause = ' where BookID is Null'
 
-            # Note: The card condition should not need the contentId test for the SD card. But the ExternalId does not get set for sideloaded kepubs on the SD card.
+            # Note: The card condition should not need the contentId test for the SD
+            # card. But the ExternalId does not get set for sideloaded kepubs on the
+            # SD card.
             card_condition = ''
             if self.has_externalid():
                 card_condition = " AND (externalId IS NOT NULL AND externalId <> '' OR contentId LIKE 'file:///mnt/sd/%')" if oncard == 'carda' else " AND (externalId IS NULL OR externalId = '') AND contentId NOT LIKE 'file:///mnt/sd/%'"
             else:
                 card_condition = " AND contentId LIKE 'file:///mnt/sd/%'" if oncard == 'carda' else " AND contentId NOT LIKE'file:///mnt/sd/%'"
 
-
             query = 'SELECT ' + columns + ' FROM content ' + where_clause + card_condition
             debug_print("KoboTouch:books - query=", query)
             try:
-                cursor.execute (query)
+                cursor.execute(query)
             except Exception as e:
                 err = str(e)
                 if not ('___ExpirationStatus' in err
@@ -1712,7 +1714,7 @@ class KOBOTOUCH(KOBO):
                     raise
                 query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
                     'ImageID, ReadStatus, "-1" as ___ExpirationStatus, "-1" as '
-                    'FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded, null as Series, null as SeriesNumber' \
+                    'FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded, null as Series, null as SeriesNumber'
                     ' from content where BookID is Null')
                 cursor.execute(query)
 
@@ -1737,7 +1739,8 @@ class KOBOTOUCH(KOBO):
                 bookshelves = get_bookshelvesforbook(connection, row[3])
 
                 prefix = self._card_a_prefix if oncard == 'carda' else self._main_prefix
-                changed = update_booklist(prefix,   path, row[0], row[1], mime, row[2], row[3], row[5], row[6], row[7], row[4], row[8], row[9], row[10], row[11], row[12], row[13], row[14], bookshelves)
+                changed = update_booklist(prefix,   path, row[0], row[1], mime, row[2], row[3], row[5], row[
+                                          6], row[7], row[4], row[8], row[9], row[10], row[11], row[12], row[13], row[14], bookshelves)
 
                 if changed:
                     need_sync = True
@@ -1759,11 +1762,11 @@ class KOBOTOUCH(KOBO):
 #                else:
 #                    debug_print("KoboTouch:books - Book in mtadata.calibre, on file system but not database - bl[idx].title:'%s'"%bl[idx].title)
 
-        #print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \
+        # print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \
         #      (len(bl_cache), len(bl), need_sync)
         # Bypassing the KOBO sync_booklists as that does things we don't need to do
         # Also forcing sync to see if this solves issues with updating shelves and matching books.
-        if need_sync or True: #self.count_found_in_bl != len(bl) or need_sync:
+        if need_sync or True:  # self.count_found_in_bl != len(bl) or need_sync:
             debug_print("KoboTouch:books - about to sync_booklists")
             if oncard == 'cardb':
                 USBMS.sync_booklists(self, (None, None, bl))
@@ -1786,7 +1789,7 @@ class KOBOTOUCH(KOBO):
         if oncard == 'cardb':
             print 'path from_contentid cardb'
         else:
-            if (ContentType == "6" or ContentType == "10"): # and MimeType == 'application/x-kobo-epub+zip':
+            if (ContentType == "6" or ContentType == "10"):  # and MimeType == 'application/x-kobo-epub+zip':
                 if path.startswith("file:///mnt/onboard/"):
                     path = self._main_prefix + path.replace("file:///mnt/onboard/", '')
                 elif path.startswith("file:///mnt/sd/"):
@@ -1804,7 +1807,6 @@ class KOBOTOUCH(KOBO):
 
         return path
 
-
     def imagefilename_from_imageID(self, prefix, ImageID):
         show_debug = self.is_debugging_title(ImageID)
 
@@ -1822,10 +1824,9 @@ class KOBOTOUCH(KOBO):
             debug_print("KoboTouch:imagefilename_from_imageID - no cover image found - ImageID=%s" % (ImageID))
         return None
 
-
     def get_extra_css(self):
         extra_sheet = None
-        
+
         if self.modifying_css():
             extra_css_path = os.path.join(self._main_prefix, self.KOBO_EXTRA_CSSFILE)
             if os.path.exists(extra_css_path):
@@ -1838,7 +1839,6 @@ class KOBOTOUCH(KOBO):
                     debug_print("KoboTouch:get_extra_css: Exception {0}".format(e))
         return extra_sheet
 
-
     def upload_books(self, files, names, on_card=None, end_session=True,
                      metadata=None):
         debug_print('KoboTouch:upload_books - %d books'%(len(files)))
@@ -1891,13 +1891,11 @@ class KOBOTOUCH(KOBO):
             except Exception as e:
                 debug_print('KoboTouch:upload_books - Exception:  %s'%str(e))
 
-
         return result
 
-
     def _modify_epub(self, file, metadata, container=None):
         debug_print("KoboTouch:_modify_epub:Processing {0} - {1}".format(metadata.author_sort, metadata.title))
-        
+
         # Currently only modifying CSS, so if no stylesheet, don't do anything
         if not self.extra_sheet:
             return True
@@ -1924,7 +1922,7 @@ class KOBOTOUCH(KOBO):
             if mt in OEB_STYLES:
                 newsheet = container.parsed(cssname)
                 oldrules = len(newsheet.cssRules)
-                # remove any existing @page rules in epub css 
+                # remove any existing @page rules in epub css
                 # if css to be appended contains an @page rule
                 if self.extra_sheet and len([r for r in self.extra_sheet if r.type == r.PAGE_RULE]):
                     page_rules = [r for r in newsheet if r.type == r.PAGE_RULE]
@@ -1932,11 +1930,11 @@ class KOBOTOUCH(KOBO):
                         debug_print("KoboTouch:_modify_epub:Removing existing @page rules")
                         for rule in page_rules:
                             rule.style = ''
-                # remove any existing widow/orphan settings in epub css 
-                # if css to be appended contains a widow/orphan rule or we there is no extra CSS file 
-                if (len([r for r in self.extra_sheet if r.type == r.STYLE_RULE \
+                # remove any existing widow/orphan settings in epub css
+                # if css to be appended contains a widow/orphan rule or we there is no extra CSS file
+                if (len([r for r in self.extra_sheet if r.type == r.STYLE_RULE
                     and (r.style['widows'] or r.style['orphans'])]) > 0):
-                    widow_orphan_rules = [r for r in newsheet if r.type == r.STYLE_RULE \
+                    widow_orphan_rules = [r for r in newsheet if r.type == r.STYLE_RULE
                         and (r.style['widows'] or r.style['orphans'])]
                     if len(widow_orphan_rules) > 0:
                         debug_print("KoboTouch:_modify_epub:Removing existing widows/orphans attribs")
@@ -1956,7 +1954,6 @@ class KOBOTOUCH(KOBO):
 
         return True
 
-
     def delete_via_sql(self, ContentID, ContentType):
         imageId = super(KOBOTOUCH, self).delete_via_sql(ContentID, ContentType)
 
@@ -1972,7 +1969,7 @@ class KOBOTOUCH(KOBO):
                     cursor = connection.cursor()
                     debug_print('KoboTouch:delete_via_sql: have cursor')
                     t = (ContentID,)
-                    #Delete from the Bookshelf
+                    # Delete from the Bookshelf
                     debug_print('KoboTouch:delete_via_sql: Delete from the Bookshelf')
                     cursor.execute('delete from ShelfContent where ContentID = ?', t)
 
@@ -2044,7 +2041,7 @@ class KOBOTOUCH(KOBO):
 
             if self._card_a_prefix is not None:
                 ContentID = ContentID.replace(self._card_a_prefix,  "file:///mnt/sd/")
-        else: # ContentType = 16
+        else:  # ContentType = 16
             debug_print("KoboTouch:contentid_from_path ContentType other than 6 - ContentType='%d'"%ContentType, "path='%s'"%path)
             ContentID = path
             ContentID = ContentID.replace(self._main_prefix, "file:///mnt/onboard/")
@@ -2108,7 +2105,7 @@ class KOBOTOUCH(KOBO):
             delete_empty_shelves    = opts.extra_customization[self.OPT_DELETE_BOOKSHELVES] and self.supports_bookshelves()
             update_series_details   = opts.extra_customization[self.OPT_UPDATE_SERIES_DETAILS] and self.supports_series()
             debugging_title         = opts.extra_customization[self.OPT_DEBUGGING_TITLE]
-            debug_print("KoboTouch:update_device_database_collections - set_debugging_title to '%s'" % debugging_title )
+            debug_print("KoboTouch:update_device_database_collections - set_debugging_title to '%s'" % debugging_title)
             booklists.set_debugging_title(debugging_title)
         else:
             delete_empty_shelves    = False
@@ -2213,7 +2210,7 @@ class KOBOTOUCH(KOBO):
                                     debug_print('            category not added to book.device_collections', book.device_collections)
                     debug_print("KoboTouch:update_device_database_collections - end for category='%s'"%category)
 
-            else: # No collections
+            else:  # No collections
                 # Since no collections exist the ReadStatus needs to be reset to 0 (Unread)
                 debug_print("No Collections - reseting ReadStatus")
                 if self.dbversion < 53:
@@ -2247,7 +2244,6 @@ class KOBOTOUCH(KOBO):
 
                 self.dump_bookshelves(connection)
 
-
         debug_print('KoboTouch:update_device_database_collections - Finished ')
 
     def rebuild_collections(self, booklist, oncard):
@@ -2292,7 +2288,6 @@ class KOBOTOUCH(KOBO):
         except Exception as e:
             debug_print('KoboTouch: FAILED to upload cover=%s Exception=%s'%(filepath, str(e)))
 
-
     def imageid_from_contentid(self, ContentID):
         ImageID = ContentID.replace('/', '_')
         ImageID = ImageID.replace(' ', '_')
@@ -2300,7 +2295,6 @@ class KOBOTOUCH(KOBO):
         ImageID = ImageID.replace('.', '_')
         return ImageID
 
-
     def images_path(self, path):
         if self._card_a_prefix and os.path.abspath(path).startswith(os.path.abspath(self._card_a_prefix)) and self.supports_covers_on_sdcard():
             path_prefix = 'koboExtStorage/images/'
@@ -2367,7 +2361,7 @@ class KOBOTOUCH(KOBO):
                                 debug_print("KoboTouch:_upload_cover - resize=%s min_dbversion=%d max_dbversion=%d" % (resize, min_dbversion, max_dbversion))
                             if self.dbversion >= min_dbversion and self.dbversion <= max_dbversion:
                                 if show_debug:
-                                    debug_print("KoboTouch:_upload_cover - creating cover for ending='%s'"%ending)#, "resize'%s'"%resize)
+                                    debug_print("KoboTouch:_upload_cover - creating cover for ending='%s'"%ending)  # , "resize'%s'"%resize)
                                 fpath = path + ending
                                 fpath = self.normalize_path(fpath.replace('/', os.sep))
 
@@ -2381,9 +2375,9 @@ class KOBOTOUCH(KOBO):
                                         width, height, fmt = identify_data(data)
                                         cover_aspect = width / height
                                         if cover_aspect > 1:
-                                            resize = (resize[0], int(resize[0] / cover_aspect ))
+                                            resize = (resize[0], int(resize[0] / cover_aspect))
                                         elif cover_aspect < 1:
-                                            resize = (int(cover_aspect * resize[1]), resize[1] )
+                                            resize = (int(cover_aspect * resize[1]), resize[1])
 
                                 # Return the data resized and in Grayscale if
                                 # required
@@ -2402,7 +2396,7 @@ class KOBOTOUCH(KOBO):
                 debug_print("KoboTouch:_upload_cover - ImageID could not be retrieved from the database")
 
     def remove_book_from_device_bookshelves(self, connection, book):
-        show_debug = self.is_debugging_title(book.title)# or True
+        show_debug = self.is_debugging_title(book.title)  # or True
 
         remove_shelf_list = set(book.current_shelves) - set(book.device_collections)
 
@@ -2687,7 +2681,6 @@ class KOBOTOUCH(KOBO):
         if show_debug:
             debug_print("KoboTouch:set_series - end")
 
-
     @classmethod
     def settings(cls):
         opts = cls._config().parse()
@@ -2710,7 +2703,6 @@ class KOBOTOUCH(KOBO):
                 opts.extra_customization = extra_customization
         return opts
 
-
     def isAuraHD(self):
         return self.detected_device.idProduct in self.AURA_HD_PRODUCT_ID
     def isGlo(self):
@@ -2736,7 +2728,6 @@ class KOBOTOUCH(KOBO):
         self.__class__.gui_name = device_name
         return device_name
 
-
     def copying_covers(self):
         opts = self.settings()
         return opts.extra_customization[self.OPT_UPLOAD_COVERS] or opts.extra_customization[self.OPT_KEEP_COVER_ASPECT_RATIO]
@@ -2752,7 +2743,6 @@ class KOBOTOUCH(KOBO):
         opts = self.settings()
         return opts.extra_customization[self.OPT_MODIFY_CSS]
 
-
     def supports_bookshelves(self):
         return self.dbversion >= self.min_supported_dbversion
 
@@ -2806,7 +2796,6 @@ class KOBOTOUCH(KOBO):
             # Supported database version
             return True
 
-
     @classmethod
     def is_debugging_title(cls, title):
         if not DEBUG:
@@ -2858,3 +2847,4 @@ class KOBOTOUCH(KOBO):
 
         cursor.close()
         debug_print('KoboTouch:dump_bookshelves - end')
+

From 8352b43e284d041bba8cf9096599b4d1403b96e0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 21:37:43 +0530
Subject: [PATCH 0408/1154] Unused import

---
 src/calibre/gui2/store/stores/cdp_plugin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/calibre/gui2/store/stores/cdp_plugin.py b/src/calibre/gui2/store/stores/cdp_plugin.py
index 738ee5e3d5..19b931b962 100644
--- a/src/calibre/gui2/store/stores/cdp_plugin.py
+++ b/src/calibre/gui2/store/stores/cdp_plugin.py
@@ -7,7 +7,6 @@ __license__ = 'GPL 3'
 __copyright__ = '2013, Tomasz Długosz <tomek3d@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
-import re
 import urllib
 from contextlib import closing
 

From e5e2eae97fb06ad4e3777960d14d1a8ff697ce32 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 07:21:27 +0530
Subject: [PATCH 0409/1154] Allow adding multiple books to running calibre

Allow adding multiple books to an already running calibre by passing
multiple file arguments to calibre.exe. Also change the .desktop file in
linux to indicate calibre can accept file arguments. Fixes #1207518 [Calibre is invisible in Ubuntu 13.04 "Open with" dialog](https://bugs.launchpad.net/calibre/+bug/1207518)
---
 src/calibre/gui2/main.py |  5 +++--
 src/calibre/gui2/ui.py   | 11 ++++++-----
 src/calibre/linux.py     |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index bcfc88d239..fc9c542b92 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -401,8 +401,9 @@ def communicate(opts, args):
         shutdown_other(t)
     else:
         if len(args) > 1:
-            args[1] = os.path.abspath(args[1])
-        t.conn.send('launched:'+repr(args))
+            args[1:] = [os.path.abspath(x) if os.path.exists(x) else x for x in args[1:]]
+        import json
+        t.conn.send('launched:'+json.dumps(args))
     t.conn.close()
     raise SystemExit(0)
 
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index e2f02eb578..43740876ea 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -520,11 +520,12 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         except Empty:
             return
         if msg.startswith('launched:'):
-            argv = eval(msg[len('launched:'):])
-            if len(argv) > 1:
-                path = os.path.abspath(argv[1])
-                if os.access(path, os.R_OK):
-                    self.iactions['Add Books'].add_filesystem_book(path)
+            import json
+            argv = json.loads(msg[len('launched:'):])
+            if isinstance(argv, (list, tuple)) and len(argv) > 1:
+                files = [os.path.abspath(p) for p in argv[1:] if not os.path.isdir(p) and os.access(p, os.R_OK)]
+                if files:
+                    self.iactions['Add Books'].add_filesystem_book(files)
             self.setWindowState(self.windowState() &
                     ~Qt.WindowMinimized|Qt.WindowActive)
             self.show_windows()
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 41af312c41..98d68816f3 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -833,7 +833,7 @@ Name=LRF Viewer
 GenericName=Viewer for LRF files
 Comment=Viewer for LRF files (SONY ebook format files)
 TryExec=lrfviewer
-Exec=lrfviewer %F
+Exec=lrfviewer %f
 Icon=calibre-viewer
 MimeType=application/x-sony-bbeb;
 Categories=Graphics;Viewer;
@@ -847,7 +847,7 @@ Name=E-book Viewer
 GenericName=Viewer for E-books
 Comment=Viewer for E-books in all the major formats
 TryExec=ebook-viewer
-Exec=ebook-viewer %F
+Exec=ebook-viewer %f
 Icon=calibre-viewer
 Categories=Graphics;Viewer;
 '''
@@ -857,7 +857,7 @@ GUI = '''\
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=calibre
+Name=calibre %F
 GenericName=E-book library management
 Comment=E-book library management: Convert, view, share, catalogue all your e-books
 TryExec=calibre

From c92910ea6e892d88a537b6c088eb16ee6151403b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 07:38:20 +0530
Subject: [PATCH 0410/1154] version 0.9.42

---
 Changelog.yaml           | 34 ++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index b379e92416..afd0516e1a 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,40 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.42
+  date: 2013-08-02
+
+  new features:
+    - title: "When downloading metadata from Amazon, convert the amazon categories into tags. You can turn this off by going to Preferences->Metadata download and configuring the Amazon source."
+      tickets: [1206763]
+
+    - title: "Kobo driver: Add an option to modify the styling in books being sent to the device, based on a template on the device."
+      tickets: [1207151]
+
+    - title: "Get Books: Add support for two more Polish ebook stores: cdp.pl and ebooki.allegro.pl"
+
+    - title: "calibredb: Add a new clone command to create clones of libraries with the same custom columns, virtual libraries, etc. as the current library."
+ 
+  bug fixes:
+    - title: "MOBI metadata: Do not fail to set metadata in MOBI files if they have EXTH fields with NULL pointers to a cover or thumbnail."
+      tickets: [1205757]
+
+    - title: "Fix editing of book metadata failing when its timestamp is out of range for the system."
+      tickets: [1191599]
+
+    - title: "Fix renaming a user category to the same name it already has erases the user category."
+      tickets: [1207131]
+
+    - title: "Fix drag 'n drop of cover onto conversion dialog not working"
+
+    - title: "Device drivers: Explicitly fsync() all files when writing to devices, to reduce chances of file corruption if the device is disconnected while jobs are running"
+
+    - title: "Fix calibre not appearing in Ubuntu's 'Open with..' menu"
+      tickets: [1207518]
+
+  improved recipes:
+    - PC World
+
 - version: 0.9.41
   date: 2013-07-27
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index d161a85b3c..c1ea2b80df 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 41)
+numeric_version = (0, 9, 42)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 3c777a815421a627453717324d5dbcc7aee79ae1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 16:35:54 +0530
Subject: [PATCH 0411/1154] Update The Scotsman

---
 recipes/the_scotsman.recipe | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/recipes/the_scotsman.recipe b/recipes/the_scotsman.recipe
index 0ea73e70b8..6db64cfcaa 100644
--- a/recipes/the_scotsman.recipe
+++ b/recipes/the_scotsman.recipe
@@ -17,6 +17,7 @@ class TheScotsman(BasicNewsRecipe):
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
+    auto_cleanup = True
     language              = 'en_GB'
     encoding              = 'utf-8'
     publication_type      = 'newspaper'
@@ -25,13 +26,13 @@ class TheScotsman(BasicNewsRecipe):
     extra_css             = 'body{font-family: Arial,Helvetica,sans-serif}'
     
     
-    keep_only_tags    = [dict(attrs={'class':'editorialSection'})]
-    remove_tags_after = dict(attrs={'class':'socialBookmarkPanel'})
-    remove_tags       = [
-                           dict(name=['meta','iframe','object','embed','link']),
-                           dict(attrs={'class':['secondaryArticlesNav','socialBookmarkPanel']}),
-                           dict(attrs={'id':'relatedArticles'})
-                        ]
+    #keep_only_tags    = [dict(attrs={'class':'editorialSection'})]
+    #remove_tags_after = dict(attrs={'class':'socialBookmarkPanel'})
+    #remove_tags       = [
+                           #dict(name=['meta','iframe','object','embed','link']),
+                           #dict(attrs={'class':['secondaryArticlesNav','socialBookmarkPanel']}),
+                           #dict(attrs={'id':'relatedArticles'})
+                        #]
     remove_attributes = ['lang']
     
     conversion_options = {
@@ -55,10 +56,10 @@ class TheScotsman(BasicNewsRecipe):
                         ('Opinion'      , 'http://www.scotsman.com/cmlink/1.957054' )
                      ]
                      
-    def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        for item in soup.findAll('img'):
-            if not item.has_key('alt'):
-               item['alt'] = 'image'
-        return soup
+    #def preprocess_html(self, soup):
+        #for item in soup.findAll(style=True):
+            #del item['style']
+        #for item in soup.findAll('img'):
+            #if not item.has_key('alt'):
+               #item['alt'] = 'image'
+        #return soup
\ No newline at end of file

From 211aff74d7499f42d8dd5f9be7018bf599a7ed50 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 16:46:15 +0530
Subject: [PATCH 0412/1154] ...

---
 recipes/the_scotsman.recipe | 50 +++++++++++++------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/recipes/the_scotsman.recipe b/recipes/the_scotsman.recipe
index 6db64cfcaa..ebffdf2698 100644
--- a/recipes/the_scotsman.recipe
+++ b/recipes/the_scotsman.recipe
@@ -1,4 +1,3 @@
-
 __license__   = 'GPL v3'
 __copyright__ = '2008 - 2011, Darko Miletic <darko.miletic at gmail.com>'
 '''
@@ -12,54 +11,39 @@ class TheScotsman(BasicNewsRecipe):
     __author__            = 'Darko Miletic'
     description           = 'News from Scotland'
     publisher             = 'Johnston Publishing Ltd.'
-    category              = 'news, politics, Scotland, UK'    
+    category              = 'news, politics, Scotland, UK'
     oldest_article        = 2
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
-    auto_cleanup = True
     language              = 'en_GB'
     encoding              = 'utf-8'
     publication_type      = 'newspaper'
-    remove_empty_feeds    = True    
+    remove_empty_feeds    = True
     masthead_url          = 'http://www.scotsman.com/webimage/swts_thescotsman_image_e_7_25526!image/3142543874.png_gen/derivatives/default/3142543874.png'
     extra_css             = 'body{font-family: Arial,Helvetica,sans-serif}'
-    
-    
-    #keep_only_tags    = [dict(attrs={'class':'editorialSection'})]
-    #remove_tags_after = dict(attrs={'class':'socialBookmarkPanel'})
-    #remove_tags       = [
-                           #dict(name=['meta','iframe','object','embed','link']),
-                           #dict(attrs={'class':['secondaryArticlesNav','socialBookmarkPanel']}),
-                           #dict(attrs={'id':'relatedArticles'})
-                        #]
+
+    keep_only_tags    = [dict(name='div', attrs={'class':'article'})]
     remove_attributes = ['lang']
-    
+
     conversion_options = {
                           'comment'   : description
                         , 'tags'      : category
                         , 'publisher' : publisher
                         , 'language'  : language
                         }
-    
+
     feeds          = [
-                        ('Latest News'  , 'http://www.scotsman.com/cmlink/1.957140' ),
-                        ('UK'           , 'http://www.scotsman.com/cmlink/1.957142' ),
-                        ('Scotland'     , 'http://www.scotsman.com/cmlink/1.957141' ),
-                        ('International', 'http://www.scotsman.com/cmlink/1.957143' ),
-                        ('Politics'     , 'http://www.scotsman.com/cmlink/1.957044' ),
+                        ('Latest News'  , 'http://www.scotsman.com/cmlink/1.957140'),
+                        ('UK'           , 'http://www.scotsman.com/cmlink/1.957142'),
+                        ('Scotland'     , 'http://www.scotsman.com/cmlink/1.957141'),
+                        ('International', 'http://www.scotsman.com/cmlink/1.957143'),
+                        ('Politics'     , 'http://www.scotsman.com/cmlink/1.957044'),
                         ('Arts'         , 'http://www.scotsman.com/cmlink/1.1804825'),
-                        ('Entertainment', 'http://www.scotsman.com/cmlink/1.957053' ),
-                        ('Sports'       , 'http://www.scotsman.com/cmlink/1.957151' ),
-                        ('Business'     , 'http://www.scotsman.com/cmlink/1.957156' ),                        
-                        ('Features'     , 'http://www.scotsman.com/cmlink/1.957149' ),
-                        ('Opinion'      , 'http://www.scotsman.com/cmlink/1.957054' )
+                        ('Entertainment', 'http://www.scotsman.com/cmlink/1.957053'),
+                        ('Sports'       , 'http://www.scotsman.com/cmlink/1.957151'),
+                        ('Business'     , 'http://www.scotsman.com/cmlink/1.957156'),
+                        ('Features'     , 'http://www.scotsman.com/cmlink/1.957149'),
+                        ('Opinion'      , 'http://www.scotsman.com/cmlink/1.957054')
                      ]
-                     
-    #def preprocess_html(self, soup):
-        #for item in soup.findAll(style=True):
-            #del item['style']
-        #for item in soup.findAll('img'):
-            #if not item.has_key('alt'):
-               #item['alt'] = 'image'
-        #return soup
\ No newline at end of file
+

From ed9e3ab4368965904cf64450c6175d27659bb54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Fri, 2 Aug 2013 23:34:11 +0200
Subject: [PATCH 0413/1154] move format detection to get_details()

---
 src/calibre/gui2/store/stores/cdp_plugin.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/store/stores/cdp_plugin.py b/src/calibre/gui2/store/stores/cdp_plugin.py
index 738ee5e3d5..1aacd23d00 100644
--- a/src/calibre/gui2/store/stores/cdp_plugin.py
+++ b/src/calibre/gui2/store/stores/cdp_plugin.py
@@ -62,11 +62,6 @@ class CdpStore(BasicStoreConfig, StorePlugin):
                     author = ''.join(data.xpath('.//div[@class="product-description"]//ul[@class="taxons"]/li[2]/a/text()'))
                     price = ''.join(data.xpath('.//span[@itemprop="price"]/text()'))
 
-                    with closing(br.open(id.strip(), timeout=timeout/4)) as nf:
-                        idata = html.fromstring(nf.read())
-                        formats = ', '.join(idata.xpath('//div[@id="product-bonus"]/div/ul/li/text()'))
-
-
                     counter -= 1
 
                     s = SearchResult()
@@ -76,9 +71,16 @@ class CdpStore(BasicStoreConfig, StorePlugin):
                     s.price = price
                     s.detail_item = id.strip()
                     s.drm = SearchResult.DRM_UNLOCKED
-                    s.formats = formats.upper()
 
                     yield s
                 if not doc.xpath('//span[@class="next"]/a'):
                     break
             page+=1
+
+    def get_details(self, search_result, timeout):
+        br = browser()
+        with closing(br.open(search_result.detail_item, timeout=timeout)) as nf:
+            idata = html.fromstring(nf.read())
+            formats = ', '.join(idata.xpath('//div[@id="product-bonus"]/div/ul/li/text()'))
+            search_result.formats = formats.upper()
+        return True

From 1c7a229ebca9a093e338a84c48fb85b76040c4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Sat, 3 Aug 2013 00:13:02 +0200
Subject: [PATCH 0414/1154] bump up plugin version

---
 src/calibre/gui2/store/stores/cdp_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/store/stores/cdp_plugin.py b/src/calibre/gui2/store/stores/cdp_plugin.py
index 1aacd23d00..4e696f822f 100644
--- a/src/calibre/gui2/store/stores/cdp_plugin.py
+++ b/src/calibre/gui2/store/stores/cdp_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 1 # Needed for dynamic plugin loading
+store_version = 2 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2013, Tomasz Długosz <tomek3d@gmail.com>'

From 8f1bf67ada75a1c7d28f0ca43fc1ea1793c63aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Sat, 3 Aug 2013 00:20:35 +0200
Subject: [PATCH 0415/1154] move format and DRM status detection to
 get_details()

---
 .../gui2/store/stores/legimi_plugin.py        | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/calibre/gui2/store/stores/legimi_plugin.py b/src/calibre/gui2/store/stores/legimi_plugin.py
index 1195866faa..0af9220f75 100644
--- a/src/calibre/gui2/store/stores/legimi_plugin.py
+++ b/src/calibre/gui2/store/stores/legimi_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 2 # Needed for dynamic plugin loading
+store_version = 3 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2013, Tomasz Długosz <tomek3d@gmail.com>'
@@ -45,7 +45,6 @@ class LegimiStore(BasicStoreConfig, StorePlugin):
         url = 'http://www.legimi.com/pl/ebooki/?szukaj=' + urllib.quote_plus(query)
 
         br = browser()
-        drm_pattern = re.compile("zabezpieczona DRM")
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
@@ -62,14 +61,6 @@ class LegimiStore(BasicStoreConfig, StorePlugin):
                 title = ''.join(data.xpath('.//span[@class="bookListTitle ellipsis"]/text()'))
                 author = ''.join(data.xpath('.//span[@class="bookListAuthor ellipsis"]/text()'))
                 price = ''.join(data.xpath('.//div[@class="bookListPrice"]/span/text()'))
-                formats = []
-                with closing(br.open(id.strip(), timeout=timeout/4)) as nf:
-                    idata = html.fromstring(nf.read())
-                    formatlist = idata.xpath('.//div[@id="fullBookFormats"]//span[@class="bookFormat"]/text()')
-                    for x in formatlist:
-                        if x.strip() not in formats:
-                            formats.append(x.strip())
-                    drm = drm_pattern.search(''.join(idata.xpath('.//div[@id="fullBookFormats"]/p/text()')))
 
                 counter -= 1
 
@@ -79,7 +70,20 @@ class LegimiStore(BasicStoreConfig, StorePlugin):
                 s.author = author.strip()
                 s.price = price
                 s.detail_item = 'http://www.legimi.com/' + id.strip()
-                s.formats = ', '.join(formats)
-                s.drm = SearchResult.DRM_LOCKED if drm else SearchResult.DRM_UNLOCKED
 
                 yield s
+
+    def get_details(self, search_result, timeout):
+        drm_pattern = re.compile("zabezpieczona DRM")
+        formats = []
+        br = browser()
+        with closing(br.open(search_result.detail_item, timeout=timeout)) as nf:
+            idata = html.fromstring(nf.read())
+            formatlist = idata.xpath('.//div[@id="fullBookFormats"]//span[@class="bookFormat"]/text()')
+            for x in formatlist:
+                if x.strip() not in formats:
+                    formats.append(x.strip())
+            drm = drm_pattern.search(''.join(idata.xpath('.//div[@id="fullBookFormats"]/p/text()')))
+            search_result.formats = ', '.join(formats)
+            search_result.drm = SearchResult.DRM_LOCKED if drm else SearchResult.DRM_UNLOCKED
+        return True

From 57437fb0b0774b54bb9282d2318f93fcaeed1174 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 3 Aug 2013 07:53:25 +0530
Subject: [PATCH 0416/1154] Fix incorrect error being raised when trying load a
 None object as an image with imagemagick.

---
 src/calibre/utils/magick/__init__.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/calibre/utils/magick/__init__.py b/src/calibre/utils/magick/__init__.py
index 01e0a7bdd8..99ed2d98be 100644
--- a/src/calibre/utils/magick/__init__.py
+++ b/src/calibre/utils/magick/__init__.py
@@ -60,12 +60,12 @@ class FontMetrics(object):
 
 # }}}
 
-class PixelWand(_magick.PixelWand): # {{{
+class PixelWand(_magick.PixelWand):  # {{{
     pass
 
 # }}}
 
-class DrawingWand(_magick.DrawingWand): # {{{
+class DrawingWand(_magick.DrawingWand):  # {{{
 
     @dynamic_property
     def font(self):
@@ -117,7 +117,7 @@ class DrawingWand(_magick.DrawingWand): # {{{
 
 # }}}
 
-class Image(_magick.Image): # {{{
+class Image(_magick.Image):  # {{{
 
     @property
     def clone(self):
@@ -126,9 +126,9 @@ class Image(_magick.Image): # {{{
         return ans
 
     def load(self, data):
-        data = bytes(data)
         if not data:
             raise ValueError('Cannot open image from empty data string')
+        data = bytes(data)
         return _magick.Image.load(self, data)
 
     def open(self, path_or_file):
@@ -165,7 +165,6 @@ class Image(_magick.Image): # {{{
             self.type_ = val
         return property(fget=fget, fset=fset, doc=_magick.Image.type_.__doc__)
 
-
     @dynamic_property
     def size(self):
         def fget(self):
@@ -181,7 +180,6 @@ class Image(_magick.Image): # {{{
             self.size_ = (int(val[0]), int(val[1]), filter, blur)
         return property(fget=fget, fset=fset, doc=_magick.Image.size_.__doc__)
 
-
     def save(self, path, format=None):
         if format is None:
             ext = os.path.splitext(path)[1]

From 27e5f2c94a00bf453fed7700e3302c2ef70d0c65 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 3 Aug 2013 13:37:10 +0530
Subject: [PATCH 0417/1154] Private Eye by Martyn Pritchard

---
 recipes/private_eye.recipe | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 recipes/private_eye.recipe

diff --git a/recipes/private_eye.recipe b/recipes/private_eye.recipe
new file mode 100644
index 0000000000..265812125d
--- /dev/null
+++ b/recipes/private_eye.recipe
@@ -0,0 +1,31 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1359406781(BasicNewsRecipe):
+    title          = u'Private Eye'
+    oldest_article = 15
+    max_articles_per_feed = 100
+    remove_empty_feeds = True
+    remove_javascript     = True
+    no_stylesheets = True
+    ignore_duplicate_articles = {'title'}
+    language = 'en_GB'
+    __author__ = 'Martyn Pritchard'
+    encoding     =  'iso-8859-1'
+    compress_news_images = True
+    compress_news_images_auto_size = 8
+    scale_news_images_to_device = False
+    scale_news_images = (220, 300)
+
+    def get_cover_url(self):
+            soup = self.index_to_soup('http://www.private-eye.co.uk')
+            cov = soup.find(attrs={'width' : '180', 'border' : '0'})
+            cover_url = 'http://www.private-eye.co.uk/'+cov['src']
+            return cover_url
+
+    keep_only_tags = [dict(name='table', attrs={'width':['100%'], 'border':['0'], 'align': ['center'], 'cellspacing':['0'], 'cellpadding':['0']}),
+                      dict(name='table', attrs={'width':['480'], 'cellspacing':['0'], 'cellpadding':['0']}),
+                      dict(name='table', attrs={'width':['490'], 'border':['0'], 'align': ['left'], 'cellspacing':['0'], 'cellpadding':['1']}),
+                      dict(name='table', attrs={'width':['500'], 'cellspacing':['0'], 'cellpadding':['0']}),
+                     ]
+
+    feeds          = [(u'Private Eye', u'http://www.private-eye.co.uk/rss/rss.php')]

From 34ed01dbd048b32bcf758a6af9d832f28d493830 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 3 Aug 2013 17:30:45 +0530
Subject: [PATCH 0418/1154] Initial implementation of plugins mirroring

---
 setup/plugins_mirror.py | 526 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 526 insertions(+)
 create mode 100644 setup/plugins_mirror.py

diff --git a/setup/plugins_mirror.py b/setup/plugins_mirror.py
new file mode 100644
index 0000000000..dca9595c75
--- /dev/null
+++ b/setup/plugins_mirror.py
@@ -0,0 +1,526 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import urllib2, re, HTMLParser, zlib, gzip, io, sys, bz2, json, errno, urlparse, os, zipfile, ast, tempfile, glob, fcntl, atexit
+from future_builtins import map, zip, filter
+from collections import namedtuple
+from multiprocessing.pool import ThreadPool
+from datetime import datetime
+from email.utils import parsedate
+from contextlib import closing
+from functools import partial
+from xml.sax.saxutils import escape, quoteattr
+
+USER_AGENT = 'calibre'
+MR_URL = 'http://www.mobileread.com/forums/'
+WORKDIR = '/srv/plugins' if os.path.exists('/srv') else '/t/plugins'
+PLUGINS = 'plugins.json.bz2'
+INDEX = MR_URL + 'showpost.php?p=1362767&postcount=1'
+# INDEX = 'file:///t/raw.html'
+
+IndexEntry = namedtuple('IndexEntry', 'name url donate history uninstall deprecated thread_id')
+u = HTMLParser.HTMLParser().unescape
+
+def read(url, get_info=False):  # {{{
+    if url.startswith("file://"):
+        return urllib2.urlopen(url).read()
+    opener = urllib2.build_opener()
+    opener.addheaders = [
+        ('User-Agent', USER_AGENT),
+        ('Accept-Encoding', 'gzip,deflate'),
+    ]
+    res = opener.open(url)
+    info = res.info()
+    encoding = info.get('Content-Encoding')
+    raw = res.read()
+    res.close()
+    if encoding and encoding.lower() in {'gzip', 'x-gzip', 'deflate'}:
+        if encoding.lower() == 'deflate':
+            raw = zlib.decompress(raw)
+        else:
+            raw = gzip.GzipFile(fileobj=io.BytesIO(raw)).read()
+    if get_info:
+        return raw, info
+    return raw
+# }}}
+
+def url_to_plugin_id(url, deprecated):
+    query = urlparse.parse_qs(urlparse.urlparse(url).query)
+    ans = (query['t'] if 't' in query else query['p'])[0]
+    if deprecated:
+        ans += '-deprecated'
+    return ans
+
+def parse_index(raw=None):  # {{{
+    raw = raw or read(INDEX).decode('utf-8', 'replace')
+
+    dep_start = raw.index('>Deprecated/Renamed/Retired Plugins:<')
+    dpat = re.compile(r'''(?is)Donate\s*:\s*<a\s+href=['"](.+?)['"]''')
+    key_pat = re.compile(r'''(?is)(History|Uninstall)\s*:\s*([^<;]+)[<;]''')
+    seen = {}
+
+    for match in re.finditer(r'''(?is)<li.+?<a\s+href=['"](http://www.mobileread.com/forums/showthread.php\?[pt]=\d+).+?>(.+?)<(.+?)</li>''', raw):
+        deprecated = match.start() > dep_start
+        donate = uninstall = None
+        history = False
+        name, url, rest = u(match.group(2)), u(match.group(1)), match.group(3)
+        m = dpat.search(rest)
+        if m is not None:
+            donate = u(m.group(1))
+        for m in key_pat.finditer(rest):
+            k = m.group(1).lower()
+            if k == 'history' and m.group(2).strip().lower() in {'yes', 'true'}:
+                history = True
+            elif k == 'uninstall':
+                uninstall = tuple(x.strip() for x in m.group(2).strip().split(','))
+
+        thread_id = url_to_plugin_id(url, deprecated)
+        if thread_id in seen:
+            raise ValueError('thread_id for %s and %s is the same: %s' % (seen[thread_id], name, thread_id))
+        seen[thread_id] = name
+        entry = IndexEntry(name, url, donate, history, uninstall, deprecated, thread_id)
+        yield entry
+# }}}
+
+def parse_plugin_zip_url(raw):
+    for m in re.finditer(r'''(?is)<a\s+href=['"](attachment.php\?[^'"]+?)['"][^>]*>([^<>]+?\.zip)\s*<''', raw):
+        url, name = u(m.group(1)), u(m.group(2).strip())
+        if name.lower().endswith('.zip'):
+            return MR_URL + url, name
+    return None, None
+
+def load_plugins_index():
+    try:
+        with open(PLUGINS, 'rb') as f:
+            raw = f.read()
+    except IOError as err:
+        if err.errno == errno.ENOENT:
+            return {}
+        raise
+    return json.loads(bz2.decompress(raw))
+
+# Get metadata from plugin zip file {{{
+def convert_node(fields, x, names={}):
+    name = x.__class__.__name__
+    conv = lambda x:convert_node(fields, x, names=names)
+    if name == 'Str':
+        return x.s.decode('utf-8') if isinstance(x.s, bytes) else x.s
+    elif name == 'Num':
+        return x.n
+    elif name in {'Set', 'List', 'Tuple'}:
+        func = {'Set':set, 'List':list, 'Tuple':tuple}[name]
+        return func(map(conv, x.elts))
+    elif name == 'Dict':
+        keys, values = map(conv, x.keys), map(conv, x.values)
+        return dict(zip(keys, values))
+    elif name == 'Call':
+        if len(x.args) != 1 and len(x.keywords) != 0:
+            raise TypeError('Unsupported function call for fields: %s' % (fields,))
+        return tuple(map(conv, x.args))[0]
+    elif name == 'Name':
+        if x.id not in names:
+            raise ValueError('Could not find name %s for fields: %s' % (x.id, fields))
+        return names[x.id]
+    raise TypeError('Unknown datatype %s for fields: %s' % (x, fields))
+
+Alias = namedtuple('Alias', 'name asname')
+
+def parse_metadata(raw):
+    module = ast.parse(raw, filename='__init__.py')
+    top_level_imports = filter(lambda x:x.__class__.__name__ == 'ImportFrom', ast.iter_child_nodes(module))
+    top_level_classes = tuple(filter(lambda x:x.__class__.__name__ == 'ClassDef', ast.iter_child_nodes(module)))
+    top_level_assigments = filter(lambda x:x.__class__.__name__ == 'Assign', ast.iter_child_nodes(module))
+    defaults = {'name':'', 'description':'', 'supported_platforms':['windows', 'osx', 'linux'],
+                'version':(1, 0, 0), 'author':'Unknown', 'minimum_calibre_version':(0, 9, 42)}
+    field_names = set(defaults)
+
+    plugin_import_found = set()
+    all_imports = []
+    for node in top_level_imports:
+        names = getattr(node, 'names', [])
+        mod = getattr(node, 'module', None)
+        if names and mod:
+            names = [Alias(n.name, getattr(n, 'asname', None)) for n in names]
+            if mod in {
+                'calibre.customize', 'calibre.customize.conversion',
+                'calibre.ebooks.metadata.sources.base', 'calibre.ebooks.metadata.covers',
+                'calibre.devices.interface', 'calibre.ebooks.metadata.fetch',
+                       } or re.match(r'calibre\.devices\.[a-z0-9]+\.driver', mod) is not None:
+                inames = {n.asname or n.name for n in names}
+                inames = {x for x in inames if x.lower() != x}
+                plugin_import_found |= inames
+            else:
+                all_imports.append((mod, [n.name for n in names]))
+    if not plugin_import_found:
+        return all_imports
+
+    names = {}
+    for node in top_level_assigments:
+        targets = {getattr(t, 'id', None) for t in node.targets}
+        targets.discard(None)
+        for x in targets - field_names:
+            try:
+                val = convert_node({x}, node.value)
+            except Exception:
+                pass
+            else:
+                names[x] = val
+
+    def parse_class(node):
+        class_assigments = filter(lambda x:x.__class__.__name__ == 'Assign', ast.iter_child_nodes(node))
+        found = {}
+        for node in class_assigments:
+            targets = {getattr(t, 'id', None) for t in node.targets}
+            targets.discard(None)
+            fields = field_names.intersection(targets)
+            if fields:
+                val = convert_node(fields, node.value, names=names)
+                for field in fields:
+                    found[field] = val
+        return found
+
+    if top_level_classes:
+        for node in top_level_classes:
+            bases = {getattr(x, 'id', None) for x in node.bases}
+            if not bases.intersection(plugin_import_found):
+                continue
+            found = parse_class(node)
+            if 'name' in found and 'author' in found:
+                defaults.update(found)
+                return defaults
+        for node in top_level_classes:
+            found = parse_class(node)
+            if 'name' in found and 'author' in found and 'version' in found:
+                defaults.update(found)
+                return defaults
+
+    raise ValueError('Could not find plugin class')
+
+def get_plugin_info(raw):
+    metadata = None
+    with zipfile.ZipFile(io.BytesIO(raw)) as zf:
+        names = {x.decode('utf-8') if isinstance(x, bytes) else x : x for x in zf.namelist()}
+        inits = [x for x in names if x.rpartition('/')[-1] == '__init__.py']
+        inits.sort(key=lambda x:x.count('/'))
+        if inits and inits[0] == '__init__.py':
+            metadata = names[inits[0]]
+        else:
+            # Legacy plugin
+            for name, val in names.iteritems():
+                if name.endswith('plugin.py'):
+                    metadata = val
+                    break
+        if metadata is None:
+            raise ValueError('No __init__.py found in plugin')
+        raw = zf.open(metadata).read()
+        ans = parse_metadata(raw)
+        if isinstance(ans, dict):
+            return ans
+        # The plugin is importing its base class from somewhere else, le sigh
+        for mod, _ in ans:
+            mod = mod.split('.')
+            if mod[0] == 'calibre_plugins':
+                mod = mod[2:]
+            mod = '/'.join(mod) + '.py'
+            if mod in names:
+                raw = zf.open(names[mod]).read()
+                ans = parse_metadata(raw)
+                if isinstance(ans, dict):
+                    return ans
+
+    raise ValueError('Failed to find plugin class')
+
+
+# }}}
+
+def update_plugin_from_entry(plugin, entry):
+    plugin['index_name'] = entry.name
+    plugin['thread_url'] = entry.url
+    for x in ('donate', 'history', 'deprecated', 'uninstall', 'thread_id'):
+        plugin[x] = getattr(entry, x)
+
+def fetch_plugin(old_index, entry):
+    lm_map = {plugin['thread_id']:plugin for plugin in old_index.itervalues()}
+    raw = read(entry.url)
+    url, name = parse_plugin_zip_url(raw)
+    plugin = lm_map.get(entry.thread_id, None)
+
+    if plugin is not None:
+        # Previously downloaded plugin
+        lm = datetime(*tuple(map(int, re.split(r'\D', plugin['last_modified'])))[:6])
+        request = urllib2.Request(url)
+        request.get_method = lambda : 'HEAD'
+        with closing(urllib2.urlopen(request)) as response:
+            info = response.info()
+        slm = datetime(*parsedate(info.get('Last-Modified'))[:6])
+        if lm >= slm:
+            # The previously downloaded plugin zip file is up-to-date
+            update_plugin_from_entry(plugin, entry)
+            return plugin
+
+    raw, info = read(url, get_info=True)
+    slm = datetime(*parsedate(info.get('Last-Modified'))[:6])
+    plugin = get_plugin_info(raw)
+    plugin['last_modified'] = slm.isoformat()
+    plugin['file'] = 'staging_%s.zip' % entry.thread_id
+    plugin['size'] = len(raw)
+    plugin['original_url'] = url
+    update_plugin_from_entry(plugin, entry)
+    with open(plugin['file'], 'wb') as f:
+        f.write(raw)
+    return plugin
+
+def parallel_fetch(old_index, entry):
+    try:
+        return fetch_plugin(old_index, entry)
+    except Exception:
+        import traceback
+        return traceback.format_exc()
+
+def log(*args, **kwargs):
+    print (*args, **kwargs)
+    with open('log', 'a') as f:
+        kwargs['file'] = f
+        print (*args, **kwargs)
+
+def atomic_write(raw, name):
+    with tempfile.NamedTemporaryFile(dir=os.getcwdu(), delete=False) as f:
+        f.write(raw)
+        os.rename(f.name, name)
+
+def fetch_plugins(old_index):
+    ans = {}
+    pool = ThreadPool(processes=10)
+    entries = tuple(parse_index())
+    result = pool.map(partial(parallel_fetch, old_index), entries)
+    for entry, plugin in zip(entries, result):
+        if isinstance(plugin, dict):
+            ans[entry.name] = plugin
+        else:
+            if entry.name in old_index:
+                ans[entry.name] = old_index[entry.name]
+            log('Failed to get plugin', entry.name, 'at', datetime.utcnow().isoformat(), 'with error:')
+            log(plugin)
+    # Move staged files
+    for plugin in ans.itervalues():
+        if plugin['file'].startswith('staging_'):
+            src = plugin['file']
+            plugin['file'] = src.partition('_')[-1]
+            os.rename(src, plugin['file'])
+    raw = bz2.compress(json.dumps(ans, sort_keys=True, indent=4, separators=(',', ': ')))
+    atomic_write(raw, PLUGINS)
+    # Cleanup any extra .zip files
+    all_plugin_files = {p['file'] for p in ans.itervalues()}
+    extra = set(glob.glob('*.zip')) - all_plugin_files
+    for x in extra:
+        os.unlink(x)
+    return ans
+
+def plugin_to_index(plugin):
+    title = '<h3><img src="http://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/32/Apps-preferences-plugin-icon.png"><a href=%s title="Plugin forum thread">%s</a></h3>' % (  # noqa
+        quoteattr(plugin['thread_url']), escape(plugin['name']))
+    released = datetime(*tuple(map(int, re.split(r'\D', plugin['last_modified'])))[:6]).strftime('%e %b, %Y').lstrip()
+    details = [
+        'Version: <b>%s</b>' % escape('.'.join(map(str, plugin['version']))),
+        'Released: <b>%s</b>' % escape(released),
+        'Author: %s' % escape(plugin['author']),
+        'History: %s' % escape('Yes' if plugin['history'] else 'No'),
+        'calibre: %s' % escape('.'.join(map(str, plugin['minimum_calibre_version']))),
+        'Platforms: %s' % escape(', '.join(sorted(plugin['supported_platforms']) or ['all'])),
+    ]
+    if plugin['uninstall']:
+        details.append('Uninstall: %s' % escape(', '.join(plugin['uninstall'])))
+    if plugin['donate']:
+        details.append('<a href=%s title="Donate">Donate</a>' % quoteattr(plugin['donate']))
+    block = []
+    for li in details:
+        if li.startswith('calibre:'):
+            block.append('<br>')
+        block.append('<li>%s</li>' % li)
+    block = '<ul>%s</ul>' % ('\n'.join(block))
+    zipfile = '<div class="end"><a href=%s title="Download plugin" download=%s>Download plugin \u2193</a></div>' % (
+        quoteattr(plugin['file']), quoteattr(plugin['name'] + '.zip'))
+    desc = plugin['description'] or ''
+    if desc:
+        desc = '<p>%s</p>' % desc
+    return '%s\n%s\n%s\n%s\n\n' % (title, desc, block, zipfile)
+
+def create_index(index):
+    plugins = []
+    for name in sorted(index):
+        plugin = index[name]
+        if not plugin['deprecated']:
+            plugins.append(
+                plugin_to_index(plugin))
+    index = '''\
+<!DOCTYPE html>
+<html>
+<head><meta charset="utf-8"><title>Index of calibre plugins</title>
+<link rel="icon" type="image/x-icon" href="http://calibre-ebook.com/favicon.ico" />
+<style type="text/css">
+body { background-color: #eee; }
+a { text-decoration: none }
+a:hover, h3:hover { color: red }
+a:visited { color: blue }
+ul { list-style-type: none; font-size: smaller }
+li { display: inline }
+li+li:before { content: " - " }
+.end { border-bottom: solid 1pt black; padding-bottom: 0.5ex; margin-bottom: 4ex; }
+h1 img, h3 img { vertical-align: middle; margin-right: 0.5em; }
+h1 { text-align: center }
+</style>
+</head>
+<body>
+<h1><img src="http://manual.calibre-ebook.com/_static/logo.png">Index of calibre plugins</h1>
+</body>
+%s
+</body>
+</html>''' % ('\n'.join(plugins))
+    raw = index.encode('utf-8')
+    try:
+        with open('index.html', 'rb') as f:
+            oraw = f.read()
+    except EnvironmentError:
+        oraw = None
+    if raw != oraw:
+        atomic_write(raw, 'index.html')
+
+
+def singleinstance():
+    path = os.path.abspath('plugins_mirror_update.lock')
+    try:
+        f = open(path, 'w')
+        fcntl.lockf(f.fileno(), fcntl.LOCK_EX|fcntl.LOCK_NB)
+        f.write(str(os.getpid()))
+        f.flush()
+        atexit.register(f.close)
+        return True
+    except IOError:
+        return False
+    return False
+
+def main():
+    try:
+        os.chdir(WORKDIR)
+    except OSError as err:
+        if err.errno == errno.ENOENT:
+            try:
+                os.makedirs(WORKDIR)
+            except EnvironmentError:
+                pass
+            os.chdir(WORKDIR)
+        else:
+            raise
+    if not singleinstance():
+        print('Another instance is running or you dont have permission to create lock file, aborting.', file=sys.stderr)
+        raise SystemExit(1)
+    open('log', 'w').close()
+    try:
+        plugins_index = load_plugins_index()
+        plugins_index = fetch_plugins(plugins_index)
+        create_index(plugins_index)
+    except:
+        import traceback
+        log('Failed to run at:', datetime.utcnow().isoformat())
+        log(traceback.format_exc())
+        raise SystemExit(1)
+
+def test_parse():  # {{{
+    raw = read(INDEX).decode('utf-8', 'replace')
+
+    old_entries = []
+    from lxml import html
+    root = html.fromstring(raw)
+    list_nodes = root.xpath('//div[@id="post_message_1362767"]/ul/li')
+    # Add our deprecated plugins which are nested in a grey span
+    list_nodes.extend(root.xpath('//div[@id="post_message_1362767"]/span/ul/li'))
+    for list_node in list_nodes:
+        name = list_node.xpath('a')[0].text_content().strip()
+        url = list_node.xpath('a/@href')[0].strip()
+
+        description_text = list_node.xpath('i')[0].text_content()
+        description_parts = description_text.partition('Version:')
+
+        details_text = description_parts[1] + description_parts[2].replace('\r\n','')
+        details_pairs = details_text.split(';')
+        details = {}
+        for details_pair in details_pairs:
+            pair = details_pair.split(':')
+            if len(pair) == 2:
+                key = pair[0].strip().lower()
+                value = pair[1].strip()
+                details[key] = value
+
+        donation_node = list_node.xpath('i/span/a/@href')
+        donate = donation_node[0] if donation_node else None
+        uninstall = tuple(x.strip() for x in details.get('uninstall', '').strip().split(',') if x.strip()) or None
+        history = details.get('history', 'No').lower() in ['yes', 'true']
+        deprecated = details.get('deprecated', 'No').lower() in ['yes', 'true']
+        old_entries.append(IndexEntry(name, url, donate, history, uninstall, deprecated, url_to_plugin_id(url, deprecated)))
+
+    new_entries = tuple(parse_index(raw))
+    for i, entry in enumerate(old_entries):
+        if entry != new_entries[i]:
+            print ('The new entry: %s != %s' % (new_entries[i], entry))
+            raise SystemExit(1)
+    pool = ThreadPool(processes=20)
+    urls = [e.url for e in new_entries]
+    data = pool.map(read, urls)
+    for url, raw in zip(urls, data):
+        sys.stdout.flush()
+        root = html.fromstring(raw)
+        attachment_nodes = root.xpath('//fieldset/table/tr/td/a')
+        full_url = None
+        for attachment_node in attachment_nodes:
+            filename = attachment_node.text_content().lower()
+            if filename.find('.zip') != -1:
+                full_url = MR_URL + attachment_node.attrib['href']
+                break
+        new_url, aname = parse_plugin_zip_url(raw)
+        if new_url != full_url:
+            print ('new url (%s): %s != %s for plugin at: %s' % (aname, new_url, full_url, url))
+            raise SystemExit(1)
+
+# }}}
+
+def test_parse_metadata():  # {{{
+    raw = b'''\
+import os
+from calibre.customize import FileTypePlugin
+
+MV = (0, 7, 53)
+
+class HelloWorld(FileTypePlugin):
+
+    name                = _('name') # Name of the plugin
+    description         = {1, 2}
+    supported_platforms = ['windows', 'osx', 'linux'] # Platforms this plugin will run on
+    author              = u'Acme Inc.' # The author of this plugin
+    version             = {1:'a', 'b':2}
+    file_types          = set(['epub', 'mobi']) # The file types that this plugin will be applied to
+    on_postprocess      = True # Run this plugin after conversion is complete
+    minimum_calibre_version = MV
+    '''
+    vals = {
+        'name':'name', 'description':{1, 2},
+        'supported_platforms':['windows', 'osx', 'linux'],
+        'author':'Acme Inc.', 'version':{1:'a', 'b':2},
+        'minimum_calibre_version':(0, 7, 53)}
+    assert parse_metadata(raw) == vals
+    buf = io.BytesIO()
+    with zipfile.ZipFile(buf, 'w') as zf:
+        zf.writestr('very/lovely.py', raw)
+        zf.writestr('__init__.py', b'from xxx import yyy\nfrom very.lovely import HelloWorld')
+    assert get_plugin_info(buf.getvalue()) == vals
+
+# }}}
+
+if __name__ == '__main__':
+    # test_parse_metadata()
+    main()
+

From 670184a69aa1b444b1ea736cd7344a1df31bdcd6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 3 Aug 2013 17:39:16 +0530
Subject: [PATCH 0419/1154] Fix file permissions and user agent

---
 setup/plugins_mirror.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup/plugins_mirror.py b/setup/plugins_mirror.py
index dca9595c75..24bfae072a 100644
--- a/setup/plugins_mirror.py
+++ b/setup/plugins_mirror.py
@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import urllib2, re, HTMLParser, zlib, gzip, io, sys, bz2, json, errno, urlparse, os, zipfile, ast, tempfile, glob, fcntl, atexit
+import urllib2, re, HTMLParser, zlib, gzip, io, sys, bz2, json, errno, urlparse, os, zipfile, ast, tempfile, glob, fcntl, atexit, stat
 from future_builtins import map, zip, filter
 from collections import namedtuple
 from multiprocessing.pool import ThreadPool
@@ -16,7 +16,7 @@ from contextlib import closing
 from functools import partial
 from xml.sax.saxutils import escape, quoteattr
 
-USER_AGENT = 'calibre'
+USER_AGENT = 'calibre mirror'
 MR_URL = 'http://www.mobileread.com/forums/'
 WORKDIR = '/srv/plugins' if os.path.exists('/srv') else '/t/plugins'
 PLUGINS = 'plugins.json.bz2'
@@ -291,6 +291,7 @@ def log(*args, **kwargs):
 def atomic_write(raw, name):
     with tempfile.NamedTemporaryFile(dir=os.getcwdu(), delete=False) as f:
         f.write(raw)
+        os.fchmod(f.fileno(), stat.S_IREAD|stat.S_IWRITE|stat.S_IRGRP|stat.S_IROTH)
         os.rename(f.name, name)
 
 def fetch_plugins(old_index):

From 8b372eeb44708ec1db8e13c31d130a3c68a1dee7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 3 Aug 2013 17:49:40 +0530
Subject: [PATCH 0420/1154] Update notes on file server deployment

---
 setup/file_hosting_servers.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index ece966490c..907e88553f 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -15,7 +15,7 @@ dpkg-reconfigure tzdata
 set timezone to Asia/Kolkata
 service cron restart
 
-apt-get install vim nginx zsh python-lxml python-mechanize iotop htop smartmontools mosh
+apt-get install vim nginx zsh python-lxml python-mechanize iotop htop smartmontools mosh git
 chsh -s /bin/zsh
 
 mkdir -p /root/staging /root/work/vim /srv/download /srv/manual
@@ -23,6 +23,10 @@ mkdir -p /root/staging /root/work/vim /srv/download /srv/manual
 scp .zshrc .vimrc  server:
 scp -r ~/work/vim/zsh-syntax-highlighting server:work/vim
 scp -r ~/work/vim/zsh-history-substring-search server:work/vim
+cd /usr/local && git clone https://github.com/kovidgoyal/calibre.git
+
+Add the following to crontab::
+    @hourly    /usr/bin/python /usr/local/calibre/setup/plugins_mirror.py
 
 If the server has a backup hard-disk, mount it at /mnt/backup and edit /etc/fstab so that it is auto-mounted.
 Then, add the following to crontab::

From a043e21c8e450b2cfbae037f94ffbe16fe854685 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 3 Aug 2013 18:00:18 -0400
Subject: [PATCH 0421/1154] Store: Change punucation into spaces when using
 author or title searching.

---
 src/calibre/gui2/store/search/models.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py
index af2c274bd7..96948c2363 100644
--- a/src/calibre/gui2/store/search/models.py
+++ b/src/calibre/gui2/store/search/models.py
@@ -451,7 +451,9 @@ class SearchFilter(SearchQueryParser):
                         vals = accessor(sr).split(',')
                     elif locvalue in ('author2', 'title2'):
                         m = self.IN_MATCH
-                        vals = re.sub(r'(^|\s)(and|not|or|a|the|is|of|,)(\s|$)', ' ', accessor(sr)).split(' ')
+                        vals = re.sub(r'(^|\s)(and|not|or|a|the|is|of)(\s|$)', ' ', accessor(sr))
+                        vals = re.sub('[.,!@#$%^&*\(\)\'"\[\]]', ' ', vals)
+                        vals = vals.split(' ')
                         vals = [x for x in vals if x]
                         final_query = query.lower()
                     else:

From b9307dd4dac8531fcaea83727d68f500cee93811 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 3 Aug 2013 18:16:22 -0400
Subject: [PATCH 0422/1154] Further work for dealing with common words and
 punctuation.

---
 src/calibre/gui2/store/search/models.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py
index 96948c2363..bfd38d63d9 100644
--- a/src/calibre/gui2/store/search/models.py
+++ b/src/calibre/gui2/store/search/models.py
@@ -451,11 +451,15 @@ class SearchFilter(SearchQueryParser):
                         vals = accessor(sr).split(',')
                     elif locvalue in ('author2', 'title2'):
                         m = self.IN_MATCH
-                        vals = re.sub(r'(^|\s)(and|not|or|a|the|is|of)(\s|$)', ' ', accessor(sr))
-                        vals = re.sub('[.,!@#$%^&*\(\)\'"\[\]]', ' ', vals)
+                        def field_trimmer(field):
+                            field = re.sub(r'(^|\s)(and|not|or|a|the|is|of)(\s|$)', ' ', field)
+                            field = re.sub('[.,!@#$%^&*\(\)\'"\[\]]', ' ', field)
+                            return field
+                        vals = field_trimmer(accessor(sr))
                         vals = vals.split(' ')
                         vals = [x for x in vals if x]
-                        final_query = query.lower()
+                        final_query = field_trimmer(query.lower())
+                        final_query = re.sub('[ ]{2,}', ' ', final_query)
                     else:
                         vals = [accessor(sr)]
                     if self._match(final_query, vals, m):

From c70b70dd76eb1f7fa8f7a587752aef171fc97e5f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 08:20:37 +0530
Subject: [PATCH 0423/1154] Make the punctuation removal faster and more robust

---
 src/calibre/gui2/store/search/models.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py
index af2c274bd7..026cb76d8d 100644
--- a/src/calibre/gui2/store/search/models.py
+++ b/src/calibre/gui2/store/search/models.py
@@ -6,7 +6,7 @@ __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
-import re
+import re, string
 from operator import attrgetter
 
 from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize,
@@ -325,6 +325,9 @@ class SearchFilter(SearchQueryParser):
     def __init__(self):
         SearchQueryParser.__init__(self, locations=self.USABLE_LOCATIONS)
         self.srs = set([])
+        # remove joiner words surrounded by space or at string boundaries
+        self.joiner_pat = re.compile(r'(^|\s)(and|not|or|a|the|is|of)(\s|$)', re.IGNORECASE)
+        self.punctuation_table = {ord(x):' ' for x in string.punctuation}
 
     def add_search_result(self, search_result):
         self.srs.add(search_result)
@@ -449,11 +452,10 @@ class SearchFilter(SearchQueryParser):
 
                     if locvalue == 'format':
                         vals = accessor(sr).split(',')
-                    elif locvalue in ('author2', 'title2'):
+                    elif locvalue in {'author2', 'title2'}:
                         m = self.IN_MATCH
-                        vals = re.sub(r'(^|\s)(and|not|or|a|the|is|of|,)(\s|$)', ' ', accessor(sr)).split(' ')
-                        vals = [x for x in vals if x]
-                        final_query = query.lower()
+                        vals = [x for x in self.field_trimmer(accessor(sr)).split() if x]
+                        final_query = ' '.join(self.field_trimmer(icu_lower(query)).split())
                     else:
                         vals = [accessor(sr)]
                     if self._match(final_query, vals, m):
@@ -464,3 +466,8 @@ class SearchFilter(SearchQueryParser):
                     traceback.print_exc()
         return matches
 
+    def field_trimmer(self, field):
+        ''' Remove common joiner words and punctuation to improve matching,
+        punctuation is removed first, so that a.and.b becomes a b '''
+        return self.joiner_pat.sub(' ', field.translate(self.punctuation_table))
+

From db4ba9133b6b4825e777114f8f1ce47792c983df Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 09:18:18 +0530
Subject: [PATCH 0424/1154] Comments editor: Disable insert link until focused

Comments editor: The Insert Link button has no effect until the user
clicks inside the comments box, therefore disable it until it is ready,
to prevent confusion. Fixes #1208073 [Insert Link not working](https://bugs.launchpad.net/calibre/+bug/1208073)
---
 src/calibre/gui2/comments_editor.py | 47 ++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index c043fccba4..ac8ab13d20 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -18,11 +18,11 @@ from PyQt4.QtWebKit import QWebView, QWebPage
 
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre import xml_replace_entities, prepare_string_for_xml
-from calibre.gui2 import open_url
+from calibre.gui2 import open_url, error_dialog
 from calibre.utils.soupparser import fromstring
 from calibre.utils.config import tweaks
 
-class PageAction(QAction): # {{{
+class PageAction(QAction):  # {{{
 
     def __init__(self, wac, icon, text, checkable, view):
         QAction.__init__(self, QIcon(I(icon+'.png')), text, view)
@@ -43,14 +43,15 @@ class PageAction(QAction): # {{{
         self.page_action.trigger()
 
     def update_state(self, *args):
-        if sip.isdeleted(self) or sip.isdeleted(self.page_action): return
+        if sip.isdeleted(self) or sip.isdeleted(self.page_action):
+            return
         if self.isCheckable():
             self.setChecked(self.page_action.isChecked())
         self.setEnabled(self.page_action.isEnabled())
 
 # }}}
 
-class BlockStyleAction(QAction): # {{{
+class BlockStyleAction(QAction):  # {{{
 
     def __init__(self, text, name, view):
         QAction.__init__(self, text, view)
@@ -62,7 +63,7 @@ class BlockStyleAction(QAction): # {{{
 
 # }}}
 
-class EditorWidget(QWebView): # {{{
+class EditorWidget(QWebView):  # {{{
 
     def __init__(self, parent=None):
         QWebView.__init__(self, parent)
@@ -157,6 +158,8 @@ class EditorWidget(QWebView): # {{{
         self.action_insert_link = QAction(QIcon(I('insert-link.png')),
                 _('Insert link'), self)
         self.action_insert_link.triggered.connect(self.insert_link)
+        self.pageAction(QWebPage.ToggleBold).changed.connect(self.update_link_action)
+        self.action_insert_link.setEnabled(False)
         self.action_clear = QAction(QIcon(I('edit-clear')), _('Clear'), self)
         self.action_clear.triggered.connect(self.clear_text)
 
@@ -166,6 +169,10 @@ class EditorWidget(QWebView): # {{{
         self.setHtml('')
         self.set_readonly(False)
 
+    def update_link_action(self):
+        wac = self.pageAction(QWebPage.ToggleBold)
+        self.action_insert_link.setEnabled(wac.isEnabled())
+
     def set_readonly(self, what):
         self.readonly = what
         self.page().setContentEditable(not self.readonly)
@@ -202,12 +209,16 @@ class EditorWidget(QWebView): # {{{
         url = self.parse_link(unicode(link))
         if url.isValid():
             url = unicode(url.toString())
+            self.setFocus(Qt.OtherFocusReason)
             if name:
                 self.exec_command('insertHTML',
                         '<a href="%s">%s</a>'%(prepare_string_for_xml(url, True),
                             prepare_string_for_xml(name)))
             else:
                 self.exec_command('createLink', url)
+        else:
+            error_dialog(self, _('Invalid URL'),
+                         _('The url %r is invalid') % unicode(link), show=True)
 
     def ask_link(self):
         d = QDialog(self)
@@ -362,9 +373,9 @@ class Highlighter(QSyntaxHighlighter):
         self.colors['doctype']        = QColor(192, 192, 192)
         self.colors['entity']         = QColor(128, 128, 128)
         self.colors['tag']            = QColor(136,  18, 128)
-        self.colors['comment']        = QColor( 35, 110,  37)
+        self.colors['comment']        = QColor(35, 110,  37)
         self.colors['attrname']       = QColor(153,  69,   0)
-        self.colors['attrval']        = QColor( 36,  36, 170)
+        self.colors['attrval']        = QColor(36,  36, 170)
 
     def highlightBlock(self, text):
         state = self.previousBlockState()
@@ -378,8 +389,8 @@ class Highlighter(QSyntaxHighlighter):
                 start = pos
                 while pos < len_:
                     if text.mid(pos, 3) == "-->":
-                        pos += 3;
-                        state = State_Text;
+                        pos += 3
+                        state = State_Text
                         break
                     else:
                         pos += 1
@@ -422,7 +433,7 @@ class Highlighter(QSyntaxHighlighter):
                     if ch == QChar('>'):
                         state = State_Text
                         break
-                self.setFormat(start, pos - start, self.colors['tag']);
+                self.setFormat(start, pos - start, self.colors['tag'])
 
             # anywhere after tag name and before tag closing ('>')
             elif state == State_InsideTag:
@@ -489,7 +500,7 @@ class Highlighter(QSyntaxHighlighter):
                     # just stop at non-space or tag delimiter
                     start = pos
                     while pos < len_:
-                        ch = text.at(pos);
+                        ch = text.at(pos)
                         if ch.isSpace():
                             break
                         if ch in (QChar('>'), QChar('/')):
@@ -538,7 +549,7 @@ class Highlighter(QSyntaxHighlighter):
                                 state = State_DocType
                             else:
                                 state = State_TagStart
-                        break;
+                        break
                     elif ch == QChar('&'):
                         start = pos
                         while pos < len_ and text.at(pos) != QChar(';'):
@@ -549,12 +560,11 @@ class Highlighter(QSyntaxHighlighter):
                     else:
                         pos += 1
 
-
         self.setCurrentBlockState(state)
 
 # }}}
 
-class Editor(QWidget): # {{{
+class Editor(QWidget):  # {{{
 
     def __init__(self, parent=None, one_line_toolbar=False):
         QWidget.__init__(self, parent)
@@ -650,13 +660,13 @@ class Editor(QWidget): # {{{
         return property(fget=fget, fset=fset)
 
     def change_tab(self, index):
-        #print 'reloading:', (index and self.wyswyg_dirty) or (not index and
+        # print 'reloading:', (index and self.wyswyg_dirty) or (not index and
         #        self.source_dirty)
-        if index == 1: # changing to code view
+        if index == 1:  # changing to code view
             if self.wyswyg_dirty:
                 self.code_edit.setPlainText(self.editor.html)
                 self.wyswyg_dirty = False
-        elif index == 0: #changing to wyswyg
+        elif index == 0:  # changing to wyswyg
             if self.source_dirty:
                 self.editor.html = unicode(self.code_edit.toPlainText())
                 self.source_dirty = False
@@ -687,4 +697,5 @@ if __name__ == '__main__':
     w.show()
     w.html = '<b>testing</b>'
     app.exec_()
-    #print w.html
+    # print w.html
+

From 6db94c833fd48e24ab8a9b584c9f4451925695b4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 10:33:22 +0530
Subject: [PATCH 0425/1154] pep8

---
 src/calibre/gui2/preferences/plugins.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py
index 48aae7c3f5..482f64b706 100644
--- a/src/calibre/gui2/preferences/plugins.py
+++ b/src/calibre/gui2/preferences/plugins.py
@@ -23,7 +23,7 @@ from calibre.utils.search_query_parser import SearchQueryParser
 from calibre.utils.icu import lower
 from calibre.constants import iswindows
 
-class PluginModel(QAbstractItemModel, SearchQueryParser): # {{{
+class PluginModel(QAbstractItemModel, SearchQueryParser):  # {{{
 
     def __init__(self, show_only_user_plugins=False):
         QAbstractItemModel.__init__(self)
@@ -172,7 +172,6 @@ class PluginModel(QAbstractItemModel, SearchQueryParser): # {{{
                     return self.index(j, 0, parent)
         return QModelIndex()
 
-
     def refresh_plugin(self, plugin, rescan=False):
         if rescan:
             self.populate()
@@ -191,7 +190,7 @@ class PluginModel(QAbstractItemModel, SearchQueryParser): # {{{
         if index.internalId() == 0:
             if role == Qt.DisplayRole:
                 category = self.categories[index.row()]
-                return QVariant(_("%(plugin_type)s %(plugins)s")%\
+                return QVariant(_("%(plugin_type)s %(plugins)s")%
                         dict(plugin_type=category, plugins=_('plugins')))
         else:
             plugin = self.index_to_plugin(index)
@@ -276,7 +275,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             unicode(self.search.currentText()), backwards=True)
         self.highlight_index(idx)
 
-
     def toggle_plugin(self, *args):
         self.modify_plugin(op='toggle')
 
@@ -298,8 +296,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         if not path:
             return
         path = path[0]
-        if path and  os.access(path, os.R_OK) and path.lower().endswith('.zip'):
-            if not question_dialog(self, _('Are you sure?'), '<p>' + \
+        if path and os.access(path, os.R_OK) and path.lower().endswith('.zip'):
+            if not question_dialog(self, _('Are you sure?'), '<p>' +
                     _('Installing plugins is a <b>security risk</b>. '
                     'Plugins can contain a virus/malware. '
                         'Only install it if you got it from a trusted source.'
@@ -327,7 +325,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             error_dialog(self, _('No valid plugin path'),
                          _('%s is not a valid plugin path')%path).exec_()
 
-
     def modify_plugin(self, op=''):
         index = self.plugin_view.currentIndex()
         if index.isValid():
@@ -399,7 +396,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     def reload_store_plugins(self):
         self.gui.load_store_plugins()
-        if self.gui.iactions.has_key('Store'):
+        if 'Store' in self.gui.iactions:
             self.gui.iactions['Store'].load_menu()
 
     def check_for_add_to_toolbars(self, plugin):
@@ -429,7 +426,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
                 all_locations.iteritems() if key
                 not in plugin_action.dont_add_to]
         if not allowed_locations:
-            return # This plugin doesn't want to live in the GUI
+            return  # This plugin doesn't want to live in the GUI
 
         from calibre.gui2.dialogs.choose_plugin_toolbars import ChoosePluginToolbarsDialog
         d = ChoosePluginToolbarsDialog(self, plugin_action, allowed_locations)
@@ -445,3 +442,4 @@ if __name__ == '__main__':
     app = QApplication([])
     test_widget('Advanced', 'Plugins')
 
+

From e5a8f45879bb042bc9a52af0405a84de107c875f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 10:34:33 +0530
Subject: [PATCH 0426/1154] Make it clear that disabling plugins is prevented
 by policy

---
 src/calibre/gui2/preferences/plugins.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py
index 482f64b706..d7ed371a1e 100644
--- a/src/calibre/gui2/preferences/plugins.py
+++ b/src/calibre/gui2/preferences/plugins.py
@@ -338,7 +338,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             if op == 'toggle':
                 if not plugin.can_be_disabled:
                     error_dialog(self,_('Plugin cannot be disabled'),
-                                 _('The plugin: %s cannot be disabled')%plugin.name).exec_()
+                                 _('Disabling the plugin %s is not allowed')%plugin.name).exec_()
                     return
                 if is_disabled(plugin):
                     enable_plugin(plugin)

From ba0ce696f484e6ccbbf73aa9bc090569dd518458 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 12:07:28 +0530
Subject: [PATCH 0427/1154] pep8

---
 src/calibre/ebooks/oeb/transforms/cover.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/oeb/transforms/cover.py b/src/calibre/ebooks/oeb/transforms/cover.py
index 8facbab785..9bfb4e30d1 100644
--- a/src/calibre/ebooks/oeb/transforms/cover.py
+++ b/src/calibre/ebooks/oeb/transforms/cover.py
@@ -59,7 +59,6 @@ class CoverManager(object):
         </html>
     ''')
 
-
     def __init__(self, no_default_cover=False, no_svg_cover=False,
             preserve_aspect_ratio=False, fixed_size=None):
         self.no_default_cover = no_default_cover
@@ -141,7 +140,7 @@ class CoverManager(object):
             if width is None or height is None:
                 self.log.warning('Failed to read cover dimensions')
                 width, height = 600, 800
-            #if self.preserve_aspect_ratio:
+            # if self.preserve_aspect_ratio:
             #    width, height = 600, 800
             self.svg_template = self.svg_template.replace('__viewbox__',
                     '0 0 %d %d'%(width, height))
@@ -170,6 +169,3 @@ class CoverManager(object):
             titem = getattr(self.oeb.toc, 'item_that_refers_to_cover', None)
             if titem is not None:
                 titem.href = item.href
-
-
-

From 938fe0fa667254ff64bb6e20b2f6226a1b107570 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 12:35:19 +0530
Subject: [PATCH 0428/1154] EPUB Input: Use raster cover metadata

EPUB Input: If the EPUB file identifies an actual cover image in
addition to the titlepage html file, use the cover image instead of
rendering the titlepage. This is faster and has the advantage that an
EPUB to EPUB conversion preserves internal cover structure.
---
 .../ebooks/conversion/plugins/epub_input.py   | 41 ++++++++++++++-----
 src/calibre/ebooks/metadata/opf2.py           |  4 +-
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/epub_input.py b/src/calibre/ebooks/conversion/plugins/epub_input.py
index 5ccf00c643..b40f76a78e 100644
--- a/src/calibre/ebooks/conversion/plugins/epub_input.py
+++ b/src/calibre/ebooks/conversion/plugins/epub_input.py
@@ -75,6 +75,10 @@ class EPUBInput(InputFormatPlugin):
         return False
 
     def rationalize_cover(self, opf, log):
+        ''' Ensure that the cover information in the guide is correct. That
+        means, at most one entry with type="cover" that points to a raster
+        cover and at most one entry with type="titlepage" that points to an
+        HTML titlepage. '''
         removed = None
         from lxml import etree
         guide_cover, guide_elem = None, None
@@ -109,24 +113,41 @@ class EPUBInput(InputFormatPlugin):
             # display in the end
             spine[0].attrib.pop('linear', None)
             opf.spine[0].is_linear = True
-        guide_elem.set('href', 'calibre_raster_cover.jpg')
+        # Ensure that the guide has a cover entry pointing to a raster cover
+        # and a titlepage entry pointing to the html titlepage. The titlepage
+        # entry will be used by the epub output plugin, the raster cover entry
+        # by other output plugins.
+
         from calibre.ebooks.oeb.base import OPF
-        t = etree.SubElement(elem[0].getparent(), OPF('item'),
-        href=guide_elem.get('href'), id='calibre_raster_cover')
-        t.set('media-type', 'image/jpeg')
+
+        # Search for a raster cover identified in the OPF
+        raster_cover = opf.raster_cover
+
+        # Set the cover guide entry
+        if raster_cover is not None:
+            guide_elem.set('href', raster_cover)
+        else:
+            # Render the titlepage to create a raster cover
+            from calibre.ebooks import render_html_svg_workaround
+            guide_elem.set('href', 'calibre_raster_cover.jpg')
+            t = etree.SubElement(
+                elem[0].getparent(), OPF('item'), href=guide_elem.get('href'), id='calibre_raster_cover')
+            t.set('media-type', 'image/jpeg')
+            if os.path.exists(guide_cover):
+                renderer = render_html_svg_workaround(guide_cover, log)
+                if renderer is not None:
+                    open('calibre_raster_cover.jpg', 'wb').write(
+                        renderer)
+
+        # Set the titlepage guide entry
         for elem in list(opf.iterguide()):
             if elem.get('type', '').lower() == 'titlepage':
                 elem.getparent().remove(elem)
+
         t = etree.SubElement(guide_elem.getparent(), OPF('reference'))
         t.set('type', 'titlepage')
         t.set('href', guide_cover)
         t.set('title', 'Title Page')
-        from calibre.ebooks import render_html_svg_workaround
-        if os.path.exists(guide_cover):
-            renderer = render_html_svg_workaround(guide_cover, log)
-            if renderer is not None:
-                open('calibre_raster_cover.jpg', 'wb').write(
-                    renderer)
         return removed
 
     def find_opf(self):
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 77e334dd3e..25d4855980 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -1083,12 +1083,12 @@ class OPF(object):  # {{{
             for item in self.itermanifest():
                 if item.get('id', None) == cover_id:
                     mt = item.get('media-type', '')
-                    if 'xml' not in mt:
+                    if mt and 'xml' not in mt and 'html' not in mt:
                         return item.get('href', None)
             for item in self.itermanifest():
                 if item.get('href', None) == cover_id:
                     mt = item.get('media-type', '')
-                    if mt.startswith('image/'):
+                    if mt and mt.startswith('image/'):
                         return item.get('href', None)
 
     @dynamic_property

From 66d897893a73b3c54014fe0025f8dcc7f644d500 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 15:07:03 +0530
Subject: [PATCH 0429/1154] Support adding images into the comments field

Allow adding images into the comments field, by clicking on the insert
link button in the comments editor in the edit metadata dialog.

When generating a metadata jacket during book polishing or conversion,
embed any images referenced in the comments.
---
 src/calibre/ebooks/oeb/polish/jacket.py     | 31 +++++++++++--
 src/calibre/ebooks/oeb/transforms/jacket.py | 27 +++++++++--
 src/calibre/gui2/comments_editor.py         | 51 ++++++++++++++++-----
 3 files changed, 90 insertions(+), 19 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/jacket.py b/src/calibre/ebooks/oeb/polish/jacket.py
index 8ae65f3f9f..ee795c0011 100644
--- a/src/calibre/ebooks/oeb/polish/jacket.py
+++ b/src/calibre/ebooks/oeb/polish/jacket.py
@@ -11,14 +11,26 @@ from calibre.customize.ui import output_profiles
 from calibre.ebooks.conversion.config import load_defaults
 from calibre.ebooks.oeb.base import XPath, OPF
 from calibre.ebooks.oeb.polish.cover import find_cover_page
-from calibre.ebooks.oeb.transforms.jacket import render_jacket as render
+from calibre.ebooks.oeb.transforms.jacket import render_jacket as render, referenced_images
 
-def render_jacket(mi):
+def render_jacket(container, jacket):
+    mi = container.mi
     ps = load_defaults('page_setup')
     op = ps.get('output_profile', 'default')
     opmap = {x.short_name:x for x in output_profiles()}
     output_profile = opmap.get(op, opmap['default'])
-    return render(mi, output_profile)
+    root = render(mi, output_profile)
+    for img, path in referenced_images(root):
+        container.log('Embedding referenced image: %s into jacket' % path)
+        ext = path.rpartition('.')[-1]
+        jacket_item = container.generate_item('jacket_image.'+ext, id_prefix='jacket_img')
+        name = container.href_to_name(jacket_item.get('href'), container.opf_name)
+        with open(path, 'rb') as f:
+            container.parsed_cache[name] = f.read()
+            container.commit_item(name)
+        href = container.name_to_href(name, jacket)
+        img.set('src', href)
+    return root
 
 def is_legacy_jacket(root):
     return len(root.xpath(
@@ -42,17 +54,25 @@ def find_existing_jacket(container):
                     return name
 
 def replace_jacket(container, name):
-    root = render_jacket(container.mi)
+    root = render_jacket(container, name)
     container.parsed_cache[name] = root
     container.dirty(name)
 
 def remove_jacket(container):
     name = find_existing_jacket(container)
     if name is not None:
+        remove_jacket_images(container, name)
         container.remove_item(name)
         return True
     return False
 
+def remove_jacket_images(container, name):
+    root = container.parsed_cache[name]
+    for img in root.xpath('//*[local-name() = "img" and @src]'):
+        iname = container.href_to_name(img.get('src'), name)
+        if container.has_name(iname):
+            container.remove_item(iname)
+
 def add_or_replace_jacket(container):
     name = find_existing_jacket(container)
     found = True
@@ -60,6 +80,9 @@ def add_or_replace_jacket(container):
         jacket_item = container.generate_item('jacket.xhtml', id_prefix='jacket')
         name = container.href_to_name(jacket_item.get('href'), container.opf_name)
         found = False
+    if found:
+        remove_jacket_images(container, name)
+
     replace_jacket(container, name)
     if not found:
         # Insert new jacket into spine
diff --git a/src/calibre/ebooks/oeb/transforms/jacket.py b/src/calibre/ebooks/oeb/transforms/jacket.py
index 02abda0927..a9cc10dc3d 100644
--- a/src/calibre/ebooks/oeb/transforms/jacket.py
+++ b/src/calibre/ebooks/oeb/transforms/jacket.py
@@ -6,12 +6,13 @@ __license__   = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import sys
+import sys, os
 from xml.sax.saxutils import escape
 
 from lxml import etree
 
 from calibre import guess_type, strftime
+from calibre.constants import iswindows
 from calibre.ebooks.BeautifulSoup import BeautifulSoup
 from calibre.ebooks.oeb.base import XPath, XHTML_NS, XHTML, xml2text, urldefrag
 from calibre.library.comments import comments_to_html
@@ -84,9 +85,17 @@ class Jacket(object):
                 alt_comments=comments)
         id, href = self.oeb.manifest.generate('calibre_jacket', 'jacket.xhtml')
 
-        item = self.oeb.manifest.add(id, href, guess_type(href)[0], data=root)
-        self.oeb.spine.insert(0, item, True)
-        self.oeb.inserted_metadata_jacket = item
+        jacket = self.oeb.manifest.add(id, href, guess_type(href)[0], data=root)
+        self.oeb.spine.insert(0, jacket, True)
+        self.oeb.inserted_metadata_jacket = jacket
+        for img, path in referenced_images(root):
+            self.oeb.log('Embedding referenced image %s into jacket' % path)
+            ext = path.rpartition('.')[-1].lower()
+            item_id, href = self.oeb.manifest.generate('jacket_image', 'jacket_img.'+ext)
+            with open(path, 'rb') as f:
+                item = self.oeb.manifest.add(item_id, href, guess_type(href)[0], data=f.read())
+            item.unload_data_from_memory()
+            img.set('src', jacket.relhref(item.href))
 
     def remove_existing_jacket(self):
         for x in self.oeb.spine[:4]:
@@ -262,3 +271,13 @@ def linearize_jacket(oeb):
                 e.tag = XHTML('span')
             break
 
+def referenced_images(root):
+    for img in XPath('//h:img[@src]')(root):
+        src = img.get('src')
+        if src.startswith('file://'):
+            path = src[7:]
+            if iswindows and path.startswith('/'):
+                path = path[1:]
+            if os.path.exists(path):
+                yield img, path
+
diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index ac8ab13d20..921c8676e9 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -12,15 +12,16 @@ import sip
 
 from PyQt4.Qt import (QApplication, QFontInfo, QSize, QWidget, QPlainTextEdit,
     QToolBar, QVBoxLayout, QAction, QIcon, Qt, QTabWidget, QUrl, QFormLayout,
-    QSyntaxHighlighter, QColor, QChar, QColorDialog, QMenu, QDialog,
-    QHBoxLayout, QKeySequence, QLineEdit, QDialogButtonBox)
+    QSyntaxHighlighter, QColor, QChar, QColorDialog, QMenu, QDialog, QLabel,
+    QHBoxLayout, QKeySequence, QLineEdit, QDialogButtonBox, QPushButton)
 from PyQt4.QtWebKit import QWebView, QWebPage
 
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre import xml_replace_entities, prepare_string_for_xml
-from calibre.gui2 import open_url, error_dialog
+from calibre.gui2 import open_url, error_dialog, choose_files
 from calibre.utils.soupparser import fromstring
 from calibre.utils.config import tweaks
+from calibre.utils.imghdr import what
 
 class PageAction(QAction):  # {{{
 
@@ -156,7 +157,7 @@ class EditorWidget(QWebView):  # {{{
             self.block_style_actions.append(ac)
 
         self.action_insert_link = QAction(QIcon(I('insert-link.png')),
-                _('Insert link'), self)
+                _('Insert link or image'), self)
         self.action_insert_link.triggered.connect(self.insert_link)
         self.pageAction(QWebPage.ToggleBold).changed.connect(self.update_link_action)
         self.action_insert_link.setEnabled(False)
@@ -203,14 +204,18 @@ class EditorWidget(QWebView):  # {{{
             self.exec_command('hiliteColor', unicode(col.name()))
 
     def insert_link(self, *args):
-        link, name = self.ask_link()
+        link, name, is_image = self.ask_link()
         if not link:
             return
-        url = self.parse_link(unicode(link))
+        url = self.parse_link(link)
         if url.isValid():
             url = unicode(url.toString())
             self.setFocus(Qt.OtherFocusReason)
-            if name:
+            if is_image:
+                self.exec_command('insertHTML',
+                        '<img src="%s" alt="%s"></img>'%(prepare_string_for_xml(url, True),
+                            prepare_string_for_xml(name or '', True)))
+            elif name:
                 self.exec_command('insertHTML',
                         '<a href="%s">%s</a>'%(prepare_string_for_xml(url, True),
                             prepare_string_for_xml(name)))
@@ -218,7 +223,7 @@ class EditorWidget(QWebView):  # {{{
                 self.exec_command('createLink', url)
         else:
             error_dialog(self, _('Invalid URL'),
-                         _('The url %r is invalid') % unicode(link), show=True)
+                         _('The url %r is invalid') % link, show=True)
 
     def ask_link(self):
         d = QDialog(self)
@@ -227,19 +232,43 @@ class EditorWidget(QWebView):  # {{{
         d.setLayout(l)
         d.url = QLineEdit(d)
         d.name = QLineEdit(d)
+        d.setMinimumWidth(600)
         d.bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
+        d.br = b = QPushButton(_('&Browse'))
+        b.setIcon(QIcon(I('document_open.png')))
+        def cf():
+            files = choose_files(d, 'select link file', _('Choose file'), select_only_single_file=True)
+            if files:
+                d.url.setText(files[0])
+        b.clicked.connect(cf)
+        d.la = la = QLabel(_(
+            'Enter a URL. You can also choose to create a link to a file on '
+            'your computer. If the selected file is an image, it will be '
+            'inserted as an image. Note that if you create a link to a file on '
+            'your computer, it will stop working if the file is moved.'))
+        la.setWordWrap(True)
+        la.setStyleSheet('QLabel { margin-bottom: 1.5ex }')
+        l.setWidget(0, l.SpanningRole, la)
         l.addRow(_('Enter &URL:'), d.url)
-        l.addRow(_('Enter name (optional):'), d.name)
+        l.addRow(_('Enter &name (optional):'), d.name)
+        l.addRow(_('Choose a file on your computer:'), d.br)
         l.addRow(d.bb)
         d.bb.accepted.connect(d.accept)
         d.bb.rejected.connect(d.reject)
-        link, name = None, None
+        d.resize(d.sizeHint())
+        link, name, is_image = None, None, False
         if d.exec_() == d.Accepted:
             link, name = unicode(d.url.text()).strip(), unicode(d.name.text()).strip()
-        return link, name
+            if link and os.path.exists(link):
+                with lopen(link, 'rb') as f:
+                    q = what(f)
+                is_image = q in {'jpeg', 'png', 'gif'}
+        return link, name, is_image
 
     def parse_link(self, link):
         link = link.strip()
+        if link and os.path.exists(link):
+            return QUrl.fromLocalFile(link)
         has_schema = re.match(r'^[a-zA-Z]+:', link)
         if has_schema is not None:
             url = QUrl(link, QUrl.TolerantMode)

From eb9714c7619d83cdee3a7f01071b86d4c5f15a1f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 15:21:54 +0530
Subject: [PATCH 0430/1154] Switch to reading plugin index from plugins mirror

---
 src/calibre/gui2/dialogs/plugin_updater.py | 144 +++++----------------
 1 file changed, 32 insertions(+), 112 deletions(-)

diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py
index 0b0885dc82..123a14b829 100644
--- a/src/calibre/gui2/dialogs/plugin_updater.py
+++ b/src/calibre/gui2/dialogs/plugin_updater.py
@@ -23,10 +23,8 @@ from calibre.gui2 import error_dialog, question_dialog, info_dialog, NONE, open_
 from calibre.gui2.preferences.plugins import ConfigWidget
 from calibre.utils.date import UNDEFINED_DATE, format_date
 
-
-MR_URL = 'http://www.mobileread.com/forums/'
-MR_INDEX_URL = MR_URL + 'showpost.php?p=1362767&postcount=1'
-
+SERVER = 'http://plugins.calibre-ebook.com/'
+INDEX_URL = '%splugins.json.bz2' % SERVER
 FILTER_ALL = 0
 FILTER_INSTALLED = 1
 FILTER_UPDATE_AVAILABLE = 2
@@ -55,33 +53,30 @@ def filter_not_installed_plugins(display_plugin):
     return not display_plugin.is_installed()
 
 def read_available_plugins(raise_error=False):
+    import json, bz2
     display_plugins = []
     br = browser()
-    br.set_handle_gzip(True)
     try:
-        raw = br.open_novisit(MR_INDEX_URL).read()
+        raw = br.open_novisit(INDEX_URL).read()
         if not raw:
             return
+        raw = json.loads(bz2.decompress(raw))
     except:
         if raise_error:
             raise
         traceback.print_exc()
         return
-    raw = raw.decode('utf-8', errors='replace')
-    root = html.fromstring(raw)
-    list_nodes = root.xpath('//div[@id="post_message_1362767"]/ul/li')
-    # Add our deprecated plugins which are nested in a grey span
-    list_nodes.extend(root.xpath('//div[@id="post_message_1362767"]/span/ul/li'))
-    for list_node in list_nodes:
+    for plugin in raw.itervalues():
         try:
-            display_plugin = DisplayPlugin(list_node)
+            display_plugin = DisplayPlugin(plugin)
             get_installed_plugin_status(display_plugin)
             display_plugins.append(display_plugin)
         except:
             if DEBUG:
-                prints('======= MobileRead Parse Error =======')
+                prints('======= Plugin Parse Error =======')
                 traceback.print_exc()
-                prints(html.tostring(list_node))
+                import pprint
+                pprint.pprint(plugin)
     display_plugins = sorted(display_plugins, key=lambda k: k.name)
     return display_plugins
 
@@ -189,61 +184,21 @@ class PluginFilterComboBox(QComboBox):
 
 class DisplayPlugin(object):
 
-    def __init__(self, list_node):
-        # The html from the index web page looks like this:
-        '''
-<li><a href="http://www.mobileread.com/forums/showthread.php?t=121787">Book Sync</a><br />
-<i>Add books to a list to be automatically sent to your device the next time it is connected.<br />
-<span class="resize_1">Version: 1.1; Released: 02-22-2011; Calibre: 0.7.42; Author: kiwidude; <br />
-Platforms: Windows, OSX, Linux; History: Yes;</span></i></li>
-        '''
-        self.name = list_node.xpath('a')[0].text_content().strip()
-        self.forum_link = list_node.xpath('a/@href')[0].strip()
+    def __init__(self, plugin):
+        self.name = plugin['name']
+        self.forum_link = plugin['thread_url']
+        self.zip_url = SERVER + plugin['file']
         self.installed_version = None
-
-        description_text = list_node.xpath('i')[0].text_content()
-        description_parts = description_text.partition('Version:')
-        self.description = description_parts[0].strip()
-
-        details_text = description_parts[1] + description_parts[2].replace('\r\n','')
-        details_pairs = details_text.split(';')
-        details = {}
-        for details_pair in details_pairs:
-            pair = details_pair.split(':')
-            if len(pair) == 2:
-                key = pair[0].strip().lower()
-                value = pair[1].strip()
-                details[key] = value
-
-        donation_node = list_node.xpath('i/span/a/@href')
-        self.donation_link = donation_node[0] if donation_node else None
-
-        self.available_version = self._version_text_to_tuple(details.get('version', None))
-
-        release_date = details.get('released', '01-01-0101').split('-')
-        date_parts = [int(re.search(r'(\d+)', x).group(1)) for x in release_date]
-        self.release_date = datetime.date(date_parts[2], date_parts[0], date_parts[1])
-
-        self.calibre_required_version = self._version_text_to_tuple(details.get('calibre', None))
-        self.author = details.get('author', '')
-        self.platforms = [p.strip().lower() for p in details.get('platforms', '').split(',')]
-        # Optional pairing just for plugins which require checking for uninstall first
-        self.uninstall_plugins = []
-        uninstall = details.get('uninstall', None)
-        if uninstall:
-            self.uninstall_plugins = [i.strip() for i in uninstall.split(',')]
-        self.has_changelog = details.get('history', 'No').lower() in ['yes', 'true']
-        self.is_deprecated = details.get('deprecated', 'No').lower() in ['yes', 'true']
-
-    def _version_text_to_tuple(self, version_text):
-        if version_text:
-            ver = version_text.split('.')
-            while len(ver) < 3:
-                ver.append('0')
-            ver = [int(re.search(r'(\d+)', x).group(1)) for x in ver]
-            return tuple(ver)
-        else:
-            return None
+        self.description = plugin['description']
+        self.donation_link = plugin['donate']
+        self.available_version = tuple(plugin['version'])
+        self.release_date = datetime.datetime(*tuple(map(int, re.split(r'\D', plugin['last_modified'])))[:6]).date()
+        self.calibre_required_version = plugin['minimum_calibre_version']
+        self.author = plugin['author']
+        self.platforms = plugin['supported_platforms']
+        self.uninstall_plugins = plugin['uninstall'] or []
+        self.has_changelog = plugin['history']
+        self.is_deprecated = plugin['deprecated']
 
     def is_disabled(self):
         if self.plugin is None:
@@ -456,6 +411,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
         SizePersistedDialog.__init__(self, gui, 'Plugin Updater plugin:plugin updater dialog')
         self.gui = gui
         self.forum_link = None
+        self.zip_url = None
         self.model = None
         self.do_restart = False
         self._initialize_controls()
@@ -475,8 +431,8 @@ class PluginUpdaterDialog(SizePersistedDialog):
             self._select_and_focus_view()
         else:
             error_dialog(self.gui, _('Update Check Failed'),
-                        _('Unable to reach the MobileRead plugins forum index page.'),
-                        det_msg=MR_INDEX_URL, show=True)
+                        _('Unable to reach the plugin index page.'),
+                        det_msg=INDEX_URL, show=True)
             self.filter_combo.setEnabled(False)
         # Cause our dialog size to be restored from prefs or created on first usage
         self.resize_dialog()
@@ -599,6 +555,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
             display_plugin = self.model.display_plugins[actual_idx.row()]
             self.description.setText(display_plugin.description)
             self.forum_link = display_plugin.forum_link
+            self.zip_url = display_plugin.zip_url
             self.forum_action.setEnabled(bool(self.forum_link))
             self.install_button.setEnabled(display_plugin.is_valid_to_install())
             self.install_action.setEnabled(self.install_button.isEnabled())
@@ -611,6 +568,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
         else:
             self.description.setText('')
             self.forum_link = None
+            self.zip_url = None
             self.forum_action.setEnabled(False)
             self.install_button.setEnabled(False)
             self.install_action.setEnabled(False)
@@ -703,17 +661,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
             for name_to_remove in uninstall_names:
                 self._uninstall_plugin(name_to_remove)
 
-        if DEBUG:
-            prints('Locating zip file for %s: %s'% (display_plugin.name, display_plugin.forum_link))
-        self.gui.status_bar.showMessage(
-                _('Locating zip file for %(name)s: %(link)s') % dict(
-                    name=display_plugin.name, link=display_plugin.forum_link))
-        plugin_zip_url = self._read_zip_attachment_url(display_plugin.forum_link)
-        if not plugin_zip_url:
-            return error_dialog(self.gui, _('Install Plugin Failed'),
-                        _('Unable to locate a plugin zip file for <b>%s</b>') % display_plugin.name,
-                        det_msg=display_plugin.forum_link, show=True)
-
+        plugin_zip_url = display_plugin.zip_url
         if DEBUG:
             prints('Downloading plugin zip attachment: ', plugin_zip_url)
         self.gui.status_bar.showMessage(_('Downloading plugin zip attachment: %s') % plugin_zip_url)
@@ -852,39 +800,11 @@ class PluginUpdaterDialog(SizePersistedDialog):
                     prints(html.tostring(spoiler_node))
         return None
 
-    def _read_zip_attachment_url(self, forum_link):
-        br = browser()
-        br.set_handle_gzip(True)
-        try:
-            raw = br.open_novisit(forum_link).read()
-            if not raw:
-                return None
-        except:
-            traceback.print_exc()
-            return None
-        raw = raw.decode('utf-8', errors='replace')
-        root = html.fromstring(raw)
-        attachment_nodes = root.xpath('//fieldset/table/tr/td/a')
-        for attachment_node in attachment_nodes:
-            try:
-                filename = attachment_node.text_content().lower()
-                if filename.find('.zip') != -1:
-                    full_url = MR_URL + attachment_node.attrib['href']
-                    return full_url
-            except:
-                if DEBUG:
-                    prints('======= MobileRead Parse Error =======')
-                    traceback.print_exc()
-                    prints(html.tostring(attachment_node))
-        return None
-
     def _download_zip(self, plugin_zip_url):
         from calibre.ptempfile import PersistentTemporaryFile
         br = browser()
-        br.set_handle_gzip(True)
         raw = br.open_novisit(plugin_zip_url).read()
-        pt = PersistentTemporaryFile('.zip')
-        pt.write(raw)
-        pt.close()
+        with PersistentTemporaryFile('.zip') as pt:
+            pt.write(raw)
         return pt.name
 

From ca0ee594f91ca9789bd4c020633226a0c31e9257 Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Sun, 4 Aug 2013 21:43:02 +1000
Subject: [PATCH 0431/1154] Delete Activity entry for synced shelves

When deleting shelves that have been synced, the Activity entry for the
shelf was not being deleted. This left a tile for the shelf on the home
screen of the Glo and AuraHD. Fixes #1208159 [Delete Activity entry for synced shelves on Kobo devices](https://bugs.launchpad.net/calibre/+bug/1208159)
---
 src/calibre/devices/kobo/driver.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 907a8b309a..2ef2c5efb7 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -2490,7 +2490,8 @@ class KOBOTOUCH(KOBO):
                                  "WHERE Type = 'Shelf' "
                                  "AND NOT EXISTS "
                                     "(SELECT 1 FROM Shelf "
-                                    "WHERE Shelf.Name = Activity.Id)"
+                                    "WHERE Shelf.Name = Activity.Id "
+                                    "AND Shelf._IsDeleted = 'false')"
                                  )
 
         cursor = connection.cursor()

From d03bfd7f3d7bdd2045fa24e73f4895230ffe2ac6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 23:48:52 +0530
Subject: [PATCH 0432/1154] Fix holding write lock while calling notify in
 legacy API

---
 src/calibre/db/legacy.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index a97e107c0e..b794d2c14c 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -436,7 +436,7 @@ class LibraryDatabase(object):
             if typ:
                 identifiers[typ] = val
                 self.new_api._set_field('identifiers', {book_id:identifiers})
-                self.notify('metadata', [book_id])
+        self.notify('metadata', [book_id])
 
     def set_isbn(self, book_id, isbn, notify=True, commit=True):
         self.set_identifier(book_id, 'isbn', isbn, notify=notify, commit=commit)
@@ -449,9 +449,9 @@ class LibraryDatabase(object):
                 existing = {icu_lower(x) for x in otags}
                 tags = list(otags) + [x for x in tags if icu_lower(x) not in existing]
             ret = self.new_api._set_field('tags', {book_id:tags}, allow_case_change=allow_case_change)
-            if notify:
-                self.notify('metadata', [book_id])
-            return ret
+        if notify:
+            self.notify('metadata', [book_id])
+        return ret
 
     def set_metadata(self, book_id, mi, ignore_errors=False, set_title=True,
                      set_authors=True, commit=True, force_changes=False, notify=True):

From 27b36ebefc4e3490fdc658bd9779c3a818734b18 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 00:00:34 +0530
Subject: [PATCH 0433/1154] Fix write_lock being help on db when postimport
 plugins are run

---
 src/calibre/db/adding.py | 43 +++++++++++++-------------
 src/calibre/db/cache.py  | 67 ++++++++++++++++++++--------------------
 2 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py
index d777e7065e..0ca8c611d8 100644
--- a/src/calibre/db/adding.py
+++ b/src/calibre/db/adding.py
@@ -106,26 +106,27 @@ def add_catalog(cache, path, title):
     from calibre.utils.date import utcnow
 
     fmt = os.path.splitext(path)[1][1:].lower()
-    with lopen(path, 'rb') as stream, cache.write_lock:
-        matches = cache._search('title:="%s" and tags:="%s"' % (title.replace('"', '\\"'), _('Catalog')), None)
-        db_id = None
-        if matches:
-            db_id = list(matches)[0]
-        try:
-            mi = get_metadata(stream, fmt)
-            mi.authors = ['calibre']
-        except:
-            mi = Metadata(title, ['calibre'])
-        mi.title, mi.authors = title, ['calibre']
-        mi.tags = [_('Catalog')]
-        mi.pubdate = mi.timestamp = utcnow()
-        if fmt == 'mobi':
-            mi.cover, mi.cover_data = None, (None, None)
-        if db_id is None:
-            db_id = cache._create_book_entry(mi, apply_import_tags=False)
-        else:
-            cache._set_metadata(db_id, mi)
-        cache._add_format(db_id, fmt, stream)
+    with lopen(path, 'rb') as stream:
+        with cache.write_lock:
+            matches = cache._search('title:="%s" and tags:="%s"' % (title.replace('"', '\\"'), _('Catalog')), None)
+            db_id = None
+            if matches:
+                db_id = list(matches)[0]
+            try:
+                mi = get_metadata(stream, fmt)
+                mi.authors = ['calibre']
+            except:
+                mi = Metadata(title, ['calibre'])
+            mi.title, mi.authors = title, ['calibre']
+            mi.tags = [_('Catalog')]
+            mi.pubdate = mi.timestamp = utcnow()
+            if fmt == 'mobi':
+                mi.cover, mi.cover_data = None, (None, None)
+            if db_id is None:
+                db_id = cache._create_book_entry(mi, apply_import_tags=False)
+            else:
+                cache._set_metadata(db_id, mi)
+        cache.add_format(db_id, fmt, stream)  # Cant keep write lock since post-import hooks might run
 
     return db_id
 
@@ -156,7 +157,7 @@ def add_news(cache, path, arg):
             mi.timestamp = utcnow()
 
         db_id = cache._create_book_entry(mi, apply_import_tags=False)
-        cache._add_format(db_id, fmt, stream)
+    cache.add_format(db_id, fmt, stream)  # Cant keep write lock since post-import hooks might run
 
     if not hasattr(path, 'read'):
         stream.close()
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 28058d7e8a..7db3a8b279 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -679,11 +679,10 @@ class Cache(object):
         fmtfile = self.format(book_id, original_fmt, as_file=True)
         if fmtfile is not None:
             fmt = original_fmt.partition('_')[2]
-            with self.write_lock:
-                with fmtfile:
-                    self._add_format(book_id, fmt, fmtfile, run_hooks=False)
-                self._remove_formats({book_id:(original_fmt,)})
-                return True
+            with fmtfile:
+                self.add_format(book_id, fmt, fmtfile, run_hooks=False)
+            self.remove_formats({book_id:(original_fmt,)})
+            return True
         return False
 
     @read_api
@@ -1150,38 +1149,40 @@ class Cache(object):
             self._reload_from_db()
             raise
 
-    @write_api
+    @api
     def add_format(self, book_id, fmt, stream_or_path, replace=True, run_hooks=True, dbapi=None):
-        if run_hooks:
-            # Run import plugins
-            npath = run_import_plugins(stream_or_path, fmt)
-            fmt = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
-            stream_or_path = lopen(npath, 'rb')
-            fmt = check_ebook_format(stream_or_path, fmt)
+        with self.write_lock:
+            if run_hooks:
+                # Run import plugins
+                npath = run_import_plugins(stream_or_path, fmt)
+                fmt = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
+                stream_or_path = lopen(npath, 'rb')
+                fmt = check_ebook_format(stream_or_path, fmt)
 
-        fmt = (fmt or '').upper()
-        self.format_metadata_cache[book_id].pop(fmt, None)
-        try:
-            name = self.fields['formats'].format_fname(book_id, fmt)
-        except:
-            name = None
+            fmt = (fmt or '').upper()
+            self.format_metadata_cache[book_id].pop(fmt, None)
+            try:
+                name = self.fields['formats'].format_fname(book_id, fmt)
+            except:
+                name = None
 
-        if name and not replace:
-            return False
+            if name and not replace:
+                return False
 
-        path = self._field_for('path', book_id).replace('/', os.sep)
-        title = self._field_for('title', book_id, default_value=_('Unknown'))
-        author = self._field_for('authors', book_id, default_value=(_('Unknown'),))[0]
-        stream = stream_or_path if hasattr(stream_or_path, 'read') else lopen(stream_or_path, 'rb')
-        size, fname = self.backend.add_format(book_id, fmt, stream, title, author, path)
-        del stream
+            path = self._field_for('path', book_id).replace('/', os.sep)
+            title = self._field_for('title', book_id, default_value=_('Unknown'))
+            author = self._field_for('authors', book_id, default_value=(_('Unknown'),))[0]
+            stream = stream_or_path if hasattr(stream_or_path, 'read') else lopen(stream_or_path, 'rb')
+            size, fname = self.backend.add_format(book_id, fmt, stream, title, author, path)
+            del stream
 
-        max_size = self.fields['formats'].table.update_fmt(book_id, fmt, fname, size, self.backend)
-        self.fields['size'].table.update_sizes({book_id: max_size})
-        self._update_last_modified((book_id,))
+            max_size = self.fields['formats'].table.update_fmt(book_id, fmt, fname, size, self.backend)
+            self.fields['size'].table.update_sizes({book_id: max_size})
+            self._update_last_modified((book_id,))
 
         if run_hooks:
-            # Run post import plugins
+            # Run post import plugins, the write lock is released so the plugin
+            # can call api without a locking violation.
             run_plugins_on_postimport(dbapi or self, book_id, fmt)
             stream_or_path.close()
 
@@ -1305,17 +1306,17 @@ class Cache(object):
 
         return book_id
 
-    @write_api
+    @api
     def add_books(self, books, add_duplicates=True, apply_import_tags=True, preserve_uuid=False, run_hooks=True, dbapi=None):
         duplicates, ids = [], []
         for mi, format_map in books:
-            book_id = self._create_book_entry(mi, add_duplicates=add_duplicates, apply_import_tags=apply_import_tags, preserve_uuid=preserve_uuid)
+            book_id = self.create_book_entry(mi, add_duplicates=add_duplicates, apply_import_tags=apply_import_tags, preserve_uuid=preserve_uuid)
             if book_id is None:
                 duplicates.append((mi, format_map))
             else:
                 ids.append(book_id)
                 for fmt, stream_or_path in format_map.iteritems():
-                    self._add_format(book_id, fmt, stream_or_path, dbapi=dbapi, run_hooks=run_hooks)
+                    self.add_format(book_id, fmt, stream_or_path, dbapi=dbapi, run_hooks=run_hooks)
         return ids, duplicates
 
     @write_api

From a97c86bfe3f0d6096444f435ee0f9340d58e3f85 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 4 Aug 2013 16:33:24 -0400
Subject: [PATCH 0434/1154] TXT Input: Allow shipped markdown extensions to be
 selected and used.

---
 .../ebooks/conversion/plugins/txt_input.py    | 17 +++++++++--
 src/calibre/ebooks/txt/processor.py           |  7 ++---
 src/calibre/gui2/convert/txt_input.py         |  2 +-
 src/calibre/gui2/convert/txt_input.ui         | 28 +++++++++++--------
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/txt_input.py b/src/calibre/ebooks/conversion/plugins/txt_input.py
index a8e18aad11..876e2c381e 100644
--- a/src/calibre/ebooks/conversion/plugins/txt_input.py
+++ b/src/calibre/ebooks/conversion/plugins/txt_input.py
@@ -47,8 +47,19 @@ class TXTInput(InputFormatPlugin):
         OptionRecommendation(name='txt_in_remove_indents', recommended_value=False,
             help=_('Normally extra space at the beginning of lines is retained. '
                    'With this option they will be removed.')),
-        OptionRecommendation(name="markdown_disable_toc", recommended_value=False,
-            help=_('Do not insert a Table of Contents into the output text.')),
+        OptionRecommendation(name="markdown_extensions", recommended_value='footnotes, tables, toc',
+            help=_('Enable extensions to markdown syntax. Extensions are formatting that is not part '
+                   'of the standard format.\n'
+                   'This should be a comma separated list of exentensions to enable:\n'
+                   '* abbr: Abbreviations.\n'
+                   '* def_list: Definition lists.\n'
+                   '* fenced_code: Alternative code block syntax.\n'
+                   '* footnotes: Footnotes\n.'
+                   '* headerid: Allow ids as part of a header.\n'
+                   '* meta: Metadata in the document.\n'
+                   '* tables: Support tables.\n'
+                   '* toc: Generate a table of contents.\n'
+                   '* wikilinks: Wiki style links.\n')),
     ])
 
     def convert(self, stream, options, file_ext, log,
@@ -178,7 +189,7 @@ class TXTInput(InputFormatPlugin):
         if options.formatting_type == 'markdown':
             log.debug('Running text through markdown conversion...')
             try:
-                html = convert_markdown(txt, disable_toc=options.markdown_disable_toc)
+                html = convert_markdown(txt, extensions=[x for x in options.markdown_extensions.split(',') if x.strip()])
             except RuntimeError:
                 raise ValueError('This txt file has malformed markup, it cannot be'
                     ' converted by calibre. See http://daringfireball.net/projects/markdown/syntax')
diff --git a/src/calibre/ebooks/txt/processor.py b/src/calibre/ebooks/txt/processor.py
index 0880eca4ca..cb132d374a 100644
--- a/src/calibre/ebooks/txt/processor.py
+++ b/src/calibre/ebooks/txt/processor.py
@@ -17,6 +17,7 @@ from calibre.ebooks.conversion.preprocess import DocAnalysis
 from calibre.utils.cleantext import clean_ascii_chars
 
 HTML_TEMPLATE = u'<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>%s </title></head><body>\n%s\n</body></html>'
+VALID_MARKDOWN_EXTENSIONS = ['abbr', 'def_list', 'fenced_code', 'footnotes', 'headerid', 'meta', 'tables', 'toc', 'wikilinks']
 
 def clean_txt(txt):
     '''
@@ -95,11 +96,9 @@ def convert_basic(txt, title='', epub_split_size_kb=0):
 
     return HTML_TEMPLATE % (title, u'\n'.join(lines))
 
-def convert_markdown(txt, title='', disable_toc=False):
+def convert_markdown(txt, title='', extensions=['footnotes', 'tables', 'toc']):
     from calibre.ebooks.markdown import markdown
-    extensions=['footnotes', 'tables']
-    if not disable_toc:
-        extensions.append('toc')
+    extensions = [x for x in extensions if x.lower() in VALID_MARKDOWN_EXTENSIONS]
     md = markdown.Markdown(
           extensions,
           safe_mode=False)
diff --git a/src/calibre/gui2/convert/txt_input.py b/src/calibre/gui2/convert/txt_input.py
index acdf5f43c0..c4ef46a7e2 100644
--- a/src/calibre/gui2/convert/txt_input.py
+++ b/src/calibre/gui2/convert/txt_input.py
@@ -16,7 +16,7 @@ class PluginWidget(Widget, Ui_Form):
 
     def __init__(self, parent, get_option, get_help, db=None, book_id=None):
         Widget.__init__(self, parent,
-            ['paragraph_type', 'formatting_type', 'markdown_disable_toc',
+            ['paragraph_type', 'formatting_type', 'markdown_extensions',
              'preserve_spaces', 'txt_in_remove_indents'])
         self.db, self.book_id = db, book_id
         for x in get_option('paragraph_type').option.choices:
diff --git a/src/calibre/gui2/convert/txt_input.ui b/src/calibre/gui2/convert/txt_input.ui
index 211b03294a..1d98eaccfb 100644
--- a/src/calibre/gui2/convert/txt_input.ui
+++ b/src/calibre/gui2/convert/txt_input.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>518</width>
-    <height>353</height>
+    <width>588</width>
+    <height>330</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -97,8 +97,21 @@
      <property name="title">
       <string>Markdown</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="opt_markdown_extensions"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Extensions (comma separated):</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="2">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>&lt;p&gt;Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit &lt;a href=&quot;http://daringfireball.net/projects/markdown&quot;&gt;markdown&lt;/a&gt;.</string>
@@ -111,13 +124,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="opt_markdown_disable_toc">
-        <property name="text">
-         <string>Do not insert Table of Contents into output text when using markdown</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

From 2fbcd61fb4950b13d5ca0b264256d1c9bff556fe Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 06:46:11 +0530
Subject: [PATCH 0435/1154] Add basic debug info to unhandled error dialog

---
 src/calibre/gui2/main_window.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/main_window.py b/src/calibre/gui2/main_window.py
index 9646211750..6c8a4876dd 100644
--- a/src/calibre/gui2/main_window.py
+++ b/src/calibre/gui2/main_window.py
@@ -88,7 +88,6 @@ class MainWindow(QMainWindow):
         cls.___menu_bar = mb
         cls.___menu = menu
 
-
     @classmethod
     def get_menubar_actions(cls):
         preferences_action = QAction(QIcon(I('config.png')), _('&Preferences'), None)
@@ -108,6 +107,11 @@ class MainWindow(QMainWindow):
             return
         try:
             sio = StringIO.StringIO()
+            try:
+                from calibre.debug import print_basic_debug_info
+                print_basic_debug_info(out=sio)
+            except:
+                pass
             traceback.print_exception(type, value, tb, file=sio)
             fe = sio.getvalue()
             prints(fe, file=sys.stderr)

From e459dee9c63c89ee3af2787e856bbd5ed7becf01 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 08:05:32 +0530
Subject: [PATCH 0436/1154] Add a tweak to debug newdb locking issues

---
 src/calibre/db/locking.py       | 35 +++++++++++++++++++++++++++++++--
 src/calibre/gui2/main_window.py |  2 ++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index 0791a5ac07..90afbb8ffe 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -7,12 +7,17 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+import traceback, sys
 from threading import Lock, Condition, current_thread, RLock
 from functools import partial
 from collections import Counter
+from calibre.utils.config_base import tweaks
 
 class LockingError(RuntimeError):
-    pass
+
+    def __init__(self, msg, extra=None):
+        RuntimeError.__init__(self, msg)
+        self.locking_debug_msg = extra
 
 def create_locks():
     '''
@@ -37,7 +42,8 @@ def create_locks():
     the possibility of deadlocking in this scenario).
     '''
     l = SHLock()
-    return RWLockWrapper(l), RWLockWrapper(l, is_shared=False)
+    wrapper = DebugRWLockWrapper if tweaks.get('newdb_debug_locking', False) else RWLockWrapper
+    return wrapper(l), wrapper(l, is_shared=False)
 
 class SHLock(object):  # {{{
     '''
@@ -217,6 +223,31 @@ class RWLockWrapper(object):
     def owns_lock(self):
         return self._shlock.owns_lock()
 
+class DebugRWLockWrapper(RWLockWrapper):
+
+    def __init__(self, *args, **kwargs):
+        RWLockWrapper.__init__(self, *args, **kwargs)
+        self._last_acquire = ()
+
+    def __enter__(self):
+        try:
+            RWLockWrapper.__enter__(self)
+        except LockingError as e:
+            if self._last_acquire is None:
+                raise
+            et, ei, tb = sys.exc_info()
+            raise LockingError, LockingError(e.message, extra='Last successful call to acquire():\n' + ''.join(self._last_acquire)), tb
+        self._last_acquire = traceback.format_stack()
+
+    def release(self):
+        try:
+            RWLockWrapper.release(self)
+        except LockingError as e:
+            if self._last_acquire is None:
+                raise
+            et, ei, tb = sys.exc_info()
+            raise LockingError, LockingError(e.message, extra='Last successful call to acquire():\n' + ''.join(self._last_acquire)), tb
+
 class RecordLock(object):
 
     '''
diff --git a/src/calibre/gui2/main_window.py b/src/calibre/gui2/main_window.py
index 6c8a4876dd..150c437148 100644
--- a/src/calibre/gui2/main_window.py
+++ b/src/calibre/gui2/main_window.py
@@ -113,6 +113,8 @@ class MainWindow(QMainWindow):
             except:
                 pass
             traceback.print_exception(type, value, tb, file=sio)
+            if getattr(value, 'locking_debug_msg', None):
+                prints(value.locking_debug_msg, file=sio)
             fe = sio.getvalue()
             prints(fe, file=sys.stderr)
             msg = '<b>%s</b>:'%type.__name__ + unicode(str(value), 'utf8', 'replace')

From 2e3a0e57bf427025cc1f91a962cfaf4cb3d82677 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 10:37:29 +0530
Subject: [PATCH 0437/1154] Fix book count in tooltip of choose library button
 not updating

Fixes #1208217 [library toolbar button not updated on book deletion](https://bugs.launchpad.net/calibre/+bug/1208217)
---
 src/calibre/gui2/actions/choose_library.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index f50aa95443..9c6a666a92 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -292,16 +292,22 @@ class ChooseLibraryAction(InterfaceAction):
         path = path.replace(os.sep, '/')
         return self.stats.pretty(path)
 
+    def update_tooltip(self, count):
+        tooltip = self.action_spec[2] + '\n\n' + _('{0} [{1} books]').format(
+            getattr(self, 'last_lname', ''), count)
+        a = self.qaction
+        a.setToolTip(tooltip)
+        a.setStatusTip(tooltip)
+        a.setWhatsThis(tooltip)
+
     def library_changed(self, db):
         lname = self.stats.library_used(db)
-        tooltip = self.action_spec[2] + '\n\n' + _('{0} [{1} books]').format(lname, db.count())
+        self.last_lname = lname
         if len(lname) > 16:
             lname = lname[:16] + u'…'
         a = self.qaction
         a.setText(lname)
-        a.setToolTip(tooltip)
-        a.setStatusTip(tooltip)
-        a.setWhatsThis(tooltip)
+        self.update_tooltip(db.count())
         self.build_menus()
         state = self.view_state_map.get(self.stats.canonicalize_path(
             db.library_path), None)
@@ -557,7 +563,7 @@ class ChooseLibraryAction(InterfaceAction):
         self.switch_requested(self.qs_locations[idx])
 
     def count_changed(self, new_count):
-        pass
+        self.update_tooltip(new_count)
 
     def choose_library(self, *args):
         if not self.change_library_allowed():

From 8da42d6a700c2edd3b06948954a0e99b9df46a90 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 10:59:36 +0530
Subject: [PATCH 0438/1154] Do not popup an error dialog for invalid message

Do not popup an error dialog when an invalid message is received from
another instance, unless we are in DEBUG mode. See #1207947
---
 src/calibre/gui2/ui.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 43740876ea..6d2c2d2d14 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -19,7 +19,7 @@ from PyQt4.Qt import (Qt, SIGNAL, QTimer, QHelpEvent, QAction,
                      QDialog, QSystemTrayIcon, QApplication)
 
 from calibre import prints, force_unicode
-from calibre.constants import __appname__, isosx, filesystem_encoding
+from calibre.constants import __appname__, isosx, filesystem_encoding, DEBUG
 from calibre.utils.config import prefs, dynamic
 from calibre.utils.ipc.server import Server
 from calibre.db import get_db_loader
@@ -521,7 +521,16 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             return
         if msg.startswith('launched:'):
             import json
-            argv = json.loads(msg[len('launched:'):])
+            try:
+                argv = json.loads(msg[len('launched:'):])
+            except ValueError:
+                prints('Failed to decode message from other instance: %r' % msg)
+                if DEBUG:
+                    error_dialog(self, 'Invalid message',
+                                 'Received an invalid message from other calibre instance.'
+                                 ' Do you have multiple versions of calibre installed?',
+                                 det_msg='Invalid msg: %r' % msg, show=True)
+                argv = ()
             if isinstance(argv, (list, tuple)) and len(argv) > 1:
                 files = [os.path.abspath(p) for p in argv[1:] if not os.path.isdir(p) and os.access(p, os.R_OK)]
                 if files:

From 34d2b0a64fca3b3b14e2eb36fa35d02f5e35ed83 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 11:06:43 +0530
Subject: [PATCH 0439/1154] Allow refering to bugs without closing them in
 commit messages

---
 setup/git_pre_commit_hook.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/git_pre_commit_hook.py b/setup/git_pre_commit_hook.py
index 8be2640f35..978983ca56 100755
--- a/setup/git_pre_commit_hook.py
+++ b/setup/git_pre_commit_hook.py
@@ -20,7 +20,7 @@ from lxml import html
 SENDMAIL = ('/home/kovid/work/env', 'pgp_mail')
 LAUNCHPAD_BUG = 'https://bugs.launchpad.net/calibre/+bug/%s'
 GITHUB_BUG = 'https://api.github.com/repos/kovidgoyal/calibre/issues/%s'
-BUG_PAT = r'(Fix|Implement|Fixes|Fixed|Implemented)\s+#(\d+)'
+BUG_PAT = r'(Fix|Implement|Fixes|Fixed|Implemented|See)\s+#(\d+)'
 
 class Bug:
 
@@ -45,7 +45,7 @@ class Bug:
             summary = json.loads(urllib.urlopen(GITHUB_BUG % bug).read())['title']
         if summary:
             print ('Working on bug:', summary)
-            if int(bug) > 100000:
+            if int(bug) > 100000 and action != 'See':
                 self.close_bug(bug, action)
                 return match.group() + ' [%s](%s)' % (summary, LAUNCHPAD_BUG % bug)
             return match.group() + ' (%s)' % summary

From 1d338fa8c43108489f00d0a6ca2a514211c13cab Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 12:09:13 +0530
Subject: [PATCH 0440/1154] ...

---
 src/calibre/gui2/preferences/plugins.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py
index d7ed371a1e..9329477710 100644
--- a/src/calibre/gui2/preferences/plugins.py
+++ b/src/calibre/gui2/preferences/plugins.py
@@ -337,8 +337,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             plugin = self._plugin_model.index_to_plugin(index)
             if op == 'toggle':
                 if not plugin.can_be_disabled:
-                    error_dialog(self,_('Plugin cannot be disabled'),
-                                 _('Disabling the plugin %s is not allowed')%plugin.name).exec_()
+                    info_dialog(self, _('Plugin cannot be disabled'),
+                                 _('Disabling the plugin %s is not allowed')%plugin.name, show=True, show_copy_button=False)
                     return
                 if is_disabled(plugin):
                     enable_plugin(plugin)

From 6c630b280ffe86c0ac2928ed8b2c0de683d6d428 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 12:54:35 +0530
Subject: [PATCH 0441/1154] Auto-run .ui file compilation on branch change

---
 setup/git_post_checkout_hook.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 setup/git_post_checkout_hook.py

diff --git a/setup/git_post_checkout_hook.py b/setup/git_post_checkout_hook.py
new file mode 100755
index 0000000000..f2e47cf582
--- /dev/null
+++ b/setup/git_post_checkout_hook.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os, subprocess
+base = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+subprocess.check_call(['python', 'setup.py', 'gui'], cwd=base)
+

From b5f1010d8a21e87c90f25f0bbd122a34e53c699b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 13:23:56 +0530
Subject: [PATCH 0442/1154] Conversion: Fix removal of empty inline tags

Conversion: Fix empty inline tags that are the second child of a
paragraph causing text change location. Fixes #1207735 [Conversion issue from epub to mobi.  Italicized word sometimes moves to end of paragrah.](https://bugs.launchpad.net/calibre/+bug/1207735)
---
 src/calibre/ebooks/oeb/parse_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index 8bf9c23d98..dd4ee11cc6 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -399,7 +399,7 @@ def parse_html(data, log=None, decoder=None, preprocessor=None,
         idx = p.index(a) -1
         p.remove(a)
         if a.tail:
-            if idx <= 0:
+            if idx < 0:
                 if p.text is None:
                     p.text = ''
                 p.text += a.tail

From 3d7b8b939e9c1a165367b8ad8049c3a8ded2d91d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 30 Jul 2013 14:36:36 +0530
Subject: [PATCH 0443/1154] Start work on cover grid

---
 resources/images/grid.png                   | Bin 0 -> 10706 bytes
 src/calibre/gui2/init.py                    |  20 ++++++++++----
 src/calibre/gui2/library/alternate_views.py |  29 ++++++++++++++++++++
 src/calibre/gui2/library/views.py           |   2 ++
 src/calibre/gui2/widgets.py                 |  10 +++----
 5 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 resources/images/grid.png
 create mode 100644 src/calibre/gui2/library/alternate_views.py

diff --git a/resources/images/grid.png b/resources/images/grid.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1dbf40a65b86fe42f834f3b5dc8959db7f94c9e
GIT binary patch
literal 10706
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
ZC#yDU$2M7e@IIy#;<&@HiX+}P{ugsGMp6I(

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index feed5bb4ad..283823158d 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -15,7 +15,8 @@ from calibre.constants import (isosx, __appname__, preferred_encoding,
     get_version)
 from calibre.gui2 import config, is_widescreen, gprefs
 from calibre.gui2.library.views import BooksView, DeviceBooksView
-from calibre.gui2.widgets import Splitter
+from calibre.gui2.library.alternate_views import GridView
+from calibre.gui2.widgets import Splitter, LayoutButton
 from calibre.gui2.tag_browser.ui import TagBrowserWidget
 from calibre.gui2.book_details import BookDetails
 from calibre.gui2.notify import get_notifier
@@ -116,7 +117,13 @@ class LibraryWidget(Splitter):  # {{{
                 shortcut=_('Shift+Alt+B'))
         parent.library_view = BooksView(parent)
         parent.library_view.setObjectName('library_view')
-        self.addWidget(parent.library_view)
+        stack = QStackedWidget(self)
+        av = parent.library_view.alternate_views
+        av.set_stack(stack)
+        parent.grid_view = GridView(parent)
+        parent.grid_view.setObjectName('grid_view')
+        av.add_view('grid', parent.grid_view)
+        self.addWidget(stack)
 # }}}
 
 class Stack(QStackedWidget):  # {{{
@@ -251,7 +258,7 @@ class LayoutMixin(object):  # {{{
             self.bd_splitter.addWidget(self.book_details)
             self.bd_splitter.setCollapsible(self.bd_splitter.other_index, False)
             self.centralwidget.layout().addWidget(self.bd_splitter)
-            button_order = ('tb', 'bd', 'cb')
+            button_order = ('tb', 'bd', 'cb', 'gv')
         # }}}
         else:  # wide {{{
             self.bd_splitter = Splitter('book_details_splitter',
@@ -266,13 +273,16 @@ class LayoutMixin(object):  # {{{
             self.bd_splitter.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,
                 QSizePolicy.Expanding))
             self.centralwidget.layout().addWidget(self.bd_splitter)
-            button_order = ('tb', 'cb', 'bd')
+            button_order = ('tb', 'cb', 'bd', 'gv')
         # }}}
 
         self.status_bar = StatusBar(self)
         stylename = unicode(self.style().objectName())
+        self.grid_view_button = LayoutButton(I('grid.png'), _('Cover Grid'), parent=self, shortcut=_('Shift+Alt+G'))
+        self.grid_view_button.set_state_to_show()
+
         for x in button_order:
-            button = getattr(self, x+'_splitter').button
+            button = self.grid_view_button if x == 'gv' else getattr(self, x+'_splitter').button
             button.setIconSize(QSize(24, 24))
             if isosx and stylename != u'Calibre':
                 button.setStyleSheet('''
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
new file mode 100644
index 0000000000..6970dba94e
--- /dev/null
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from PyQt4.Qt import QListView
+
+class AlternateViews(object):
+
+    def __init__(self, main_view):
+        self.views = {}
+        self.current_view = self.main_view = main_view
+        self.stack = None
+
+    def set_stack(self, stack):
+        self.stack = stack
+        self.stack.addWidget(self.main_view)
+
+    def add_view(self, key, view):
+        self.views[key] = view
+        self.stack.addWidget(view)
+        self.stack.setCurrentIndex(0)
+
+class GridView(QListView):
+    pass
+
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 0cb827adea..dc412fc368 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -19,6 +19,7 @@ from calibre.gui2.library.delegates import (RatingDelegate, PubDateDelegate,
     CcBoolDelegate, CcCommentsDelegate, CcDateDelegate, CcTemplateDelegate,
     CcEnumDelegate, CcNumberDelegate, LanguagesDelegate)
 from calibre.gui2.library.models import BooksModel, DeviceBooksModel
+from calibre.gui2.library.alternate_views import AlternateViews
 from calibre.utils.config import tweaks, prefs
 from calibre.gui2 import error_dialog, gprefs
 from calibre.gui2.library import DEFAULT_SORT
@@ -141,6 +142,7 @@ class BooksView(QTableView):  # {{{
         QTableView.__init__(self, parent)
         self.setProperty('highlight_current_item', 150)
         self.row_sizing_done = False
+        self.alternate_views = AlternateViews(self)
 
         if not tweaks['horizontal_scrolling_per_column']:
             self.setHorizontalScrollMode(self.ScrollPerPixel)
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index a10366c471..43963d81fd 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -927,14 +927,15 @@ class SplitterHandle(QSplitterHandle):
 
 class LayoutButton(QToolButton):
 
-    def __init__(self, icon, text, splitter, parent=None, shortcut=None):
+    def __init__(self, icon, text, splitter=None, parent=None, shortcut=None):
         QToolButton.__init__(self, parent)
         self.label = text
         self.setIcon(QIcon(icon))
         self.setCheckable(True)
 
         self.splitter = splitter
-        splitter.state_changed.connect(self.update_state)
+        if splitter is not None:
+            splitter.state_changed.connect(self.update_state)
         self.setCursor(Qt.PointingHandCursor)
         self.shortcut = ''
         if shortcut:
@@ -942,14 +943,13 @@ class LayoutButton(QToolButton):
 
     def set_state_to_show(self, *args):
         self.setChecked(False)
-        label =_('Show')
-        self.setText(label + ' ' + self.label + u' (%s)'%self.shortcut)
+        self.setText(_('Show %(label)s [%(shortcut)s]')%dict(label=self.label, shortcut=self.shortcut))
         self.setToolTip(self.text())
         self.setStatusTip(self.text())
 
     def set_state_to_hide(self, *args):
         self.setChecked(True)
-        self.setText(_('Hide %(label)s %(shortcut)s')%dict(
+        self.setText(_('Hide %(label)s [%(shortcut)s]')%dict(
             label=self.label, shortcut=self.shortcut))
         self.setToolTip(self.text())
         self.setStatusTip(self.text())

From 0889f6f0c6e1abd2d3b48e9bc825b58ddb675e9e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 12:55:36 +0530
Subject: [PATCH 0444/1154] Shortcut for grid view

---
 src/calibre/gui2/init.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 283823158d..2ca9b43729 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
 import functools
 
 from PyQt4.Qt import (Qt, QApplication, QStackedWidget, QMenu, QTimer,
-        QSize, QSizePolicy, QStatusBar, QLabel, QFont)
+        QSize, QSizePolicy, QStatusBar, QLabel, QFont, QAction)
 
 from calibre.utils.config import prefs, tweaks
 from calibre.constants import (isosx, __appname__, preferred_encoding,
@@ -243,6 +243,20 @@ class StatusBar(QStatusBar):  # {{{
 
 # }}}
 
+class GridViewButton(LayoutButton):  # {{{
+
+    def __init__(self, gui):
+        sc = _('Shift+Alt+G')
+        LayoutButton.__init__(self, I('grid.png'), _('Cover Grid'), parent=gui, shortcut=sc)
+        self.set_state_to_show()
+        self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self)
+        gui.addAction(self.action_toggle)
+        gui.keyboard.register_shortcut('grid view toggle' + self.label, unicode(self.action_toggle.text()),
+                                       default_keys=(sc,), action=self.action_toggle)
+        self.action_toggle.triggered.connect(self.toggle)
+
+# }}}
+
 class LayoutMixin(object):  # {{{
 
     def __init__(self):
@@ -278,8 +292,7 @@ class LayoutMixin(object):  # {{{
 
         self.status_bar = StatusBar(self)
         stylename = unicode(self.style().objectName())
-        self.grid_view_button = LayoutButton(I('grid.png'), _('Cover Grid'), parent=self, shortcut=_('Shift+Alt+G'))
-        self.grid_view_button.set_state_to_show()
+        self.grid_view_button = GridViewButton(self)
 
         for x in button_order:
             button = self.grid_view_button if x == 'gv' else getattr(self, x+'_splitter').button

From fe363c95f5b5090afe000b8acf450dfb611d92b0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 13:43:25 +0530
Subject: [PATCH 0445/1154] Wire up the grid view button

---
 src/calibre/gui2/init.py                    |  4 ++++
 src/calibre/gui2/library/alternate_views.py | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 2ca9b43729..fe4a4e836e 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -293,6 +293,7 @@ class LayoutMixin(object):  # {{{
         self.status_bar = StatusBar(self)
         stylename = unicode(self.style().objectName())
         self.grid_view_button = GridViewButton(self)
+        self.grid_view_button.toggled.connect(self.toggle_grid_view)
 
         for x in button_order:
             button = self.grid_view_button if x == 'gv' else getattr(self, x+'_splitter').button
@@ -339,6 +340,9 @@ class LayoutMixin(object):  # {{{
                     self.library_view.currentIndex())
         self.library_view.setFocus(Qt.OtherFocusReason)
 
+    def toggle_grid_view(self, show):
+        self.library_view.alternate_views.show_view('grid' if show else None)
+
     def bd_cover_changed(self, id_, cdata):
         self.library_view.model().db.set_cover(id_, cdata)
         if self.cover_flow:
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 6970dba94e..0c216d8d2f 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -11,7 +11,8 @@ from PyQt4.Qt import QListView
 class AlternateViews(object):
 
     def __init__(self, main_view):
-        self.views = {}
+        self.views = {None:main_view}
+        self.stack_positions = {None:0}
         self.current_view = self.main_view = main_view
         self.stack = None
 
@@ -21,9 +22,17 @@ class AlternateViews(object):
 
     def add_view(self, key, view):
         self.views[key] = view
+        self.stack_positions[key] = self.stack.count()
         self.stack.addWidget(view)
         self.stack.setCurrentIndex(0)
 
+    def show_view(self, key=None):
+        view = self.views[key]
+        if view is self.current_view:
+            return
+        self.stack.setCurrentIndex(self.stack_positions[key])
+        self.current_view = view
+
 class GridView(QListView):
     pass
 

From 0b9fe18d911794512ca1487385d12968e6742a11 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 18:07:14 +0530
Subject: [PATCH 0446/1154] Grid view renders

---
 src/calibre/db/cache.py                     |  13 ++
 src/calibre/gui2/library/alternate_views.py | 194 +++++++++++++++++++-
 src/calibre/gui2/library/views.py           |   2 +
 src/calibre/gui2/ui.py                      |   1 +
 4 files changed, 208 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 7db3a8b279..677c3168d5 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -89,6 +89,7 @@ class Cache(object):
         self.formatter_template_cache = {}
         self.dirtied_cache = {}
         self.dirtied_sequence = 0
+        self.cover_caches = set()
 
         # Implement locking for all simple read/write API methods
         # An unlocked version of the method is stored with the name starting
@@ -1031,9 +1032,21 @@ class Cache(object):
                 path = self._field_for('path', book_id).replace('/', os.sep)
 
             self.backend.set_cover(book_id, path, data)
+            for cc in self.cover_caches:
+                cc.invalidate(book_id)
         return self._set_field('cover', {
             book_id:(0 if data is None else 1) for book_id, data in book_id_data_map.iteritems()})
 
+    @write_api
+    def add_cover_cache(self, cover_cache):
+        if not callable(cover_cache.invalidate):
+            raise ValueError('Cover caches must have an invalidate method')
+        self.cover_caches.add(cover_cache)
+
+    @write_api
+    def remove_cover_cache(self, cover_cache):
+        self.cover_caches.discard(cover_cache)
+
     @write_api
     def set_metadata(self, book_id, mi, ignore_errors=False, force_changes=False,
                      set_title=True, set_authors=True):
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 0c216d8d2f..19588904a6 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -6,7 +6,15 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from PyQt4.Qt import QListView
+from time import time
+from collections import OrderedDict
+from threading import Lock, Event, Thread
+from Queue import Queue
+
+from PyQt4.Qt import (
+    QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal, QPalette, QColor)
+
+from calibre import fit_image
 
 class AlternateViews(object):
 
@@ -25,6 +33,7 @@ class AlternateViews(object):
         self.stack_positions[key] = self.stack.count()
         self.stack.addWidget(view)
         self.stack.setCurrentIndex(0)
+        view.setModel(self.main_view._model)
 
     def show_view(self, key=None):
         view = self.views[key]
@@ -32,7 +41,188 @@ class AlternateViews(object):
             return
         self.stack.setCurrentIndex(self.stack_positions[key])
         self.current_view = view
+        if view is not self.main_view:
+            view.shown()
+
+    def set_database(self, db, stage=0):
+        for view in self.views.itervalues():
+            if view is not self.main_view:
+                view.set_database(db, stage=stage)
+
+class CoverCache(dict):
+
+    def __init__(self, limit=200):
+        self.items = OrderedDict()
+        self.lock = Lock()
+        self.limit = limit
+
+    def invalidate(self, book_id):
+        with self.lock:
+            self.items.pop(book_id, None)
+
+    def __call__(self, key):
+        with self.lock:
+            ans = self.items.pop(key, False)
+            if ans is not False:
+                self.items[key] = ans
+                if len(self.items) > self.limit:
+                    del self.items[next(self.items.iterkeys())]
+
+        return ans
+
+    def set(self, key, val):
+        with self.lock:
+            self.items[key] = val
+            if len(self.items) > self.limit:
+                del self.items[next(self.items.iterkeys())]
+
+    def clear(self):
+        with self.lock:
+            self.items.clear()
+
+class CoverDelegate(QStyledItemDelegate):
+
+    def __init__(self, parent, width, height):
+        super(CoverDelegate, self).__init__(parent)
+        self.cover_size = QSize(width, height)
+        self.item_size = self.cover_size + QSize(8, 8)
+        self.spacing = max(10, min(50, int(0.1 * width)))
+        self.cover_cache = CoverCache()
+        self.render_queue = Queue()
+
+    def sizeHint(self, option, index):
+        return self.item_size
+
+    def paint(self, painter, option, index):
+        QStyledItemDelegate.paint(self, painter, option, QModelIndex())  # draw the hover and selection highlights
+        db = index.model().db
+        try:
+            book_id = db.id(index.row())
+        except (ValueError, IndexError, KeyError):
+            return
+        db = db.new_api
+        cdata = self.cover_cache(book_id)
+        painter.save()
+        try:
+            rect = option.rect
+            rect.adjust(4, 4, -4, -4)
+            if cdata is None or cdata is False:
+                title = db.field_for('title', book_id, default_value='')
+                painter.drawText(rect, Qt.AlignCenter|Qt.TextWordWrap, title)
+                if cdata is False:
+                    self.render_queue.put(book_id)
+            else:
+                dx = max(0, int((rect.width() - cdata.width())/2.0))
+                dy = max(0, rect.height() - cdata.height())
+                rect.adjust(dx, dy, -dx, 0)
+                painter.drawImage(rect, cdata)
+        finally:
+            painter.restore()
+
+def join_with_timeout(q, timeout=2):
+    q.all_tasks_done.acquire()
+    try:
+        endtime = time() + timeout
+        while q.unfinished_tasks:
+            remaining = endtime - time()
+            if remaining <= 0.0:
+                raise RuntimeError('Waiting for queue to clear timed out')
+            q.all_tasks_done.wait(remaining)
+    finally:
+        q.all_tasks_done.release()
 
 class GridView(QListView):
-    pass
+
+    update_item = pyqtSignal(object)
+
+    def __init__(self, parent):
+        QListView.__init__(self, parent)
+        pal = QPalette(self.palette())
+        r = g = b = 0x50
+        pal.setColor(pal.Base, QColor(r, g, b))
+        pal.setColor(pal.Text, QColor(Qt.white if (r + g + b)/3.0 < 128 else Qt.black))
+        self.setPalette(pal)
+        self.setUniformItemSizes(True)
+        self.setWrapping(True)
+        self.setFlow(self.LeftToRight)
+        self.setLayoutMode(self.Batched)
+        self.setResizeMode(self.Adjust)
+        self.setSelectionMode(self.ExtendedSelection)
+        self.delegate = CoverDelegate(self, 135, 180)
+        self.setItemDelegate(self.delegate)
+        self.setSpacing(self.delegate.spacing)
+        self.ignore_render_requests = Event()
+        self.render_thread = None
+        self.update_item.connect(self.re_render, type=Qt.QueuedConnection)
+
+    def shown(self):
+        if self.render_thread is None:
+            self.render_thread = Thread(target=self.render_covers)
+            self.render_thread.daemon = True
+            self.render_thread.start()
+
+    def render_covers(self):
+        q = self.delegate.render_queue
+        while True:
+            book_id = q.get()
+            try:
+                if book_id is None:
+                    return
+                if self.ignore_render_requests.is_set():
+                    continue
+                try:
+                    self.render_cover(book_id)
+                except:
+                    import traceback
+                    traceback.print_exc()
+            finally:
+                q.task_done()
+
+    def render_cover(self, book_id):
+        cdata = self.model().db.new_api.cover(book_id)
+        if self.ignore_render_requests.is_set():
+            return
+        if cdata is not None:
+            p = QImage()
+            p.loadFromData(cdata)
+            cdata = None
+            if not p.isNull():
+                width, height = p.width(), p.height()
+                scaled, nwidth, nheight = fit_image(width, height, self.delegate.cover_size.width(), self.delegate.cover_size.height())
+                if scaled:
+                    if self.ignore_render_requests.is_set():
+                        return
+                    p = p.scaled(nwidth, nheight, Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
+                cdata = p
+        self.delegate.cover_cache.set(book_id, cdata)
+        self.update_item.emit(book_id)
+
+    def re_render(self, book_id):
+        m = self.model()
+        try:
+            index = m.db.row(book_id)
+        except (IndexError, ValueError, KeyError):
+            return
+        self.update(m.index(index, 0))
+
+    def shutdown(self):
+        self.ignore_render_requests.set()
+        self.delegate.render_queue.put(None)
+
+    def set_database(self, newdb, stage=0):
+        if stage == 0:
+            self.ignore_render_requests.set()
+            try:
+                # Use a timeout so that if, for some reason, the render thread
+                # gets stuck, we dont deadlock, future covers wont get
+                # rendered, but this is better than a deadlock
+                join_with_timeout(self.delegate.render_queue)
+            except RuntimeError:
+                print ('Cover rendering thread is stuck!')
+            finally:
+                self.ignore_render_requests.clear()
+        else:
+            self.delegate.cover_cache.clear()
+
+
 
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index dc412fc368..257540c53d 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -632,6 +632,7 @@ class BooksView(QTableView):  # {{{
     # Initialization/Delegate Setup {{{
 
     def set_database(self, db):
+        self.alternate_views.set_database(db)
         self.save_state()
         self._model.set_database(db)
         self.tags_delegate.set_database(db)
@@ -639,6 +640,7 @@ class BooksView(QTableView):  # {{{
         self.authors_delegate.set_database(db)
         self.series_delegate.set_auto_complete_function(db.all_series)
         self.publisher_delegate.set_auto_complete_function(db.all_publishers)
+        self.alternate_views.set_database(db, stage=1)
 
     def database_changed(self, db):
         for i in range(self.model().columnCount(None)):
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 6d2c2d2d14..8e34c2a84f 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -812,6 +812,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         return True
 
     def shutdown(self, write_settings=True):
+        self.grid_view.shutdown()
         try:
             db = self.library_view.model().db
             cf = db.clean

From f3bb9ea4ed7eb181dc69fb246ba29691c63061ce Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 18:13:14 +0530
Subject: [PATCH 0447/1154] Register cover caches with the db

---
 src/calibre/gui2/library/alternate_views.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 19588904a6..479c071784 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -80,6 +80,9 @@ class CoverCache(dict):
         with self.lock:
             self.items.clear()
 
+    def __hash__(self):
+        return id(self)
+
 class CoverDelegate(QStyledItemDelegate):
 
     def __init__(self, parent, width, height):
@@ -212,6 +215,11 @@ class GridView(QListView):
     def set_database(self, newdb, stage=0):
         if stage == 0:
             self.ignore_render_requests.set()
+            try:
+                self.model().db.new_api.remove_cover_cache(self.delegate.cover_cache)
+            except AttributeError:
+                pass  # db is None
+            newdb.new_api.add_cover_cache(self.delegate.cover_cache)
             try:
                 # Use a timeout so that if, for some reason, the render thread
                 # gets stuck, we dont deadlock, future covers wont get

From b95b0942da67aec5b3e144e2697de64ef431019c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 18:32:36 +0530
Subject: [PATCH 0448/1154] Remember grid view state

---
 src/calibre/gui2/init.py | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index fe4a4e836e..14910d749a 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -248,12 +248,33 @@ class GridViewButton(LayoutButton):  # {{{
     def __init__(self, gui):
         sc = _('Shift+Alt+G')
         LayoutButton.__init__(self, I('grid.png'), _('Cover Grid'), parent=gui, shortcut=sc)
-        self.set_state_to_show()
-        self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self)
-        gui.addAction(self.action_toggle)
-        gui.keyboard.register_shortcut('grid view toggle' + self.label, unicode(self.action_toggle.text()),
-                                       default_keys=(sc,), action=self.action_toggle)
-        self.action_toggle.triggered.connect(self.toggle)
+        if tweaks.get('use_new_db', False):
+            self.set_state_to_show()
+            self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self)
+            gui.addAction(self.action_toggle)
+            gui.keyboard.register_shortcut('grid view toggle' + self.label, unicode(self.action_toggle.text()),
+                                        default_keys=(sc,), action=self.action_toggle)
+            self.action_toggle.triggered.connect(self.toggle)
+            self.toggled.connect(self.update_state)
+            self.grid_enabled = True
+        else:
+            self.setVisible(False)
+            self.grid_enabled = False
+
+    def update_state(self, checked):
+        if checked:
+            self.set_state_to_hide()
+        else:
+            self.set_state_to_show()
+
+    def save_state(self):
+        if self.grid_enabled:
+            gprefs['grid view visible'] = bool(self.isChecked())
+
+    def restore_state(self):
+        if self.grid_enabled and gprefs.get('grid view visible', False):
+            self.toggle()
+
 
 # }}}
 
@@ -366,11 +387,13 @@ class LayoutMixin(object):  # {{{
             s = getattr(self, x+'_splitter')
             s.update_desired_state()
             s.save_state()
+        self.grid_view_button.save_state()
 
     def read_layout_settings(self):
         # View states are restored automatically when set_database is called
         for x in ('cb', 'tb', 'bd'):
             getattr(self, x+'_splitter').restore_state()
+        self.grid_view_button.restore_state()
 
     def update_status_bar(self, *args):
         v = self.current_view()

From 7717fe6d0537854ea1278f2c354ea043bd8b875d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Aug 2013 21:27:53 +0530
Subject: [PATCH 0449/1154] Sync the main and grid views

---
 src/calibre/gui2/library/alternate_views.py | 64 ++++++++++++++++++++-
 src/calibre/gui2/library/views.py           | 12 ++--
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 479c071784..0aada05b7e 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -6,16 +6,28 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
+import itertools, operator
 from time import time
 from collections import OrderedDict
 from threading import Lock, Event, Thread
 from Queue import Queue
+from functools import wraps
 
 from PyQt4.Qt import (
-    QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal, QPalette, QColor)
+    QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
+    QPalette, QColor, QItemSelection)
 
 from calibre import fit_image
 
+def sync(func):
+    @wraps(func)
+    def ans(self, *args, **kwargs):
+        if self.break_link or self.current_view is self.main_view:
+            return
+        with self:
+            return func(self, *args, **kwargs)
+    return ans
+
 class AlternateViews(object):
 
     def __init__(self, main_view):
@@ -23,6 +35,8 @@ class AlternateViews(object):
         self.stack_positions = {None:0}
         self.current_view = self.main_view = main_view
         self.stack = None
+        self.break_link = False
+        self.main_connected = False
 
     def set_stack(self, stack):
         self.stack = stack
@@ -34,6 +48,8 @@ class AlternateViews(object):
         self.stack.addWidget(view)
         self.stack.setCurrentIndex(0)
         view.setModel(self.main_view._model)
+        view.selectionModel().currentChanged.connect(self.slave_current_changed)
+        view.selectionModel().selectionChanged.connect(self.slave_selection_changed)
 
     def show_view(self, key=None):
         view = self.views[key]
@@ -42,13 +58,45 @@ class AlternateViews(object):
         self.stack.setCurrentIndex(self.stack_positions[key])
         self.current_view = view
         if view is not self.main_view:
+            self.main_current_changed(self.main_view.currentIndex())
+            self.main_selection_changed()
             view.shown()
+            if not self.main_connected:
+                self.main_connected = True
+                self.main_view.selectionModel().currentChanged.connect(self.main_current_changed)
+                self.main_view.selectionModel().selectionChanged.connect(self.main_selection_changed)
+            view.setFocus(Qt.OtherFocusReason)
 
     def set_database(self, db, stage=0):
         for view in self.views.itervalues():
             if view is not self.main_view:
                 view.set_database(db, stage=stage)
 
+    def __enter__(self):
+        self.break_link = True
+
+    def __exit__(self, *args):
+        self.break_link = False
+
+    @sync
+    def slave_current_changed(self, current, *args):
+        self.main_view.set_current_row(current.row(), for_sync=True)
+
+    @sync
+    def slave_selection_changed(self, *args):
+        rows = {r.row() for r in self.current_view.selectionModel().selectedIndexes()}
+        self.main_view.select_rows(rows, using_ids=False, change_current=False, scroll=False)
+
+    @sync
+    def main_current_changed(self, current, *args):
+        self.current_view.set_current_row(current.row())
+
+    @sync
+    def main_selection_changed(self, *args):
+        rows = {r.row() for r in self.main_view.selectionModel().selectedIndexes()}
+        self.current_view.select_rows(rows)
+
+
 class CoverCache(dict):
 
     def __init__(self, limit=200):
@@ -232,5 +280,19 @@ class GridView(QListView):
         else:
             self.delegate.cover_cache.clear()
 
+    def select_rows(self, rows):
+        sel = QItemSelection()
+        sm = self.selectionModel()
+        m = self.model()
+        # Create a range based selector for each set of contiguous rows
+        # as supplying selectors for each individual row causes very poor
+        # performance if a large number of rows has to be selected.
+        for k, g in itertools.groupby(enumerate(rows), lambda (i,x):i-x):
+            group = list(map(operator.itemgetter(1), g))
+            sel.merge(QItemSelection(m.index(min(group), 0), m.index(max(group), 0)), sm.Select)
+        sm.select(sel, sm.ClearAndSelect)
 
+    def set_current_row(self, row):
+        sm = self.selectionModel()
+        sm.setCurrentIndex(self.model().index(row, 0), sm.NoUpdate)
 
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 257540c53d..c1292c1b6b 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -863,7 +863,7 @@ class BooksView(QTableView):  # {{{
                     self.scrollTo(self.model().index(row, i), self.PositionAtCenter)
                     break
 
-    def set_current_row(self, row=0, select=True):
+    def set_current_row(self, row=0, select=True, for_sync=False):
         if row > -1 and row < self.model().rowCount(QModelIndex()):
             h = self.horizontalHeader()
             logical_indices = list(range(h.count()))
@@ -876,10 +876,14 @@ class BooksView(QTableView):  # {{{
             pairs.sort(cmp=lambda x,y:cmp(x[1], y[1]))
             i = pairs[0][0]
             index = self.model().index(row, i)
-            self.setCurrentIndex(index)
-            if select:
+            if for_sync:
                 sm = self.selectionModel()
-                sm.select(index, sm.ClearAndSelect|sm.Rows)
+                sm.setCurrentIndex(index, sm.NoUpdate)
+            else:
+                self.setCurrentIndex(index)
+                if select:
+                    sm = self.selectionModel()
+                    sm.select(index, sm.ClearAndSelect|sm.Rows)
 
     def keyPressEvent(self, ev):
         val = self.horizontalScrollBar().value()

From 2e6b37ee7f5c262dc17707c1ccc415265603a71c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 08:39:23 +0530
Subject: [PATCH 0450/1154] Document shortcut for toggling grid view

---
 manual/gui.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manual/gui.rst b/manual/gui.rst
index 127d0062c0..5b3b96152d 100755
--- a/manual/gui.rst
+++ b/manual/gui.rst
@@ -593,6 +593,8 @@ Calibre has several keyboard shortcuts to save you time and mouse movement. Thes
       - Toggle Book Details panel
     * - :kbd:`Alt+Shift+T`
       - Toggle Tag Browser
+    * - :kbd:`Alt+Shift+G`
+      - Toggle Cover Grid
     * - :kbd:`Alt+A`
       - Show books by the same author as the current book
     * - :kbd:`Alt+T`

From 3ae7205720d5abddbff0e7bf5f0f960bb5b1294e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 09:49:52 +0530
Subject: [PATCH 0451/1154] Speed up cover rendering by caching QPixmaps

---
 src/calibre/gui2/library/alternate_views.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 0aada05b7e..02a8ca939c 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -15,7 +15,7 @@ from functools import wraps
 
 from PyQt4.Qt import (
     QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
-    QPalette, QColor, QItemSelection)
+    QPalette, QColor, QItemSelection, QPixmap)
 
 from calibre import fit_image
 
@@ -108,18 +108,22 @@ class CoverCache(dict):
         with self.lock:
             self.items.pop(book_id, None)
 
-    def __call__(self, key):
+    def __getitem__(self, key):
+        ' Must be called in the GUI thread '
         with self.lock:
-            ans = self.items.pop(key, False)
+            ans = self.items.pop(key, False)  # pop() so that item is moved to the top
             if ans is not False:
+                if isinstance(ans, QImage):
+                    # Convert to QPixmap, since rendering QPixmap is much
+                    # faster
+                    ans = QPixmap.fromImage(ans)
                 self.items[key] = ans
-                if len(self.items) > self.limit:
-                    del self.items[next(self.items.iterkeys())]
 
         return ans
 
     def set(self, key, val):
         with self.lock:
+            self.items.pop(key, None)  # pop() so that item is moved to the top
             self.items[key] = val
             if len(self.items) > self.limit:
                 del self.items[next(self.items.iterkeys())]
@@ -152,7 +156,7 @@ class CoverDelegate(QStyledItemDelegate):
         except (ValueError, IndexError, KeyError):
             return
         db = db.new_api
-        cdata = self.cover_cache(book_id)
+        cdata = self.cover_cache[book_id]
         painter.save()
         try:
             rect = option.rect
@@ -166,7 +170,7 @@ class CoverDelegate(QStyledItemDelegate):
                 dx = max(0, int((rect.width() - cdata.width())/2.0))
                 dy = max(0, rect.height() - cdata.height())
                 rect.adjust(dx, dy, -dx, 0)
-                painter.drawImage(rect, cdata)
+                painter.drawPixmap(rect, cdata)
         finally:
             painter.restore()
 

From d97ca5359329f4b26ec7700909d3907bd199caac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 09:55:02 +0530
Subject: [PATCH 0452/1154] Scroll per pixel

---
 src/calibre/gui2/library/alternate_views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 02a8ca939c..5722e9e287 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -203,6 +203,7 @@ class GridView(QListView):
         self.setLayoutMode(self.Batched)
         self.setResizeMode(self.Adjust)
         self.setSelectionMode(self.ExtendedSelection)
+        self.setVerticalScrollMode(self.ScrollPerPixel)
         self.delegate = CoverDelegate(self, 135, 180)
         self.setItemDelegate(self.delegate)
         self.setSpacing(self.delegate.spacing)

From 0b70899dfdd20f3fd9d480e2dc87fc3e16bde8da Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 10:36:32 +0530
Subject: [PATCH 0453/1154] Add context menu to grid view

---
 src/calibre/gui2/library/alternate_views.py | 13 +++++++++++++
 src/calibre/gui2/library/views.py           |  1 +
 2 files changed, 14 insertions(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 5722e9e287..237404e32c 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -96,6 +96,11 @@ class AlternateViews(object):
         rows = {r.row() for r in self.main_view.selectionModel().selectedIndexes()}
         self.current_view.select_rows(rows)
 
+    def set_context_menu(self, menu):
+        for view in self.views.itervalues():
+            if view is not self.main_view:
+                view.set_context_menu(menu)
+
 
 class CoverCache(dict):
 
@@ -210,6 +215,7 @@ class GridView(QListView):
         self.ignore_render_requests = Event()
         self.render_thread = None
         self.update_item.connect(self.re_render, type=Qt.QueuedConnection)
+        self.context_menu = None
 
     def shown(self):
         if self.render_thread is None:
@@ -301,3 +307,10 @@ class GridView(QListView):
         sm = self.selectionModel()
         sm.setCurrentIndex(self.model().index(row, 0), sm.NoUpdate)
 
+    def set_context_menu(self, menu):
+        self.context_menu = menu
+
+    def contextMenuEvent(self, event):
+        if self.context_menu is not None:
+            self.context_menu.popup(event.globalPos())
+            event.accept()
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index c1292c1b6b..2a653d7b1d 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -696,6 +696,7 @@ class BooksView(QTableView):  # {{{
     def set_context_menu(self, menu, edit_collections_action):
         self.setContextMenuPolicy(Qt.DefaultContextMenu)
         self.context_menu = menu
+        self.alternate_views.set_context_menu(menu)
         self.edit_collections_action = edit_collections_action
 
     def contextMenuEvent(self, event):

From f17708760d26bfdf997dce5462335e1c773f768f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 10:41:09 +0530
Subject: [PATCH 0454/1154] Double click to read in grid view

---
 src/calibre/gui2/library/alternate_views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 237404e32c..eee5bc3e6e 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -215,6 +215,7 @@ class GridView(QListView):
         self.ignore_render_requests = Event()
         self.render_thread = None
         self.update_item.connect(self.re_render, type=Qt.QueuedConnection)
+        self.doubleClicked.connect(parent.iactions['View'].view_triggered)
         self.context_menu = None
 
     def shown(self):

From 0c427b046b3ffc41f8ab51cfb0cb4d51a8e6a086 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 11:18:38 +0530
Subject: [PATCH 0455/1154] Add sorting to grid view context menu

---
 src/calibre/gui2/library/alternate_views.py | 29 ++++++++++++++++++---
 src/calibre/gui2/library/views.py           |  7 +++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index eee5bc3e6e..66e59fe7fd 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -11,11 +11,11 @@ from time import time
 from collections import OrderedDict
 from threading import Lock, Event, Thread
 from Queue import Queue
-from functools import wraps
+from functools import wraps, partial
 
 from PyQt4.Qt import (
     QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
-    QPalette, QColor, QItemSelection, QPixmap)
+    QPalette, QColor, QItemSelection, QPixmap, QMenu)
 
 from calibre import fit_image
 
@@ -50,6 +50,7 @@ class AlternateViews(object):
         view.setModel(self.main_view._model)
         view.selectionModel().currentChanged.connect(self.slave_current_changed)
         view.selectionModel().selectionChanged.connect(self.slave_selection_changed)
+        view.sort_requested.connect(self.main_view.sort_by_named_field)
 
     def show_view(self, key=None):
         view = self.views[key]
@@ -194,6 +195,7 @@ def join_with_timeout(q, timeout=2):
 class GridView(QListView):
 
     update_item = pyqtSignal(object)
+    sort_requested = pyqtSignal(object, object)
 
     def __init__(self, parent):
         QListView.__init__(self, parent)
@@ -216,6 +218,7 @@ class GridView(QListView):
         self.render_thread = None
         self.update_item.connect(self.re_render, type=Qt.QueuedConnection)
         self.doubleClicked.connect(parent.iactions['View'].view_triggered)
+        self.gui = parent
         self.context_menu = None
 
     def shown(self):
@@ -313,5 +316,25 @@ class GridView(QListView):
 
     def contextMenuEvent(self, event):
         if self.context_menu is not None:
-            self.context_menu.popup(event.globalPos())
+            lv = self.gui.library_view
+            menu = self._temp_menu = QMenu(self)
+            sm = QMenu(_('Sort by'), menu)
+            db = self.model().db
+            for col in lv.visible_columns:
+                m = db.metadata_for_field(col)
+                last = self.model().sorted_on
+                ascending = True
+                extra = ''
+                if last[0] == col:
+                    ascending = not last[1]
+                    extra = ' [%s]' % _('reverse')
+                sm.addAction('%s%s' % (m.get('name', col), extra), partial(self.do_sort, col, ascending))
+
+            for ac in self.context_menu.actions():
+                menu.addAction(ac)
+            menu.addMenu(sm)
+            menu.popup(event.globalPos())
             event.accept()
+
+    def do_sort(self, column, ascending):
+        self.sort_requested.emit(column, ascending)
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 2a653d7b1d..41ef245edb 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -845,6 +845,13 @@ class BooksView(QTableView):  # {{{
     def column_map(self):
         return self._model.column_map
 
+    @property
+    def visible_columns(self):
+        h = self.horizontalHeader()
+        logical_indices = (x for x in xrange(h.count()) if not h.isSectionHidden(x))
+        rmap = {i:x for i, x in enumerate(self.column_map)}
+        return (rmap[h.visualIndex(x)] for x in logical_indices if h.visualIndex(x) > -1)
+
     def refresh_book_details(self):
         idx = self.currentIndex()
         if idx.isValid():

From 5522a2bf94f86947b2f14e916e75498701b46108 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 13:21:00 +0530
Subject: [PATCH 0456/1154] Drag 'n drop for the grid view

Refactor the D'nD code from the main view so that it can be re-used for
the grid view directly.
---
 src/calibre/gui2/library/alternate_views.py | 175 +++++++++++++++++++-
 src/calibre/gui2/library/views.py           | 156 +----------------
 2 files changed, 181 insertions(+), 150 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 66e59fe7fd..921299e074 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -6,7 +6,8 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import itertools, operator
+import itertools, operator, os
+from types import MethodType
 from time import time
 from collections import OrderedDict
 from threading import Lock, Event, Thread
@@ -15,10 +16,171 @@ from functools import wraps, partial
 
 from PyQt4.Qt import (
     QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
-    QPalette, QColor, QItemSelection, QPixmap, QMenu)
+    QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication, QMimeData,
+    QUrl, QDrag, QPoint, QPainter, QRect)
 
 from calibre import fit_image
+from calibre.utils.config import prefs
 
+# Drag 'n Drop {{{
+def dragMoveEvent(self, event):
+    event.acceptProposedAction()
+
+def event_has_mods(self, event=None):
+    mods = event.modifiers() if event is not None else \
+            QApplication.keyboardModifiers()
+    return mods & Qt.ControlModifier or mods & Qt.ShiftModifier
+
+def mousePressEvent(base_class, self, event):
+    ep = event.pos()
+    if self.indexAt(ep) in self.selectionModel().selectedIndexes() and \
+            event.button() == Qt.LeftButton and not self.event_has_mods():
+        self.drag_start_pos = ep
+    return base_class.mousePressEvent(self, event)
+
+def drag_icon(self, cover, multiple):
+    cover = cover.scaledToHeight(120, Qt.SmoothTransformation)
+    if multiple:
+        base_width = cover.width()
+        base_height = cover.height()
+        base = QImage(base_width+21, base_height+21,
+                QImage.Format_ARGB32_Premultiplied)
+        base.fill(QColor(255, 255, 255, 0).rgba())
+        p = QPainter(base)
+        rect = QRect(20, 0, base_width, base_height)
+        p.fillRect(rect, QColor('white'))
+        p.drawRect(rect)
+        rect.moveLeft(10)
+        rect.moveTop(10)
+        p.fillRect(rect, QColor('white'))
+        p.drawRect(rect)
+        rect.moveLeft(0)
+        rect.moveTop(20)
+        p.fillRect(rect, QColor('white'))
+        p.save()
+        p.setCompositionMode(p.CompositionMode_SourceAtop)
+        p.drawImage(rect.topLeft(), cover)
+        p.restore()
+        p.drawRect(rect)
+        p.end()
+        cover = base
+    return QPixmap.fromImage(cover)
+
+def drag_data(self):
+    m = self.model()
+    db = m.db
+    rows = self.selectionModel().selectedIndexes()
+    selected = list(map(m.id, rows))
+    ids = ' '.join(map(str, selected))
+    md = QMimeData()
+    md.setData('application/calibre+from_library', ids)
+    fmt = prefs['output_format']
+
+    def url_for_id(i):
+        try:
+            ans = db.format_path(i, fmt, index_is_id=True)
+        except:
+            ans = None
+        if ans is None:
+            fmts = db.formats(i, index_is_id=True)
+            if fmts:
+                fmts = fmts.split(',')
+            else:
+                fmts = []
+            for f in fmts:
+                try:
+                    ans = db.format_path(i, f, index_is_id=True)
+                except:
+                    ans = None
+        if ans is None:
+            ans = db.abspath(i, index_is_id=True)
+        return QUrl.fromLocalFile(ans)
+
+    md.setUrls([url_for_id(i) for i in selected])
+    drag = QDrag(self)
+    col = self.selectionModel().currentIndex().column()
+    try:
+        md.column_name = self.column_map[col]
+    except AttributeError:
+        md.column_name = 'title'
+    drag.setMimeData(md)
+    cover = self.drag_icon(m.cover(self.currentIndex().row()),
+            len(selected) > 1)
+    drag.setHotSpot(QPoint(-15, -15))
+    drag.setPixmap(cover)
+    return drag
+
+def mouseMoveEvent(base_class, self, event):
+    if not self.drag_allowed:
+        return
+    if self.drag_start_pos is None:
+        return base_class.mouseMoveEvent(self, event)
+
+    if self.event_has_mods():
+        self.drag_start_pos = None
+        return
+
+    if not (event.buttons() & Qt.LeftButton) or \
+            (event.pos() - self.drag_start_pos).manhattanLength() \
+                    < QApplication.startDragDistance():
+        return
+
+    index = self.indexAt(event.pos())
+    if not index.isValid():
+        return
+    drag = self.drag_data()
+    drag.exec_(Qt.CopyAction)
+    self.drag_start_pos = None
+
+def dragEnterEvent(self, event):
+    if int(event.possibleActions() & Qt.CopyAction) + \
+        int(event.possibleActions() & Qt.MoveAction) == 0:
+        return
+    paths = self.paths_from_event(event)
+
+    if paths:
+        event.acceptProposedAction()
+
+def dropEvent(self, event):
+    paths = self.paths_from_event(event)
+    event.setDropAction(Qt.CopyAction)
+    event.accept()
+    self.files_dropped.emit(paths)
+
+def paths_from_event(self, event):
+    '''
+    Accept a drop event and return a list of paths that can be read from
+    and represent files with extensions.
+    '''
+    md = event.mimeData()
+    if md.hasFormat('text/uri-list') and not \
+            md.hasFormat('application/calibre+from_library'):
+        urls = [unicode(u.toLocalFile()) for u in md.urls()]
+        return [u for u in urls if os.path.splitext(u)[1] and
+                os.path.exists(u)]
+
+def setup_dnd_interface(cls_or_self):
+    if isinstance(cls_or_self, type):
+        cls = cls_or_self
+        base_class = cls.__bases__[0]
+        fmap = globals()
+        for x in (
+            'dragMoveEvent', 'event_has_mods', 'mousePressEvent', 'mouseMoveEvent',
+            'drag_data', 'drag_icon', 'dragEnterEvent', 'dropEvent', 'paths_from_event'):
+            func = fmap[x]
+            if x in {'mouseMoveEvent', 'mousePressEvent'}:
+                func = partial(func, base_class)
+            setattr(cls, x, MethodType(func, None, cls))
+    else:
+        self = cls_or_self
+        self.drag_allowed = True
+        self.drag_start_pos = None
+        self.setDragEnabled(True)
+        self.setDragDropOverwriteMode(False)
+        self.setDragDropMode(self.DragDrop)
+# }}}
+
+# Manage slave views {{{
 def sync(func):
     @wraps(func)
     def ans(self, *args, **kwargs):
@@ -51,6 +213,7 @@ class AlternateViews(object):
         view.selectionModel().currentChanged.connect(self.slave_current_changed)
         view.selectionModel().selectionChanged.connect(self.slave_selection_changed)
         view.sort_requested.connect(self.main_view.sort_by_named_field)
+        view.files_dropped.connect(self.main_view.files_dropped)
 
     def show_view(self, key=None):
         view = self.views[key]
@@ -101,8 +264,9 @@ class AlternateViews(object):
         for view in self.views.itervalues():
             if view is not self.main_view:
                 view.set_context_menu(menu)
+# }}}
 
-
+# Caching and rendering of covers {{{
 class CoverCache(dict):
 
     def __init__(self, limit=200):
@@ -191,14 +355,17 @@ def join_with_timeout(q, timeout=2):
             q.all_tasks_done.wait(remaining)
     finally:
         q.all_tasks_done.release()
+# }}}
 
 class GridView(QListView):
 
     update_item = pyqtSignal(object)
     sort_requested = pyqtSignal(object, object)
+    files_dropped = pyqtSignal(object)
 
     def __init__(self, parent):
         QListView.__init__(self, parent)
+        setup_dnd_interface(self)
         pal = QPalette(self.palette())
         r = g = b = 0x50
         pal.setColor(pal.Base, QColor(r, g, b))
@@ -338,3 +505,5 @@ class GridView(QListView):
 
     def do_sort(self, column, ascending):
         self.sort_requested.emit(column, ascending)
+
+setup_dnd_interface(GridView)
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 41ef245edb..254709c209 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -5,21 +5,22 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, itertools, operator
+import itertools, operator
 from functools import partial
 from future_builtins import map
 from collections import OrderedDict
 
-from PyQt4.Qt import (QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, QFont,
-    QModelIndex, QIcon, QItemSelection, QMimeData, QDrag, QApplication, QStyle,
-    QPoint, QPixmap, QUrl, QImage, QPainter, QColor, QRect, QHeaderView, QStyleOptionHeader)
+from PyQt4.Qt import (
+    QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, QFont, QModelIndex,
+    QIcon, QItemSelection, QMimeData, QDrag, QStyle, QPoint, QUrl, QHeaderView,
+    QStyleOptionHeader)
 
 from calibre.gui2.library.delegates import (RatingDelegate, PubDateDelegate,
     TextDelegate, DateDelegate, CompleteDelegate, CcTextDelegate,
     CcBoolDelegate, CcCommentsDelegate, CcDateDelegate, CcTemplateDelegate,
     CcEnumDelegate, CcNumberDelegate, LanguagesDelegate)
 from calibre.gui2.library.models import BooksModel, DeviceBooksModel
-from calibre.gui2.library.alternate_views import AlternateViews
+from calibre.gui2.library.alternate_views import AlternateViews, setup_dnd_interface
 from calibre.utils.config import tweaks, prefs
 from calibre.gui2 import error_dialog, gprefs
 from calibre.gui2.library import DEFAULT_SORT
@@ -163,11 +164,7 @@ class BooksView(QTableView):  # {{{
             else:
                 self.setEditTriggers(self.DoubleClicked|self.editTriggers())
 
-        self.drag_allowed = True
-        self.setDragEnabled(True)
-        self.setDragDropOverwriteMode(False)
-        self.setDragDropMode(self.DragDrop)
-        self.drag_start_pos = None
+        setup_dnd_interface(self)
         self.setAlternatingRowColors(True)
         self.setSelectionBehavior(self.SelectRows)
         self.setShowGrid(False)
@@ -704,143 +701,6 @@ class BooksView(QTableView):  # {{{
         event.accept()
     # }}}
 
-    # Drag 'n Drop {{{
-    @classmethod
-    def paths_from_event(cls, event):
-        '''
-        Accept a drop event and return a list of paths that can be read from
-        and represent files with extensions.
-        '''
-        md = event.mimeData()
-        if md.hasFormat('text/uri-list') and not \
-                md.hasFormat('application/calibre+from_library'):
-            urls = [unicode(u.toLocalFile()) for u in md.urls()]
-            return [u for u in urls if os.path.splitext(u)[1] and
-                    os.path.exists(u)]
-
-    def drag_icon(self, cover, multiple):
-        cover = cover.scaledToHeight(120, Qt.SmoothTransformation)
-        if multiple:
-            base_width = cover.width()
-            base_height = cover.height()
-            base = QImage(base_width+21, base_height+21,
-                    QImage.Format_ARGB32_Premultiplied)
-            base.fill(QColor(255, 255, 255, 0).rgba())
-            p = QPainter(base)
-            rect = QRect(20, 0, base_width, base_height)
-            p.fillRect(rect, QColor('white'))
-            p.drawRect(rect)
-            rect.moveLeft(10)
-            rect.moveTop(10)
-            p.fillRect(rect, QColor('white'))
-            p.drawRect(rect)
-            rect.moveLeft(0)
-            rect.moveTop(20)
-            p.fillRect(rect, QColor('white'))
-            p.save()
-            p.setCompositionMode(p.CompositionMode_SourceAtop)
-            p.drawImage(rect.topLeft(), cover)
-            p.restore()
-            p.drawRect(rect)
-            p.end()
-            cover = base
-        return QPixmap.fromImage(cover)
-
-    def drag_data(self):
-        m = self.model()
-        db = m.db
-        rows = self.selectionModel().selectedRows()
-        selected = list(map(m.id, rows))
-        ids = ' '.join(map(str, selected))
-        md = QMimeData()
-        md.setData('application/calibre+from_library', ids)
-        fmt = prefs['output_format']
-
-        def url_for_id(i):
-            try:
-                ans = db.format_path(i, fmt, index_is_id=True)
-            except:
-                ans = None
-            if ans is None:
-                fmts = db.formats(i, index_is_id=True)
-                if fmts:
-                    fmts = fmts.split(',')
-                else:
-                    fmts = []
-                for f in fmts:
-                    try:
-                        ans = db.format_path(i, f, index_is_id=True)
-                    except:
-                        ans = None
-            if ans is None:
-                ans = db.abspath(i, index_is_id=True)
-            return QUrl.fromLocalFile(ans)
-
-        md.setUrls([url_for_id(i) for i in selected])
-        drag = QDrag(self)
-        col = self.selectionModel().currentIndex().column()
-        md.column_name = self.column_map[col]
-        drag.setMimeData(md)
-        cover = self.drag_icon(m.cover(self.currentIndex().row()),
-                len(selected) > 1)
-        drag.setHotSpot(QPoint(-15, -15))
-        drag.setPixmap(cover)
-        return drag
-
-    def event_has_mods(self, event=None):
-        mods = event.modifiers() if event is not None else \
-                QApplication.keyboardModifiers()
-        return mods & Qt.ControlModifier or mods & Qt.ShiftModifier
-
-    def mousePressEvent(self, event):
-        ep = event.pos()
-        if self.indexAt(ep) in self.selectionModel().selectedIndexes() and \
-                event.button() == Qt.LeftButton and not self.event_has_mods():
-            self.drag_start_pos = ep
-        return QTableView.mousePressEvent(self, event)
-
-    def mouseMoveEvent(self, event):
-        if not self.drag_allowed:
-            return
-        if self.drag_start_pos is None:
-            return QTableView.mouseMoveEvent(self, event)
-
-        if self.event_has_mods():
-            self.drag_start_pos = None
-            return
-
-        if not (event.buttons() & Qt.LeftButton) or \
-                (event.pos() - self.drag_start_pos).manhattanLength() \
-                      < QApplication.startDragDistance():
-            return
-
-        index = self.indexAt(event.pos())
-        if not index.isValid():
-            return
-        drag = self.drag_data()
-        drag.exec_(Qt.CopyAction)
-        self.drag_start_pos = None
-
-    def dragEnterEvent(self, event):
-        if int(event.possibleActions() & Qt.CopyAction) + \
-           int(event.possibleActions() & Qt.MoveAction) == 0:
-            return
-        paths = self.paths_from_event(event)
-
-        if paths:
-            event.acceptProposedAction()
-
-    def dragMoveEvent(self, event):
-        event.acceptProposedAction()
-
-    def dropEvent(self, event):
-        paths = self.paths_from_event(event)
-        event.setDropAction(Qt.CopyAction)
-        event.accept()
-        self.files_dropped.emit(paths)
-
-    # }}}
-
     @property
     def column_map(self):
         return self._model.column_map
@@ -1048,6 +908,8 @@ class BooksView(QTableView):  # {{{
 
 # }}}
 
+setup_dnd_interface(BooksView)
+
 class DeviceBooksView(BooksView):  # {{{
 
     def __init__(self, parent):

From ae3aa445962724fd6eb18a802b036e0210abe610 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 14:30:25 +0530
Subject: [PATCH 0457/1154] Port preserve_view_state to work with the grid view

---
 src/calibre/gui2/library/alternate_views.py | 10 ++++++-
 src/calibre/gui2/library/views.py           | 31 +++++++++++++++------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 921299e074..6e6912c9eb 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -374,7 +374,9 @@ class GridView(QListView):
         self.setUniformItemSizes(True)
         self.setWrapping(True)
         self.setFlow(self.LeftToRight)
-        self.setLayoutMode(self.Batched)
+        # We cannot set layout mode to batched, because that breaks
+        # restore_vpos()
+        # self.setLayoutMode(self.Batched)
         self.setResizeMode(self.Adjust)
         self.setSelectionMode(self.ExtendedSelection)
         self.setVerticalScrollMode(self.ScrollPerPixel)
@@ -506,4 +508,10 @@ class GridView(QListView):
     def do_sort(self, column, ascending):
         self.sort_requested.emit(column, ascending)
 
+    def restore_vpos(self, vpos):
+        self.verticalScrollBar().setValue(vpos)
+
+    def restore_hpos(self, hpos):
+        pass
+
 setup_dnd_interface(GridView)
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 254709c209..06e6e43fcd 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -87,18 +87,24 @@ class PreserveViewState(object):  # {{{
             require_selected_ids=True):
         self.view = view
         self.require_selected_ids = require_selected_ids
-        self.selected_ids = set()
-        self.current_id = None
         self.preserve_hpos = preserve_hpos
         self.preserve_vpos = preserve_vpos
+        self.init_vals()
+
+    def init_vals(self):
+        self.selected_ids = set()
+        self.current_id = None
         self.vscroll = self.hscroll = 0
+        self.original_view = None
 
     def __enter__(self):
+        self.init_vals()
         try:
+            view = self.original_view = self.view.alternate_views.current_view
             self.selected_ids = self.view.get_selected_ids()
             self.current_id = self.view.current_id
-            self.vscroll = self.view.verticalScrollBar().value()
-            self.hscroll = self.view.horizontalScrollBar().value()
+            self.vscroll = view.verticalScrollBar().value()
+            self.hscroll = view.horizontalScrollBar().value()
         except:
             import traceback
             traceback.print_exc()
@@ -110,10 +116,19 @@ class PreserveViewState(object):  # {{{
             if self.selected_ids:
                 self.view.select_rows(self.selected_ids, using_ids=True,
                         scroll=False, change_current=self.current_id is None)
-            if self.preserve_vpos:
-                self.view.verticalScrollBar().setValue(self.vscroll)
-            if self.preserve_hpos:
-                self.view.horizontalScrollBar().setValue(self.hscroll)
+            view = self.original_view
+            if self.view.alternate_views.current_view is view:
+                if self.preserve_vpos:
+                    if hasattr(view, 'restore_vpos'):
+                        view.restore_vpos(self.vscroll)
+                    else:
+                        view.verticalScrollBar().setValue(self.vscroll)
+                if self.preserve_hpos:
+                    if hasattr(view, 'restore_hpos'):
+                        view.restore_hpos(self.hscroll)
+                    else:
+                        view.horizontalScrollBar().setValue(self.hscroll)
+        self.init_vals()
 
     @dynamic_property
     def state(self):

From 5737ead466ed7f50180d2f983cc27b65654b0f30 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 15:10:35 +0530
Subject: [PATCH 0458/1154] pep8

---
 src/calibre/gui2/__init__.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 7b88a943bb..157ade7020 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -114,20 +114,20 @@ defs['refresh_book_list_on_bulk_edit'] = True
 del defs
 # }}}
 
-NONE = QVariant() #: Null value to return from the data function of item models
+NONE = QVariant()  # : Null value to return from the data function of item models
 UNDEFINED_QDATETIME = QDateTime(UNDEFINED_DATE)
 
 ALL_COLUMNS = ['title', 'ondevice', 'authors', 'size', 'timestamp', 'rating', 'publisher',
         'tags', 'series', 'pubdate']
 
-def _config(): # {{{
+def _config():  # {{{
     c = Config('gui', 'preferences for the calibre GUI')
     c.add_opt('send_to_storage_card_by_default', default=False,
               help=_('Send file to storage card instead of main memory by default'))
     c.add_opt('confirm_delete', default=False,
               help=_('Confirm before deleting'))
     c.add_opt('main_window_geometry', default=None,
-              help=_('Main window geometry')) # value QVariant.toByteArray
+              help=_('Main window geometry'))  # value QVariant.toByteArray
     c.add_opt('new_version_notification', default=True,
               help=_('Notify when a new version is available'))
     c.add_opt('use_roman_numerals_for_series_number', default=True,
@@ -579,9 +579,9 @@ class FileDialog(QObject):
                        filters=[],
                        add_all_files_filter=True,
                        parent=None,
-                       modal = True,
-                       name = '',
-                       mode = QFileDialog.ExistingFiles,
+                       modal=True,
+                       name='',
+                       mode=QFileDialog.ExistingFiles,
                        default_dir='~',
                        no_save_dir=False
                        ):
@@ -610,7 +610,7 @@ class FileDialog(QObject):
         if not isinstance(initial_dir, basestring):
             initial_dir = os.path.expanduser(default_dir)
         self.selected_files = []
-        use_native_dialog = not os.environ.has_key('CALIBRE_NO_NATIVE_FILEDIALOGS')
+        use_native_dialog = 'CALIBRE_NO_NATIVE_FILEDIALOGS' not in os.environ
         with SanitizeLibraryPath():
             opts = QFileDialog.Option()
             if not use_native_dialog:
@@ -630,7 +630,8 @@ class FileDialog(QObject):
                         ftext, "", opts)
                 for f in fs:
                     f = unicode(f)
-                    if not f: continue
+                    if not f:
+                        continue
                     if not os.path.exists(f):
                         # QFileDialog for some reason quotes spaces
                         # on linux if there is more than one space in a row
@@ -919,7 +920,6 @@ class Application(QApplication):
                 self.file_event_hook(self._file_open_paths)
                 self._file_open_paths = []
 
-
     def load_translations(self):
         if self._translator is not None:
             self.removeTranslator(self._translator)
@@ -1060,3 +1060,4 @@ _df = os.environ.get('CALIBRE_DEVELOP_FROM', None)
 if _df and os.path.exists(_df):
     build_forms(_df)
 
+

From 0541a118e6eac6f680d89d7ad76251366d05ce36 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Aug 2013 16:23:24 +0530
Subject: [PATCH 0459/1154] Make the cover grid customizable

---
 src/calibre/gui2/__init__.py                |   4 +
 src/calibre/gui2/library/alternate_views.py |  56 +++++-
 src/calibre/gui2/preferences/look_feel.py   |  31 +++-
 src/calibre/gui2/preferences/look_feel.ui   | 178 ++++++++++++++++++++
 4 files changed, 255 insertions(+), 14 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 157ade7020..9c28b0ebe9 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -111,6 +111,10 @@ defs['tags_browser_category_icons'] = {}
 defs['cover_browser_reflections'] = True
 defs['extra_row_spacing'] = 0
 defs['refresh_book_list_on_bulk_edit'] = True
+defs['cover_grid_width'] = 0
+defs['cover_grid_height'] = 0
+defs['cover_grid_color'] = (80, 80, 80)
+defs['cover_grid_cache_size'] = 200
 del defs
 # }}}
 
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 6e6912c9eb..f43abb58cb 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -20,8 +20,11 @@ from PyQt4.Qt import (
     QUrl, QDrag, QPoint, QPainter, QRect)
 
 from calibre import fit_image
+from calibre.gui2 import gprefs
 from calibre.utils.config import prefs
 
+CM_TO_INCH = 0.393701
+
 # Drag 'n Drop {{{
 def dragMoveEvent(self, event):
     event.acceptProposedAction()
@@ -305,15 +308,39 @@ class CoverCache(dict):
     def __hash__(self):
         return id(self)
 
+    def set_limit(self, limit):
+        with self.lock:
+            self.limit = limit
+            if len(self.items) > self.limit:
+                extra = len(self.items) - self.limit
+                remove = tuple(self.iterkeys())[:extra]
+                for k in remove:
+                    del self.items[k]
+
 class CoverDelegate(QStyledItemDelegate):
 
-    def __init__(self, parent, width, height):
+    def __init__(self, parent):
         super(CoverDelegate, self).__init__(parent)
+        self.set_dimensions()
+        self.cover_cache = CoverCache(limit=gprefs['cover_grid_cache_size'])
+        self.render_queue = Queue()
+
+    def set_dimensions(self):
+        width = self.original_width = gprefs['cover_grid_width']
+        height = self.original_height = gprefs['cover_grid_height']
+
+        if height < 0.1:
+            height = max(185, QApplication.instance().desktop().availableGeometry(self.parent()).height() / 5.0)
+        else:
+            height *= self.parent().logicalDpiY() * CM_TO_INCH
+
+        if width < 0.1:
+            width = 0.75 * height
+        else:
+            width *= self.parent().logicalDpiX() * CM_TO_INCH
         self.cover_size = QSize(width, height)
         self.item_size = self.cover_size + QSize(8, 8)
         self.spacing = max(10, min(50, int(0.1 * width)))
-        self.cover_cache = CoverCache()
-        self.render_queue = Queue()
 
     def sizeHint(self, option, index):
         return self.item_size
@@ -366,11 +393,7 @@ class GridView(QListView):
     def __init__(self, parent):
         QListView.__init__(self, parent)
         setup_dnd_interface(self)
-        pal = QPalette(self.palette())
-        r = g = b = 0x50
-        pal.setColor(pal.Base, QColor(r, g, b))
-        pal.setColor(pal.Text, QColor(Qt.white if (r + g + b)/3.0 < 128 else Qt.black))
-        self.setPalette(pal)
+        self.set_color()
         self.setUniformItemSizes(True)
         self.setWrapping(True)
         self.setFlow(self.LeftToRight)
@@ -380,7 +403,7 @@ class GridView(QListView):
         self.setResizeMode(self.Adjust)
         self.setSelectionMode(self.ExtendedSelection)
         self.setVerticalScrollMode(self.ScrollPerPixel)
-        self.delegate = CoverDelegate(self, 135, 180)
+        self.delegate = CoverDelegate(self)
         self.setItemDelegate(self.delegate)
         self.setSpacing(self.delegate.spacing)
         self.ignore_render_requests = Event()
@@ -390,6 +413,21 @@ class GridView(QListView):
         self.gui = parent
         self.context_menu = None
 
+    def set_color(self):
+        r, g, b = gprefs['cover_grid_color']
+        pal = QPalette()
+        pal.setColor(pal.Base, QColor(r, g, b))
+        pal.setColor(pal.Text, QColor(Qt.white if (r + g + b)/3.0 < 128 else Qt.black))
+        self.setPalette(pal)
+
+    def refresh_settings(self):
+        if gprefs['cover_grid_width'] != self.delegate.original_width or gprefs['cover_grid_height'] != self.delegate.original_height:
+            self.delegate.set_dimensions()
+            self.setSpacing(self.delegate.spacing)
+            self.delegate.cover_cache.clear()
+        self.set_color()
+        self.delegate.cover_cache.set_limit(gprefs['cover_grid_cache_size'])
+
     def shown(self):
         if self.render_thread is None:
             self.render_thread = Thread(target=self.render_covers)
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index b3021cf446..114f44d181 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -5,8 +5,8 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from PyQt4.Qt import (QApplication, QFont, QFontInfo, QFontDialog,
-        QAbstractListModel, Qt, QIcon, QKeySequence)
+from PyQt4.Qt import (QApplication, QFont, QFontInfo, QFontDialog, QColorDialog,
+        QAbstractListModel, Qt, QIcon, QKeySequence, QPalette, QColor)
 
 from calibre.gui2.preferences import ConfigWidgetBase, test_widget, CommaSeparatedList
 from calibre.gui2.preferences.look_feel_ui import Ui_Form
@@ -18,7 +18,7 @@ from calibre.utils.icu import sort_key
 from calibre.gui2.book_details import get_field_list
 from calibre.gui2.preferences.coloring import EditRules
 
-class DisplayedFields(QAbstractListModel): # {{{
+class DisplayedFields(QAbstractListModel):  # {{{
 
     def __init__(self, db, parent=None):
         QAbstractListModel.__init__(self, parent)
@@ -110,6 +110,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('tag_browser_old_look', gprefs, restart_required=True)
         r('bd_show_cover', gprefs)
         r('bd_overlay_cover_size', gprefs)
+        r('cover_grid_width', gprefs)
+        r('cover_grid_height', gprefs)
+        r('cover_grid_cache_size', gprefs)
 
         r('cover_flow_queue_length', config, restart_required=True)
         r('cover_browser_reflections', gprefs)
@@ -123,7 +126,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         lang = get_lang()
         if lang is None or lang not in available_translations():
             lang = 'en'
-        items = [(l, get_esc_lang(l)) for l in available_translations() \
+        items = [(l, get_esc_lang(l)) for l in available_translations()
                  if l != lang]
         if lang != 'en':
             items.append(('en', get_esc_lang('en')))
@@ -170,7 +173,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('categories_using_hierarchy', db.prefs, setting=CommaSeparatedList,
           choices=sorted(list(choices), key=sort_key))
 
-
         self.current_font = self.initial_font = None
         self.change_font_button.clicked.connect(self.change_font)
 
@@ -197,6 +199,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         keys = [unicode(x.toString(QKeySequence.NativeText)) for x in keys]
         self.fs_help_msg.setText(unicode(self.fs_help_msg.text())%(
             _(' or ').join(keys)))
+        self.cover_grid_color_button.clicked.connect(self.change_cover_grid_color)
 
     def initialize(self):
         ConfigWidgetBase.initialize(self)
@@ -215,6 +218,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             mi=None
         self.edit_rules.initialize(db.field_metadata, db.prefs, mi, 'column_color_rules')
         self.icon_rules.initialize(db.field_metadata, db.prefs, mi, 'column_icon_rules')
+        self.set_cg_color(gprefs['cover_grid_color'])
+
+    def set_cg_color(self, val):
+        pal = QPalette()
+        pal.setColor(QPalette.Window, QColor(*val))
+        self.cover_grid_color_label.setPalette(pal)
 
     def restore_defaults(self):
         ConfigWidgetBase.restore_defaults(self)
@@ -227,6 +236,15 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.edit_rules.clear()
         self.icon_rules.clear()
         self.changed_signal.emit()
+        self.set_cg_color(gprefs.defaults['cover_grid_color'])
+
+    def change_cover_grid_color(self):
+        col = QColorDialog.getColor(self.cover_grid_color_label.palette().color(QPalette.Window),
+                              self.gui, _('Choose background color for cover grid'))
+        if col.isValid():
+            col = tuple(col.getRgb())[:3]
+            self.set_cg_color(col)
+            self.changed_signal.emit()
 
     def build_font_obj(self):
         font_info = self.current_font
@@ -286,6 +304,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.display_model.commit()
         self.edit_rules.commit(self.gui.current_db.prefs)
         self.icon_rules.commit(self.gui.current_db.prefs)
+        gprefs['cover_grid_color'] = tuple(self.cover_grid_color_label.palette().color(QPalette.Window).getRgb())[:3]
         return rr
 
     def refresh_gui(self, gui):
@@ -296,9 +315,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         if hasattr(gui.cover_flow, 'setShowReflections'):
             gui.cover_flow.setShowReflections(gprefs['cover_browser_reflections'])
         gui.library_view.refresh_row_sizing()
+        gui.grid_view.refresh_settings()
 
 if __name__ == '__main__':
     from calibre.gui2 import Application
     app = Application([])
     test_widget('Interface', 'Look & Feel')
 
+
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 086c012e17..d962dad0eb 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -223,6 +223,184 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_5">
+      <attribute name="icon">
+       <iconset resource="../../../../resources/images.qrc">
+        <normaloff>:/images/grid.png</normaloff>:/images/grid.png</iconset>
+      </attribute>
+      <attribute name="title">
+       <string>Cover Grid</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QLabel" name="label_11">
+           <property name="text">
+            <string>Cover &amp;Width: </string>
+           </property>
+           <property name="buddy">
+            <cstring>opt_cover_grid_width</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDoubleSpinBox" name="opt_cover_grid_width">
+           <property name="toolTip">
+            <string>The width of displayed covers</string>
+           </property>
+           <property name="suffix">
+            <string> cm</string>
+           </property>
+           <property name="decimals">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_12">
+           <property name="text">
+            <string>Cover &amp;Height: </string>
+           </property>
+           <property name="buddy">
+            <cstring>opt_cover_grid_height</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDoubleSpinBox" name="opt_cover_grid_height">
+           <property name="toolTip">
+            <string>The height of displayed covers</string>
+           </property>
+           <property name="suffix">
+            <string> cm</string>
+           </property>
+           <property name="decimals">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_13">
+           <property name="text">
+            <string>A value of zero means set automatically based on screen size</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label_14">
+           <property name="text">
+            <string>Background color for the cover grid:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="cover_grid_color_label">
+           <property name="minimumSize">
+            <size>
+             <width>50</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="autoFillBackground">
+            <bool>true</bool>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cover_grid_color_button">
+           <property name="text">
+            <string>Change &amp;color</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="label_15">
+           <property name="text">
+            <string>Number of covers to cache in &amp;memory:</string>
+           </property>
+           <property name="buddy">
+            <cstring>opt_cover_grid_cache_size</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="opt_cover_grid_cache_size">
+           <property name="maximum">
+            <number>3000</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>355</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_4">
       <attribute name="icon">
        <iconset resource="../../../../resources/images.qrc">

From a914e95d9f218f79f727a38c8c37e0acdc986627 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 16:07:24 +0530
Subject: [PATCH 0460/1154] Ensure that QPixmap objects are never deleted on
 non-GUI threads

---
 src/calibre/gui2/library/alternate_views.py | 26 +++++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index f43abb58cb..2494890202 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -10,7 +10,7 @@ import itertools, operator, os
 from types import MethodType
 from time import time
 from collections import OrderedDict
-from threading import Lock, Event, Thread
+from threading import Lock, Event, Thread, current_thread
 from Queue import Queue
 from functools import wraps, partial
 
@@ -276,17 +276,29 @@ class CoverCache(dict):
         self.items = OrderedDict()
         self.lock = Lock()
         self.limit = limit
+        self.pixmap_staging = []
+        self.gui_thread = current_thread()
+
+    def clear_staging(self):
+        ' Must be called in the GUI thread '
+        self.pixmap_staging = []
 
     def invalidate(self, book_id):
         with self.lock:
-            self.items.pop(book_id, None)
+            self._pop(book_id)
+
+    def _pop(self, book_id):
+        val = self.items.pop(book_id, None)
+        if type(val) is QPixmap and current_thread() is not self.gui_thread:
+            self.pixmap_staging.append(val)
 
     def __getitem__(self, key):
         ' Must be called in the GUI thread '
         with self.lock:
+            self.clear_staging()
             ans = self.items.pop(key, False)  # pop() so that item is moved to the top
             if ans is not False:
-                if isinstance(ans, QImage):
+                if type(ans) is QImage:
                     # Convert to QPixmap, since rendering QPixmap is much
                     # faster
                     ans = QPixmap.fromImage(ans)
@@ -296,13 +308,16 @@ class CoverCache(dict):
 
     def set(self, key, val):
         with self.lock:
-            self.items.pop(key, None)  # pop() so that item is moved to the top
+            self._pop(key)  # pop() so that item is moved to the top
             self.items[key] = val
             if len(self.items) > self.limit:
                 del self.items[next(self.items.iterkeys())]
 
     def clear(self):
         with self.lock:
+            if current_thread() is not self.gui_thread:
+                pixmaps = (x for x in self.items.itervalues() if type(x) is QPixmap)
+                self.pixmap_staging.extend(pixmaps)
             self.items.clear()
 
     def __hash__(self):
@@ -315,7 +330,7 @@ class CoverCache(dict):
                 extra = len(self.items) - self.limit
                 remove = tuple(self.iterkeys())[:extra]
                 for k in remove:
-                    del self.items[k]
+                    self._pop(k)
 
 class CoverDelegate(QStyledItemDelegate):
 
@@ -471,6 +486,7 @@ class GridView(QListView):
         self.update_item.emit(book_id)
 
     def re_render(self, book_id):
+        self.delegate.cover_cache.clear_staging()
         m = self.model()
         try:
             index = m.db.row(book_id)

From 85ef13a6ff252795db01aa7b20521e96db0db8f7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 19:06:19 +0530
Subject: [PATCH 0461/1154] Animate double clicks in the grid view

---
 src/calibre/gui2/library/alternate_views.py | 44 +++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 2494890202..92b023303b 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -17,10 +17,10 @@ from functools import wraps, partial
 from PyQt4.Qt import (
     QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
     QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication, QMimeData,
-    QUrl, QDrag, QPoint, QPainter, QRect)
+    QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QPropertyAnimation, QEasingCurve)
 
 from calibre import fit_image
-from calibre.gui2 import gprefs
+from calibre.gui2 import gprefs, config
 from calibre.utils.config import prefs
 
 CM_TO_INCH = 0.393701
@@ -334,11 +334,24 @@ class CoverCache(dict):
 
 class CoverDelegate(QStyledItemDelegate):
 
+    @pyqtProperty(float)
+    def animated_size(self):
+        return self._animated_size
+
+    @animated_size.setter
+    def animated_size(self, val):
+        self._animated_size = val
+
     def __init__(self, parent):
         super(CoverDelegate, self).__init__(parent)
+        self._animated_size = 1.0
+        self.animation = QPropertyAnimation(self, 'animated_size', self)
+        self.animation.setEasingCurve(QEasingCurve.OutInCirc)
+        self.animation.setDuration(500)
         self.set_dimensions()
         self.cover_cache = CoverCache(limit=gprefs['cover_grid_cache_size'])
         self.render_queue = Queue()
+        self.animating = None
 
     def set_dimensions(self):
         width = self.original_width = gprefs['cover_grid_width']
@@ -356,6 +369,9 @@ class CoverDelegate(QStyledItemDelegate):
         self.cover_size = QSize(width, height)
         self.item_size = self.cover_size + QSize(8, 8)
         self.spacing = max(10, min(50, int(0.1 * width)))
+        self.animation.setStartValue(1.0)
+        self.animation.setKeyValueAt(0.5, 0.5)
+        self.animation.setEndValue(1.0)
 
     def sizeHint(self, option, index):
         return self.item_size
@@ -379,6 +395,8 @@ class CoverDelegate(QStyledItemDelegate):
                 if cdata is False:
                     self.render_queue.put(book_id)
             else:
+                if self.animating is not None and self.animating.row() == index.row():
+                    cdata = cdata.scaled(cdata.size() * self._animated_size)
                 dx = max(0, int((rect.width() - cdata.width())/2.0))
                 dy = max(0, rect.height() - cdata.height())
                 rect.adjust(dx, dy, -dx, 0)
@@ -419,15 +437,35 @@ class GridView(QListView):
         self.setSelectionMode(self.ExtendedSelection)
         self.setVerticalScrollMode(self.ScrollPerPixel)
         self.delegate = CoverDelegate(self)
+        self.delegate.animation.valueChanged.connect(self.animation_value_changed)
+        self.delegate.animation.finished.connect(self.animation_done)
         self.setItemDelegate(self.delegate)
         self.setSpacing(self.delegate.spacing)
         self.ignore_render_requests = Event()
         self.render_thread = None
         self.update_item.connect(self.re_render, type=Qt.QueuedConnection)
-        self.doubleClicked.connect(parent.iactions['View'].view_triggered)
+        self.doubleClicked.connect(self.double_clicked)
+        self.setCursor(Qt.PointingHandCursor)
         self.gui = parent
         self.context_menu = None
 
+    def double_clicked(self, index):
+        d = self.delegate
+        if d.animating is None and not config['disable_animations']:
+            d.animating = index
+            d.animation.start()
+        self.gui.iactions['View'].view_triggered(index)
+
+    def animation_value_changed(self, value):
+        if self.delegate.animating is not None:
+            self.update(self.delegate.animating)
+
+    def animation_done(self):
+        if self.delegate.animating is not None:
+            idx = self.delegate.animating
+            self.delegate.animating = None
+            self.update(idx)
+
     def set_color(self):
         r, g, b = gprefs['cover_grid_color']
         pal = QPalette()

From fb0410b04ca586cf889dfb4529641c8e13fee0e0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 22:26:44 +0530
Subject: [PATCH 0462/1154] D'nD fixes

Fix dragging a single book in the book list using the multi-book icon.
Also use a class decorator for the API, looks nicer :)
---
 src/calibre/gui2/library/alternate_views.py | 5 +++--
 src/calibre/gui2/library/views.py           | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 92b023303b..3a8cd2130b 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -73,7 +73,7 @@ def drag_data(self):
     m = self.model()
     db = m.db
     rows = self.selectionModel().selectedIndexes()
-    selected = list(map(m.id, rows))
+    selected = list(set(map(m.id, rows)))
     ids = ' '.join(map(str, selected))
     md = QMimeData()
     md.setData('application/calibre+from_library', ids)
@@ -174,6 +174,7 @@ def setup_dnd_interface(cls_or_self):
             if x in {'mouseMoveEvent', 'mousePressEvent'}:
                 func = partial(func, base_class)
             setattr(cls, x, MethodType(func, None, cls))
+        return cls
     else:
         self = cls_or_self
         self.drag_allowed = True
@@ -417,6 +418,7 @@ def join_with_timeout(q, timeout=2):
         q.all_tasks_done.release()
 # }}}
 
+@setup_dnd_interface
 class GridView(QListView):
 
     update_item = pyqtSignal(object)
@@ -606,4 +608,3 @@ class GridView(QListView):
     def restore_hpos(self, hpos):
         pass
 
-setup_dnd_interface(GridView)
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 06e6e43fcd..0b22999b27 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -144,6 +144,7 @@ class PreserveViewState(object):  # {{{
 
 # }}}
 
+@setup_dnd_interface
 class BooksView(QTableView):  # {{{
 
     files_dropped = pyqtSignal(object)
@@ -923,8 +924,6 @@ class BooksView(QTableView):  # {{{
 
 # }}}
 
-setup_dnd_interface(BooksView)
-
 class DeviceBooksView(BooksView):  # {{{
 
     def __init__(self, parent):

From 579fd8a48568faa413354b94a0168f87b06c7b01 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Aug 2013 23:41:56 +0530
Subject: [PATCH 0463/1154] ...

---
 src/calibre/gui2/library/alternate_views.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 3a8cd2130b..4c4997b0d7 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -72,8 +72,7 @@ def drag_icon(self, cover, multiple):
 def drag_data(self):
     m = self.model()
     db = m.db
-    rows = self.selectionModel().selectedIndexes()
-    selected = list(set(map(m.id, rows)))
+    selected = self.get_selected_ids()
     ids = ' '.join(map(str, selected))
     md = QMimeData()
     md.setData('application/calibre+from_library', ids)
@@ -602,6 +601,10 @@ class GridView(QListView):
     def do_sort(self, column, ascending):
         self.sort_requested.emit(column, ascending)
 
+    def get_selected_ids(self):
+        m = self.model()
+        return [m.id(i) for i in self.selectionModel().selectedIndexes()]
+
     def restore_vpos(self, vpos):
         self.verticalScrollBar().setValue(vpos)
 

From 1121be459f054a76bc1cbf459b0a78a52ba30014 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 07:00:45 +0530
Subject: [PATCH 0464/1154] Allow running with olddb

---
 src/calibre/gui2/library/alternate_views.py | 2 ++
 src/calibre/gui2/preferences/look_feel.py   | 6 +++++-
 src/calibre/gui2/preferences/look_feel.ui   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 4c4997b0d7..0b3fc86b0a 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -538,6 +538,8 @@ class GridView(QListView):
         self.delegate.render_queue.put(None)
 
     def set_database(self, newdb, stage=0):
+        if not hasattr(newdb, 'new_api'):
+            return
         if stage == 0:
             self.ignore_render_requests.set()
             try:
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 114f44d181..e0bd8ead36 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -13,7 +13,7 @@ from calibre.gui2.preferences.look_feel_ui import Ui_Form
 from calibre.gui2 import config, gprefs, qt_app, NONE
 from calibre.utils.localization import (available_translations,
     get_language, get_lang)
-from calibre.utils.config import prefs
+from calibre.utils.config import prefs, tweaks
 from calibre.utils.icu import sort_key
 from calibre.gui2.book_details import get_field_list
 from calibre.gui2.preferences.coloring import EditRules
@@ -200,6 +200,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.fs_help_msg.setText(unicode(self.fs_help_msg.text())%(
             _(' or ').join(keys)))
         self.cover_grid_color_button.clicked.connect(self.change_cover_grid_color)
+        if not tweaks.get('use_new_db', False):
+            for i in range(self.tabWidget.count()):
+                if self.tabWidget.widget(i) is self.cover_grid_tab:
+                    self.tabWidget.removeTab(i)
 
     def initialize(self):
         ConfigWidgetBase.initialize(self)
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index d962dad0eb..9e4851d73e 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -223,7 +223,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_5">
+     <widget class="QWidget" name="cover_grid_tab">
       <attribute name="icon">
        <iconset resource="../../../../resources/images.qrc">
         <normaloff>:/images/grid.png</normaloff>:/images/grid.png</iconset>

From 0e64b0c886f84a1b069164816b8fde226470f3d9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 14:08:54 +0530
Subject: [PATCH 0465/1154] Make spacing between covers adjustable

---
 src/calibre/gui2/__init__.py                |  1 +
 src/calibre/gui2/library/alternate_views.py | 12 ++-
 src/calibre/gui2/preferences/look_feel.py   |  1 +
 src/calibre/gui2/preferences/look_feel.ui   | 94 +++++++++++----------
 4 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 9c28b0ebe9..bec9a3177c 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -115,6 +115,7 @@ defs['cover_grid_width'] = 0
 defs['cover_grid_height'] = 0
 defs['cover_grid_color'] = (80, 80, 80)
 defs['cover_grid_cache_size'] = 200
+defs['cover_grid_spacing'] = 0
 del defs
 # }}}
 
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 0b3fc86b0a..260b2460ea 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -368,11 +368,18 @@ class CoverDelegate(QStyledItemDelegate):
             width *= self.parent().logicalDpiX() * CM_TO_INCH
         self.cover_size = QSize(width, height)
         self.item_size = self.cover_size + QSize(8, 8)
-        self.spacing = max(10, min(50, int(0.1 * width)))
+        self.calculate_spacing()
         self.animation.setStartValue(1.0)
         self.animation.setKeyValueAt(0.5, 0.5)
         self.animation.setEndValue(1.0)
 
+    def calculate_spacing(self):
+        spc = self.original_spacing = gprefs['cover_grid_spacing']
+        if spc < 0.1:
+            self.spacing = max(10, min(50, int(0.1 * self.original_width)))
+        else:
+            self.spacing = self.parent().logicalDpiX() * CM_TO_INCH * spc
+
     def sizeHint(self, option, index):
         return self.item_size
 
@@ -479,6 +486,9 @@ class GridView(QListView):
             self.delegate.set_dimensions()
             self.setSpacing(self.delegate.spacing)
             self.delegate.cover_cache.clear()
+        if gprefs['cover_grid_spacing'] != self.delegate.original_spacing:
+            self.delegate.calculate_spacing()
+            self.setSpacing(self.delegate.spacing)
         self.set_color()
         self.delegate.cover_cache.set_limit(gprefs['cover_grid_cache_size'])
 
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index e0bd8ead36..80521abf9f 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -113,6 +113,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('cover_grid_width', gprefs)
         r('cover_grid_height', gprefs)
         r('cover_grid_cache_size', gprefs)
+        r('cover_grid_spacing', gprefs)
 
         r('cover_flow_queue_length', config, restart_required=True)
         r('cover_browser_reflections', gprefs)
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 9e4851d73e..d704e1a214 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -231,8 +231,8 @@
       <attribute name="title">
        <string>Cover Grid</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0" colspan="2">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QLabel" name="label_11">
@@ -272,6 +272,9 @@
            <property name="toolTip">
             <string>The height of displayed covers</string>
            </property>
+           <property name="specialValueText">
+            <string>Automatic</string>
+           </property>
            <property name="suffix">
             <string> cm</string>
            </property>
@@ -305,13 +308,16 @@
          </item>
         </layout>
        </item>
-       <item>
+       <item row="1" column="0" colspan="2">
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QLabel" name="label_14">
            <property name="text">
             <string>Background color for the cover grid:</string>
            </property>
+           <property name="buddy">
+            <cstring>cover_grid_color_button</cstring>
+           </property>
           </widget>
          </item>
          <item>
@@ -352,52 +358,48 @@
          </item>
         </layout>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="QLabel" name="label_15">
-           <property name="text">
-            <string>Number of covers to cache in &amp;memory:</string>
-           </property>
-           <property name="buddy">
-            <cstring>opt_cover_grid_cache_size</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="opt_cover_grid_cache_size">
-           <property name="maximum">
-            <number>3000</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_15">
+         <property name="text">
+          <string>Number of covers to cache in &amp;memory:</string>
+         </property>
+         <property name="buddy">
+          <cstring>opt_cover_grid_cache_size</cstring>
+         </property>
+        </widget>
        </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
+       <item row="2" column="1">
+        <widget class="QSpinBox" name="opt_cover_grid_cache_size">
+         <property name="maximum">
+          <number>3000</number>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>355</height>
-          </size>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_16">
+         <property name="text">
+          <string>&amp;Spacing between covers:</string>
          </property>
-        </spacer>
+         <property name="buddy">
+          <cstring>opt_cover_grid_spacing</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QDoubleSpinBox" name="opt_cover_grid_spacing">
+         <property name="toolTip">
+          <string>The spacing between covers. A value of zero means calculate automatically based on cover size.</string>
+         </property>
+         <property name="specialValueText">
+          <string>Automatic</string>
+         </property>
+         <property name="suffix">
+          <string> cm</string>
+         </property>
+         <property name="decimals">
+          <number>1</number>
+         </property>
+        </widget>
        </item>
       </layout>
      </widget>

From 10b4b9d39c89be4913733e0ab71fe8e0a932f5f2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 14:13:05 +0530
Subject: [PATCH 0466/1154] Show authors in addition to title when cover not
 available

---
 src/calibre/gui2/library/alternate_views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 260b2460ea..0e88953426 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -398,7 +398,8 @@ class CoverDelegate(QStyledItemDelegate):
             rect.adjust(4, 4, -4, -4)
             if cdata is None or cdata is False:
                 title = db.field_for('title', book_id, default_value='')
-                painter.drawText(rect, Qt.AlignCenter|Qt.TextWordWrap, title)
+                authors = ' & '.join(db.field_for('authors', book_id, default_value=()))
+                painter.drawText(rect, Qt.AlignCenter|Qt.TextWordWrap, '%s\n\n%s' % (title, authors))
                 if cdata is False:
                     self.render_queue.put(book_id)
             else:

From 3cf7988c256c4547111e76cd2df9b02ce19f4010 Mon Sep 17 00:00:00 2001
From: sylvaindurand <sylvain.durand@ponts.org>
Date: Mon, 5 Aug 2013 16:04:04 +0200
Subject: [PATCH 0467/1154] Typography, error message and description

- french typography (apostrophes, guillemets);
- error message if using a free account (which can't download the newspaper);
- description.
---
 recipes/le_monde_sub.recipe | 55 +++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/recipes/le_monde_sub.recipe b/recipes/le_monde_sub.recipe
index dc9fa9d36f..e55d71e0a7 100644
--- a/recipes/le_monde_sub.recipe
+++ b/recipes/le_monde_sub.recipe
@@ -13,7 +13,7 @@ class LeMonde(BasicNewsRecipe):
 
     title              = u'Le Monde: Édition abonnés'
     __author__         = 'Sylvain Durand'
-    description        = u'Disponible du lundi au samedi à partir de 14 heures environ, avec tous ses cahiers.'
+    description        = u'La version papier du quotidien Le Monde, disponible du lundi au samedi à partir de 14 heures environ, avec tous ses cahiers.'
     language           = 'fr'
     encoding           = 'utf8'
 
@@ -65,28 +65,41 @@ class LeMonde(BasicNewsRecipe):
         url = time.strftime(self.journal_url,self.date)
         soup = self.index_to_soup(url).sommaire
         sections = []
-        for sec in soup.findAll("section"):
-            articles = []
-            if sec['cahier'] != "Le Monde":
-                for col in sec.findAll("fnts"):
-                    col.extract()
-            if sec['cahier']=="Le Monde Magazine":
-                continue
-            for art in sec.findAll("art"):
-                if art.txt.string and art.ttr.string:
-                    if art.find(['url']):
-                        art.insert(6,'<div id="photo"><img src="'+art.find(['url']).string+'" /></div>')
-                    if art.find(['lgd']) and art.find(['lgd']).string:
-                        art.insert(7,'<div id="lgd">'+art.find(['lgd']).string+'</div>')
-                    article = "<html><head></head><body>"+unicode(art)+"</body></html>"
-                    article = article.replace('<![CDATA[','').replace(']]>','').replace(' oC ','°C ')
-                    article = article.replace('srttr>','h3>').replace('ssttr>','h2>').replace('ttr>','h1>')
-                    f = PersistentTemporaryFile()
-                    f.write(article)
-                    articles.append({'title':art.ttr.string,'url':"file:///"+f.name})
-            sections.append((sec['nom'], articles))
+        try:
+            for sec in soup.findAll("section"):
+                articles = []
+                if sec['cahier'] != "Le Monde":
+                    for col in sec.findAll("fnts"):
+                        col.extract()
+                if sec['cahier']=="Le Monde Magazine":
+                    continue
+                for art in sec.findAll("art"):
+                    if art.txt.string and art.ttr.string:
+                        if art.find(['url']):
+                            art.insert(6,'<div id="photo"><img src="'+art.find(['url']).string+'" /></div>')
+                        if art.find(['lgd']) and art.find(['lgd']).string:
+                            art.insert(7,'<div id="lgd">'+art.find(['lgd']).string+'</div>')
+                        
+                        def guillemets(match):
+                            if match.group(1) == u"=":
+                                return match.group(0)
+                            return u'%s«&nbsp;%s&nbsp;»' % (match.group(1), match.group(2))
+                            
+                        article = "<html><head></head><body>"+unicode(art)+"</body></html>"
+                        article = article.replace('<![CDATA[','').replace(']]>','').replace(' oC ','°C ')
+                        article = article.replace('srttr>','h3>').replace('ssttr>','h2>').replace('ttr>','h1>')
+                        article = article.replace("'" , u'\u2019')
+                        article = re.sub('(.|^)"([^"]+)"', guillemets, article)
+                    
+                        f = PersistentTemporaryFile()
+                        f.write(article)
+                        articles.append({'title':art.ttr.string,'url':"file:///"+f.name})
+                sections.append((sec['nom'], articles))
+        except AttributeError:
+            self.log("Vos identifiants sont incorrects, ou votre abonnement LeMonde.fr ne vous permet pas de télécharger le journal.")
         return sections
 
+
     def preprocess_html(self, soup):
         for lgd in soup.findAll(id="lgd"):
             lgd.contents[-1].extract()

From 71c7489cc1b618edce7058820464fd9cab0ec9d9 Mon Sep 17 00:00:00 2001
From: Sylvain Durand <sylvain.durand@ponts.org>
Date: Mon, 5 Aug 2013 17:09:22 +0200
Subject: [PATCH 0468/1154] =?UTF-8?q?New=20icon=20for=20Le=20Monde:=20Edit?=
 =?UTF-8?q?ion=20abonn=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 recipes/icons/le_monde_sub.png | Bin 0 -> 510 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 recipes/icons/le_monde_sub.png

diff --git a/recipes/icons/le_monde_sub.png b/recipes/icons/le_monde_sub.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9b1717f77efa5e7346e8a9211e077f1896d6fae
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3SE^941>n>j(e<0gFjQ
zK~y-)#go6zVNn#tf9IZyjzr@L6cRMzU*Qq(8WNFEQi(*N(@=Q>jn*58R-xb>{0WVF
zuQkQQoe^JVCi#k4&Dl9Sd!4=4UdI698*un0LV`#n5}vVG3}Xz|TCBAIxUP%qx?dAm
zYw<jf`Fu{J(O@(hA&FwKNG6j3pi-$&tyaJ6LV!-ElO*Z+eCl?)>3lxxh4p%^`~5CS
zIv$Ve_xm!&=%t?kWwTiU>h*e(q*kk?*=#0B>UO&-l}g%fx0+6;uR;L|HQ4X>03;F#
zf*>H7Ome+m34(xlJWf8Jr&ug<xm<`wqn{!MLGU)0F$PItE}c%}`##U-^WWC^D*pWe
zW6a-u;CUX_S`LT92gx6O;5a|SR4PR-mt(nH;`{zbH;&_k_iqG)!2n5gIvsYq9jn!f
z^Z85=1Vp1z9*+msTAIx!^?Lo6sf;mdx7#Wd3IeoPEHoSr1!yvvXgnSZP_0(eX0uVb
zTz*?)=z~Zk5}LzW`xXOo97lj$*L@=}|NS@q0HO@qrE-F5u>b%707*qoM6N<$f&}W<
AJOBUy

literal 0
HcmV?d00001


From c5baa30f7ba469f50616e493e32154fd968cd006 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 21:07:41 +0530
Subject: [PATCH 0469/1154] ...

---
 src/calibre/gui2/preferences/look_feel.ui | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index d704e1a214..2438c2f9c1 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -249,6 +249,9 @@
            <property name="toolTip">
             <string>The width of displayed covers</string>
            </property>
+           <property name="specialValueText">
+            <string>Automatic</string>
+           </property>
            <property name="suffix">
             <string> cm</string>
            </property>
@@ -283,16 +286,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QLabel" name="label_13">
-           <property name="text">
-            <string>A value of zero means set automatically based on screen size</string>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">

From 602c3d22a55f32aafaa3c377a86de2e67246ee17 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 21:43:29 +0530
Subject: [PATCH 0470/1154] newdb: Handle duplicate values when setting
 many-many fields

Fixes an error when merging book records that have the same tags.
---
 src/calibre/db/tests/writing.py | 3 +++
 src/calibre/db/write.py         | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 4f2bacf921..96e2bb0c34 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -292,6 +292,9 @@ class WritingTest(BaseTest):
             ae(c.field_for('sort', 1), 'Moose, The')
             ae(c.field_for('sort', 2), 'Cat')
 
+        # Test setting with the same value repeated
+        ae(sf('tags', {3: ('a', 'b', 'a')}), {3})
+
     # }}}
 
     def test_dirtied(self):  # {{{
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 58c642e59c..5f486445db 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -337,6 +337,14 @@ def many_one(book_id_val_map, db, field, allow_case_change, *args):
 # }}}
 
 # Many-Many fields {{{
+
+def uniq(vals):
+    ' Remove all duplicates from vals, while preserving order. Items in vals must be hashable '
+    vals = vals or ()
+    seen = set()
+    seen_add = seen.add
+    return tuple(x for x in vals if x not in seen and not seen_add(x))
+
 def many_many(book_id_val_map, db, field, allow_case_change, *args):
     dirtied = set()
     m = field.metadata
@@ -349,6 +357,7 @@ def many_many(book_id_val_map, db, field, allow_case_change, *args):
     rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
     val_map = {}
     case_changes = {}
+    book_id_val_map = {k:uniq(vals) for k, vals in book_id_val_map.iteritems()}
     for vals in book_id_val_map.itervalues():
         for val in vals:
             get_db_id(val, db, m, table, kmap, rid_map, allow_case_change,

From 8d3fd8b05c3ff2bc054e81af757326997fa21eeb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 22:07:24 +0530
Subject: [PATCH 0471/1154] newdb: Fix true/false searches on numeric columns

---
 src/calibre/db/search.py        | 3 +++
 src/calibre/db/tests/reading.py | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 9eeacc24b5..6a6fbb0a56 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -290,8 +290,11 @@ class NumericSearch(object):  # {{{
                 raise ParseException(
                         _('Non-numeric value in query: {0}').format(query))
 
+        qfalse = query == 'false'
         for val, book_ids in field_iter():
             if val is None:
+                if qfalse:
+                    matches |= book_ids
                 continue
             try:
                 v = cast(val)
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 56866f5aa7..c9d29475f6 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -224,8 +224,8 @@ class ReadingTest(BaseTest):
             'rating:3', 'rating:>2', 'rating:=2', 'rating:true',
             'rating:false', 'rating:>4', 'tags:#<2', 'tags:#>7',
             'cover:false', 'cover:true', '#float:>11', '#float:<1k',
-            '#float:10.01', 'series_index:1', 'series_index:<3', 'id:1',
-            'id:>2',
+            '#float:10.01', '#float:false', 'series_index:1',
+            'series_index:<3', 'id:1', 'id:>2',
 
             # Bool tests
             '#yesno:true', '#yesno:false', '#yesno:yes', '#yesno:no',

From 768cd4d887f5509063686aaa404aaffc5fc28c9a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 5 Aug 2013 22:33:05 +0530
Subject: [PATCH 0472/1154] Plugin updater dialog: Use index names

Use index names as the key for plugins rather than names from the
plugin zip file, as deprecated plugins sometimes have the same name in
the zip file, but different names in the index.
---
 src/calibre/gui2/dialogs/plugin_updater.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py
index 123a14b829..0e95116866 100644
--- a/src/calibre/gui2/dialogs/plugin_updater.py
+++ b/src/calibre/gui2/dialogs/plugin_updater.py
@@ -185,7 +185,7 @@ class PluginFilterComboBox(QComboBox):
 class DisplayPlugin(object):
 
     def __init__(self, plugin):
-        self.name = plugin['name']
+        self.name = plugin['index_name']
         self.forum_link = plugin['thread_url']
         self.zip_url = SERVER + plugin['file']
         self.installed_version = None

From beca8ecf790d9a6958d5544534cbc84fdd71f168 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 07:37:16 +0530
Subject: [PATCH 0473/1154] A lot more verbose lock debugging

---
 src/calibre/db/locking.py | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index 90afbb8ffe..822168eb08 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -227,28 +227,24 @@ class DebugRWLockWrapper(RWLockWrapper):
 
     def __init__(self, *args, **kwargs):
         RWLockWrapper.__init__(self, *args, **kwargs)
-        self._last_acquire = ()
 
     def __enter__(self):
-        try:
-            RWLockWrapper.__enter__(self)
-        except LockingError as e:
-            if self._last_acquire is None:
-                raise
-            et, ei, tb = sys.exc_info()
-            raise LockingError, LockingError(e.message, extra='Last successful call to acquire():\n' + ''.join(self._last_acquire)), tb
-        self._last_acquire = traceback.format_stack()
+        print ('#' * 120, file=sys.stderr)
+        print ('acquire called: thread id:', current_thread(), 'shared:', self._is_shared, file=sys.stderr)
+        traceback.print_stack()
+        RWLockWrapper.__enter__(self)
+        print ('acquire done: thread id:', current_thread(), file=sys.stderr)
+        print ('_' * 120, file=sys.stderr)
 
     def release(self):
-        try:
-            RWLockWrapper.release(self)
-        except LockingError as e:
-            if self._last_acquire is None:
-                raise
-            et, ei, tb = sys.exc_info()
-            raise LockingError, LockingError(e.message, extra='Last successful call to acquire():\n' + ''.join(self._last_acquire)), tb
+        print ('*' * 120, file=sys.stderr)
+        print ('release called: thread id:', current_thread(), 'shared:', self._is_shared, file=sys.stderr)
+        traceback.print_stack()
+        RWLockWrapper.release(self)
+        print ('release done: thread id:', current_thread(), 'is_shared:', self._shlock.is_shared, 'is_exclusive:', self._shlock.is_exclusive, file=sys.stderr)
+        print ('_' * 120, file=sys.stderr)
 
-class RecordLock(object):
+class RecordLock(object):  # {{{
 
     '''
     Lock records identified by hashable ids. To use
@@ -326,6 +322,7 @@ class RecordLock(object):
 
     def _return_lock(self, lock):
         self._free_locks.append(lock)
+# }}}
 
 # Tests {{{
 if __name__ == '__main__':

From cf293a6232ec54415ac231100e63b468d15b8a4a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 07:39:04 +0530
Subject: [PATCH 0474/1154] Remove the unused RecordLock class

---
 src/calibre/db/locking.py | 115 +-------------------------------------
 1 file changed, 1 insertion(+), 114 deletions(-)

diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index 822168eb08..ac871a5869 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -8,9 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import traceback, sys
-from threading import Lock, Condition, current_thread, RLock
-from functools import partial
-from collections import Counter
+from threading import Lock, Condition, current_thread
 from calibre.utils.config_base import tweaks
 
 class LockingError(RuntimeError):
@@ -244,86 +242,6 @@ class DebugRWLockWrapper(RWLockWrapper):
         print ('release done: thread id:', current_thread(), 'is_shared:', self._shlock.is_shared, 'is_exclusive:', self._shlock.is_exclusive, file=sys.stderr)
         print ('_' * 120, file=sys.stderr)
 
-class RecordLock(object):  # {{{
-
-    '''
-    Lock records identified by hashable ids. To use
-
-    rl = RecordLock()
-
-    with rl.lock(some_id):
-        # do something
-
-    This will lock the record identified by some_id exclusively. The lock is
-    recursive, which means that you can lock the same record multiple times in
-    the same thread.
-
-    This class co-operates with the SHLock class. If you try to lock a record
-    in a thread that already holds the SHLock, a LockingError is raised. This
-    is to prevent the possibility of a cross-lock deadlock.
-
-    A cross-lock deadlock is still possible if you first lock a record and then
-    acquire the SHLock, but the usage pattern for this lock makes this highly
-    unlikely (this lock should be acquired immediately before any file I/O on
-    files in the library and released immediately after).
-    '''
-
-    class Wrap(object):
-
-        def __init__(self, release):
-            self.release = release
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, *args, **kwargs):
-            self.release()
-            self.release = None
-
-    def __init__(self, sh_lock):
-        self._lock = Lock()
-        #  This is for recycling lock objects.
-        self._free_locks = [RLock()]
-        self._records = {}
-        self._counter = Counter()
-        self.sh_lock = sh_lock
-
-    def lock(self, record_id):
-        if self.sh_lock.owns_lock():
-            raise LockingError('Current thread already holds a shared lock,'
-                ' you cannot also ask for record lock as this could cause a'
-                ' deadlock.')
-        with self._lock:
-            l = self._records.get(record_id, None)
-            if l is None:
-                l = self._take_lock()
-                self._records[record_id] = l
-            self._counter[record_id] += 1
-        l.acquire()
-        return RecordLock.Wrap(partial(self.release, record_id))
-
-    def release(self, record_id):
-        with self._lock:
-            l = self._records.pop(record_id, None)
-            if l is None:
-                raise LockingError('No lock acquired for record %r'%record_id)
-            l.release()
-            self._counter[record_id] -= 1
-            if self._counter[record_id] > 0:
-                self._records[record_id] = l
-            else:
-                self._return_lock(l)
-
-    def _take_lock(self):
-        try:
-            return self._free_locks.pop()
-        except IndexError:
-            return RLock()
-
-    def _return_lock(self, lock):
-        self._free_locks.append(lock)
-# }}}
-
 # Tests {{{
 if __name__ == '__main__':
     import time, random, unittest
@@ -490,37 +408,6 @@ if __name__ == '__main__':
             self.assertFalse(lock.is_shared)
             self.assertFalse(lock.is_exclusive)
 
-        def test_record_lock(self):
-            shlock = SHLock()
-            lock = RecordLock(shlock)
-
-            shlock.acquire()
-            self.assertRaises(LockingError, lock.lock, 1)
-            shlock.release()
-            with lock.lock(1):
-                with lock.lock(1):
-                    pass
-
-            def dolock():
-                with lock.lock(1):
-                    time.sleep(0.1)
-
-            t = Thread(target=dolock)
-            t.daemon = True
-            with lock.lock(1):
-                t.start()
-                t.join(0.2)
-                self.assertTrue(t.is_alive())
-            t.join(0.11)
-            self.assertFalse(t.is_alive())
-
-            t = Thread(target=dolock)
-            t.daemon = True
-            with lock.lock(2):
-                t.start()
-                t.join(0.11)
-                self.assertFalse(t.is_alive())
-
     suite = unittest.TestLoader().loadTestsFromTestCase(TestLock)
     unittest.TextTestRunner(verbosity=2).run(suite)
 

From 666248454b6c22b89fc2022accc8d001d00da656 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 07:44:19 +0530
Subject: [PATCH 0475/1154] Move lock testing into the main test suite

---
 src/calibre/db/locking.py       | 170 -------------------------------
 src/calibre/db/tests/locking.py | 174 ++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+), 170 deletions(-)
 create mode 100644 src/calibre/db/tests/locking.py

diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index ac871a5869..9245ecae84 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -242,174 +242,4 @@ class DebugRWLockWrapper(RWLockWrapper):
         print ('release done: thread id:', current_thread(), 'is_shared:', self._shlock.is_shared, 'is_exclusive:', self._shlock.is_exclusive, file=sys.stderr)
         print ('_' * 120, file=sys.stderr)
 
-# Tests {{{
-if __name__ == '__main__':
-    import time, random, unittest
-    from threading import Thread
-
-    class TestLock(unittest.TestCase):
-        """Testcases for Lock classes."""
-
-        def test_owns_locks(self):
-            lock = SHLock()
-            self.assertFalse(lock.owns_lock())
-            lock.acquire(shared=True)
-            self.assertTrue(lock.owns_lock())
-            lock.release()
-            self.assertFalse(lock.owns_lock())
-            lock.acquire(shared=False)
-            self.assertTrue(lock.owns_lock())
-            lock.release()
-            self.assertFalse(lock.owns_lock())
-
-            done = []
-            def test():
-                if not lock.owns_lock():
-                    done.append(True)
-            lock.acquire()
-            t = Thread(target=test)
-            t.daemon = True
-            t.start()
-            t.join(1)
-            self.assertEqual(len(done), 1)
-            lock.release()
-
-        def test_multithread_deadlock(self):
-            lock = SHLock()
-            def two_shared():
-                r = RWLockWrapper(lock)
-                with r:
-                    time.sleep(0.2)
-                    with r:
-                        pass
-            def one_exclusive():
-                time.sleep(0.1)
-                w = RWLockWrapper(lock, is_shared=False)
-                with w:
-                    pass
-            threads = [Thread(target=two_shared), Thread(target=one_exclusive)]
-            for t in threads:
-                t.daemon = True
-                t.start()
-            for t in threads:
-                t.join(5)
-            live = [t for t in threads if t.is_alive()]
-            self.assertListEqual(live, [], 'ShLock hung')
-
-        def test_upgrade(self):
-            lock = SHLock()
-            lock.acquire(shared=True)
-            self.assertRaises(LockingError, lock.acquire, shared=False)
-            lock.release()
-
-        def test_downgrade(self):
-            lock = SHLock()
-            lock.acquire(shared=False)
-            self.assertRaises(LockingError, lock.acquire, shared=True)
-            lock.release()
-
-        def test_recursive(self):
-            lock = SHLock()
-            lock.acquire(shared=True)
-            lock.acquire(shared=True)
-            self.assertEqual(lock.is_shared, 2)
-            lock.release()
-            lock.release()
-            self.assertFalse(lock.is_shared)
-            lock.acquire(shared=False)
-            lock.acquire(shared=False)
-            self.assertEqual(lock.is_exclusive, 2)
-            lock.release()
-            lock.release()
-            self.assertFalse(lock.is_exclusive)
-
-        def test_release(self):
-            lock = SHLock()
-            self.assertRaises(LockingError, lock.release)
-
-            def get_lock(shared):
-                lock.acquire(shared=shared)
-                time.sleep(1)
-                lock.release()
-
-            threads = [Thread(target=get_lock, args=(x,)) for x in (True,
-                False)]
-            for t in threads:
-                t.daemon = True
-                t.start()
-                self.assertRaises(LockingError, lock.release)
-                t.join(2)
-                self.assertFalse(t.is_alive())
-            self.assertFalse(lock.is_shared)
-            self.assertFalse(lock.is_exclusive)
-
-        def test_acquire(self):
-            lock = SHLock()
-
-            def get_lock(shared):
-                lock.acquire(shared=shared)
-                time.sleep(1)
-                lock.release()
-
-            shared = Thread(target=get_lock, args=(True,))
-            shared.daemon = True
-            shared.start()
-            time.sleep(0.1)
-            self.assertTrue(lock.acquire(shared=True, blocking=False))
-            lock.release()
-            self.assertFalse(lock.acquire(shared=False, blocking=False))
-            lock.acquire(shared=False)
-            self.assertFalse(shared.is_alive())
-            lock.release()
-            self.assertTrue(lock.acquire(shared=False, blocking=False))
-            lock.release()
-
-            exclusive = Thread(target=get_lock, args=(False,))
-            exclusive.daemon = True
-            exclusive.start()
-            time.sleep(0.1)
-            self.assertFalse(lock.acquire(shared=False, blocking=False))
-            self.assertFalse(lock.acquire(shared=True, blocking=False))
-            lock.acquire(shared=True)
-            self.assertFalse(exclusive.is_alive())
-            lock.release()
-            lock.acquire(shared=False)
-            lock.release()
-            lock.acquire(shared=True)
-            lock.release()
-            self.assertFalse(lock.is_shared)
-            self.assertFalse(lock.is_exclusive)
-
-        def test_contention(self):
-            lock = SHLock()
-            done = []
-            def lots_of_acquires():
-                for _ in xrange(1000):
-                    shared = random.choice([True,False])
-                    lock.acquire(shared=shared)
-                    lock.acquire(shared=shared)
-                    time.sleep(random.random() * 0.0001)
-                    lock.release()
-                    time.sleep(random.random() * 0.0001)
-                    lock.acquire(shared=shared)
-                    time.sleep(random.random() * 0.0001)
-                    lock.release()
-                    lock.release()
-                done.append(True)
-            threads = [Thread(target=lots_of_acquires) for _ in xrange(10)]
-            for t in threads:
-                t.daemon = True
-                t.start()
-            for t in threads:
-                t.join(20)
-            live = [t for t in threads if t.is_alive()]
-            self.assertListEqual(live, [], 'ShLock hung')
-            self.assertEqual(len(done), len(threads), 'SHLock locking failed')
-            self.assertFalse(lock.is_shared)
-            self.assertFalse(lock.is_exclusive)
-
-    suite = unittest.TestLoader().loadTestsFromTestCase(TestLock)
-    unittest.TextTestRunner(verbosity=2).run(suite)
-
-# }}}
 
diff --git a/src/calibre/db/tests/locking.py b/src/calibre/db/tests/locking.py
new file mode 100644
index 0000000000..a9dcb43ae4
--- /dev/null
+++ b/src/calibre/db/tests/locking.py
@@ -0,0 +1,174 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import time, random
+from threading import Thread
+from calibre.db.tests.base import BaseTest
+from calibre.db.locking import SHLock, RWLockWrapper, LockingError
+
+class TestLock(BaseTest):
+    """Tests for db locking """
+
+    def test_owns_locks(self):
+        lock = SHLock()
+        self.assertFalse(lock.owns_lock())
+        lock.acquire(shared=True)
+        self.assertTrue(lock.owns_lock())
+        lock.release()
+        self.assertFalse(lock.owns_lock())
+        lock.acquire(shared=False)
+        self.assertTrue(lock.owns_lock())
+        lock.release()
+        self.assertFalse(lock.owns_lock())
+
+        done = []
+        def test():
+            if not lock.owns_lock():
+                done.append(True)
+        lock.acquire()
+        t = Thread(target=test)
+        t.daemon = True
+        t.start()
+        t.join(1)
+        self.assertEqual(len(done), 1)
+        lock.release()
+
+    def test_multithread_deadlock(self):
+        lock = SHLock()
+        def two_shared():
+            r = RWLockWrapper(lock)
+            with r:
+                time.sleep(0.2)
+                with r:
+                    pass
+        def one_exclusive():
+            time.sleep(0.1)
+            w = RWLockWrapper(lock, is_shared=False)
+            with w:
+                pass
+        threads = [Thread(target=two_shared), Thread(target=one_exclusive)]
+        for t in threads:
+            t.daemon = True
+            t.start()
+        for t in threads:
+            t.join(5)
+        live = [t for t in threads if t.is_alive()]
+        self.assertListEqual(live, [], 'ShLock hung')
+
+    def test_upgrade(self):
+        lock = SHLock()
+        lock.acquire(shared=True)
+        self.assertRaises(LockingError, lock.acquire, shared=False)
+        lock.release()
+
+    def test_downgrade(self):
+        lock = SHLock()
+        lock.acquire(shared=False)
+        self.assertRaises(LockingError, lock.acquire, shared=True)
+        lock.release()
+
+    def test_recursive(self):
+        lock = SHLock()
+        lock.acquire(shared=True)
+        lock.acquire(shared=True)
+        self.assertEqual(lock.is_shared, 2)
+        lock.release()
+        lock.release()
+        self.assertFalse(lock.is_shared)
+        lock.acquire(shared=False)
+        lock.acquire(shared=False)
+        self.assertEqual(lock.is_exclusive, 2)
+        lock.release()
+        lock.release()
+        self.assertFalse(lock.is_exclusive)
+
+    def test_release(self):
+        lock = SHLock()
+        self.assertRaises(LockingError, lock.release)
+
+        def get_lock(shared):
+            lock.acquire(shared=shared)
+            time.sleep(1)
+            lock.release()
+
+        threads = [Thread(target=get_lock, args=(x,)) for x in (True,
+            False)]
+        for t in threads:
+            t.daemon = True
+            t.start()
+            self.assertRaises(LockingError, lock.release)
+            t.join(2)
+            self.assertFalse(t.is_alive())
+        self.assertFalse(lock.is_shared)
+        self.assertFalse(lock.is_exclusive)
+
+    def test_acquire(self):
+        lock = SHLock()
+
+        def get_lock(shared):
+            lock.acquire(shared=shared)
+            time.sleep(1)
+            lock.release()
+
+        shared = Thread(target=get_lock, args=(True,))
+        shared.daemon = True
+        shared.start()
+        time.sleep(0.1)
+        self.assertTrue(lock.acquire(shared=True, blocking=False))
+        lock.release()
+        self.assertFalse(lock.acquire(shared=False, blocking=False))
+        lock.acquire(shared=False)
+        self.assertFalse(shared.is_alive())
+        lock.release()
+        self.assertTrue(lock.acquire(shared=False, blocking=False))
+        lock.release()
+
+        exclusive = Thread(target=get_lock, args=(False,))
+        exclusive.daemon = True
+        exclusive.start()
+        time.sleep(0.1)
+        self.assertFalse(lock.acquire(shared=False, blocking=False))
+        self.assertFalse(lock.acquire(shared=True, blocking=False))
+        lock.acquire(shared=True)
+        self.assertFalse(exclusive.is_alive())
+        lock.release()
+        lock.acquire(shared=False)
+        lock.release()
+        lock.acquire(shared=True)
+        lock.release()
+        self.assertFalse(lock.is_shared)
+        self.assertFalse(lock.is_exclusive)
+
+    def test_contention(self):
+        lock = SHLock()
+        done = []
+        def lots_of_acquires():
+            for _ in xrange(1000):
+                shared = random.choice([True,False])
+                lock.acquire(shared=shared)
+                lock.acquire(shared=shared)
+                time.sleep(random.random() * 0.0001)
+                lock.release()
+                time.sleep(random.random() * 0.0001)
+                lock.acquire(shared=shared)
+                time.sleep(random.random() * 0.0001)
+                lock.release()
+                lock.release()
+            done.append(True)
+        threads = [Thread(target=lots_of_acquires) for _ in xrange(10)]
+        for t in threads:
+            t.daemon = True
+            t.start()
+        for t in threads:
+            t.join(20)
+        live = [t for t in threads if t.is_alive()]
+        self.assertListEqual(live, [], 'ShLock hung')
+        self.assertEqual(len(done), len(threads), 'SHLock locking failed')
+        self.assertFalse(lock.is_shared)
+        self.assertFalse(lock.is_exclusive)
+

From 562f8f16b469c2f62f30115d1863e00a18a34bfd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 11:39:09 +0530
Subject: [PATCH 0476/1154] newdb: Fix move_library() broken on case-insenstive
 file systems

get_top_level_move_items() was not checking that the items it returned
actually existed on case-insensitive file systems. This bug is actually
present in olddb as well.
---
 src/calibre/db/backend.py      | 2 +-
 src/calibre/db/tests/legacy.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index db5510d055..05a8887576 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1485,7 +1485,7 @@ class DB(object):
         if not self.is_case_sensitive:
             for x in items:
                 path_map[x.lower()] = x
-            items = set(path_map)
+            items = {x.lower() for x in items}
             paths = {x.lower() for x in paths}
         items = items.intersection(paths)
         return items, path_map
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index c936367ba4..55610f6401 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -167,7 +167,6 @@ class LegacyTest(BaseTest):
 
         for meth, args in {
             'find_identical_books': [(Metadata('title one', ['author one']),), (Metadata('unknown'),), (Metadata('xxxx'),)],
-            'get_top_level_move_items': [()],
             'get_books_for_category': [('tags', newstag), ('#formats', 'FMT1')],
             'get_next_series_num_for': [('A Series One',)],
             'get_id_from_uuid':[('ddddd',), (db.uuid(1, True),)],
@@ -241,6 +240,10 @@ class LegacyTest(BaseTest):
             for a in args:
                 self.assertEqual(fmt(getattr(db, meth)(*a)), fmt(getattr(ndb, meth)(*a)),
                                  'The method: %s() returned different results for argument %s' % (meth, a))
+        def f(x, y):  # get_top_level_move_items is broken in the old db on case-insensitive file systems
+            x.discard('metadata_db_prefs_backup.json')
+            return x, y
+        self.assertEqual(f(*db.get_top_level_move_items()), f(*ndb.get_top_level_move_items()))
         d1, d2 = BytesIO(), BytesIO()
         db.copy_cover_to(1, d1, True)
         ndb.copy_cover_to(1, d2, True)

From 37484fb02c8f6fcd17066088f60f2c4ba1bab3b4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 12:04:38 +0530
Subject: [PATCH 0477/1154] Fix refresh() test failling on OS X because of file
 system resolution

---
 src/calibre/db/tests/legacy.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 55610f6401..03abdee26e 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import inspect
+import inspect, time
 from io import BytesIO
 from repr import repr
 from functools import partial
@@ -126,6 +126,9 @@ class LegacyTest(BaseTest):
         ' Test refreshing the view after a change to metadata.db '
         db = self.init_legacy()
         db2 = self.init_legacy()
+        # Ensure that the following change will actually update the timestamp
+        # on filesystems with one second resolution (OS X)
+        time.sleep(1)
         self.assertEqual(db2.data.cache.set_field('title', {1:'xxx'}), set([1]))
         db2.close()
         del db2

From 17dcc39aff04ba8e3b8c44ccf61615ef12d62200 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 12:31:47 +0530
Subject: [PATCH 0478/1154] Fix test failures due to file locking on windows

---
 src/calibre/db/tests/legacy.py | 39 +++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 03abdee26e..4baf1a627e 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -10,7 +10,6 @@ import inspect, time
 from io import BytesIO
 from repr import repr
 from functools import partial
-from tempfile import NamedTemporaryFile
 from operator import itemgetter
 
 from calibre.db.tests.base import BaseTest
@@ -313,19 +312,20 @@ class LegacyTest(BaseTest):
     def test_legacy_adding_books(self):  # {{{
         'Test various adding/deleting books methods'
         from calibre.ebooks.metadata.book.base import Metadata
+        from calibre.ptempfile import TemporaryFile
         legacy, old = self.init_legacy(self.cloned_library), self.init_old(self.cloned_library)
         mi = Metadata('Added Book0', authors=('Added Author',))
-        with NamedTemporaryFile(suffix='.aff') as f:
-            f.write(b'xxx')
-            f.flush()
-            T = partial(ET, 'add_books', ([f.name], ['AFF'], [mi]), old=old, legacy=legacy)
+        with TemporaryFile(suffix='.aff') as name:
+            with open(name, 'wb') as f:
+                f.write(b'xxx')
+            T = partial(ET, 'add_books', ([name], ['AFF'], [mi]), old=old, legacy=legacy)
             T()(self)
             book_id = T(kwargs={'return_ids':True})(self)[1][0]
             self.assertEqual(legacy.new_api.formats(book_id), ('AFF',))
             T(kwargs={'add_duplicates':False})(self)
             mi.title = 'Added Book1'
             mi.uuid = 'uuu'
-            T = partial(ET, 'import_book', (mi,[f.name]), old=old, legacy=legacy)
+            T = partial(ET, 'import_book', (mi,[name]), old=old, legacy=legacy)
             book_id = T()(self)
             self.assertNotEqual(legacy.uuid(book_id, index_is_id=True), old.uuid(book_id, index_is_id=True))
             book_id = T(kwargs={'preserve_uuid':True})(self)
@@ -336,10 +336,10 @@ class LegacyTest(BaseTest):
             T((0, 'AFF', BytesIO(b'fffff')))(self)
             T((0, 'AFF', BytesIO(b'fffff')))(self)
             T((0, 'AFF', BytesIO(b'fffff')), {'replace':True})(self)
-        with NamedTemporaryFile(suffix='.opf') as f:
-            f.write(b'zzzz')
-            f.flush()
-            T = partial(ET, 'import_book', (mi,[f.name]), old=old, legacy=legacy)
+        with TemporaryFile(suffix='.opf') as name:
+            with open(name, 'wb') as f:
+                f.write(b'zzzz')
+            T = partial(ET, 'import_book', (mi,[name]), old=old, legacy=legacy)
             book_id = T()(self)
             self.assertFalse(legacy.new_api.formats(book_id))
 
@@ -349,21 +349,21 @@ class LegacyTest(BaseTest):
         T({'add_duplicates':False})
         T({'force_id':1000})
 
-        with NamedTemporaryFile(suffix='.txt') as f:
-            f.write(b'tttttt')
-            f.seek(0)
-            bid = legacy.add_catalog(f.name, 'My Catalog')
-            self.assertEqual(old.add_catalog(f.name, 'My Catalog'), bid)
+        with TemporaryFile(suffix='.txt') as name:
+            with open(name, 'wb') as f:
+                f.write(b'tttttt')
+            bid = legacy.add_catalog(name, 'My Catalog')
+            self.assertEqual(old.add_catalog(name, 'My Catalog'), bid)
             cache = legacy.new_api
             self.assertEqual(cache.formats(bid), ('TXT',))
             self.assertEqual(cache.field_for('title', bid), 'My Catalog')
             self.assertEqual(cache.field_for('authors', bid), ('calibre',))
             self.assertEqual(cache.field_for('tags', bid), (_('Catalog'),))
-            self.assertTrue(bid < legacy.add_catalog(f.name, 'Something else'))
-            self.assertEqual(legacy.add_catalog(f.name, 'My Catalog'), bid)
-            self.assertEqual(old.add_catalog(f.name, 'My Catalog'), bid)
+            self.assertTrue(bid < legacy.add_catalog(name, 'Something else'))
+            self.assertEqual(legacy.add_catalog(name, 'My Catalog'), bid)
+            self.assertEqual(old.add_catalog(name, 'My Catalog'), bid)
 
-            bid = legacy.add_news(f.name, {'title':'Events', 'add_title_tag':True, 'custom_tags':('one', 'two')})
+            bid = legacy.add_news(name, {'title':'Events', 'add_title_tag':True, 'custom_tags':('one', 'two')})
             self.assertEqual(cache.formats(bid), ('TXT',))
             self.assertEqual(cache.field_for('authors', bid), ('calibre',))
             self.assertEqual(cache.field_for('tags', bid), (_('News'), 'Events', 'one', 'two'))
@@ -783,5 +783,6 @@ class LegacyTest(BaseTest):
             ('saved_search_names',),
             ('saved_search_lookup', 'n'),
         ))
+        db.close()
     # }}}
 

From 2affa5bf4e17399732464d067959b086dc9ac172 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 12:37:00 +0530
Subject: [PATCH 0479/1154] Fix test failure on windows because of slowness

---
 src/calibre/db/tests/writing.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 96e2bb0c34..19f6e70f48 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -343,12 +343,12 @@ class WritingTest(BaseTest):
             ae(sf('authors', {1:'author1 & author2', 2:'author1 & author2', 3:'author1 & author2'}), {1,2,3})
             count = 6
             while cache.dirty_queue_length() and count > 0:
-                mb.join(interval)
+                mb.join(2)
                 count -= 1
             af(cache.dirty_queue_length())
         finally:
             mb.stop()
-        mb.join(interval)
+        mb.join(2)
         af(mb.is_alive())
         from calibre.ebooks.metadata.opf2 import OPF
         for book_id in (1, 2, 3):

From b458cf07c4d73b2e84c6c0c5c31d647a3cfe09c6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 12:41:47 +0530
Subject: [PATCH 0480/1154] Another test fix for windows

---
 src/calibre/db/tests/locking.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/tests/locking.py b/src/calibre/db/tests/locking.py
index a9dcb43ae4..24d146fa3a 100644
--- a/src/calibre/db/tests/locking.py
+++ b/src/calibre/db/tests/locking.py
@@ -123,6 +123,7 @@ class TestLock(BaseTest):
         lock.release()
         self.assertFalse(lock.acquire(shared=False, blocking=False))
         lock.acquire(shared=False)
+        shared.join(1)
         self.assertFalse(shared.is_alive())
         lock.release()
         self.assertTrue(lock.acquire(shared=False, blocking=False))

From 44545b0c34e726958ca7cdf09f4f6c1ab07ef9b0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 12:47:48 +0530
Subject: [PATCH 0481/1154] ...

---
 src/calibre/db/tests/locking.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/tests/locking.py b/src/calibre/db/tests/locking.py
index 24d146fa3a..405c8669b9 100644
--- a/src/calibre/db/tests/locking.py
+++ b/src/calibre/db/tests/locking.py
@@ -136,6 +136,7 @@ class TestLock(BaseTest):
         self.assertFalse(lock.acquire(shared=False, blocking=False))
         self.assertFalse(lock.acquire(shared=True, blocking=False))
         lock.acquire(shared=True)
+        exclusive.join(1)
         self.assertFalse(exclusive.is_alive())
         lock.release()
         lock.acquire(shared=False)

From cc7c53289f7c44fbc0d5b5fd9511381b81509352 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 13:08:40 +0530
Subject: [PATCH 0482/1154] Ensure the recycle bin is not used while running
 tests

---
 src/calibre/db/tests/base.py     |  4 ++++
 src/calibre/utils/recycle_bin.py | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index 7a44897600..e541b410f2 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -27,10 +27,14 @@ class BaseTest(unittest.TestCase):
         reset_tweaks_to_default()
 
     def setUp(self):
+        from calibre.utils.recycle_bin import nuke_recycle
+        nuke_recycle()
         self.library_path = self.mkdtemp()
         self.create_db(self.library_path)
 
     def tearDown(self):
+        from calibre.utils.recycle_bin import restore_recyle
+        restore_recyle()
         gc.collect(), gc.collect()
         shutil.rmtree(self.library_path)
 
diff --git a/src/calibre/utils/recycle_bin.py b/src/calibre/utils/recycle_bin.py
index d1a63e8d01..7b1b38261b 100644
--- a/src/calibre/utils/recycle_bin.py
+++ b/src/calibre/utils/recycle_bin.py
@@ -36,8 +36,16 @@ elif islinux:
 
 can_recycle = callable(recycle)
 
-def delete_file(path):
-    if callable(recycle):
+def nuke_recycle():
+    global can_recycle
+    can_recycle = False
+
+def restore_recyle():
+    global can_recycle
+    can_recycle = callable(recycle)
+
+def delete_file(path, permanent=False):
+    if not permanent and can_recycle:
         try:
             recycle(path)
             return
@@ -59,7 +67,7 @@ def delete_tree(path, permanent=False):
             time.sleep(1)
             shutil.rmtree(path)
     else:
-        if callable(recycle):
+        if can_recycle:
             try:
                 recycle(path)
                 return

From 7b7f5c81dc62e4c5d36e379e14e5168a1a2840ae Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 13:13:29 +0530
Subject: [PATCH 0483/1154] newdb: More efficient deleteing of multiple books

---
 src/calibre/gui2/library/models.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 5f9e7bfdc6..df2afe5afc 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -315,9 +315,14 @@ class BooksModel(QAbstractTableModel):  # {{{
         return ids
 
     def delete_books_by_id(self, ids, permanent=False):
-        for id in ids:
-            self.db.delete_book(id, permanent=permanent, do_clean=False)
-        self.db.clean()
+        if hasattr(self.db, 'new_api'):
+            self.db.new_api.remove_books(ids, permanent=permanent)
+            self.db.data.books_deleted(tuple(ids))
+            self.db.notify('delete', list(ids))
+        else:
+            for id in ids:
+                self.db.delete_book(id, permanent=permanent, do_clean=False)
+            self.db.clean()
         self.books_deleted()
 
     def books_added(self, num):

From 66c5a1072bee017de327951303751cda6e931211 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 15:52:27 +0530
Subject: [PATCH 0484/1154] newdb: Workaround windows spinning the event loop
 when deleting files

Windows, being deigned by the geniuses that it is, spins the event loop
while deleting files to the recycle bin, and there exists *no other way* to
move files to the Recycle Bin, since the Recycle Bin format is not
documented or stable.

So we move only files out of the library in the thread calling
delete_books(). The files are moved to the Recycle Bin in a worker
thread. This has two advantages:

1) Faster deletes, since the main thread does not have to wait on the
Recycle Bin (some windows' installs are so badly messed up that moving a
single file to the Bin takes seconds)

2) Restoring deleted files from the bin will not restore them inside the
calibre library folder, where they become orphed. They will be restored
elsewhere.

Disadvantages:

1) If the user deletes a lot of books and quits calibre, they might not
be finished deleting on quit, this can probably be mitigated by popping
up a warning at shutdown
---
 src/calibre/db/backend.py          |  45 +++++++----
 src/calibre/db/delete_service.py   | 116 +++++++++++++++++++++++++++++
 src/calibre/db/tests/add_remove.py |  17 ++++-
 src/calibre/gui2/ui.py             |   2 +
 4 files changed, 162 insertions(+), 18 deletions(-)
 create mode 100644 src/calibre/db/delete_service.py

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 05a8887576..871d704ce1 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -8,7 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 # Imports {{{
-import os, shutil, uuid, json, glob, time, cPickle, hashlib
+import os, shutil, uuid, json, glob, time, cPickle, hashlib, errno
 from functools import partial
 
 import apsw
@@ -19,6 +19,7 @@ from calibre.constants import (iswindows, filesystem_encoding,
 from calibre.ptempfile import PersistentTemporaryFile, TemporaryFile
 from calibre.db import SPOOL_SIZE
 from calibre.db.schema_upgrades import SchemaUpgrade
+from calibre.db.delete_service import delete_service
 from calibre.db.errors import NoSuchFormat
 from calibre.library.field_metadata import FieldMetadata
 from calibre.ebooks.metadata import title_sort, author_to_author_sort
@@ -28,7 +29,6 @@ from calibre.utils.date import utcfromtimestamp, parse_date
 from calibre.utils.filenames import (
     is_case_sensitive, samefile, hardlink_file, ascii_filename, WindowsAtomicFolderMove, atomic_rename)
 from calibre.utils.magick.draw import save_cover_data_to
-from calibre.utils.recycle_bin import delete_tree, delete_file
 from calibre.utils.formatter_functions import load_user_template_functions
 from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable,
         SizeTable, FormatsTable, AuthorsTable, IdentifiersTable, PathTable,
@@ -1035,9 +1035,18 @@ class DB(object):
             path = os.path.normcase(path).lower()
         return path
 
-    def rmtree(self, path, permanent=False):
-        if not self.normpath(self.library_path).startswith(self.normpath(path)):
-            delete_tree(path, permanent=permanent)
+    def is_deletable(self, path):
+        return path and not self.normpath(self.library_path).startswith(self.normpath(path))
+
+    def rmtree(self, path):
+        if self.is_deletable(path):
+            try:
+                shutil.rmtree(path)
+            except:
+                import traceback
+                traceback.print_exc()
+                time.sleep(1)  # In case something has temporarily locked a file
+                shutil.rmtree(path)
 
     def construct_path_name(self, book_id, title, author):
         '''
@@ -1170,7 +1179,7 @@ class DB(object):
         path = self.format_abspath(book_id, fmt, fname, path)
         if path is not None:
             try:
-                delete_file(path)
+                delete_service().delete_files((path,), self.library_path)
             except:
                 import traceback
                 traceback.print_exc()
@@ -1360,10 +1369,10 @@ class DB(object):
                 if os.path.exists(spath) and not samefile(spath, tpath):
                     if wam is not None:
                         wam.delete_originals()
-                    self.rmtree(spath, permanent=True)
+                    self.rmtree(spath)
                     parent = os.path.dirname(spath)
                     if len(os.listdir(parent)) == 0:
-                        self.rmtree(parent, permanent=True)
+                        self.rmtree(parent)
         finally:
             if wam is not None:
                 wam.close_handles()
@@ -1404,16 +1413,20 @@ class DB(object):
             return f.read()
 
     def remove_books(self, path_map, permanent=False):
-        for book_id, path in path_map.iteritems():
-            if path:
-                path = os.path.join(self.library_path, path)
-                if os.path.exists(path):
-                    self.rmtree(path, permanent=permanent)
-                    parent = os.path.dirname(path)
-                    if len(os.listdir(parent)) == 0:
-                        self.rmtree(parent, permanent=permanent)
         self.conn.executemany(
             'DELETE FROM books WHERE id=?', [(x,) for x in path_map])
+        paths = {os.path.join(self.library_path, x) for x in path_map.itervalues() if x}
+        paths = {x for x in paths if os.path.exists(x) and self.is_deletable(x)}
+        if permanent:
+            for path in paths:
+                self.rmtree(path)
+                try:
+                    os.rmdir(os.path.dirname(path))
+                except OSError as e:
+                    if e.errno != errno.ENOTEMPTY:
+                        raise
+        else:
+            delete_service().delete_books(paths, self.library_path)
 
     def add_custom_data(self, name, val_map, delete_first):
         if delete_first:
diff --git a/src/calibre/db/delete_service.py b/src/calibre/db/delete_service.py
new file mode 100644
index 0000000000..a79afc7d4b
--- /dev/null
+++ b/src/calibre/db/delete_service.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os, tempfile, shutil, errno, time
+from threading import Thread
+from Queue import Queue
+
+from calibre.utils.recycle_bin import delete_tree, delete_file
+
+class DeleteService(Thread):
+
+    ''' Provide a blocking file delete implementation with support for the
+    recycle bin. On windows, deleting files to the recycle bin spins the event
+    loop, which can cause locking errors in the main thread. We get around this
+    by only moving the files/folders to be deleted out of the library in the
+    main thread, they are deleted to recycle bin in a separate worker thread.
+
+    This has the added advantage that doing a restore from the recycle bin wont
+    cause metadata.db and the file system to get out of sync. Also, deleting
+    becomes much faster, since in the common case, the move is done by a simple
+    os.rename(). The downside is that if the user quits calibre while a long
+    move to recycle bin is happening, the files may not all be deleted.'''
+
+    daemon = True
+
+    def __init__(self):
+        Thread.__init__(self)
+        self.requests = Queue()
+
+    def shutdown(self, timeout=20):
+        self.requests.put(None)
+        self.join(timeout)
+
+    def create_staging(self, library_path):
+        base_path = os.path.dirname(library_path)
+        base = os.path.basename(library_path)
+        try:
+            return tempfile.mkdtemp(prefix=base+' deleted ', dir=base_path)
+        except OSError:
+            return tempfile.mkdtemp(prefix=base+' deleted ')
+
+    def delete_books(self, paths, library_path):
+        tdir = self.create_staging(library_path)
+        self.queue_paths(tdir, paths, delete_empty_parent=True)
+
+    def queue_paths(self, tdir, paths, delete_empty_parent=True):
+        for path in paths:
+            if os.path.exists(path):
+                try:
+                    shutil.move(path, tdir)
+                except EnvironmentError:
+                    # Wait a little in case something has locked a file
+                    time.sleep(1)
+                    shutil.move(path, tdir)
+                if delete_empty_parent:
+                    parent = os.path.dirname(path)
+                    try:
+                        os.rmdir(parent)
+                    except OSError as e:
+                        if e.errno != errno.ENOTEMPTY:
+                            raise
+                self.requests.put(os.path.join(tdir, os.path.basename(path)))
+
+    def delete_files(self, paths, library_path):
+        tdir = self.create_staging(library_path)
+        self.queue_paths(tdir, paths, delete_empty_parent=False)
+
+    def run(self):
+        while True:
+            x = self.requests.get()
+            try:
+                if x is None:
+                    break
+                try:
+                    self.do_delete(x)
+                except:
+                    import traceback
+                    traceback.print_exc()
+            finally:
+                self.requests.task_done()
+
+    def wait(self):
+        'Blocks until all pending deletes have completed'
+        self.requests.join()
+
+    def do_delete(self, x):
+        if os.path.isdir(x):
+            delete_tree(x)
+        else:
+            delete_file(x)
+        try:
+            os.rmdir(os.path.dirname(x))
+        except OSError as e:
+            if e.errno != errno.ENOTEMPTY:
+                raise
+
+__ds = None
+def delete_service():
+    global __ds
+    if __ds is None:
+        __ds = DeleteService()
+        __ds.start()
+    return __ds
+
+def shutdown(timeout=20):
+    global __ds
+    if __ds is not None:
+        __ds.shutdown(timeout)
+        __ds = None
+
+
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index 5cbac5deca..fb44d0e62c 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -209,6 +209,7 @@ class AddRemoveTest(BaseTest):
 
     def test_remove_books(self):  # {{{
         'Test removal of books'
+        cl = self.cloned_library
         cache = self.init_cache()
         af, ae, at = self.assertFalse, self.assertEqual, self.assertTrue
         authors = cache.fields['authors'].table
@@ -233,7 +234,7 @@ class AddRemoveTest(BaseTest):
         item_id = {v:k for k, v in cache.fields['#series'].table.id_map.iteritems()}['My Series Two']
         cache.remove_books((1,), permanent=True)
         for x in (fmtpath, bookpath, authorpath):
-            af(os.path.exists(x))
+            af(os.path.exists(x), 'The file %s exists, when it should not' % x)
         for c in (cache, self.init_cache()):
             table = c.fields['authors'].table
             self.assertNotIn(1, c.all_book_ids())
@@ -252,6 +253,19 @@ class AddRemoveTest(BaseTest):
             self.assertFalse(table.book_col_map)
             self.assertFalse(table.col_book_map)
 
+        # Test the delete service
+        from calibre.db.delete_service import delete_service
+        cache = self.init_cache(cl)
+        # Check that files are removed
+        fmtpath = cache.format_abspath(1, 'FMT1')
+        bookpath = os.path.dirname(fmtpath)
+        authorpath = os.path.dirname(bookpath)
+        item_id = {v:k for k, v in cache.fields['#series'].table.id_map.iteritems()}['My Series Two']
+        cache.remove_books((1,))
+        delete_service().wait()
+        for x in (fmtpath, bookpath, authorpath):
+            af(os.path.exists(x), 'The file %s exists, when it should not' % x)
+
     # }}}
 
     def test_original_fmt(self):  # {{{
@@ -271,4 +285,3 @@ class AddRemoveTest(BaseTest):
         af(db.has_format(1, 'ORIGINAL_FMT1'))
         ae(set(fmts), set(db.formats(1, verify_formats=False)))
     # }}}
-
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 8e34c2a84f..90eac209b2 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -854,6 +854,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
                 pass
         except KeyboardInterrupt:
             pass
+        from calibre.db.delete_service import shutdown
+        shutdown()
         time.sleep(2)
         self.istores.join()
         self.hide_windows()

From 5f518fba1d9280bc9945518c7b6897dff5e2e020 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 15:56:37 +0530
Subject: [PATCH 0485/1154] Jot Down by desUbiKado

---
 recipes/jot_down.recipe | 69 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 recipes/jot_down.recipe

diff --git a/recipes/jot_down.recipe b/recipes/jot_down.recipe
new file mode 100644
index 0000000000..ac5a0b7010
--- /dev/null
+++ b/recipes/jot_down.recipe
@@ -0,0 +1,69 @@
+#!/usr/bin/env  python
+# vim:fileencoding=utf-8
+from __future__ import unicode_literals
+__license__     = 'GPL v3'
+__copyright__   = '23 June 2013, desUBIKado'
+__author__      = 'desUBIKado'
+__description__ = 'Contemporary Culture Magazine'
+__version__     = 'v0.01'
+__date__        = '23, June 2013'
+'''
+http://www.jotdown.es/
+'''
+
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class jotdown(BasicNewsRecipe):
+    author        = 'desUBIKado'
+    description   = 'Revista digital con magníficos y extensos artículos'
+    title          = u'Jot Down - Contemporary Culture Magazine'
+    publisher      = 'Wabi Sabi Investments, S.C.'
+    category       = 'Opinion, culture, science, movies, TV shows, music, blogs'
+    language       = 'es'
+    timefmt        = '[%a, %d %b, %Y]'
+    oldest_article = 7
+    delay          = 1
+    max_articles_per_feed = 20
+    masthead_url   = 'http://www.jotdown.es/wp-content/uploads/2011/04/logoJotDown.png'
+    use_embedded_content  = False
+    remove_javascript = True
+    no_stylesheets = True
+
+    feeds          = [
+                        (u'Portada', u'http://www.jotdown.es/feed/')
+                     ]
+
+    keep_only_tags     = [dict(name='div', attrs={'class':['single']}),
+                          dict(name='div', attrs={'id':['comments']}),
+                         ]
+
+    remove_tags        = [dict(name='a', attrs={'href':['http://alternativaseconomicas.coop/']}),
+                          dict(name='div', attrs={'class':['reply','after-meta','comment-author vcard']}),
+                          dict(name='div', attrs={'align':['center']}),
+                          dict(name='span', attrs={'class':['fbreplace']}),
+                          dict(name='div', attrs={'id':'respond'})
+                     ]
+
+    remove_tags_after  = dict(name='div' , attrs={'id':'respond'})
+
+    extra_css = '''
+                    .comment-list {font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:12px;}
+                '''
+
+    preprocess_regexps = [
+ # To present the image of the embedded video
+                           (re.compile(r'<object type="application/x-shockwave-flash" data="http://www.youtube.com/v',
+                            re.DOTALL|re.IGNORECASE), lambda match: '<img src="http://img.youtube.com/vi'),
+                           (re.compile(r'&rel=0&fs=1"', re.DOTALL|re.IGNORECASE), lambda match: '/0.jpg"><object'),
+ # To remove the link of the category
+                           (re.compile(r'<div class="meta">', re.DOTALL|re.IGNORECASE), lambda match: '<div class="meta"><!-- '),
+                           (re.compile(r'</a>, <a href="http://www.jotdown.es/category', re.DOTALL|re.IGNORECASE), lambda match: ', <!--'),
+                           (re.compile(r'"category tag">', re.DOTALL|re.IGNORECASE), lambda match: '--> '),
+                           (re.compile(r'</a> &mdash;', re.DOTALL|re.IGNORECASE), lambda match: ''),
+ # To remove the link of the title
+                           (re.compile(r'<h1> <a href="', re.DOTALL|re.IGNORECASE), lambda match: '<h1> <div class="'),
+                           (re.compile(r'</a> </h1>', re.DOTALL|re.IGNORECASE), lambda match: '</div> </h1>')
+
+                      ]
+

From a33ce97c17986c6bf1681a8324a8106848ad5882 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 16:48:20 +0530
Subject: [PATCH 0486/1154] Search highlighting for the grid view

---
 src/calibre/gui2/library/alternate_views.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 0e88953426..bcbc99d57c 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -352,6 +352,7 @@ class CoverDelegate(QStyledItemDelegate):
         self.cover_cache = CoverCache(limit=gprefs['cover_grid_cache_size'])
         self.render_queue = Queue()
         self.animating = None
+        self.highlight_color = QColor(Qt.white)
 
     def set_dimensions(self):
         width = self.original_width = gprefs['cover_grid_width']
@@ -385,11 +386,20 @@ class CoverDelegate(QStyledItemDelegate):
 
     def paint(self, painter, option, index):
         QStyledItemDelegate.paint(self, painter, option, QModelIndex())  # draw the hover and selection highlights
-        db = index.model().db
+        m = index.model()
+        db = m.db
         try:
             book_id = db.id(index.row())
         except (ValueError, IndexError, KeyError):
             return
+        if book_id in m.ids_to_highlight_set:
+            painter.save()
+            try:
+                painter.setPen(self.highlight_color)
+                painter.setRenderHint(QPainter.Antialiasing, True)
+                painter.drawRoundedRect(option.rect, 10, 10, Qt.RelativeSize)
+            finally:
+                painter.restore()
         db = db.new_api
         cdata = self.cover_cache[book_id]
         painter.save()
@@ -435,7 +445,6 @@ class GridView(QListView):
     def __init__(self, parent):
         QListView.__init__(self, parent)
         setup_dnd_interface(self)
-        self.set_color()
         self.setUniformItemSizes(True)
         self.setWrapping(True)
         self.setFlow(self.LeftToRight)
@@ -450,6 +459,7 @@ class GridView(QListView):
         self.delegate.animation.finished.connect(self.animation_done)
         self.setItemDelegate(self.delegate)
         self.setSpacing(self.delegate.spacing)
+        self.set_color()
         self.ignore_render_requests = Event()
         self.render_thread = None
         self.update_item.connect(self.re_render, type=Qt.QueuedConnection)
@@ -478,9 +488,12 @@ class GridView(QListView):
     def set_color(self):
         r, g, b = gprefs['cover_grid_color']
         pal = QPalette()
-        pal.setColor(pal.Base, QColor(r, g, b))
-        pal.setColor(pal.Text, QColor(Qt.white if (r + g + b)/3.0 < 128 else Qt.black))
+        col = QColor(r, g, b)
+        pal.setColor(pal.Base, col)
+        dark = (r + g + b)/3.0 < 128
+        pal.setColor(pal.Text, QColor(Qt.white if dark else Qt.black))
         self.setPalette(pal)
+        self.delegate.highlight_color = pal.color(pal.Text)
 
     def refresh_settings(self):
         if gprefs['cover_grid_width'] != self.delegate.original_width or gprefs['cover_grid_height'] != self.delegate.original_height:

From 5c7124b999cd7ae704327fb511c599d7e49795a3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 16:52:42 +0530
Subject: [PATCH 0487/1154] Ensure that text is anti-aliased in the grid view

---
 src/calibre/gui2/library/alternate_views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index bcbc99d57c..4733518889 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -409,6 +409,7 @@ class CoverDelegate(QStyledItemDelegate):
             if cdata is None or cdata is False:
                 title = db.field_for('title', book_id, default_value='')
                 authors = ' & '.join(db.field_for('authors', book_id, default_value=()))
+                painter.setRenderHint(QPainter.TextAntialiasing, True)
                 painter.drawText(rect, Qt.AlignCenter|Qt.TextWordWrap, '%s\n\n%s' % (title, authors))
                 if cdata is False:
                     self.render_queue.put(book_id)

From a0fb42865d37ac2b2fb399e7ddaac3740b05df4b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 21:46:46 +0530
Subject: [PATCH 0488/1154] Add an icon for the sort by context menu entry

---
 src/calibre/gui2/library/alternate_views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 4733518889..80988f2296 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -16,7 +16,7 @@ from functools import wraps, partial
 
 from PyQt4.Qt import (
     QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
-    QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication, QMimeData,
+    QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication, QMimeData, QIcon,
     QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QPropertyAnimation, QEasingCurve)
 
 from calibre import fit_image
@@ -621,7 +621,7 @@ class GridView(QListView):
 
             for ac in self.context_menu.actions():
                 menu.addAction(ac)
-            menu.addMenu(sm)
+            menu.addMenu(sm).setIcon(QIcon(I('arrow-up.png')))
             menu.popup(event.globalPos())
             event.accept()
 

From 727944a4b5cbb9cfdd4339f639d8b59ba4259c01 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Aug 2013 21:51:56 +0530
Subject: [PATCH 0489/1154] Update Telegraph UK

---
 recipes/telegraph_uk.recipe | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/recipes/telegraph_uk.recipe b/recipes/telegraph_uk.recipe
index 347352d424..57a2068b62 100644
--- a/recipes/telegraph_uk.recipe
+++ b/recipes/telegraph_uk.recipe
@@ -12,7 +12,8 @@ class TelegraphUK(BasicNewsRecipe):
     description           = 'News from United Kingdom'
     oldest_article        = 2
     category              = 'news, politics, UK'
-    publisher             = 'Telegraph Media Group ltd.'    
+    publisher             = 'Telegraph Media Group ltd.'
+    compress_news_images  = True
     max_articles_per_feed = 100
     no_stylesheets        = True
     language              = 'en_GB'
@@ -34,30 +35,30 @@ class TelegraphUK(BasicNewsRecipe):
                         , 'publisher' : publisher
                         , 'language'  : language
                         }
-                        
-                        
+
     keep_only_tags      = [
                            dict(name='div', attrs={'class':['storyHead','byline']})
-                          ,dict(name='div', attrs={'id':'mainBodyArea'           })
+                          ,dict(name='div', attrs={'id':'mainBodyArea'})
                           ]
-    remove_tags         = [dict(name='div', attrs={'class':['related_links_inline',"imgindex","next","prev","gutterUnder",'ssImgHide','imageExtras','ssImg hide','related_links_video']})
+    remove_tags         = [dict(name='div', attrs={
+        'class':['related_links_inline',"imgindex","next","prev","gutterUnder",'ssImgHide','imageExtras','ssImg hide','related_links_video']})
                           ,dict(name='ul' , attrs={'class':['shareThis shareBottom']})
                           ,dict(name='span', attrs={'class':['num','placeComment']})
                           ]
 
     feeds               = [
-                         (u'UK News'        , u'http://www.telegraph.co.uk/news/uknews/rss'                                      )
-                        ,(u'World News'     , u'http://www.telegraph.co.uk/news/worldnews/rss'                                   )
-                        ,(u'Politics'       , u'http://www.telegraph.co.uk/news/newstopics/politics/rss'                         )
-                        ,(u'Finance'        , u'http://www.telegraph.co.uk/finance/rss'                                          )
-                        ,(u'Technology News', u'http://www.telegraph.co.uk/scienceandtechnology/technology/technologynews/rss'   )
+                         (u'UK News'        , u'http://www.telegraph.co.uk/news/uknews/rss')
+                        ,(u'World News'     , u'http://www.telegraph.co.uk/news/worldnews/rss')
+                        ,(u'Politics'       , u'http://www.telegraph.co.uk/news/newstopics/politics/rss')
+                        ,(u'Finance'        , u'http://www.telegraph.co.uk/finance/rss')
+                        ,(u'Technology News', u'http://www.telegraph.co.uk/scienceandtechnology/technology/technologynews/rss')
                         ,(u'UK News'        , u'http://www.telegraph.co.uk/scienceandtechnology/technology/technologyreviews/rss')
-                        ,(u'Science News'   , u'http://www.telegraph.co.uk/scienceandtechnology/science/sciencenews/rss'         )
-                        ,(u'Sport'          , u'http://www.telegraph.co.uk/sport/rss'                                            )
-                        ,(u'Earth News'     , u'http://www.telegraph.co.uk/earth/earthnews/rss'                                  )
-                        ,(u'Comment'        , u'http://www.telegraph.co.uk/comment/rss'                                          )
-                        ,(u'Travel'        , u'http://www.telegraph.co.uk/travel/rss'                                            )
-                        ,(u'How about that?', u'http://www.telegraph.co.uk/news/newstopics/howaboutthat/rss'                     )
+                        ,(u'Science News'   , u'http://www.telegraph.co.uk/scienceandtechnology/science/sciencenews/rss')
+                        ,(u'Sport'          , u'http://www.telegraph.co.uk/sport/rss')
+                        ,(u'Earth News'     , u'http://www.telegraph.co.uk/earth/earthnews/rss')
+                        ,(u'Comment'        , u'http://www.telegraph.co.uk/comment/rss')
+                        ,(u'Travel'        , u'http://www.telegraph.co.uk/travel/rss')
+                        ,(u'How about that?', u'http://www.telegraph.co.uk/news/newstopics/howaboutthat/rss')
                          ]
     def populate_article_metadata(self, article, soup, first):
         if first and hasattr(self, 'add_toc_thumbnail'):
@@ -70,3 +71,4 @@ class TelegraphUK(BasicNewsRecipe):
         if 'picture-galleries' in url or 'pictures' in url or 'picturegalleries' in url :
             url = None
         return url
+

From 1294635c25d43c4df1b14b8103ec15dc121377c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Tue, 6 Aug 2013 20:47:23 +0200
Subject: [PATCH 0490/1154] fix detection of discounted price in koobe

---
 src/calibre/gui2/store/stores/koobe_plugin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/store/stores/koobe_plugin.py b/src/calibre/gui2/store/stores/koobe_plugin.py
index b8b7386593..0b8ee8f719 100644
--- a/src/calibre/gui2/store/stores/koobe_plugin.py
+++ b/src/calibre/gui2/store/stores/koobe_plugin.py
@@ -62,6 +62,8 @@ class KoobeStore(BasicStoreConfig, StorePlugin):
 
                     cover_url = ''.join(data.xpath('.//div[@class="cover"]/a/img/@src'))
                     price = ''.join(data.xpath('.//span[@class="current_price"]/text()'))
+                    if not price:
+                        price = ''.join(data.xpath('.//div[@class="book_promo_price"]/span/text()'))
                     title = ''.join(data.xpath('.//h2[@class="title"]/a/text()'))
                     author = ', '.join(data.xpath('.//h3[@class="book_author"]/a/text()'))
                     formats = ', '.join(data.xpath('.//div[@class="formats"]/div/div/@title'))

From 7fb0bf9c0ffe57f9718a6966caa68e0f00ae255b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Tue, 6 Aug 2013 20:51:45 +0200
Subject: [PATCH 0491/1154] bump up koobe plugin version

---
 src/calibre/gui2/store/stores/koobe_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/store/stores/koobe_plugin.py b/src/calibre/gui2/store/stores/koobe_plugin.py
index 0b8ee8f719..d767a832cb 100644
--- a/src/calibre/gui2/store/stores/koobe_plugin.py
+++ b/src/calibre/gui2/store/stores/koobe_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3  # Needed for dynamic plugin loading
+store_version = 4  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2013, Tomasz Długosz <tomek3d@gmail.com>'

From d9ab10dd1613a42c6422eab4b6a73f6ab7e0eac1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Aug 2013 08:06:57 +0530
Subject: [PATCH 0492/1154] Make the sort sub menu a little clearer

---
 src/calibre/gui2/library/alternate_views.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 80988f2296..d5c7472d84 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -616,8 +616,10 @@ class GridView(QListView):
                 extra = ''
                 if last[0] == col:
                     ascending = not last[1]
-                    extra = ' [%s]' % _('reverse')
-                sm.addAction('%s%s' % (m.get('name', col), extra), partial(self.do_sort, col, ascending))
+                    extra = ' [%s]' % _('reverse current sort')
+                ac = sm.addAction('%s%s' % (m.get('name', col), extra), partial(self.do_sort, col, ascending))
+                if last[0] == col:
+                    ac.setIcon(QIcon(I('ok.png')))
 
             for ac in self.context_menu.actions():
                 menu.addAction(ac)

From 6ce79b2d96eb58690e68266499f34b48ba1d489c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Aug 2013 09:44:17 +0530
Subject: [PATCH 0493/1154] Grid View: Do not render covers while user is using
 slider on scrollbar

---
 src/calibre/gui2/library/alternate_views.py | 33 +++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index d5c7472d84..193afb5c95 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -468,6 +468,39 @@ class GridView(QListView):
         self.setCursor(Qt.PointingHandCursor)
         self.gui = parent
         self.context_menu = None
+        self.verticalScrollBar().sliderPressed.connect(self.slider_pressed)
+        self.verticalScrollBar().sliderReleased.connect(self.slider_released)
+
+    @property
+    def first_visible_row(self):
+        geom = self.viewport().geometry()
+        for y in xrange(geom.top(), (self.spacing()*2) + geom.top(), 5):
+            for x in xrange(geom.left(), (self.spacing()*2) + geom.left(), 5):
+                ans = self.indexAt(QPoint(x, y)).row()
+                if ans > -1:
+                    return ans
+
+    @property
+    def last_visible_row(self):
+        geom = self.viewport().geometry()
+        for y in xrange(geom.bottom(), geom.bottom() - 2 * self.spacing(), -5):
+            for x in xrange(geom.left(), (self.spacing()*2) + geom.left(), 5):
+                ans = self.indexAt(QPoint(x, y)).row()
+                if ans > -1:
+                    item_width = self.delegate.item_size.width() + 2*self.spacing()
+                    return ans + (geom.width() // item_width)
+
+    def update_viewport(self):
+        m = self.model()
+        for r in xrange(self.first_visible_row or 0, self.last_visible_row or (m.count() - 1)):
+            self.update(m.index(r, 0))
+
+    def slider_pressed(self):
+        self.ignore_render_requests.set()
+
+    def slider_released(self):
+        self.ignore_render_requests.clear()
+        self.update_viewport()
 
     def double_clicked(self, index):
         d = self.delegate

From 798eb321d8a9b20e4c3ea145b0c4b288cdcb368f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Aug 2013 09:54:25 +0530
Subject: [PATCH 0494/1154] Grid View: Delay rendering on wheel events

Ignore continuous wheel events, only rendering after the "last" wheel
event, where two wheel event are continuous if they occur within 200
msecs of each other.
---
 src/calibre/gui2/library/alternate_views.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 193afb5c95..656d8baaff 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -15,7 +15,7 @@ from Queue import Queue
 from functools import wraps, partial
 
 from PyQt4.Qt import (
-    QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
+    QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal, QTimer,
     QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication, QMimeData, QIcon,
     QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QPropertyAnimation, QEasingCurve)
 
@@ -470,6 +470,10 @@ class GridView(QListView):
         self.context_menu = None
         self.verticalScrollBar().sliderPressed.connect(self.slider_pressed)
         self.verticalScrollBar().sliderReleased.connect(self.slider_released)
+        self.update_timer = QTimer(self)
+        self.update_timer.setInterval(200)
+        self.update_timer.timeout.connect(self.update_viewport)
+        self.update_timer.setSingleShot(True)
 
     @property
     def first_visible_row(self):
@@ -491,6 +495,7 @@ class GridView(QListView):
                     return ans + (geom.width() // item_width)
 
     def update_viewport(self):
+        self.ignore_render_requests.clear()
         m = self.model()
         for r in xrange(self.first_visible_row or 0, self.last_visible_row or (m.count() - 1)):
             self.update(m.index(r, 0))
@@ -502,6 +507,11 @@ class GridView(QListView):
         self.ignore_render_requests.clear()
         self.update_viewport()
 
+    def wheelEvent(self, e):
+        self.ignore_render_requests.set()
+        QListView.wheelEvent(self, e)
+        self.update_timer.start()
+
     def double_clicked(self, index):
         d = self.delegate
         if d.animating is None and not config['disable_animations']:

From 05572d975af092ce3e9a2318ef3d41ad9d6c53e9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Aug 2013 10:52:04 +0530
Subject: [PATCH 0495/1154] Allow skipping the confirm bulk reconvert dialog

When bulk converting previously converted books, calibre asks for a
confirmation. Make this confirmation dialog skippable.
---
 src/calibre/gui2/tools.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py
index 32e3174c8d..db15837227 100644
--- a/src/calibre/gui2/tools.py
+++ b/src/calibre/gui2/tools.py
@@ -373,9 +373,9 @@ def convert_existing(parent, db, book_ids, output_format):  # {{{
 
     if already_converted_ids:
         if not question_dialog(parent, _('Convert existing'),
-                _('The following books have already been converted to %s format. '
-                   'Do you wish to reconvert them?') % output_format,
-                '\n'.join(already_converted_titles)):
+                _('The following books have already been converted to the %s format. '
+                   'Do you wish to reconvert them?') % output_format.upper(),
+                det_msg='\n'.join(already_converted_titles), skip_dialog_name='confirm_bulk_reconvert'):
             book_ids = [x for x in book_ids if x not in already_converted_ids]
 
     return book_ids

From c4a82de4c7ae655d1e2cf3bcb1eed08ad832e63f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Aug 2013 12:50:24 +0530
Subject: [PATCH 0496/1154] Confirm quit while delete in progress

---
 src/calibre/db/delete_service.py | 5 +++++
 src/calibre/gui2/ui.py           | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/calibre/db/delete_service.py b/src/calibre/db/delete_service.py
index a79afc7d4b..ce5578f888 100644
--- a/src/calibre/db/delete_service.py
+++ b/src/calibre/db/delete_service.py
@@ -113,4 +113,9 @@ def shutdown(timeout=20):
         __ds.shutdown(timeout)
         __ds = None
 
+def has_jobs():
+    global __ds
+    if __ds is not None:
+        return (not __ds.requests.empty()) or __ds.requests.unfinished_tasks
+    return False
 
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 90eac209b2..196de7cb6a 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -809,6 +809,14 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
 
             if not question_dialog(self, _('Active jobs'), msg):
                 return False
+        from calibre.db.delete_service import has_jobs
+        if has_jobs():
+            msg = _('Some deleted books are still being moved to the Recycle '
+                    'Bin, if you quit now, they will be left behind. Are you '
+                    'sure you want to quit?')
+            if not question_dialog(self, _('Active jobs'), msg):
+                return False
+
         return True
 
     def shutdown(self, write_settings=True):

From 8b5e9ed035d1610a77e59cf283092eb244f986d3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Aug 2013 16:33:43 +0530
Subject: [PATCH 0497/1154] Add Sort By context menu entry

A new "Sort By" action for the right click menu. This allows sorting on all columns in the library,
not just the visible columns. To use it go to Preferences->Toolbars and
add it to "The context menu for books in the calibre library"
---
 src/calibre/customize/builtins.py           |  6 +-
 src/calibre/gui2/actions/sort.py            | 79 +++++++++++++++++++++
 src/calibre/gui2/library/alternate_views.py | 33 +++------
 src/calibre/gui2/library/views.py           |  5 ++
 4 files changed, 98 insertions(+), 25 deletions(-)
 create mode 100644 src/calibre/gui2/actions/sort.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 3e573be026..0812325157 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -912,6 +912,10 @@ class ActionPickRandom(InterfaceActionBase):
     actual_plugin = 'calibre.gui2.actions.random:PickRandomAction'
     description = _('Choose a random book from your calibre library')
 
+class ActionSortBy(InterfaceActionBase):
+    name = 'Sort By'
+    actual_plugin = 'calibre.gui2.actions.sort:SortByAction'
+    description = _('Sort the list of books')
 
 class ActionStore(InterfaceActionBase):
     name = 'Store'
@@ -943,7 +947,7 @@ plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionSendToDevice, ActionHelp, ActionPreferences, ActionSimilarBooks,
         ActionAddToLibrary, ActionEditCollections, ActionMatchBooks, ActionChooseLibrary,
         ActionCopyToLibrary, ActionTweakEpub, ActionNextMatch, ActionStore,
-        ActionPluginUpdater, ActionPickRandom, ActionEditToC]
+        ActionPluginUpdater, ActionPickRandom, ActionEditToC, ActionSortBy]
 
 # }}}
 
diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
new file mode 100644
index 0000000000..14bd641020
--- /dev/null
+++ b/src/calibre/gui2/actions/sort.py
@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from PyQt4.Qt import QToolButton, QAction, pyqtSignal, QIcon
+
+from calibre.gui2.actions import InterfaceAction
+from calibre.utils.icu import sort_key
+
+class SortAction(QAction):
+
+    sort_requested = pyqtSignal(object, object)
+
+    def __init__(self, text, key, ascending, parent):
+        QAction.__init__(self, text, parent)
+        self.key, self.ascending = key, ascending
+        self.triggered.connect(self)
+
+    def __call__(self):
+        self.sort_requested(self.key, self.ascending)
+
+class SortByAction(InterfaceAction):
+
+    name = 'Sort By'
+    action_spec = (_('Sort By'), 'arrow-up.png', _('Sort the list of books'), None)
+    action_type = 'current'
+    popup_type = QToolButton.InstantPopup
+    action_add_menu = True
+    dont_add_to = frozenset([
+        'toolbar', 'toolbar-device', 'context-menu-device', 'toolbar-child',
+        'menubar', 'menubar-device', 'context-menu-cover-browser'])
+
+    def genesis(self):
+        self.sorted_icon = QIcon(I('ok.png'))
+
+    def location_selected(self, loc):
+        self.qaction.setEnabled(loc == 'library')
+
+    def update_menu(self):
+        menu = self.qaction.menu()
+        for action in menu.actions():
+            action.sort_requested.disconnect()
+        menu.clear()
+        lv = self.gui.library_view
+        m = lv.model()
+        db = m.db
+        try:
+            sort_col, order = m.sorted_on
+        except TypeError:
+            sort_col, order = 'date', True
+        fm = db.field_metadata
+        name_map = {fm[k]['name']:k for k in fm.sortable_field_keys() if fm[k]['name']}
+        self._sactions = []
+        for name in sorted(name_map, key=sort_key):
+            key = name_map[name]
+            if key == 'title':
+                continue
+            if key == 'sort':
+                name = _('Title')
+            if key == 'ondevice' and self.gui.device_connected is None:
+                    continue
+            ascending = True
+            if key == sort_col:
+                name = _('%s [reverse current sort]') % name
+                ascending = not order
+            sac = SortAction(name, key, ascending, menu)
+            if key == sort_col:
+                sac.setIcon(self.sorted_icon)
+            sac.sort_requested.connect(self.sort_requested)
+            menu.addAction(sac)
+
+    def sort_requested(self, key, ascending):
+        self.gui.library_view.sort_by_named_field(key, ascending)
+
+
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 656d8baaff..ec3a788017 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -15,9 +15,10 @@ from Queue import Queue
 from functools import wraps, partial
 
 from PyQt4.Qt import (
-    QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal, QTimer,
-    QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication, QMimeData, QIcon,
-    QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QPropertyAnimation, QEasingCurve)
+    QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
+    QTimer, QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication,
+    QMimeData, QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty,
+    QPropertyAnimation, QEasingCurve)
 
 from calibre import fit_image
 from calibre.gui2 import gprefs, config
@@ -215,7 +216,6 @@ class AlternateViews(object):
         view.setModel(self.main_view._model)
         view.selectionModel().currentChanged.connect(self.slave_current_changed)
         view.selectionModel().selectionChanged.connect(self.slave_selection_changed)
-        view.sort_requested.connect(self.main_view.sort_by_named_field)
         view.files_dropped.connect(self.main_view.files_dropped)
 
     def show_view(self, key=None):
@@ -440,7 +440,6 @@ def join_with_timeout(q, timeout=2):
 class GridView(QListView):
 
     update_item = pyqtSignal(object)
-    sort_requested = pyqtSignal(object, object)
     files_dropped = pyqtSignal(object)
 
     def __init__(self, parent):
@@ -648,31 +647,17 @@ class GridView(QListView):
 
     def contextMenuEvent(self, event):
         if self.context_menu is not None:
-            lv = self.gui.library_view
             menu = self._temp_menu = QMenu(self)
-            sm = QMenu(_('Sort by'), menu)
-            db = self.model().db
-            for col in lv.visible_columns:
-                m = db.metadata_for_field(col)
-                last = self.model().sorted_on
-                ascending = True
-                extra = ''
-                if last[0] == col:
-                    ascending = not last[1]
-                    extra = ' [%s]' % _('reverse current sort')
-                ac = sm.addAction('%s%s' % (m.get('name', col), extra), partial(self.do_sort, col, ascending))
-                if last[0] == col:
-                    ac.setIcon(QIcon(I('ok.png')))
-
+            sac = self.gui.iactions['Sort By']
+            sort_added = tuple(ac for ac in self.context_menu.actions() if ac is sac.qaction)
+            if not sort_added:
+                menu.addAction(sac.qaction)
             for ac in self.context_menu.actions():
                 menu.addAction(ac)
-            menu.addMenu(sm).setIcon(QIcon(I('arrow-up.png')))
+            sac.update_menu()
             menu.popup(event.globalPos())
             event.accept()
 
-    def do_sort(self, column, ascending):
-        self.sort_requested.emit(column, ascending)
-
     def get_selected_ids(self):
         m = self.model()
         return [m.id(i) for i in self.selectionModel().selectedIndexes()]
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 0b22999b27..34716445cc 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -157,6 +157,7 @@ class BooksView(QTableView):  # {{{
 
     def __init__(self, parent, modelcls=BooksModel, use_edit_metadata_dialog=True):
         QTableView.__init__(self, parent)
+        self.gui = parent
         self.setProperty('highlight_current_item', 150)
         self.row_sizing_done = False
         self.alternate_views = AlternateViews(self)
@@ -713,6 +714,10 @@ class BooksView(QTableView):  # {{{
         self.edit_collections_action = edit_collections_action
 
     def contextMenuEvent(self, event):
+        sac = self.gui.iactions['Sort By']
+        sort_added = tuple(ac for ac in self.context_menu.actions() if ac is sac.qaction)
+        if sort_added:
+            sac.update_menu()
         self.context_menu.popup(event.globalPos())
         event.accept()
     # }}}

From 39e76dfedf77b0145315d53c38bb525422365014 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Aug 2013 21:36:10 +0530
Subject: [PATCH 0498/1154] La Capital de Rosario by Darko Miletic

Fixes #1209289 [New recipe for La Capital de Rosario](https://bugs.launchpad.net/calibre/+bug/1209289)
---
 recipes/icons/lacapital.png | Bin 0 -> 1120 bytes
 recipes/lacapital.recipe    |  76 ++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 recipes/icons/lacapital.png
 create mode 100644 recipes/lacapital.recipe

diff --git a/recipes/icons/lacapital.png b/recipes/icons/lacapital.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b245e6874cfef054be50a14e2df5885d1bbd550
GIT binary patch
literal 1120
zcmcgq`Crp@9R7UeNT4aGX=>qtfh9&sQG%G_xQqxnr4o@cgzT`>3L>T;W1IsQ#wj3R
z0)c=W0&W}|C=9lJ`A*pZY-9HgY%pNo=0DN<^}L_=>v?{8|L{Ecu+Tt^{Vsa|046vH
z8*aId&v&Dhg%2Ly907n82n&hyw@4I4ZOai<aQfPa997qmh5AzuL{k#FGj71W0+A_{
z@x$tBL<KS#h|0L5ekQg<z?&6#H}F;$_1j5o*^=o#M?qw%FH=N^n)u;lsRMp=OsEWP
zncZK*wJn@7Yg=bkdTirNT)#MZM5WW|5s|!<A=R&}ZYrd^l)`lBl4L=1v}N|}psItf
zPZ^e&Os3Rvg*|~8(mS6wuD}!{*lvYqBOm0lY;qsZ>6YDVI87Yw#bH@=8<)UR8w`fy
z&0OmIVg_BQRjJ%6r(vZou3I1wiahIhKJB81v${Pc>^`v}qHS(TtL~gpVOx3U2IZtl
zC4NkXuC9osvVb083|Z<?_AFsQ;zVK}s6>+c=B;lb^9!a+6tQzHC$?*5eSHn!VY^J)
ziFUz-UQyDJES)N`FM^j1`kf_guV#KwkJz;wZsTebX$rkYV^siqR8RZf<%4X7Z86N(
zF1uGvd)4y-ItA85_O_Cz=LaNdLsF1Gl|WOc&}7DCqeiRSkOSKh5e#v1-yP1eHbG#Q
zD4HTqc_L4vNkJCVA(!b|g?Kg2_}!Z+o>cg?3&UFG&h$&uX|gDaG<HytG@?M!bwFTk
zC9xBS6<Up!tzL%mV4DKCnXB<{;+s+P+S;1Yuw*bAHENZ3VFlzcp&XVCaf&Wm92PCQ
zR3L6uoDQDuNE6?;fp>F4>E9^~ZJi5$B#9!+P}FQjQIlzP$zagvbl?U9WHA8V0w%z-
zKsFO(vjBk!2r$TDK?D|CWdyk}$g^My<ik)N3$k#&<<}CX2yr4ITS#p8+tVJ^9G?bW
z1X&tGky~o{|4c@DWEcR@?qKZ6$g5?LBcw5d2C{=+W_{m2E1R!R-@X`d2K;m6>?7Bh
z^1~a0s@=9^yt)Ip_TJleH~i!e@0V7+c53JKqu|H>{Rdyp;g)q>dibKpuJmAV;tPMr
z<j;B{b4hQ$dyVsL61Y#y`#iz(yH84X#}e%AUfBQ+UHPEn&jUrNFNEx=ZBF$06}%Dm
zclIA6<3H`CZfY8ujAsFS#K&HpTPtvb&oFOATmN1G{(b2y$SZVw^yk;3K7G6Q0ToOP
z`$E$LxPs%`8AF42eyISs(G<vqI+69;M?*{oqqfFkd<Yd&&fSDt2ED2IPagx^jXKEr
zov_yPkW*pzg>Sq;Qy})3ZTr~wPi{53Z~p5`9H`k_ImJ#xF4M18w!KHg;jDtMtX}U;
QH9ij{*gq88>=%#w4^h%VE&u=k

literal 0
HcmV?d00001

diff --git a/recipes/lacapital.recipe b/recipes/lacapital.recipe
new file mode 100644
index 0000000000..0c9553903c
--- /dev/null
+++ b/recipes/lacapital.recipe
@@ -0,0 +1,76 @@
+__license__   = 'GPL v3'
+__copyright__ = '2013, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.lacapital.com.ar
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class LaCapital(BasicNewsRecipe):
+    title                 = 'La Capital de Rosario'
+    __author__            = 'Darko Miletic'
+    description           = 'Noticias, actualidad y toda la informacion de Rosario y la region'
+    publisher             = 'Diario La Capital S. A.'
+    category              = 'news, politics, Rosario, Santa Fe, Argentina'
+    oldest_article        = 2
+    max_articles_per_feed = 200
+    no_stylesheets        = True
+    encoding              = 'utf8'
+    use_embedded_content  = False
+    language              = 'es_AR'
+    remove_empty_feeds    = True
+    publication_type      = 'newspaper'
+    masthead_url          = 'http://www.lacapital.com.ar/system/modules/com.tfsla.diario.core/resources/images/logoLaCapital_noCom.png'
+    extra_css             = """
+                               body{font-family: Georgia,"Times New Roman",Times,serif }
+                               img{margin-bottom: 0.4em; display:block}
+                            """
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+
+    keep_only_tags=[dict(attrs={'class':'leer'})]
+    remove_tags_after=dict(attrs={'class':'notaA'})
+    remove_tags = [
+                     dict(name=['meta','link','iframe','object'])
+                    ,dict(name='div', attrs={'class':['herramientas','almargen','relacionadas']})
+                  ]
+
+
+    feeds = [
+              (u'Portada'             , u'http://www.lacapital.com.ar/rss/home.xml'            )
+             ,(u'La Ciudad'           , u'http://www.lacapital.com.ar/rss/laciudad.xml'        )
+             ,(u'Politica'            , u'http://www.lacapital.com.ar/rss/politica.xml'        )
+             ,(u'Economia'            , u'http://www.lacapital.com.ar/rss/economia.xml'        )
+             ,(u'La Region'           , u'http://www.lacapital.com.ar/rss/laregion.xml'        )
+             ,(u'Informacion General' , u'http://www.lacapital.com.ar/rss/informaciongral.xml' )
+             ,(u'El Mundo'            , u'http://www.lacapital.com.ar/rss/elmundo.xml'         )
+             ,(u'Opinion'             , u'http://www.lacapital.com.ar/rss/opinion.xml'         )
+             ,(u'Cartas de lectores'  , u'http://www.lacapital.com.ar/rss/cartasdelectores.xml')
+             ,(u'Escenario'           , u'http://www.lacapital.com.ar/rss/escenario.xml'       )
+             ,(u'Policiales'          , u'http://www.lacapital.com.ar/rss/policiales.xml'      )
+             ,(u'Ovacion'             , u'http://www.lacapital.com.ar/rss/ovacion.xml'         )
+             ,(u'Turismo'             , u'http://www.lacapital.com.ar/rss/turismo.xml'         )
+             ,(u'Economia'            , u'http://www.lacapital.com.ar/rss/economia.xml'        )
+             ,(u'Señales'             , u'http://www.lacapital.com.ar/rss/senales.xml'         )
+             ,(u'Educacion'           , u'http://www.lacapital.com.ar/rss/educacion.xml'       )
+             ,(u'Estilo'              , u'http://www.lacapital.com.ar/rss/estilo.xml'          )
+             ,(u'Salud'               , u'http://www.lacapital.com.ar/rss/salud.xml'           )
+             ,(u'Tecnologia'          , u'http://www.lacapital.com.ar/rss/tecnologia.xml'      )
+            ]
+
+    def get_cover_url(self):
+        soup = self.index_to_soup('http://www.lacapital.com.ar/impresa/tapa.html')
+        for image in soup.findAll('img',alt=True):
+           if image['alt'].startswith('Tapa de papel'):
+              return image['src']
+        return None
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup

From 6640ca524281a56c17c2bed1fc1f2e8127c71a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 7 Aug 2013 21:24:57 +0200
Subject: [PATCH 0499/1154] ebookpoint plugin: fix detecting author for cases
 where the name is a link

---
 src/calibre/gui2/store/stores/ebookpoint_plugin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/store/stores/ebookpoint_plugin.py b/src/calibre/gui2/store/stores/ebookpoint_plugin.py
index d0306a45ee..dd8f45d4ae 100644
--- a/src/calibre/gui2/store/stores/ebookpoint_plugin.py
+++ b/src/calibre/gui2/store/stores/ebookpoint_plugin.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 1 # Needed for dynamic plugin loading
+store_version = 2 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
-__copyright__ = '2011-2012, Tomasz Długosz <tomek3d@gmail.com>'
+__copyright__ = '2011-2013, Tomasz Długosz <tomek3d@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
 import re
@@ -62,7 +62,7 @@ class EbookpointStore(BasicStoreConfig, StorePlugin):
                 cover_url = ''.join(data.xpath('.//a[@class="cover"]/img/@src'))
                 title = ''.join(data.xpath('.//h3/a/@title'))
                 title = re.sub('eBook.', '', title)
-                author = ''.join(data.xpath('.//p[@class="author"]/text()'))
+                author = ''.join(data.xpath('.//p[@class="author"]//text()'))
                 price = ''.join(data.xpath('.//p[@class="price"]/ins/text()'))
 
                 formats = ', '.join(data.xpath('.//div[@class="ikony"]/span/text()'))

From a8f29d9159ec5d04c202a0177b050238cda51788 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 08:03:26 +0530
Subject: [PATCH 0500/1154] Update The Sunday Times UK and The Times Online

Fixes #1208519 [Private bug](https://bugs.launchpad.net/calibre/+bug/1208519)
---
 recipes/sunday_times.recipe | 4 ++--
 recipes/times_online.recipe | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/sunday_times.recipe b/recipes/sunday_times.recipe
index 2ffb65423d..c4cdbcbd85 100644
--- a/recipes/sunday_times.recipe
+++ b/recipes/sunday_times.recipe
@@ -1,6 +1,6 @@
 
 __license__   = 'GPL v3'
-__copyright__ = '2010-2012, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2010-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
 www.thesundaytimes.co.uk
 '''
@@ -50,7 +50,7 @@ class TimesOnline(BasicNewsRecipe):
                                      ,'username':self.username
                                      ,'password':self.password
                                    })
-            br.open('https://acs.thetimes.co.uk/user/login',data)
+            br.open('https://login.thetimes.co.uk/',data)
         return br
 
     remove_tags      = [
diff --git a/recipes/times_online.recipe b/recipes/times_online.recipe
index 2213c3a116..318c1c7508 100644
--- a/recipes/times_online.recipe
+++ b/recipes/times_online.recipe
@@ -1,6 +1,6 @@
 
 __license__   = 'GPL v3'
-__copyright__ = '2009-2012, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
 www.thetimes.co.uk
 '''
@@ -49,7 +49,7 @@ class TimesOnline(BasicNewsRecipe):
                                      ,'username':self.username
                                      ,'password':self.password
                                    })
-            br.open('https://acs.thetimes.co.uk/user/login',data)
+            br.open('https://login.thetimes.co.uk/',data)
         return br
 
     remove_tags      = [

From b29c4fa56d8846d835c1b91e7b9502a22be33b47 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 08:46:19 +0530
Subject: [PATCH 0501/1154] Various Frech news sources by Malah

---
 recipes/gamekult.recipe              | 36 ++++++++++++++++++++
 recipes/jeuxvideo.recipe             | 44 +++++++++++++++++++++++++
 recipes/le_gorafi.recipe             | 34 +++++++++++++++++++
 recipes/le_nouvel_observateur.recipe | 49 ++++++++++++++++++++++++++++
 4 files changed, 163 insertions(+)
 create mode 100644 recipes/gamekult.recipe
 create mode 100644 recipes/jeuxvideo.recipe
 create mode 100644 recipes/le_gorafi.recipe
 create mode 100644 recipes/le_nouvel_observateur.recipe

diff --git a/recipes/gamekult.recipe b/recipes/gamekult.recipe
new file mode 100644
index 0000000000..0b528fe196
--- /dev/null
+++ b/recipes/gamekult.recipe
@@ -0,0 +1,36 @@
+from __future__ import unicode_literals
+__license__   = 'GPL v3'
+__copyright__ = '2013, Malah <malah at neuf dot fr>'
+'''
+Gamekult.com
+'''
+
+__author__ = '2013, Malah <malah at neuf dot fr>'
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class GamekultCom(BasicNewsRecipe):
+    title          = u'Gamekult.com'
+    __author__ = 'Malah'
+    description = u'Toute l`actualité du jeu vidéo PC, consoles, mobiles.'
+    oldest_article = 1.5
+    language = 'fr'
+    max_articles_per_feed = 100
+    remove_empty_feeds = True
+    use_embedded_content = False
+    no_stylesheets = True
+    ignore_duplicate_articles = {'title', 'url'}
+    keep_only_tags = [dict(id=['story-page','story-body'])]
+    remove_tags = [
+      dict(name='div', attrs={'class':'sharebar'}),
+      dict(name='object', attrs={'type':'application/x-shockwave-flash'}),
+      dict(name='span', attrs={'class':'share'}),
+      dict(name='div', attrs={'class':'story-pagination'}),
+      dict(name='div', attrs={'class':'pagination pagination-centered'}),
+    ]
+
+    masthead_url       = u'https://upload.wikimedia.org/wikipedia/fr/9/9c/Logo_-_GAMEKULT.png'
+
+    feeds =  [
+      ('Test', u'http://www.gamekult.com/feeds/test.html'),
+      ('Actu', u'http://www.gamekult.com/feeds/actu.html'),
+    ]
diff --git a/recipes/jeuxvideo.recipe b/recipes/jeuxvideo.recipe
new file mode 100644
index 0000000000..a41fe94753
--- /dev/null
+++ b/recipes/jeuxvideo.recipe
@@ -0,0 +1,44 @@
+from __future__ import unicode_literals
+__license__   = 'GPL v3'
+__copyright__ = '2013, Malah <malah at neuf dot fr>'
+'''
+JeuxVideo.com
+'''
+
+__author__ = '2013, Malah <malah at neuf dot fr>'
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class JeuxVideoCom(BasicNewsRecipe):
+    title          = 'JeuxVideo.com'
+    __author__ = 'Malah'
+    description = 'La Référence des Jeux Vidéo sur PC et Consoles !'
+    oldest_article = 1.5
+    language = 'fr'
+    max_articles_per_feed = 100
+    remove_empty_feeds = True
+    use_embedded_content = False
+    no_stylesheets = True
+    ignore_duplicate_articles = {'title', 'url'}
+    keep_only_tags = [dict(id=['news_detail','test_txt','test_avis'])]
+    remove_tags = [
+        dict(name='div', attrs={'id':'player_video_article'}),
+        dict(name='div', attrs={'class':'liste-fiches'})
+    ]
+    masthead_url       = u'https://upload.wikimedia.org/wikipedia/commons/3/39/Jeuxvideocom.png'
+    feeds =  [
+        (u'Section PC',u'http://www.jeuxvideo.com/rss/rss-pc.xml'),
+        (u'Section Xbox 360',u'http://www.jeuxvideo.com/rss/rss-360.xml'),
+        (u'Section PlayStation 3',u'http://www.jeuxvideo.com/rss/rss-ps3.xml'),
+        (u'Section Wii U',u'http://www.jeuxvideo.com/rss/rss-wiiu.xml'),
+        (u'Section Wii',u'http://www.jeuxvideo.com/rss/rss-wii.xml'),
+        (u'Section Nintendo 3DS',u'http://www.jeuxvideo.com/rss/rss-3ds.xml'),
+        (u'Section Nintendo DS',u'http://www.jeuxvideo.com/rss/rss-ds.xml'),
+        (u'Section PlayStation Vita',u'http://www.jeuxvideo.com/rss/rss-vita.xml'),
+        (u'Section PlayStation Protable',u'http://www.jeuxvideo.com/rss/rss-psp.xml'),
+        (u'Section Android',u'http://www.jeuxvideo.com/rss/rss-android.xml'),
+        (u'Section Iphone',u'http://www.jeuxvideo.com/rss/rss-iphone.xml'),
+        (u'Section Web',u'http://www.jeuxvideo.com/rss/rss-wb.xml'),
+        (u'Autres news', u'http://www.jeuxvideo.com/rss/rss-news.xml'),
+        (u'Autres vidéos', u'http://www.jeuxvideo.com/rss/rss-videos.xml'),
+        (u'Autres articles', u'http://www.jeuxvideo.com/rss/rss.xml'),
+    ]
diff --git a/recipes/le_gorafi.recipe b/recipes/le_gorafi.recipe
new file mode 100644
index 0000000000..d88d0affc2
--- /dev/null
+++ b/recipes/le_gorafi.recipe
@@ -0,0 +1,34 @@
+from __future__ import unicode_literals
+__license__   = 'GPL v3'
+__copyright__ = '2013, Malah <malah at neuf dot fr>'
+'''
+Le GORAFI.fr
+'''
+
+__author__ = '2013, Malah <malah at neuf dot fr>'
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class legorafi(BasicNewsRecipe):
+    title = u'Le GORAFI.fr'
+    __author__ = 'Malah'
+    description = u'Depuis 1826, toute l\'information de sources contradictoires'
+    oldest_article = 7
+    language = 'fr'
+    max_articles_per_feed = 100
+    use_embedded_content = False
+    no_stylesheets = True
+    keep_only_tags = [
+        dict(name='div', attrs={'class':'entry-content'}),
+        dict(name='h3', attrs={'id':'comments-title'}),
+    ]
+    remove_tags = [
+        dict(name='div', attrs={'id':'soshake-sharebox'}),
+        dict(name='div', attrs={'class':'social-ring'}),
+        dict(name='div', attrs={'class':'entry-utility'}),
+        dict(name='div', attrs={'id':'respond'}),
+    ]
+    masthead_url = u'http://web.gweno.free.fr/img/logositeter.png'
+    couverture_url = u'http://www.legorafi.fr/wp-content/uploads/2013/02/iconegorafi.png'
+    feeds =  [
+      (u'Articles', u'http://www.legorafi.fr/feed/'),
+    ]
diff --git a/recipes/le_nouvel_observateur.recipe b/recipes/le_nouvel_observateur.recipe
new file mode 100644
index 0000000000..b3a0460423
--- /dev/null
+++ b/recipes/le_nouvel_observateur.recipe
@@ -0,0 +1,49 @@
+from __future__ import unicode_literals
+__license__   = 'GPL v3'
+__copyright__ = '2013, Malah <malah at neuf dot fr>'
+'''
+Le Nouvel Observateur
+'''
+
+__author__ = '2013, Malah <malah at neuf dot fr>'
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class LeNouvelObs(BasicNewsRecipe):
+    title          = u'Le Nouvel Observateur'
+    __author__ = 'Malah'
+    description = u'Actualités en temps réel, Info à la Une'
+    oldest_article = 1
+    language = 'fr'
+    max_articles_per_feed = 25
+    use_embedded_content = False
+    ignore_duplicate_articles = ('title', 'url')
+    remove_empty_feeds = True
+    no_stylesheets = True
+    masthead_url       = u'https://upload.wikimedia.org/wikipedia/fr/f/f9/Le_Nouvel_observateur.png'
+    feeds          = [
+        (u'Politique', u'http://tempsreel.nouvelobs.com/politique/rss.xml'),
+        (u'Société', u'http://tempsreel.nouvelobs.com/societe/rss.xml'),
+        (u'Monde', u'http://tempsreel.nouvelobs.com/monde/rss.xml'),
+        (u'Economie', u'http://tempsreel.nouvelobs.com/economie/rss.xml'),
+        (u'Culture', u'http://tempsreel.nouvelobs.com/culture/rss.xml'),
+        (u'High Tech', u'http://obsession.nouvelobs.com/high-tech/rss.xml'),
+        (u'Education', u'http://tempsreel.nouvelobs.com/education/rss.xml'),
+        (u'Services', u'http://tempsreel.nouvelobs.com/services/rss.xml'),
+        (u'Sport', u'http://tempsreel.nouvelobs.com/sport/rss.xml'),
+        (u'CinéObs', u'http://cinema.nouvelobs.com/articles.rss'),
+        (u'TéléObs', u'http://teleobs.nouvelobs.com/rss.xml'),
+        (u'Autres Actualités',u'http://tempsreel.nouvelobs.com/rss.xml'),
+    ]
+    keep_only_tags = [
+        dict(name='h1', attrs={'id':'obs-article-title'}),
+        dict(name='div', attrs={'class':'obs-date'}),
+        dict(name='div', attrs={'class':'art-auteur'}),
+        dict(name='h2', attrs={'class':'obs-article-intro'}),
+        dict(name='div', attrs={'id':'obs-article-keywords'}),
+        dict(name='div', attrs={'id':'obs-article-mainpic'}),
+        dict(name='div', attrs={'itemprop':'articleBody'}),
+        dict(name='img', attrs={'id':'ObsImg'}),
+        dict(name='p', attrs={'class':'date-media'}),
+        dict(name='p', attrs={'id':'ObsDesc'}),
+    ]

From faf7060c3bf6adce29ae7d0d6438b32a9b0032b2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 13:05:36 +0530
Subject: [PATCH 0502/1154] Increase max cover grid cache size

---
 src/calibre/gui2/preferences/look_feel.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 2438c2f9c1..f10de2460f 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -364,7 +364,7 @@
        <item row="2" column="1">
         <widget class="QSpinBox" name="opt_cover_grid_cache_size">
          <property name="maximum">
-          <number>3000</number>
+          <number>50000</number>
          </property>
         </widget>
        </item>

From 560a09710796d461fbab720019ec5a7db4dc775d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 15:35:56 +0530
Subject: [PATCH 0503/1154] ...

---
 src/calibre/gui2/preferences/look_feel.ui | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index f10de2460f..98296dd014 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -366,6 +366,9 @@
          <property name="maximum">
           <number>50000</number>
          </property>
+         <property name="toolTip">
+          <string>The maximum number of covers to keep in memory. Increasing this will make rendering faster, at the cost of more memory usage.</string>
+         </property>
         </widget>
        </item>
        <item row="3" column="0">

From e5ce1ca2a469156ebb3697903ba7fade25324cf2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 16:01:19 +0530
Subject: [PATCH 0504/1154] Allow sending by email to combinations of
 recipients

Sending by email: Allow sending by email to an arbitrary combination of
email address. Access it via the "Select recipients" menu entry in the
Email To menu. Fixes #1207818 [[Enhancement] - "Email to selected"](https://bugs.launchpad.net/calibre/+bug/1207818)
---
 src/calibre/gui2/actions/convert.py |  16 +++
 src/calibre/gui2/actions/device.py  |  12 +-
 src/calibre/gui2/device.py          |   5 +
 src/calibre/gui2/email.py           | 170 +++++++++++++++++++++++++++-
 4 files changed, 200 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index c5e1580c6d..aaadd1a452 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -106,6 +106,15 @@ class ConvertAction(InterfaceAction):
                 self.book_auto_converted_mail,
                 extra_job_args=[delete_from_library, to, fmts, subject])
 
+    def auto_convert_multiple_mail(self, book_ids, data, ofmt, delete_from_library):
+        previous = self.gui.library_view.currentIndex()
+        rows = [x.row() for x in self.gui.library_view.selectionModel().selectedRows()]
+        jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, ofmt)
+        if jobs == []: return
+        self.queue_convert_jobs(jobs, changed, bad, rows, previous,
+                self.book_auto_converted_multiple_mail,
+                extra_job_args=[delete_from_library, data])
+
     def auto_convert_news(self, book_ids, format):
         previous = self.gui.library_view.currentIndex()
         rows = [x.row() for x in \
@@ -207,6 +216,13 @@ class ConvertAction(InterfaceAction):
         self.gui.send_by_mail(to, fmts, delete_from_library, subject=subject,
                 specific_format=fmt, send_ids=[book_id], do_auto_convert=False)
 
+    def book_auto_converted_multiple_mail(self, job):
+        temp_files, fmt, book_id, delete_from_library, data = self.conversion_jobs[job]
+        self.book_converted(job)
+        for to, subject in data:
+            self.gui.send_by_mail(to, (fmt,), delete_from_library, subject=subject,
+                    specific_format=fmt, send_ids=[book_id], do_auto_convert=False)
+
     def book_auto_converted_news(self, job):
         temp_files, fmt, book_id = self.conversion_jobs[job]
         self.book_converted(job)
diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py
index 09cadceb9c..e6432f9334 100644
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@@ -19,7 +19,7 @@ from calibre.gui2.dialogs.smartdevice import SmartdeviceDialog
 from calibre.gui2 import info_dialog, question_dialog
 from calibre.library.server import server_config as content_server_config
 
-class ShareConnMenu(QMenu): # {{{
+class ShareConnMenu(QMenu):  # {{{
 
     connect_to_folder = pyqtSignal()
     connect_to_itunes = pyqtSignal()
@@ -138,8 +138,17 @@ class ShareConnMenu(QMenu): # {{{
                     ac.a_s.connect(sync_menu.action_triggered)
                 action1.a_s.connect(sync_menu.action_triggered)
                 action2.a_s.connect(sync_menu.action_triggered)
+            action1 = DeviceAction('choosemail:', False, False, I('mail.png'),
+                    _('Select recipients'))
+            action2 = DeviceAction('choosemail:', True, False, I('mail.png'),
+                    _('Select recipients') + ' ' + _('(delete from library)'))
+            self.email_to_menu.addAction(action1)
+            self.email_to_and_delete_menu.addAction(action2)
+            map(self.memory.append, (action1, action2))
             ac = self.addMenu(self.email_to_and_delete_menu)
             self.email_actions.append(ac)
+            action1.a_s.connect(sync_menu.action_triggered)
+            action2.a_s.connect(sync_menu.action_triggered)
         else:
             ac = self.addAction(_('Setup email based sharing of books'))
             self.email_actions.append(ac)
@@ -287,3 +296,4 @@ class ConnectShareAction(InterfaceAction):
         ac.setIcon(QIcon(I('dot_%s.png'%icon)))
         ac.setText(text)
 
+
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index d3225e66e7..bddfa3efa9 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1214,6 +1214,11 @@ class DeviceMixin(object): # {{{
             subject = ';'.join(sub_dest_parts[2:])
             fmts = [x.strip().lower() for x in fmts.split(',')]
             self.send_by_mail(to, fmts, delete, subject=subject)
+        elif dest == 'choosemail':
+            from calibre.gui2.email import select_recipients
+            data = select_recipients(self)
+            if data:
+                self.send_multiple_by_mail(data, delete)
 
     def cover_to_thumbnail(self, data):
         if self.device_manager.device and \
diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 6645441158..5ecce8248f 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -11,6 +11,11 @@ from binascii import unhexlify
 from functools import partial
 from threading import Thread
 from itertools import repeat
+from collections import defaultdict
+
+from PyQt4.Qt import (
+    Qt, QDialog, QGridLayout, QIcon, QListWidget, QDialogButtonBox,
+    QListWidgetItem, QLabel, QLineEdit, QPushButton)
 
 from calibre.utils.smtp import (compose_mail, sendmail, extract_email_address,
         config as email_config)
@@ -18,9 +23,10 @@ from calibre.utils.filenames import ascii_filename
 from calibre.customize.ui import available_input_formats, available_output_formats
 from calibre.ebooks.metadata import authors_to_string
 from calibre.constants import preferred_encoding
-from calibre.gui2 import config, Dispatcher, warning_dialog
+from calibre.gui2 import config, Dispatcher, warning_dialog, error_dialog
 from calibre.library.save_to_disk import get_components
-from calibre.utils.config import tweaks
+from calibre.utils.config import tweaks, prefs
+from calibre.utils.icu import sort_key
 from calibre.gui2.threaded_jobs import ThreadedJob
 
 class Worker(Thread):
@@ -166,8 +172,164 @@ def email_news(mi, remove, get_fmts, done, job_manager):
 plugboard_email_value = 'email'
 plugboard_email_formats = ['epub', 'mobi', 'azw3']
 
+class SelectRecipients(QDialog):  # {{{
+
+    def __init__(self, parent=None):
+        QDialog.__init__(self, parent)
+        self._layout = l = QGridLayout(self)
+        self.setLayout(l)
+        self.setWindowIcon(QIcon(I('mail.png')))
+        self.setWindowTitle(_('Select recipients'))
+        self.recipients = r = QListWidget(self)
+        l.addWidget(r, 0, 0, 1, -1)
+        self.la = la = QLabel(_('Add a new recipient:'))
+        la.setStyleSheet('QLabel { font-weight: bold }')
+        l.addWidget(la, l.rowCount(), 0, 1, -1)
+
+        self.labels = tuple(map(QLabel, (
+            _('&Address'), _('A&lias'), _('&Formats'), _('&Subject'))))
+        tooltips = (
+            _('The email address of the recipient'),
+            _('The optional alias (simple name) of the recipient'),
+            _('Formats to email. The first matching one will be sent (comma separated list)'),
+            _('The optional subject for email sent to this recipient'))
+
+        for i, name in enumerate(('address', 'alias', 'formats', 'subject')):
+            c = i % 2
+            row = l.rowCount() - c
+            self.labels[i].setText(unicode(self.labels[i].text()) + ':')
+            l.addWidget(self.labels[i], row, (2*c))
+            le = QLineEdit(self)
+            le.setToolTip(tooltips[i])
+            setattr(self, name, le)
+            self.labels[i].setBuddy(le)
+            l.addWidget(le, row, (2*c) + 1)
+        self.formats.setText(prefs['output_format'].upper())
+        self.add_button = b = QPushButton(QIcon(I('plus.png')), _('&Add recipient'), self)
+        b.clicked.connect(self.add_recipient)
+        l.addWidget(b, l.rowCount(), 0, 1, -1)
+
+        self.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
+        l.addWidget(bb, l.rowCount(), 0, 1, -1)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+        self.setMinimumWidth(500)
+        self.setMinimumHeight(400)
+        self.resize(self.sizeHint())
+        self.init_list()
+
+    def add_recipient(self):
+        to = unicode(self.address.text()).strip()
+        if not to:
+            return error_dialog(
+                self, _('Need address'), _('You must specify an address'), show=True)
+        formats = ','.join([x.strip().upper() for x in unicode(self.formats.text()).strip().split(',') if x.strip()])
+        if not formats:
+            return error_dialog(
+                self, _('Need formats'), _('You must specify at least one format to send'), show=True)
+        opts = email_config().parse()
+        if to in opts.accounts:
+            return error_dialog(
+                self, _('Already exists'), _('The recipient %s already exists') % to, show=True)
+        acc = opts.accounts
+        acc[to] = [formats, False, False]
+        c = email_config()
+        c.set('accounts', acc)
+        alias = unicode(self.alias.text()).strip()
+        if alias:
+            opts.aliases[to] = alias
+            c.set('aliases', opts.aliases)
+        subject = unicode(self.subject.text()).strip()
+        if subject:
+            opts.subjects[to] = subject
+            c.set('subjects', opts.subjects)
+        self.create_item(alias or to, to, checked=True)
+
+    def create_item(self, alias, key, checked=False):
+        i = QListWidgetItem(alias, self.recipients)
+        i.setFlags(Qt.ItemIsEnabled | Qt.ItemIsUserCheckable)
+        i.setCheckState(Qt.Checked if checked else Qt.Unchecked)
+        i.setData(Qt.UserRole, key)
+        self.items.append(i)
+
+    def init_list(self):
+        opts = email_config().parse()
+        self.items = []
+        for key in sorted(opts.accounts or (), key=sort_key):
+            self.create_item(opts.aliases.get(key, key), key)
+
+    @property
+    def ans(self):
+        opts = email_config().parse()
+        ans = []
+        for i in self.items:
+            if i.checkState() == Qt.Checked:
+                to = unicode(i.data(Qt.UserRole).toString())
+                fmts = tuple(x.strip().upper() for x in (opts.accounts[to][0] or '').split(','))
+                subject = opts.subjects.get(to, '')
+                ans.append((to, fmts, subject))
+        return ans
+
+def select_recipients(parent=None):
+    d = SelectRecipients(parent)
+    if d.exec_() == d.Accepted:
+        return d.ans
+    return ()
+# }}}
+
 class EmailMixin(object):  # {{{
 
+    def send_multiple_by_mail(self, recipients, delete_from_library):
+        ids = set(self.library_view.model().id(r) for r in self.library_view.selectionModel().selectedRows())
+        if not ids:
+            return
+        db = self.current_db
+        db_fmt_map = {book_id:set((db.formats(book_id, index_is_id=True) or '').upper().split(',')) for book_id in ids}
+        ofmts = {x.upper() for x in available_output_formats()}
+        ifmts = {x.upper() for x in available_input_formats()}
+        bad_recipients = {}
+        auto_convert_map = defaultdict(list)
+
+        for to, fmts, subject in recipients:
+            rfmts = set(fmts)
+            ok_ids = {book_id for book_id, bfmts in db_fmt_map.iteritems() if bfmts.intersection(rfmts)}
+            convert_ids = ids - ok_ids
+            self.send_by_mail(to, fmts, delete_from_library, subject=subject, send_ids=ok_ids, do_auto_convert=False)
+            if not rfmts.intersection(ofmts):
+                bad_recipients[to] = (convert_ids, True)
+                continue
+            outfmt = tuple(f for f in fmts if f in ofmts)[0]
+            ok_ids = {book_id for book_id in convert_ids if db_fmt_map[book_id].intersection(ifmts)}
+            bad_ids = convert_ids - ok_ids
+            if bad_ids:
+                bad_recipients[to] = (bad_ids, False)
+            if ok_ids:
+                auto_convert_map[outfmt].append((to, subject, ok_ids))
+
+        if auto_convert_map:
+            titles = {book_id for x in auto_convert_map.itervalues() for data in x for book_id in data[2]}
+            titles = {db.title(book_id, index_is_id=True) for book_id in titles}
+            if self.auto_convert_question(
+                _('Auto convert the following books before sending via email?'), list(titles)):
+                for ofmt, data in auto_convert_map.iteritems():
+                    ids = {bid for x in data for bid in x[2]}
+                    data = [(to, subject) for to, subject, x in data]
+                    self.iactions['Convert Books'].auto_convert_multiple_mail(ids, data, ofmt, delete_from_library)
+
+        if bad_recipients:
+            det_msg = []
+            titles = {book_id for x in bad_recipients.itervalues() for book_id in x[0]}
+            titles = {book_id:db.title(book_id, index_is_id=True) for book_id in titles}
+            for to, (ids, nooutput) in bad_recipients.iteritems():
+                msg = _('This recipient has no valid formats defined') if nooutput else \
+                        _('These books have no suitable input formats for conversion')
+                det_msg.append('%s - %s' % (to, msg))
+                det_msg.extend('\t' + titles[bid] for bid in ids)
+                det_msg.append('\n')
+            warning_dialog(self, _('Could not send'),
+                           _('Could not send books to some recipients. Click Show Details for more information'),
+                           det_msg='\n'.join(det_msg), show=True)
+
     def send_by_mail(self, to, fmts, delete_from_library, subject='', send_ids=None,
             do_auto_convert=True, specific_format=None):
         ids = [self.library_view.model().id(r) for r in self.library_view.selectionModel().selectedRows()] if send_ids is None else send_ids
@@ -307,4 +469,8 @@ class EmailMixin(object):  # {{{
 
 # }}}
 
+if __name__ == '__main__':
+    from PyQt4.Qt import QApplication
+    app = QApplication([])  # noqa
+    print (select_recipients())
 

From ad1de3729eb830570bc580b0252451efbb920942 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 16:43:33 +0530
Subject: [PATCH 0505/1154] Grid view: Render covers in pauses during scrolling
 or slow scrolling

---
 src/calibre/gui2/library/alternate_views.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index ec3a788017..bbb20527f1 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -495,16 +495,24 @@ class GridView(QListView):
 
     def update_viewport(self):
         self.ignore_render_requests.clear()
+        self.update_timer.stop()
         m = self.model()
         for r in xrange(self.first_visible_row or 0, self.last_visible_row or (m.count() - 1)):
             self.update(m.index(r, 0))
 
     def slider_pressed(self):
         self.ignore_render_requests.set()
+        self.verticalScrollBar().valueChanged.connect(self.value_changed_during_scroll)
 
     def slider_released(self):
-        self.ignore_render_requests.clear()
         self.update_viewport()
+        self.verticalScrollBar().valueChanged.disconnect(self.value_changed_during_scroll)
+
+    def value_changed_during_scroll(self):
+        if self.ignore_render_requests.is_set():
+            self.update_timer.start()
+        else:
+            self.ignore_render_requests.set()
 
     def wheelEvent(self, e):
         self.ignore_render_requests.set()

From 2c5ab05e9cc3bacd7be9c02fec3451e54a99e8db Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 16:55:08 +0530
Subject: [PATCH 0506/1154] Increase update interval in slider drag mode

---
 src/calibre/gui2/library/alternate_views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index bbb20527f1..09daa04ddc 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -503,10 +503,12 @@ class GridView(QListView):
     def slider_pressed(self):
         self.ignore_render_requests.set()
         self.verticalScrollBar().valueChanged.connect(self.value_changed_during_scroll)
+        self.update_timer.setInterval(500)
 
     def slider_released(self):
         self.update_viewport()
         self.verticalScrollBar().valueChanged.disconnect(self.value_changed_during_scroll)
+        self.update_timer.setInterval(200)
 
     def value_changed_during_scroll(self):
         if self.ignore_render_requests.is_set():

From 36cace1b483a4a7ac3033e3ffad5f2d6dfd3f221 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 19:13:30 +0530
Subject: [PATCH 0507/1154] Grid view: Add tooltips

---
 src/calibre/gui2/library/alternate_views.py | 26 +++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 09daa04ddc..6a414d433b 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -13,12 +13,14 @@ from collections import OrderedDict
 from threading import Lock, Event, Thread, current_thread
 from Queue import Queue
 from functools import wraps, partial
+from textwrap import wrap
 
 from PyQt4.Qt import (
     QListView, QSize, QStyledItemDelegate, QModelIndex, Qt, QImage, pyqtSignal,
     QTimer, QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication,
-    QMimeData, QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty,
-    QPropertyAnimation, QEasingCurve)
+    QMimeData, QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QEvent,
+    QPropertyAnimation, QEasingCurve, pyqtSlot, QHelpEvent, QAbstractItemView,
+    QStyleOptionViewItem, QToolTip)
 
 from calibre import fit_image
 from calibre.gui2 import gprefs, config
@@ -423,6 +425,26 @@ class CoverDelegate(QStyledItemDelegate):
         finally:
             painter.restore()
 
+    @pyqtSlot(QHelpEvent, QAbstractItemView, QStyleOptionViewItem, QModelIndex, result=bool)
+    def helpEvent(self, event, view, option, index):
+        if event is not None and view is not None and event.type() == QEvent.ToolTip:
+            try:
+                db = index.model().db
+            except AttributeError:
+                return False
+            try:
+                book_id = db.id(index.row())
+            except (ValueError, IndexError, KeyError):
+                return False
+            title = db.new_api.field_for('title', book_id)
+            authors = db.new_api.field_for('authors', book_id)
+            if title and authors:
+                title = '<b>%s</b>' % ('\n'.join(wrap(title, 100)))
+                authors = '\n'.join(wrap(' & '.join(authors), 100))
+                QToolTip.showText(event.globalPos(), '%s<br><br>%s' % (title, authors), view)
+                return True
+        return False
+
 def join_with_timeout(q, timeout=2):
     q.all_tasks_done.acquire()
     try:

From 9996f3b88a3a05b9f0a042281a265acce14a30e7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Aug 2013 21:32:35 +0530
Subject: [PATCH 0508/1154] pep8

---
 recipes/le_monde_sub.recipe | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes/le_monde_sub.recipe b/recipes/le_monde_sub.recipe
index e55d71e0a7..e3fcda6f68 100644
--- a/recipes/le_monde_sub.recipe
+++ b/recipes/le_monde_sub.recipe
@@ -2,7 +2,7 @@
 __author__    = 'Sylvain Durand <sylvain.durand@ponts.org>'
 __license__   = 'GPL v3'
 
-import time
+import time, re
 
 from calibre import strftime
 from calibre.web.feeds.news import BasicNewsRecipe
@@ -79,18 +79,18 @@ class LeMonde(BasicNewsRecipe):
                             art.insert(6,'<div id="photo"><img src="'+art.find(['url']).string+'" /></div>')
                         if art.find(['lgd']) and art.find(['lgd']).string:
                             art.insert(7,'<div id="lgd">'+art.find(['lgd']).string+'</div>')
-                        
+
                         def guillemets(match):
                             if match.group(1) == u"=":
                                 return match.group(0)
                             return u'%s«&nbsp;%s&nbsp;»' % (match.group(1), match.group(2))
-                            
+
                         article = "<html><head></head><body>"+unicode(art)+"</body></html>"
                         article = article.replace('<![CDATA[','').replace(']]>','').replace(' oC ','°C ')
                         article = article.replace('srttr>','h3>').replace('ssttr>','h2>').replace('ttr>','h1>')
                         article = article.replace("'" , u'\u2019')
                         article = re.sub('(.|^)"([^"]+)"', guillemets, article)
-                    
+
                         f = PersistentTemporaryFile()
                         f.write(article)
                         articles.append({'title':art.ttr.string,'url':"file:///"+f.name})
@@ -99,9 +99,9 @@ class LeMonde(BasicNewsRecipe):
             self.log("Vos identifiants sont incorrects, ou votre abonnement LeMonde.fr ne vous permet pas de télécharger le journal.")
         return sections
 
-
     def preprocess_html(self, soup):
         for lgd in soup.findAll(id="lgd"):
             lgd.contents[-1].extract()
         return soup
 
+

From 0a508d2ff56ce564302771343bb6eacaea56323e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 08:05:27 +0530
Subject: [PATCH 0509/1154] version 0.9.43

---
 Changelog.yaml           | 53 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index afd0516e1a..c5c1ac3315 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,59 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.43
+  date: 2013-08-09
+
+  new features:
+    - title: "TXT Input: Allow using various markdown extensions for more features when converting markdown formatted txt files. See http://pythonhosted.org/Markdown/extensions/index.html for details."
+
+    - title: "Sending by email: Allow sending by email to an arbitrary combination of email address. Access it via the 'Select recipients' menu entry in the Email To menu."
+      tickets: [1207818]
+
+    - title: "A new 'Sort By' action for the right click menu. This allows sorting on all columns in the library, not just the visible columns. To use it go to Preferences->Toolbars and add it to 'The context menu for books in the calibre library'"
+
+    - title: "Allow adding images into the comments field, by clicking on the insert link button in the comments editor in the edit metadata dialog."
+
+    - title: "Allow skipping the confirm bulk reconvert dialog"
+
+    - title: "EPUB Input: If the EPUB file identifies an actual cover image in addition to the titlepage html file, use the cover image instead of rendering the titlepage. This is faster and has the advantage that an EPUB to EPUB conversion preserves internal cover structure."
+
+    - title: "Get Books: Improve searching by removing punctuation from title/authors before matching."
+ 
+  bug fixes:
+    - title: "Conversion: Fix empty inline tags that are the second child of a paragraph causing text change location."
+      tickets: [1207735]
+
+    - title: "Fix book count in tooltip of choose library button not updating"
+      ticket: [1208217]
+
+    - title: "Kobo driver: When deleting shelves that have been synced, the Activity entry for the shelf was not being deleted. This left a tile for the shelf on the home screen of the Glo and AuraHD."
+      tickets: [1208159]
+
+    - title: "Comments editor: The Insert Link button has no effect until the user clicks inside the comments box, therefore disable it until it is ready, to prevent confusion."
+      tickets: [1208073]
+
+    - title: "Get Books: Update various Polish store plugins"
+
+  improved recipes:
+    - The Sunday Times UK and The Times Online
+    - Telegraph UK
+    - Le Monde: Edition abonnés 
+    - The Scotsman
+
+  new recipes:
+    - title: Various French news sources 
+      author: Malah
+
+    - title: La Capital de Rosario 
+      author: Darko Miletic
+
+    - title: Jot Down 
+      author: desUbiKado
+
+    - title: Private Eye 
+      author: Martyn Pritchard
+
 - version: 0.9.42
   date: 2013-08-02
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index c1ea2b80df..e0c0f6b845 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 42)
+numeric_version = (0, 9, 43)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 83126c4bf5c198e0364432b5e3ee38750fcb6977 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 08:17:49 +0530
Subject: [PATCH 0510/1154] ...

---
 src/calibre/ebooks/oeb/polish/embed.py | 4 ++--
 src/calibre/gui2/convert/page_setup.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/embed.py b/src/calibre/ebooks/oeb/polish/embed.py
index 1f5412bbc9..4d6b826de7 100644
--- a/src/calibre/ebooks/oeb/polish/embed.py
+++ b/src/calibre/ebooks/oeb/polish/embed.py
@@ -67,8 +67,8 @@ def embed_font(container, font, all_font_rules, report, warned):
                 rule['src'] = 'url(%s)' % href
                 rule['name'] = name
                 return rule
-        msg = _('Failed to find font matching: family: %s; weight: %s; style: %s; stretch: %s') % (
-            ff, font['font-weight'], font['font-style'], font['font-stretch'])
+        msg = _('Failed to find font matching: family: %(family)s; weight: %(weight)s; style: %(style)s; stretch: %(stretch)s') % dict(
+            family=ff, weight=font['font-weight'], style=font['font-style'], stretch=font['font-stretch'])
         if msg not in warned:
             warned.add(msg)
             report(msg)
diff --git a/src/calibre/gui2/convert/page_setup.py b/src/calibre/gui2/convert/page_setup.py
index ac93557dd1..16196990f2 100644
--- a/src/calibre/gui2/convert/page_setup.py
+++ b/src/calibre/gui2/convert/page_setup.py
@@ -31,7 +31,7 @@ class ProfileModel(QAbstractListModel):
             if w >= 10000:
                 ss = _('unlimited')
             else:
-                ss = _('%d x %d pixels') % (w, h)
+                ss = _('%(width)d x %(height)d pixels') % dict(width=w, height=h)
             ss = _('Screen size: %s') % ss
             return QVariant('%s [%s]' % (profile.description, ss))
         return NONE

From 2ae75daf61317676f82a45f6a33b26e8181ba53d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 11:26:05 +0530
Subject: [PATCH 0511/1154] ...

---
 Changelog.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index c5c1ac3315..fee1971d3f 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -57,7 +57,7 @@
   improved recipes:
     - The Sunday Times UK and The Times Online
     - Telegraph UK
-    - Le Monde: Edition abonnés 
+    - "Le Monde: Edition abonnés"
     - The Scotsman
 
   new recipes:

From 618aa68822ba48d891630c8a83a3ba5deede039a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 13:12:30 +0530
Subject: [PATCH 0512/1154] oops

---
 src/calibre/gui2/actions/sort.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
index 14bd641020..76d22d5da6 100644
--- a/src/calibre/gui2/actions/sort.py
+++ b/src/calibre/gui2/actions/sort.py
@@ -21,7 +21,7 @@ class SortAction(QAction):
         self.triggered.connect(self)
 
     def __call__(self):
-        self.sort_requested(self.key, self.ascending)
+        self.sort_requested.emit(self.key, self.ascending)
 
 class SortByAction(InterfaceAction):
 

From 7fe8d334d421017ef364a0cc9094da05ac5f07c0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 13:44:36 +0530
Subject: [PATCH 0513/1154] Invalidate cover caches when deleting books

---
 src/calibre/db/cache.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 677c3168d5..0b58c23c1d 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1351,6 +1351,9 @@ class Cache(object):
                 table.remove_books(book_ids, self.backend)
         self._search_api.discard_books(book_ids)
         self._clear_caches(book_ids=book_ids, template_cache=False, search_cache=False)
+        for cc in self.cover_caches:
+            for book_id in book_ids:
+                cc.invalidate(book_id)
 
     @read_api
     def author_sort_strings_for_books(self, book_ids):

From e844dd117fce83d38fb9de46ccd388aec0af23bb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 13:52:47 +0530
Subject: [PATCH 0514/1154] Move the cover cache into its own module

---
 src/calibre/gui2/library/alternate_views.py | 71 ++-----------------
 src/calibre/gui2/library/caches.py          | 77 +++++++++++++++++++++
 2 files changed, 82 insertions(+), 66 deletions(-)
 create mode 100644 src/calibre/gui2/library/caches.py

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 6a414d433b..cce5ceb102 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -9,8 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import itertools, operator, os
 from types import MethodType
 from time import time
-from collections import OrderedDict
-from threading import Lock, Event, Thread, current_thread
+from threading import Event, Thread
 from Queue import Queue
 from functools import wraps, partial
 from textwrap import wrap
@@ -24,6 +23,7 @@ from PyQt4.Qt import (
 
 from calibre import fit_image
 from calibre.gui2 import gprefs, config
+from calibre.gui2.library.caches import CoverCache
 from calibre.utils.config import prefs
 
 CM_TO_INCH = 0.393701
@@ -271,69 +271,7 @@ class AlternateViews(object):
                 view.set_context_menu(menu)
 # }}}
 
-# Caching and rendering of covers {{{
-class CoverCache(dict):
-
-    def __init__(self, limit=200):
-        self.items = OrderedDict()
-        self.lock = Lock()
-        self.limit = limit
-        self.pixmap_staging = []
-        self.gui_thread = current_thread()
-
-    def clear_staging(self):
-        ' Must be called in the GUI thread '
-        self.pixmap_staging = []
-
-    def invalidate(self, book_id):
-        with self.lock:
-            self._pop(book_id)
-
-    def _pop(self, book_id):
-        val = self.items.pop(book_id, None)
-        if type(val) is QPixmap and current_thread() is not self.gui_thread:
-            self.pixmap_staging.append(val)
-
-    def __getitem__(self, key):
-        ' Must be called in the GUI thread '
-        with self.lock:
-            self.clear_staging()
-            ans = self.items.pop(key, False)  # pop() so that item is moved to the top
-            if ans is not False:
-                if type(ans) is QImage:
-                    # Convert to QPixmap, since rendering QPixmap is much
-                    # faster
-                    ans = QPixmap.fromImage(ans)
-                self.items[key] = ans
-
-        return ans
-
-    def set(self, key, val):
-        with self.lock:
-            self._pop(key)  # pop() so that item is moved to the top
-            self.items[key] = val
-            if len(self.items) > self.limit:
-                del self.items[next(self.items.iterkeys())]
-
-    def clear(self):
-        with self.lock:
-            if current_thread() is not self.gui_thread:
-                pixmaps = (x for x in self.items.itervalues() if type(x) is QPixmap)
-                self.pixmap_staging.extend(pixmaps)
-            self.items.clear()
-
-    def __hash__(self):
-        return id(self)
-
-    def set_limit(self, limit):
-        with self.lock:
-            self.limit = limit
-            if len(self.items) > self.limit:
-                extra = len(self.items) - self.limit
-                remove = tuple(self.iterkeys())[:extra]
-                for k in remove:
-                    self._pop(k)
-
+# Rendering of covers {{{
 class CoverDelegate(QStyledItemDelegate):
 
     @pyqtProperty(float)
@@ -458,6 +396,7 @@ def join_with_timeout(q, timeout=2):
         q.all_tasks_done.release()
 # }}}
 
+# The View {{{
 @setup_dnd_interface
 class GridView(QListView):
 
@@ -699,4 +638,4 @@ class GridView(QListView):
 
     def restore_hpos(self, hpos):
         pass
-
+# }}}
diff --git a/src/calibre/gui2/library/caches.py b/src/calibre/gui2/library/caches.py
new file mode 100644
index 0000000000..45dc5cddd5
--- /dev/null
+++ b/src/calibre/gui2/library/caches.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from threading import Lock, current_thread
+from collections import OrderedDict
+
+from PyQt4.Qt import QImage, QPixmap
+
+class CoverCache(dict):
+
+    ' This is a RAM cache to speed up rendering of covers by storing them as QPixmaps '
+
+    def __init__(self, limit=200):
+        self.items = OrderedDict()
+        self.lock = Lock()
+        self.limit = limit
+        self.pixmap_staging = []
+        self.gui_thread = current_thread()
+
+    def clear_staging(self):
+        ' Must be called in the GUI thread '
+        self.pixmap_staging = []
+
+    def invalidate(self, book_id):
+        with self.lock:
+            self._pop(book_id)
+
+    def _pop(self, book_id):
+        val = self.items.pop(book_id, None)
+        if type(val) is QPixmap and current_thread() is not self.gui_thread:
+            self.pixmap_staging.append(val)
+
+    def __getitem__(self, key):
+        ' Must be called in the GUI thread '
+        with self.lock:
+            self.clear_staging()
+            ans = self.items.pop(key, False)  # pop() so that item is moved to the top
+            if ans is not False:
+                if type(ans) is QImage:
+                    # Convert to QPixmap, since rendering QPixmap is much
+                    # faster
+                    ans = QPixmap.fromImage(ans)
+                self.items[key] = ans
+
+        return ans
+
+    def set(self, key, val):
+        with self.lock:
+            self._pop(key)  # pop() so that item is moved to the top
+            self.items[key] = val
+            if len(self.items) > self.limit:
+                del self.items[next(self.items.iterkeys())]
+
+    def clear(self):
+        with self.lock:
+            if current_thread() is not self.gui_thread:
+                pixmaps = (x for x in self.items.itervalues() if type(x) is QPixmap)
+                self.pixmap_staging.extend(pixmaps)
+            self.items.clear()
+
+    def __hash__(self):
+        return id(self)
+
+    def set_limit(self, limit):
+        with self.lock:
+            self.limit = limit
+            if len(self.items) > self.limit:
+                extra = len(self.items) - self.limit
+                remove = tuple(self.iterkeys())[:extra]
+                for k in remove:
+                    self._pop(k)
+

From eb9e9dfbaf43d989638aae8aec5b0b8b06918d5c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 14:46:16 +0530
Subject: [PATCH 0515/1154] Cover grid: Add option toshow book title below
 cover

---
 src/calibre/gui2/__init__.py                |  1 +
 src/calibre/gui2/library/alternate_views.py | 34 ++++++++++++++++++---
 src/calibre/gui2/preferences/look_feel.py   |  1 +
 src/calibre/gui2/preferences/look_feel.ui   | 21 ++++++++-----
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index bec9a3177c..7d0f85094b 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -116,6 +116,7 @@ defs['cover_grid_height'] = 0
 defs['cover_grid_color'] = (80, 80, 80)
 defs['cover_grid_cache_size'] = 200
 defs['cover_grid_spacing'] = 0
+defs['cover_grid_show_title'] = False
 del defs
 # }}}
 
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index cce5ceb102..2bd39ff0ac 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -274,6 +274,8 @@ class AlternateViews(object):
 # Rendering of covers {{{
 class CoverDelegate(QStyledItemDelegate):
 
+    MARGIN = 4
+
     @pyqtProperty(float)
     def animated_size(self):
         return self._animated_size
@@ -297,6 +299,7 @@ class CoverDelegate(QStyledItemDelegate):
     def set_dimensions(self):
         width = self.original_width = gprefs['cover_grid_width']
         height = self.original_height = gprefs['cover_grid_height']
+        self.original_show_title = show_title = gprefs['cover_grid_show_title']
 
         if height < 0.1:
             height = max(185, QApplication.instance().desktop().availableGeometry(self.parent()).height() / 5.0)
@@ -308,7 +311,14 @@ class CoverDelegate(QStyledItemDelegate):
         else:
             width *= self.parent().logicalDpiX() * CM_TO_INCH
         self.cover_size = QSize(width, height)
-        self.item_size = self.cover_size + QSize(8, 8)
+        self.title_height = 0
+        if show_title:
+            f = self.parent().font()
+            sz = f.pixelSize()
+            if sz < 5:
+                sz = f.pointSize() * self.parent().logicalDpiY() / 72.0
+            self.title_height = max(25, sz + 10)
+        self.item_size = self.cover_size + QSize(2 * self.MARGIN, (2 * self.MARGIN) + self.title_height)
         self.calculate_spacing()
         self.animation.setStartValue(1.0)
         self.animation.setKeyValueAt(0.5, 0.5)
@@ -345,7 +355,7 @@ class CoverDelegate(QStyledItemDelegate):
         painter.save()
         try:
             rect = option.rect
-            rect.adjust(4, 4, -4, -4)
+            rect.adjust(self.MARGIN, self.MARGIN, -self.MARGIN, -self.MARGIN)
             if cdata is None or cdata is False:
                 title = db.field_for('title', book_id, default_value='')
                 authors = ' & '.join(db.field_for('authors', book_id, default_value=()))
@@ -354,12 +364,23 @@ class CoverDelegate(QStyledItemDelegate):
                 if cdata is False:
                     self.render_queue.put(book_id)
             else:
+                if self.title_height != 0:
+                    orect = QRect(rect)
+                    rect.setBottom(rect.bottom() - self.title_height)
                 if self.animating is not None and self.animating.row() == index.row():
                     cdata = cdata.scaled(cdata.size() * self._animated_size)
                 dx = max(0, int((rect.width() - cdata.width())/2.0))
                 dy = max(0, rect.height() - cdata.height())
                 rect.adjust(dx, dy, -dx, 0)
                 painter.drawPixmap(rect, cdata)
+                if self.title_height != 0:
+                    rect = orect
+                    rect.setTop(rect.bottom() - self.title_height + 5)
+                    painter.setRenderHint(QPainter.TextAntialiasing, True)
+                    title = db.field_for('title', book_id, default_value='')
+                    metrics = painter.fontMetrics()
+                    painter.drawText(rect, Qt.AlignCenter|Qt.TextSingleLine,
+                                     metrics.elidedText(title, Qt.ElideRight, rect.width()))
         finally:
             painter.restore()
 
@@ -510,10 +531,15 @@ class GridView(QListView):
         self.delegate.highlight_color = pal.color(pal.Text)
 
     def refresh_settings(self):
-        if gprefs['cover_grid_width'] != self.delegate.original_width or gprefs['cover_grid_height'] != self.delegate.original_height:
+        size_changed = (
+            gprefs['cover_grid_width'] != self.delegate.original_width or
+            gprefs['cover_grid_height'] != self.delegate.original_height
+        )
+        if (size_changed or gprefs['cover_grid_show_title'] != self.delegate.original_show_title):
             self.delegate.set_dimensions()
             self.setSpacing(self.delegate.spacing)
-            self.delegate.cover_cache.clear()
+            if size_changed:
+                self.delegate.cover_cache.clear()
         if gprefs['cover_grid_spacing'] != self.delegate.original_spacing:
             self.delegate.calculate_spacing()
             self.setSpacing(self.delegate.spacing)
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 80521abf9f..552f907ab2 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -114,6 +114,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('cover_grid_height', gprefs)
         r('cover_grid_cache_size', gprefs)
         r('cover_grid_spacing', gprefs)
+        r('cover_grid_show_title', gprefs)
 
         r('cover_flow_queue_length', config, restart_required=True)
         r('cover_browser_reflections', gprefs)
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 98296dd014..ca9c83d3d3 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -351,7 +351,7 @@
          </item>
         </layout>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_15">
          <property name="text">
           <string>Number of covers to cache in &amp;memory:</string>
@@ -361,17 +361,17 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
+       <item row="3" column="1">
         <widget class="QSpinBox" name="opt_cover_grid_cache_size">
-         <property name="maximum">
-          <number>50000</number>
-         </property>
          <property name="toolTip">
           <string>The maximum number of covers to keep in memory. Increasing this will make rendering faster, at the cost of more memory usage.</string>
          </property>
+         <property name="maximum">
+          <number>50000</number>
+         </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="label_16">
          <property name="text">
           <string>&amp;Spacing between covers:</string>
@@ -381,7 +381,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
+       <item row="4" column="1">
         <widget class="QDoubleSpinBox" name="opt_cover_grid_spacing">
          <property name="toolTip">
           <string>The spacing between covers. A value of zero means calculate automatically based on cover size.</string>
@@ -397,6 +397,13 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QCheckBox" name="opt_cover_grid_show_title">
+         <property name="text">
+          <string>Show the book &amp;title below the cover</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">

From 063bcabad4636729a7d8f2a9aad6524d81161819 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 15:06:30 +0530
Subject: [PATCH 0516/1154] Fix book list not scrolling when changing current
 book with book info dialog

---
 src/calibre/gui2/dialogs/book_info.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index 284d17a349..92691fd7cd 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -31,7 +31,6 @@ class BookInfo(QDialog, Ui_BookInfo):
         palette.setBrush(QPalette.Base, Qt.transparent)
         self.details.page().setPalette(palette)
 
-
         self.view = view
         self.current_row = None
         self.fit_cover.setChecked(dynamic.get('book_info_dialog_fit_cover',
@@ -85,20 +84,25 @@ class BookInfo(QDialog, Ui_BookInfo):
         QTimer.singleShot(1, self.resize_cover)
 
     def slave(self, current, previous):
-        row = current.row()
-        self.refresh(row)
+        if current.row() != previous.row():
+            row = current.row()
+            self.refresh(row)
+
+    def move(self, delta=1):
+        idx = self.view.currentIndex()
+        if idx.isValid():
+            m = self.view.model()
+            ni = m.index(idx.row() + delta, idx.column())
+            if ni.isValid():
+                self.view.setCurrentIndex(ni)
+                if self.view.isVisible():
+                    self.view.scrollTo(ni)
 
     def next(self):
-        row = self.view.currentIndex().row()
-        ni = self.view.model().index(row+1, 0)
-        if ni.isValid():
-            self.view.setCurrentIndex(ni)
+        self.move()
 
     def previous(self):
-        row = self.view.currentIndex().row()
-        ni = self.view.model().index(row-1, 0)
-        if ni.isValid():
-            self.view.setCurrentIndex(ni)
+        self.move(-1)
 
     def resize_cover(self):
         if self.cover_pixmap is None:
@@ -138,4 +142,3 @@ class BookInfo(QDialog, Ui_BookInfo):
         self.resize_cover()
         html = render_html(mi, self.css, True, self, all_fields=True)
         self.details.setHtml(html)
-

From 89c712128e2b87fda81769630951cfe8865f9377 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 15:10:12 +0530
Subject: [PATCH 0517/1154] Remove deprecated use of SIGNAL

---
 src/calibre/gui2/dialogs/book_info.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index 92691fd7cd..cf79c224cd 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 
 
-from PyQt4.Qt import (QCoreApplication, SIGNAL, QModelIndex, QTimer, Qt,
+from PyQt4.Qt import (QCoreApplication, QModelIndex, QTimer, Qt,
     QDialog, QPixmap, QIcon, QSize, QPalette, QShortcut, QKeySequence)
 
 from calibre.gui2.dialogs.book_info_ui import Ui_BookInfo
@@ -36,9 +36,9 @@ class BookInfo(QDialog, Ui_BookInfo):
         self.fit_cover.setChecked(dynamic.get('book_info_dialog_fit_cover',
             True))
         self.refresh(row)
-        self.connect(self.view.selectionModel(), SIGNAL('currentChanged(QModelIndex,QModelIndex)'), self.slave)
-        self.connect(self.next_button, SIGNAL('clicked()'), self.next)
-        self.connect(self.previous_button, SIGNAL('clicked()'), self.previous)
+        self.view.selectionModel().currentChanged.connect(self.slave)
+        self.next_button.clicked.connect(self.next)
+        self.previous_button.clicked.connect(self.previous)
         self.fit_cover.stateChanged.connect(self.toggle_cover_fit)
         self.cover.resizeEvent = self.cover_view_resized
         self.cover.cover_changed.connect(self.cover_changed)

From 4ce6bb4378f8ddaec3f4c81c2067981a7071a72f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 15:25:11 +0530
Subject: [PATCH 0518/1154] Keep references to BookInfo to prevent object
 lifetime issues

---
 src/calibre/gui2/actions/show_book_details.py | 16 ++++++++++++++--
 src/calibre/gui2/dialogs/book_info.py         |  9 ++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/actions/show_book_details.py b/src/calibre/gui2/actions/show_book_details.py
index 83e570d7b6..520d0522c9 100644
--- a/src/calibre/gui2/actions/show_book_details.py
+++ b/src/calibre/gui2/actions/show_book_details.py
@@ -5,6 +5,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+from PyQt4.Qt import Qt
 
 from calibre.gui2.actions import InterfaceAction
 from calibre.gui2.dialogs.book_info import BookInfo
@@ -20,6 +21,7 @@ class ShowBookDetailsAction(InterfaceAction):
 
     def genesis(self):
         self.qaction.triggered.connect(self.show_book_info)
+        self.memory = []
 
     def show_book_info(self, *args):
         if self.gui.current_view() is not self.gui.library_view:
@@ -29,6 +31,16 @@ class ShowBookDetailsAction(InterfaceAction):
             return
         index = self.gui.library_view.currentIndex()
         if index.isValid():
-            BookInfo(self.gui, self.gui.library_view, index,
-                    self.gui.book_details.handle_click).show()
+            d = BookInfo(self.gui, self.gui.library_view, index,
+                    self.gui.book_details.handle_click)
+            self.memory.append(d)
+            d.closed.connect(self.closed, type=Qt.QueuedConnection)
+            d.show()
+
+    def closed(self, d):
+        try:
+            d.closed.disconnect(self.closed)
+            self.memory.remove(d)
+        except ValueError:
+            pass
 
diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index cf79c224cd..898058a74d 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 
 
-from PyQt4.Qt import (QCoreApplication, QModelIndex, QTimer, Qt,
+from PyQt4.Qt import (QCoreApplication, QModelIndex, QTimer, Qt, pyqtSignal,
     QDialog, QPixmap, QIcon, QSize, QPalette, QShortcut, QKeySequence)
 
 from calibre.gui2.dialogs.book_info_ui import Ui_BookInfo
@@ -14,6 +14,8 @@ from calibre.gui2.book_details import render_html
 
 class BookInfo(QDialog, Ui_BookInfo):
 
+    closed = pyqtSignal(object)
+
     def __init__(self, parent, view, row, link_delegate):
         QDialog.__init__(self, parent)
         Ui_BookInfo.__init__(self)
@@ -59,6 +61,11 @@ class BookInfo(QDialog, Ui_BookInfo):
         link = unicode(qurl.toString())
         self.link_delegate(link)
 
+    def done(self, r):
+        ret = QDialog.done(self, r)
+        self.closed.emit(self)
+        return ret
+
     def cover_changed(self, data):
         if self.current_row is not None:
             id_ = self.view.model().id(self.current_row)

From 840f316703e3f5da5ce86297448ac11f31f637fb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 15:29:29 +0530
Subject: [PATCH 0519/1154] Update El Periodica de Aragon and El Correo

---
 recipes/el_correo.recipe    | 47 +++++++++++++++++--------------------
 recipes/el_periodico.recipe | 18 +++++++-------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/recipes/el_correo.recipe b/recipes/el_correo.recipe
index 110c19d7ba..235d5e0fc7 100644
--- a/recipes/el_correo.recipe
+++ b/recipes/el_correo.recipe
@@ -3,10 +3,10 @@ __license__     = 'GPL v3'
 __copyright__   = '08 Januery 2011, desUBIKado'
 __author__      = 'desUBIKado'
 __description__ = 'Daily newspaper from Biscay'
-__version__     = 'v0.08'
-__date__        = '08, Januery 2011'
+__version__     = 'v0.10'
+__date__        = '07, August 2013'
 '''
-[url]http://www.elcorreo.com/[/url]
+http://www.elcorreo.com/
 '''
 
 import time
@@ -24,6 +24,7 @@ class heraldo(BasicNewsRecipe):
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
+    masthead_url          = 'http://www.elcorreo.com/vizcaya/noticias/201002/02/Media/logo-elcorreo-nuevo.png'
     language              = 'es'
     timefmt               = '[%a, %d %b, %Y]'
     encoding              = 'iso-8859-1'
@@ -33,15 +34,15 @@ class heraldo(BasicNewsRecipe):
     feeds              = [
                            (u'Portada',       u'http://www.elcorreo.com/vizcaya/portada.xml'),
                            (u'Local',         u'http://www.elcorreo.com/vizcaya/rss/feeds/vizcaya.xml'),
-               (u'Internacional', u'hhttp://www.elcorreo.com/vizcaya/rss/feeds/internacional.xml'),
-               (u'Econom\xeda',   u'http://www.elcorreo.com/vizcaya/rss/feeds/economia.xml'),
+                           (u'Internacional', u'hhttp://www.elcorreo.com/vizcaya/rss/feeds/internacional.xml'),
+                           (u'Econom\xeda',   u'http://www.elcorreo.com/vizcaya/rss/feeds/economia.xml'),
                            (u'Pol\xedtica',   u'http://www.elcorreo.com/vizcaya/rss/feeds/politica.xml'),
-               (u'Opini\xf3n',    u'http://www.elcorreo.com/vizcaya/rss/feeds/opinion.xml'),
-               (u'Deportes',      u'http://www.elcorreo.com/vizcaya/rss/feeds/deportes.xml'),
+                           (u'Opini\xf3n',    u'http://www.elcorreo.com/vizcaya/rss/feeds/opinion.xml'),
+                           (u'Deportes',      u'http://www.elcorreo.com/vizcaya/rss/feeds/deportes.xml'),
                            (u'Sociedad',      u'http://www.elcorreo.com/vizcaya/rss/feeds/sociedad.xml'),
-               (u'Cultura',       u'http://www.elcorreo.com/vizcaya/rss/feeds/cultura.xml'),
-               (u'Televisi\xf3n', u'http://www.elcorreo.com/vizcaya/rss/feeds/television.xml'),
-               (u'Gente',         u'http://www.elcorreo.com/vizcaya/rss/feeds/gente.xml')
+                           (u'Cultura',       u'http://www.elcorreo.com/vizcaya/rss/feeds/cultura.xml'),
+                           (u'Televisi\xf3n', u'http://www.elcorreo.com/vizcaya/rss/feeds/television.xml'),
+                           (u'Gente',         u'http://www.elcorreo.com/vizcaya/rss/feeds/gente.xml')
                          ]
 
     keep_only_tags     = [
@@ -54,14 +55,14 @@ class heraldo(BasicNewsRecipe):
                           dict(name='div', attrs={'class':['mod_lomas','bloque_lomas','blm_header','link-app3','link-app4','botones_listado']}),
                           dict(name='div', attrs={'class':['navegacion_galeria','modulocanalpromocion','separa','separacion','compartir','tags_relacionados']}),
                           dict(name='div', attrs={'class':['moduloBuscadorDeportes','modulo-gente','moddestacadopeq','OpcArt','articulopiniones']}),
-                          dict(name='div', attrs={'class':['modulo-especial','publiEspecial']}),
-                          dict(name='div', attrs={'id':['articulopina']}),
+                          dict(name='div', attrs={'class':['modulo-especial','publiEspecial','carruselNoticias','vj','modulocomun2']}),
+                          dict(name='div', attrs={'id':['articulopina','webs_asociadas']}),
                           dict(name='br', attrs={'class':'clear'}),
                           dict(name='form', attrs={'name':'frm_conversor2'})
                          ]
 
     remove_tags_before = dict(name='div' , attrs={'class':'articulo  '})
-    remove_tags_after  = dict(name='div' , attrs={'class':'comentarios'})
+    remove_tags_after  = dict(name='div' , attrs={'class':'robapaginas'})
 
     def get_cover_url(self):
         cover = None
@@ -69,10 +70,8 @@ class heraldo(BasicNewsRecipe):
         year = str(st.tm_year)
         month = "%.2d" % st.tm_mon
         day = "%.2d" % st.tm_mday
-        #[url]http://img.kiosko.net/2011/01/02/es/elcorreo.750.jpg[/url]
-                #[url]http://info.elcorreo.com/pdf/06012011-viz.pdf[/url]
-        cover='http://info.elcorreo.com/pdf/'+ day + month + year +'-viz.pdf'
-
+                 # http://info.elcorreo.com/pdf/07082013-viz.pdf
+        cover='http://info.elcorreo.com/pdf/'+ day +  month + year +'-viz.pdf'
         br = BasicNewsRecipe.get_browser(self)
         try:
             br.open(cover)
@@ -92,29 +91,27 @@ class heraldo(BasicNewsRecipe):
                     img{margin-bottom: 0.4em}
                 '''
 
-
-
     preprocess_regexps = [
 
- # To present the image of the embedded video
+ # Para presentar la imagen de los video incrustados
                            (re.compile(r'var RUTA_IMAGEN', re.DOTALL|re.IGNORECASE), lambda match: '</script><img src'),
                            (re.compile(r'.jpg";', re.DOTALL|re.IGNORECASE), lambda match: '.jpg">'),
                            (re.compile(r'var SITIO = "elcorreo";', re.DOTALL|re.IGNORECASE), lambda match: '<SCRIPT TYPE="text/JavaScript"'),
 
-# To separate paragraphs with a blank line
+# Para separar los parrafos con una linea en blanco
                            (re.compile(r'<div class="p"', re.DOTALL|re.IGNORECASE), lambda match: '<p></p><div class="p"'),
 
-# To put a blank line between the subtitle and the date and time of the news
+# Para poner una linea en blanco entre el subttulo y la fecha y hora de la noticia
                            (re.compile(r'<div class="date">', re.DOTALL|re.IGNORECASE), lambda match: '<br><div class="date">'),
 
-# To put a blank line between the intro of the embedded videos and the previous text
+# Para poner una linea en blanco entre la entradilla de los videos incrustados y el texto anterior
                            (re.compile(r'<div class="video"', re.DOTALL|re.IGNORECASE), lambda match: '<br><div class="video"'),
 
-# To view photos from the first when these are presented as a gallery
+# Para sacar las fotos a partir de la primera cuando se presentan como una galeria
                            (re.compile(r'src="/img/shim.gif"', re.DOTALL|re.IGNORECASE), lambda match: ''),
                            (re.compile(r'rel=', re.DOTALL|re.IGNORECASE), lambda match: 'src='),
 
-# To remove the link of the title
+# Para quitar el enlace del titulo
                            (re.compile(r'<h1 class="headline">\n<a href="', re.DOTALL|re.IGNORECASE), lambda match: '<h1 class="'),
                            (re.compile(r'</a>\n</h1>', re.DOTALL|re.IGNORECASE), lambda match: '</h1>'),
 
diff --git a/recipes/el_periodico.recipe b/recipes/el_periodico.recipe
index abdf537fbe..ecdf458c2e 100644
--- a/recipes/el_periodico.recipe
+++ b/recipes/el_periodico.recipe
@@ -5,8 +5,8 @@ __license__     = 'GPL v3'
 __copyright__   = '04 December 2010, desUBIKado'
 __author__      = 'desUBIKado'
 __description__ = 'Daily newspaper from Aragon'
-__version__     = 'v0.08'
-__date__        = '13, November 2011'
+__version__     = 'v0.09'
+__date__        = '07, August 2013'
 '''
 elperiodicodearagon.com
 '''
@@ -25,11 +25,11 @@ class elperiodicodearagon(BasicNewsRecipe):
     no_stylesheets        = True
     use_embedded_content  = False
     language              = 'es'
+    masthead_url          = 'http://pdf.elperiodicodearagon.com/img/logotipo.gif'
     encoding              = 'iso-8859-1'
     remove_empty_feeds    = True
     remove_javascript     = True
 
-
     conversion_options = {
                              'comments'  : description
                             ,'tags'      : category
@@ -56,23 +56,21 @@ class elperiodicodearagon(BasicNewsRecipe):
                            (u'Fiestas del Pilar', u'http://zetaestaticos.com/aragon/rss/107_es.xml')
                          ]
 
-
     remove_attributes = ['height','width']
 
     keep_only_tags     = [dict(name='div', attrs={'id':'Noticia'})]
 
-
     # Recuperamos la portada de papel (la imagen format=1 tiene mayor resolucion)
-
     def get_cover_url(self):
-        index = 'http://pdf.elperiodicodearagon.com/'
+        index = 'http://pdf.elperiodicodearagon.com/edicion.php'
         soup = self.index_to_soup(index)
         for image in soup.findAll('img',src=True):
-           if image['src'].startswith('http://pdf.elperiodicodearagon.com/funciones/portada-preview.php?eid='):
-              return image['src'].rstrip('format=2') + 'format=1'
+            if image['src'].startswith('/funciones/img-public.php?key='):
+                return 'http://pdf.elperiodicodearagon.com' + image['src']
         return None
 
     # Usamos la versión para móviles
 
     def print_version(self, url):
-          return url.replace('http://www.elperiodicodearagon.com/', 'http://www.elperiodicodearagon.com/m/')
+        return url.replace('http://www.elperiodicodearagon.com/', 'http://www.elperiodicodearagon.com/m/')
+

From 9f7637778abe93ff75098b2598704df5a8514059 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 15:49:56 +0530
Subject: [PATCH 0520/1154] Ensure the book info dialog is deleted when closed

---
 src/calibre/gui2/actions/show_book_details.py |  4 ++++
 src/calibre/gui2/dialogs/book_info.py         | 23 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/actions/show_book_details.py b/src/calibre/gui2/actions/show_book_details.py
index 520d0522c9..75026ae370 100644
--- a/src/calibre/gui2/actions/show_book_details.py
+++ b/src/calibre/gui2/actions/show_book_details.py
@@ -43,4 +43,8 @@ class ShowBookDetailsAction(InterfaceAction):
             self.memory.remove(d)
         except ValueError:
             pass
+        else:
+            import sip
+            sip.delete(d)
+            del d
 
diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index 898058a74d..b0c1087238 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -63,6 +63,8 @@ class BookInfo(QDialog, Ui_BookInfo):
 
     def done(self, r):
         ret = QDialog.done(self, r)
+        self.view.selectionModel().currentChanged.disconnect(self.slave)
+        self.view = self.link_delegate = self.gui = None
         self.closed.emit(self)
         return ret
 
@@ -96,14 +98,19 @@ class BookInfo(QDialog, Ui_BookInfo):
             self.refresh(row)
 
     def move(self, delta=1):
-        idx = self.view.currentIndex()
-        if idx.isValid():
-            m = self.view.model()
-            ni = m.index(idx.row() + delta, idx.column())
-            if ni.isValid():
-                self.view.setCurrentIndex(ni)
-                if self.view.isVisible():
-                    self.view.scrollTo(ni)
+        self.view.selectionModel().currentChanged.disconnect(self.slave)
+        try:
+            idx = self.view.currentIndex()
+            if idx.isValid():
+                m = self.view.model()
+                ni = m.index(idx.row() + delta, idx.column())
+                if ni.isValid():
+                    self.view.setCurrentIndex(ni)
+                    self.refresh(ni.row())
+                    if self.view.isVisible():
+                        self.view.scrollTo(ni)
+        finally:
+            self.view.selectionModel().currentChanged.connect(self.slave)
 
     def next(self):
         self.move()

From ee1142105b50e1104c374eedff39dd195d8df5af Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 17:58:46 +0530
Subject: [PATCH 0521/1154] Refactor BookInfo dialog

Make the book information dialog user resizable, with a splitter between
the cover and the info panel. Also change the background of the cover
panel for books that have been marked using the Temp marker plugin.
Fixes #1209057 [[ENHANCEMENTS] Book Information window](https://bugs.launchpad.net/calibre/+bug/1209057)
---
 src/calibre/gui2/dialogs/book_info.py | 102 +++++++++++++++++++------
 src/calibre/gui2/dialogs/book_info.ui | 106 --------------------------
 src/calibre/gui2/library/models.py    |   4 +
 src/calibre/library/caches.py         |   4 +
 4 files changed, 86 insertions(+), 130 deletions(-)
 delete mode 100644 src/calibre/gui2/dialogs/book_info.ui

diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index b0c1087238..0abf7f0f91 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -1,31 +1,56 @@
 #!/usr/bin/env  python
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 
 
-from PyQt4.Qt import (QCoreApplication, QModelIndex, QTimer, Qt, pyqtSignal,
-    QDialog, QPixmap, QIcon, QSize, QPalette, QShortcut, QKeySequence)
+from PyQt4.Qt import (
+    QCoreApplication, QModelIndex, QTimer, Qt, pyqtSignal, QWidget,
+    QGridLayout, QDialog, QPixmap, QSize, QPalette, QShortcut, QKeySequence,
+    QSplitter, QVBoxLayout, QCheckBox, QPushButton, QIcon, QBrush)
+from PyQt4.QtWebKit import QWebView
 
-from calibre.gui2.dialogs.book_info_ui import Ui_BookInfo
-from calibre.gui2 import dynamic
+from calibre.gui2 import gprefs
 from calibre import fit_image
 from calibre.gui2.book_details import render_html
+from calibre.gui2.widgets import CoverView
 
-class BookInfo(QDialog, Ui_BookInfo):
+_css = None
+def css():
+    global _css
+    if _css is None:
+        _css = P('templates/book_details.css', data=True).decode('utf-8')
+    return _css
+
+class BookInfo(QDialog):
 
     closed = pyqtSignal(object)
 
     def __init__(self, parent, view, row, link_delegate):
         QDialog.__init__(self, parent)
-        Ui_BookInfo.__init__(self)
-        self.setupUi(self)
+        self.normal_brush = QBrush(Qt.white)
+        self.marked_brush = QBrush(Qt.lightGray)
+        self.marked = None
         self.gui = parent
+        self.splitter = QSplitter(self)
+        self._l = l = QVBoxLayout(self)
+        self.setLayout(l)
+        l.addWidget(self.splitter)
+
+        self.cover = CoverView(self)
+        self.cover.resizeEvent = self.cover_view_resized
+        self.cover.cover_changed.connect(self.cover_changed)
         self.cover_pixmap = None
+        self.cover.sizeHint = self.details_size_hint
+        self.splitter.addWidget(self.cover)
+
+        self.details = QWebView(self)
         self.details.sizeHint = self.details_size_hint
         self.details.page().setLinkDelegationPolicy(self.details.page().DelegateAllLinks)
         self.details.linkClicked.connect(self.link_clicked)
-        self.css = P('templates/book_details.css', data=True).decode('utf-8')
+        self.css = css()
         self.link_delegate = link_delegate
         self.details.setAttribute(Qt.WA_OpaquePaintEvent, False)
         palette = self.details.palette()
@@ -33,17 +58,27 @@ class BookInfo(QDialog, Ui_BookInfo):
         palette.setBrush(QPalette.Base, Qt.transparent)
         self.details.page().setPalette(palette)
 
+        self.c = QWidget(self)
+        self.c.l = l2 = QGridLayout(self.c)
+        self.c.setLayout(l2)
+        l2.addWidget(self.details, 0, 0, 1, -1)
+        self.splitter.addWidget(self.c)
+
+        self.fit_cover = QCheckBox(_('Fit &cover within view'), self)
+        self.fit_cover.setChecked(gprefs.get('book_info_dialog_fit_cover', True))
+        l2.addWidget(self.fit_cover, l2.rowCount(), 0, 1, -1)
+        self.previous_button = QPushButton(QIcon(I('previous.png')), _('&Previous'), self)
+        self.previous_button.clicked.connect(self.previous)
+        l2.addWidget(self.previous_button, l2.rowCount(), 0)
+        self.next_button = QPushButton(QIcon(I('next.png')), _('&Next'), self)
+        self.next_button.clicked.connect(self.next)
+        l2.addWidget(self.next_button, l2.rowCount() - 1, 1)
+
         self.view = view
         self.current_row = None
-        self.fit_cover.setChecked(dynamic.get('book_info_dialog_fit_cover',
-            True))
         self.refresh(row)
         self.view.selectionModel().currentChanged.connect(self.slave)
-        self.next_button.clicked.connect(self.next)
-        self.previous_button.clicked.connect(self.previous)
         self.fit_cover.stateChanged.connect(self.toggle_cover_fit)
-        self.cover.resizeEvent = self.cover_view_resized
-        self.cover.cover_changed.connect(self.cover_changed)
         self.ns = QShortcut(QKeySequence('Alt+Right'), self)
         self.ns.activated.connect(self.next)
         self.ps = QShortcut(QKeySequence('Alt+Left'), self)
@@ -53,15 +88,25 @@ class BookInfo(QDialog, Ui_BookInfo):
         self.previous_button.setToolTip(_('Previous [%s]')%
                 unicode(self.ps.key().toString(QKeySequence.NativeText)))
 
-        desktop = QCoreApplication.instance().desktop()
-        screen_height = desktop.availableGeometry().height() - 100
-        self.resize(self.size().width(), screen_height)
+        geom = QCoreApplication.instance().desktop().availableGeometry(self)
+        screen_height = geom.height() - 100
+        screen_width = geom.width() - 100
+        self.resize(max(int(screen_width/2), 700), screen_height)
+        saved_layout = gprefs.get('book_info_dialog_layout', None)
+        if saved_layout is not None:
+            try:
+                self.restoreGeometry(saved_layout[0])
+                self.splitter.restoreState(saved_layout[1])
+            except Exception:
+                pass
 
     def link_clicked(self, qurl):
         link = unicode(qurl.toString())
         self.link_delegate(link)
 
     def done(self, r):
+        saved_layout = (bytearray(self.saveGeometry()), bytearray(self.splitter.saveState()))
+        gprefs.set('book_info_dialog_layout', saved_layout)
         ret = QDialog.done(self, r)
         self.view.selectionModel().currentChanged.disconnect(self.slave)
         self.view = self.link_delegate = self.gui = None
@@ -86,7 +131,7 @@ class BookInfo(QDialog, Ui_BookInfo):
         return QSize(350, 550)
 
     def toggle_cover_fit(self, state):
-        dynamic.set('book_info_dialog_fit_cover', self.fit_cover.isChecked())
+        gprefs.set('book_info_dialog_fit_cover', self.fit_cover.isChecked())
         self.resize_cover()
 
     def cover_view_resized(self, event):
@@ -121,7 +166,6 @@ class BookInfo(QDialog, Ui_BookInfo):
     def resize_cover(self):
         if self.cover_pixmap is None:
             return
-        self.setWindowIcon(QIcon(self.cover_pixmap))
         pixmap = self.cover_pixmap
         if self.fit_cover.isChecked():
             scaled, new_width, new_height = fit_image(pixmap.width(),
@@ -131,9 +175,18 @@ class BookInfo(QDialog, Ui_BookInfo):
                 pixmap = pixmap.scaled(new_width, new_height,
                         Qt.KeepAspectRatio, Qt.SmoothTransformation)
         self.cover.set_pixmap(pixmap)
-        sz = pixmap.size()
-        self.cover.setToolTip(_('Cover size: %(width)d x %(height)d')%dict(
-            width=sz.width(), height=sz.height()))
+        self.update_cover_tooltip()
+
+    def update_cover_tooltip(self):
+        tt = ''
+        if self.marked:
+            tt = _('This book is marked') if self.marked in {True, 'true'} else _(
+                'This book is marked as: %s') % self.marked
+            tt += '\n\n'
+        if self.cover_pixmap is not None:
+            sz = self.cover_pixmap.size()
+            tt += _('Cover size: %(width)d x %(height)d')%dict(width=sz.width(), height=sz.height())
+        self.cover.setToolTip(tt)
 
     def refresh(self, row):
         if isinstance(row, QModelIndex):
@@ -150,9 +203,10 @@ class BookInfo(QDialog, Ui_BookInfo):
         self.next_button.setEnabled(False if row == self.view.model().rowCount(QModelIndex())-1 else True)
         self.current_row = row
         self.setWindowTitle(mi.title)
-        self.title.setText('<b>'+mi.title)
-        mi.title = _('Unknown')
         self.cover_pixmap = QPixmap.fromImage(mi.cover_data[1])
         self.resize_cover()
         html = render_html(mi, self.css, True, self, all_fields=True)
         self.details.setHtml(html)
+        self.marked = mi.marked
+        self.cover.setBackgroundBrush(self.marked_brush if mi.marked else self.normal_brush)
+        self.update_cover_tooltip()
diff --git a/src/calibre/gui2/dialogs/book_info.ui b/src/calibre/gui2/dialogs/book_info.ui
deleted file mode 100644
index 44fd1adf22..0000000000
--- a/src/calibre/gui2/dialogs/book_info.ui
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>BookInfo</class>
- <widget class="QDialog" name="BookInfo">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>917</width>
-    <height>492</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../../../../resources/images.qrc">
-    <normaloff>:/images/metadata.png</normaloff>:/images/metadata.png</iconset>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="title">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" rowspan="3">
-    <widget class="CoverView" name="cover"/>
-   </item>
-   <item row="3" column="1">
-    <widget class="QCheckBox" name="fit_cover">
-     <property name="text">
-      <string>Fit &amp;cover within view</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="previous_button">
-       <property name="text">
-        <string>&amp;Previous</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../resources/images.qrc">
-         <normaloff>:/images/previous.png</normaloff>:/images/previous.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="next_button">
-       <property name="text">
-        <string>&amp;Next</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../resources/images.qrc">
-         <normaloff>:/images/next.png</normaloff>:/images/next.png</iconset>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="1">
-    <widget class="QWebView" name="details">
-     <property name="url">
-      <url>
-       <string>about:blank</string>
-      </url>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header>QtWebKit/QWebView</header>
-  </customwidget>
-  <customwidget>
-   <class>CoverView</class>
-   <extends>QGraphicsView</extends>
-   <header>calibre/gui2/widgets.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../../../../resources/images.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index df2afe5afc..ddd67f9ab7 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -463,6 +463,10 @@ class BooksModel(QAbstractTableModel):  # {{{
         mi.id = self.db.id(idx)
         mi.field_metadata = self.db.field_metadata
         mi.path = self.db.abspath(idx, create_dirs=False)
+        try:
+            mi.marked = self.db.data.get_marked(idx, index_is_id=False)
+        except:
+            mi.marked = None
         return mi
 
     def current_changed(self, current, previous, emit_signal=True):
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index 46f3f4e7e9..a7ceb706f7 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -916,6 +916,10 @@ class ResultCache(SearchQueryParser):  # {{{
             except:
                 pass
 
+    def get_marked(self, idx, index_is_id=True, default_value=None):
+        id_ = idx if index_is_id else self[idx][0]
+        return self.marked_ids_dict.get(id_, default_value)
+
     # }}}
 
     def remove(self, id):

From 8716d82a81478ab285d2373ca45d8456548619d0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 10 Aug 2013 08:11:46 +0530
Subject: [PATCH 0522/1154] Make the help text for the margin options more
 explicit

---
 src/calibre/ebooks/conversion/plumber.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index d4bdeb4562..73e76b72d0 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -384,25 +384,29 @@ OptionRecommendation(name='remove_fake_margins',
 OptionRecommendation(name='margin_top',
         recommended_value=5.0, level=OptionRecommendation.LOW,
         help=_('Set the top margin in pts. Default is %default. '
-            'Setting this to less than zero will cause no margin to be set. '
+            'Setting this to less than zero will cause no margin to be set '
+            '(the margin setting in the original document will be preserved). '
             'Note: 72 pts equals 1 inch')),
 
 OptionRecommendation(name='margin_bottom',
         recommended_value=5.0, level=OptionRecommendation.LOW,
         help=_('Set the bottom margin in pts. Default is %default. '
-            'Setting this to less than zero will cause no margin to be set. '
+            'Setting this to less than zero will cause no margin to be set '
+            '(the margin setting in the original document will be preserved). '
             'Note: 72 pts equals 1 inch')),
 
 OptionRecommendation(name='margin_left',
         recommended_value=5.0, level=OptionRecommendation.LOW,
         help=_('Set the left margin in pts. Default is %default. '
-            'Setting this to less than zero will cause no margin to be set. '
+            'Setting this to less than zero will cause no margin to be set '
+            '(the margin setting in the original document will be preserved). '
             'Note: 72 pts equals 1 inch')),
 
 OptionRecommendation(name='margin_right',
         recommended_value=5.0, level=OptionRecommendation.LOW,
         help=_('Set the right margin in pts. Default is %default. '
-            'Setting this to less than zero will cause no margin to be set. '
+            'Setting this to less than zero will cause no margin to be set '
+            '(the margin setting in the original document will be preserved). '
             'Note: 72 pts equals 1 inch')),
 
 OptionRecommendation(name='change_justification',

From 2c68f92866c2756e2cb2cedaa789c3bc69bde67f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 10 Aug 2013 08:52:09 +0530
Subject: [PATCH 0523/1154] Fix unnecessary disk I/O when scrolling cover grid

---
 src/calibre/gui2/library/alternate_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 2bd39ff0ac..cd62d38a3c 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -570,9 +570,9 @@ class GridView(QListView):
                 q.task_done()
 
     def render_cover(self, book_id):
-        cdata = self.model().db.new_api.cover(book_id)
         if self.ignore_render_requests.is_set():
             return
+        cdata = self.model().db.new_api.cover(book_id)
         if cdata is not None:
             p = QImage()
             p.loadFromData(cdata)

From 7ed19123e430e1b00861a4f5cb4a345e15e3bcf7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 10 Aug 2013 08:54:15 +0530
Subject: [PATCH 0524/1154] ...

---
 src/calibre/gui2/convert/page_setup.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/convert/page_setup.ui b/src/calibre/gui2/convert/page_setup.ui
index ee018628ac..b4e72d33be 100644
--- a/src/calibre/gui2/convert/page_setup.ui
+++ b/src/calibre/gui2/convert/page_setup.ui
@@ -110,7 +110,7 @@
         <item row="0" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_left">
           <property name="specialValueText">
-           <string>No margin</string>
+           <string>Unset</string>
           </property>
           <property name="suffix">
            <string> pt</string>
@@ -139,7 +139,7 @@
         <item row="1" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_top">
           <property name="specialValueText">
-           <string>No margin</string>
+           <string>Unset</string>
           </property>
           <property name="suffix">
            <string> pt</string>
@@ -168,7 +168,7 @@
         <item row="2" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_right">
           <property name="specialValueText">
-           <string>No margin</string>
+           <string>Unset</string>
           </property>
           <property name="suffix">
            <string> pt</string>
@@ -197,7 +197,7 @@
         <item row="3" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_bottom">
           <property name="specialValueText">
-           <string>No margin</string>
+           <string>Unset</string>
           </property>
           <property name="suffix">
            <string> pt</string>

From e5f761998fdff4aafe59249c575cdee2b97a1526 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 10 Aug 2013 21:30:04 +0530
Subject: [PATCH 0525/1154] Update The Independent

---
 recipes/independent.recipe | 483 +------------------------------------
 1 file changed, 7 insertions(+), 476 deletions(-)

diff --git a/recipes/independent.recipe b/recipes/independent.recipe
index fc6bacce57..6bbdfec8be 100644
--- a/recipes/independent.recipe
+++ b/recipes/independent.recipe
@@ -1,504 +1,34 @@
 # adapted from old recipe by Darko Miletic <darko.miletic at gmail.com>
 
-import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import Tag, NavigableString
-
 
 class TheIndependentNew(BasicNewsRecipe):
 
-    # flag to enable/disable article graphics on business pages/some others
-    # eg http://www.independent.co.uk/news/world/europe/berlusconi-departure-fails-to-calm-the-markets-6259682.html
-    # -max dimensions can be altered using the .pictureContainer img selector in the css
-    _FETCH_ARTICLE_GRAPHICS = True
-
-    #Flag to enable/disable image fetching (not business)
-    _FETCH_IMAGES = True
-
-    #Set max gallery images here (respects _FETCH_IMAGES)
-    # -1 for infinite
-    _MAX_GALLERY_IMAGES = -1
-
-
-     #used for converting rating to stars
+     # used for converting rating to stars
     _STAR_URL = 'http://www.independent.co.uk/skins/ind/images/rating_star.png'
     _NO_STAR_URL = 'http://www.independent.co.uk/skins/ind/images/rating_star_grey.png'
 
-
     title                   = u'The Independent'
-    __author__              = 'Will'
+    __author__              = 'Krittika Goyal'
     description             = 'The latest in UK News and World News from The \
                                Independent. Wide range of international and local news, sports \
                                news, commentary and opinion pieces.Independent News - Breaking news \
                                that matters. Your daily comprehensive news source - The \
                                Independent Newspaper'
     publisher               = 'The Independent'
+    oldest_article          = 2.0
+    ignore_duplicate_articles = {'title', 'url'}
+    remove_empty_feeds      = True
     category                = 'news, UK'
     no_stylesheets          = True
     use_embedded_content    = False
     remove_empty_feeds      = True
+    auto_cleanup = True
     language                = 'en_GB'
     publication_type        = 'newspaper'
     masthead_url            = 'http://www.independent.co.uk/independent.co.uk/editorial/logo/independent_Masthead.png'
     encoding                = 'utf-8'
     compress_news_images    = True
-    remove_tags             =[
-                               dict(attrs={'id' : ['RelatedArtTag','renderBiography']}),
-                               dict(attrs={'class' : ['autoplay','openBiogPopup']}),
-                               dict(name='img',attrs={'alt' : ['Get Adobe Flash player']}),
-                               dict(name='img',attrs={'alt' : ['view gallery']}),
-                               dict(attrs={'style' : re.compile('.*')}),
-                               dict(attrs={'class':lambda x: x and 'voicesRelatedTopics' in x.split()}),
-                             ]
-
-    keep_only_tags          =[dict(attrs={'id':['main','top']})]
-    recursions = 0
-
-    # fixes non compliant html nesting and 'marks' article graphics links
-    preprocess_regexps      = [
-                                (re.compile('<span class="storyTop ">(?P<nested>.*?)</span>', re.DOTALL),
-                                lambda match: '<div class="storyTop">' + match.group('nested') + '</div>'),
-                                (re.compile('(<strong>.*?[Cc]lick.*?<a.*?((HERE)|([Hh]ere)).*?</strong>)', re.DOTALL),
-                                lambda match: '<div class="article-graphic">' + match.group(0) + '</div>'),
-                              ]
-
-
-    conversion_options = {
-                          'comment'   : description
-                        , 'tags'      : category
-                        , 'publisher' : publisher
-                        , 'language'  : language
-                        }
-
-    extra_css             = """
-                               h1{font-family: Georgia,serif ; font-size: x-large; }
-                               body{font-family: Verdana,Arial,Helvetica,sans-serif}
-                               img{margin-bottom: 0.4em; display:block}
-                               .starRating img {float: left}
-                               .starRating {margin-top:0.4em; display: block}
-                               .image {clear:left; font-size: x-small; color:#888888;}
-                               .articleByTimeLocation {font-size: x-small; color:#888888;
-                                margin-bottom:0.2em ; margin-top:0.2em ; display:block}
-                                .subtitle {clear:left ;}
-                               .column-1 h1 { color: #191919}
-                               .column-1 h2 { color: #333333}
-                               .column-1 h3 { color: #444444}
-                               .subtitle { color: #777777; font-size: medium;}
-                               .column-1 a,h1,h2,h3 { margin: 0; }
-                               .column-1 div{margin: 0;}
-                               .articleContent {display: block; clear:left;}
-                               .articleContent {color: #000000; font-size: medium;}
-                               .ivDrip-section {color: #000000; font-size: medium;}
-                               .datetime {color: #888888}
-                               .title {font-weight:bold;}
-                               .storyTop{}
-                               .pictureContainer img { max-width: 400px; max-height: 400px;}
-                               .image img { max-width: 400px; max-height: 400px;}
-                            """
-
-    oldest_article = 1
-    max_articles_per_feed = 100
-
-    _processed_urls = []
-
-
-    def get_article_url(self, article):
-        url = super(self.__class__,self).get_article_url(article)
-
-        title = article.get('title', None)
-        if title and re.search("^Video:",title):
-            return None
-
-        #remove duplicates
-        if not (url in self._processed_urls):
-            self._processed_urls.append(url)
-        else:
-            url = None
-        return url
-
-    def populate_article_metadata(self, article, soup, first):
-        if first and hasattr(self, 'add_toc_thumbnail'):
-            picdiv = soup.find('img')
-            if picdiv is not None:
-                self.add_toc_thumbnail(article,picdiv['src'])
-
-    def preprocess_html(self, soup):
-
-        #remove 'advertorial articles'
-        strapline = soup.find('div',attrs={'class' : re.compile('.*strapLine.*')})
-        if strapline:
-            for para in strapline.findAll('p'):
-                if len(para.contents) and isinstance(para.contents[0],NavigableString) \
-                and para.contents[0] == 'ADVERTORIAL FEATURE':
-                    return None
-
-        # remove Suggested Topics
-        items_to_extract = []
-
-        for item in soup.findAll('div',attrs={'class' : re.compile('.*RelatedArtTag.*')}):
-            items_to_extract.append(item)
-
-        for item in items_to_extract:
-            item.extract()
-
-        items_to_extract = []
-        slideshow_elements = []
-
-        for item in soup.findAll(attrs={'class' : re.compile("widget.*")}):
-            remove = True
-            pattern = re.compile('((articleContent)|(title))$')
-            if (pattern.search(item['class'])) is not None:
-                remove = False
-
-            # corrections
-            # story content always good
-            pattern = re.compile('storyContent')
-            if (pattern.search(item['class'])) is not None:
-                remove = False
-
-            #images
-            pattern = re.compile('slideshow')
-            if (pattern.search(item['class'])) is not None:
-                if self._FETCH_IMAGES:
-                    remove = False
-                    slideshow_elements.append(item)
-                else:
-                    remove = True
-
-            #social widgets always bad
-            pattern = re.compile('socialwidget')
-            if (pattern.search(item['class'])) is not None:
-                remove = True
-
-            if remove:
-                items_to_extract.append(item)
-
-        for item in items_to_extract:
-            item.extract()
-
-        items_to_extract = []
-
-        if self._FETCH_IMAGES:
-            for element in slideshow_elements:
-                for item in element.findAll('a',attrs={'href' : re.compile('.*')}):
-                    if item.img is not None:
-                        #use full size image
-                        images = []
-
-                        img = item.findNext('img')
-
-                        if  not '?action=gallery' in item['href']:
-                            img['src'] = item['href']
-                            tag = Tag(soup,'h3')
-                            text = ''
-                            try:
-                                text = img['data-title']
-                            except:
-                                pass
-
-                            if img.get('title') and (len(img['title']) > 1):
-                                text = NavigableString(img['title'])
-                            tag.insert(0,text)
-                            images.append((img, tag))
-                        else:
-                            gallery_images, remove_link = self._get_gallery_images(item['href'])
-                            images = images + gallery_images
-                            if remove_link:
-                                gal_link = soup.find('a',attrs={'id' : 'view-gallery'})
-                                if gal_link:
-                                    gal_link.extract()
-                            img.extract()
-                        for (img, title) in images:
-                            #insert caption if available
-                            if title:
-                                #picture before text
-                                img.extract()
-                                item.insert(0,img)
-                                item.insert(1,title)
-
-                            # remove link
-                            item.name = "div"
-                            item["class"]='image'
-                            del item["href"]
-
-
-        #remove empty subtitles
-        """
-        currently the subtitle is located in first paragraph after
-        sibling <h3 class="subtitle"> tag. This may be 'fixed' at
-        some point.
-        """
-        subtitle = soup.find('h3',attrs={'class' : 'subtitle'})
-        if subtitle is not None:
-            subtitleText = subtitle.findNext('p')
-            if subtitleText is not None:
-                if len(subtitleText.contents[0]) <= 1 :
-                    subtitleText.extract()
-                    subtitle.extract()
-
-
-        #replace rating numbers with stars
-        for item in soup.findAll('div',attrs={ 'class' : 'starRating'}):
-            if item is not None:
-                soup2 = self._insertRatingStars(soup,item)
-            if soup2 is not None:
-                soup = soup2
-
-
-        #remove empty paragraph tags in storyTop which can leave a space
-        #between first paragraph and rest of story
-        nested_content = False
-        storyTop = soup.find('div',attrs={ 'class' : ['storyTop']})
-        for item in storyTop.findAll('p'):
-            for nested in item:
-                if isinstance(nested, Tag):
-                    nested_content = True
-                    break
-            if not nested_content and item.contents is not None and len(item.contents[0]) <= 1 :
-                items_to_extract.append(item)
-
-        for item in items_to_extract:
-            item.extract()
-
-        items_to_extract = []
-
-
-        #remove line breaks immediately next to tags with default margins
-        #to prevent double line spacing and narrow columns of text
-        storyTop = soup.find('div',attrs={ 'class' : ['storyTop']})
-        self._remove_undesired_line_breaks_from_tag(storyTop,soup)
-
-
-        #replace article graphics link with the graphics themselves
-        if self._FETCH_ARTICLE_GRAPHICS:
-            items_to_insert = []
-            for item in soup.findAll('div', attrs={'class' : ['article-graphic']}):
-                strong = item.find('strong')
-                if not strong:
-                    continue
-                for child in strong:
-                    if isinstance(child,Tag):
-                        if str(child.name) == 'a':
-                            items_to_insert.extend(self._get_article_graphic(strong,child['href'],soup))
-
-            for item in items_to_insert:
-                item[0].replaceWith(item[1])
-
-        for item in items_to_extract:
-            item.extract()
-
-        return soup
-
-
-    def _get_article_graphic(self,old_item,url,soup):
-
-        items_to_insert = []
-
-        if re.search('\.jpg$',str(url)):
-            div = Tag(soup,'div')
-            div['class'] = 'pictureContainer'
-            img = Tag(soup,'img')
-            img['src'] = url
-            img['alt'] = 'article graphic'
-            div.insert(0,img)
-            items_to_insert.append((old_item,div,))
-            return items_to_insert
-
-        soup2 = self.index_to_soup(url)
-        for item in soup2.findAll('div',attrs={'class' : re.compile("widget picture article.*")}):
-            items_to_insert.append((old_item,item),)
-        return items_to_insert
-
-
-    def _insertRatingStars(self,soup,item):
-        if item.contents is None or len(item.contents) < 1:
-            return
-        rating = item.contents[0]
-
-        try:
-            rating = float(item.contents[0])
-        except:
-            print 'Could not convert decimal rating to star: malformatted float.'
-            return
-        for i in range(1,6):
-            star = Tag(soup,'img')
-            if i <= rating:
-                star['src'] = self._STAR_URL
-            else:
-                star['src'] = self._NO_STAR_URL
-            star['alt'] = 'star number ' +  str(i)
-            item.insert(i,star)
-        #item.contents[0] = NavigableString('(' + str(rating) + ')')
-        item.contents[0] = ''
-
-    def postprocess_html(self,soup, first_fetch):
-
-        #mark subtitle parent as non-compliant nesting causes
-        # p's to be 'popped out' of the h3 tag they are nested in.
-        subtitle = soup.find('h3', attrs={'class' : 'subtitle'})
-        subtitle_div = None
-        if subtitle:
-            subtitle_div = subtitle.parent
-        if subtitle_div:
-            clazz = ''
-            if 'class' in subtitle_div:
-                clazz = subtitle_div['class'] + ' '
-            clazz = clazz + 'subtitle'
-            subtitle_div['class'] = clazz
-
-        #find broken images and remove captions
-        items_to_extract = []
-        for item in soup.findAll('div', attrs={'class' : 'image'}):
-            img = item.findNext('img')
-            if img and img.get('src'):
-                # broken images still point to remote url
-                pattern = re.compile('http://www.independent.co.uk.*')
-                if pattern.match(img["src"]) is not None:
-                    caption = img.findNextSibling('h3')
-                    if caption is not None:
-                        items_to_extract.append(caption)
-                    items_to_extract.append(img)
-
-        for item in items_to_extract:
-            item.extract()
-
-        # nickredding's fix for non-justified text
-        for ptag in soup.findAll('p',attrs={'align':'left'}):
-            del(ptag['align'])
-
-        return soup
-
-    def _get_gallery_images(self,url):
-        gallery_soup = self.index_to_soup(url)
-        images = []
-        remove_link = True
-        total = 1
-        try:
-            counter = gallery_soup.find('div',attrs={'id' : ['counter']})
-            total = counter.contents[0].split('/')
-            total = int(total[1].rstrip())
-        except:
-            total = 1
-
-        if self._MAX_GALLERY_IMAGES >= 0 and total > self._MAX_GALLERY_IMAGES:
-            total = self._MAX_GALLERY_IMAGES
-            remove_link = False
-
-        for i in range(1, total +1):
-            image, title = self._get_image_from_gallery(gallery_soup)
-            if image:
-                images.append((image,title))
-            next = url + '&ino=' + str(i + 1)
-            gallery_soup = self.index_to_soup(next)
-        images.reverse()
-        return images, remove_link
-
-    def _get_image_from_gallery(self,soup):
-        try:
-            container = soup.find('div',attrs={'id' : ['main-image']})
-            image = container.find('img')
-            if image:
-                title = soup.find('div',attrs={'id' : ['image-title']})
-            return image, title
-        except:
-            print 'error fetching gallery image'
-            return None
-
-
-
-    def _recurisvely_linearise_tag_tree(
-        self,
-        item,
-        linearised= None,
-        count=0,
-        limit = 100
-        ):
-        linearised = linearised or []
-        count = count + 1
-        if count > limit:
-            return linearised
-        if not (isinstance(item,Tag)):
-            return linearised
-        for nested in item:
-            linearised.append(nested)
-            linearised = self._recurisvely_linearise_tag_tree(nested,linearised, count)
-        return linearised
-
-
-    def _get_previous_tag(self,current_index, tag_tree):
-        if current_index == 0:
-            return None
-        else:
-            return tag_tree[current_index - 1]
-
-
-    def _get_next_tag(self,current_index, tag_tree):
-        if current_index < len(tag_tree) - 1:
-            return tag_tree[current_index + 1]
-        else:
-            return None
-
-
-    def _list_match(self,test_str, list_regex):
-        for regex in list_regex:
-            match = re.match(regex, test_str)
-            if match is not None:
-                return True
-        return False
-
-    def _remove_undesired_line_breaks_from_tag(self,parent,soup):
-
-        if parent is None:
-            return
-
-
-        tag_tree = self._recurisvely_linearise_tag_tree(parent)
-        items_to_remove = []
-
-
-        for item in tag_tree:
-            if item == u'\n':
-               items_to_remove.append(item)
-               continue;
-
-        for item in items_to_remove:
-            tag_tree.remove(item)
-
-
-        spaced_tags = [r'p', r'h\d', r'blockquote']
-        tags_to_extract = []
-        tags_to_replace = []
-        for (i, tag) in enumerate(tag_tree):
-            if isinstance(tag, Tag):
-                if str(tag) == '<br />':
-                    previous_tag = self._get_previous_tag(i, tag_tree)
-
-                    if isinstance(previous_tag, Tag):
-                        previous_tag_is_spaced = previous_tag is not None\
-                             and self._list_match(str(previous_tag.name),
-                                spaced_tags)
-                    else:
-                        previous_tag_is_spaced = False
-
-                    next_tag = self._get_next_tag(i, tag_tree)
-
-                    if isinstance(next_tag, Tag):
-                        next_tag_is_spaced = next_tag is not None\
-                             and self._list_match(str(next_tag.name), spaced_tags)
-                    else:
-                        next_tag_is_spaced = False
-
-                    if previous_tag_is_spaced or next_tag_is_spaced or i == 0\
-                         or i == len(tag_tree) - 1:
-                        tags_to_extract.append(tag)
-                    else:
-                        tags_to_replace.append((tag,NavigableString(' '),))
-
-
-        for pair in tags_to_replace:
-            pair[0].replaceWith(pair[1])
-        for tag in tags_to_extract:
-            tag.extract()
 
     feeds = [
         (u'News - UK',
@@ -610,3 +140,4 @@ class TheIndependentNew(BasicNewsRecipe):
          u'http://www.independent.co.uk/extras/indybest/?service=rss'),
         ]
 
+

From 8036df43285bed9ae9437a4794bbfdc58116c93d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 11 Aug 2013 09:10:42 +0530
Subject: [PATCH 0526/1154] newdb: Fix edit metadata dialog not showing
 undefined dates correctly

---
 src/calibre/gui2/metadata/basic_widgets.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index 519132bf00..3d1a439deb 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -24,8 +24,8 @@ from calibre.ebooks.metadata.meta import get_metadata
 from calibre.gui2 import (file_icon_provider, UNDEFINED_QDATETIME,
         choose_files, error_dialog, choose_images)
 from calibre.gui2.complete2 import EditWithComplete
-from calibre.utils.date import (local_tz, qt_to_dt, as_local_time,
-        UNDEFINED_DATE)
+from calibre.utils.date import (
+    local_tz, qt_to_dt, as_local_time, UNDEFINED_DATE, is_date_undefined)
 from calibre import strftime
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.customize.ui import run_plugins_on_import
@@ -1453,7 +1453,7 @@ class DateEdit(QDateTimeEdit):
         def fget(self):
             return qt_to_dt(self.dateTime(), as_utc=False)
         def fset(self, val):
-            if val is None:
+            if val is None or is_date_undefined(val):
                 val = UNDEFINED_DATE
             else:
                 val = as_local_time(val)

From 72e15d8ec7fe6a4105d27370eddfd26e41f0ea63 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 11 Aug 2013 10:48:23 +0530
Subject: [PATCH 0527/1154] ...

---
 src/calibre/gui2/convert/page_setup.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/convert/page_setup.ui b/src/calibre/gui2/convert/page_setup.ui
index b4e72d33be..a2cb9cfc10 100644
--- a/src/calibre/gui2/convert/page_setup.ui
+++ b/src/calibre/gui2/convert/page_setup.ui
@@ -110,7 +110,7 @@
         <item row="0" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_left">
           <property name="specialValueText">
-           <string>Unset</string>
+           <string>Unchanged</string>
           </property>
           <property name="suffix">
            <string> pt</string>
@@ -139,7 +139,7 @@
         <item row="1" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_top">
           <property name="specialValueText">
-           <string>Unset</string>
+           <string>Unchanged</string>
           </property>
           <property name="suffix">
            <string> pt</string>
@@ -168,7 +168,7 @@
         <item row="2" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_right">
           <property name="specialValueText">
-           <string>Unset</string>
+           <string>Unchanged</string>
           </property>
           <property name="suffix">
            <string> pt</string>
@@ -197,7 +197,7 @@
         <item row="3" column="1">
          <widget class="QDoubleSpinBox" name="opt_margin_bottom">
           <property name="specialValueText">
-           <string>Unset</string>
+           <string>Unchanged</string>
           </property>
           <property name="suffix">
            <string> pt</string>

From 5170076301630df4c625eb69f570e1f0d7007495 Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Sun, 11 Aug 2013 20:44:04 +0200
Subject: [PATCH 0528/1154] Fix bug #1163572

RTF input modifications
---
 .../ebooks/conversion/plugins/rtf_input.py    |  7 +++-
 src/calibre/ebooks/metadata/rtf.py            |  7 +++-
 src/calibre/ebooks/rtf2xml/ParseRtf.py        | 10 ++++-
 src/calibre/ebooks/rtf2xml/char_set.py        |  5 ++-
 src/calibre/ebooks/rtf2xml/check_encoding.py  |  3 +-
 src/calibre/ebooks/rtf2xml/convert_to_tags.py |  4 +-
 .../ebooks/rtf2xml/default_encoding.py        | 42 ++++++++++++++++---
 src/calibre/ebooks/rtf2xml/get_char_map.py    |  6 +--
 src/calibre/ebooks/rtf2xml/hex_2_utf8.py      |  4 +-
 9 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/rtf_input.py b/src/calibre/ebooks/conversion/plugins/rtf_input.py
index 45d7f16608..4a37e45ddc 100644
--- a/src/calibre/ebooks/conversion/plugins/rtf_input.py
+++ b/src/calibre/ebooks/conversion/plugins/rtf_input.py
@@ -96,8 +96,13 @@ class RTFInput(InputFormatPlugin):
             # Write or do not write paragraphs. Default is 0.
             empty_paragraphs = 1,
 
-            #debug
+            # Debug
             deb_dir = debug_dir,
+
+            # Default encoding
+            default_encoding = getattr(self.opts, 'input_encoding', 'cp1252'),
+
+            # Run level
             run_level = run_lev,
         )
         parser.parse_rtf()
diff --git a/src/calibre/ebooks/metadata/rtf.py b/src/calibre/ebooks/metadata/rtf.py
index 5abbfb73f8..0eae93a8d3 100644
--- a/src/calibre/ebooks/metadata/rtf.py
+++ b/src/calibre/ebooks/metadata/rtf.py
@@ -1,5 +1,6 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
 """
 Edit metadata in RTF files.
 """
@@ -61,7 +62,7 @@ def detect_codepage(stream):
     if match is not None:
         num = match.group(1)
         if num == '0':
-            num = '1250'
+            num = '1252'
         codec = 'cp'+num
         try:
             codecs.lookup(codec)
@@ -82,7 +83,9 @@ def decode(raw, codec):
     return raw
 
 def get_metadata(stream):
-    """ Return metadata as a L{MetaInfo} object """
+    """
+    Return metadata as a L{MetaInfo} object
+    """
     stream.seek(0)
     if stream.read(5) != r'{\rtf':
         return MetaInformation(_('Unknown'))
diff --git a/src/calibre/ebooks/rtf2xml/ParseRtf.py b/src/calibre/ebooks/rtf2xml/ParseRtf.py
index 30305b27a7..9c1ae0d00e 100755
--- a/src/calibre/ebooks/rtf2xml/ParseRtf.py
+++ b/src/calibre/ebooks/rtf2xml/ParseRtf.py
@@ -58,6 +58,8 @@ def Handle_Main():
             group_borders = 1,
             # Write or do not write paragraphs. Default is 0.
             empty_paragraphs = 0,
+            # Allow to use a custom default encoding as fallback
+            default_encoding = 'cp1252',
     )
     try:
         parse_obj.parse_rtf()
@@ -101,6 +103,7 @@ class ParseRtf:
                 empty_paragraphs = 1,
                 no_dtd = 0,
                 char_data = '',
+                default_encoding = 'cp1252',
                 ):
 
         """
@@ -144,6 +147,7 @@ class ParseRtf:
         self.__group_borders = group_borders
         self.__empty_paragraphs = empty_paragraphs
         self.__no_dtd = no_dtd
+        self.__default_encoding = default_encoding
 
     def __check_file(self, the_file, type):
         """Check to see if files exist"""
@@ -227,14 +231,15 @@ class ParseRtf:
             run_level = self.__run_level,
             bug_handler = RtfInvalidCodeException,
             check_raw = True,
+            default_encoding = self.__default_encoding,
             )
             platform, code_page, default_font_num = encode_obj.find_default_encoding()
             check_encoding_obj = check_encoding.CheckEncoding(
                     bug_handler = RtfInvalidCodeException,
                         )
             enc = encode_obj.get_codepage()
-            if enc != 'mac_roman':
-                enc = 'cp' + enc
+            #TODO: to check if cp is a good idea or if I should use a dict to convert
+            enc = 'cp' + enc
             msg = '%s\nException in token processing' % str(msg)
             if check_encoding_obj.check_encoding(self.__file, enc):
                 file_name = self.__file if isinstance(self.__file, str) \
@@ -308,6 +313,7 @@ class ParseRtf:
             in_file = self.__temp_file,
             run_level = self.__run_level,
             bug_handler = RtfInvalidCodeException,
+            default_encoding = self.__default_encoding,
             )
         platform, code_page, default_font_num = encode_obj.find_default_encoding()
         hex2utf_obj = hex_2_utf8.Hex2Utf8(
diff --git a/src/calibre/ebooks/rtf2xml/char_set.py b/src/calibre/ebooks/rtf2xml/char_set.py
index bfa18d9971..7f0d1d0d13 100755
--- a/src/calibre/ebooks/rtf2xml/char_set.py
+++ b/src/calibre/ebooks/rtf2xml/char_set.py
@@ -14872,7 +14872,8 @@ LATIN SMALL LETTER U WITH DIAERESIS:'FC:252:&#x00FC;
 LATIN SMALL LETTER Z WITH DOT ABOVE:'FD:380:&#x017C;
 LATIN SMALL LETTER Z WITH CARON:'FE:382:&#x017E;
 </ansicpg1257>
-<mac_roman>
+#mac_roman
+<ansicpg10000>
 LATIN CAPITAL LETTER A WITH DIAERESIS:'80:196:&#x00C4;
 LATIN CAPITAL LETTER A WITH RING ABOVE:'81:197:&#x00C5;
 LATIN CAPITAL LETTER C WITH CEDILLA:'82:199:&#x00C7;
@@ -15001,7 +15002,7 @@ CEDILLA:'FC:184:&#x00B8;
 DOUBLE ACUTE ACCENT:'FD:733:&#x02DD;
 OGONEK:'FE:731:&#x02DB;
 CARON:'FF:711:&#x02C7;
-</mac_roman>
+</ansicpg10000>
 <caps_hex>
 LATIN SMALL LETTER A:'61:97:'41
 LATIN SMALL LETTER B:'62:98:'42
diff --git a/src/calibre/ebooks/rtf2xml/check_encoding.py b/src/calibre/ebooks/rtf2xml/check_encoding.py
index 0f52320aea..f424e9ff12 100755
--- a/src/calibre/ebooks/rtf2xml/check_encoding.py
+++ b/src/calibre/ebooks/rtf2xml/check_encoding.py
@@ -13,8 +13,7 @@ class CheckEncoding:
             try:
                 char.decode(encoding)
             except UnicodeError, msg:
-                sys.stderr.write('line: %s char: %s\n' %  (line_num, char_position))
-                sys.stderr.write(str(msg) + '\n')
+                sys.stderr.write('line: %s char: %s\n%s\n' %  (line_num, char_position, str(msg)))
 
     def check_encoding(self, path, encoding='us-ascii', verbose=True):
         line_num = 0
diff --git a/src/calibre/ebooks/rtf2xml/convert_to_tags.py b/src/calibre/ebooks/rtf2xml/convert_to_tags.py
index 32e2bc69d7..d6af7688c7 100755
--- a/src/calibre/ebooks/rtf2xml/convert_to_tags.py
+++ b/src/calibre/ebooks/rtf2xml/convert_to_tags.py
@@ -36,8 +36,8 @@ class ConvertToTags:
         self.__dtd_path = dtd_path
         self.__no_dtd = no_dtd
         self.__encoding = 'cp' + encoding
-        if encoding == 'mac_roman':
-            self.__encoding = 'mac_roman'
+        # if encoding == 'mac_roman':
+            # self.__encoding = 'mac_roman'
         self.__indent = indent
         self.__run_level = run_level
         self.__write_to = better_mktemp()
diff --git a/src/calibre/ebooks/rtf2xml/default_encoding.py b/src/calibre/ebooks/rtf2xml/default_encoding.py
index c0a43db800..ee428a8dec 100755
--- a/src/calibre/ebooks/rtf2xml/default_encoding.py
+++ b/src/calibre/ebooks/rtf2xml/default_encoding.py
@@ -61,12 +61,43 @@ class DefaultEncoding:
     """
     Find the default encoding for the doc
     """
-    def __init__(self, in_file, bug_handler, run_level = 1, check_raw = False):
+    
+    #Note: not all those encoding are really supported by rtf2xml
+    # See http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
+    # and src\calibre\gui2\widgets.py for the input list in calibre
+    ENCODINGS = {
+                # Special cases
+                'cp1252':'1252',
+                'utf-8':'1252',
+                'ascii':'1252',
+                # Normal cases
+                'big5':'950',
+                'cp1250':'1250',
+                'cp1251':'1251',
+                'cp1253':'1253',
+                'cp1254':'1254',
+                'cp1255':'1255',
+                'cp1256':'1256',
+                'shift_jis':'932',
+                'gb2312':'936',
+                #Not in RTF 1.9.1 codepage specification
+                'hz':'52936',
+                'iso8859_5':'28595',
+                'iso2022_jp':'50222',
+                'iso2022_kr':'50225',
+                'euc_jp':'51932',
+                'euc_kr':'51949',
+                'gb18030':'54936',
+                }
+
+    def __init__(self, in_file, bug_handler, default_encoding, run_level = 1, check_raw = False):
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__platform = 'Windows'
         self.__default_num = 'not-defined'
         self.__code_page = '1252'
+        if default_encoding in self.ENCODINGS.iterkeys():
+            self.__code_page = self.ENCODINGS[default_encoding]
         self.__datafetched = False
         self.__fetchraw = check_raw
 
@@ -75,16 +106,16 @@ class DefaultEncoding:
             self._encoding()
             self.__datafetched = True
             code_page = 'ansicpg' + self.__code_page
-            if self.__code_page == '10000':
-                self.__code_page = 'mac_roman'
+            # if self.__code_page == '10000':
+                # self.__code_page = 'mac_roman'
         return self.__platform, code_page, self.__default_num
 
     def get_codepage(self):
         if not self.__datafetched:
             self._encoding()
             self.__datafetched = True
-            if self.__code_page == '10000':
-                self.__code_page = 'mac_roman'
+            # if self.__code_page == '10000':
+                # self.__code_page = 'mac_roman'
         return self.__code_page
 
     def get_platform(self):
@@ -148,6 +179,7 @@ if __name__ == '__main__':
     import sys
     encode_obj = DefaultEncoding(
             in_file = sys.argv[1],
+            default_encoding = sys.argv[2],
             bug_handler = Exception,
             check_raw = True,
             )
diff --git a/src/calibre/ebooks/rtf2xml/get_char_map.py b/src/calibre/ebooks/rtf2xml/get_char_map.py
index 00a612ffb3..96e6aa4787 100755
--- a/src/calibre/ebooks/rtf2xml/get_char_map.py
+++ b/src/calibre/ebooks/rtf2xml/get_char_map.py
@@ -34,10 +34,8 @@ class GetCharMap:
         self.__bug_handler = bug_handler
 
     def get_char_map(self, map):
-        if map == 'ansicpg0':
-            map = 'ansicpg1250'
-        if map == 'ansicpg10000':
-            map = 'mac_roman'
+        # if map == 'ansicpg10000':
+            # map = 'mac_roman'
         found_map = False
         map_dict = {}
         self.__char_file.seek(0)
diff --git a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
index 2c0f4ffdff..3a8773b0d6 100755
--- a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
+++ b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
@@ -27,8 +27,8 @@ class Hex2Utf8:
             default_char_map,
             bug_handler,
             invalid_rtf_handler,
-            copy=None,
-            temp_dir=None,
+            copy= None,
+            temp_dir= None,
             symbol = None,
             wingdings = None,
             caps = None,

From 12df6bd3d4f24e0f3a86bf70713d12aa7074cbac Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Sun, 11 Aug 2013 20:45:23 +0200
Subject: [PATCH 0529/1154] Bibtex typo

---
 src/calibre/utils/bibtex.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/calibre/utils/bibtex.py b/src/calibre/utils/bibtex.py
index c59de68f55..2ffd2003c2 100644
--- a/src/calibre/utils/bibtex.py
+++ b/src/calibre/utils/bibtex.py
@@ -2858,39 +2858,36 @@ class BibTeX:
 
     def ValidateCitationKey(self, text):
         """
-        removes characters not allowed in BibTeX keys
+        Removes characters not allowed in BibTeX keys
         """
         return self.invalid_cit.sub(u'', text)
 
     def braceUppercase(self, text):
-        """ Convert uppercase letters to bibtex encoded uppercase
+        """ 
+        Convert uppercase letters to bibtex encoded uppercase
         """
         return self.upper.sub(lambda m: u'{%s}' % m.group(), text)
 
     def resolveEntities(self, text):
-        # for entity, entity_map in entity_mapping.iteritems():
-        #   text = text.replace(entity, entity_map)
-        # return text
         return self.rep_ent.mreplace(text)
 
     def resolveUnicode(self, text):
         # UTF-8 text as entry
-        # for unichar, latexenc in utf8enc2latex_mapping.iteritems() :
-        #    text = text.replace(unichar, latexenc)
         text = self.rep_utf8.mreplace(text)
         return text.replace(u'$}{$', u'')
 
     def escapeSpecialCharacters(self, text):
         """
-        latex escaping some (not all) special characters
+        Latex escaping some (not all) special characters
         """
         text.replace('\\', '\\\\')
         return self.escape.sub(lambda m: u'\\%s' % m.group(), text)
 
-    # Calibre functions
-    # Option to go to official ASCII Bibtex or unofficial UTF-8
-    # Go from an unicode entry to ASCII Bibtex format without encoding
+    # Calibre functions: Option to go to official ASCII Bibtex or unofficial UTF-8
     def utf8ToBibtex(self, text):
+        """
+        Go from an unicode entry to ASCII Bibtex format without encoding
+        """
         if len(text) == 0:
             return ''
         text.replace('\\', '\\\\')
@@ -2900,6 +2897,8 @@ class BibTeX:
         return self.escapeSpecialCharacters(text)
 
     def bibtex_author_format(self, item):
-        # Format authors for Bibtex compliance (get a list as input)
+        """
+        Format authors for Bibtex compliance (get a list as input)
+        """
         return self.utf8ToBibtex(u' and '.join([author for author in item]))
 

From 989e6de90709e7ce78158eea1b1640d336b24120 Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Sun, 11 Aug 2013 20:46:55 +0200
Subject: [PATCH 0530/1154] Bulk trim newdb

Widget + newdb modifications
---
 src/calibre/gui2/dialogs/metadata_bulk.py | 12 ++++++++++++
 src/calibre/gui2/dialogs/metadata_bulk.ui |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index c72f1533a5..88c51d4e7f 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -204,6 +204,16 @@ class MyBlockingBusyNew(QDialog):  # {{{
                     covers.sort(key=lambda x: x[1])
                     if covers:
                         cache.set_cover({book_id:covers[-1][0]})
+        elif args.cover_action == 'trim':
+            from calibre.utils.magick import Image
+            for book_id in self.ids:
+                cdata = cache.cover(book_id)
+                if cdata:
+                    im = Image()
+                    im.load(cdata)
+                    im.trim(10)
+                    cdata = im.export('png')
+                    cache.set_cover({book_id:cdata})
 
         # Formats
         if args.do_remove_format:
@@ -1213,6 +1223,8 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
             cover_action = 'generate'
         elif self.cover_from_fmt.isChecked():
             cover_action = 'fromfmt'
+        elif self.cover_trim.isChecked():
+            cover_action = 'trim'
 
         args = Settings(remove_all, remove, add, au, aus, do_aus, rating, pub, do_series,
                 do_autonumber, do_remove_format, remove_format, do_swap_ta,
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index 2b48e635be..afc5e55449 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -603,6 +603,13 @@ Future conversion of these books will use the default settings.</string>
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QRadioButton" name="cover_trim">
+                <property name="text">
+                 <string>&amp;Trim cover</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QRadioButton" name="cover_from_fmt">
                 <property name="text">

From 0aa490214b4c56c989a2ccf169fd7156f7e13c2c Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Sun, 11 Aug 2013 22:16:59 +0200
Subject: [PATCH 0531/1154] Bulk trim legacy db

---
 src/calibre/gui2/dialogs/metadata_bulk.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 88c51d4e7f..48b1eec784 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -433,6 +433,15 @@ class MyBlockingBusy(QDialog):  # {{{
                     if covers:
                         self.db.set_cover(id, covers[-1][0])
                     covers = []
+            elif cover_action == 'trim':
+                from calibre.utils.magick import Image
+                cdata = self.db.cover(id, index_is_id=True)
+                if cdata:
+                    im = Image()
+                    im.load(cdata)
+                    im.trim(10)
+                    cdata = im.export('png')
+                    self.db.set_cover(id, cdata)
 
             if do_remove_format:
                 self.db.remove_format(id, remove_format, index_is_id=True,

From 6c2ca8975d4d702c761af746ea55abc3aeb5ce27 Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Sun, 11 Aug 2013 22:43:17 +0200
Subject: [PATCH 0532/1154] Added the fuzz tweak variable

---
 resources/default_tweaks.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index d8e158f842..411aab42a8 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -385,6 +385,14 @@ sort_dates_using_visible_fields = False
 generate_cover_title_font = None
 generate_cover_foot_font = None
 
+#: Fuzz parameter value for cover trim
+# The value used by ImageMagick for the
+# fuzz distance when triming a cover.
+# Colors within this distance are considered equal. 
+# The distance can be in absolute intensity units or,
+# by appending %, a percentage of the maximum possible intensity
+cover_trim_fuzz_value = 10
+
 #: Control behavior of the book list
 # You can control the behavior of doubleclicks on the books list.
 # Choices: open_viewer, do_nothing,

From 0a01e4b72f22ab156cdc4e62debde6b3a75835a8 Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Sun, 11 Aug 2013 23:08:43 +0200
Subject: [PATCH 0533/1154] Replaced the fixed trim

Single and bulk metadata trim modification with tweaked value
---
 src/calibre/gui2/dialogs/metadata_bulk.py  | 4 ++--
 src/calibre/gui2/metadata/basic_widgets.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 48b1eec784..f0baaaf17a 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -211,7 +211,7 @@ class MyBlockingBusyNew(QDialog):  # {{{
                 if cdata:
                     im = Image()
                     im.load(cdata)
-                    im.trim(10)
+                    im.trim(tweaks['cover_trim_fuzz_value'])
                     cdata = im.export('png')
                     cache.set_cover({book_id:cdata})
 
@@ -439,7 +439,7 @@ class MyBlockingBusy(QDialog):  # {{{
                 if cdata:
                     im = Image()
                     im.load(cdata)
-                    im.trim(10)
+                    im.trim(tweaks['cover_trim_fuzz_value'])
                     cdata = im.export('png')
                     self.db.set_cover(id, cdata)
 
diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index 519132bf00..a675220117 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -971,7 +971,7 @@ class Cover(ImageView):  # {{{
             return
         im = Image()
         im.load(cdata)
-        im.trim(10)
+        im.trim(tweaks['cover_trim_fuzz_value'])
         cdata = im.export('png')
         self.current_val = cdata
 

From dc51ad4236c7414ac196dd1671175febcfd9c0f8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 08:52:03 +0530
Subject: [PATCH 0534/1154] Daily Express by Dave Asbury

---
 recipes/daily_express.recipe | 67 ++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 recipes/daily_express.recipe

diff --git a/recipes/daily_express.recipe b/recipes/daily_express.recipe
new file mode 100644
index 0000000000..c9b620eeec
--- /dev/null
+++ b/recipes/daily_express.recipe
@@ -0,0 +1,67 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+import re
+class AdvancedUserRecipe1376229553(BasicNewsRecipe):
+    title          = u'Daily Express'
+    __author__ = 'Dave Asbury'
+    encoding    = 'utf-8'
+    remove_empty_feeds = True
+    #remove_javascript     = True
+    no_stylesheets        = True
+    oldest_article = 2
+    max_articles_per_feed = 10
+    #auto_cleanup = True
+    compress_news_images = True
+    compress_news_images_max_size = 25
+    ignore_duplicate_articles = {'title', 'url'}
+
+    remove_tags = [
+                                dict(name='footer'),
+                                dict(attrs={'id' : 'header_addons'}),
+                dict(attrs={'class' : 'hoverException'}),
+                                dict(name='_li'),dict(name='li'),
+                        dict(attrs={'class' : 'box related-articles clear'}),
+                                dict(attrs={'class' : 'news-list'}),
+                             ]
+    keep_only_tags = [
+                dict(name='h1'),
+                                dict(attrs={'class' : 'publish-info'}),
+                                # dict(name='h3'),
+                                #dict(name='section',attrs={'class' : 'photo'}),
+                #dict(name='section',attrs={'class' : 'text-description'}),
+
+                dict(attrs={'class' : 'clearfix hR new-style'}),
+                             ]
+
+    preprocess_regexps = [
+        (re.compile(r'widget', re.IGNORECASE | re.DOTALL), lambda match: '')]
+
+    preprocess_regexps = [
+        (re.compile(r'<h3>More UK</h3>', re.IGNORECASE | re.DOTALL), lambda match: '')]
+
+    feeds          = [(u'UK News', u'http://www.express.co.uk/posts/rss/1/uk'),
+                 (u'World News',u'http://www.express.co.uk/posts/rss/78/world'),
+                         (u'Finance',u'http://www.express.co.uk/posts/rss/21/finance'),
+                 (u'Sport',u'http://www.express.co.uk/posts/rss/65/sport'),
+                 (u'Entertainment',u'http://www.express.co.uk/posts/rss/18/entertainment'),
+                         (u'Lifestyle',u'http://www.express.co.uk/posts/rss/8/life&style'),
+                 (u'Fun',u'http://www.express.co.uk/posts/rss/110/fun'),
+                        ]
+
+    def get_cover_url(self):
+        soup = self.index_to_soup('http://www.express.co.uk/ourpaper/')
+        cov = soup.find(attrs={'src' : re.compile('http://images.dailyexpress.co.uk/img/covers/')})
+        cov=str(cov)
+        cov2 =  re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', cov)
+
+        cov=str(cov2)
+        cov=cov[2:len(cov)-2]
+        cover_url=cov
+        return cover_url
+
+    extra_css = '''
+                    h1{font-weight:bold;font-size:26px;}
+                    h2{font-weight:normal;font-size:small;}
+                    p{font-size:14px;}
+                    body{font-size:14px;}
+      '''
+

From 361ab678fb9f6d97c6037049966e0294b04634ba Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Mon, 12 Aug 2013 07:18:29 +0200
Subject: [PATCH 0535/1154] Change image export format to jpg

---
 src/calibre/gui2/dialogs/metadata_bulk.py  | 4 ++--
 src/calibre/gui2/metadata/basic_widgets.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index f0baaaf17a..5f6d3bcc3a 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -212,7 +212,7 @@ class MyBlockingBusyNew(QDialog):  # {{{
                     im = Image()
                     im.load(cdata)
                     im.trim(tweaks['cover_trim_fuzz_value'])
-                    cdata = im.export('png')
+                    cdata = im.export('jpg')
                     cache.set_cover({book_id:cdata})
 
         # Formats
@@ -440,7 +440,7 @@ class MyBlockingBusy(QDialog):  # {{{
                     im = Image()
                     im.load(cdata)
                     im.trim(tweaks['cover_trim_fuzz_value'])
-                    cdata = im.export('png')
+                    cdata = im.export('jpg')
                     self.db.set_cover(id, cdata)
 
             if do_remove_format:
diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index a675220117..0fb2d0b197 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -972,7 +972,7 @@ class Cover(ImageView):  # {{{
         im = Image()
         im.load(cdata)
         im.trim(tweaks['cover_trim_fuzz_value'])
-        cdata = im.export('png')
+        cdata = im.export('jpg')
         self.current_val = cdata
 
     def generate_cover(self, *args):

From 1d0a181f5e5f29d43b37ad721e57d765bbc606d0 Mon Sep 17 00:00:00 2001
From: sengian <sengian1@gmail.com>
Date: Mon, 12 Aug 2013 07:26:51 +0200
Subject: [PATCH 0536/1154] Fixed tweak text for % not available

---
 resources/default_tweaks.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index 411aab42a8..47e742875b 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -386,11 +386,9 @@ generate_cover_title_font = None
 generate_cover_foot_font = None
 
 #: Fuzz parameter value for cover trim
-# The value used by ImageMagick for the
-# fuzz distance when triming a cover.
+# The value used by ImageMagick for the fuzz distance when trimming a cover.
 # Colors within this distance are considered equal. 
-# The distance can be in absolute intensity units or,
-# by appending %, a percentage of the maximum possible intensity
+# The distance is in absolute intensity units.
 cover_trim_fuzz_value = 10
 
 #: Control behavior of the book list

From 9859812ec935c57a31d9a3a98c70bf0159295fe9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 13:40:36 +0530
Subject: [PATCH 0537/1154] Cover grid: Add a disk cache for rendered
 thumbnails

---
 src/calibre/db/backend.py                   |  16 +
 src/calibre/db/cache.py                     |  15 +-
 src/calibre/db/tests/utils.py               |  83 +++++
 src/calibre/db/utils.py                     | 297 +++++++++++++++
 src/calibre/gui2/__init__.py                |   1 +
 src/calibre/gui2/library/alternate_views.py |  94 ++++-
 src/calibre/gui2/library/caches.py          |  15 +-
 src/calibre/gui2/preferences/look_feel.py   |  41 ++-
 src/calibre/gui2/preferences/look_feel.ui   | 377 ++++++++++++--------
 9 files changed, 768 insertions(+), 171 deletions(-)
 create mode 100644 src/calibre/db/tests/utils.py
 create mode 100644 src/calibre/db/utils.py

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 871d704ce1..f977bbff49 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1225,6 +1225,22 @@ class DB(object):
                         return True
         return False
 
+    def cover_or_cache(self, path, timestamp):
+        path = os.path.abspath(os.path.join(self.library_path, path, 'cover.jpg'))
+        try:
+            stat = os.stat(path)
+        except EnvironmentError:
+            return False, None, None
+        if abs(timestamp - stat.st_mtime) < 0.1:
+            return True, None, None
+        try:
+            f = lopen(path, 'rb')
+        except (IOError, OSError):
+            time.sleep(0.2)
+        f = lopen(path, 'rb')
+        with f:
+            return True, f.read(), stat.st_mtime
+
     def set_cover(self, book_id, path, data):
         path = os.path.abspath(os.path.join(self.library_path, path))
         if not os.path.exists(path):
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 0b58c23c1d..2dc5d557f7 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -587,6 +587,14 @@ class Cache(object):
                 ret = i
         return ret
 
+    @read_api
+    def cover_or_cache(self, book_id, timestamp):
+        try:
+            path = self._field_for('path', book_id).replace('/', os.sep)
+        except AttributeError:
+            return False, None, None
+        return self.backend.cover_or_cache(path, timestamp)
+
     @read_api
     def cover_last_modified(self, book_id):
         try:
@@ -1032,8 +1040,8 @@ class Cache(object):
                 path = self._field_for('path', book_id).replace('/', os.sep)
 
             self.backend.set_cover(book_id, path, data)
-            for cc in self.cover_caches:
-                cc.invalidate(book_id)
+        for cc in self.cover_caches:
+            cc.invalidate(book_id_data_map)
         return self._set_field('cover', {
             book_id:(0 if data is None else 1) for book_id, data in book_id_data_map.iteritems()})
 
@@ -1352,8 +1360,7 @@ class Cache(object):
         self._search_api.discard_books(book_ids)
         self._clear_caches(book_ids=book_ids, template_cache=False, search_cache=False)
         for cc in self.cover_caches:
-            for book_id in book_ids:
-                cc.invalidate(book_id)
+            cc.invalidate(book_ids)
 
     @read_api
     def author_sort_strings_for_books(self, book_ids):
diff --git a/src/calibre/db/tests/utils.py b/src/calibre/db/tests/utils.py
new file mode 100644
index 0000000000..c30264b6bb
--- /dev/null
+++ b/src/calibre/db/tests/utils.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import shutil
+
+from calibre import walk
+from calibre.db.tests.base import BaseTest
+from calibre.db.utils import ThumbnailCache
+
+class UtilsTest(BaseTest):
+
+    def setUp(self):
+        self.tdir = self.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.tdir)
+
+    def init_tc(self, name='1', max_size=1):
+        return ThumbnailCache(name=name, location=self.tdir, max_size=max_size, test_mode=True)
+
+    def basic_fill(self, c, num=5):
+        total = 0
+        for i in range(1, num+1):
+            sz = i * 1000
+            c.insert(i, i, (('%d'%i) * sz).encode('ascii'))
+            total += sz
+        return total
+
+    def test_thumbnail_cache(self):  # {{{
+        ' Test the operation of the thumbnail cache '
+        c = self.init_tc()
+        self.assertFalse(hasattr(c, 'total_size'), 'index read on initialization')
+        c.invalidate(666)
+        self.assertFalse(hasattr(c, 'total_size'), 'index read on invalidate')
+
+        self.assertEqual(self.basic_fill(c), c.total_size)
+        self.assertEqual(5, len(c))
+
+        for i in (3, 4, 2, 5, 1):
+            data, ts = c[i]
+            self.assertEqual(i, ts, 'timestamp not correct')
+            self.assertEqual((('%d'%i) * (i*1000)).encode('ascii'), data)
+        c.set_group_id('a')
+        self.basic_fill(c)
+        order = tuple(c.items)
+        ts = c.current_size
+        c.shutdown()
+        c = self.init_tc()
+        self.assertEqual(c.current_size, ts, 'size not preserved after restart')
+        self.assertEqual(order, tuple(c.items), 'order not preserved after restart')
+        c.shutdown()
+        c = self.init_tc()
+        c.invalidate((1,))
+        self.assertIsNone(c[1][1], 'invalidate before load_index() failed')
+        c.invalidate((2,))
+        self.assertIsNone(c[2][1], 'invalidate after load_index() failed')
+        c.set_group_id('a')
+        c[1]
+        c.set_size(0.001)
+        self.assertLessEqual(c.current_size, 1024, 'set_size() failed')
+        self.assertEqual(len(c), 1)
+        self.assertIn(1, c)
+        c.insert(9, 9, b'x' * (c.max_size-1))
+        self.assertEqual(len(c), 1)
+        self.assertLessEqual(c.current_size, c.max_size, 'insert() did not prune')
+        self.assertIn(9, c)
+        c.empty()
+        self.assertEqual(c.total_size, 0)
+        self.assertEqual(len(c), 0)
+        self.assertEqual(tuple(walk(c.location)), ())
+        c = self.init_tc()
+        self.basic_fill(c)
+        self.assertEqual(len(c), 5)
+        c.set_thumbnail_size(200, 201)
+        self.assertIsNone(c[1][0])
+        self.assertEqual(len(c), 0)
+        self.assertEqual(tuple(walk(c.location)), ())
+    # }}}
diff --git a/src/calibre/db/utils.py b/src/calibre/db/utils.py
new file mode 100644
index 0000000000..8f77b9204e
--- /dev/null
+++ b/src/calibre/db/utils.py
@@ -0,0 +1,297 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os, errno, cPickle, sys
+from collections import OrderedDict, namedtuple
+from future_builtins import map
+from threading import Lock
+
+from calibre import as_unicode, prints
+from calibre.constants import cache_dir
+
+Entry = namedtuple('Entry', 'path size timestamp thumbnail_size')
+class CacheError(Exception):
+    pass
+
+class ThumbnailCache(object):
+
+    ' This is a persistent disk cache to speed up loading and resizing of covers '
+
+    def __init__(self,
+                 max_size=1024,  # The maximum disk space in MB
+                 name='thumbnail-cache',  # The name of this cache (should be unique in location)
+                 thumbnail_size=(100, 100),   # The size of the thumbnails, can be changed
+                 location=None,   # The location for this cache, if None cache_dir() is used
+                 test_mode=False,  # Used for testing
+                 min_disk_cache=0):  # If the size is set less than or equal to this value, the cache is disabled.
+        self.location = os.path.join(location or cache_dir(), name)
+        if max_size <= min_disk_cache:
+            max_size = 0
+        self.max_size = int(max_size * (1024**2))
+        self.group_id = 'group'
+        self.thumbnail_size = thumbnail_size
+        self.size_changed = False
+        self.lock = Lock()
+        self.min_disk_cache = min_disk_cache
+        if test_mode:
+            self.log = self.fail_on_error
+
+    def log(self, *args, **kwargs):
+        kwargs['file'] = sys.stderr
+        prints(*args, **kwargs)
+
+    def fail_on_error(self, *args, **kwargs):
+        msg = ' '.join(args)
+        raise CacheError(msg)
+
+    def _do_delete(self, path):
+        try:
+            os.remove(path)
+        except EnvironmentError as err:
+            self.log('Failed to delete cached thumbnail file:', as_unicode(err))
+
+    def _load_index(self):
+        'Load the index, automatically removing incorrectly sized thumbnails and pruning to fit max_size'
+        try:
+            os.makedirs(self.location)
+        except OSError as err:
+            if err.errno != errno.EEXIST:
+                self.log('Failed to make thumbnail cache dir:', as_unicode(err))
+        self.total_size = 0
+        self.items = OrderedDict()
+        order = self._read_order()
+        def listdir(*args):
+            try:
+                return os.listdir(os.path.join(*args))
+            except EnvironmentError:
+                return ()  # not a directory or no permission or whatever
+        entries = ('/'.join((parent, subdir, entry))
+                   for parent in listdir(self.location)
+                   for subdir in listdir(self.location, parent)
+                   for entry in listdir(self.location, parent, subdir))
+
+        invalidate = set()
+        try:
+            with open(os.path.join(self.location, 'invalidate'), 'rb') as f:
+                raw = f.read()
+        except EnvironmentError as err:
+            if getattr(err, 'errno', None) != errno.ENOENT:
+                self.log('Failed to read thumbnail invalidate data:', as_unicode(err))
+        else:
+            try:
+                os.remove(os.path.join(self.location, 'invalidate'))
+            except EnvironmentError as err:
+                self.log('Failed to remove thumbnail invalidate data:', as_unicode(err))
+            else:
+                def record(line):
+                    try:
+                        uuid, book_id = line.partition(' ')[0::2]
+                        book_id = int(book_id)
+                        return (uuid, book_id)
+                    except Exception:
+                        return None
+                invalidate = {record(x) for x in raw.splitlines()}
+        items = []
+        try:
+            for entry in entries:
+                try:
+                    uuid, name = entry.split('/')[0::2]
+                    book_id, timestamp, size, thumbnail_size = name.split('-')
+                    book_id, timestamp, size = int(book_id), float(timestamp), int(size)
+                    thumbnail_size = tuple(map(int, thumbnail_size.partition('x')[0::2]))
+                except (ValueError, TypeError, IndexError, KeyError, AttributeError):
+                    continue
+                key = (uuid, book_id)
+                path = os.path.join(self.location, entry)
+                if self.thumbnail_size == thumbnail_size and key not in invalidate:
+                    items.append((key, Entry(path, size, timestamp, thumbnail_size)))
+                    self.total_size += size
+                else:
+                    self._do_delete(path)
+        except EnvironmentError as err:
+            self.log('Failed to read thumbnail cache dir:', as_unicode(err))
+
+        self.items = OrderedDict(sorted(items, key=lambda x:order.get(hash(x[0]), 0)))
+        self._apply_size()
+
+    def _invalidate_sizes(self):
+        if self.size_changed:
+            size = self.thumbnail_size
+            remove = (key for key, entry in self.items.iteritems() if size != entry.thumbnail_size)
+            for key in remove:
+                self._remove(key)
+            self.size_changed = False
+
+    def _remove(self, key):
+        entry = self.items.pop(key, None)
+        if entry is not None:
+            self._do_delete(entry.path)
+            self.total_size -= entry.size
+
+    def _apply_size(self):
+        while self.total_size > self.max_size and self.items:
+            entry = self.items.popitem(last=False)[1]
+            self._do_delete(entry.path)
+            self.total_size -= entry.size
+
+    def _write_order(self):
+        if hasattr(self, 'items'):
+            try:
+                with open(os.path.join(self.location, 'order'), 'wb') as f:
+                    f.write(cPickle.dumps(tuple(map(hash, self.items)), -1))
+            except EnvironmentError as err:
+                self.log('Failed to save thumbnail cache order:', as_unicode(err))
+
+    def _read_order(self):
+        order = {}
+        try:
+            with open(os.path.join(self.location, 'order'), 'rb') as f:
+                order = cPickle.loads(f.read())
+                order = {k:i for i, k in enumerate(order)}
+        except Exception as err:
+            if getattr(err, 'errno', None) != errno.ENOENT:
+                self.log('Failed to load thumbnail cache order:', as_unicode(err))
+        return order
+
+    def shutdown(self):
+        with self.lock:
+            self._write_order()
+
+    def set_group_id(self, group_id):
+        with self.lock:
+            self.group_id = group_id
+
+    def set_thumbnail_size(self, width, height):
+        with self.lock:
+            self.thumbnail_size = (width, height)
+            self.size_changed = True
+
+    def insert(self, book_id, timestamp, data):
+        if self.max_size < len(data):
+            return
+        with self.lock:
+            if not hasattr(self, 'total_size'):
+                self._load_index()
+            self._invalidate_sizes()
+            ts = ('%.2f' % timestamp).replace('.00', '')
+            path = '%s%s%s%s%d-%s-%d-%dx%d' % (
+                self.group_id, os.sep, book_id % 100, os.sep,
+                book_id, ts, len(data), self.thumbnail_size[0], self.thumbnail_size[1])
+            path = os.path.join(self.location, path)
+            key = (self.group_id, book_id)
+            e = self.items.pop(key, None)
+            self.total_size -= getattr(e, 'size', 0)
+            try:
+                with open(path, 'wb') as f:
+                    f.write(data)
+            except EnvironmentError as err:
+                d = os.path.dirname(path)
+                if not os.path.exists(d):
+                    try:
+                        os.makedirs(d)
+                        with open(path, 'wb') as f:
+                            f.write(data)
+                    except EnvironmentError as err:
+                        self.log('Failed to write cached thumbnail:', path, as_unicode(err))
+                        return self._apply_size()
+                else:
+                    self.log('Failed to write cached thumbnail:', path, as_unicode(err))
+                    return self._apply_size()
+            self.items[key] = Entry(path, len(data), timestamp, self.thumbnail_size)
+            self.total_size += len(data)
+            self._apply_size()
+
+    def __len__(self):
+        with self.lock:
+            try:
+                return len(self.items)
+            except AttributeError:
+                self._load_index()
+                return len(self.items)
+
+    def __contains__(self, book_id):
+        with self.lock:
+            try:
+                return (self.group_id, book_id) in self.items
+            except AttributeError:
+                self._load_index()
+                return (self.group_id, book_id) in self.items
+
+    def __getitem__(self, book_id):
+        with self.lock:
+            if not hasattr(self, 'total_size'):
+                self._load_index()
+            self._invalidate_sizes()
+            key = (self.group_id, book_id)
+            entry = self.items.pop(key, None)
+            if entry is None:
+                return None, None
+            if entry.thumbnail_size != self.thumbnail_size:
+                try:
+                    os.remove(entry.path)
+                except EnvironmentError as err:
+                    if getattr(err, 'errno', None) != errno.ENOENT:
+                        self.log('Failed to remove cached thumbnail:', entry.path, as_unicode(err))
+                self.total_size -= entry.size
+                return None, None
+            self.items[key] = entry
+            try:
+                with open(entry.path, 'rb') as f:
+                    data = f.read()
+            except EnvironmentError as err:
+                self.log('Failed to read cached thumbnail:', entry.path, as_unicode(err))
+                return None, None
+            return data, entry.timestamp
+
+    def invalidate(self, book_ids):
+        with self.lock:
+            if hasattr(self, 'total_size'):
+                for book_id in book_ids:
+                    self._remove((self.group_id, book_id))
+            elif os.path.exists(self.location):
+                try:
+                    raw = '\n'.join('%s %d' % (self.group_id, book_id) for book_id in book_ids)
+                    with open(os.path.join(self.location, 'invalidate'), 'ab') as f:
+                        f.write(raw.encode('ascii'))
+                except EnvironmentError as err:
+                    self.log('Failed to write invalidate thumbnail record:', as_unicode(err))
+
+    @property
+    def current_size(self):
+        with self.lock:
+            if not hasattr(self, 'total_size'):
+                self._load_index()
+            return self.total_size
+
+    def empty(self):
+        with self.lock:
+            try:
+                os.remove(os.path.join(self.location, 'order'))
+            except EnvironmentError:
+                pass
+            if not hasattr(self, 'total_size'):
+                self._load_index()
+            for entry in self.items.itervalues():
+                self._do_delete(entry.path)
+            self.total_size = 0
+            self.items = OrderedDict()
+
+    def __hash__(self):
+        return id(self)
+
+    def set_size(self, size_in_mb):
+        if size_in_mb <= self.min_disk_cache:
+            size_in_mb = 0
+        size_in_mb = max(0, size_in_mb)
+        with self.lock:
+            self.max_size = int(size_in_mb * (1024**2))
+            if hasattr(self, 'total_size'):
+                self._apply_size()
+
+
+
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 7d0f85094b..50e434bb49 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -115,6 +115,7 @@ defs['cover_grid_width'] = 0
 defs['cover_grid_height'] = 0
 defs['cover_grid_color'] = (80, 80, 80)
 defs['cover_grid_cache_size'] = 200
+defs['cover_grid_disk_cache_size'] = 2000
 defs['cover_grid_spacing'] = 0
 defs['cover_grid_show_title'] = False
 del defs
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index cd62d38a3c..fe5117916a 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -19,14 +19,29 @@ from PyQt4.Qt import (
     QTimer, QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication,
     QMimeData, QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QEvent,
     QPropertyAnimation, QEasingCurve, pyqtSlot, QHelpEvent, QAbstractItemView,
-    QStyleOptionViewItem, QToolTip)
+    QStyleOptionViewItem, QToolTip, QByteArray, QBuffer)
 
-from calibre import fit_image
+from calibre import fit_image, prints
 from calibre.gui2 import gprefs, config
-from calibre.gui2.library.caches import CoverCache
+from calibre.gui2.library.caches import CoverCache, ThumbnailCache
 from calibre.utils.config import prefs
 
 CM_TO_INCH = 0.393701
+CACHE_FORMAT = 'PPM'
+
+class EncodeError(ValueError):
+    pass
+
+def image_to_data(image):  # {{{
+    ba = QByteArray()
+    buf = QBuffer(ba)
+    buf.open(QBuffer.WriteOnly)
+    if not image.save(buf, CACHE_FORMAT):
+        raise EncodeError('Failed to encode thumbnail')
+    ret = bytes(ba.data())
+    buf.close()
+    return ret
+# }}}
 
 # Drag 'n Drop {{{
 def dragMoveEvent(self, event):
@@ -443,6 +458,8 @@ class GridView(QListView):
         self.setSpacing(self.delegate.spacing)
         self.set_color()
         self.ignore_render_requests = Event()
+        self.thumbnail_cache = ThumbnailCache(max_size=gprefs['cover_grid_disk_cache_size'],
+            thumbnail_size=(self.delegate.cover_size.width(), self.delegate.cover_size.height()))
         self.render_thread = None
         self.update_item.connect(self.re_render, type=Qt.QueuedConnection)
         self.doubleClicked.connect(self.double_clicked)
@@ -485,12 +502,10 @@ class GridView(QListView):
     def slider_pressed(self):
         self.ignore_render_requests.set()
         self.verticalScrollBar().valueChanged.connect(self.value_changed_during_scroll)
-        self.update_timer.setInterval(500)
 
     def slider_released(self):
         self.update_viewport()
         self.verticalScrollBar().valueChanged.disconnect(self.value_changed_during_scroll)
-        self.update_timer.setInterval(200)
 
     def value_changed_during_scroll(self):
         if self.ignore_render_requests.is_set():
@@ -545,9 +560,15 @@ class GridView(QListView):
             self.setSpacing(self.delegate.spacing)
         self.set_color()
         self.delegate.cover_cache.set_limit(gprefs['cover_grid_cache_size'])
+        if size_changed:
+            self.thumbnail_cache.set_thumbnail_size(self.delegate.cover_size.width(), self.delegate.cover_size.height())
+        cs = gprefs['cover_grid_disk_cache_size']
+        if (cs*(1024**2)) != self.thumbnail_cache.max_size:
+            self.thumbnail_cache.set_size(cs)
 
     def shown(self):
         if self.render_thread is None:
+            self.thumbnail_cache.set_database(self.gui.current_db)
             self.render_thread = Thread(target=self.render_covers)
             self.render_thread.daemon = True
             self.render_thread.start()
@@ -572,19 +593,51 @@ class GridView(QListView):
     def render_cover(self, book_id):
         if self.ignore_render_requests.is_set():
             return
-        cdata = self.model().db.new_api.cover(book_id)
-        if cdata is not None:
+        tcdata, timestamp = self.thumbnail_cache[book_id]
+        use_cache = False
+        if timestamp is None:
+            # Not in cache
+            has_cover, cdata, timestamp = self.model().db.new_api.cover_or_cache(book_id, 0)
+        else:
+            has_cover, cdata, timestamp = self.model().db.new_api.cover_or_cache(book_id, timestamp)
+            if has_cover and cdata is None:
+                # The cached cover is fresh
+                cdata = tcdata
+                use_cache = True
+
+        if has_cover:
             p = QImage()
-            p.loadFromData(cdata)
-            cdata = None
-            if not p.isNull():
-                width, height = p.width(), p.height()
-                scaled, nwidth, nheight = fit_image(width, height, self.delegate.cover_size.width(), self.delegate.cover_size.height())
-                if scaled:
-                    if self.ignore_render_requests.is_set():
-                        return
-                    p = p.scaled(nwidth, nheight, Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
-                cdata = p
+            p.loadFromData(cdata, CACHE_FORMAT if cdata is tcdata else 'JPEG')
+            if p.isNull() and cdata is tcdata:
+                # Invalid image in cache
+                self.thumbnail_cache.invalidate((book_id,))
+                self.update_item.emit(book_id)
+                return
+            cdata = None if p.isNull() else p
+            if not use_cache:  # cache is stale
+                if cdata is not None:
+                    width, height = p.width(), p.height()
+                    scaled, nwidth, nheight = fit_image(width, height, self.delegate.cover_size.width(), self.delegate.cover_size.height())
+                    if scaled:
+                        if self.ignore_render_requests.is_set():
+                            return
+                        p = p.scaled(nwidth, nheight, Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
+                    cdata = p
+                # update cache
+                if cdata is None:
+                    self.thumbnail_cache.invalidate((book_id,))
+                else:
+                    try:
+                        self.thumbnail_cache.insert(book_id, timestamp, image_to_data(cdata))
+                    except EncodeError as err:
+                        self.thumbnail_cache.invalidate((book_id,))
+                        prints(err)
+                    except Exception:
+                        import traceback
+                        traceback.print_exc()
+        elif tcdata is not None:
+            # Cover was removed, but it exists in cache, remove from cache
+            self.thumbnail_cache.invalidate((book_id,))
         self.delegate.cover_cache.set(book_id, cdata)
         self.update_item.emit(book_id)
 
@@ -600,6 +653,7 @@ class GridView(QListView):
     def shutdown(self):
         self.ignore_render_requests.set()
         self.delegate.render_queue.put(None)
+        self.thumbnail_cache.shutdown()
 
     def set_database(self, newdb, stage=0):
         if not hasattr(newdb, 'new_api'):
@@ -607,10 +661,12 @@ class GridView(QListView):
         if stage == 0:
             self.ignore_render_requests.set()
             try:
-                self.model().db.new_api.remove_cover_cache(self.delegate.cover_cache)
+                for x in (self.delegate.cover_cache, self.thumbnail_cache):
+                    self.model().db.new_api.remove_cover_cache(x)
             except AttributeError:
                 pass  # db is None
-            newdb.new_api.add_cover_cache(self.delegate.cover_cache)
+            for x in (self.delegate.cover_cache, self.thumbnail_cache):
+                newdb.new_api.add_cover_cache(x)
             try:
                 # Use a timeout so that if, for some reason, the render thread
                 # gets stuck, we dont deadlock, future covers wont get
diff --git a/src/calibre/gui2/library/caches.py b/src/calibre/gui2/library/caches.py
index 45dc5cddd5..2788bcfefe 100644
--- a/src/calibre/gui2/library/caches.py
+++ b/src/calibre/gui2/library/caches.py
@@ -11,6 +11,15 @@ from collections import OrderedDict
 
 from PyQt4.Qt import QImage, QPixmap
 
+from calibre.db.utils import ThumbnailCache as TC
+
+class ThumbnailCache(TC):
+    def __init__(self, max_size=1024, thumbnail_size=(100, 100)):
+        TC.__init__(self, name='gui-thumbnail-cache', min_disk_cache=100, max_size=max_size, thumbnail_size=thumbnail_size)
+
+    def set_database(self, db):
+        TC.set_group_id(self, db.library_id)
+
 class CoverCache(dict):
 
     ' This is a RAM cache to speed up rendering of covers by storing them as QPixmaps '
@@ -26,9 +35,10 @@ class CoverCache(dict):
         ' Must be called in the GUI thread '
         self.pixmap_staging = []
 
-    def invalidate(self, book_id):
+    def invalidate(self, book_ids):
         with self.lock:
-            self._pop(book_id)
+            for book_id in book_ids:
+                self._pop(book_id)
 
     def _pop(self, book_id):
         val = self.items.pop(book_id, None)
@@ -75,3 +85,4 @@ class CoverCache(dict):
                 for k in remove:
                     self._pop(k)
 
+
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 552f907ab2..31f3807ced 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -5,12 +5,15 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from PyQt4.Qt import (QApplication, QFont, QFontInfo, QFontDialog, QColorDialog,
-        QAbstractListModel, Qt, QIcon, QKeySequence, QPalette, QColor)
+from threading import Thread
 
+from PyQt4.Qt import (QApplication, QFont, QFontInfo, QFontDialog, QColorDialog,
+        QAbstractListModel, Qt, QIcon, QKeySequence, QPalette, QColor, pyqtSignal)
+
+from calibre import human_readable
 from calibre.gui2.preferences import ConfigWidgetBase, test_widget, CommaSeparatedList
 from calibre.gui2.preferences.look_feel_ui import Ui_Form
-from calibre.gui2 import config, gprefs, qt_app, NONE
+from calibre.gui2 import config, gprefs, qt_app, NONE, open_local_file
 from calibre.utils.localization import (available_translations,
     get_language, get_lang)
 from calibre.utils.config import prefs, tweaks
@@ -95,6 +98,8 @@ class DisplayedFields(QAbstractListModel):  # {{{
 
 class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
+    size_calculated = pyqtSignal(object)
+
     def genesis(self, gui):
         self.gui = gui
         db = gui.library_view.model().db
@@ -113,6 +118,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('cover_grid_width', gprefs)
         r('cover_grid_height', gprefs)
         r('cover_grid_cache_size', gprefs)
+        r('cover_grid_disk_cache_size', gprefs)
         r('cover_grid_spacing', gprefs)
         r('cover_grid_show_title', gprefs)
 
@@ -206,6 +212,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             for i in range(self.tabWidget.count()):
                 if self.tabWidget.widget(i) is self.cover_grid_tab:
                     self.tabWidget.removeTab(i)
+        self.size_calculated.connect(self.update_cg_cache_size, type=Qt.QueuedConnection)
+        self.tabWidget.currentChanged.connect(self.tab_changed)
+        self.cover_grid_empty_cache.clicked.connect(self.empty_cache)
+        self.cover_grid_open_cache.clicked.connect(self.open_cg_cache)
+        self.opt_cover_grid_disk_cache_size.setMinimum(self.gui.grid_view.thumbnail_cache.min_disk_cache)
+        self.opt_cover_grid_disk_cache_size.setMaximum(self.gui.grid_view.thumbnail_cache.min_disk_cache * 100)
 
     def initialize(self):
         ConfigWidgetBase.initialize(self)
@@ -226,11 +238,34 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.icon_rules.initialize(db.field_metadata, db.prefs, mi, 'column_icon_rules')
         self.set_cg_color(gprefs['cover_grid_color'])
 
+    def open_cg_cache(self):
+        open_local_file(self.gui.grid_view.thumbnail_cache.location)
+
+    def update_cg_cache_size(self, size):
+        self.cover_grid_current_disk_cache.setText(
+            _('Current space used: %s') % human_readable(size))
+
+    def tab_changed(self, index):
+        if self.tabWidget.currentWidget() is self.cover_grid_tab:
+            self.show_current_cache_usage()
+
+    def show_current_cache_usage(self):
+        t = Thread(target=self.calc_cache_size)
+        t.daemon = True
+        t.start()
+
+    def calc_cache_size(self):
+        self.size_calculated.emit(self.gui.grid_view.thumbnail_cache.current_size)
+
     def set_cg_color(self, val):
         pal = QPalette()
         pal.setColor(QPalette.Window, QColor(*val))
         self.cover_grid_color_label.setPalette(pal)
 
+    def empty_cache(self):
+        self.gui.grid_view.thumbnail_cache.empty()
+        self.calc_cache_size()
+
     def restore_defaults(self):
         ConfigWidgetBase.restore_defaults(self)
         ofont = self.current_font
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index ca9c83d3d3..3669c2efea 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -231,147 +231,8 @@
       <attribute name="title">
        <string>Cover Grid</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0" colspan="2">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QLabel" name="label_11">
-           <property name="text">
-            <string>Cover &amp;Width: </string>
-           </property>
-           <property name="buddy">
-            <cstring>opt_cover_grid_width</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QDoubleSpinBox" name="opt_cover_grid_width">
-           <property name="toolTip">
-            <string>The width of displayed covers</string>
-           </property>
-           <property name="specialValueText">
-            <string>Automatic</string>
-           </property>
-           <property name="suffix">
-            <string> cm</string>
-           </property>
-           <property name="decimals">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_12">
-           <property name="text">
-            <string>Cover &amp;Height: </string>
-           </property>
-           <property name="buddy">
-            <cstring>opt_cover_grid_height</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QDoubleSpinBox" name="opt_cover_grid_height">
-           <property name="toolTip">
-            <string>The height of displayed covers</string>
-           </property>
-           <property name="specialValueText">
-            <string>Automatic</string>
-           </property>
-           <property name="suffix">
-            <string> cm</string>
-           </property>
-           <property name="decimals">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0" colspan="2">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QLabel" name="label_14">
-           <property name="text">
-            <string>Background color for the cover grid:</string>
-           </property>
-           <property name="buddy">
-            <cstring>cover_grid_color_button</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="cover_grid_color_label">
-           <property name="minimumSize">
-            <size>
-             <width>50</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="autoFillBackground">
-            <bool>true</bool>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="cover_grid_color_button">
-           <property name="text">
-            <string>Change &amp;color</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_15">
-         <property name="text">
-          <string>Number of covers to cache in &amp;memory:</string>
-         </property>
-         <property name="buddy">
-          <cstring>opt_cover_grid_cache_size</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="opt_cover_grid_cache_size">
-         <property name="toolTip">
-          <string>The maximum number of covers to keep in memory. Increasing this will make rendering faster, at the cost of more memory usage.</string>
-         </property>
-         <property name="maximum">
-          <number>50000</number>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
+      <layout class="QGridLayout" name="gridLayout_4">
+       <item row="4" column="1" colspan="3">
         <widget class="QLabel" name="label_16">
          <property name="text">
           <string>&amp;Spacing between covers:</string>
@@ -381,7 +242,172 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="1" column="7" colspan="2">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>417</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="3" colspan="3">
+        <widget class="QLabel" name="cover_grid_color_label">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="autoFillBackground">
+          <bool>true</bool>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="9">
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Caching of covers for improved performance</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0" colspan="5">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>There are two kinds of caches that calibre uses to improve performance when rendering covers in the grid view. A disk cache that is kept on your hard disk and stores the cover thumbnails and an in memory cache used to ensure flicker free rendering of covers. For best results, keep the memory cache small and the disk cache large, unless you have a lot of extra RAM in your computer and dont mind it being used by the memory cache.</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2">
+           <widget class="QLabel" name="label_15">
+            <property name="text">
+             <string>Number of covers to cache in &amp;memory (keep this small):</string>
+            </property>
+            <property name="buddy">
+             <cstring>opt_cover_grid_cache_size</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QSpinBox" name="opt_cover_grid_cache_size">
+            <property name="toolTip">
+             <string>The maximum number of covers to keep in memory. Increasing this will make rendering faster, at the cost of more memory usage.</string>
+            </property>
+            <property name="maximum">
+             <number>50000</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QLabel" name="label_18">
+            <property name="text">
+             <string>Maximum amount of disk space to use for caching thumbnails: </string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QSpinBox" name="opt_cover_grid_disk_cache_size">
+            <property name="specialValueText">
+             <string>Disable</string>
+            </property>
+            <property name="suffix">
+             <string> MB</string>
+            </property>
+            <property name="minimum">
+             <number>100</number>
+            </property>
+            <property name="singleStep">
+             <number>100</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="3" colspan="2">
+           <widget class="QLabel" name="cover_grid_current_disk_cache">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QPushButton" name="cover_grid_empty_cache">
+            <property name="text">
+             <string>Empty disk cache</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="2" colspan="3">
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>310</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="3" column="1">
+           <widget class="QPushButton" name="cover_grid_open_cache">
+            <property name="text">
+             <string>Open cache directory</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="2" colspan="3">
+        <widget class="QLabel" name="label_12">
+         <property name="text">
+          <string>Cover &amp;Height: </string>
+         </property>
+         <property name="buddy">
+          <cstring>opt_cover_grid_height</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="8">
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>365</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="6" colspan="2">
+        <widget class="QPushButton" name="cover_grid_color_button">
+         <property name="text">
+          <string>Change &amp;color</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Cover &amp;Width: </string>
+         </property>
+         <property name="buddy">
+          <cstring>opt_cover_grid_width</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="4" colspan="3">
         <widget class="QDoubleSpinBox" name="opt_cover_grid_spacing">
          <property name="toolTip">
           <string>The spacing between covers. A value of zero means calculate automatically based on cover size.</string>
@@ -397,13 +423,78 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2">
+       <item row="2" column="0" colspan="3">
+        <widget class="QLabel" name="label_14">
+         <property name="text">
+          <string>Background color for the cover grid:</string>
+         </property>
+         <property name="buddy">
+          <cstring>cover_grid_color_button</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QDoubleSpinBox" name="opt_cover_grid_width">
+         <property name="toolTip">
+          <string>The width of displayed covers</string>
+         </property>
+         <property name="specialValueText">
+          <string>Automatic</string>
+         </property>
+         <property name="suffix">
+          <string> cm</string>
+         </property>
+         <property name="decimals">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="5" colspan="2">
+        <widget class="QDoubleSpinBox" name="opt_cover_grid_height">
+         <property name="toolTip">
+          <string>The height of displayed covers</string>
+         </property>
+         <property name="specialValueText">
+          <string>Automatic</string>
+         </property>
+         <property name="suffix">
+          <string> cm</string>
+         </property>
+         <property name="decimals">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="9">
         <widget class="QCheckBox" name="opt_cover_grid_show_title">
          <property name="text">
           <string>Show the book &amp;title below the cover</string>
          </property>
         </widget>
        </item>
+       <item row="0" column="0" colspan="9">
+        <widget class="QLabel" name="label_19">
+         <property name="text">
+          <string>Control the cover grid view. You can enble this view by clicking the grid button in the bottom right corner of the main calibre window.</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">

From b19ee15eca39c91e04d913442a62a5e5e76c07f8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 14:24:34 +0530
Subject: [PATCH 0538/1154] Optimize for disk cache

Disable delay rendering and change cache size defaults for optimizing
the use of the disk cache
---
 src/calibre/gui2/__init__.py                |  6 +++---
 src/calibre/gui2/library/alternate_views.py | 15 +++++++++------
 src/calibre/gui2/library/caches.py          |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 50e434bb49..fc1364c20e 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -113,10 +113,10 @@ defs['extra_row_spacing'] = 0
 defs['refresh_book_list_on_bulk_edit'] = True
 defs['cover_grid_width'] = 0
 defs['cover_grid_height'] = 0
-defs['cover_grid_color'] = (80, 80, 80)
-defs['cover_grid_cache_size'] = 200
-defs['cover_grid_disk_cache_size'] = 2000
 defs['cover_grid_spacing'] = 0
+defs['cover_grid_color'] = (80, 80, 80)
+defs['cover_grid_cache_size'] = 100
+defs['cover_grid_disk_cache_size'] = 2500
 defs['cover_grid_show_title'] = False
 del defs
 # }}}
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index fe5117916a..ea4ecc03e4 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -438,6 +438,7 @@ class GridView(QListView):
 
     update_item = pyqtSignal(object)
     files_dropped = pyqtSignal(object)
+    delay_render = False
 
     def __init__(self, parent):
         QListView.__init__(self, parent)
@@ -466,8 +467,9 @@ class GridView(QListView):
         self.setCursor(Qt.PointingHandCursor)
         self.gui = parent
         self.context_menu = None
-        self.verticalScrollBar().sliderPressed.connect(self.slider_pressed)
-        self.verticalScrollBar().sliderReleased.connect(self.slider_released)
+        if self.delay_render:
+            self.verticalScrollBar().sliderPressed.connect(self.slider_pressed)
+            self.verticalScrollBar().sliderReleased.connect(self.slider_released)
         self.update_timer = QTimer(self)
         self.update_timer.setInterval(200)
         self.update_timer.timeout.connect(self.update_viewport)
@@ -513,10 +515,11 @@ class GridView(QListView):
         else:
             self.ignore_render_requests.set()
 
-    def wheelEvent(self, e):
-        self.ignore_render_requests.set()
-        QListView.wheelEvent(self, e)
-        self.update_timer.start()
+    if delay_render:
+        def wheelEvent(self, e):
+            self.ignore_render_requests.set()
+            QListView.wheelEvent(self, e)
+            self.update_timer.start()
 
     def double_clicked(self, index):
         d = self.delegate
diff --git a/src/calibre/gui2/library/caches.py b/src/calibre/gui2/library/caches.py
index 2788bcfefe..b38448106e 100644
--- a/src/calibre/gui2/library/caches.py
+++ b/src/calibre/gui2/library/caches.py
@@ -24,7 +24,7 @@ class CoverCache(dict):
 
     ' This is a RAM cache to speed up rendering of covers by storing them as QPixmaps '
 
-    def __init__(self, limit=200):
+    def __init__(self, limit=100):
         self.items = OrderedDict()
         self.lock = Lock()
         self.limit = limit

From 518721ff40a1af0d8414ac3b2696166a8246acd2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 16:01:12 +0530
Subject: [PATCH 0539/1154] Nicer controls for changing grid cover size

---
 src/calibre/gui2/library/alternate_views.py |   5 +-
 src/calibre/gui2/preferences/look_feel.py   |  19 +
 src/calibre/gui2/preferences/look_feel.ui   | 377 ++++++++++++--------
 3 files changed, 260 insertions(+), 141 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index ea4ecc03e4..d6b05c33ac 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -29,6 +29,9 @@ from calibre.utils.config import prefs
 CM_TO_INCH = 0.393701
 CACHE_FORMAT = 'PPM'
 
+def auto_height(widget):
+    return max(185, QApplication.instance().desktop().availableGeometry(widget).height() / 5.0)
+
 class EncodeError(ValueError):
     pass
 
@@ -317,7 +320,7 @@ class CoverDelegate(QStyledItemDelegate):
         self.original_show_title = show_title = gprefs['cover_grid_show_title']
 
         if height < 0.1:
-            height = max(185, QApplication.instance().desktop().availableGeometry(self.parent()).height() / 5.0)
+            height = auto_height(self.parent())
         else:
             height *= self.parent().logicalDpiY() * CM_TO_INCH
 
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 31f3807ced..27ca36d0a1 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -6,6 +6,7 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 from threading import Thread
+from functools import partial
 
 from PyQt4.Qt import (QApplication, QFont, QFontInfo, QFontDialog, QColorDialog,
         QAbstractListModel, Qt, QIcon, QKeySequence, QPalette, QColor, pyqtSignal)
@@ -20,6 +21,7 @@ from calibre.utils.config import prefs, tweaks
 from calibre.utils.icu import sort_key
 from calibre.gui2.book_details import get_field_list
 from calibre.gui2.preferences.coloring import EditRules
+from calibre.gui2.library.alternate_views import auto_height, CM_TO_INCH
 
 class DisplayedFields(QAbstractListModel):  # {{{
 
@@ -216,9 +218,26 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.tabWidget.currentChanged.connect(self.tab_changed)
         self.cover_grid_empty_cache.clicked.connect(self.empty_cache)
         self.cover_grid_open_cache.clicked.connect(self.open_cg_cache)
+        self.cover_grid_smaller_cover.clicked.connect(partial(self.resize_cover, True))
+        self.cover_grid_larger_cover.clicked.connect(partial(self.resize_cover, False))
         self.opt_cover_grid_disk_cache_size.setMinimum(self.gui.grid_view.thumbnail_cache.min_disk_cache)
         self.opt_cover_grid_disk_cache_size.setMaximum(self.gui.grid_view.thumbnail_cache.min_disk_cache * 100)
 
+    def resize_cover(self, smaller):
+        cval = self.opt_cover_grid_height.value()
+        wval = self.opt_cover_grid_width.value()
+        if cval < 0.1:
+            dpi = self.opt_cover_grid_height.logicalDpiY()
+            cval = auto_height(self.opt_cover_grid_height) / dpi / CM_TO_INCH
+        if wval < 0.1:
+            wval = 0.75 * cval
+        ar = wval / cval
+        delta = 0.2 * (-1 if smaller else 1)
+        cval += delta
+        cval = max(0, cval)
+        self.opt_cover_grid_height.setValue(cval)
+        self.opt_cover_grid_width.setValue(cval * ar)
+
     def initialize(self):
         ConfigWidgetBase.initialize(self)
         font = gprefs['font']
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 3669c2efea..71bb3c82db 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -231,47 +231,246 @@
       <attribute name="title">
        <string>Cover Grid</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_4">
-       <item row="4" column="1" colspan="3">
-        <widget class="QLabel" name="label_16">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="label_19">
          <property name="text">
-          <string>&amp;Spacing between covers:</string>
+          <string>Control the cover grid view. You can enble this view by clicking the grid button in the bottom right corner of the main calibre window.</string>
          </property>
-         <property name="buddy">
-          <cstring>opt_cover_grid_spacing</cstring>
+         <property name="wordWrap">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="1" column="7" colspan="2">
-        <spacer name="horizontalSpacer">
+       <item>
+        <spacer name="verticalSpacer_6">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>417</width>
-           <height>20</height>
+           <width>20</width>
+           <height>10</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="2" column="3" colspan="3">
-        <widget class="QLabel" name="cover_grid_color_label">
-         <property name="minimumSize">
-          <size>
-           <width>50</width>
-           <height>50</height>
-          </size>
-         </property>
-         <property name="autoFillBackground">
-          <bool>true</bool>
-         </property>
+       <item>
+        <widget class="QCheckBox" name="opt_cover_grid_show_title">
          <property name="text">
-          <string/>
+          <string>Show the book &amp;title below the cover</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="9">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label_16">
+           <property name="text">
+            <string>&amp;Spacing between covers:</string>
+           </property>
+           <property name="buddy">
+            <cstring>opt_cover_grid_spacing</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDoubleSpinBox" name="opt_cover_grid_spacing">
+           <property name="toolTip">
+            <string>The spacing between covers. A value of zero means calculate automatically based on cover size.</string>
+           </property>
+           <property name="specialValueText">
+            <string>Automatic</string>
+           </property>
+           <property name="suffix">
+            <string> cm</string>
+           </property>
+           <property name="decimals">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QLabel" name="label_14">
+           <property name="text">
+            <string>Background color for the cover grid:</string>
+           </property>
+           <property name="buddy">
+            <cstring>cover_grid_color_button</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="cover_grid_color_label">
+           <property name="minimumSize">
+            <size>
+             <width>50</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="autoFillBackground">
+            <bool>true</bool>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cover_grid_color_button">
+           <property name="text">
+            <string>Change &amp;color</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string>Cover size</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>Cover &amp;Width: </string>
+            </property>
+            <property name="buddy">
+             <cstring>opt_cover_grid_width</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QDoubleSpinBox" name="opt_cover_grid_width">
+            <property name="toolTip">
+             <string>The width of displayed covers</string>
+            </property>
+            <property name="specialValueText">
+             <string>Automatic</string>
+            </property>
+            <property name="suffix">
+             <string> cm</string>
+            </property>
+            <property name="decimals">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QPushButton" name="cover_grid_larger_cover">
+            <property name="toolTip">
+             <string>Make the covers larger, maintaining current aspect ratio.</string>
+            </property>
+            <property name="text">
+             <string>&amp;Larger covers</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../../../resources/images.qrc">
+              <normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>Cover &amp;Height: </string>
+            </property>
+            <property name="buddy">
+             <cstring>opt_cover_grid_height</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QDoubleSpinBox" name="opt_cover_grid_height">
+            <property name="toolTip">
+             <string>The height of displayed covers</string>
+            </property>
+            <property name="specialValueText">
+             <string>Automatic</string>
+            </property>
+            <property name="suffix">
+             <string> cm</string>
+            </property>
+            <property name="decimals">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QPushButton" name="cover_grid_smaller_cover">
+            <property name="toolTip">
+             <string>Make the covers smaller, maintaining current aspect ratio.</string>
+            </property>
+            <property name="text">
+             <string>&amp;Smaller covers</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../../../resources/images.qrc">
+              <normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3">
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="0" colspan="4">
+           <widget class="QLabel" name="label_20">
+            <property name="text">
+             <string>By default, calibre chooses a cover size based on your computer's screen size. You can change the cover size here:</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
           <string>Caching of covers for improved performance</string>
@@ -364,92 +563,23 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="3">
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="2" colspan="3">
-        <widget class="QLabel" name="label_12">
-         <property name="text">
-          <string>Cover &amp;Height: </string>
-         </property>
-         <property name="buddy">
-          <cstring>opt_cover_grid_height</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="8">
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>365</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="6" colspan="2">
-        <widget class="QPushButton" name="cover_grid_color_button">
-         <property name="text">
-          <string>Change &amp;color</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_11">
-         <property name="text">
-          <string>Cover &amp;Width: </string>
-         </property>
-         <property name="buddy">
-          <cstring>opt_cover_grid_width</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="4" colspan="3">
-        <widget class="QDoubleSpinBox" name="opt_cover_grid_spacing">
-         <property name="toolTip">
-          <string>The spacing between covers. A value of zero means calculate automatically based on cover size.</string>
-         </property>
-         <property name="specialValueText">
-          <string>Automatic</string>
-         </property>
-         <property name="suffix">
-          <string> cm</string>
-         </property>
-         <property name="decimals">
-          <number>1</number>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="3">
-        <widget class="QLabel" name="label_14">
-         <property name="text">
-          <string>Background color for the cover grid:</string>
-         </property>
-         <property name="buddy">
-          <cstring>cover_grid_color_button</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QDoubleSpinBox" name="opt_cover_grid_width">
-         <property name="toolTip">
-          <string>The width of displayed covers</string>
-         </property>
-         <property name="specialValueText">
-          <string>Automatic</string>
-         </property>
-         <property name="suffix">
-          <string> cm</string>
-         </property>
-         <property name="decimals">
-          <number>1</number>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
+       <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -462,39 +592,6 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="5" colspan="2">
-        <widget class="QDoubleSpinBox" name="opt_cover_grid_height">
-         <property name="toolTip">
-          <string>The height of displayed covers</string>
-         </property>
-         <property name="specialValueText">
-          <string>Automatic</string>
-         </property>
-         <property name="suffix">
-          <string> cm</string>
-         </property>
-         <property name="decimals">
-          <number>1</number>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" colspan="9">
-        <widget class="QCheckBox" name="opt_cover_grid_show_title">
-         <property name="text">
-          <string>Show the book &amp;title below the cover</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="9">
-        <widget class="QLabel" name="label_19">
-         <property name="text">
-          <string>Control the cover grid view. You can enble this view by clicking the grid button in the bottom right corner of the main calibre window.</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">

From e3231a6481ba3fd03bd58e5b6921aea966b64825 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 16:12:53 +0530
Subject: [PATCH 0540/1154] Show series in grid view tooltip as well

---
 src/calibre/gui2/library/alternate_views.py | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index d6b05c33ac..63e6ee631e 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -21,7 +21,8 @@ from PyQt4.Qt import (
     QPropertyAnimation, QEasingCurve, pyqtSlot, QHelpEvent, QAbstractItemView,
     QStyleOptionViewItem, QToolTip, QByteArray, QBuffer)
 
-from calibre import fit_image, prints
+from calibre import fit_image, prints, prepare_string_for_xml
+from calibre.ebooks.metadata import fmt_sidx
 from calibre.gui2 import gprefs, config
 from calibre.gui2.library.caches import CoverCache, ThumbnailCache
 from calibre.utils.config import prefs
@@ -413,12 +414,22 @@ class CoverDelegate(QStyledItemDelegate):
                 book_id = db.id(index.row())
             except (ValueError, IndexError, KeyError):
                 return False
-            title = db.new_api.field_for('title', book_id)
-            authors = db.new_api.field_for('authors', book_id)
+            db = db.new_api
+            p = prepare_string_for_xml
+            title = db.field_for('title', book_id)
+            authors = db.field_for('authors', book_id)
             if title and authors:
-                title = '<b>%s</b>' % ('\n'.join(wrap(title, 100)))
-                authors = '\n'.join(wrap(' & '.join(authors), 100))
-                QToolTip.showText(event.globalPos(), '%s<br><br>%s' % (title, authors), view)
+                title = '<b>%s</b>' % ('<br>'.join(wrap(p(title), 120)))
+                authors = '<br>'.join(wrap(p(' & '.join(authors)), 120))
+                tt = '%s<br><br>%s' % (title, authors)
+                series = db.field_for('series', book_id)
+                if series:
+                    use_roman_numbers=config['use_roman_numerals_for_series_number']
+                    val = _('Book %(sidx)s of <span class="series_name">%(series)s</span>')%dict(
+                        sidx=fmt_sidx(db.field_for('series_index', book_id), use_roman=use_roman_numbers),
+                        series=p(series))
+                    tt += '<br><br>' + val
+                QToolTip.showText(event.globalPos(), tt, view)
                 return True
         return False
 

From f7250683a40c5c46d8f40abee26c1a960402904f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 18:30:38 +0530
Subject: [PATCH 0541/1154] ebook-meta: Ignore the read metadata from file
 contents setting

ebook-meta program: Ignore the adding books preference that controls the
reading of metadata from file names vs. file contents.
---
 src/calibre/ebooks/metadata/cli.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/metadata/cli.py b/src/calibre/ebooks/metadata/cli.py
index 9ffe5007f5..7a7a7203e9 100644
--- a/src/calibre/ebooks/metadata/cli.py
+++ b/src/calibre/ebooks/metadata/cli.py
@@ -31,7 +31,6 @@ silently ignored.
 ''')
 
 
-
 def config():
     c = StringConfig('')
     c.add_opt('title', ['-t', '--title'],
@@ -163,7 +162,7 @@ def main(args=sys.argv):
         if getattr(opts, pref.name) is not None:
             trying_to_set = True
             break
-    mi = get_metadata(stream, stream_type)
+    mi = get_metadata(stream, stream_type, force_read_metadata=True)
     if trying_to_set:
         prints(_('Original metadata')+'::')
     metadata = unicode(mi)
@@ -181,7 +180,7 @@ def main(args=sys.argv):
             if opts.lrf_bookid is not None:
                 lrf = LRFMetaFile(stream)
                 lrf.book_id = opts.lrf_bookid
-        mi = get_metadata(stream, stream_type)
+        mi = get_metadata(stream, stream_type, force_read_metadata=True)
         prints('\n' + _('Changed metadata') + '::')
         metadata = unicode(mi)
         metadata = '\t'+'\n\t'.join(metadata.split('\n'))

From f017da50aaa933b9a7cdcd55272045894980315d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 18:53:22 +0530
Subject: [PATCH 0542/1154] newdb: set_metadata should not allow case changes

set_metadata() was allowing case changes for is_multiple fields, causing
for instance, adding books to change the case of existing
tags/authors/etc. In the old backend it was inconsistent, case changes
were disallowed for most fields, but allowed for a few, for example,
series.
---
 src/calibre/db/cache.py         | 10 +++++-----
 src/calibre/db/tests/writing.py |  8 +++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 2dc5d557f7..7ed653093c 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1057,7 +1057,7 @@ class Cache(object):
 
     @write_api
     def set_metadata(self, book_id, mi, ignore_errors=False, force_changes=False,
-                     set_title=True, set_authors=True):
+                     set_title=True, set_authors=True, allow_case_change=False):
         '''
         Set metadata for the book `id` from the `Metadata` object `mi`
 
@@ -1078,13 +1078,13 @@ class Cache(object):
         except (AttributeError, TypeError):
             pass
 
-        def set_field(name, val, **kwargs):
-            self._set_field(name, {book_id:val}, **kwargs)
+        def set_field(name, val):
+            self._set_field(name, {book_id:val}, do_path_update=False, allow_case_change=allow_case_change)
 
         path_changed = False
         if set_title and mi.title:
             path_changed = True
-            set_field('title', mi.title, do_path_update=False)
+            set_field('title', mi.title)
         if set_authors:
             path_changed = True
             if not mi.authors:
@@ -1092,7 +1092,7 @@ class Cache(object):
             authors = []
             for a in mi.authors:
                 authors += string_to_authors(a)
-            set_field('authors', authors, do_path_update=False)
+            set_field('authors', authors)
 
         if path_changed:
             self._update_path({book_id})
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 19f6e70f48..f4b8553164 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -420,6 +420,13 @@ class WritingTest(BaseTest):
         ae(nmi2.get_extra('#series'), 1.0)
         self.compare_metadata(nmi2, oldmi2, exclude={'last_modified', 'format_metadata', '#series_index'})
 
+        cache = self.init_cache(self.cloned_library)
+        mi = cache.get_metadata(1)
+        otags = mi.tags
+        mi.tags = [x.upper() for x in mi.tags]
+        cache.set_metadata(3, mi)
+        self.assertEqual(set(otags), set(cache.field_for('tags', 3)), 'case changes should not be allowed in set_metadata')
+
     # }}}
 
     def test_conversion_options(self):  # {{{
@@ -574,4 +581,3 @@ class WritingTest(BaseTest):
         cache.add_format(1, 'ADD', BytesIO(b'xxxx'))
         test_invalidate()
     # }}}
-

From db9056d5a1489e909f9d24e0fcabf80585b1d85f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Aug 2013 21:40:12 +0530
Subject: [PATCH 0543/1154] ...

---
 src/calibre/gui2/library/alternate_views.py | 2 +-
 src/calibre/gui2/preferences/look_feel.ui   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 63e6ee631e..95edb3f90c 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -345,7 +345,7 @@ class CoverDelegate(QStyledItemDelegate):
 
     def calculate_spacing(self):
         spc = self.original_spacing = gprefs['cover_grid_spacing']
-        if spc < 0.1:
+        if spc < 0.01:
             self.spacing = max(10, min(50, int(0.1 * self.original_width)))
         else:
             self.spacing = self.parent().logicalDpiX() * CM_TO_INCH * spc
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 71bb3c82db..1adda76634 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -289,7 +289,10 @@
             <string> cm</string>
            </property>
            <property name="decimals">
-            <number>1</number>
+            <number>2</number>
+           </property>
+           <property name="singleStep">
+            <double>0.100000000000000</double>
            </property>
           </widget>
          </item>

From 58b4beca963e715277cefe8cb7643366c1852a79 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 11:09:55 +0530
Subject: [PATCH 0544/1154] Show only the first two version numbers if the
 third is zero

---
 src/calibre/constants.py    | 4 +++-
 src/calibre/utils/config.py | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index e0c0f6b845..d4d73e64a7 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -217,9 +217,11 @@ else:
 # }}}
 
 def get_version():
-    '''Return version string that indicates if we are running in a dev env'''
+    '''Return version string for display to user '''
     dv = os.environ.get('CALIBRE_DEVELOP_FROM', None)
     v = __version__
+    if numeric_version[-1] == 0:
+        v = v[:-2]
     if getattr(sys, 'frozen', False) and dv and os.path.abspath(dv) in sys.path:
         v += '*'
     if iswindows and is64bit:
diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index fbd4c47a35..b002a019ae 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -12,7 +12,7 @@ from optparse import OptionParser as _OptionParser, OptionGroup
 from optparse import IndentedHelpFormatter
 
 from calibre.constants import (config_dir, CONFIG_DIR_MODE, __appname__,
-        __version__, __author__)
+        get_version, __author__)
 from calibre.utils.lock import ExclusiveFile
 from calibre.utils.config_base import (make_config_dir, Option, OptionValues,
         OptionSet, ConfigInterface, Config, prefs, StringConfig, ConfigProxy,
@@ -76,7 +76,7 @@ class OptionParser(_OptionParser):
 
     def __init__(self,
                  usage='%prog [options] filename',
-                 version='%%prog (%s %s)'%(__appname__, __version__),
+                 version=None,
                  epilog=None,
                  gui_mode=False,
                  conflict_handler='resolve',
@@ -89,6 +89,8 @@ class OptionParser(_OptionParser):
             epilog = _('Created by ')+colored(__author__, fg='cyan')
         usage += '\n\n'+_('''Whenever you pass arguments to %prog that have spaces in them, '''
                  '''enclose the arguments in quotation marks.''')+'\n'
+        if version is None:
+            version = '%%prog (%s %s)'%(__appname__, get_version())
         _OptionParser.__init__(self, usage=usage, version=version, epilog=epilog,
                                formatter=CustomHelpFormatter(),
                                conflict_handler=conflict_handler, **kwds)

From 2d394c6b6e40416007fef72689cf5d248e3be1d4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 11:14:08 +0530
Subject: [PATCH 0545/1154] Better name for sort by cover menu entry

---
 src/calibre/gui2/actions/sort.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
index 76d22d5da6..c959b0e45e 100644
--- a/src/calibre/gui2/actions/sort.py
+++ b/src/calibre/gui2/actions/sort.py
@@ -53,7 +53,13 @@ class SortByAction(InterfaceAction):
         except TypeError:
             sort_col, order = 'date', True
         fm = db.field_metadata
-        name_map = {fm[k]['name']:k for k in fm.sortable_field_keys() if fm[k]['name']}
+        def get_name(k):
+            ans = fm[k]['name']
+            if k == 'cover':
+                ans = _('Has cover')
+            return ans
+
+        name_map = {get_name(k):k for k in fm.sortable_field_keys() if fm[k]['name']}
         self._sactions = []
         for name in sorted(name_map, key=sort_key):
             key = name_map[name]

From 454016e6bf46c03706230e3e6c78d4d8ecb4f65a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 13:11:18 +0530
Subject: [PATCH 0546/1154] Remove invalid entries from sort menu

---
 src/calibre/gui2/actions/sort.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
index c959b0e45e..6fa25b263c 100644
--- a/src/calibre/gui2/actions/sort.py
+++ b/src/calibre/gui2/actions/sort.py
@@ -63,7 +63,7 @@ class SortByAction(InterfaceAction):
         self._sactions = []
         for name in sorted(name_map, key=sort_key):
             key = name_map[name]
-            if key == 'title':
+            if key in {'title', 'series_sort', 'formats', 'path'}:
                 continue
             if key == 'sort':
                 name = _('Title')

From e9a35b1958c7faecb50ee33b88d79c45c44c38e5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 13:16:02 +0530
Subject: [PATCH 0547/1154] Show current aspect ratio when changing cover size

---
 src/calibre/gui2/preferences/look_feel.py | 15 ++++++++++++++-
 src/calibre/gui2/preferences/look_feel.ui | 13 +++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 27ca36d0a1..469eaf35cb 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -222,8 +222,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.cover_grid_larger_cover.clicked.connect(partial(self.resize_cover, False))
         self.opt_cover_grid_disk_cache_size.setMinimum(self.gui.grid_view.thumbnail_cache.min_disk_cache)
         self.opt_cover_grid_disk_cache_size.setMaximum(self.gui.grid_view.thumbnail_cache.min_disk_cache * 100)
+        self.opt_cover_grid_width.valueChanged.connect(self.update_aspect_ratio)
+        self.opt_cover_grid_height.valueChanged.connect(self.update_aspect_ratio)
 
-    def resize_cover(self, smaller):
+    @property
+    def current_cover_size(self):
         cval = self.opt_cover_grid_height.value()
         wval = self.opt_cover_grid_width.value()
         if cval < 0.1:
@@ -231,6 +234,15 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             cval = auto_height(self.opt_cover_grid_height) / dpi / CM_TO_INCH
         if wval < 0.1:
             wval = 0.75 * cval
+        return wval, cval
+
+    def update_aspect_ratio(self, *args):
+        width, height = self.current_cover_size
+        ar = width / height
+        self.cover_grid_aspect_ratio.setText(_('Current aspect ratio (width/height): %.2g') % ar)
+
+    def resize_cover(self, smaller):
+        wval, cval = self.current_cover_size
         ar = wval / cval
         delta = 0.2 * (-1 if smaller else 1)
         cval += delta
@@ -256,6 +268,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.edit_rules.initialize(db.field_metadata, db.prefs, mi, 'column_color_rules')
         self.icon_rules.initialize(db.field_metadata, db.prefs, mi, 'column_icon_rules')
         self.set_cg_color(gprefs['cover_grid_color'])
+        self.update_aspect_ratio()
 
     def open_cg_cache(self):
         open_local_file(self.gui.grid_view.thumbnail_cache.location)
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 1adda76634..45874a095f 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -380,7 +380,8 @@
           <item row="1" column="1">
            <widget class="QDoubleSpinBox" name="opt_cover_grid_width">
             <property name="toolTip">
-             <string>The width of displayed covers</string>
+             <string>The width of displayed covers.
+A value of zero means calculate automatically.</string>
             </property>
             <property name="specialValueText">
              <string>Automatic</string>
@@ -420,7 +421,8 @@
           <item row="2" column="1">
            <widget class="QDoubleSpinBox" name="opt_cover_grid_height">
             <property name="toolTip">
-             <string>The height of displayed covers</string>
+             <string>The height of displayed covers.
+A value of zero means calculate automatically.</string>
             </property>
             <property name="specialValueText">
              <string>Automatic</string>
@@ -470,6 +472,13 @@
             </property>
            </widget>
           </item>
+          <item row="3" column="0" colspan="4">
+           <widget class="QLabel" name="cover_grid_aspect_ratio">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>

From b0f30ce66a534ea691cf2d7d31dec790545d8b0c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 13:51:58 +0530
Subject: [PATCH 0548/1154] Show traceback when reading metadata from format
 fails

---
 src/calibre/gui2/metadata/basic_widgets.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index b7bb0252ef..a596e43f35 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -867,8 +867,10 @@ class FormatsManager(QWidget):
                     mi = get_metadata(stream, ext)
                 return mi, ext
             except:
+                import traceback
                 error_dialog(self, _('Could not read metadata'),
-                            _('Could not read metadata from %s format')%ext).exec_()
+                            _('Could not read metadata from %s format')%ext.upper(),
+                             det_msg=traceback.format_exc(), show=True)
             return None, None
         finally:
             if old != prefs['read_file_metadata']:

From b5c70f1b9b0318e87edead6d39b67bd9d3fe2725 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 14:29:41 +0530
Subject: [PATCH 0549/1154] pep8

---
 src/calibre/gui2/metadata/single.py | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/calibre/gui2/metadata/single.py b/src/calibre/gui2/metadata/single.py
index 1593c977ff..908275ebcc 100644
--- a/src/calibre/gui2/metadata/single.py
+++ b/src/calibre/gui2/metadata/single.py
@@ -44,7 +44,7 @@ class MetadataSingleDialogBase(ResizableDialog):
         self.rows_to_refresh = set()
         ResizableDialog.__init__(self, parent)
 
-    def setupUi(self, *args): # {{{
+    def setupUi(self, *args):  # {{{
         self.resize(990, 670)
 
         self.download_shortcut = QShortcut(self)
@@ -102,7 +102,7 @@ class MetadataSingleDialogBase(ResizableDialog):
             self.restoreGeometry(bytes(geom))
     # }}}
 
-    def create_basic_metadata_widgets(self): # {{{
+    def create_basic_metadata_widgets(self):  # {{{
         self.basic_metadata_widgets = []
 
         self.languages = LanguagesEdit(self)
@@ -159,7 +159,7 @@ class MetadataSingleDialogBase(ResizableDialog):
         self.series = SeriesEdit(self)
         self.clear_series_button = QToolButton(self)
         self.clear_series_button.setToolTip(
-               _('Clear series') )
+               _('Clear series'))
         self.clear_series_button.clicked.connect(self.series.clear)
         self.series_index = SeriesIndexEdit(self, self.series)
         self.basic_metadata_widgets.extend([self.series, self.series_index])
@@ -240,7 +240,7 @@ class MetadataSingleDialogBase(ResizableDialog):
 
     # }}}
 
-    def create_custom_metadata_widgets(self): # {{{
+    def create_custom_metadata_widgets(self):  # {{{
         self.custom_metadata_widgets_parent = w = QWidget(self)
         layout = QGridLayout()
         w.setLayout(layout)
@@ -250,7 +250,7 @@ class MetadataSingleDialogBase(ResizableDialog):
         self.__custom_col_layouts = [layout]
     # }}}
 
-    def set_custom_metadata_tab_order(self, before=None, after=None): # {{{
+    def set_custom_metadata_tab_order(self, before=None, after=None):  # {{{
         sto = QWidget.setTabOrder
         if getattr(self, 'custom_metadata_widgets', []):
             ans = self.custom_metadata_widgets
@@ -289,7 +289,7 @@ class MetadataSingleDialogBase(ResizableDialog):
         if callable(self.set_current_callback):
             self.set_current_callback(id_)
         # Commented out as it doesn't play nice with Next, Prev buttons
-        #self.fetch_metadata_button.setFocus(Qt.OtherFocusReason)
+        # self.fetch_metadata_button.setFocus(Qt.OtherFocusReason)
 
     # Miscellaneous interaction methods {{{
     def update_window_title(self, *args):
@@ -332,14 +332,15 @@ class MetadataSingleDialogBase(ResizableDialog):
 
     def cover_from_format(self, *args):
         ext = self.formats_manager.get_selected_format()
-        if ext is None: return
+        if ext is None:
+            return
         if ext == 'pdf':
             return self.get_pdf_cover()
         try:
             mi, ext = self.formats_manager.get_selected_format_metadata(self.db,
                     self.book_id)
         except (IOError, OSError) as err:
-            if getattr(err, 'errno', None) == errno.EACCES: # Permission denied
+            if getattr(err, 'errno', None) == errno.EACCES:  # Permission denied
                 import traceback
                 fname = err.filename if err.filename else 'file'
                 error_dialog(self, _('Permission denied'),
@@ -455,7 +456,6 @@ class MetadataSingleDialogBase(ResizableDialog):
             if d.cover_pixmap is not None:
                 self.cover.current_val = pixmap_to_data(d.cover_pixmap)
 
-
     # }}}
 
     def apply_changes(self):
@@ -471,7 +471,7 @@ class MetadataSingleDialogBase(ResizableDialog):
                 self.books_to_refresh |= getattr(widget, 'books_to_refresh',
                         set([]))
             except (IOError, OSError) as err:
-                if getattr(err, 'errno', None) == errno.EACCES: # Permission denied
+                if getattr(err, 'errno', None) == errno.EACCES:  # Permission denied
                     import traceback
                     fname = getattr(err, 'filename', None)
                     p = 'Locked file: %s\n\n'%fname if fname else ''
@@ -564,7 +564,7 @@ class MetadataSingleDialogBase(ResizableDialog):
             try:
                 signal.disconnect()
             except:
-                pass # Fails if view format was never connected
+                pass  # Fails if view format was never connected
         disconnect(self.view_format)
         for b in ('next_button', 'prev_button'):
             x = getattr(self, b, None)
@@ -587,7 +587,7 @@ class Splitter(QSplitter):
         self.frame_resized.emit(ev)
         return QSplitter.resizeEvent(self, ev)
 
-class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
+class MetadataSingleDialog(MetadataSingleDialogBase):  # {{{
 
     def do_layout(self):
         if len(self.db.custom_column_label_map) == 0:
@@ -716,7 +716,7 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
 
 # }}}
 
-class DragTrackingWidget(QWidget): # {{{
+class DragTrackingWidget(QWidget):  # {{{
 
     def __init__(self, parent, on_drag_enter):
         QWidget.__init__(self, parent)
@@ -727,7 +727,7 @@ class DragTrackingWidget(QWidget): # {{{
 
 # }}}
 
-class MetadataSingleDialogAlt1(MetadataSingleDialogBase): # {{{
+class MetadataSingleDialogAlt1(MetadataSingleDialogBase):  # {{{
 
     cc_two_column = False
     one_line_comments_toolbar = True
@@ -881,7 +881,7 @@ class MetadataSingleDialogAlt1(MetadataSingleDialogBase): # {{{
 
 # }}}
 
-class MetadataSingleDialogAlt2(MetadataSingleDialogBase): # {{{
+class MetadataSingleDialogAlt2(MetadataSingleDialogBase):  # {{{
 
     cc_two_column = False
     one_line_comments_toolbar = True

From a58b15a0ad0f85b66966edd035dc2103e040fe60 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 18:50:21 +0530
Subject: [PATCH 0550/1154] PDF Output: Do not error out when cover generation
 fails

PDF Output: Do not abort conversion if the document being converted has
an HTML cover (found in some broken EPUB files).
---
 src/calibre/ebooks/pdf/render/from_html.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/pdf/render/from_html.py b/src/calibre/ebooks/pdf/render/from_html.py
index 771cc33ede..ad27635c59 100644
--- a/src/calibre/ebooks/pdf/render/from_html.py
+++ b/src/calibre/ebooks/pdf/render/from_html.py
@@ -216,7 +216,11 @@ class PDFWriter(QObject):
         try:
             if self.cover_data is not None:
                 p = QPixmap()
-                p.loadFromData(self.cover_data)
+                try:
+                    p.loadFromData(self.cover_data)
+                except TypeError:
+                    self.log.warn('This ebook does not have a raster cover, cannot generate cover for PDF'
+                                  '. Cover type: %s' % type(self.cover_data))
                 if not p.isNull():
                     self.doc.init_page()
                     draw_image_page(QRect(*self.doc.full_page_rect),

From 2822ddfd5f748b3edc598e60ee75100c07fcc6a1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 20:53:53 +0530
Subject: [PATCH 0551/1154] Handle both space and comma separated font size
 keys

---
 src/calibre/gui2/convert/font_key.py      | 2 +-
 src/calibre/gui2/convert/look_and_feel.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/convert/font_key.py b/src/calibre/gui2/convert/font_key.py
index 39eb58dd48..2d8b883abd 100644
--- a/src/calibre/gui2/convert/font_key.py
+++ b/src/calibre/gui2/convert/font_key.py
@@ -64,7 +64,7 @@ class FontKeyChooser(QDialog, Ui_Dialog):
     @property
     def fsizes(self):
         key = unicode(self.font_size_key.text()).strip()
-        return [float(x.strip()) for x in key.split(',') if x.strip()]
+        return [float(x.strip()) for x in key.split(',' if ',' in key else ' ') if x.strip()]
 
     @property
     def dbase(self):
diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py
index a3e364b9ca..ba101a8c0a 100644
--- a/src/calibre/gui2/convert/look_and_feel.py
+++ b/src/calibre/gui2/convert/look_and_feel.py
@@ -76,6 +76,10 @@ class LookAndFeelWidget(Widget, Ui_Form):
             ans = ans.union(set([x.strip().lower() for x in
                 unicode(self.filter_css_others.text()).split(',')]))
             return ','.join(ans) if ans else None
+        if g is self.opt_font_size_mapping:
+            val = unicode(g.text()).strip()
+            val = [x.strip() for x in val.split(',' if ',' in val else ' ') if x.strip()]
+            return ', '.join(val) or None
         return Widget.get_value_handler(self, g)
 
     def set_value_handler(self, g, val):
@@ -87,7 +91,8 @@ class LookAndFeelWidget(Widget, Ui_Form):
                     break
             return True
         if g is self.opt_filter_css:
-            if not val: val = ''
+            if not val:
+                val = ''
             items = frozenset([x.strip().lower() for x in val.split(',')])
             for key, vals in self.FILTER_CSS.iteritems():
                 w = getattr(self, 'filter_css_%s'%key)

From f5d400d364659706884b4e4a708690e4d66d74f3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Aug 2013 22:20:04 +0530
Subject: [PATCH 0552/1154] An improved cover trimming algorithm

An improved cover trimming algorithm to automatically detect and remove
borders and extra space from the edge of cover images. To try it use the
"Trim" button in the edit metadata dialog.
---
 src/calibre/gui2/dialogs/metadata_bulk.ui  | 11 ++-
 src/calibre/gui2/metadata/basic_widgets.py |  3 +
 src/calibre/utils/magick/__init__.py       |  7 ++
 src/calibre/utils/magick/magick.c          | 90 ++++++++++++++++++++++
 4 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index afc5e55449..741f8cae54 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -605,8 +605,13 @@ Future conversion of these books will use the default settings.</string>
               </item>
               <item>
                <widget class="QRadioButton" name="cover_trim">
+                <property name="toolTip">
+                 <string>Try to automatically detect and remove borders and extra space
+ from the edges of cover images. This can sometimes remove too
+ much, so use with care.</string>
+                </property>
                 <property name="text">
-                 <string>&amp;Trim cover</string>
+                 <string>&amp;Trim cover (DANGEROUS)</string>
                 </property>
                </widget>
               </item>
@@ -1119,8 +1124,8 @@ not multiple and the destination field is multiple</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>934</width>
-                <height>256</height>
+                <width>203</width>
+                <height>58</height>
                </rect>
               </property>
               <layout class="QGridLayout" name="testgrid">
diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index a596e43f35..6238d0c08a 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -902,6 +902,9 @@ class Cover(ImageView):  # {{{
                 _('&Browse'), parent)
         self.trim_cover_button = QPushButton(QIcon(I('trim.png')),
                 _('T&rim'), parent)
+        self.trim_cover_button.setToolTip(_(
+            'Automatically detect and remove extra space at the cover\'s edges.\n'
+            'Pressing it repeatedly can sometimes remove stubborn borders.'))
         self.remove_cover_button = QPushButton(QIcon(I('trash.png')),
             _('&Remove'), parent)
 
diff --git a/src/calibre/utils/magick/__init__.py b/src/calibre/utils/magick/__init__.py
index 99ed2d98be..0c1315eb71 100644
--- a/src/calibre/utils/magick/__init__.py
+++ b/src/calibre/utils/magick/__init__.py
@@ -225,6 +225,13 @@ class Image(_magick.Image):  # {{{
         _magick.Image.quantize(self, number_colors, colorspace, treedepth, dither,
                 measure_error)
 
+    def trim(self, fuzz):
+        try:
+            _magick.Image.remove_border(self, fuzz)
+        except AttributeError:
+            _magick.Image.trim(self, fuzz)
+
+
 # }}}
 
 def create_canvas(width, height, bgcolor='#ffffff'):
diff --git a/src/calibre/utils/magick/magick.c b/src/calibre/utils/magick/magick.c
index 0a4c3bd866..e306ad9065 100644
--- a/src/calibre/utils/magick/magick.c
+++ b/src/calibre/utils/magick/magick.c
@@ -7,6 +7,9 @@
 
 // Ensure that the underlying MagickWand has not been deleted
 #define NULL_CHECK(x) if(self->wand == NULL) {PyErr_SetString(PyExc_ValueError, "Underlying ImageMagick Wand has been destroyed"); return x; }
+#define MAX(x, y) ((x > y) ? x: y)
+#define ABS(x) ((x < 0) ? -x : x)
+#define SQUARE(x) x*x
 
 // magick_set_exception {{{
 PyObject* magick_set_exception(MagickWand *wand) {
@@ -17,6 +20,15 @@ PyObject* magick_set_exception(MagickWand *wand) {
     desc = MagickRelinquishMemory(desc);
     return NULL;
 }
+
+PyObject* pw_iterator_set_exception(PixelIterator *pi) {
+    ExceptionType ext;
+    char *desc = PixelGetIteratorException(pi, &ext);
+    PyErr_SetString(PyExc_Exception, desc);
+    PixelClearIteratorException(pi);
+    desc = MagickRelinquishMemory(desc);
+    return NULL;
+}
 // }}}
 
 // PixelWand object definition {{{
@@ -840,6 +852,80 @@ magick_Image_trim(magick_Image *self, PyObject *args) {
 }
 // }}}
 
+// Image.remove_border {{{
+
+static size_t 
+magick_find_border(PixelIterator *pi, double fuzz, size_t img_width, double *reds, PixelWand** (*next)(PixelIterator*, size_t*)) {
+    size_t band = 0, width = 0, c = 0;
+    double *greens = NULL, *blues = NULL, red_average, green_average, blue_average, distance, first_row[3] = {0.0, 0.0, 0.0};
+    PixelWand **pixels = NULL;
+
+    greens = reds + img_width + 1; blues = greens + img_width + 1;
+
+    while ( (pixels = next(pi, &width)) != NULL ) {
+        red_average = 0; green_average = 0; blue_average = 0;
+        for (c = 0; c < width; c++) {
+            reds[c] = PixelGetRed(pixels[c]); greens[c] = PixelGetGreen(pixels[c]); blues[c] = PixelGetBlue(pixels[c]); 
+            /* PixelGetHSL(pixels[c], reds + c, greens + c, blues + c); */
+            red_average += reds[c]; green_average += greens[c]; blue_average += blues[c];
+        }
+        red_average /= MAX(1, width); green_average /= MAX(1, width); blue_average /= MAX(1, width);
+        distance = 0;
+        for (c = 0; c < width && distance < fuzz; c++) 
+            distance = MAX(distance, SQUARE((reds[c] - red_average)) + SQUARE((greens[c] - green_average)) + SQUARE((blues[c] - blue_average))); 
+        if (distance > fuzz) break;  // row is not homogeneous
+        if (band == 0) {first_row[0] = red_average; first_row[1] = blue_average; first_row[2] = green_average; }
+        else {
+            distance = SQUARE((first_row[0] - red_average)) + SQUARE((first_row[1] - green_average)) + SQUARE((first_row[2] - blue_average));
+            if (distance > fuzz) break; // this row's average color is far from the previous rows average color
+        }
+        band += 1;
+    }
+    return band;
+}
+
+static PyObject *
+magick_Image_remove_border(magick_Image *self, PyObject *args) {
+    double fuzz, *buf = NULL;
+    PixelIterator *pi = NULL;
+    size_t width, height, iwidth, iheight;
+    size_t top_band = 0, bottom_band = 0, left_band = 0, right_band = 0;
+    
+    NULL_CHECK(NULL)
+
+    if (!PyArg_ParseTuple(args, "d", &fuzz)) return NULL;
+    fuzz /= 255;
+
+    height = iwidth = MagickGetImageHeight(self->wand);
+    width  = iheight = MagickGetImageWidth(self->wand);
+    buf = PyMem_New(double, 3*(MAX(width, height)+1));
+    pi = NewPixelIterator(self->wand);
+    if (buf == NULL || pi == NULL) { PyErr_NoMemory(); goto end; }
+    top_band = magick_find_border(pi, fuzz, width, buf, &PixelGetNextIteratorRow);
+    if (top_band >= height) goto end;
+    PixelSetLastIteratorRow(pi);
+    bottom_band = magick_find_border(pi, fuzz, width, buf, &PixelGetPreviousIteratorRow);
+    if (bottom_band >= height) goto end;
+    if (!MagickTransposeImage(self->wand)) { magick_set_exception(self->wand); goto end; }
+    pi = DestroyPixelIterator(pi);
+    pi = NewPixelIterator(self->wand);
+    if (pi == NULL) { PyErr_NoMemory(); goto end; }
+    left_band = magick_find_border(pi, fuzz, iwidth, buf, &PixelGetNextIteratorRow);
+    if (left_band >= iheight) goto end;
+    PixelSetLastIteratorRow(pi);
+    right_band = magick_find_border(pi, fuzz, iwidth, buf, &PixelGetPreviousIteratorRow);
+    if (right_band >= iheight) goto end;
+    if (!MagickTransposeImage(self->wand)) { magick_set_exception(self->wand); goto end; }
+    if (!MagickCropImage(self->wand, width - left_band - right_band, height - top_band - bottom_band, left_band, top_band)) { magick_set_exception(self->wand); goto end; }
+end:
+    if (pi != NULL) pi = DestroyPixelIterator(pi);
+    if (buf != NULL) PyMem_Free(buf);
+    if (PyErr_Occurred() != NULL) return NULL;
+
+    return Py_BuildValue("kkkk", left_band, top_band, right_band, bottom_band);
+}
+// }}}
+
 // Image.thumbnail {{{
 
 static PyObject *
@@ -1229,6 +1315,10 @@ static PyMethodDef magick_Image_methods[] = {
      "trim(fuzz) \n\n Trim image."
     },
 
+    {"remove_border", (PyCFunction)magick_Image_remove_border, METH_VARARGS,
+     "remove_border(fuzz) \n\n Try to detect and remove borders from the image, better than the ImageMagick trim() method. Detects rows of the same color at each image edge. Where color similarity testing is based on the fuzz factor (a number between 0 and 255). Returns the number of columns/rows removed from the left, top, right and bottom edges of the image."
+    },
+
     {"crop", (PyCFunction)magick_Image_crop, METH_VARARGS,
      "crop(width, height, x, y) \n\n Crop image."
     },

From 9e0b25ec5f44f41842ea5a7204ffca5ba97d169e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Aug 2013 10:10:50 +0530
Subject: [PATCH 0553/1154] Add on device indication to the grid view

---
 src/calibre/gui2/library/alternate_views.py | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 95edb3f90c..be76601b20 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -314,6 +314,7 @@ class CoverDelegate(QStyledItemDelegate):
         self.render_queue = Queue()
         self.animating = None
         self.highlight_color = QColor(Qt.white)
+        self.on_device_emblem = QPixmap(I('ok.png')).scaled(48, 48, transformMode=Qt.SmoothTransformation)
 
     def set_dimensions(self):
         width = self.original_width = gprefs['cover_grid_width']
@@ -371,10 +372,14 @@ class CoverDelegate(QStyledItemDelegate):
                 painter.restore()
         db = db.new_api
         cdata = self.cover_cache[book_id]
+        device_connected = self.parent().gui.device_connected is not None
+        on_device = device_connected and db.field_for('ondevice', book_id)
         painter.save()
+        right_adjust = 0
         try:
             rect = option.rect
             rect.adjust(self.MARGIN, self.MARGIN, -self.MARGIN, -self.MARGIN)
+            orect = QRect(rect)
             if cdata is None or cdata is False:
                 title = db.field_for('title', book_id, default_value='')
                 authors = ' & '.join(db.field_for('authors', book_id, default_value=()))
@@ -384,22 +389,31 @@ class CoverDelegate(QStyledItemDelegate):
                     self.render_queue.put(book_id)
             else:
                 if self.title_height != 0:
-                    orect = QRect(rect)
+                    trect = QRect(rect)
                     rect.setBottom(rect.bottom() - self.title_height)
                 if self.animating is not None and self.animating.row() == index.row():
                     cdata = cdata.scaled(cdata.size() * self._animated_size)
                 dx = max(0, int((rect.width() - cdata.width())/2.0))
                 dy = max(0, rect.height() - cdata.height())
+                right_adjust = dx
                 rect.adjust(dx, dy, -dx, 0)
                 painter.drawPixmap(rect, cdata)
                 if self.title_height != 0:
-                    rect = orect
+                    rect = trect
                     rect.setTop(rect.bottom() - self.title_height + 5)
                     painter.setRenderHint(QPainter.TextAntialiasing, True)
                     title = db.field_for('title', book_id, default_value='')
                     metrics = painter.fontMetrics()
                     painter.drawText(rect, Qt.AlignCenter|Qt.TextSingleLine,
                                      metrics.elidedText(title, Qt.ElideRight, rect.width()))
+            if on_device:
+                p = self.on_device_emblem
+                drect = QRect(orect)
+                drect.setRight(drect.right() - right_adjust)
+                drect.setBottom(drect.bottom() - self.title_height)
+                drect.setTop(drect.bottom() - p.height() + 1)
+                drect.setLeft(drect.right() - p.width() + 1)
+                painter.drawPixmap(drect, p)
         finally:
             painter.restore()
 
@@ -415,6 +429,8 @@ class CoverDelegate(QStyledItemDelegate):
             except (ValueError, IndexError, KeyError):
                 return False
             db = db.new_api
+            device_connected = self.parent().gui.device_connected
+            on_device = device_connected is not None and db.field_for('ondevice', book_id)
             p = prepare_string_for_xml
             title = db.field_for('title', book_id)
             authors = db.field_for('authors', book_id)
@@ -429,6 +445,9 @@ class CoverDelegate(QStyledItemDelegate):
                         sidx=fmt_sidx(db.field_for('series_index', book_id), use_roman=use_roman_numbers),
                         series=p(series))
                     tt += '<br><br>' + val
+                if on_device:
+                    val = _('This book is on the device in %s') % on_device
+                    tt += '<br><br>' + val
                 QToolTip.showText(event.globalPos(), tt, view)
                 return True
         return False

From 1d796e581798f39243e280316d99aaade41c2ada Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Aug 2013 10:15:22 +0530
Subject: [PATCH 0554/1154] Button to reset cover sizes to automatic

---
 src/calibre/gui2/preferences/look_feel.py |  5 +++++
 src/calibre/gui2/preferences/look_feel.ui | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 469eaf35cb..db993a0424 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -220,6 +220,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.cover_grid_open_cache.clicked.connect(self.open_cg_cache)
         self.cover_grid_smaller_cover.clicked.connect(partial(self.resize_cover, True))
         self.cover_grid_larger_cover.clicked.connect(partial(self.resize_cover, False))
+        self.cover_grid_reset_size.clicked.connect(self.cg_reset_size)
         self.opt_cover_grid_disk_cache_size.setMinimum(self.gui.grid_view.thumbnail_cache.min_disk_cache)
         self.opt_cover_grid_disk_cache_size.setMaximum(self.gui.grid_view.thumbnail_cache.min_disk_cache * 100)
         self.opt_cover_grid_width.valueChanged.connect(self.update_aspect_ratio)
@@ -250,6 +251,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.opt_cover_grid_height.setValue(cval)
         self.opt_cover_grid_width.setValue(cval * ar)
 
+    def cg_reset_size(self):
+        self.opt_cover_grid_width.setValue(0)
+        self.opt_cover_grid_height.setValue(0)
+
     def initialize(self):
         ConfigWidgetBase.initialize(self)
         font = gprefs['font']
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 45874a095f..92e2581ab0 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -367,6 +367,13 @@
           <string>Cover size</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
+          <item row="3" column="0" colspan="5">
+           <widget class="QLabel" name="cover_grid_aspect_ratio">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
@@ -449,7 +456,7 @@ A value of zero means calculate automatically.</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
+          <item row="1" column="4">
            <spacer name="horizontalSpacer_4">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -462,7 +469,7 @@ A value of zero means calculate automatically.</string>
             </property>
            </spacer>
           </item>
-          <item row="0" column="0" colspan="4">
+          <item row="0" column="0" colspan="5">
            <widget class="QLabel" name="label_20">
             <property name="text">
              <string>By default, calibre chooses a cover size based on your computer's screen size. You can change the cover size here:</string>
@@ -472,10 +479,13 @@ A value of zero means calculate automatically.</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" colspan="4">
-           <widget class="QLabel" name="cover_grid_aspect_ratio">
+          <item row="1" column="3" rowspan="2">
+           <widget class="QPushButton" name="cover_grid_reset_size">
+            <property name="toolTip">
+             <string>Reset size to automatic</string>
+            </property>
             <property name="text">
-             <string/>
+             <string>&amp;Reset size</string>
             </property>
            </widget>
           </item>

From 929c13396bd4fa50ac9e0de2790021c9e4bace1b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Aug 2013 10:20:00 +0530
Subject: [PATCH 0555/1154] Remove disabled delay rendering code

---
 src/calibre/gui2/library/alternate_views.py | 24 ---------------------
 1 file changed, 24 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index be76601b20..13063fd3fc 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -471,7 +471,6 @@ class GridView(QListView):
 
     update_item = pyqtSignal(object)
     files_dropped = pyqtSignal(object)
-    delay_render = False
 
     def __init__(self, parent):
         QListView.__init__(self, parent)
@@ -500,9 +499,6 @@ class GridView(QListView):
         self.setCursor(Qt.PointingHandCursor)
         self.gui = parent
         self.context_menu = None
-        if self.delay_render:
-            self.verticalScrollBar().sliderPressed.connect(self.slider_pressed)
-            self.verticalScrollBar().sliderReleased.connect(self.slider_released)
         self.update_timer = QTimer(self)
         self.update_timer.setInterval(200)
         self.update_timer.timeout.connect(self.update_viewport)
@@ -534,26 +530,6 @@ class GridView(QListView):
         for r in xrange(self.first_visible_row or 0, self.last_visible_row or (m.count() - 1)):
             self.update(m.index(r, 0))
 
-    def slider_pressed(self):
-        self.ignore_render_requests.set()
-        self.verticalScrollBar().valueChanged.connect(self.value_changed_during_scroll)
-
-    def slider_released(self):
-        self.update_viewport()
-        self.verticalScrollBar().valueChanged.disconnect(self.value_changed_during_scroll)
-
-    def value_changed_during_scroll(self):
-        if self.ignore_render_requests.is_set():
-            self.update_timer.start()
-        else:
-            self.ignore_render_requests.set()
-
-    if delay_render:
-        def wheelEvent(self, e):
-            self.ignore_render_requests.set()
-            QListView.wheelEvent(self, e)
-            self.update_timer.start()
-
     def double_clicked(self, index):
         d = self.delegate
         if d.animating is None and not config['disable_animations']:

From a6adfd12e7adb093c6650a70f1dd4eafd47ea74a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Aug 2013 12:28:22 +0530
Subject: [PATCH 0556/1154] Grid View: Center the covers horizontally in the
 viewport

---
 src/calibre/gui2/library/alternate_views.py | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 13063fd3fc..2339eb02e9 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -489,6 +489,7 @@ class GridView(QListView):
         self.delegate.animation.finished.connect(self.animation_done)
         self.setItemDelegate(self.delegate)
         self.setSpacing(self.delegate.spacing)
+        self.padding_left = 0
         self.set_color()
         self.ignore_render_requests = Event()
         self.thumbnail_cache = ThumbnailCache(max_size=gprefs['cover_grid_disk_cache_size'],
@@ -557,6 +558,32 @@ class GridView(QListView):
         self.setPalette(pal)
         self.delegate.highlight_color = pal.color(pal.Text)
 
+    def center_grid(self):
+        if self.gui.library_view.alternate_views.current_view is not self:
+            return
+        try:
+            sz = self.spacing()*2 + self.delegate.item_size.width()
+            num = self.width() // sz
+        except (AttributeError, ZeroDivisionError):
+            return
+        extra = max(0, int((self.width() - (num * sz)) / 2) - self.spacing())
+        if extra != self.padding_left:
+            self.padding_left = extra
+            self.setViewportMargins(self.padding_left, 0, 0, 0)
+
+    def resizeEvent(self, e):
+        self.center_grid()
+        return QListView.resizeEvent(self, e)
+
+    def event(self, e):
+        if e.type() == e.Paint:
+            p = QPainter(self)
+            # Without this the viewport margin is rendered in QPalette::Window
+            # instead of QPalette::Base
+            p.fillRect(0, 0, self.padding_left+2, self.height(), self.palette().color(QPalette.Base))
+            p.end()
+        return QListView.event(self, e)
+
     def refresh_settings(self):
         size_changed = (
             gprefs['cover_grid_width'] != self.delegate.original_width or
@@ -584,6 +611,7 @@ class GridView(QListView):
             self.render_thread = Thread(target=self.render_covers)
             self.render_thread.daemon = True
             self.render_thread.start()
+        self.center_grid()
 
     def render_covers(self):
         q = self.delegate.render_queue

From 14b40e15590df94266ec6a08a5f3d1c4e7a574b9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Aug 2013 18:42:05 +0530
Subject: [PATCH 0557/1154] Virtual libraries as tabs above book list

Add an option to display virtual libraries as tabs above the book list.
Convenient to quickly switch between virtual libraries. To enable, click
the Virtual library button and select 'Show virtual libraries as tabs'.
You can re-arrange the tabs by drag and drop and close tabs you do not
want. Right click on the tabs to restore closed tabs.
---
 src/calibre/db/backend.py                    |  1 +
 src/calibre/gui2/__init__.py                 |  1 +
 src/calibre/gui2/init.py                     | 93 +++++++++++++++++++-
 src/calibre/gui2/search_restriction_mixin.py | 14 ++-
 src/calibre/gui2/ui.py                       |  2 +
 src/calibre/library/database2.py             |  1 +
 6 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index f977bbff49..9a13f4fd21 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -423,6 +423,7 @@ class DB(object):
         ]
         defs['virtual_libraries'] = {}
         defs['virtual_lib_on_startup'] = defs['cs_virtual_lib_on_startup'] = ''
+        defs['virt_libs_hidden'] = defs['virt_libs_order'] = ()
 
         # Migrate the bool tristate tweak
         defs['bools_are_tristate'] = \
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index fc1364c20e..5b8d2142a4 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -118,6 +118,7 @@ defs['cover_grid_color'] = (80, 80, 80)
 defs['cover_grid_cache_size'] = 100
 defs['cover_grid_disk_cache_size'] = 2500
 defs['cover_grid_show_title'] = False
+defs['show_vl_tabs'] = False
 del defs
 # }}}
 
diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 14910d749a..7feb4c730d 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -8,9 +8,10 @@ __docformat__ = 'restructuredtext en'
 import functools
 
 from PyQt4.Qt import (Qt, QApplication, QStackedWidget, QMenu, QTimer,
-        QSize, QSizePolicy, QStatusBar, QLabel, QFont, QAction)
+        QSize, QSizePolicy, QStatusBar, QLabel, QFont, QAction, QTabBar)
 
 from calibre.utils.config import prefs, tweaks
+from calibre.utils.icu import sort_key
 from calibre.constants import (isosx, __appname__, preferred_encoding,
     get_version)
 from calibre.gui2 import config, is_widescreen, gprefs
@@ -278,9 +279,99 @@ class GridViewButton(LayoutButton):  # {{{
 
 # }}}
 
+class VLTabs(QTabBar):  # {{{
+
+    def __init__(self, parent):
+        QTabBar.__init__(self, parent)
+        self.setDocumentMode(True)
+        self.setDrawBase(False)
+        self.setMovable(True)
+        self.setTabsClosable(True)
+        self.gui = parent
+        self.currentChanged.connect(self.tab_changed)
+        self.tabMoved.connect(self.tab_moved, type=Qt.QueuedConnection)
+        self.tabCloseRequested.connect(self.tab_close)
+        self.setStyleSheet('QTabBar::tab:selected { font-weight: bold } QTabBar::tab { text-align: center }')
+        self.setVisible(gprefs['show_vl_tabs'])
+
+    def enable_bar(self):
+        gprefs['show_vl_tabs'] = True
+        self.setVisible(True)
+
+    def disable_bar(self):
+        gprefs['show_vl_tabs'] = False
+        self.setVisible(False)
+
+    def tab_changed(self, idx):
+        vl = unicode(self.tabData(idx).toString()).strip() or None
+        self.gui.apply_virtual_library(vl)
+
+    def tab_moved(self, from_, to):
+        self.current_db.prefs['virt_libs_order'] = [unicode(self.tabData(i).toString()) for i in range(self.count())]
+
+    def tab_close(self, index):
+        vl = unicode(self.tabData(index).toString())
+        if vl:  # Dont allow closing the All Books tab
+            self.current_db.prefs['virt_libs_hidden'] = list(
+                self.current_db.prefs['virt_libs_hidden']) + [vl]
+            self.removeTab(index)
+
+    @property
+    def current_db(self):
+        return self.gui.current_db
+
+    def rebuild(self):
+        self.currentChanged.disconnect(self.tab_changed)
+        db = self.current_db
+        virt_libs = frozenset(db.prefs.get('virtual_libraries', {}))
+        hidden = frozenset(db.prefs['virt_libs_hidden'])
+        if hidden - virt_libs:
+            db.prefs['virt_libs_hidden'] = list(hidden.intersection(virt_libs))
+        order = db.prefs['virt_libs_order']
+        while self.count():
+            self.removeTab(0)
+        current_lib = db.data.get_base_restriction_name()
+        current_idx = all_idx = None
+        virt_libs = (set(virt_libs) - hidden) | {''}
+        order = {x:i for i, x in enumerate(order)}
+        for i, vl in enumerate(sorted(virt_libs, key=lambda x:(order.get(x, 0), sort_key(x)))):
+            self.addTab(vl or _('All books'))
+            self.setTabData(i, vl)
+            if vl == current_lib:
+                current_idx = i
+            if not vl:
+                all_idx = i
+        self.setCurrentIndex(all_idx if current_idx is None else current_idx)
+        self.currentChanged.connect(self.tab_changed)
+        self.tabButton(all_idx, self.RightSide).setVisible(False)
+
+    def contextMenuEvent(self, ev):
+        m = QMenu(self)
+        m.addAction(_('Sort alphabetically'), self.sort_alphabetically)
+        hidden = self.current_db.prefs['virt_libs_hidden']
+        if hidden:
+            s = m._s = m.addMenu(_('Restore hidden tabs'))
+            for x in hidden:
+                s.addAction(x, partial(self.restore, x))
+        m.addAction(_('Hide virtual library tabs'), self.disable_bar)
+        m.exec_(ev.globalPos())
+
+    def sort_alphabetically(self):
+        self.current_db.prefs['virt_libs_order'] = ()
+        self.rebuild()
+
+    def restore(self, x):
+        h = self.current_db.prefs['virt_libs_hidden']
+        self.current_db.prefs['virt_libs_hidden'] = list(set(h) - {x})
+        self.rebuild()
+
+# }}}
+
 class LayoutMixin(object):  # {{{
 
     def __init__(self):
+        self.vl_tabs = VLTabs(self)
+        self.centralwidget.layout().addWidget(self.vl_tabs)
 
         if config['gui_layout'] == 'narrow':  # narrow {{{
             self.book_details = BookDetails(False, self)
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index e8f7cd51ae..2d8ff8474c 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -12,7 +12,7 @@ from PyQt4.Qt import (
     Qt, QMenu, QPoint, QIcon, QDialog, QGridLayout, QLabel, QLineEdit, QComboBox,
     QDialogButtonBox, QSize, QVBoxLayout, QListWidget, QStringList, QRadioButton)
 
-from calibre.gui2 import error_dialog, question_dialog
+from calibre.gui2 import error_dialog, question_dialog, gprefs
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.widgets import ComboBoxWithHelp
 from calibre.utils.config_base import tweaks
@@ -334,6 +334,7 @@ class SearchRestrictionMixin(object):
         virt_libs = db.prefs.get('virtual_libraries', {})
         virt_libs[name] = search
         db.prefs.set('virtual_libraries', virt_libs)
+        self.rebuild_vl_tabs()
 
     def do_create_edit(self, name=None):
         db = self.library_view.model().db
@@ -361,6 +362,11 @@ class SearchRestrictionMixin(object):
         self.build_virtual_library_list(a, self.remove_vl_triggered)
         m.addMenu(a)
 
+        if gprefs['show_vl_tabs']:
+            m.addAction(_('Hide virtual library tabs'), self.vl_tabs.disable_bar)
+        else:
+            m.addAction(_('Show virtual libraries as tabs'), self.vl_tabs.enable_bar)
+
         m.addSeparator()
 
         db = self.library_view.model().db
@@ -402,6 +408,9 @@ class SearchRestrictionMixin(object):
         p = QPoint(0, self.virtual_library.height())
         self.virtual_library_menu.popup(self.virtual_library.mapToGlobal(p))
 
+    def rebuild_vl_tabs(self):
+        self.vl_tabs.rebuild()
+
     def apply_virtual_library(self, library=None):
         db = self.library_view.model().db
         virt_libs = db.prefs.get('virtual_libraries', {})
@@ -471,6 +480,7 @@ class SearchRestrictionMixin(object):
         db.prefs.set('virtual_libraries', virt_libs)
         if reapply and db.data.get_base_restriction_name() == name:
             self.apply_virtual_library('')
+        self.rebuild_vl_tabs()
 
     def _trim_restriction_name(self, name):
         return name[0:MAX_VIRTUAL_LIBRARY_NAME_LENGTH].strip()
@@ -591,11 +601,13 @@ class SearchRestrictionMixin(object):
                     'QLabel { border-radius: 6px; background-color: %s }' %
                     tweaks['highlight_virtual_library'])
             self.clear_vl.setVisible(True)
+            self.search_count.setVisible(not gprefs['show_vl_tabs'])
         else:  # No restriction or not library view
             t = ''
             self.search_count.setStyleSheet(
                     'QLabel { background-color: transparent; }')
             self.clear_vl.setVisible(False)
+            self.search_count.setVisible(False)
         self.search_count.setText(t)
 
 if __name__ == '__main__':
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 196de7cb6a..4cec88cf05 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -341,6 +341,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         ######################### Search Restriction ##########################
         if db.prefs['virtual_lib_on_startup']:
             self.apply_virtual_library(db.prefs['virtual_lib_on_startup'])
+        self.rebuild_vl_tabs()
 
         ########################### Cover Flow ################################
 
@@ -627,6 +628,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         self.saved_searches_changed(recount=False)  # reload the search restrictions combo box
         if db.prefs['virtual_lib_on_startup']:
             self.apply_virtual_library(db.prefs['virtual_lib_on_startup'])
+        self.rebuild_vl_tabs()
         for action in self.iactions.values():
             action.library_changed(db)
         if olddb is not None:
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 847b223b4d..248f958288 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -235,6 +235,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         ]
         defs['virtual_libraries'] = {}
         defs['virtual_lib_on_startup'] = defs['cs_virtual_lib_on_startup'] = ''
+        defs['virt_libs_hidden'] = defs['virt_libs_order'] = ()
 
         # Migrate the bool tristate tweak
         defs['bools_are_tristate'] = \

From 857ddac1b987efa46f59bed353fcf3b1ce6ff87d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Aug 2013 18:51:21 +0530
Subject: [PATCH 0558/1154] Email to selected in top level menu

Also show error message when no recipients are selected instead of
silently doing nothing.
---
 src/calibre/gui2/actions/device.py | 5 +++++
 src/calibre/gui2/email.py          | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py
index e6432f9334..364a0486b2 100644
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@@ -145,6 +145,11 @@ class ShareConnMenu(QMenu):  # {{{
             self.email_to_menu.addAction(action1)
             self.email_to_and_delete_menu.addAction(action2)
             map(self.memory.append, (action1, action2))
+            tac1 = DeviceAction('choosemail:', False, False, I('mail.png'),
+                    _('Email to selected recipients...'))
+            self.addAction(tac1)
+            tac1.a_s.connect(sync_menu.action_triggered)
+            self.memory.append(tac1)
             ac = self.addMenu(self.email_to_and_delete_menu)
             self.email_actions.append(ac)
             action1.a_s.connect(sync_menu.action_triggered)
diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 5ecce8248f..57ffebefe0 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -258,6 +258,12 @@ class SelectRecipients(QDialog):  # {{{
         for key in sorted(opts.accounts or (), key=sort_key):
             self.create_item(opts.aliases.get(key, key), key)
 
+    def accept(self):
+        if not self.ans:
+            return error_dialog(self, _('No recipients'),
+                                _('You must select at least one recipient'), show=True)
+        QDialog.accept(self)
+
     @property
     def ans(self):
         opts = email_config().parse()

From 0d430172d245be23fc1a454ff73117d915001fbd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Aug 2013 21:12:06 +0530
Subject: [PATCH 0559/1154] Fix adding VL not updating VL tabs correctly

---
 src/calibre/gui2/search_restriction_mixin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 2d8ff8474c..a2cc06d691 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -334,7 +334,6 @@ class SearchRestrictionMixin(object):
         virt_libs = db.prefs.get('virtual_libraries', {})
         virt_libs[name] = search
         db.prefs.set('virtual_libraries', virt_libs)
-        self.rebuild_vl_tabs()
 
     def do_create_edit(self, name=None):
         db = self.library_view.model().db
@@ -346,6 +345,7 @@ class SearchRestrictionMixin(object):
             self.add_virtual_library(db, cd.library_name, cd.library_search)
             if not name or name == db.data.get_base_restriction_name():
                 self.apply_virtual_library(cd.library_name)
+            self.rebuild_vl_tabs()
 
     def virtual_library_clicked(self):
         m = self.virtual_library_menu

From b97b70bc7c32a18112e90948cd83b2b84231e0bc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Aug 2013 08:46:48 +0530
Subject: [PATCH 0560/1154] Linux mtp: Update MTP device ids from upstram

Also add id for MT65xx Android Phone. Fixes #1212458 [device not detected by calibre](https://bugs.launchpad.net/calibre/+bug/1212458)
---
 .../devices/mtp/unix/upstream/music-players.h | 95 +++++++++++++++----
 1 file changed, 79 insertions(+), 16 deletions(-)

diff --git a/src/calibre/devices/mtp/unix/upstream/music-players.h b/src/calibre/devices/mtp/unix/upstream/music-players.h
index c7a9b80bce..f0e175cb70 100644
--- a/src/calibre/devices/mtp/unix/upstream/music-players.h
+++ b/src/calibre/devices/mtp/unix/upstream/music-players.h
@@ -3,7 +3,7 @@
  * List of music players as USB ids.
  *
  * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
- * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
+ * Copyright (C) 2005-2013 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2006-2007 Marcus Meissner
  * Copyright (C) 2007 Ted Bullock
  * Copyright (C) 2012 Sony Mobile Communications AB
@@ -570,14 +570,18 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Acer", 0x0502, "Iconia TAB A510 (ID2)", 0x338a,
       DEVICE_FLAGS_ANDROID_BUGS },
+  { "Acer", 0x0502, "S500 CloudMobile", 0x33aa,
+      DEVICE_FLAGS_ANDROID_BUGS },
   { "Acer", 0x0502, "E350 Liquid Gallant Duo", 0x33c3,
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Acer", 0x0502, "Iconia TAB A210", 0x33cb,
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Acer", 0x0502, "Iconia TAB A110", 0x33d8,
       DEVICE_FLAGS_ANDROID_BUGS },
-
-
+  { "Acer", 0x0502, "Liquid Z120 MT65xx Android Phone", 0x3473,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "Acer", 0x0502, "MT65xx Android Phone", 0x353c,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * SanDisk
@@ -1057,6 +1061,8 @@
   { "Nokia", 0x0421, "E72", 0x0221, DEVICE_FLAG_NONE },
   // From: Anonymous SourceForge user
   { "Nokia", 0x0421, "5530", 0x0229, DEVICE_FLAG_NONE },
+  /* Grzegorz Woźniak <wozniakg@gmail.com> */
+  { "Nokia", 0x0421, "E6", 0x032f, DEVICE_FLAG_NONE },
   // From: Anonymous SourceForge user
   { "Nokia", 0x0421, "N97 mini", 0x026b, DEVICE_FLAG_NONE },
   // From: Anonymous SourceForge user
@@ -1112,6 +1118,7 @@
   // From: Maxin B. John <maxin.john@gmail.com>
   { "Nokia", 0x0421, "N9", 0x051a, DEVICE_FLAG_NONE },
   { "Nokia", 0x0421, "C5-00", 0x0592, DEVICE_FLAG_NONE },
+  { "Nokia", 0x0421, "808 PureView", 0x05d3, DEVICE_FLAG_NONE },
   // Reported by Sampo Savola
   // Covers Lumia 920, 820 and probably any WP8 device.
   { "Nokia", 0x0421, "Nokia Lumia WP8", 0x0661, DEVICE_FLAG_NONE },
@@ -1543,6 +1550,8 @@
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "MT11i Xperia Neo MTP", 0x0156,
       DEVICE_FLAG_NONE },
+  { "SonyEricsson", 0x0fce, "IS12S Xperia Acro MTP", 0x0157,
+      DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "MK16i Xperia MTP", 0x015a,
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "R800/R88i Xperia Play MTP", 0x015d,
@@ -1591,16 +1600,20 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia E MTP", 0x018c,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Tablet Z MTP", 0x018D,
+  { "SONY", 0x0fce, "Xperia Tablet Z MTP 1", 0x018d,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia Z MTP", 0x0193,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Tablet Z MTP", 0x0194,
+  { "SONY", 0x0fce, "Xperia Tablet Z MTP 2", 0x0194,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia SP MTP", 0x0195,
       DEVICE_FLAG_NONE },
 
   /*
    * MTP+UMS personalities of MTP devices (see above)
    */
+  { "SonyEricsson", 0x0fce, "IS12S Xperia Acro MTP+CDROM", 0x4157,
+      DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "ST17i Xperia Active MTP+CDROM", 0x4168,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "LT26i Xperia S MTP+CDROM", 0x4169,
@@ -1633,15 +1646,17 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia J MTP+CDROM", 0x4188,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia ZL MTP", 0x4189,
+  { "SONY", 0x0fce, "Xperia ZL MTP+CDROM", 0x4189,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia E MTP+CDROM", 0x418c,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Tablet Z MTP", 0x418d,
+  { "SONY", 0x0fce, "Xperia Tablet Z MTP+CDROM 1", 0x418d,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Z MTP", 0x4193,
+  { "SONY", 0x0fce, "Xperia Z MTP+CDROM", 0x4193,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Tablet Z MTP", 0x4194,
+  { "SONY", 0x0fce, "Xperia Tablet Z MTP+CDROM 2", 0x4194,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia SP MTP+CDROM", 0x4195,
       DEVICE_FLAG_NONE },
 
   /*
@@ -1651,6 +1666,8 @@
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "MT11i Xperia Neo MTP+ADB", 0x5156,
       DEVICE_FLAG_NONE },
+  { "SonyEricsson", 0x0fce, "IS12S Xperia Acro MTP+ADB", 0x5157,
+      DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "MK16i Xperia MTP+ADB", 0x515a,
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "R800/R88i Xperia Play MTP+ADB", 0x515d,
@@ -1665,7 +1682,7 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "LT26i Xperia S MTP+ADB", 0x5169,
       DEVICE_FLAG_NO_ZERO_READS },
-  { "SonyEricsson", 0x0fce, "SK17i Xperia Mini Pro MTP+ADB", 0x516d,
+  { "SonyEricsson", 0x0fce, "WT19i Live Walkman MTP+ADB", 0x516d,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "ST21i Xperia Tipo MTP+ADB", 0x5170,
       DEVICE_FLAG_NONE },
@@ -1695,15 +1712,17 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia J MTP+ADB", 0x5188,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia ZL MTP", 0x5189,
+  { "SONY", 0x0fce, "Xperia ZL MTP+ADB", 0x5189,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia E MTP+ADB", 0x518c,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Tablet Z MTP", 0x518d,
+  { "SONY", 0x0fce, "Xperia Tablet Z MTP+ADB 1", 0x518d,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Z MTP", 0x5193,
+  { "SONY", 0x0fce, "Xperia Z MTP+ADB", 0x5193,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Tablet Z MTP", 0x5194,
+  { "SONY", 0x0fce, "Xperia Tablet Z MTP+ADB 2", 0x5194,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia SP MTP+ADB", 0x5195,
       DEVICE_FLAG_NONE },
 
   /*
@@ -1844,6 +1863,10 @@
   { "Google Inc (for Asus)", 0x18d1, "TF101 Transformer", 0x4e0f,
       DEVICE_FLAGS_ANDROID_BUGS },
   // 0x4e21 (Nexus S) is a USB Mass Storage device.
+  { "Google Inc (for Samsung)", 0x18d1, "Nexus S (MTP)", 0x4e25,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "Google Inc (for Samsung)", 0x18d1, "Nexus S (MTP+ADB)", 0x4e26,
+      DEVICE_FLAGS_ANDROID_BUGS },
   // Reported by Chris Smith <tcgsmythe@users.sourceforge.net>
   { "Google Inc (for Asus)", 0x18d1, "Nexus 7 (MTP)", 0x4e41,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2023,6 +2046,8 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Asus", 0x0b05, "TF101 Eeepad Transformer (MTP+ADB)", 0x4e1f,
       DEVICE_FLAGS_ANDROID_BUGS },
+  { "Asus", 0x0b05, "Fonepad", 0x514f,
+      DEVICE_FLAGS_ANDROID_BUGS },
   { "Asus", 0x0b05, "PadFone (MTP)", 0x5200,
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Asus", 0x0b05, "PadFone (MTP+ADB)", 0x5201,
@@ -2077,7 +2102,9 @@
    */
   { "ZTE", 0x19d2, "V55 ID 1", 0x0244, DEVICE_FLAGS_ANDROID_BUGS },
   { "ZTE", 0x19d2, "V55 ID 2", 0x0245, DEVICE_FLAGS_ANDROID_BUGS },
-  { "ZTE", 0x19d2, "v790/Blade 3", 0x0306, DEVICE_FLAGS_ANDROID_BUGS },
+  { "ZTE", 0x19d2, "V790/Blade 3", 0x0306, DEVICE_FLAGS_ANDROID_BUGS },
+  { "ZTE", 0x19d2, "V880E", 0x0307, DEVICE_FLAGS_ANDROID_BUGS },
+  { "ZTE", 0x19d2, "V985", 0x0383, DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * HTC (High Tech Computer Corp)
@@ -2100,6 +2127,12 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "HTC", 0x0bb4, "HTC One S (ID1)", 0x0cec,
       DEVICE_FLAGS_ANDROID_BUGS },
+  { "HTC", 0x0bb4, "HTC Desire X", 0x0dd5,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "HTC", 0x0bb4, "HTC One (ID1)", 0x0dda,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "HTC", 0x0bb4, "HTC One (MTP+UMS+ADB)", 0x0dea,
+      DEVICE_FLAGS_ANDROID_BUGS },
   { "HTC", 0x0bb4, "HTC Evo 4G LTE (ID1)", 0x0df5,
       DEVICE_FLAGS_ANDROID_BUGS },
   { "HTC", 0x0bb4, "HTC One S (ID2)", 0x0df9,
@@ -2120,7 +2153,9 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "HTC", 0x0bb4, "Droid DNA (MTP+UMS)", 0x0ebd,
       DEVICE_FLAGS_ANDROID_BUGS },
-  { "HTC", 0x0bb4, "HTC One X (ID2)", 0x0f91,
+  { "HTC", 0x0bb4, "HTC One (MTP+ADB)", 0x0f87,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "HTC", 0x0bb4, "HTC One (ID3)", 0x0f91,
       DEVICE_FLAGS_ANDROID_BUGS },
   // These identify themselves as "cm_tenderloin", fun...
   // Done by HTC for HP I guess.
@@ -2129,6 +2164,9 @@
   { "Hewlett-Packard", 0x0bb4, "HP Touchpad (MTP+ADB)", 0x6860,
       DEVICE_FLAGS_ANDROID_BUGS },
 #if 0
+  // Apparently also used by a clone called Jiayu G2S
+  // with the MTK6577T chipset
+  // http://www.ejiayu.com/en/Product-19.html with
   { "HTC", 0x0bb4, "Android Device ID2 (Zopo, HD2...)", 0x2008,
       DEVICE_FLAGS_ANDROID_BUGS },
 #endif
@@ -2155,6 +2193,7 @@
   // Reported by Michael Gurski <gurski@users.sourceforge.net>
   { "Vizio", 0x0489, "VTAB1008", 0xe040, DEVICE_FLAGS_ANDROID_BUGS },
 
+
   /*
    * Amazon
    */
@@ -2172,6 +2211,8 @@
    */
   { "Barnes&Noble", 0x2080, "Nook HD+", 0x0005,
       DEVICE_FLAGS_ANDROID_BUGS },
+  { "Barnes&Noble", 0x2080, "Nook HD", 0x0006,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Viewpia, bq, YiFang
@@ -2211,6 +2252,28 @@
   { "Xiaomi", 0x2717, "Mi-2 (MTP)", 0xf003,
       DEVICE_FLAGS_ANDROID_BUGS },
 
+  /*
+   * XO Learning Tablet
+   */
+  { "Acromag Inc.", 0x16d5, "XO Learning Tablet (MTP+ADB)", 0x8005,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "Acromag Inc.", 0x16d5, "XO Learning Tablet (MTP)", 0x8006,
+      DEVICE_FLAGS_ANDROID_BUGS },
+
+  /*
+   * SHARP Corporation
+   */
+  { "SHARP Corporation", 0x0489, "SH930W", 0xc025,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "SHARP Corporation", 0x04dd, "SBM203SH", 0x9661,
+      DEVICE_FLAGS_ANDROID_BUGS },
+
+  /*
+   * Alcatel
+   */
+  { "Alcatel", 0x1bbb, "One Touch 997D", 0x2008,
+      DEVICE_FLAGS_ANDROID_BUGS },
+
   /*
    * Other strange stuff.
    */

From c8083b0995fab77d4d56650fb5f7846dd96bf35b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Aug 2013 08:52:55 +0530
Subject: [PATCH 0561/1154] Move non upstream change out of upstream file

---
 src/calibre/devices/mtp/unix/devices.c                | 3 +++
 src/calibre/devices/mtp/unix/upstream/music-players.h | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/mtp/unix/devices.c b/src/calibre/devices/mtp/unix/devices.c
index 2efe02c38f..8738f210d5 100644
--- a/src/calibre/devices/mtp/unix/devices.c
+++ b/src/calibre/devices/mtp/unix/devices.c
@@ -11,6 +11,9 @@
 const calibre_device_entry_t calibre_mtp_device_table[] = {
 #include "upstream/music-players.h"
 
+  { "Acer", 0x0502, "MT65xx Android Phone", 0x353c,
+      DEVICE_FLAGS_ANDROID_BUGS },
+
     , { NULL, 0xffff, NULL, 0xffff, DEVICE_FLAG_NONE }
 };
 
diff --git a/src/calibre/devices/mtp/unix/upstream/music-players.h b/src/calibre/devices/mtp/unix/upstream/music-players.h
index f0e175cb70..fedda128aa 100644
--- a/src/calibre/devices/mtp/unix/upstream/music-players.h
+++ b/src/calibre/devices/mtp/unix/upstream/music-players.h
@@ -580,8 +580,6 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Acer", 0x0502, "Liquid Z120 MT65xx Android Phone", 0x3473,
       DEVICE_FLAGS_ANDROID_BUGS },
-  { "Acer", 0x0502, "MT65xx Android Phone", 0x353c,
-      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * SanDisk

From 767bee56a2e39f562d5de2c674801cd276d2bafc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Aug 2013 09:14:04 +0530
Subject: [PATCH 0562/1154] Allow customization of comic metadata reader plugin

Allow customizing the comic metadata reader plugin via
Preferences->Plugins to read the series index from either the volume
or the issue number of the comic. Fixes #1211433 [comicinfo metada uses volume instead of issue](https://bugs.launchpad.net/calibre/+bug/1211433)
---
 src/calibre/customize/builtins.py      |  8 +++++++-
 src/calibre/ebooks/metadata/archive.py | 13 ++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 0812325157..24c3a688b2 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -130,6 +130,9 @@ class ComicMetadataReader(MetadataReaderPlugin):
     file_types = set(['cbr', 'cbz'])
     description = _('Extract cover from comic files')
 
+    def customization_help(self, gui=False):
+        return 'Read series number from volume or issue number. Default is volume, set this to issue to use issue number instead.'
+
     def get_metadata(self, stream, ftype):
         if hasattr(stream, 'seek') and hasattr(stream, 'tell'):
             pos = stream.tell()
@@ -151,8 +154,11 @@ class ComicMetadataReader(MetadataReaderPlugin):
         mi = MetaInformation(None, None)
         stream.seek(0)
         if ftype in {'cbr', 'cbz'}:
+            series_index = self.site_customization
+            if series_index not in {'volume', 'issue'}:
+                series_index = 'volume'
             try:
-                mi.smart_update(get_comic_metadata(stream, ftype))
+                mi.smart_update(get_comic_metadata(stream, ftype, series_index=series_index))
             except:
                 pass
         if ret is not None:
diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
index b236064ed8..7b8ecd2ca9 100644
--- a/src/calibre/ebooks/metadata/archive.py
+++ b/src/calibre/ebooks/metadata/archive.py
@@ -86,13 +86,16 @@ class ArchiveExtract(FileTypePlugin):
                 of.write(zf.read(fname))
         return of.name
 
-def get_comic_book_info(d, mi):
+def get_comic_book_info(d, mi, series_index='volume'):
     # See http://code.google.com/p/comicbookinfo/wiki/Example
     series = d.get('series', '')
     if series.strip():
         mi.series = series
-        if d.get('volume', -1) > -1:
-            mi.series_index = float(d['volume'])
+        si = d.get(series_index, None)
+        if si is None:
+            si = d.get('issue' if series_index == 'volume' else 'volume', None)
+        if si is not None:
+            mi.series_index = float(si)
     if d.get('rating', -1) > -1:
         mi.rating = d['rating']
     for x in ('title', 'publisher'):
@@ -126,7 +129,7 @@ def get_comic_book_info(d, mi):
         except:
             pass
 
-def get_comic_metadata(stream, stream_type):
+def get_comic_metadata(stream, stream_type, series_index='volume'):
     # See http://code.google.com/p/comicbookinfo/wiki/Example
     from calibre.ebooks.metadata import MetaInformation
 
@@ -149,7 +152,7 @@ def get_comic_metadata(stream, stream_type):
         if hasattr(m, 'iterkeys'):
             for cat in m.iterkeys():
                 if cat.startswith('ComicBookInfo'):
-                    get_comic_book_info(m[cat], mi)
+                    get_comic_book_info(m[cat], mi, series_index=series_index)
                     break
     return mi
 

From bad2bc51c7aefc7e5fd7c2724e8d948262748240 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Aug 2013 22:06:11 +0530
Subject: [PATCH 0563/1154] Add QtXmlPatterns to the linux build as some
 distros seem to require it

---
 setup/installer/linux/freeze2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index 220f28ba82..cb2d8e0070 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -19,7 +19,7 @@ SITE_PACKAGES = ['PIL', 'dateutil', 'dns', 'PyQt4', 'mechanize',
         '_psutil_linux.so', 'psutil', 'cssselect', 'apsw.so']
 
 QTDIR          = '/usr/lib/qt4'
-QTDLLS         = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit', 'QtDBus')
+QTDLLS         = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit', 'QtDBus', 'QtXmlPatterns')
 MAGICK_PREFIX = '/usr'
 binary_includes = [
                 '/usr/bin/pdftohtml',

From 0a164ce799367ff7a990dd109d211067f2cf0c03 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 09:21:09 +0530
Subject: [PATCH 0564/1154] Driver for Samsung Galaxy Young S5360

Fixes #1212918 [Calibre wont recognize Samsung Galaxy young](https://bugs.launchpad.net/calibre/+bug/1212918)
---
 src/calibre/devices/android/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 28f55751e2..b59386b4df 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -248,7 +248,7 @@ class ANDROID(USBMS):
             'S5830I_CARD', 'MID7042', 'LINK-CREATE', '7035', 'VIEWPAD_7E',
             'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS',
             'ICS', 'E400', '__FILE-STOR_GADG', 'ST80208-1', 'GT-S5660M_CARD', 'XT894', '_USB',
-            'PROD_TAB13-201', 'URFPAD2', 'MID1126', 'ST10216-1',
+            'PROD_TAB13-201', 'URFPAD2', 'MID1126', 'ST10216-1', 'S5360L_CARD',
     ]
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',

From e857a7f6f4c9d92eb58246214bdaa5cda29646ce Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 09:38:27 +0530
Subject: [PATCH 0565/1154] version 0.9.44

---
 Changelog.yaml           | 38 ++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index fee1971d3f..d4f3b4cbb9 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,44 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.44
+  date: 2013-08-16
+
+  new features:
+    - title: "Add an option to display all virtual libraries as tabs above the book list."
+      description: "Convenient to quickly switch between virtual libraries. To enable, click the Virtual library button and select 'Show virtual libraries as tabs'.  You can re-arrange the tabs by drag and drop and close tabs you do not want. Right click on the tabs to restore closed tabs."
+
+    - title: "An improved cover trimming algorithm to automatically detect and remove borders and extra space from the edge of cover images. To try it use the 'Trim' button in the edit metadata dialog. This can sometimes remove too much so if you dont like the result, just click cancel. You can make the algorithm more or less aggressive via Preferences->Tweaks"
+
+    - title: "Allow customizing the comic metadata reader plugin via Preferences->Plugins to read the series index from either the volume or the issue number of the comic."
+      tickets: [1211433]
+
+    - title: "Linux MTP driver: Add ids for some newer devices."
+      tickets: [1212458]
+
+    - title: "Add a trim cover option to the bulk metadata edit dialog"
+
+    - title: "Make the book information dialog user resizable, with a splitter between the cover and the info panel. Also change the background of the cover panel for books that have been marked using the Temp marker plugin."
+      tickets: [1209057]
+
+    - title: "Driver for Samsung Galaxy Young Android phone"
+      tickets: [1212918]
+ 
+  bug fixes:
+    - title: "PDF Output: Do not abort conversion if the document being converted has an HTML cover (found in some broken EPUB files)."
+
+    - title: "RTF Input: When converting RTF files with no codepage, use the input encoding setting as the codepage."
+      tickets: [1163572]
+
+  improved recipes:
+    - The Independent
+    - El Periodica de Aragon 
+    - El Correo
+
+  new recipes:
+    - title: Daily Express 
+      author: Dave Asbury
+
 - version: 0.9.43
   date: 2013-08-09
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index d4d73e64a7..9fe774f648 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 43)
+numeric_version = (0, 9, 44)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 559f6721de89f2638b7da9f66429b8220ff42eea Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 09:48:12 +0530
Subject: [PATCH 0566/1154] ...

---
 src/calibre/devices/mtp/unix/devices.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/calibre/devices/mtp/unix/devices.c b/src/calibre/devices/mtp/unix/devices.c
index 8738f210d5..c8d000bc09 100644
--- a/src/calibre/devices/mtp/unix/devices.c
+++ b/src/calibre/devices/mtp/unix/devices.c
@@ -11,8 +11,7 @@
 const calibre_device_entry_t calibre_mtp_device_table[] = {
 #include "upstream/music-players.h"
 
-  { "Acer", 0x0502, "MT65xx Android Phone", 0x353c,
-      DEVICE_FLAGS_ANDROID_BUGS },
+    , { "Acer", 0x0502, "MT65xx Android Phone", 0x353c, DEVICE_FLAGS_ANDROID_BUGS }
 
     , { NULL, 0xffff, NULL, 0xffff, DEVICE_FLAG_NONE }
 };

From 9c6b1312352dffd67c2ebcf5f7bd80ccabcb9fac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 11:38:08 +0530
Subject: [PATCH 0567/1154] Fix #1212943 [Minor typo in Calibre message
 (enble)](https://bugs.launchpad.net/calibre/+bug/1212943)

---
 src/calibre/gui2/preferences/look_feel.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 92e2581ab0..519e8dfc0f 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -235,7 +235,7 @@
        <item>
         <widget class="QLabel" name="label_19">
          <property name="text">
-          <string>Control the cover grid view. You can enble this view by clicking the grid button in the bottom right corner of the main calibre window.</string>
+          <string>Control the cover grid view. You can enable this view by clicking the grid button in the bottom right corner of the main calibre window.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>

From d8c244a83b08bb000e38f020023797fd5360be30 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 12:56:37 +0530
Subject: [PATCH 0568/1154] Mark all books as dirty when deleting custom column

---
 src/calibre/db/cache.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 7ed653093c..ce7b48193f 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1547,6 +1547,7 @@ class Cache(object):
     @write_api
     def delete_custom_column(self, label=None, num=None):
         self.backend.delete_custom_column(label, num)
+        self._mark_as_dirty(self._all_book_ids())
 
     @write_api
     def create_custom_column(self, label, name, datatype, is_multiple, editable=True, display={}):

From a2d6b66bc267713c7349b4220e0c1f8ef95ca1a9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 14:20:03 +0530
Subject: [PATCH 0569/1154] Mark books as dirty only after custom column is
 actually deleted

---
 src/calibre/db/backend.py | 2 ++
 src/calibre/db/cache.py   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 9a13f4fd21..3a8bca7df1 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -515,6 +515,7 @@ class DB(object):
     # }}}
 
     def initialize_custom_columns(self):  # {{{
+        self.custom_columns_deleted = False
         with self.conn:
             # Delete previously marked custom columns
             for record in self.conn.get(
@@ -537,6 +538,7 @@ class DB(object):
                         DROP TABLE   IF EXISTS {lt};
                         '''.format(table=table, lt=lt)
                 )
+                self.custom_columns_deleted = True
             self.conn.execute('DELETE FROM custom_columns WHERE mark_for_delete=1')
 
         # Load metadata for custom columns
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index ce7b48193f..6caa277508 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -107,6 +107,9 @@ class Cache(object):
 
         self._search_api = Search(self, 'saved_searches', self.field_metadata.get_search_terms())
         self.initialize_dynamic()
+        if self.backend.custom_columns_deleted:
+            self.mark_as_dirty(self.all_book_ids())
+        self.backend.custom_columns_deleted = False
 
     @write_api
     def initialize_dynamic(self):
@@ -1547,7 +1550,6 @@ class Cache(object):
     @write_api
     def delete_custom_column(self, label=None, num=None):
         self.backend.delete_custom_column(label, num)
-        self._mark_as_dirty(self._all_book_ids())
 
     @write_api
     def create_custom_column(self, label, name, datatype, is_multiple, editable=True, display={}):

From 02217cc62d8b4c179ae1ddc42b506922ee56b201 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 14:24:28 +0530
Subject: [PATCH 0570/1154] ...

---
 src/calibre/db/cache.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 6caa277508..07b191d4f6 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -107,9 +107,6 @@ class Cache(object):
 
         self._search_api = Search(self, 'saved_searches', self.field_metadata.get_search_terms())
         self.initialize_dynamic()
-        if self.backend.custom_columns_deleted:
-            self.mark_as_dirty(self.all_book_ids())
-        self.backend.custom_columns_deleted = False
 
     @write_api
     def initialize_dynamic(self):
@@ -309,6 +306,9 @@ class Cache(object):
                     field.author_sort_field = self.fields['author_sort']
                 elif name == 'title':
                     field.title_sort_field = self.fields['sort']
+        if self.backend.custom_columns_deleted:
+            self.mark_as_dirty(self.all_book_ids())
+        self.backend.custom_columns_deleted = False
 
     @read_api
     def field_for(self, name, book_id, default_value=None):

From b5571efffe0fd92c9e3b159477fcf36c3c0fd411 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 14:58:59 +0530
Subject: [PATCH 0571/1154] Start work on DOCX output

---
 src/calibre/ebooks/docx/writer/__init__.py  | 10 +++
 src/calibre/ebooks/docx/writer/container.py | 99 +++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 src/calibre/ebooks/docx/writer/__init__.py
 create mode 100644 src/calibre/ebooks/docx/writer/container.py

diff --git a/src/calibre/ebooks/docx/writer/__init__.py b/src/calibre/ebooks/docx/writer/__init__.py
new file mode 100644
index 0000000000..2dfbaa2fb8
--- /dev/null
+++ b/src/calibre/ebooks/docx/writer/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+
diff --git a/src/calibre/ebooks/docx/writer/container.py b/src/calibre/ebooks/docx/writer/container.py
new file mode 100644
index 0000000000..620935791e
--- /dev/null
+++ b/src/calibre/ebooks/docx/writer/container.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import textwrap
+
+from lxml.builder import ElementMaker
+
+from calibre import guess_type
+from calibre.constants import numeric_version, __appname__
+from calibre.ebooks.docx.names import namespaces
+from calibre.ebooks.oeb.base import xml2str
+from calibre.utils.zipfile import ZipFile
+
+class DOCX(object):
+
+    def __init__(self):
+        pass
+
+    # Boilerplate {{{
+    @property
+    def contenttypes(self):
+        E = ElementMaker(namespace=namespaces['ct'], nsmap={None:namespaces['ct']})
+        types = E.Types()
+        for partname, mt in {
+            "/word/footnotes.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml",
+            "/word/document.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",
+            "/word/numbering.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml",
+            "/word/styles.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml",
+            "/word/endnotes.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml",
+            "/word/settings.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml",
+            "/word/theme/theme1.xml": "application/vnd.openxmlformats-officedocument.theme+xml",
+            "/word/fontTable.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml",
+            "/word/webSettings.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml",
+            "/docProps/core.xml": "application/vnd.openxmlformats-package.core-properties+xml",
+            "/docProps/app.xml": "application/vnd.openxmlformats-officedocument.extended-properties+xml",
+        }.iteritems():
+            types.append(E.Override(PartName=partname, ContentType=mt))
+        added = {'png', 'gif', 'jpeg', 'jpg', 'svg', 'xml'}
+        for ext in added:
+            types.append(E.Default(Extension=ext, ContentType=guess_type('a.'+ext)[0]))
+        for ext, mt in {
+            "rels": "application/vnd.openxmlformats-package.relationships+xml",
+            "odttf": "application/vnd.openxmlformats-officedocument.obfuscatedFont",
+        }.iteritems():
+            added.add(ext)
+            types.append(E.Default(Extension=ext, ContentType=mt))
+        # TODO: Iterate over all resources and add mimetypes for any that are
+        # not already added
+        return xml2str(types, pretty_print=True)
+
+    @property
+    def appproperties(self):
+        E = ElementMaker(namespace=namespaces['ep'], nsmap={None:namespaces['ep']})
+        props = E.Properties(
+            E.Application(__appname__),
+            E.AppVersion('%02d.%04d' % numeric_version[:2]),
+            E.DocSecurity('0'),
+            E.HyperlinksChanged('false'),
+            E.LinksUpToDate('true'),
+            E.ScaleCrop('false'),
+            E.SharedDoc('false'),
+        )
+        return xml2str(props, pretty_print=True)
+
+    @property
+    def containerrels(self):
+        return textwrap.dedent(b'''\
+        <?xml version='1.0' encoding='utf-8'?>
+        <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+            <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
+            <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
+            <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
+        </Relationships>''')
+
+    @property
+    def websettings(self):
+        E = ElementMaker(namespace=namespaces['w'], nsmap={'w':namespaces['w']})
+        ws = E.webSettings(
+            E.optimizeForBrowser, E.allowPNG, E.doNotSaveAsSingleFile)
+        return xml2str(ws, pretty_print=True)
+
+    # }}}
+
+    def write(self, path_or_stream):
+        with ZipFile(path_or_stream, 'w') as zf:
+            zf.writestr('[Content_Types].xml', self.contenttypes)
+            zf.writestr('_rels/.rels', self.containerrels)
+            zf.writestr('docProps/app.xml', self.appproperties)
+            zf.writestr('word/webSettings.xml', self.websettings)
+            # TODO: Write document and document relationships
+
+if __name__ == '__main__':
+    d = DOCX()
+    print (d.websettings)

From dc16d477d1dde21f38927e508e2e238754d314cc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 14:59:24 +0530
Subject: [PATCH 0572/1154] Make the backup status dialog a bit bigger

---
 src/calibre/gui2/actions/choose_library.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 9c6a666a92..6b70bddf6a 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -171,7 +171,7 @@ class BackupStatus(QDialog):  # {{{
         self.setResult(9)
         self.setWindowTitle(_('Backup status'))
         self.update()
-        self.resize(self.sizeHint())
+        self.resize(self.sizeHint() + QSize(50, 15))
 
     def update(self):
         db = self.db()

From f28c60d066a922f5014fbe0b2bde900ae58d65fe Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 16:07:08 +0530
Subject: [PATCH 0573/1154] newdb: Disable autocommit during executemany for a
 performance boost

---
 src/calibre/db/backend.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 3a8bca7df1..660da9e088 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -287,7 +287,8 @@ class Connection(apsw.Connection):  # {{{
         return cursor.execute(sql, bindings)
 
     def executemany(self, sql, sequence_of_bindings):
-        return self.cursor().executemany(sql, sequence_of_bindings)
+        with self:  # Disable autocommit mode, for performance
+            return self.cursor().executemany(sql, sequence_of_bindings)
 
 # }}}
 

From b1f31d3dce4547174a49b2a35f28955464a0d4af Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 16:45:42 +0530
Subject: [PATCH 0574/1154] Grid view: Fix bug in centering calculation

---
 src/calibre/gui2/library/alternate_views.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 2339eb02e9..99e2b878e3 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -561,12 +561,13 @@ class GridView(QListView):
     def center_grid(self):
         if self.gui.library_view.alternate_views.current_view is not self:
             return
+        layout_width = self.viewport().width() + self.padding_left
         try:
             sz = self.spacing()*2 + self.delegate.item_size.width()
-            num = self.width() // sz
+            num = layout_width // sz
         except (AttributeError, ZeroDivisionError):
             return
-        extra = max(0, int((self.width() - (num * sz)) / 2) - self.spacing())
+        extra = max(0, int((layout_width - (num * sz)) / 2))
         if extra != self.padding_left:
             self.padding_left = extra
             self.setViewportMargins(self.padding_left, 0, 0, 0)

From eba16881fdb555aa83203a615a52fc6ee10094f7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 21:43:46 +0530
Subject: [PATCH 0575/1154] Fix virtual library tabs not being updated when
 using VL button

---
 src/calibre/gui2/init.py                     | 3 +++
 src/calibre/gui2/search_restriction_mixin.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 7feb4c730d..59bb7718b2 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -345,6 +345,9 @@ class VLTabs(QTabBar):  # {{{
         self.currentChanged.connect(self.tab_changed)
         self.tabButton(all_idx, self.RightSide).setVisible(False)
 
+    def update_current(self):
+        self.rebuild()
+
     def contextMenuEvent(self, ev):
         m = QMenu(self)
         m.addAction(_('Sort alphabetically'), self.sort_alphabetically)
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index a2cc06d691..52e456c4dc 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -446,6 +446,7 @@ class SearchRestrictionMixin(object):
                                         db.data.get_base_restriction())
         self._apply_search_restriction(db.data.get_search_restriction(),
                                        db.data.get_search_restriction_name())
+        self.vl_tabs.update_current()
 
     def build_virtual_library_list(self, menu, handler):
         db = self.library_view.model().db

From 598093b7095c893960dcaf1390381540ca378f88 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 22:40:23 +0530
Subject: [PATCH 0576/1154] Nuke the grid centering code

It was causing problems when there was exactly a screenful of items to
be displayed as the layout would bounce betwen having a scrollbar and
not having a scrollbar.
---
 src/calibre/gui2/library/alternate_views.py | 28 ---------------------
 1 file changed, 28 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 99e2b878e3..72f79b6b92 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -558,33 +558,6 @@ class GridView(QListView):
         self.setPalette(pal)
         self.delegate.highlight_color = pal.color(pal.Text)
 
-    def center_grid(self):
-        if self.gui.library_view.alternate_views.current_view is not self:
-            return
-        layout_width = self.viewport().width() + self.padding_left
-        try:
-            sz = self.spacing()*2 + self.delegate.item_size.width()
-            num = layout_width // sz
-        except (AttributeError, ZeroDivisionError):
-            return
-        extra = max(0, int((layout_width - (num * sz)) / 2))
-        if extra != self.padding_left:
-            self.padding_left = extra
-            self.setViewportMargins(self.padding_left, 0, 0, 0)
-
-    def resizeEvent(self, e):
-        self.center_grid()
-        return QListView.resizeEvent(self, e)
-
-    def event(self, e):
-        if e.type() == e.Paint:
-            p = QPainter(self)
-            # Without this the viewport margin is rendered in QPalette::Window
-            # instead of QPalette::Base
-            p.fillRect(0, 0, self.padding_left+2, self.height(), self.palette().color(QPalette.Base))
-            p.end()
-        return QListView.event(self, e)
-
     def refresh_settings(self):
         size_changed = (
             gprefs['cover_grid_width'] != self.delegate.original_width or
@@ -612,7 +585,6 @@ class GridView(QListView):
             self.render_thread = Thread(target=self.render_covers)
             self.render_thread.daemon = True
             self.render_thread.start()
-        self.center_grid()
 
     def render_covers(self):
         q = self.delegate.render_queue

From a66c5bb4d5a697964eba46fc246a9cdbb8593691 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Aug 2013 23:57:43 +0530
Subject: [PATCH 0577/1154] Grid View: Replace broken Qt shift-click
 implementation

---
 src/calibre/gui2/library/alternate_views.py | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 72f79b6b92..119725a751 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -61,6 +61,8 @@ def mousePressEvent(base_class, self, event):
     if self.indexAt(ep) in self.selectionModel().selectedIndexes() and \
             event.button() == Qt.LeftButton and not self.event_has_mods():
         self.drag_start_pos = ep
+    if hasattr(self, 'handle_mouse_press_event'):
+        return self.handle_mouse_press_event(event)
     return base_class.mousePressEvent(self, event)
 
 def drag_icon(self, cover, multiple):
@@ -733,4 +735,30 @@ class GridView(QListView):
 
     def restore_hpos(self, hpos):
         pass
+
+    def handle_mouse_press_event(self, ev):
+        if QApplication.keyboardModifiers() & Qt.ShiftModifier:
+            # Shift-Click in QLitView is broken. It selects extra items in
+            # various circumstances, for example, click on some item in the
+            # middle of a row then click on an item in the next row, all items
+            # in the first row will be selected instead of only items after the
+            # middle item.
+            index = self.indexAt(ev.pos())
+            if not index.isValid():
+                return
+            ci = self.currentIndex()
+            sm = self.selectionModel()
+            sm.setCurrentIndex(index, sm.NoUpdate)
+            if not ci.isValid():
+                return
+            if not sm.hasSelection():
+                sm.select(index, sm.ClearAndSelect)
+                return
+            cr = ci.row()
+            tgt = index.row()
+            top = self.model().index(min(cr, tgt), 0)
+            bottom = self.model().index(max(cr, tgt), 0)
+            sm.select(QItemSelection(top, bottom), sm.Select)
+        else:
+            return QListView.mousePressEvent(self, ev)
 # }}}

From 811b210303776715e76d44827a8e503262668a0e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 00:03:34 +0530
Subject: [PATCH 0578/1154] Update mediapart

---
 recipes/mediapart.recipe | 162 +++++++++++++++++++++++++++++++--------
 1 file changed, 131 insertions(+), 31 deletions(-)

diff --git a/recipes/mediapart.recipe b/recipes/mediapart.recipe
index 0dbe8bcd72..080ab66d3a 100644
--- a/recipes/mediapart.recipe
+++ b/recipes/mediapart.recipe
@@ -1,72 +1,172 @@
+# -*- mode:python -*-
+from __future__ import unicode_literals
+
 __license__   = 'GPL v3'
-__copyright__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf dot fr>'
+__copyright__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>'
 '''
 Mediapart
 '''
 
-__author__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>; 2013, Malah <malah at neuf dot fr>'
+__author__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>; 2010-2012, Louis Gesbert <meta at antislash dot info>'
 
 import re
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
 from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.web.feeds import feeds_from_index
+from datetime import date,timedelta
 
 class Mediapart(BasicNewsRecipe):
-    title          = 'Mediapart'
-    __author__ = 'Mathieu Godlewski, Louis Gesbert, Malah'
+    title = 'Mediapart'
+    __author__ = 'Mathieu Godlewski, Louis Gesbert'
     description = 'Global news in french from news site Mediapart'
-    oldest_article = 7
+    publication_type = 'newspaper'
     language = 'fr'
     needs_subscription = True
-    max_articles_per_feed = 50
+    oldest_article = 2
 
     use_embedded_content = False
     no_stylesheets = True
 
-    masthead_url       = 'https://upload.wikimedia.org/wikipedia/fr/2/23/Mediapart.png'
-    cover_url = 'http://static.mediapart.fr/files/pave_mediapart.jpg'
+    cover_url = 'https://static.mediapart.fr/files/M%20Philips/logo-mediapart.png'
+
+# --
+
+    oldest_article_date = date.today() - timedelta(days=oldest_article)
+
+# -- get the index (the feed at 'http://www.mediapart.fr/articles/feed' only has
+#    the 10 last elements :/)
 
     feeds =  [
-        ('Les articles', 'http://www.mediapart.fr/articles/feed'),
+        ('La Une', 'http://www.mediapart.fr/articles/feed'),
     ]
 
-# -- full-page-version
+    def parse_feeds(self):
+        feeds = super(Mediapart, self).parse_feeds()
+        feeds += feeds_from_index(self.my_parse_index(feeds))
+        return feeds
+
+    def my_parse_index(self, la_une):
+        articles = []
+
+        breves = []
+        liens = []
+        confidentiels = []
+
+        soup = self.index_to_soup('https://www.mediapart.fr/journal/fil-dactualites')
+        page = soup.find('div', {'id':'pageFirstContent'})
+        fils = page.find('div', {'class':re.compile(r'\bcontent-journal\b')})
+
+        for article in fils.findAll('div'):
+            try:
+                title = article.find('h2',recursive=False)
+                if title is None or title['class'] == 'title-specific':
+                    continue
+
+                # print "found fil ",title
+                article_type = article.find('a', {'href': re.compile(r'.*\/type-darticles\/.*')}).renderContents()
+                # print "kind: ",article_type
+
+                for s in title('span'):
+                    s.replaceWith(s.renderContents() + "\n")
+                url = title.find('a', href=True)['href']
+
+                article_date = self.parse_french_date(article.find("span", "article-date").renderContents())
+
+                if article_date < self.oldest_article_date:
+                    # print "too old"
+                    continue
+
+                authors = article.findAll('a',{'class':re.compile(r'\bjournalist\b')})
+                authors = [self.tag_to_string(a) for a in authors]
+
+                description = article.find('div', {'class': lambda c: c != 'taxonomy-teaser'}, recursive=False).findAll('p')
+
+                # print "fil ",title," by ",authors," : ",description
+
+                summary = {
+                    'title': self.tag_to_string(title).strip(),
+                    'author': ', '.join(authors),
+                    'url': url,
+                    'date': u'' + article_date.strftime("%A %d %b %Y"),
+                    'description': '\n'.join([self.tag_to_string(d) for d in description]),
+                }
+                {
+                    "Brève": breves,
+                    "Lien": liens,
+                    "Confidentiel": confidentiels,
+                }.get(article_type).append(summary)
+            except:
+                pass
+
+        # print 'La Une: ', len(la_une), ' articles'
+        # for a in la_une: print a["title"]
+        # print 'Brèves: ', len(breves), ' articles'
+        # print 'Revue web: ', len(liens), ' articles'
+        # print 'Confidentiel: ', len(confidentiels), ' articles'
+
+        articles += [('Brèves', breves)] if breves else []
+        articles += [('Revue du Web', liens)] if liens else []
+        articles += [('Confidentiel', confidentiels)] if confidentiels else []
+        return articles
+
+# -- print-version
 
     conversion_options = {'smarten_punctuation' : True}
 
-    keep_only_tags = [
-        dict(name='div', attrs={'class':'col-left fractal-desktop fractal-10-desktop collapse-7-desktop fractal-tablet fractal-6-tablet collapse-4-tablet'}),
-        dict(name='div', attrs={'id':'pageFirstContent'})
-    ]
-    remove_tags = [
-        dict(name='div', attrs={'id':'lire-aussi'}),
-        dict(name='div', attrs={'class':'col-right-content'})
-    ]
+    remove_tags = [dict(name='div', attrs={'class':'print-source_url'})]
+
+    # non-locale specific date parse (strptime("%d %b %Y",s) would work with french locale)
+    def parse_french_date(self, date_str):
+        date_arr = date_str.lower().split()
+        return date(day=int(date_arr[0]),
+                    year=int(date_arr[2]),
+                    month=
+                      [None, 'janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet',
+                       'août', 'septembre', 'octobre', 'novembre', 'décembre'].index(date_arr[1]))
 
     def print_version(self, url):
         raw = self.browser.open(url).read()
         soup = BeautifulSoup(raw.decode('utf8', 'replace'))
-        link = soup.find('a', {'href':re.compile('^.*?onglet=full$')})
-        if link is None:
+
+        # Filter old articles
+        article_date = self.parse_french_date(self.tag_to_string(soup.find('span', 'article-date')))
+
+        if article_date < self.oldest_article_date:
             return None
-        return link['href']
+
+        tools = soup.find('div', {'class':'menu-tools'})
+        link = tools.find('a', {'href': re.compile(r'\/print\/.*')})
+        if link is None:
+            print 'Error: print link not found'
+            return None
+        return 'https://mediapart.fr/' + link['href']
 
 # -- Handle login
-
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
         if self.username is not None and self.password is not None:
-            br.open('http://blogs.mediapart.fr/editions/guide-du-coordonnateur-d-edition')
+            br.open('https://www.mediapart.fr/user')
             br.select_form(nr=1)
             br['name'] = self.username
             br['pass'] = self.password
             br.submit()
         return br
 
-    def preprocess_html(self, soup):
-        for title in soup.findAll('p', {'class':'titre_page'}):
-            title.name = 'h3'
-        for legend in soup.findAll('span', {'class':'legend'}):
-            legend.insert(0, Tag(soup, 'br', []))
-            legend.name = 'small'
-        return soup
+    # This is a workaround articles with scribd content that include
+    # <body></body> tags _within_ the body
+    preprocess_regexps = [
+        (re.compile(r'(<body.*?>)(.*)</body>', re.IGNORECASE|re.DOTALL),
+         lambda match:
+             match.group(1)
+             + re.sub(re.compile(r'</?body>', re.IGNORECASE|re.DOTALL),'',
+                      match.group(2))
+             + '</body>')
+    ]
 
+    # def preprocess_html(self, soup):
+    #     for title in soup.findAll('p', {'class':'titre_page'}):
+    #         title.name = 'h3'
+    #     for legend in soup.findAll('span', {'class':'legend'}):
+    #         legend.insert(0, Tag(soup, 'br', []))
+    #         legend.name = 'em'
+    #     return soup

From 1fc537054bccb5069f78c5a2cc17383b172713e5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 09:34:57 +0530
Subject: [PATCH 0579/1154] Content Server: Proper error message for pick a
 random book

Raise a 404 instead of a 500 if the user tries pick a random book on an
empty library.
---
 src/calibre/library/server/browse.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index ef6b8f3f3c..872c0e65f8 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -906,8 +906,11 @@ class BrowseServer(object):
     @Endpoint()
     def browse_random(self, *args, **kwargs):
         import random
-        book_id = random.choice(self.db.search_getting_ids(
-            '', self.search_restriction))
+        try:
+            book_id = random.choice(self.db.search_getting_ids(
+                '', self.search_restriction))
+        except IndexError:
+            raise cherrypy.HTTPError(404, 'This library has no books')
         ans = self.browse_render_details(book_id, add_random_button=True)
         return self.browse_template('').format(
                 title='', script='book();', main=ans)

From 2489b7a82dbbc7a412941f4cb822330f1bab6473 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 13:25:12 +0530
Subject: [PATCH 0580/1154] ...

---
 recipes/daily_express.recipe | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/daily_express.recipe b/recipes/daily_express.recipe
index c9b620eeec..7d6faabdb9 100644
--- a/recipes/daily_express.recipe
+++ b/recipes/daily_express.recipe
@@ -3,6 +3,7 @@ import re
 class AdvancedUserRecipe1376229553(BasicNewsRecipe):
     title          = u'Daily Express'
     __author__ = 'Dave Asbury'
+    language = 'en_GB'
     encoding    = 'utf-8'
     remove_empty_feeds = True
     #remove_javascript     = True

From 7cf205f0c7c138a0d72495c0b0e9c10744edd7a1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 13:25:32 +0530
Subject: [PATCH 0581/1154] News24 and Nuus24 by Nicki de Wet

---
 recipes/news24.recipe | 53 ++++++++++++++++++++++++++++++++++++++++
 recipes/nuus24.recipe | 57 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 recipes/news24.recipe
 create mode 100644 recipes/nuus24.recipe

diff --git a/recipes/news24.recipe b/recipes/news24.recipe
new file mode 100644
index 0000000000..a344a44aec
--- /dev/null
+++ b/recipes/news24.recipe
@@ -0,0 +1,53 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1375900744(BasicNewsRecipe):
+    title                 = u'News24'
+    description           = "News24."
+    __author__            = 'Nicki de Wet'
+    publisher             = 'Media24'
+    category              = 'news, politics, South Africa'
+    oldest_article        = 3
+    max_articles_per_feed = 20
+    no_stylesheets        = True
+    encoding              = 'utf8'
+    use_embedded_content  = False
+    auto_cleanup          = False
+    language              = 'en_ZA'
+    remove_empty_feeds    = True
+    publication_type      = 'newsportal'
+    masthead_url          = 'http://www.24.com/images/widgethead_news.png'
+    extra_css             = """
+                                body{font-family: Arial,Helvetica,sans-serif }
+                                img{display: block}
+                            """
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+
+    remove_tags = [
+        dict(name=['object','embed','iframe','table','meta','link']),
+        dict(attrs={
+                'class':['TwitterfacebookLink','superSportArticleBlock',
+                         'videoHighlights', 'facebookComments','share',
+                         'item_block','kalahari_product left', 'block red',
+                         'credit']}),
+        dict(attrs={'id':['comments_wrap', 'article_toolbox_bot',
+                          'inside_news','sponsored-links', 'lnkGalleries',
+                          'relatedlinks_box', 'lnkUserGalleries',
+                          'lnkNewsGalleries', 'relatedlinks',
+                          'divRelatedLinks']})]
+
+    keep_only_tags = [
+        dict(attrs={'class':['left col633', 'article col626',
+                             'columnWrapperLeft', 'articlecolumn',
+                             'article_img', 'picture_caption', 'DiveTable']})]
+
+    feeds          = [
+        (u'Top Stories', u'http://feeds.news24.com/articles/news24/TopStories/rss'),
+        (u'South Africa', u'http://feeds.news24.com/articles/news24/SouthAfrica/rss'),
+        (u'World', u'http://feeds.news24.com/articles/news24/World/rss'),
+        (u'Sport', u'http://feeds.24.com/articles/sport/featured/topstories/rss')]
diff --git a/recipes/nuus24.recipe b/recipes/nuus24.recipe
new file mode 100644
index 0000000000..3b80bddb9b
--- /dev/null
+++ b/recipes/nuus24.recipe
@@ -0,0 +1,57 @@
+import re
+from calibre import strftime
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class Nuus24(BasicNewsRecipe):
+
+    title       = 'Nuus24'
+    __author__  = 'Nicki de Wet'
+    encoding              = 'utf-8'
+    description = 'Daaglikse Afrikaanse Nuus via Nuus24'
+    language = 'af'
+    publisher             = 'Media24'
+    timefmt = ' [%a, %d %b, %Y]'
+    masthead_url = 'http://afrikaans.news24.com/images/nuus.jpg'
+    max_articles_per_feed = 25
+    remove_tags_before = dict(id='TheFeed')
+    remove_tags_after  = dict(id='TheFeed')
+    remove_tags = [dict(
+        attrs={
+            'class':[
+                'personal-bar row-fluid', 'navbar main-menu-fixed',
+                'breaking-news-wrapper', 'row-fluid comments-bg',
+                'unstyled actions', 'modal-body', 'modal-header', 'desktop']}),
+        dict(id=['weather-forecast', 'topics', 'side-widgets', 'footer-container', 'sb-container', 'myModal']),
+        dict(name=['script', 'noscript', 'style'])]
+
+    keep_only_tags = [dict(attrs={'class':['span8 border-right']}),
+                                                dict(name=['article', 'section']),
+                                                dict(id=['img-wrapper'])]
+    extra_css = """ div.carousel-inner{ overflow:hidden;display: block;height:300px;} img{display: block} """
+    no_stylesheets = True
+
+    def parse_index(self):
+        soup = self.index_to_soup('http://afrikaans.news24.com/Index.aspx')
+
+        def feed_title(div):
+            return ''.join(div.findAll(text=True, recursive=False)).strip()
+
+        articles = {}
+        key = None
+        key = 'Nuus in Afrikaans'
+        articles[key] = []
+        ans= []
+
+        for anchor in soup.findAll(True,
+            attrs={'id':['lnkLink']}):
+            url = re.sub(r'\?.*', '', anchor['href'])
+            title = self.tag_to_string(anchor, use_alt=True).strip()
+            print title
+            description = ''
+            pubdate = strftime('%a, %d %b')
+            articles[key].append(
+                    dict(title=title, url=url, date=pubdate,
+                                    description=description,
+                                    content=''))
+        ans = [(key, articles[key])]
+        return ans

From ff8ecb1d5691ada750b07fc0d9e2433e317e97f3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 13:43:40 +0530
Subject: [PATCH 0582/1154] newdb: Shorten filenames correctly

Ensure that the total path length is <= PATH_LIMIT * 4 and that no
component is longer than PATH_LIMIT on unix.
---
 src/calibre/db/backend.py          | 36 +++++++++++++++++++-----------
 src/calibre/db/tests/filesystem.py |  9 ++++++++
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 660da9e088..04e0c7c8f8 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1056,25 +1056,31 @@ class DB(object):
         '''
         Construct the directory name for this book based on its metadata.
         '''
-        author = ascii_filename(author
-                    )[:self.PATH_LIMIT].decode('ascii', 'replace')
-        title  = ascii_filename(title
-                    )[:self.PATH_LIMIT].decode('ascii', 'replace')
+        book_id = ' (%d)' % book_id
+        l = self.PATH_LIMIT - (len(book_id) // 2) - 2
+        author = ascii_filename(author)[:l].decode('ascii', 'replace')
+        title  = ascii_filename(title)[:l].decode('ascii', 'replace')
         while author[-1] in (' ', '.'):
             author = author[:-1]
         if not author:
             author = ascii_filename(_('Unknown')).decode(
                     'ascii', 'replace')
-        return '%s/%s (%d)'%(author, title, book_id)
+        return '%s/%s%s' % (author, title, book_id)
 
-    def construct_file_name(self, book_id, title, author):
+    def construct_file_name(self, book_id, title, author, extlen):
         '''
         Construct the file name for this book based on its metadata.
         '''
-        author = ascii_filename(author
-                    )[:self.PATH_LIMIT].decode('ascii', 'replace')
-        title  = ascii_filename(title
-                    )[:self.PATH_LIMIT].decode('ascii', 'replace')
+        extlen = max(extlen, 14)  # 14 accounts for ORIGINAL_EPUB
+        # The PATH_LIMIT on windows already takes into account the doubling
+        # (it is used to enforce the total path length limit, individual path
+        # components can be much longer than the total path length would allow on
+        # windows).
+        l = (self.PATH_LIMIT - (extlen // 2) - 2) if iswindows else ((self.PATH_LIMIT - extlen - 2) // 2)
+        if l < 5:
+            raise ValueError('Extension length too long: %d' % extlen)
+        author = ascii_filename(author)[:l].decode('ascii', 'replace')
+        title  = ascii_filename(title)[:l].decode('ascii', 'replace')
         name   = title + ' - ' + author
         while name.endswith('.'):
             name = name[:-1]
@@ -1331,9 +1337,9 @@ class DB(object):
                             wam.close_handles()
 
     def add_format(self, book_id, fmt, stream, title, author, path):
-        fname = self.construct_file_name(book_id, title, author)
-        path = os.path.join(self.library_path, path)
         fmt = ('.' + fmt.lower()) if fmt else ''
+        fname = self.construct_file_name(book_id, title, author, len(fmt))
+        path = os.path.join(self.library_path, path)
         dest = os.path.join(path, fname + fmt)
         if not os.path.exists(path):
             os.makedirs(path)
@@ -1352,7 +1358,11 @@ class DB(object):
         path = self.construct_path_name(book_id, title, author)
         current_path = path_field.for_book(book_id, default_value='')
         formats = formats_field.for_book(book_id, default_value=())
-        fname = self.construct_file_name(book_id, title, author)
+        try:
+            extlen = max(len(fmt) for fmt in formats) + 1
+        except ValueError:
+            extlen = 10
+        fname = self.construct_file_name(book_id, title, author, extlen)
         # Check if the metadata used to construct paths has changed
         changed = False
         for fmt in formats:
diff --git a/src/calibre/db/tests/filesystem.py b/src/calibre/db/tests/filesystem.py
index 5367f62235..5821c41433 100644
--- a/src/calibre/db/tests/filesystem.py
+++ b/src/calibre/db/tests/filesystem.py
@@ -97,3 +97,12 @@ class FilesystemTest(BaseTest):
             self.assertEqual(all_ids, cache.all_book_ids())
             cache.backend.close()
 
+    def test_long_filenames(self):
+        ' Test long file names '
+        cache = self.init_cache()
+        cache.set_field('title', {1:'a'*10000})
+        self.assertLessEqual(len(cache.field_for('path', 1)), cache.backend.PATH_LIMIT * 2)
+        cache.set_field('authors', {1:'b'*10000})
+        self.assertLessEqual(len(cache.field_for('path', 1)), cache.backend.PATH_LIMIT * 2)
+        fpath = cache.format_abspath(1, cache.formats(1)[0])
+        self.assertLessEqual(len(fpath), len(cache.backend.library_path) + cache.backend.PATH_LIMIT * 4)

From ebd88589f4215db549a3fa0c991df382dc059c45 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 15:00:51 +0530
Subject: [PATCH 0583/1154] Content server: Make virtual libraries available as
 searches

Content server: Make virtual libraries available as searches from the
start page. They work just like saved searches, clicking on a virtual
library will show you all the books in that virtual library.
---
 src/calibre/library/server/browse.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 872c0e65f8..3096c8da9d 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -22,6 +22,7 @@ from calibre.library.comments import comments_to_html
 from calibre.library.server import custom_fields_to_display
 from calibre.library.field_metadata import category_icon_map
 from calibre.library.server.utils import quote, unquote
+from calibre.db.categories import Tag
 from calibre.ebooks.metadata.sources.identify import urls_from_identifiers
 
 def xml(*args, **kwargs):
@@ -352,6 +353,9 @@ class BrowseServer(object):
                 (_('All books'), 'allbooks', 'book.png'),
                 (_('Random book'), 'randombook', 'random.png'),
                 ]
+        virt_libs = self.db.prefs.get('virtual_libraries', {})
+        if virt_libs:
+            cats.append((_('Virtual Libs.'), 'virt_libs', 'lt.png'))
 
         def getter(x):
             return category_meta[x]['name'].lower()
@@ -421,11 +425,12 @@ class BrowseServer(object):
 
     def browse_category(self, category, sort):
         categories = self.categories_cache()
+        categories['virt_libs'] = {}
         if category not in categories:
             raise cherrypy.HTTPError(404, 'category not found')
         category_meta = self.db.field_metadata
-        category_name = category_meta[category]['name']
-        datatype = category_meta[category]['datatype']
+        category_name = _('Virtual Libraries') if category == 'virt_libs' else category_meta[category]['name']
+        datatype = 'text' if category == 'virt_libs' else category_meta[category]['datatype']
 
         # See if we have any sub-categories to display. As we find them, add
         # them to the displayed set to avoid showing the same item twice
@@ -480,7 +485,10 @@ class BrowseServer(object):
             script = 'true'
 
         # Now do the category items
+        vls = self.db.prefs.get('virtual_libraries', {})
+        categories['virt_libs'] = [Tag(k) for k, v in vls.iteritems()]
         items = categories[category]
+
         sort = self.browse_sort_categories(items, sort)
 
         if not cats and len(items) == 1:
@@ -590,6 +598,7 @@ class BrowseServer(object):
         prefix = '' if self.is_wsgi else self.opts.url_prefix
         if category is None:
             ans = self.browse_toplevel()
+        # The following are fake categories used for the top-level view
         elif category == 'newest':
             raise cherrypy.InternalRedirect(prefix +
                     '/browse/matches/newest/dummy')
@@ -629,18 +638,19 @@ class BrowseServer(object):
         categories = self.categories_cache()
 
         if category not in categories and \
-                category not in ('newest', 'allbooks'):
+                category not in ('newest', 'allbooks', 'virt_libs'):
             raise cherrypy.HTTPError(404, 'category not found')
         fm = self.db.field_metadata
         try:
             category_name = fm[category]['name']
             dt = fm[category]['datatype']
         except:
-            if category not in ('newest', 'allbooks'):
+            if category not in ('newest', 'allbooks', 'virt_libs'):
                 raise
             category_name = {
                     'newest' : _('Newest'),
                     'allbooks' : _('All books'),
+                    'virt_libs': _('Virtual Libraries'),
             }[category]
             dt = None
 
@@ -658,6 +668,10 @@ class BrowseServer(object):
                 hide_sort = 'true'
             elif category == 'allbooks':
                 ids = all_ids
+            elif category == 'virt_libs':
+                which = unhexlify(cid).decode('utf-8')
+                vls = self.db.prefs.get('virtual_libraries', {})
+                ids = self.search_cache(vls[which])
             else:
                 if fm.get(category, {'datatype':None})['datatype'] == 'composite':
                     cid = cid.decode('utf-8')
@@ -927,6 +941,7 @@ class BrowseServer(object):
                 title='', script='book();', main=ans)
 
     # }}}
+
     # Search {{{
     @Endpoint(sort_type='list')
     def browse_search(self, query='', list_sort=None):

From 813545a8dc8fc9b75316eebe5edd1ae0fe55d7d0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 15:59:33 +0530
Subject: [PATCH 0584/1154] Update Providence Journal

---
 recipes/projo.recipe | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/recipes/projo.recipe b/recipes/projo.recipe
index e68f2883fc..e74c492296 100644
--- a/recipes/projo.recipe
+++ b/recipes/projo.recipe
@@ -4,27 +4,20 @@ class ProvidenceJournal(BasicNewsRecipe):
     title          = u'Providence Journal'
     language       = 'en'
     __author__     = 'Krittika Goyal'
-    oldest_article = 7 #days
+    oldest_article = 7  # days
     max_articles_per_feed = 25
 
     no_stylesheets = True
-    remove_tags_before = dict(name='span', attrs={'class':'vitstorybody'})
-    #remove_tags_after  = dict(name='td', attrs={'class':'newptool1'})
-    remove_tags = [
-       dict(name='iframe'),
-       dict(name='div', attrs={'id':['storycontentright','slcgm_comments_block', 'footercontainer']}),
-       #dict(name='span', text=':'),
-    ]
+    auto_cleanup = True
+    use_embedded_content = False
 
     feeds          = [
-            ('Red Sox',
-            'http://www.projo.com/newskiosk/rss/projoredsox.xml'),
-            ('Political Scene',
-            'http://www.projo.com/newskiosk/rss/projopolitical.xml'),
-            ('Rhode Island News',
-            'http://www.projo.com/newskiosk/rss/projolocalnews.xml'),
-            ('Music',
-            'http://www.projo.com/newskiosk/rss/projomusic.xml'),
-    ]
-
-
+('Red Sox',
+ 'http://www.providencejournal.com/sports/red-sox/content/?rss'),
+('Political Scene',
+ 'http://www.providencejournal.com/politics/political-scene/?rss'),
+('Local News',
+ 'http://www.providencejournal.com/breaking-news/?rss'),
+('Music',
+ 'http://www.providencejournal.com/features/entertainment/music/?rss'),
+]

From 0777df1bddc846319f4270ef05385dd51f4570ad Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 16:14:18 +0530
Subject: [PATCH 0585/1154] Grid view: Show marked books with a star emblem

---
 src/calibre/gui2/library/alternate_views.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 119725a751..f2023e2a44 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -316,7 +316,6 @@ class CoverDelegate(QStyledItemDelegate):
         self.render_queue = Queue()
         self.animating = None
         self.highlight_color = QColor(Qt.white)
-        self.on_device_emblem = QPixmap(I('ok.png')).scaled(48, 48, transformMode=Qt.SmoothTransformation)
 
     def set_dimensions(self):
         width = self.original_width = gprefs['cover_grid_width']
@@ -372,6 +371,7 @@ class CoverDelegate(QStyledItemDelegate):
                 painter.drawRoundedRect(option.rect, 10, 10, Qt.RelativeSize)
             finally:
                 painter.restore()
+        marked = db.data.get_marked(book_id)
         db = db.new_api
         cdata = self.cover_cache[book_id]
         device_connected = self.parent().gui.device_connected is not None
@@ -408,8 +408,22 @@ class CoverDelegate(QStyledItemDelegate):
                     metrics = painter.fontMetrics()
                     painter.drawText(rect, Qt.AlignCenter|Qt.TextSingleLine,
                                      metrics.elidedText(title, Qt.ElideRight, rect.width()))
+            if marked:
+                try:
+                    p = self.marked_emblem
+                except AttributeError:
+                    p = self.marked_emblem = QPixmap(I('rating.png')).scaled(48, 48, transformMode=Qt.SmoothTransformation)
+                drect = QRect(orect)
+                drect.setLeft(drect.left() + right_adjust)
+                drect.setRight(drect.left() + p.width())
+                drect.setBottom(drect.bottom() - self.title_height)
+                drect.setTop(drect.bottom() - p.height())
+                painter.drawPixmap(drect, p)
             if on_device:
-                p = self.on_device_emblem
+                try:
+                    p = self.on_device_emblem
+                except AttributeError:
+                    p = self.on_device_emblem = QPixmap(I('ok.png')).scaled(48, 48, transformMode=Qt.SmoothTransformation)
                 drect = QRect(orect)
                 drect.setRight(drect.right() - right_adjust)
                 drect.setBottom(drect.bottom() - self.title_height)

From fd34b9dc1e6a1b932a139b0826491d5f7a9856d1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 17:23:30 +0530
Subject: [PATCH 0586/1154] Fix breakage on OS X machines with system style

---
 src/calibre/gui2/init.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 59bb7718b2..de0a58d7bb 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -343,7 +343,15 @@ class VLTabs(QTabBar):  # {{{
                 all_idx = i
         self.setCurrentIndex(all_idx if current_idx is None else current_idx)
         self.currentChanged.connect(self.tab_changed)
-        self.tabButton(all_idx, self.RightSide).setVisible(False)
+        try:
+            self.tabButton(all_idx, self.RightSide).setVisible(False)
+        except AttributeError:
+            try:
+                self.tabButton(all_idx, self.LeftSide).setVisible(False)
+            except AttributeError:
+                # On some OS X machines (using native style) the tab button is
+                # on the left
+                pass
 
     def update_current(self):
         self.rebuild()

From 7991fb68ff6eb1b92628cf2435ab97f849b7ba24 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Aug 2013 18:57:44 +0530
Subject: [PATCH 0587/1154] Update Daily Express

---
 recipes/daily_express.recipe | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/recipes/daily_express.recipe b/recipes/daily_express.recipe
index 7d6faabdb9..208fbc7172 100644
--- a/recipes/daily_express.recipe
+++ b/recipes/daily_express.recipe
@@ -4,18 +4,21 @@ class AdvancedUserRecipe1376229553(BasicNewsRecipe):
     title          = u'Daily Express'
     __author__ = 'Dave Asbury'
     language = 'en_GB'
+    # 13-08-17 remove quoted text from article
     encoding    = 'utf-8'
     remove_empty_feeds = True
     #remove_javascript     = True
     no_stylesheets        = True
-    oldest_article = 2
+    oldest_article = 1
     max_articles_per_feed = 10
     #auto_cleanup = True
     compress_news_images = True
-    compress_news_images_max_size = 25
+    compress_news_images_max_size = 30
     ignore_duplicate_articles = {'title', 'url'}
 
     remove_tags = [
+                                dict(attrs={'class' : 'quote'}),
+                dict(attrs={'class' : 'author'}),
                                 dict(name='footer'),
                                 dict(attrs={'id' : 'header_addons'}),
                 dict(attrs={'class' : 'hoverException'}),
@@ -60,9 +63,11 @@ class AdvancedUserRecipe1376229553(BasicNewsRecipe):
         return cover_url
 
     extra_css = '''
-                    h1{font-weight:bold;font-size:26px;}
-                    h2{font-weight:normal;font-size:small;}
-                    p{font-size:14px;}
-                    body{font-size:14px;}
+                    h1{font-weight:bold;font-size:175%;}
+                    h2{font-weight:normal;font-size:75%;}
+                    #p{font-size:14px;}
+                    #body{font-size:14px;}
+                    .photo-caption {display: block;margin-left: auto;margin-right: auto;width:100%;font-size:40%;}
+                    .publish-info {font-size:50%;}
+                    .photo img {display: block;margin-left: auto;margin-right: auto;width:100%;}
       '''
-

From 0d860c43fbe9587c60a22815683b15bc1be5b766 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Aug 2013 11:05:12 +0530
Subject: [PATCH 0588/1154] OS X build: Log stdout/stderr to Console.app

In OS X 10.8 Apple stopped redirecting stdout/stderr to Console.app for
applications launched by launch services. Re-enable the redirection,
useful for debugging.
---
 setup/installer/osx/app/site.py | 75 +++++++++++++++++++++++++++++----
 1 file changed, 67 insertions(+), 8 deletions(-)

diff --git a/setup/installer/osx/app/site.py b/setup/installer/osx/app/site.py
index 5232706727..a0b408f728 100644
--- a/setup/installer/osx/app/site.py
+++ b/setup/installer/osx/app/site.py
@@ -80,7 +80,7 @@ def addpackage(sitedir, name):
         f = open(fullname)
     except IOError:
         return
-    while 1:
+    while True:
         dir = f.readline()
         if not dir:
             break
@@ -99,14 +99,12 @@ def addpackage(sitedir, name):
         _dirs_in_sys_path = None
 
 
-sys.setdefaultencoding('utf-8')
-
-#
 # Remove sys.setdefaultencoding() so that users cannot change the
 # encoding after initialization.  The test for presence is needed when
 # this module is run as a script, because this code is executed twice.
 #
 if hasattr(sys, "setdefaultencoding"):
+    sys.setdefaultencoding('utf-8')
     del sys.setdefaultencoding
 
 def run_entry_point():
@@ -127,6 +125,62 @@ def add_calibre_vars(base):
     if dv and os.path.exists(dv):
         sys.path.insert(0, os.path.abspath(dv))
 
+def setup_asl():
+    # On Mac OS X 10.8 or later the contents of stdout and stderr
+    # do not end up in Console.app
+    # This function detects if "asl_log_descriptor" is available
+    # (introduced in 10.8), and if it is configures ASL to redirect
+    # all writes to stdout/stderr to Console.app
+    import ctypes
+    try:
+        syslib = ctypes.CDLL("/usr/lib/libSystem.dylib")
+    except EnvironmentError:
+        import ctypes.util
+        syslib = ctypes.CDLL(ctypes.util.find_library('System'))
+
+    asl_log_descriptor_proto = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int, ctypes.c_int, ctypes.c_uint32)
+    try:
+        asl_log_descriptor = asl_log_descriptor_proto(('asl_log_descriptor', syslib), ((1, 'asl'), (1, 'msg'), (1, 'level'), (1, 'descriptor'), (1, 'fd_type')))
+    except AttributeError:
+        # OS X < 10.8 no need to redirect
+        return
+    asl_open_proto = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_uint32)
+    asl_open = asl_open_proto(('asl_open', syslib), ((1, "ident"), (1, "facility"), (1, 'opts')))
+    asl_new_proto = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_uint32)
+    asl_new = asl_new_proto(('asl_new', syslib), ((1, "type"),))
+    asl_set_proto = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p)
+    asl_set = asl_set_proto(('asl_set', syslib), ((1, "msg"), (1, "key"), (1, "value")))
+
+    CONSOLE = b'com.apple.console'
+    # Taken from asl.h
+    ASL_OPT_NO_DELAY = 2
+    ASL_TYPE_MSG = 0
+    ASL_KEY_FACILITY = b'Facility'
+    ASL_KEY_LEVEL = b'Level'
+    ASL_KEY_READ_UID = b'ReadUID'
+    ASL_STRING_NOTICE = b'Notice'
+    ASL_LEVEL_NOTICE = 4
+    ASL_LOG_DESCRIPTOR_WRITE = 2
+
+    cl = asl_open(ident=getattr(sys, 'calibre_basename', b'calibre'), facility=CONSOLE, opts=ASL_OPT_NO_DELAY)
+    if cl is None:
+        return
+
+    # Create an ASL template message for the STDOUT/STDERR redirection.
+    msg = asl_new(ASL_TYPE_MSG)
+    if msg is None:
+        return
+    if asl_set(msg, ASL_KEY_FACILITY, CONSOLE) != 0:
+        return
+    if asl_set(msg, ASL_KEY_LEVEL, ASL_STRING_NOTICE) != 0:
+        return
+    if asl_set(msg, ASL_KEY_READ_UID, bytes('%d' % os.getuid())) != 0:
+        return
+    # Redirect the STDOUT/STDERR file descriptors to ASL
+    if asl_log_descriptor(cl, msg, ASL_LEVEL_NOTICE, sys.stdout.fileno(), ASL_LOG_DESCRIPTOR_WRITE) != 0:
+        return
+    if asl_log_descriptor(cl, msg, ASL_LEVEL_NOTICE, sys.stderr.fileno(), ASL_LOG_DESCRIPTOR_WRITE) != 0:
+        return
 
 def main():
     global __file__
@@ -139,11 +193,16 @@ def main():
     add_calibre_vars(base)
     addsitedir(sys.site_packages)
 
+    launched_by_launch_services = False
 
-    for arg in list(sys.argv[1:]):
-        if arg.startswith('-psn'):
+    for arg in tuple(sys.argv[1:]):
+        if arg.startswith('-psn_'):
             sys.argv.remove(arg)
+            launched_by_launch_services = True
+    if launched_by_launch_services:
+        try:
+            setup_asl()
+        except:
+            pass  # Failure to log to Console.app is not critical
 
     return run_entry_point()
-
-

From c9867cd599d4d0fa02383170f5a0a02d1e0af746 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Aug 2013 11:17:53 +0530
Subject: [PATCH 0589/1154] Report errors during UI initialization

Exceptions raised during UI initialization were not being reported to
the user, leaving a partially functioning UI with no apparent cause.
---
 src/calibre/gui2/main.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index fc9c542b92..d6d6abcf26 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -177,7 +177,7 @@ class GuiRunner(QObject):
 
     def start_gui(self, db):
         from calibre.gui2.ui import Main
-        main = Main(self.opts, gui_debug=self.gui_debug)
+        main = self.main = Main(self.opts, gui_debug=self.gui_debug)
         if self.splash_screen is not None:
             self.splash_screen.showMessage(_('Initializing user interface...'))
         with gprefs:  # Only write gui.json after initialization is complete
@@ -199,7 +199,6 @@ class GuiRunner(QObject):
         for event in self.app.file_event_hook.events:
             add_filesystem_book(event)
         self.app.file_event_hook = add_filesystem_book
-        self.main = main
 
     def initialization_failed(self):
         print 'Catastrophic failure initializing GUI, bailing out...'
@@ -231,7 +230,13 @@ class GuiRunner(QObject):
                     det_msg=traceback.format_exc(), show=True)
                 self.initialization_failed()
 
-        self.start_gui(db)
+        try:
+            self.start_gui(db)
+        except Exception:
+            error_dialog(self.main, _('Startup error'),
+                         _('There was an error during {0} startup.'
+                           ' Parts of {0} may not function. Click Show details to learn more.').format(__appname__),
+                         det_msg=traceback.format_exc(), show=True)
 
     def initialize_db(self):
         from calibre.db import get_db_loader

From 986f8b467e251d912a34f382e428fa046c5b644d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Aug 2013 12:27:04 +0530
Subject: [PATCH 0590/1154] Edit metadata dialog: Disable OK button while
 results are being downloaded.

Fixes #1213397 [AttributeError](https://bugs.launchpad.net/calibre/+bug/1213397)
---
 src/calibre/gui2/metadata/single_download.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index fc883bd88f..c65706a33c 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -1012,6 +1012,7 @@ class FullFetch(QDialog):  # {{{
         self.next_button.setIcon(QIcon(I('ok.png')))
         self.next_button.clicked.connect(self.next_clicked)
         self.ok_button = self.bb.button(self.bb.Ok)
+        self.ok_button.setEnabled(False)
         self.ok_button.clicked.connect(self.ok_clicked)
         self.prev_button = self.bb.addButton(_('Back'), self.bb.ActionRole)
         self.prev_button.setIcon(QIcon(I('back.png')))
@@ -1080,6 +1081,7 @@ class FullFetch(QDialog):  # {{{
 
     def identify_results_found(self):
         self.next_button.setEnabled(True)
+        self.ok_button.setEnabled(True)
 
     def next_clicked(self, *args):
         gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())

From c2a572faa79e542c71119a7ee31d39b51ede5eab Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Aug 2013 16:16:27 +0530
Subject: [PATCH 0591/1154] newdb: Fix deleting empty records leaving behind a
 temp dir

---
 src/calibre/db/delete_service.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/calibre/db/delete_service.py b/src/calibre/db/delete_service.py
index ce5578f888..d512562473 100644
--- a/src/calibre/db/delete_service.py
+++ b/src/calibre/db/delete_service.py
@@ -49,6 +49,7 @@ class DeleteService(Thread):
         self.queue_paths(tdir, paths, delete_empty_parent=True)
 
     def queue_paths(self, tdir, paths, delete_empty_parent=True):
+        queued = False
         for path in paths:
             if os.path.exists(path):
                 try:
@@ -65,6 +66,13 @@ class DeleteService(Thread):
                         if e.errno != errno.ENOTEMPTY:
                             raise
                 self.requests.put(os.path.join(tdir, os.path.basename(path)))
+                queued = True
+        if not queued:
+            try:
+                os.rmdir(tdir)
+            except OSError as e:
+                if e.errno != errno.ENOTEMPTY:
+                    raise
 
     def delete_files(self, paths, library_path):
         tdir = self.create_staging(library_path)

From fdd9b43f51fc2337061e7dad5adc33546b662f6f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Aug 2013 21:32:37 +0530
Subject: [PATCH 0592/1154] Update High Country News

---
 recipes/high_country_blogs.recipe | 44 ------------------
 recipes/high_country_news.recipe  | 76 +++++++++++++++++++++++++------
 2 files changed, 61 insertions(+), 59 deletions(-)
 delete mode 100644 recipes/high_country_blogs.recipe

diff --git a/recipes/high_country_blogs.recipe b/recipes/high_country_blogs.recipe
deleted file mode 100644
index 5173c30596..0000000000
--- a/recipes/high_country_blogs.recipe
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-__license__   = 'GPL v3'
-__copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>, Armin Geller'
-
-'''
-Fetch High Country News - Blogs
-'''
-from calibre.web.feeds.news import BasicNewsRecipe
-class HighCountryNewsBlogs(BasicNewsRecipe):
-
-    title                 = u'High Country News - Blogs'
-    description           = u'High Country News - Blogs (RSS Version)'
-    __author__            = 'Armin Geller' # 2012-08-01
-    publisher             = 'High Country News'
-    category              = 'news, politics, Germany'
-    timefmt               = ' [%a, %d %b %Y]'
-    language              = 'en'
-    encoding              = 'UTF-8'
-    publication_type      = 'newspaper'
-    oldest_article        = 7
-    max_articles_per_feed = 100
-    no_stylesheets        = True
-    auto_cleanup          = True
-    remove_javascript     = True
-    use_embedded_content  = False
-    masthead_url          = 'http://www.hcn.org/logo.jpg'
-    cover_source          = 'http://www.hcn.org'
-
-    def get_cover_url(self):
-       cover_source_soup = self.index_to_soup(self.cover_source)
-       preview_image_div = cover_source_soup.find(attrs={'class':' portaltype-Plone Site content--hcn template-homepage_view'})
-       return preview_image_div.div.img['src']
-
-    feeds = [
-              (u'From the Blogs', u'http://feeds.feedburner.com/hcn/FromTheBlogs?format=xml'),
-
-              (u'Heard around the West', u'http://feeds.feedburner.com/hcn/heard?format=xml'),
-              (u'The GOAT Blog', u'http://feeds.feedburner.com/hcn/goat?format=xml'),
-              (u'The Range', u'http://feeds.feedburner.com/hcn/range?format=xml'),
-             ]
-
-    def print_version(self, url):
-          return url
-
diff --git a/recipes/high_country_news.recipe b/recipes/high_country_news.recipe
index 91602d950b..b1de2f3005 100644
--- a/recipes/high_country_news.recipe
+++ b/recipes/high_country_news.recipe
@@ -1,6 +1,12 @@
 # -*- coding: utf-8 -*-
+#
+# Written:      2012-01-28
+# Last Edited:  2013-08-18
+# Remark:       Version 1.2
+# Integration of former separated Blog-News
+#
 __license__   = 'GPL v3'
-__copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>, Armin Geller'
+__copyright__ = '2013, Armin Geller'
 
 '''
 Fetch High Country News
@@ -9,35 +15,75 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class HighCountryNews(BasicNewsRecipe):
 
     title                 = u'High Country News'
-    description           = u'News from the American West'
-    __author__            = 'Armin Geller' # 2012-01-31
+    description           = u'High Country News (RSS Version)'
+    __author__            = 'Armin Geller'
     publisher             = 'High Country News'
+    category              = 'news, politics'
     timefmt               = ' [%a, %d %b %Y]'
     language              = 'en'
     encoding              = 'UTF-8'
     publication_type      = 'newspaper'
-    oldest_article        = 7
+    oldest_article        = 14
     max_articles_per_feed = 100
     no_stylesheets        = True
-    auto_cleanup          = True
+    auto_cleanup          = False
     remove_javascript     = True
+    remove_empty_feeds    = True  # 2013-08-18 AGe add
     use_embedded_content  = False
-    masthead_url          = 'http://www.hcn.org/logo.jpg' # 2012-01-31 AGe add
-    cover_source          = 'http://www.hcn.org'          # 2012-01-31 AGe add
 
-    def get_cover_url(self):                              # 2012-01-31 AGe add
-       cover_source_soup = self.index_to_soup(self.cover_source)
-       preview_image_div = cover_source_soup.find(attrs={'class':' portaltype-Plone Site content--hcn template-homepage_view'})
-       return preview_image_div.div.img['src']
+    masthead_url          = 'http://www.hcn.org/logo.jpg'
+    cover_source          = 'http://www.hcn.org'
+
+    def get_cover_url(self):
+        cover_source_soup = self.index_to_soup(self.cover_source)
+        preview_image_div = cover_source_soup.find(attrs={'class':' portaltype-Plone Site content--hcn template-homepage_view'})
+        return preview_image_div.div.img['src']
 
     feeds = [
-              (u'Most recent', u'http://feeds.feedburner.com/hcn/most-recent'),
-              (u'Current Issue', u'http://feeds.feedburner.com/hcn/current-issue'),
+              (u'Most recent', u'http://feeds.feedburner.com/hcn/most-recent?format=xml'),
+              (u'Current Issue', u'http://feeds.feedburner.com/hcn/current-issue?format=xml'),
+
+              (u'From the Blogs', u'http://feeds.feedburner.com/hcn/FromTheBlogs?format=xml'),  # 2013-07-23 AGe add
+              (u'Heard around the West', u'http://feeds.feedburner.com/hcn/heard?format=xml'),  # 2013-07-23 AGe add
+              (u'The GOAT Blog', u'http://feeds.feedburner.com/hcn/goat?format=xml'),          # 2013-07-23 AGe add
+              (u'The Range', u'http://feeds.feedburner.com/hcn/range?format=xml'),             # 2013-07-23 AGe add
 
               (u'Writers on the Range', u'http://feeds.feedburner.com/hcn/wotr'),
               (u'High Country Views', u'http://feeds.feedburner.com/hcn/HighCountryViews'),
              ]
 
-    def print_version(self, url):
-          return url + '/print_view'
+ # 2013-07-23 AGe New coding w/o using print_version
 
+    keep_only_tags    = [
+                          dict(name='div', attrs={'id':['content']}),
+                        ]
+
+    remove_tags = [
+                    dict(name='div', attrs={'class':['documentActions supercedeDocumentActions editorialDocumentActions',
+                                                      'documentActions supercedeDocumentActions editorialDocumentActions editorialFooterDocumentActions',
+                                                      'article-sidebar',
+                                                      'image-viewer-controls nojs',
+                                                      'protectedArticleWrapper',
+                                                      'visualClear',
+                                                     ]})
+                  ]
+
+    INDEX                 = ''
+    def append_page(self, soup, appendtag, position):
+        pager = soup.find('span',attrs={'class':'next'})
+        print 'AGE-append_page-------------->: ', pager
+        if pager:
+            nexturl = self.INDEX + pager.a['href']
+            soup2 = self.index_to_soup(nexturl)
+            texttag = soup2.find('div', attrs={'class':'article-text'})
+            newpos = len(texttag.contents)
+            self.append_page(soup2,texttag,newpos)
+            texttag.extract()
+            appendtag.insert(position,texttag)
+
+    def preprocess_html(self, soup):
+        self.append_page(soup, soup.body, 3)
+        pager = soup.find('div',attrs={'class':'listingBar listingBar-article'})
+        if pager:
+            pager.extract()
+        return self.adeify_images(soup)

From 8d87f7275572ae4873135d4e92d1351589aff303 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Aug 2013 21:49:19 +0530
Subject: [PATCH 0593/1154] Fix #1213664 [desktop file has %F in the wrong
 place](https://bugs.launchpad.net/calibre/+bug/1213664)

---
 src/calibre/linux.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 98d68816f3..913419bb8b 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -857,11 +857,11 @@ GUI = '''\
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=calibre %F
+Name=calibre
 GenericName=E-book library management
 Comment=E-book library management: Convert, view, share, catalogue all your e-books
 TryExec=calibre
-Exec=calibre
+Exec=calibre %F
 Icon=calibre-gui
 Categories=Office;
 '''

From 3690241ab1df7f7ffe7fe4021300d32f241a67c1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Aug 2013 08:21:57 +0530
Subject: [PATCH 0594/1154] Update El Tribuno

Fixes #1213759 [Updated recipes for El Tribuno de Salta and Jujuy](https://bugs.launchpad.net/calibre/+bug/1213759)
---
 recipes/eltribuno_jujuy_impreso.recipe | 3 +--
 recipes/eltribuno_salta_impreso.recipe | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes/eltribuno_jujuy_impreso.recipe b/recipes/eltribuno_jujuy_impreso.recipe
index 2b725231c9..8904731293 100644
--- a/recipes/eltribuno_jujuy_impreso.recipe
+++ b/recipes/eltribuno_jujuy_impreso.recipe
@@ -20,7 +20,7 @@ class ElTribunoJujuyImpreso(BasicNewsRecipe):
     max_articles_per_feed   = 250
     no_stylesheets          = True
     use_embedded_content    = False
-    encoding                = 'cp1252'
+    encoding                = 'utf8'
     publication_type        = 'newspaper'
     delay                   = 1
     articles_are_obfuscated = True
@@ -124,4 +124,3 @@ class ElTribunoJujuyImpreso(BasicNewsRecipe):
         artid = right.partition('-')[0]
         params = {'Note':artid}
         return (self.PRINTURL % urllib.urlencode(params))
-
diff --git a/recipes/eltribuno_salta_impreso.recipe b/recipes/eltribuno_salta_impreso.recipe
index 67cc073a7e..e1155b6a42 100644
--- a/recipes/eltribuno_salta_impreso.recipe
+++ b/recipes/eltribuno_salta_impreso.recipe
@@ -20,7 +20,7 @@ class ElTribunoSaltaImpreso(BasicNewsRecipe):
     max_articles_per_feed   = 250
     no_stylesheets          = True
     use_embedded_content    = False
-    encoding                = 'cp1252'
+    encoding                = 'utf8'
     publication_type        = 'newspaper'
     delay                   = 1
     articles_are_obfuscated = True
@@ -124,4 +124,3 @@ class ElTribunoSaltaImpreso(BasicNewsRecipe):
         artid = right.partition('-')[0]
         params = {'Note':artid}
         return (self.PRINTURL % urllib.urlencode(params))
-

From 6c7ff4e4e63907143e988339cc76777baf2d8c17 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Aug 2013 08:40:15 +0530
Subject: [PATCH 0595/1154] Update Metro UK

---
 recipes/metro_uk.recipe | 106 +++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 51 deletions(-)

diff --git a/recipes/metro_uk.recipe b/recipes/metro_uk.recipe
index 6b5ee3bf4b..7990ef5676 100644
--- a/recipes/metro_uk.recipe
+++ b/recipes/metro_uk.recipe
@@ -7,71 +7,75 @@ import time
 class AdvancedUserRecipe1306097511(BasicNewsRecipe):
     title          = u'Metro UK'
     description = 'News from The Metro, UK'
-    #timefmt = ''
-    __author__ = 'Dave Asbury'
-    #last update 4/4/13
-    #cover_url = 'http://profile.ak.fbcdn.net/hprofile-ak-snc4/276636_117118184990145_2132092232_n.jpg'
 
     cover_url = 'https://twimg0-a.akamaihd.net/profile_images/1638332595/METRO_LETTERS-01.jpg'
     remove_empty_feeds = True
     remove_javascript     = True
+    no_stylesheets        = True
     auto_cleanup = True
     max_articles_per_feed = 12
     ignore_duplicate_articles = {'title', 'url'}
-    encoding = 'UTF-8'
+    #encoding = 'UTF-8'
 
     language = 'en_GB'
     masthead_url        = 'http://e-edition.metro.co.uk/images/metro_logo.gif'
     compress_news_images = True
+    compress_news_images_max_size = 30
+    remove_attributes = ['style', 'font']
+    preprocess_regexps = [
+
+                (re.compile(r'\| Metro News', re.IGNORECASE | re.DOTALL), lambda match: ''),
+                        ]
+
     def parse_index(self):
-		articles = {}
-		key = None
-		ans = []
-		feeds = [ ('UK', 'http://metro.co.uk/news/uk/'),
-			('World', 'http://metro.co.uk/news/world/'),
-			('Weird', 'http://metro.co.uk/news/weird/'),
-			('Money', 'http://metro.co.uk/news/money/'),
-			('Sport', 'http://metro.co.uk/sport/'),
-			('Guilty Pleasures', 'http://metro.co.uk/guilty-pleasures/')
-			]
-		for key, feed in feeds:
-			soup = self.index_to_soup(feed)
-			articles[key] = []
-			ans.append(key)
+        articles = {}
+        key = None
+        ans = []
+        feeds = [('UK', 'http://metro.co.uk/news/uk/'),
+                ('World', 'http://metro.co.uk/news/world/'),
+                ('Weird', 'http://metro.co.uk/news/weird/'),
+                ('Money', 'http://metro.co.uk/news/money/'),
+                ('Sport', 'http://metro.co.uk/sport/'),
+                ('Guilty Pleasures', 'http://metro.co.uk/guilty-pleasures/')
+                ]
+        for key, feed in feeds:
+            soup = self.index_to_soup(feed)
+            articles[key] = []
+            ans.append(key)
 
-			today = datetime.date.today()
-			today = time.mktime(today.timetuple())-60*60*24
+            today = datetime.date.today()
+            today = time.mktime(today.timetuple())-60*60*24
 
-			for a in soup.findAll('a'):
-				for name, value in a.attrs:
-					if name == "class" and value=="post":
-						url = a['href']
-						title = a['title']
-						print title
-						description = ''
-						m = re.search('^.*uk/([^/]*)/([^/]*)/([^/]*)/', url)
-						skip = 1
-						if len(m.groups()) == 3:
-							g = m.groups()
-							dt = datetime.datetime.strptime(''+g[0]+'-'+g[1]+'-'+g[2], '%Y-%m-%d')
-							pubdate = time.strftime('%a, %d %b', dt.timetuple())
+            for a in soup.findAll('a'):
+                for name, value in a.attrs:
+                    if name == "class" and value=="post":
+                        url = a['href']
+                        title = a['title']
+                        print title
+                        description = ''
+                        m = re.search('^.*uk/([^/]*)/([^/]*)/([^/]*)/', url)
+                        skip = 1
+                        if len(m.groups()) == 3:
+                            g = m.groups()
+                            dt = datetime.datetime.strptime(''+g[0]+'-'+g[1]+'-'+g[2], '%Y-%m-%d')
+                            pubdate = time.strftime('%a, %d %b', dt.timetuple())
 
-							dt = time.mktime(dt.timetuple())
-							if dt >= today:
-								print pubdate
-								skip = 0
-						else:
-							pubdate = strftime('%a, %d %b')
+                            dt = time.mktime(dt.timetuple())
+                            if dt >= today:
+                                print pubdate
+                                skip = 0
+                        else:
+                            pubdate = strftime('%a, %d %b')
 
-						summary = a.find(True, attrs={'class':'excerpt'})
-						if summary:
-							description = self.tag_to_string(summary, use_alt=False)
+                        summary = a.find(True, attrs={'class':'excerpt'})
+                        if summary:
+                            description = self.tag_to_string(summary, use_alt=False)
 
-						if skip == 0:
-							articles[key].append(
-										dict(title=title, url=url, date=pubdate,
-												description=description,
-												content=''))
-		#ans = self.sort_index_by(ans, {'The Front Page':-1, 'Dining In, Dining Out':1, 'Obituaries':2})
-		ans = [(key, articles[key]) for key in ans if articles.has_key(key)]
-		return ans
+                        if skip == 0:
+                            articles[key].append(
+                                                    dict(title=title, url=url, date=pubdate,
+                                                                    description=description,
+                                                                    content=''))
+        #ans = self.sort_index_by(ans, {'The Front Page':-1, 'Dining In, Dining Out':1, 'Obituaries':2})
+        ans = [(key, articles[key]) for key in ans if key in articles]
+        return ans

From 079c685f1a008947af498ca92ad0681b9682bbb0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Aug 2013 09:43:17 +0530
Subject: [PATCH 0596/1154] RTF Input: Add option to ignore WMF images

RTF Input: Add option to ignore WMF images iinstead of replacing them
with a placeholder. Fixes #1213599 [RTF input conversion creates too large an image when failing to convert .wmf file](https://bugs.launchpad.net/calibre/+bug/1213599)
---
 .../ebooks/conversion/plugins/rtf_input.py    | 56 ++++++++++++-------
 src/calibre/gui2/convert/rtf_input.py         | 23 ++++++++
 src/calibre/gui2/convert/rtf_input.ui         | 41 ++++++++++++++
 3 files changed, 101 insertions(+), 19 deletions(-)
 create mode 100644 src/calibre/gui2/convert/rtf_input.py
 create mode 100644 src/calibre/gui2/convert/rtf_input.ui

diff --git a/src/calibre/ebooks/conversion/plugins/rtf_input.py b/src/calibre/ebooks/conversion/plugins/rtf_input.py
index 325f07cfe8..709e026cc7 100644
--- a/src/calibre/ebooks/conversion/plugins/rtf_input.py
+++ b/src/calibre/ebooks/conversion/plugins/rtf_input.py
@@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, glob, re, textwrap
 
-from calibre.customize.conversion import InputFormatPlugin
+from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
 
 border_style_map = {
         'single' : 'solid',
@@ -45,6 +45,11 @@ class RTFInput(InputFormatPlugin):
     description = 'Convert RTF files to HTML'
     file_types  = set(['rtf'])
 
+    options = {
+        OptionRecommendation(name='ignore_wmf', recommended_value=False,
+            help=_('Ignore WMF images instead of replacing them with a placeholder image.')),
+    }
+
     def generate_xml(self, stream):
         from calibre.ebooks.rtf2xml.ParseRtf import ParseRtf
         ofile = u'dataxml.xml'
@@ -59,51 +64,51 @@ class RTFInput(InputFormatPlugin):
             except:
                 self.log.warn('Impossible to run RTFParser in debug mode')
         parser = ParseRtf(
-            in_file    = stream,
-            out_file   = ofile,
+            in_file=stream,
+            out_file=ofile,
             # Convert symbol fonts to unicode equivalents. Default
             # is 1
-            convert_symbol = 1,
+            convert_symbol=1,
 
             # Convert Zapf fonts to unicode equivalents. Default
             # is 1.
-            convert_zapf = 1,
+            convert_zapf=1,
 
             # Convert Wingding fonts to unicode equivalents.
             # Default is 1.
-            convert_wingdings = 1,
+            convert_wingdings=1,
 
             # Convert RTF caps to real caps.
             # Default is 1.
-            convert_caps = 1,
+            convert_caps=1,
 
             # Indent resulting XML.
             # Default is 0 (no indent).
-            indent = indent_out,
+            indent=indent_out,
 
             # Form lists from RTF. Default is 1.
-            form_lists = 1,
+            form_lists=1,
 
             # Convert headings to sections. Default is 0.
-            headings_to_sections = 1,
+            headings_to_sections=1,
 
             # Group paragraphs with the same style name. Default is 1.
-            group_styles = 1,
+            group_styles=1,
 
             # Group borders. Default is 1.
-            group_borders = 1,
+            group_borders=1,
 
             # Write or do not write paragraphs. Default is 0.
-            empty_paragraphs = 1,
+            empty_paragraphs=1,
 
             # Debug
-            deb_dir = debug_dir,
+            deb_dir=debug_dir,
 
             # Default encoding
-            default_encoding = getattr(self.opts, 'input_encoding', 'cp1252') or 'cp1252',
+            default_encoding=getattr(self.opts, 'input_encoding', 'cp1252') or 'cp1252',
 
             # Run level
-            run_level = run_lev,
+            run_level=run_lev,
         )
         parser.parse_rtf()
         with open(ofile, 'rb') as f:
@@ -156,6 +161,9 @@ class RTFInput(InputFormatPlugin):
         return self.replace_wmf(name)
 
     def replace_wmf(self, name):
+        if self.opts.ignore_wmf:
+            os.remove(name)
+            return '__REMOVE_ME__'
         from calibre.ebooks import calibre_cover
         if self.default_img is None:
             self.default_img = calibre_cover('Conversion of WMF images is not supported',
@@ -177,7 +185,6 @@ class RTFInput(InputFormatPlugin):
             f.write(data)
         return name
 
-
     def write_inline_css(self, ic, border_styles):
         font_size_classes = ['span.fs%d { font-size: %spt }'%(i, x) for i, x in
                 enumerate(ic.font_sizes)]
@@ -273,14 +280,14 @@ class RTFInput(InputFormatPlugin):
         self.log('Converting XML to HTML...')
         inline_class = InlineClass(self.log)
         styledoc = etree.fromstring(P('templates/rtf.xsl', data=True))
-        extensions = { ('calibre', 'inline-class') : inline_class }
+        extensions = {('calibre', 'inline-class') : inline_class}
         transform = etree.XSLT(styledoc, extensions=extensions)
         result = transform(doc)
         html = u'index.xhtml'
         with open(html, 'wb') as f:
             res = transform.tostring(result)
             # res = res[:100].replace('xmlns:html', 'xmlns') + res[100:]
-            #clean multiple \n
+            # clean multiple \n
             res = re.sub('\n+', '\n', res)
             # Replace newlines inserted by the 'empty_paragraphs' option in rtf2xml with html blank lines
             # res = re.sub('\s*<body>', '<body>', res)
@@ -300,4 +307,15 @@ class RTFInput(InputFormatPlugin):
         opf.render(open(u'metadata.opf', 'wb'))
         return os.path.abspath(u'metadata.opf')
 
+    def postprocess_book(self, oeb, opts, log):
+        for item in oeb.spine:
+            for img in item.data.xpath('//*[local-name()="img" and @src="__REMOVE_ME__"]'):
+                p = img.getparent()
+                idx = p.index(img)
+                p.remove(img)
+                if img.tail:
+                    if idx == 0:
+                        p.text = (p.text or '') + img.tail
+                    else:
+                        p[idx-1].tail = (p[idx-1].tail or '') + img.tail
 
diff --git a/src/calibre/gui2/convert/rtf_input.py b/src/calibre/gui2/convert/rtf_input.py
new file mode 100644
index 0000000000..b0ac163b55
--- /dev/null
+++ b/src/calibre/gui2/convert/rtf_input.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from calibre.gui2.convert.rtf_input_ui import Ui_Form
+from calibre.gui2.convert import Widget
+
+class PluginWidget(Widget, Ui_Form):
+
+    TITLE = _('RTF Input')
+    HELP = _('Options specific to')+' RTF '+_('input')
+    COMMIT_NAME = 'rtf_input'
+    ICON = I('mimetypes/rtf.png')
+
+    def __init__(self, parent, get_option, get_help, db=None, book_id=None):
+        Widget.__init__(self, parent,
+            ['ignore_wmf', ])
+        self.initialize_options(get_option, get_help, db, book_id)
+
diff --git a/src/calibre/gui2/convert/rtf_input.ui b/src/calibre/gui2/convert/rtf_input.ui
new file mode 100644
index 0000000000..5b960b7570
--- /dev/null
+++ b/src/calibre/gui2/convert/rtf_input.ui
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>518</width>
+    <height>353</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <widget class="QCheckBox" name="opt_ignore_wmf">
+     <property name="text">
+      <string>Ignore &amp;WMF images in the RTF file</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>213</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

From 6690397d1a0ca83e87d30485bfaf68e9c1821495 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Aug 2013 10:21:13 +0530
Subject: [PATCH 0597/1154] pep8

---
 src/calibre/gui2/tag_browser/model.py | 45 ++++++++++++++-------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py
index ea0e5f5f68..9705b9cadc 100644
--- a/src/calibre/gui2/tag_browser/model.py
+++ b/src/calibre/gui2/tag_browser/model.py
@@ -34,7 +34,7 @@ def bf():
         _bf = QVariant(_bf)
     return _bf
 
-class TagTreeItem(object): # {{{
+class TagTreeItem(object):  # {{{
 
     CATEGORY = 0
     TAG      = 1
@@ -198,7 +198,7 @@ class TagTreeItem(object): # {{{
         return res
     # }}}
 
-class TagsModel(QAbstractItemModel): # {{{
+class TagsModel(QAbstractItemModel):  # {{{
 
     search_item_renamed = pyqtSignal()
     tag_item_renamed = pyqtSignal()
@@ -285,7 +285,7 @@ class TagsModel(QAbstractItemModel): # {{{
             print ('Tag Browser build already in progress')
             traceback.print_stack()
             return
-        #traceback.print_stack()
+        # traceback.print_stack()
         #print ()
         self._build_in_progress = True
         self.beginResetModel()
@@ -296,7 +296,7 @@ class TagsModel(QAbstractItemModel): # {{{
     def _run_rebuild(self, state_map={}):
         for node in self.node_map.itervalues():
             node.break_cycles()
-        del node #Clear reference to node in the current frame
+        del node  # Clear reference to node in the current frame
         self.node_map.clear()
         self.category_nodes = []
         self.root_item = self.create_node(icon_map=self.icon_state_map)
@@ -404,7 +404,7 @@ class TagsModel(QAbstractItemModel): # {{{
                 components = [name]
             return components
 
-        def process_one_node(category, collapse_model, state_map): # {{{
+        def process_one_node(category, collapse_model, state_map):  # {{{
             collapse_letter = None
             category_node = category
             key = category_node.category_key
@@ -489,25 +489,25 @@ class TagsModel(QAbstractItemModel): # {{{
                                 # Formatter threw an exception. Don't create subnode
                                 node_parent = sub_cat = category
                             else:
-                                sub_cat = self.create_node(parent=category, data = name,
-                                     tooltip = None, temporary=True,
-                                     category_icon = category_node.icon,
+                                sub_cat = self.create_node(parent=category, data=name,
+                                     tooltip=None, temporary=True,
+                                     category_icon=category_node.icon,
                                      category_key=category_node.category_key,
                                      icon_map=self.icon_state_map)
                                 sub_cat.tag.is_searchable = False
                                 sub_cat.is_gst = is_gst
                                 node_parent = sub_cat
-                            last_idx = idx # remember where we last partitioned
+                            last_idx = idx  # remember where we last partitioned
                         else:
                             node_parent = sub_cat
-                    else: # by 'first letter'
+                    else:  # by 'first letter'
                         cl = cl_list[idx]
                         if cl != collapse_letter:
                             collapse_letter = cl
                             sub_cat = self.create_node(parent=category,
-                                     data = collapse_letter,
-                                     category_icon = category_node.icon,
-                                     tooltip = None, temporary=True,
+                                     data=collapse_letter,
+                                     category_icon=category_node.icon,
+                                     tooltip=None, temporary=True,
                                      category_key=category_node.category_key,
                                      icon_map=self.icon_state_map)
                         sub_cat.is_gst = is_gst
@@ -784,7 +784,7 @@ class TagsModel(QAbstractItemModel): # {{{
         self.refresh_required.emit()
 
     def handle_drop(self, on_node, ids):
-        #print 'Dropped ids:', ids, on_node.tag
+        # print 'Dropped ids:', ids, on_node.tag
         key = on_node.tag.category
         if (key == 'authors' and len(ids) >= 5):
             if not confirm('<p>'+_('Changing the authors for several books can '
@@ -809,7 +809,7 @@ class TagsModel(QAbstractItemModel): # {{{
 
             # Author_sort cannot change explicitly. Changing the author might
             # change it.
-            mi.author_sort = None # Never will change by itself.
+            mi.author_sort = None  # Never will change by itself.
 
             if key == 'authors':
                 mi.authors = [val]
@@ -858,7 +858,7 @@ class TagsModel(QAbstractItemModel): # {{{
         tb_cats = self.db.field_metadata
         for user_cat in sorted(self.db.prefs.get('user_categories', {}).keys(),
                                key=sort_key):
-            cat_name = '@' + user_cat # add the '@' to avoid name collision
+            cat_name = '@' + user_cat  # add the '@' to avoid name collision
             while True:
                 try:
                     tb_cats.add_user_category(label=cat_name, name=user_cat)
@@ -891,7 +891,7 @@ class TagsModel(QAbstractItemModel): # {{{
         defvalue = order.get('*', 100)
         tb_keys = sorted(tb_categories.keys(), key=lambda x: order.get(x, defvalue))
         for category in tb_keys:
-            if category in data: # The search category can come and go
+            if category in data:  # The search category can come and go
                 self.row_map.append(category)
                 self.categories[category] = tb_categories[category]['name']
         return data
@@ -994,7 +994,7 @@ class TagsModel(QAbstractItemModel): # {{{
                             return False
                         user_cats[nkey + rest] = user_cats[ckey + rest]
                         del user_cats[ckey + rest]
-            self.user_categories_edited.emit(user_cats, nkey) # Does a refresh
+            self.user_categories_edited.emit(user_cats, nkey)  # Does a refresh
             return True
 
         key = item.tag.category
@@ -1014,7 +1014,7 @@ class TagsModel(QAbstractItemModel): # {{{
                 return False
             self.db.saved_search_rename(unicode(item.data(role).toString()), val)
             item.tag.name = val
-            self.search_item_renamed.emit() # Does a refresh
+            self.search_item_renamed.emit()  # Does a refresh
         else:
             if key == 'series':
                 self.db.rename_series(item.tag.id, val)
@@ -1089,7 +1089,7 @@ class TagsModel(QAbstractItemModel): # {{{
                 fm = self.db.metadata_for_field(node.tag.category)
                 if node.tag.category in \
                     ('tags', 'series', 'authors', 'rating', 'publisher') or \
-                    (fm['is_custom'] and \
+                    (fm['is_custom'] and
                         fm['datatype'] in ['text', 'rating', 'series', 'enumeration']):
                     ans |= Qt.ItemIsDropEnabled
             else:
@@ -1193,7 +1193,8 @@ class TagsModel(QAbstractItemModel): # {{{
         exclusive: clear all states before applying this one
         set_to: None => advance the state, otherwise a value from TAG_SEARCH_STATES
         '''
-        if not index.isValid(): return False
+        if not index.isValid():
+            return False
         item = self.get_node(index)
         item.toggle(set_to=set_to)
         if exclusive:
@@ -1269,7 +1270,7 @@ class TagsModel(QAbstractItemModel): # {{{
                     if self.db.field_metadata[tag.category]['is_csp']:
                         add_colon = True
 
-                    if tag.name and tag.name[0] == u'\u2605': # char is a star. Assume rating
+                    if tag.name and tag.name[0] == u'\u2605':  # char is a star. Assume rating
                         ans.append('%s%s:%s'%(prefix, category, len(tag.name)))
                     else:
                         name = tag.original_name

From 239407d73b1c1f95108c8934f0ee0cc1d623390e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Aug 2013 11:16:15 +0530
Subject: [PATCH 0598/1154] Switch to newdb

Remove the use_newdb_tweak and various bits of code used to support
dual use.
---
 src/calibre/db/__init__.py                  | 14 ------
 src/calibre/db/categories.py                |  7 ++-
 src/calibre/debug.py                        | 54 ++-------------------
 src/calibre/gui2/actions/choose_library.py  |  4 +-
 src/calibre/gui2/actions/copy_to_library.py |  4 +-
 src/calibre/gui2/dialogs/check_library.py   |  2 +-
 src/calibre/gui2/dialogs/choose_library.py  |  3 +-
 src/calibre/gui2/dialogs/restore_library.py |  6 +--
 src/calibre/gui2/init.py                    | 28 ++++-------
 src/calibre/gui2/main.py                    | 12 ++---
 src/calibre/gui2/preferences/look_feel.py   |  6 +--
 src/calibre/gui2/tag_browser/model.py       |  2 +-
 src/calibre/gui2/ui.py                      | 10 ++--
 src/calibre/gui2/wizard/__init__.py         | 17 +++----
 src/calibre/library/__init__.py             |  4 +-
 src/calibre/library/cli.py                  | 20 +++-----
 src/calibre/library/move.py                 |  4 +-
 src/calibre/library/server/main.py          |  4 +-
 18 files changed, 55 insertions(+), 146 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 78f05da8ac..f59612449a 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -122,17 +122,3 @@ def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None, conve
             x['available_formats'] = [i.upper() for i in formats.split(',')]
 
     return data
-
-def get_db_loader():
-    from calibre.utils.config_base import tweaks
-    if tweaks.get('use_new_db', False):
-        from calibre.db.legacy import LibraryDatabase as cls
-        import apsw
-        errs = (apsw.Error,)
-    else:
-        from calibre.library.database2 import LibraryDatabase2 as cls
-        from calibre.library.sqlite import sqlite, DatabaseException
-        errs = (sqlite.Error, DatabaseException)
-    return cls, errs
-
-
diff --git a/src/calibre/db/categories.py b/src/calibre/db/categories.py
index ebd50750a3..c86801f086 100644
--- a/src/calibre/db/categories.py
+++ b/src/calibre/db/categories.py
@@ -21,10 +21,9 @@ CATEGORY_SORTS = ('name', 'popularity', 'rating')  # This has to be a tuple not
 
 class Tag(object):
 
-    if tweaks.get('use_new_db', False):
-        __slots__ = ('name', 'original_name', 'id', 'count', 'state', 'is_hierarchical',
-               'is_editable', 'is_searchable', 'id_set', 'avg_rating', 'sort',
-               'use_sort_as_name', 'tooltip', 'icon', 'category')
+    __slots__ = ('name', 'original_name', 'id', 'count', 'state', 'is_hierarchical',
+            'is_editable', 'is_searchable', 'id_set', 'avg_rating', 'sort',
+            'use_sort_as_name', 'tooltip', 'icon', 'category')
 
     def __init__(self, name, id=None, count=0, state=0, avg=0, sort=None,
                  tooltip=None, icon=None, category=None, id_set=None,
diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 906fe2f3c4..904ee11be8 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -84,7 +84,7 @@ Everything after the -- is passed to the script.
 
     return parser
 
-def reinit_db_new(dbpath, callback=None, sql_dump=None):
+def reinit_db(dbpath, callback=None, sql_dump=None):
     from calibre.db.backend import Connection
     import apsw
     import shutil
@@ -92,6 +92,8 @@ def reinit_db_new(dbpath, callback=None, sql_dump=None):
     from contextlib import closing
     if callback is None:
         callback = lambda x, y: None
+    if not os.path.exists(dbpath):
+        raise ValueError(dbpath + ' does not exist')
 
     with closing(Connection(dbpath)) as conn:
         uv = int(conn.get('PRAGMA user_version;', all=False))
@@ -117,56 +119,6 @@ def reinit_db_new(dbpath, callback=None, sql_dump=None):
             os.remove(dest)
     prints('Database successfully re-initialized')
 
-
-def reinit_db(dbpath, callback=None, sql_dump=None):
-    if not os.path.exists(dbpath):
-        raise ValueError(dbpath + ' does not exist')
-    from calibre.utils.config_base import tweaks
-    if tweaks.get('use_new_db', False):
-        return reinit_db_new(dbpath, callback, sql_dump)
-
-    from calibre.library.sqlite import connect
-    from contextlib import closing
-    import shutil
-    conn = connect(dbpath, False)
-    uv = conn.get('PRAGMA user_version;', all=False)
-    conn.execute('PRAGMA writable_schema=ON')
-    conn.commit()
-    if sql_dump is None:
-        sql_lines = conn.dump()
-    else:
-        sql_lines = open(sql_dump, 'rb').read()
-    conn.close()
-    dest = dbpath + '.tmp'
-    try:
-        with closing(connect(dest, False)) as nconn:
-            nconn.execute('create temporary table temp_sequence(id INTEGER PRIMARY KEY AUTOINCREMENT)')
-            nconn.commit()
-            if sql_dump is None:
-                if callable(callback):
-                    callback(len(sql_lines), True)
-                for i, line in enumerate(sql_lines):
-                    try:
-                        nconn.execute(line)
-                    except:
-                        import traceback
-                        prints('SQL line %r failed with error:'%line)
-                        prints(traceback.format_exc())
-                        continue
-                    finally:
-                        if callable(callback):
-                            callback(i, False)
-            else:
-                nconn.executescript(sql_lines)
-            nconn.execute('pragma user_version=%d'%int(uv))
-            nconn.commit()
-        os.remove(dbpath)
-        shutil.copyfile(dest, dbpath)
-    finally:
-        if os.path.exists(dest):
-            os.remove(dest)
-    prints('Database successfully re-initialized')
-
 def debug_device_driver():
     from calibre.devices import debug
     debug(ioreg_to_tmp=True, buf=sys.stdout)
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 6b70bddf6a..daaa893bab 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -22,8 +22,8 @@ from calibre.gui2 import (gprefs, warning_dialog, Dispatcher, error_dialog,
 from calibre.gui2.actions import InterfaceAction
 
 def db_class():
-    from calibre.db import get_db_loader
-    return get_db_loader()[0]
+    from calibre.db.legacy import LibraryDatabase
+    return LibraryDatabase
 
 class LibraryUsageStats(object):  # {{{
 
diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index f32f060de7..b93efa1dc4 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -55,8 +55,8 @@ class Worker(Thread):  # {{{
                         notify=False, replace=replace)
 
     def doit(self):
-        from calibre.db import get_db_loader
-        newdb = get_db_loader()[0](self.loc, is_second_db=True)
+        from calibre.db.legacy import LibraryDatabase
+        newdb = LibraryDatabase(self.loc, is_second_db=True)
         with closing(newdb):
             self._doit(newdb)
         newdb.break_cycles()
diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index c1f8ed4f18..73dcadd596 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -13,7 +13,7 @@ from PyQt4.Qt import (QDialog, QVBoxLayout, QHBoxLayout, QTreeWidget, QLabel,
 
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.library.check_library import CheckLibrary, CHECKS
-from calibre.library.database2 import delete_file, delete_tree
+from calibre.utils.recycle_bin import delete_file, delete_tree
 from calibre import prints, as_unicode
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.library.sqlite import DBThread, OperationalError
diff --git a/src/calibre/gui2/dialogs/choose_library.py b/src/calibre/gui2/dialogs/choose_library.py
index 52e8ef644a..1659a47b8f 100644
--- a/src/calibre/gui2/dialogs/choose_library.py
+++ b/src/calibre/gui2/dialogs/choose_library.py
@@ -85,8 +85,7 @@ class ChooseLibrary(QDialog, Ui_Dialog):
                     show=True)
             return False
         if ac in ('new', 'move'):
-            from calibre.db import get_db_loader
-            LibraryDatabase = get_db_loader()[0]
+            from calibre.db.legacy import LibraryDatabase
             if not empty:
                 error_dialog(self, _('Not empty'),
                     _('The folder %s is not empty. Please choose an empty'
diff --git a/src/calibre/gui2/dialogs/restore_library.py b/src/calibre/gui2/dialogs/restore_library.py
index 58731fa2d0..a00151f563 100644
--- a/src/calibre/gui2/dialogs/restore_library.py
+++ b/src/calibre/gui2/dialogs/restore_library.py
@@ -12,7 +12,6 @@ from calibre.gui2 import (error_dialog, question_dialog, warning_dialog,
     info_dialog)
 from calibre import force_unicode
 from calibre.constants import filesystem_encoding
-from calibre.utils.config_base import tweaks
 
 class DBRestore(QDialog):
 
@@ -42,10 +41,7 @@ class DBRestore(QDialog):
         self.library_path = library_path
         self.update_signal.connect(self.do_update, type=Qt.QueuedConnection)
 
-        if tweaks.get('use_new_db', False):
-            from calibre.db.restore import Restore
-        else:
-            from calibre.library.restore import Restore
+        from calibre.db.restore import Restore
         self.restorer = Restore(library_path, self)
         self.restorer.daemon = True
 
diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index de0a58d7bb..a37c693eb6 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -10,7 +10,7 @@ import functools
 from PyQt4.Qt import (Qt, QApplication, QStackedWidget, QMenu, QTimer,
         QSize, QSizePolicy, QStatusBar, QLabel, QFont, QAction, QTabBar)
 
-from calibre.utils.config import prefs, tweaks
+from calibre.utils.config import prefs
 from calibre.utils.icu import sort_key
 from calibre.constants import (isosx, __appname__, preferred_encoding,
     get_version)
@@ -171,8 +171,6 @@ class StatusBar(QStatusBar):  # {{{
         QStatusBar.__init__(self, parent)
         self.version = get_version()
         self.base_msg = '%s %s' % (__appname__, self.version)
-        if tweaks.get('use_new_db', False):
-            self.base_msg += ' [newdb]'
         self.device_string = ''
         self.update_label = UpdateLabel('')
         self.total = self.current = self.selected = self.library_total = 0
@@ -249,18 +247,13 @@ class GridViewButton(LayoutButton):  # {{{
     def __init__(self, gui):
         sc = _('Shift+Alt+G')
         LayoutButton.__init__(self, I('grid.png'), _('Cover Grid'), parent=gui, shortcut=sc)
-        if tweaks.get('use_new_db', False):
-            self.set_state_to_show()
-            self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self)
-            gui.addAction(self.action_toggle)
-            gui.keyboard.register_shortcut('grid view toggle' + self.label, unicode(self.action_toggle.text()),
-                                        default_keys=(sc,), action=self.action_toggle)
-            self.action_toggle.triggered.connect(self.toggle)
-            self.toggled.connect(self.update_state)
-            self.grid_enabled = True
-        else:
-            self.setVisible(False)
-            self.grid_enabled = False
+        self.set_state_to_show()
+        self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self)
+        gui.addAction(self.action_toggle)
+        gui.keyboard.register_shortcut('grid view toggle' + self.label, unicode(self.action_toggle.text()),
+                                    default_keys=(sc,), action=self.action_toggle)
+        self.action_toggle.triggered.connect(self.toggle)
+        self.toggled.connect(self.update_state)
 
     def update_state(self, checked):
         if checked:
@@ -269,11 +262,10 @@ class GridViewButton(LayoutButton):  # {{{
             self.set_state_to_show()
 
     def save_state(self):
-        if self.grid_enabled:
-            gprefs['grid view visible'] = bool(self.isChecked())
+        gprefs['grid view visible'] = bool(self.isChecked())
 
     def restore_state(self):
-        if self.grid_enabled and gprefs.get('grid view visible', False):
+        if gprefs.get('grid view visible', False):
             self.toggle()
 
 
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index d6d6abcf26..28dcd5dc34 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -4,12 +4,14 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import sys, os, time, socket, traceback
 from functools import partial
 
+import apsw
 from PyQt4.Qt import (QCoreApplication, QIcon, QObject, QTimer,
         QPixmap, QSplashScreen, QApplication)
 
 from calibre import prints, plugins, force_unicode
 from calibre.constants import (iswindows, __appname__, isosx, DEBUG, islinux,
         filesystem_encoding, get_portable_base)
+from calibre.db.legacy import LibraryDatabase
 from calibre.utils.ipc import gui_socket_address, RC
 from calibre.gui2 import (ORG_NAME, APP_UID, initialize_file_icon_provider,
     Application, choose_dir, error_dialog, question_dialog, gprefs)
@@ -222,7 +224,7 @@ class GuiRunner(QObject):
 
             try:
                 self.library_path = candidate
-                db = self.db_class(candidate)
+                db = LibraryDatabase(candidate)
             except:
                 error_dialog(self.splash_screen, _('Bad database location'),
                     _('Bad database location %r. calibre will now quit.'
@@ -239,12 +241,10 @@ class GuiRunner(QObject):
                          det_msg=traceback.format_exc(), show=True)
 
     def initialize_db(self):
-        from calibre.db import get_db_loader
         db = None
-        self.db_class, errs = get_db_loader()
         try:
-            db = self.db_class(self.library_path)
-        except errs:
+            db = LibraryDatabase(self.library_path)
+        except apsw.Error:
             repair = question_dialog(self.splash_screen, _('Corrupted database'),
                     _('The library database at %s appears to be corrupted. Do '
                     'you want calibre to try and rebuild it automatically? '
@@ -255,7 +255,7 @@ class GuiRunner(QObject):
                     )
             if repair:
                 if repair_library(self.library_path):
-                    db = self.db_class(self.library_path)
+                    db = LibraryDatabase(self.library_path)
         except:
             error_dialog(self.splash_screen, _('Bad database location'),
                     _('Bad database location %r. Will start with '
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index db993a0424..369ae59375 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -17,7 +17,7 @@ from calibre.gui2.preferences.look_feel_ui import Ui_Form
 from calibre.gui2 import config, gprefs, qt_app, NONE, open_local_file
 from calibre.utils.localization import (available_translations,
     get_language, get_lang)
-from calibre.utils.config import prefs, tweaks
+from calibre.utils.config import prefs
 from calibre.utils.icu import sort_key
 from calibre.gui2.book_details import get_field_list
 from calibre.gui2.preferences.coloring import EditRules
@@ -210,10 +210,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.fs_help_msg.setText(unicode(self.fs_help_msg.text())%(
             _(' or ').join(keys)))
         self.cover_grid_color_button.clicked.connect(self.change_cover_grid_color)
-        if not tweaks.get('use_new_db', False):
-            for i in range(self.tabWidget.count()):
-                if self.tabWidget.widget(i) is self.cover_grid_tab:
-                    self.tabWidget.removeTab(i)
         self.size_calculated.connect(self.update_cg_cache_size, type=Qt.QueuedConnection)
         self.tabWidget.currentChanged.connect(self.tab_changed)
         self.cover_grid_empty_cache.clicked.connect(self.empty_cache)
diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py
index 9705b9cadc..48ac9045dd 100644
--- a/src/calibre/gui2/tag_browser/model.py
+++ b/src/calibre/gui2/tag_browser/model.py
@@ -15,7 +15,7 @@ from PyQt4.Qt import (QAbstractItemModel, QIcon, QVariant, QFont, Qt,
 
 from calibre.constants import config_dir
 from calibre.gui2 import NONE, gprefs, config, error_dialog
-from calibre.library.database2 import Tag
+from calibre.db.categories import Tag
 from calibre.utils.config import tweaks
 from calibre.utils.icu import sort_key, lower, strcmp, collation_order
 from calibre.library.field_metadata import TagsIcons, category_icon_map
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 4cec88cf05..925300b619 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -14,6 +14,7 @@ from Queue import Queue, Empty
 from threading import Thread
 from collections import OrderedDict
 
+import apsw
 from PyQt4.Qt import (Qt, SIGNAL, QTimer, QHelpEvent, QAction,
                      QMenu, QIcon, pyqtSignal, QUrl, QFont,
                      QDialog, QSystemTrayIcon, QApplication)
@@ -22,7 +23,7 @@ from calibre import prints, force_unicode
 from calibre.constants import __appname__, isosx, filesystem_encoding, DEBUG
 from calibre.utils.config import prefs, dynamic
 from calibre.utils.ipc.server import Server
-from calibre.db import get_db_loader
+from calibre.db.legacy import LibraryDatabase
 from calibre.customize.ui import interface_actions, available_store_plugins
 from calibre.gui2 import (error_dialog, GetMetadata, open_url,
         gprefs, max_available_height, config, info_dialog, Dispatcher,
@@ -585,10 +586,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             unload_user_template_functions(olddb.library_id)
         except:
             olddb = None
-        db_class, errs = get_db_loader()
         try:
-            db = db_class(newloc, default_prefs=default_prefs)
-        except errs:
+            db = LibraryDatabase(newloc, default_prefs=default_prefs)
+        except apsw.Error:
             if not allow_rebuild:
                 raise
             import traceback
@@ -602,7 +602,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             if repair:
                 from calibre.gui2.dialogs.restore_library import repair_library_at
                 if repair_library_at(newloc, parent=self):
-                    db = db_class(newloc, default_prefs=default_prefs)
+                    db = LibraryDatabase(newloc, default_prefs=default_prefs)
                 else:
                     return
             else:
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 00fd3bdb29..572e6a8bfe 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -14,6 +14,7 @@ from contextlib import closing
 from PyQt4.Qt import (QWizard, QWizardPage, QPixmap, Qt, QAbstractListModel,
     QVariant, QItemSelectionModel, SIGNAL, QObject, QTimer, pyqtSignal)
 from calibre import __appname__, patheq
+from calibre.db.legacy import LibraryDatabase
 from calibre.library.move import MoveLibrary
 from calibre.constants import (filesystem_encoding, iswindows, plugins,
         isportable)
@@ -33,10 +34,6 @@ from calibre.customize.ui import device_plugins
 if iswindows:
     winutil = plugins['winutil'][0]
 
-def db_class():
-    from calibre.db import get_db_loader
-    return get_db_loader()[0]
-
 # Devices {{{
 
 class Device(object):
@@ -626,7 +623,7 @@ def move_library(oldloc, newloc, parent, callback_on_complete):
             if oldloc and os.access(os.path.join(oldloc, 'metadata.db'), os.R_OK):
                 # Move old library to new location
                 try:
-                    db = db_class()(oldloc)
+                    db = LibraryDatabase(oldloc)
                 except:
                     return move_library(None, newloc, parent,
                         callback)
@@ -639,13 +636,13 @@ def move_library(oldloc, newloc, parent, callback_on_complete):
                     return
             else:
                 # Create new library at new location
-                db = db_class()(newloc)
+                db = LibraryDatabase(newloc)
                 callback(newloc)
                 return
 
         # Try to load existing library at new location
         try:
-            db_class()(newloc)
+            LibraryDatabase(newloc)
         except Exception as err:
             det = traceback.format_exc()
             error_dialog(parent, _('Invalid database'),
@@ -732,7 +729,7 @@ class LibraryPage(QWizardPage, LibraryUI):
 
     def is_library_dir_suitable(self, x):
         try:
-            return db_class().exists_at(x) or not os.listdir(x)
+            return LibraryDatabase.exists_at(x) or not os.listdir(x)
         except:
             return False
 
@@ -748,10 +745,10 @@ class LibraryPage(QWizardPage, LibraryUI):
                          _('Select location for books'))
         if x:
             if (iswindows and len(x) >
-                    db_class().WINDOWS_LIBRARY_PATH_LIMIT):
+                    LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT):
                 return error_dialog(self, _('Too long'),
                     _('Path to library too long. Must be less than'
-                    ' %d characters.')%(db_class().WINDOWS_LIBRARY_PATH_LIMIT),
+                    ' %d characters.')%(LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT),
                     show=True)
             if not os.path.exists(x):
                 try:
diff --git a/src/calibre/library/__init__.py b/src/calibre/library/__init__.py
index e219d764d5..d622a75b3d 100644
--- a/src/calibre/library/__init__.py
+++ b/src/calibre/library/__init__.py
@@ -3,9 +3,9 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 ''' Code to manage ebook library'''
 
 def db(path=None, read_only=False):
-    from calibre.db import get_db_loader
+    from calibre.db.legacy import LibraryDatabase
     from calibre.utils.config import prefs
-    return get_db_loader()[0](path if path else prefs['library_path'],
+    return LibraryDatabase(path if path else prefs['library_path'],
             read_only=read_only)
 
 
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 325fa6cefe..89989102e2 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -13,21 +13,18 @@ from textwrap import TextWrapper
 
 from calibre import preferred_encoding, prints, isbytestring, patheq
 from calibre.constants import iswindows
+from calibre.db.legacy import LibraryDatabase
 from calibre.utils.config import OptionParser, prefs, tweaks
 from calibre.ebooks.metadata.meta import get_metadata
 from calibre.ebooks.metadata.book.base import field_from_string
 from calibre.ebooks.metadata.opf2 import OPFCreator, OPF
 from calibre.utils.date import isoformat
-from calibre.db import get_db_loader
 
 FIELDS = set(['title', 'authors', 'author_sort', 'publisher', 'rating',
     'timestamp', 'size', 'tags', 'comments', 'series', 'series_index',
     'formats', 'isbn', 'uuid', 'pubdate', 'cover', 'last_modified',
     'identifiers'])
 
-def db_class():
-    return get_db_loader()[0]
-
 do_notify = True
 def send_message(msg=''):
     global do_notify
@@ -66,7 +63,7 @@ def get_db(dbpath, options):
     dbpath = os.path.abspath(dbpath)
     if options.dont_notify_gui:
         do_notify = False
-    return db_class()(dbpath)
+    return LibraryDatabase(dbpath)
 
 def do_list(db, fields, afields, sort_by, ascending, search_text, line_width, separator,
             prefix, limit, subtitle='Books in the calibre database'):
@@ -1108,7 +1105,7 @@ def command_backup_metadata(args, dbpath):
         dbpath = opts.library_path
     if isbytestring(dbpath):
         dbpath = dbpath.decode(preferred_encoding)
-    db = db_class()(dbpath)
+    db = LibraryDatabase(dbpath)
     book_ids = None
     if opts.all:
         book_ids = db.all_ids()
@@ -1190,7 +1187,7 @@ def command_check_library(args, dbpath):
             for i in list:
                 print '    %-40.40s - %-40.40s'%(i[0], i[1])
 
-    db = db_class()(dbpath)
+    db = LibraryDatabase(dbpath)
     checker = CheckLibrary(dbpath, db)
     checker.scan_library(names, exts)
     for check in checks:
@@ -1245,10 +1242,7 @@ def command_restore_database(args, dbpath):
                 self.total = float(step)
             else:
                 prints(msg, '...', '%d%%'%int(100*(step/self.total)))
-    if tweaks.get('use_new_db', False):
-        from calibre.db.restore import Restore
-    else:
-        from calibre.library.restore import Restore
+    from calibre.db.restore import Restore
     r = Restore(dbpath, progress_callback=Progress())
     r.start()
     r.join()
@@ -1306,7 +1300,7 @@ def command_list_categories(args, dbpath):
     if isbytestring(dbpath):
         dbpath = dbpath.decode(preferred_encoding)
 
-    db = db_class()(dbpath)
+    db = LibraryDatabase(dbpath)
     category_data = db.get_categories()
     data = []
     report_on = [c.strip() for c in opts.report.split(',') if c.strip()]
@@ -1425,8 +1419,6 @@ def command_clone(args, dbpath):
     if not empty:
         prints(_('%s is not empty. You must choose an empty directory for the new library.') % loc)
         return 1
-    from calibre.db import get_db_loader
-    LibraryDatabase = get_db_loader()[0]
     if iswindows and len(loc) > LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT:
         prints(_('Path to library too long. Must be less than'
                     ' %d characters.')%LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT)
diff --git a/src/calibre/library/move.py b/src/calibre/library/move.py
index ccebaa0302..5423216a80 100644
--- a/src/calibre/library/move.py
+++ b/src/calibre/library/move.py
@@ -15,9 +15,9 @@ from calibre.utils.ipc.job import ParallelJob
 
 
 def move_library(from_, to, notification=lambda x:x):
-    from calibre.db import get_db_loader
+    from calibre.db.legacy import LibraryDatabase
     time.sleep(1)
-    old = get_db_loader()[0](from_)
+    old = LibraryDatabase(from_)
     old.move_library_to(to, notification)
     return True
 
diff --git a/src/calibre/library/server/main.py b/src/calibre/library/server/main.py
index a97eb53618..d38960da67 100644
--- a/src/calibre/library/server/main.py
+++ b/src/calibre/library/server/main.py
@@ -100,7 +100,7 @@ def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
 
 
 def main(args=sys.argv):
-    from calibre.db import get_db_loader
+    from calibre.db.legacy import LibraryDatabase
     parser = option_parser()
     opts, args = parser.parse_args(args)
     if opts.daemonize and not iswindows:
@@ -116,7 +116,7 @@ def main(args=sys.argv):
         print('No saved library path. Use the --with-library option'
                 ' to specify the path to the library you want to use.')
         return 1
-    db = get_db_loader()[0](opts.with_library)
+    db = LibraryDatabase(opts.with_library)
     server = LibraryServer(db, opts, show_tracebacks=opts.develop)
     server.start()
     return 0

From 04aa6d23fb7d21645532e63486b440239b0de01e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Aug 2013 11:27:47 +0530
Subject: [PATCH 0599/1154] Ask for confirmation when toggle search highlight
 is clicked

---
 src/calibre/gui2/search_box.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index edd05168f4..a50b3dfe9c 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -14,7 +14,7 @@ from PyQt4.Qt import QComboBox, Qt, QLineEdit, QStringList, pyqtSlot, QDialog, \
                      pyqtSignal, QCompleter, QAction, QKeySequence, QTimer, \
                      QString, QIcon, QMenu
 
-from calibre.gui2 import config, error_dialog
+from calibre.gui2 import config, error_dialog, question_dialog
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.dialogs.saved_search_editor import SavedSearchEditor
 from calibre.gui2.dialogs.search import SearchDialog
@@ -420,6 +420,11 @@ class SearchBoxMixin(object):  # {{{
         self.highlight_only_button.setToolTip(tt)
 
     def highlight_only_clicked(self, state):
+        if not config['highlight_search_matches'] and not question_dialog(self, _('Are you sure?'),
+            _('This will change how searching works. When you search, instead of showing only the '
+                'matching books, all books will be shown with the matching books highlighted. '
+                'Are you sure this is what you want?'), skip_dialog_name='confirm_search_highlight_toggle'):
+            return
         config['highlight_search_matches'] = not config['highlight_search_matches']
         self.set_highlight_only_button_icon()
         self.search.do_search()

From c65f952f0fd65141793a76e172e6e819d2270652 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 20 Aug 2013 08:19:25 +0530
Subject: [PATCH 0600/1154] Update jeuxvideo

---
 recipes/jeuxvideo.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes/jeuxvideo.recipe b/recipes/jeuxvideo.recipe
index a41fe94753..2fb4f25705 100644
--- a/recipes/jeuxvideo.recipe
+++ b/recipes/jeuxvideo.recipe
@@ -6,6 +6,7 @@ JeuxVideo.com
 '''
 
 __author__ = '2013, Malah <malah at neuf dot fr>'
+
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class JeuxVideoCom(BasicNewsRecipe):
@@ -27,6 +28,8 @@ class JeuxVideoCom(BasicNewsRecipe):
     masthead_url       = u'https://upload.wikimedia.org/wikipedia/commons/3/39/Jeuxvideocom.png'
     feeds =  [
         (u'Section PC',u'http://www.jeuxvideo.com/rss/rss-pc.xml'),
+        (u'Section Xbox One',u'http://www.jeuxvideo.com/rss/rss-xo.xml'),
+        (u'Section PlayStation 4',u'http://www.jeuxvideo.com/rss/rss-ps4.xml'),
         (u'Section Xbox 360',u'http://www.jeuxvideo.com/rss/rss-360.xml'),
         (u'Section PlayStation 3',u'http://www.jeuxvideo.com/rss/rss-ps3.xml'),
         (u'Section Wii U',u'http://www.jeuxvideo.com/rss/rss-wiiu.xml'),

From 55e8c029e78d11f639c58aaf904867f639664f8d Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Tue, 20 Aug 2013 14:29:11 +1000
Subject: [PATCH 0601/1154] No device collections if shelves not maintained

Kobo driver: Display device collections even if the driver is configured
to not manage shelves on the device. Fixes #1214233 [Collections are empty when not maintaining shelves on Kobo devices](https://bugs.launchpad.net/calibre/+bug/1214233)

Skip getting the shelf collections if the Kobo driver is not configured
to maintain them. This was wiping out the device collections.
---
 src/calibre/devices/kobo/driver.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 2ef2c5efb7..a32f458a18 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -44,7 +44,7 @@ class KOBO(USBMS):
     gui_name = 'Kobo Reader'
     description = _('Communicate with the Kobo Reader')
     author = 'Timothy Legge and David Forrester'
-    version = (2, 1, 0)
+    version = (2, 1, 1)
 
     dbversion = 0
     fwversion = 0
@@ -2112,9 +2112,6 @@ class KOBOTOUCH(KOBO):
             create_bookshelves      = False
             update_series_details   = False
 
-        collections = booklists.get_collections(collections_attributes)
-#        debug_print('KoboTouch:update_device_database_collections - Collections:', collections)
-
         opts = self.settings()
         if opts.extra_customization:
             create_bookshelves = opts.extra_customization[self.OPT_CREATE_BOOKSHELVES] and self.supports_bookshelves()
@@ -2123,6 +2120,9 @@ class KOBOTOUCH(KOBO):
             delete_empty_shelves = False
         bookshelf_attribute = len(collections_attributes)
 
+        collections = booklists.get_collections(collections_attributes) if bookshelf_attribute else None
+#        debug_print('KoboTouch:update_device_database_collections - Collections:', collections)
+
         # Create a connection to the sqlite database
         # Needs to be outside books collection as in the case of removing
         # the last book from the collection the list of books is empty
@@ -2551,12 +2551,12 @@ class KOBOTOUCH(KOBO):
             if show_debug:
                 debug_print('        Did not find a record - adding')
             cursor.execute(addquery, add_values)
-            connection.commit()
         elif result[0] == 'true':
             if show_debug:
                 debug_print('        Found a record - updating - result=', result)
             cursor.execute(updatequery, update_values)
-            connection.commit()
+
+        connection.commit()
 
         cursor.close()
 

From 9cb81a69840888691e9207fa9cc608dc04f10041 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 20 Aug 2013 21:23:29 +0530
Subject: [PATCH 0602/1154] Add note about VLs as tabs to manual

---
 manual/virtual_libraries.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manual/virtual_libraries.rst b/manual/virtual_libraries.rst
index f695bb0e45..cd0d5c33de 100644
--- a/manual/virtual_libraries.rst
+++ b/manual/virtual_libraries.rst
@@ -94,6 +94,11 @@ You can quickly use the current search as a temporary virtual library by
 clicking the :guilabel:`Virtual Library` button and choosing the
 :guilabel:`*current search` entry.
 
+You can display all available virtual libraries as tabs above the book list.
+This is particularly handy if you like switching between virtual libraries very
+often. Click the :guilabel:`Virtual Library` button and select :guilabel:`Show
+virtual libraries as tabs`.
+
 Using additional restrictions
 -------------------------------
 

From f2c537ee5510ff84d053da8403b6555de39ff392 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 20 Aug 2013 21:28:31 +0530
Subject: [PATCH 0603/1154] ...

---
 manual/virtual_libraries.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manual/virtual_libraries.rst b/manual/virtual_libraries.rst
index cd0d5c33de..9432bb04ef 100644
--- a/manual/virtual_libraries.rst
+++ b/manual/virtual_libraries.rst
@@ -97,7 +97,9 @@ clicking the :guilabel:`Virtual Library` button and choosing the
 You can display all available virtual libraries as tabs above the book list.
 This is particularly handy if you like switching between virtual libraries very
 often. Click the :guilabel:`Virtual Library` button and select :guilabel:`Show
-virtual libraries as tabs`.
+virtual libraries as tabs`. You can re-arrange the tabs by drag and drop and
+close ones you do not want to see. Closed tabs can be restored by
+right-clicking on the tab bar.
 
 Using additional restrictions
 -------------------------------

From 8609f177f8a679cd7c76aac1f4fb56c8c710a392 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Aug 2013 10:25:15 +0530
Subject: [PATCH 0604/1154] pep8

---
 src/calibre/gui2/preferences/metadata_sources.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/preferences/metadata_sources.py b/src/calibre/gui2/preferences/metadata_sources.py
index c091203824..b71c7f957c 100644
--- a/src/calibre/gui2/preferences/metadata_sources.py
+++ b/src/calibre/gui2/preferences/metadata_sources.py
@@ -19,7 +19,7 @@ from calibre.customize.ui import (all_metadata_plugins, is_disabled,
         enable_plugin, disable_plugin, default_disabled_plugins)
 from calibre.gui2 import NONE, error_dialog, question_dialog
 
-class SourcesModel(QAbstractTableModel): # {{{
+class SourcesModel(QAbstractTableModel):  # {{{
 
     def __init__(self, parent=None):
         QAbstractTableModel.__init__(self, parent)
@@ -108,7 +108,6 @@ class SourcesModel(QAbstractTableModel): # {{{
             self.dataChanged.emit(index, index)
         return ret
 
-
     def flags(self, index):
         col = index.column()
         ans = QAbstractTableModel.flags(self, index)
@@ -145,8 +144,7 @@ class SourcesModel(QAbstractTableModel): # {{{
 
 # }}}
 
-class FieldsModel(QAbstractListModel): # {{{
-
+class FieldsModel(QAbstractListModel):  # {{{
 
     def __init__(self, parent=None):
         QAbstractTableModel.__init__(self, parent)
@@ -251,7 +249,7 @@ class FieldsModel(QAbstractListModel): # {{{
 
 # }}}
 
-class PluginConfig(QWidget): # {{{
+class PluginConfig(QWidget):  # {{{
 
     finished = pyqtSignal()
 

From d61e0b5be8f0762d49a1a1283ebb6aa051d60e50 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Aug 2013 10:30:05 +0530
Subject: [PATCH 0605/1154] pep8

---
 src/calibre/ebooks/metadata/sources/ozon.py | 53 ++++++++++-----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/ozon.py b/src/calibre/ebooks/metadata/sources/ozon.py
index 627c7830c1..c314a29936 100644
--- a/src/calibre/ebooks/metadata/sources/ozon.py
+++ b/src/calibre/ebooks/metadata/sources/ozon.py
@@ -36,7 +36,7 @@ class Ozon(Source):
              '(?:[0-9]+[- ]?){2}[0-9X]'
     isbnRegex = re.compile(isbnPattern)
 
-    def get_book_url(self, identifiers): # {{{
+    def get_book_url(self, identifiers):  # {{{
         import urllib2
         ozon_id = identifiers.get('ozon', None)
         res = None
@@ -46,7 +46,7 @@ class Ozon(Source):
         return res
     # }}}
 
-    def create_query(self, log, title=None, authors=None, identifiers={}): # {{{
+    def create_query(self, log, title=None, authors=None, identifiers={}):  # {{{
         from urllib import quote_plus
         # div_book -> search only books, ebooks and audio books
         search_url = self.ozon_url + '/webservice/webservice.asmx/SearchWebService?searchContext=div_book&searchText='
@@ -81,7 +81,7 @@ class Ozon(Source):
     # }}}
 
     def identify(self, log, result_queue, abort, title=None, authors=None,
-            identifiers={}, timeout=60): # {{{
+            identifiers={}, timeout=60):  # {{{
         from lxml import etree
         from calibre.ebooks.chardet import xml_to_unicode
 
@@ -113,7 +113,7 @@ class Ozon(Source):
 
     # }}}
 
-    def get_metadata(self, log, entries, title, authors, identifiers): # {{{
+    def get_metadata(self, log, entries, title, authors, identifiers):  # {{{
         # some book titles have extra characters like this
         # TODO: make a twick
         #reRemoveFromTitle = None
@@ -138,10 +138,11 @@ class Ozon(Source):
             for author in authors:
                 for miauthor in miauthors:
                     #log.debug(u'=> %s <> %s'%(author, miauthor))
-                    if author in miauthor: return True
+                    if author in miauthor:
+                        return True
             return None
 
-        def ensure_metadata_match(mi): # {{{
+        def ensure_metadata_match(mi):  # {{{
             match = True
             if title:
                 mititle = unicode(mi.title).upper() if mi.title else ''
@@ -171,7 +172,7 @@ class Ozon(Source):
         return metadata
     # }}}
 
-    def get_all_details(self, log, metadata, abort, result_queue, identifiers, timeout): # {{{
+    def get_all_details(self, log, metadata, abort, result_queue, identifiers, timeout):  # {{{
         req_isbn = identifiers.get('isbn', None)
 
         for mi in metadata:
@@ -202,7 +203,7 @@ class Ozon(Source):
                 log.exception(u'Failed to get details for metadata: %s'%mi.title)
     # }}}
 
-    def to_metadata(self, log, entry): # {{{
+    def to_metadata(self, log, entry):  # {{{
         xp_template = 'normalize-space(./*[local-name() = "{0}"]/text())'
 
         title = entry.xpath(xp_template.format('Name'))
@@ -237,7 +238,7 @@ class Ozon(Source):
         return mi
     # }}}
 
-    def get_cached_cover_url(self, identifiers): # {{{
+    def get_cached_cover_url(self, identifiers):  # {{{
         url = None
         ozon_id = identifiers.get('ozon', None)
         if ozon_id is None:
@@ -249,7 +250,7 @@ class Ozon(Source):
         return url
     # }}}
 
-    def download_cover(self, log, result_queue, abort, title=None, authors=None, identifiers={}, timeout=30, get_best_cover=False): # {{{
+    def download_cover(self, log, result_queue, abort, title=None, authors=None, identifiers={}, timeout=30, get_best_cover=False):  # {{{
         cached_url = self.get_cached_cover_url(identifiers)
         if cached_url is None:
             log.debug('No cached cover found, running identify')
@@ -286,7 +287,7 @@ class Ozon(Source):
             return as_unicode(e)
     # }}}
 
-    def get_book_details(self, log, metadata, timeout): # {{{
+    def get_book_details(self, log, metadata, timeout):  # {{{
         from lxml import html, etree
         from calibre.ebooks.chardet import xml_to_unicode
 
@@ -338,7 +339,7 @@ class Ozon(Source):
                     metadata.pubdate = toPubdate(log, matcher.group(0))
 
         # overwrite comments from HTML if any
-        xpt = u'//*[@id="detail_description"]//*[contains(text(), "От производителя")]/../node()[not(self::comment())][not(self::br)][preceding::*[contains(text(), "От производителя")]]'
+        xpt = u'//*[@id="detail_description"]//*[contains(text(), "От производителя")]/../node()[not(self::comment())][not(self::br)][preceding::*[contains(text(), "От производителя")]]'  # noqa
         from lxml.etree import ElementBase
         comment_elem = doc.xpath(xpt)
         if comment_elem:
@@ -356,11 +357,11 @@ class Ozon(Source):
             log.debug('No book description found in HTML')
     # }}}
 
-def _quoteString(strToQuote): # {{{
+def _quoteString(strToQuote):  # {{{
     return '"' + strToQuote + '"' if strToQuote and strToQuote.find(' ') != -1 else strToQuote
 # }}}
 
-def _verifyISBNIntegrity(log, isbn): # {{{
+def _verifyISBNIntegrity(log, isbn):  # {{{
     # Online ISBN-Check http://www.isbn-check.de/
     res = check_isbn(isbn)
     if not res:
@@ -369,7 +370,7 @@ def _verifyISBNIntegrity(log, isbn): # {{{
 # }}}
 
 # TODO: make customizable
-def _translateToBigCoverUrl(coverUrl): # {{{
+def _translateToBigCoverUrl(coverUrl):  # {{{
     # http://www.ozon.ru/multimedia/books_covers/small/1002986468.gif
     # http://www.ozon.ru/multimedia/books_covers/1002986468.jpg
 
@@ -379,7 +380,7 @@ def _translateToBigCoverUrl(coverUrl): # {{{
     return coverUrl
 # }}}
 
-def _get_affiliateId(): # {{{
+def _get_affiliateId():  # {{{
     import random
 
     aff_id = 'romuk'
@@ -391,7 +392,7 @@ def _get_affiliateId(): # {{{
 
 def _format_isbn(log, isbn):  # {{{
     # for now only RUS ISBN are supported
-    #http://ru.wikipedia.org/wiki/ISBN_российских_издательств
+    # http://ru.wikipedia.org/wiki/ISBN_российских_издательств
     isbn_pat = re.compile(r"""
         ^
         (\d{3})?            # match GS1 Prefix for ISBN13
@@ -416,7 +417,6 @@ def _format_isbn(log, isbn):  # {{{
         $
     """, re.VERBOSE)
 
-
     res = check_isbn(isbn)
     if res:
         m = isbn_pat.match(res)
@@ -427,9 +427,9 @@ def _format_isbn(log, isbn):  # {{{
     return res
 # }}}
 
-def _translageLanguageToCode(displayLang): # {{{
+def _translageLanguageToCode(displayLang):  # {{{
     displayLang = unicode(displayLang).strip() if displayLang else None
-    langTbl = {  None: 'ru',
+    langTbl = {None: 'ru',
                 u'Немецкий': 'de',
                 u'Английский': 'en',
                 u'Французский': 'fr',
@@ -444,7 +444,7 @@ def _translageLanguageToCode(displayLang): # {{{
 # }}}
 
 # [В.П. Колесников | Колесников В.П.]-> В. П. BКолесников
-def _normalizeAuthorNameWithInitials(name): # {{{
+def _normalizeAuthorNameWithInitials(name):  # {{{
     res = name
     if name:
         re1 = u'^(?P<lname>\S+)\s+(?P<fname>[^\d\W]\.)(?:\s*(?P<mname>[^\d\W]\.))?$'
@@ -459,7 +459,7 @@ def _normalizeAuthorNameWithInitials(name): # {{{
     return res
 # }}}
 
-def toPubdate(log, yearAsString): # {{{
+def toPubdate(log, yearAsString):  # {{{
     from calibre.utils.date import parse_only_date
     res = None
     if yearAsString:
@@ -470,17 +470,16 @@ def toPubdate(log, yearAsString): # {{{
     return res
 # }}}
 
-def _listToUnicodePrintStr(lst): # {{{
+def _listToUnicodePrintStr(lst):  # {{{
     return u'[' + u', '.join(unicode(x) for x in lst) + u']'
 # }}}
 
-if __name__ == '__main__': # tests {{{
+if __name__ == '__main__':  # tests {{{
     # To run these test use: calibre-debug -e src/calibre/ebooks/metadata/sources/ozon.py
     # comment some touched_fields before run thoses tests
     from calibre.ebooks.metadata.sources.test import (test_identify_plugin,
             title_test, authors_test, isbn_test)
 
-
     test_identify_plugin(Ozon.name,
         [
 #            (
@@ -490,7 +489,7 @@ if __name__ == '__main__': # tests {{{
 #                 authors_test([u'В. П. Колесников', u'Г. В. Шатков'])]
 #            ),
              (
-                {'identifiers':{'isbn': '9785916572629'} },
+                {'identifiers':{'isbn': '9785916572629'}},
                 [title_test(u'На все четыре стороны', exact=True),
                  authors_test([u'А. А. Гилл'])]
              ),
@@ -501,7 +500,7 @@ if __name__ == '__main__': # tests {{{
                  authors_test([u'Erich Maria Remarque'])]
              ),
              (
-                {'identifiers':{ }, 'title':u'Метро 2033',
+                {'identifiers':{}, 'title':u'Метро 2033',
                     'authors':[u'Дмитрий Глуховский']},
                 [title_test(u'Метро 2033', exact=False)]
              ),

From d844b5cb6a581b40bbe547e272317d5d48d46e02 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Aug 2013 10:31:42 +0530
Subject: [PATCH 0606/1154] Fix extra 'language' entry in metadata download
 config dialog

---
 src/calibre/ebooks/metadata/sources/ozon.py      | 2 +-
 src/calibre/gui2/preferences/metadata_sources.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/ozon.py b/src/calibre/ebooks/metadata/sources/ozon.py
index c314a29936..11f09e166a 100644
--- a/src/calibre/ebooks/metadata/sources/ozon.py
+++ b/src/calibre/ebooks/metadata/sources/ozon.py
@@ -20,7 +20,7 @@ class Ozon(Source):
     capabilities = frozenset(['identify', 'cover'])
 
     touched_fields = frozenset(['title', 'authors', 'identifier:isbn', 'identifier:ozon',
-                               'publisher', 'pubdate', 'comments', 'series', 'rating', 'language'])
+                               'publisher', 'pubdate', 'comments', 'series', 'rating', 'languages'])
     # Test purpose only, test function does not like when sometimes some filed are empty
     # touched_fields = frozenset(['title', 'authors', 'identifier:isbn', 'identifier:ozon',
     #                          'publisher', 'pubdate', 'comments'])
diff --git a/src/calibre/gui2/preferences/metadata_sources.py b/src/calibre/gui2/preferences/metadata_sources.py
index b71c7f957c..5c4a7decd0 100644
--- a/src/calibre/gui2/preferences/metadata_sources.py
+++ b/src/calibre/gui2/preferences/metadata_sources.py
@@ -162,7 +162,9 @@ class FieldsModel(QAbstractListModel):  # {{{
                 'languages': _('Languages'),
         }
         self.overrides = {}
-        self.exclude = frozenset(['series_index'])
+        self.exclude = frozenset([
+            'series_index', 'language'  # some plugins use language instead of languages
+        ])
 
     def rowCount(self, parent=None):
         return len(self.fields)

From 883f4cab8e195592869f0e06da6c94a3f03dfb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 21 Aug 2013 19:56:42 +0200
Subject: [PATCH 0607/1154] use ads4books in virtualo plugin

---
 .../gui2/store/stores/virtualo_plugin.py      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/store/stores/virtualo_plugin.py b/src/calibre/gui2/store/stores/virtualo_plugin.py
index 86824b5542..65dd45ca04 100644
--- a/src/calibre/gui2/store/stores/virtualo_plugin.py
+++ b/src/calibre/gui2/store/stores/virtualo_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2013, Tomasz Długosz <tomek3d@gmail.com>'
@@ -9,6 +9,7 @@ __docformat__ = 'restructuredtext en'
 
 import re
 import urllib
+from base64 import b64encode
 from contextlib import closing
 
 from lxml import html
@@ -25,12 +26,18 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog
 class VirtualoStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
-        pid = '12'
-        url = 'http://virtualo.pl/ebook/c2/?pr=' + pid
-        detail_url = detail_item + '&pr=' + pid if detail_item else url
+        aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/12/58/'
+
+        url = 'http://virtualo.pl/ebook/c2/'
+
+        aff_url = aff_root + str(b64encode(url))
+
+        detail_url = None
+        if detail_item:
+            detail_url = aff_root + str(b64encode(detail_item))
 
         if external or self.config.get('open_external', False):
-            open_url(QUrl(url_slash_cleaner(detail_url)))
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else aff_url)))
         else:
             d = WebStoreDialog(self.gui, url, parent, detail_item)
             d.setWindowTitle(self.name)
@@ -50,7 +57,7 @@ class VirtualoStore(BasicStoreConfig, StorePlugin):
                 if counter <= 0:
                     break
 
-                id = ''.join(data.xpath('.//div[@class="list_middle_left"]//a/@href'))
+                id = ''.join(data.xpath('.//div[@class="list_middle_left"]//a/@href')).split(r'?q=')[0]
                 if not id:
                     continue
 

From 6a9fe9043a4a3e3f0a634c9d056d265ee40403b8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Aug 2013 06:11:11 +0530
Subject: [PATCH 0608/1154] Plugin mirror: Parse plugins that import metadata

---
 setup/plugins_mirror.py | 48 ++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/setup/plugins_mirror.py b/setup/plugins_mirror.py
index 24bfae072a..bead10567c 100644
--- a/setup/plugins_mirror.py
+++ b/setup/plugins_mirror.py
@@ -105,9 +105,9 @@ def load_plugins_index():
     return json.loads(bz2.decompress(raw))
 
 # Get metadata from plugin zip file {{{
-def convert_node(fields, x, names={}):
+def convert_node(fields, x, names={}, import_data=None):
     name = x.__class__.__name__
-    conv = lambda x:convert_node(fields, x, names=names)
+    conv = lambda x:convert_node(fields, x, names=names, import_data=import_data)
     if name == 'Str':
         return x.s.decode('utf-8') if isinstance(x.s, bytes) else x.s
     elif name == 'Num':
@@ -124,13 +124,34 @@ def convert_node(fields, x, names={}):
         return tuple(map(conv, x.args))[0]
     elif name == 'Name':
         if x.id not in names:
+            if import_data is not None and x.id in import_data[0]:
+                return get_import_data(x.id, import_data[0][x.id], *import_data[1:])
             raise ValueError('Could not find name %s for fields: %s' % (x.id, fields))
         return names[x.id]
     raise TypeError('Unknown datatype %s for fields: %s' % (x, fields))
 
 Alias = namedtuple('Alias', 'name asname')
 
-def parse_metadata(raw):
+def get_import_data(name, mod, zf, names):
+    mod = mod.split('.')
+    if mod[0] == 'calibre_plugins':
+        mod = mod[2:]
+    mod = '/'.join(mod) + '.py'
+    if mod in names:
+        raw = zf.open(names[mod]).read()
+        module = ast.parse(raw, filename='__init__.py')
+        top_level_assigments = filter(lambda x:x.__class__.__name__ == 'Assign', ast.iter_child_nodes(module))
+        for node in top_level_assigments:
+            targets = {getattr(t, 'id', None) for t in node.targets}
+            targets.discard(None)
+            for x in targets:
+                if x == name:
+                    return convert_node({x}, node.value)
+        raise ValueError('Failed to find name: %r in module: %r' % (name, mod))
+    else:
+        raise ValueError('Failed to find module: %r' % mod)
+
+def parse_metadata(raw, namelist, zf):
     module = ast.parse(raw, filename='__init__.py')
     top_level_imports = filter(lambda x:x.__class__.__name__ == 'ImportFrom', ast.iter_child_nodes(module))
     top_level_classes = tuple(filter(lambda x:x.__class__.__name__ == 'ClassDef', ast.iter_child_nodes(module)))
@@ -138,6 +159,7 @@ def parse_metadata(raw):
     defaults = {'name':'', 'description':'', 'supported_platforms':['windows', 'osx', 'linux'],
                 'version':(1, 0, 0), 'author':'Unknown', 'minimum_calibre_version':(0, 9, 42)}
     field_names = set(defaults)
+    imported_names = {}
 
     plugin_import_found = set()
     all_imports = []
@@ -156,16 +178,19 @@ def parse_metadata(raw):
                 plugin_import_found |= inames
             else:
                 all_imports.append((mod, [n.name for n in names]))
+                imported_names[n.asname or n.name] = mod
     if not plugin_import_found:
         return all_imports
 
+    import_data = (imported_names, zf, namelist)
+
     names = {}
     for node in top_level_assigments:
         targets = {getattr(t, 'id', None) for t in node.targets}
         targets.discard(None)
         for x in targets - field_names:
             try:
-                val = convert_node({x}, node.value)
+                val = convert_node({x}, node.value, import_data=import_data)
             except Exception:
                 pass
             else:
@@ -179,7 +204,7 @@ def parse_metadata(raw):
             targets.discard(None)
             fields = field_names.intersection(targets)
             if fields:
-                val = convert_node(fields, node.value, names=names)
+                val = convert_node(fields, node.value, names=names, import_data=import_data)
                 for field in fields:
                     found[field] = val
         return found
@@ -218,7 +243,7 @@ def get_plugin_info(raw):
         if metadata is None:
             raise ValueError('No __init__.py found in plugin')
         raw = zf.open(metadata).read()
-        ans = parse_metadata(raw)
+        ans = parse_metadata(raw, names, zf)
         if isinstance(ans, dict):
             return ans
         # The plugin is importing its base class from somewhere else, le sigh
@@ -229,7 +254,7 @@ def get_plugin_info(raw):
             mod = '/'.join(mod) + '.py'
             if mod in names:
                 raw = zf.open(names[mod]).read()
-                ans = parse_metadata(raw)
+                ans = parse_metadata(raw, names, zf)
                 if isinstance(ans, dict):
                     return ans
 
@@ -512,10 +537,11 @@ class HelloWorld(FileTypePlugin):
         'supported_platforms':['windows', 'osx', 'linux'],
         'author':'Acme Inc.', 'version':{1:'a', 'b':2},
         'minimum_calibre_version':(0, 7, 53)}
-    assert parse_metadata(raw) == vals
+    assert parse_metadata(raw, None, None) == vals
     buf = io.BytesIO()
     with zipfile.ZipFile(buf, 'w') as zf:
-        zf.writestr('very/lovely.py', raw)
+        zf.writestr('very/lovely.py', raw.replace(b'MV = (0, 7, 53)', b'from very.ver import MV'))
+        zf.writestr('very/ver.py', b'MV = (0, 7, 53)')
         zf.writestr('__init__.py', b'from xxx import yyy\nfrom very.lovely import HelloWorld')
     assert get_plugin_info(buf.getvalue()) == vals
 
@@ -523,5 +549,7 @@ class HelloWorld(FileTypePlugin):
 
 if __name__ == '__main__':
     # test_parse_metadata()
-    main()
+    # import pprint
+    # pprint.pprint(get_plugin_info(open(sys.argv[-1], 'rb').read()))
 
+    main()

From 596f58bbcd4c530384ed5c61697a8f94476e77f3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Aug 2013 10:00:44 +0530
Subject: [PATCH 0609/1154] pep8

---
 src/calibre/ebooks/oeb/stylizer.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index d765b43c6a..f9618099a4 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -252,7 +252,8 @@ class Stylizer(object):
                     for rule in stylesheet.cssRules:
                         if rule.type == rule.IMPORT_RULE:
                             ihref = item.abshref(rule.href)
-                            if rule.media.mediaText == 'amzn-mobi': continue
+                            if rule.media.mediaText == 'amzn-mobi':
+                                continue
                             hrefs = self.oeb.manifest.hrefs
                             if ihref not in hrefs:
                                 self.logger.warn('Ignoring missing stylesheet in @import rule:', rule.href)
@@ -353,7 +354,7 @@ class Stylizer(object):
                                 x.insert(0, span)
                                 self.style(span)._update_cssdict(cssdict)
                                 break
-                else: # Element pseudo-class
+                else:  # Element pseudo-class
                     for elem in matches:
                         self.style(elem)._update_pseudo_class(fl, cssdict)
             else:
@@ -431,8 +432,10 @@ class Stylizer(object):
                 style[name] = prop.value
         if 'font-size' in style:
             size = style['font-size']
-            if size == 'normal': size = 'medium'
-            if size == 'smallest': size = 'xx-small'
+            if size == 'normal':
+                size = 'medium'
+            if size == 'smallest':
+                size = 'xx-small'
             if size in FONT_SIZE_NAMES:
                 style['font-size'] = "%dpt" % self.profile.fnames[size]
         return style
@@ -476,7 +479,8 @@ class Stylizer(object):
             for key in composition:
                 if cssprofiles.validate(key, value):
                     style[key] = value
-                    if not primitives: break
+                    if not primitives:
+                        break
                     value = primitives.pop()
             for key in composition:
                 if key not in style:
@@ -514,7 +518,8 @@ class Stylizer(object):
             for key in composition:
                 if cssprofiles.validate(key, value):
                     style[key] = value
-                    if not primitives: break
+                    if not primitives:
+                        break
                     value = primitives.pop()
             for key in composition:
                 if key not in style:
@@ -532,7 +537,8 @@ class Stylizer(object):
     def stylesheet(self, name, font_scale=None):
         rules = []
         for _, _, style, selector, href in self.rules:
-            if href != name: continue
+            if href != name:
+                continue
             if font_scale and 'font-size' in style and \
                     style['font-size'].endswith('pt'):
                 style = copy.copy(style)
@@ -684,13 +690,15 @@ class Style(object):
             elif value == 'smaller':
                 factor = 1.0/1.2
                 for _, _, size in self._profile.fsizes:
-                    if base <= size: break
+                    if base <= size:
+                        break
                     factor = None
                     result = size
             elif value == 'larger':
                 factor = 1.2
                 for _, _, size in reversed(self._profile.fsizes):
-                    if base >= size: break
+                    if base >= size:
+                        break
                     factor = None
                     result = size
             else:
@@ -839,8 +847,7 @@ class Style(object):
             self._get('padding-bottom'), base=self.height)
 
     def __str__(self):
-        items = self._style.items()
-        items.sort()
+        items = sorted(self._style.items())
         return '; '.join("%s: %s" % (key, val) for key, val in items)
 
     def cssdict(self):

From eb0eb79801f2779ae5effee0764f50804dfd4c50 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Aug 2013 22:10:42 +0530
Subject: [PATCH 0610/1154] Update Consumerist

---
 recipes/consumerist.recipe | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/recipes/consumerist.recipe b/recipes/consumerist.recipe
index 3d8056e49d..386f640529 100644
--- a/recipes/consumerist.recipe
+++ b/recipes/consumerist.recipe
@@ -17,14 +17,16 @@ class Consumerist(BasicNewsRecipe):
     no_stylesheets        = True
     encoding              = 'utf-8'
     use_embedded_content  = False
+    auto_cleanup = True
+    auto_cleanup_keep = '//div[@class="wp-caption alignleft"]'
     language              = 'en'
     masthead_url          = 'http://consumerist.com/css/images/footer_man.gif'
     extra_css             = '''
-	body{font-family: "Lucida Grande",Helvetica,Arial,sans-serif}
-	img{margin-bottom: 1em}
-	h1{font-family :Arial,Helvetica,sans-serif; font-size:x-large}
-	h2{font-family :Arial,Helvetica,sans-serif; font-size:large}
-	              '''
+    body{font-family: "Lucida Grande",Helvetica,Arial,sans-serif}
+    img{margin-bottom: 1em}
+    h1{font-family :Arial,Helvetica,sans-serif; font-size:x-large}
+    h2{font-family :Arial,Helvetica,sans-serif; font-size:large}
+                  '''
     conversion_options = {
                           'comment'   : description
                         , 'tags'      : category
@@ -32,22 +34,5 @@ class Consumerist(BasicNewsRecipe):
                         , 'language'  : language
                         }
 
-    remove_attributes  = ['width','height']
-    #keep_only_tags     = [dict(attrs={'class':['', 'category-breadcrumb']}),]
-    remove_tags_before = dict(name='h2')
-
-    remove_tags = [
-       #dict(name='iframe'),
-       dict(name='div', attrs={'class':['e-comments', 'more-about', 'entry-tags']}),
-       #dict(name='div', attrs={'id':['IEContainer', 'clickIncludeBox']}),
-       #dict(name='ul', attrs={'class':'article-tools'}),
-       #dict(name='ul', attrs={'class':'articleTools'}),
-    ]
-
-    remove_tags_after  = dict(attrs={'class':'e-body'})
-
     feeds = [(u'Articles', u'http://consumerist.com/index.xml')]
 
-    def preprocess_html(self, soup):
-        return self.adeify_images(soup)
-

From cf7412fc0a18d141be8541555337425e34a59adb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 08:59:07 +0530
Subject: [PATCH 0611/1154] version 1.0.0

---
 Changelog.yaml           | 50 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index d4f3b4cbb9..1599e0617f 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,56 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.0.0
+  date: 2013-08-23
+
+  new features:
+    - title: "A new 'cover grid' view of the books in your calibre library"
+      description: "Excellent for judging your books by their covers :) To use click the button with the icon of a grid in the bottom right corner of the main window. It can be configured via Preferences->Look & Feel->Cover Grid"
+      type: major
+
+    - title: "A new, faster database backend"
+      description: "The database backend in calibre has been re-written from scratch. The new code is smaller, more robust and much faster than the old code. The exact speedup will depend on the number of books and number and type of custom columns in your library. Users have reported calibre startup times decreasing by a factor of 2-3 times."
+      type: major
+
+    - title: "For a summary of the major changes in calibre between 0.9 and 1.0, see http://calibre-ebook.com/new-in/ten"
+      type: major
+
+    - title: "RTF Input: Add option to ignore WMF images iinstead of replacing them with a placeholder."
+      tickets: [1213599]
+
+    - title: "Content server: Make virtual libraries available as searches from the start page. They work just like saved searches, clicking on a virtual library will show you all the books in that virtual library."
+ 
+  bug fixes:
+    - title: "Remove extra, useless 'language' entry in metadata download configuration dialog"
+
+    - title: "Kobo driver: Display device collections even if the driver is configured to not manage shelves on the device."
+      tickets: [1214233]
+
+    - title: "Fix typo in calibre.desktop file on linux"
+      tickets: [1213664]
+
+    - title: "Edit metadata dialog: Disable OK button while results are being downloaded."
+      tickets: [1213397]
+
+    - title: "In OS X 10.8 Apple stopped redirecting stdout/stderr to Console.app for applications launched by launch services. Re-enable the redirection, useful for debugging."
+
+    - title: "Fix virtual library tabs not being updated when using VL button"
+
+  improved recipes:
+    - Consumerist
+    - jeuxvideo
+    - Metro UK
+    - El Tribuno
+    - High Country News
+    - Daily Express
+    - Providence Journal
+    - mediapart
+
+  new recipes:
+    - title: News24 and Nuus24
+      author: Nicki de Wet
+     
 - version: 0.9.44
   date: 2013-08-16
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 9fe774f648..06e780b713 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 44)
+numeric_version = (1, 0, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 5f3267d3ebc7cddf9bcd84d36eda2fcce7715343 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 12:19:33 +0530
Subject: [PATCH 0612/1154] Update Consumerist again

---
 recipes/consumerist.recipe | 40 +++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/recipes/consumerist.recipe b/recipes/consumerist.recipe
index 386f640529..2050185180 100644
--- a/recipes/consumerist.recipe
+++ b/recipes/consumerist.recipe
@@ -1,3 +1,5 @@
+## Last Edit:  2013-08-23
+## From:  Armin Geller
 __license__   = 'GPL v3'
 __copyright__ = '2010, NA'
 '''
@@ -17,22 +19,34 @@ class Consumerist(BasicNewsRecipe):
     no_stylesheets        = True
     encoding              = 'utf-8'
     use_embedded_content  = False
-    auto_cleanup = True
-    auto_cleanup_keep = '//div[@class="wp-caption alignleft"]'
     language              = 'en'
-    masthead_url          = 'http://consumerist.com/css/images/footer_man.gif'
+    masthead_url          = 'http://consumermediallc.files.wordpress.com/2013/02/consumerist.png'# AGe 2013-08-23
+    
     extra_css             = '''
-    body{font-family: "Lucida Grande",Helvetica,Arial,sans-serif}
-    img{margin-bottom: 1em}
-    h1{font-family :Arial,Helvetica,sans-serif; font-size:x-large}
-    h2{font-family :Arial,Helvetica,sans-serif; font-size:large}
-                  '''
+                              body{font-family: "Lucida Grande",Helvetica,Arial,sans-serif}
+                              img{margin-bottom: 1em}
+                              h1{font-family :Arial,Helvetica,sans-serif; font-size:x-large}
+                              h2{font-family :Arial,Helvetica,sans-serif; font-size:large}
+                            '''
     conversion_options = {
-                          'comment'   : description
-                        , 'tags'      : category
-                        , 'publisher' : publisher
-                        , 'language'  : language
-                        }
+                          'comment'   : description,
+                          'tags'      : category,
+                          'publisher' : publisher,
+                          'language'  : language,
+                          }
+
+    remove_attributes  = ['width','height']
+
+    keep_only_tags     = dict(name='div', attrs={'class':['hfeed',]}) # AGe 2013-08-23
+
+    remove_tags        = [dict(name='div', attrs={'class':['navigation', # AGe 2013-08-23
+                                         'wpcom-related-posts widget widget_related_posts', # AGe 2013-08-23
+                                         'sharedaddy sd-like-enabled sd-sharing-enabled',]}), # AGe 2013-08-23
+                          dict(name='div', attrs={'id':['comments',]}), # AGe 2013-08-23
+                          ]
 
     feeds = [(u'Articles', u'http://consumerist.com/index.xml')]
 
+    def preprocess_html(self, soup):
+        return self.adeify_images(soup)
+

From 26b5f6a18948938bc5773dc2d7d8c62634c355e6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 13:29:18 +0530
Subject: [PATCH 0613/1154] Add a button to restore default cover grid
 background

---
 src/calibre/gui2/preferences/look_feel.py | 5 +++++
 src/calibre/gui2/preferences/look_feel.ui | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 369ae59375..4fc32b0e77 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -210,6 +210,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.fs_help_msg.setText(unicode(self.fs_help_msg.text())%(
             _(' or ').join(keys)))
         self.cover_grid_color_button.clicked.connect(self.change_cover_grid_color)
+        self.cover_grid_default_color_button.clicked.connect(self.restore_cover_grid_color)
         self.size_calculated.connect(self.update_cg_cache_size, type=Qt.QueuedConnection)
         self.tabWidget.currentChanged.connect(self.tab_changed)
         self.cover_grid_empty_cache.clicked.connect(self.empty_cache)
@@ -320,6 +321,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             self.set_cg_color(col)
             self.changed_signal.emit()
 
+    def restore_cover_grid_color(self):
+        self.set_cg_color(gprefs.defaults['cover_grid_color'])
+        self.changed_signal.emit()
+
     def build_font_obj(self):
         font_info = self.current_font
         if font_info is not None:
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 519e8dfc0f..774c017698 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -346,6 +346,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="cover_grid_default_color_button">
+           <property name="text">
+            <string>Restore &amp;default color</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">

From cf699a8f2bb34efa9d54ca10f93fbde2050045a7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 13:35:30 +0530
Subject: [PATCH 0614/1154] Move the cover grid button to the center

---
 src/calibre/gui2/init.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index a37c693eb6..da89d7b764 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -387,7 +387,7 @@ class LayoutMixin(object):  # {{{
             self.bd_splitter.addWidget(self.book_details)
             self.bd_splitter.setCollapsible(self.bd_splitter.other_index, False)
             self.centralwidget.layout().addWidget(self.bd_splitter)
-            button_order = ('tb', 'bd', 'cb', 'gv')
+            button_order = ('tb', 'bd', 'gv', 'cb')
         # }}}
         else:  # wide {{{
             self.bd_splitter = Splitter('book_details_splitter',
@@ -402,7 +402,7 @@ class LayoutMixin(object):  # {{{
             self.bd_splitter.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,
                 QSizePolicy.Expanding))
             self.centralwidget.layout().addWidget(self.bd_splitter)
-            button_order = ('tb', 'cb', 'bd', 'gv')
+            button_order = ('tb', 'cb', 'gv', 'bd')
         # }}}
 
         self.status_bar = StatusBar(self)

From c6948e9abd89b845dd094c0e313960fa1b4ec626 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 23 Aug 2013 10:56:25 +0200
Subject: [PATCH 0615/1154] Fix the virtual_libraries lazy getter.

---
 src/calibre/db/cache.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 07b191d4f6..4da51e9b2e 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1685,10 +1685,10 @@ class Cache(object):
 
     @read_api
     def virtual_libraries_for_books(self, book_ids):
-        libraries = tuple(self._pref('virtual_libraries', {}).iterkeys())
+        libraries = self._pref('virtual_libraries', {})
         ans = {book_id:[] for book_id in book_ids}
-        for lib in libraries:
-            books = self._search(lib)  # We deliberately dont use book_ids as we want to use the search cache
+        for lib,expr in libraries.iteritems():
+            books = self._search(expr)  # We deliberately dont use book_ids as we want to use the search cache
             for book in book_ids:
                 if book in books:
                     ans[book].append(lib)

From aa58f3a559349e9e80ae25e79396b1889e65eeff Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 17:06:52 +0530
Subject: [PATCH 0616/1154] newdb: Fix sorting of is_multiple fields

Fix sorting of book list by multi-valued fields like tags not correct in
the new backend. Fixes #1215820 [different ordering by tags in the 1.0 version](https://bugs.launchpad.net/calibre/+bug/1215820)
---
 src/calibre/db/fields.py           | 12 ++++++++----
 src/calibre/db/tests/reading.py    | 19 +++++++++++++++++++
 src/calibre/gui2/library/models.py |  2 +-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index e47e366c9b..35ed4a25ef 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -13,7 +13,7 @@ from collections import defaultdict, Counter
 
 from calibre.db.tables import ONE_ONE, MANY_ONE, MANY_MANY, null
 from calibre.db.write import Writer
-from calibre.ebooks.metadata import title_sort
+from calibre.ebooks.metadata import title_sort, author_to_author_sort
 from calibre.utils.config_base import tweaks
 from calibre.utils.icu import sort_key
 from calibre.utils.date import UNDEFINED_DATE
@@ -48,6 +48,10 @@ class Field(object):
             self._sort_key = lambda x:sort_key(calibre_langcode_to_name(x))
         self.is_multiple = (bool(self.metadata['is_multiple']) or self.name ==
                 'formats')
+        self.sort_sort_key = True
+        if self.is_multiple and '&' in self.metadata['is_multiple']['list_to_ui']:
+            self._sort_key = lambda x: sort_key(author_to_author_sort(x))
+            self.sort_sort_key = False
         self.default_value = {} if name == 'identifiers' else () if self.is_multiple else None
         self.category_formatter = type(u'')
         if dt == 'rating':
@@ -378,9 +382,9 @@ class ManyToManyField(Field):
         all_cids = set()
         for cids in ans.itervalues():
             all_cids = all_cids.union(set(cids))
-        sk_map = {cid: self._sort_key(self.table.id_map[cid])
-                for cid in all_cids}
-        return {id_: (tuple(sk_map[cid] for cid in cids) if cids else
+        sk_map = {cid: self._sort_key(self.table.id_map[cid]) for cid in all_cids}
+        sort_func = (lambda x:tuple(sorted(x))) if self.sort_sort_key else tuple
+        return {id_: (sort_func(sk_map[cid] for cid in cids) if cids else
                         (self._default_sort_key,))
                 for id_, cids in ans.iteritems()}
 
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index c9d29475f6..5f752dbfa2 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -161,6 +161,25 @@ class ReadingTest(BaseTest):
         # Test subsorting
         self.assertEqual([3, 2, 1], cache.multisort([('identifiers', True),
             ('title', True)]), 'Subsort failed')
+
+        # Test sorting of is_multiple fields.
+
+        # Author like fields should be sorted by generating sort names from the
+        # actual values in entry order
+        for field in ('authors', '#authors'):
+            self.assertEqual(
+                cache.set_field(field, {1:('aa bb', 'bb cc', 'cc dd'), 2:('bb aa', 'xx yy'), 3: ('aa bb', 'bb aa')}), {1, 2, 3})
+            self.assertEqual([2, 3, 1], cache.multisort([(field, True)], ids_to_sort=(1, 2, 3)))
+            self.assertEqual([1, 3, 2], cache.multisort([(field, False)], ids_to_sort=(1, 2, 3)))
+
+        # All other is_multiple fields should be sorted by sorting the values
+        # for each book and using that as the sort key
+        for field in ('tags', '#tags'):
+            self.assertEqual(
+                cache.set_field(field, {1:('b', 'a'), 2:('c', 'y'), 3: ('b', 'z')}), {1, 2, 3})
+            self.assertEqual([1, 3, 2], cache.multisort([(field, True)], ids_to_sort=(1, 2, 3)))
+            self.assertEqual([2, 3, 1], cache.multisort([(field, False)], ids_to_sort=(1, 2, 3)))
+
     # }}}
 
     def test_get_metadata(self):  # {{{
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index ddd67f9ab7..181f145cbe 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -685,7 +685,7 @@ class BooksModel(QAbstractTableModel):  # {{{
             elif dt in {'text', 'comments', 'composite', 'enumeration'}:
                 if m['is_multiple'] and not field_obj.is_composite:
                     jv = m['is_multiple']['list_to_ui']
-                    do_sort = field == 'tags'
+                    do_sort = '&' not in jv
                     if do_sort:
                         def func(idx):
                             return QVariant(jv.join(sorted(fffunc(field_obj, idfunc(idx), default_value=()), key=sort_key)))

From da8910bd90c8ecfb6eb128a6f253848a7e5cf256 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 17:45:35 +0530
Subject: [PATCH 0617/1154] pep8

---
 src/calibre/library/server/base.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/calibre/library/server/base.py b/src/calibre/library/server/base.py
index f8608bd2d0..f2598aa3d9 100644
--- a/src/calibre/library/server/base.py
+++ b/src/calibre/library/server/base.py
@@ -28,7 +28,7 @@ from calibre.library.server.ajax import AjaxServer
 from calibre import prints, as_unicode
 
 
-class DispatchController(object): # {{{
+class DispatchController(object):  # {{{
 
     def __init__(self, prefix, wsgi=False, auth_controller=None):
         self.dispatcher = cherrypy.dispatch.RoutesDispatcher()
@@ -71,7 +71,7 @@ class DispatchController(object): # {{{
 
 # }}}
 
-class BonJour(SimplePlugin): # {{{
+class BonJour(SimplePlugin):  # {{{
 
     def __init__(self, engine, port=8080, prefix=''):
         SimplePlugin.__init__(self, engine)
@@ -88,7 +88,6 @@ class BonJour(SimplePlugin): # {{{
                 {'path':self.prefix+'/opds'}),
         ]
 
-
     def start(self):
         zeroconf_ip_address = verify_ipV4_address(self.ip_address)
         try:
@@ -110,7 +109,6 @@ class BonJour(SimplePlugin): # {{{
             cherrypy.log.error('Failed to stop BonJour:')
             cherrypy.log.error(traceback.format_exc())
 
-
     stop.priority = 10
 
 cherrypy.engine.bonjour = BonJour(cherrypy.engine)
@@ -161,9 +159,9 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
             'request.show_tracebacks': show_tracebacks,
             'server.socket_host'     : listen_on,
             'server.socket_port'     : opts.port,
-            'server.socket_timeout'  : opts.timeout, #seconds
-            'server.thread_pool'     : opts.thread_pool, # number of threads
-            'server.shutdown_timeout': st, # minutes
+            'server.socket_timeout'  : opts.timeout,  # seconds
+            'server.thread_pool'     : opts.thread_pool,  # number of threads
+            'server.shutdown_timeout': st,  # minutes
         })
         if embedded or wsgi:
             cherrypy.config.update({'engine.SIGHUP'          : None,
@@ -173,9 +171,9 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
         self.exception = None
         auth_controller = None
         self.users_dict = {}
-        #self.config['/'] = {
+        # self.config['/'] = {
         #    'tools.sessions.on' : True,
-        #    'tools.sessions.timeout': 60, # Session times out after 60 minutes
+        # 'tools.sessions.timeout': 60, # Session times out after 60 minutes
         #}
 
         if not wsgi:

From 9614b2613729f51231bf9e2f504adda58637d328 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 17:46:52 +0530
Subject: [PATCH 0618/1154] Content server: Fix blank username causing error on
 startup

Fixes #1215893 [attempted to start server and recieved an error](https://bugs.launchpad.net/calibre/+bug/1215893)
---
 src/calibre/library/server/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/base.py b/src/calibre/library/server/base.py
index f2598aa3d9..0fc301662f 100644
--- a/src/calibre/library/server/base.py
+++ b/src/calibre/library/server/base.py
@@ -185,7 +185,7 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
                     'text/xml', 'text/javascript', 'text/css'],
             }
 
-            if opts.password:
+            if opts.username and opts.password:
                 self.users_dict[opts.username.strip()] = opts.password.strip()
                 auth_controller = AuthController('Your calibre library',
                         self.users_dict)

From 867a51daf2f3ab3b2c23168cfa9707976d2dfa2e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 18:10:49 +0530
Subject: [PATCH 0619/1154] newdb: Fix dump and restore on non-ascii locales
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix a bug in the new backend that broke the Check Library function on computers
with non-English locales. Fixes #1215819 [version 1.0 vérification de la bibliothèque](https://bugs.launchpad.net/calibre/+bug/1215819)

Upstream bug: https://code.google.com/p/apsw/issues/detail?id=142
---
 src/apsw_shell.py               | 2928 +++++++++++++++++++++++++++++++
 src/calibre/db/backend.py       |    3 +-
 src/calibre/db/tests/writing.py |   10 +
 3 files changed, 2940 insertions(+), 1 deletion(-)
 create mode 100644 src/apsw_shell.py

diff --git a/src/apsw_shell.py b/src/apsw_shell.py
new file mode 100644
index 0000000000..61f78c45e6
--- /dev/null
+++ b/src/apsw_shell.py
@@ -0,0 +1,2928 @@
+#!/usr/bin/env python
+# This is a patched version of sheel.py to fix
+# https://code.google.com/p/apsw/issues/detail?id=142
+
+import sys
+import apsw
+import shlex
+import os
+import csv
+import re
+import textwrap
+import time
+import codecs
+import base64
+
+if sys.platform=="win32":
+    _win_colour=False
+    try:
+        import colorama
+        colorama.init()
+        del colorama
+        _win_colour=True
+    except: # there are several failure reasons, ignore them all
+        pass
+
+
+class Shell(object):
+    """Implements a SQLite shell
+
+    :param stdin: Where to read input from (default sys.stdin)
+    :param stdout: Where to send output (default sys.stdout)
+    :param stderr: Where to send errors (default sys.stderr)
+    :param encoding: Default encoding for files opened/created by the
+      Shell.  If you want stdin/out/err to use a particular encoding
+      then you need to provide them `already configured <http://docs.python.org/library/codecs.html#codecs.open>`__ that way.
+    :param args: This should be program arguments only (ie if
+      passing in sys.argv do not include sys.argv[0] which is the
+      program name.  You can also pass in None and then call
+      :meth:`process_args` if you want to catch any errors
+      in handling the arguments yourself.
+    :param db: A existing :class:`Connection` you wish to use
+
+    The commands and behaviour are modelled after the `interactive
+    shell <https://sqlite.org/sqlite.html>`__ that is part of
+    SQLite.
+
+    You can inherit from this class to embed in your own code and user
+    interface.  Internally everything is handled as unicode.
+    Conversions only happen at the point of input or output which you
+    can override in your own code.
+
+    This implementation fixes a number of bugs/quirks present in the
+    sqlite shell.  Its control-C handling is also friendlier.  Some
+    examples of issues not present in this implementation:
+
+    * https://sqlite.org/src/info/c25aab7e7e
+    * https://sqlite.org/src/info/7b61b6c6ce
+    * https://sqlite.org/src/info/ee19e690ec
+    * https://sqlite.org/src/info/2466653295
+
+    Errors and diagnostics are only ever sent to error output
+    (self.stderr) and never to the regular output (self.stdout).  This
+    means using shell output is always easy and consistent.
+
+    Shell commands begin with a dot (eg .help).  They are implemented
+    as a method named after the command (eg command_help).  The method
+    is passed one parameter which is the list of arguments to the
+    command.
+
+    Output modes are implemented by functions named after the mode (eg
+    output_column).
+
+    When you request help the help information is automatically
+    generated from the docstrings for the command and output
+    functions.
+
+    You should not use a Shell object concurrently from multiple
+    threads.  It is one huge set of state information which would
+    become inconsistent if used simultaneously, and then give baffling
+    errors.  It is safe to call methods one at a time from different
+    threads.  ie it doesn't care what thread calls methods as long as
+    you don't call more than one concurrently.
+    """
+
+    class Error(Exception):
+        """Class raised on errors.  The expectation is that the error
+        will be displayed by the shell as text so there are no
+        specific subclasses as the distinctions between different
+        types of errors doesn't matter."""
+        pass
+
+    def __init__(self, stdin=None, stdout=None, stderr=None, encoding="utf8", args=None, db=None):
+        """Create instance, set defaults and do argument processing."""
+        super(Shell, self).__init__()
+        # The parameter doc has to be in main class doc as sphinx
+        # ignores any described here
+        self.exceptions=False
+        self.history_file="~/.sqlite_history"
+        self._db=None
+        self.dbfilename=None
+        if db:
+            self.db=db, db.filename
+        else:
+            self.db=None, None
+        self.prompt=    "sqlite> "
+        self.moreprompt="    ..> "
+        self.separator="|"
+        self.bail=False
+        self.echo=False
+        self.timer=False
+        self.header=False
+        self.nullvalue=""
+        self.output=self.output_list
+        self._output_table=self._fmt_sql_identifier("table")
+        self.widths=[]
+        # do we truncate output in list mode?  (explain doesn't, regular does)
+        self.truncate=True
+        # a stack of previous outputs. turning on explain saves previous, off restores
+        self._output_stack=[]
+
+        # other stuff
+        self.set_encoding(encoding)
+        if stdin is None: stdin=sys.stdin
+        if stdout is None: stdout=sys.stdout
+        if stderr is None: stderr=sys.stderr
+        self.stdin=stdin
+        self.stdout=stdout
+        self._original_stdout=stdout
+        self.stderr=stderr
+        # we don't become interactive until the command line args are
+        # successfully parsed and acted upon
+        self.interactive=None
+        # current colouring object
+        self.command_colour() # set to default
+        self._using_readline=False
+        self._input_stack=[]
+        self.input_line_number=0
+        self.push_input()
+        self.push_output()
+        self._input_descriptions=[]
+
+        if args:
+            try:
+                self.process_args(args)
+            except:
+                if len(self._input_descriptions):
+                    self._input_descriptions.append("Processing command line arguments")
+                self.handle_exception()
+                raise
+
+        if self.interactive is None:
+            self.interactive=getattr(self.stdin, "isatty", False) and self.stdin.isatty() and getattr(self.stdout, "isatty", False) and self.stdout.isatty()
+
+    def _ensure_db(self):
+        "The database isn't opened until first use.  This function ensures it is now open."
+        if not self._db:
+            if not self.dbfilename:
+                self.dbfilename=":memory:"
+            self._db=apsw.Connection(self.dbfilename, flags=apsw.SQLITE_OPEN_URI | apsw.SQLITE_OPEN_READWRITE | apsw.SQLITE_OPEN_CREATE)
+        return self._db
+
+    def _set_db(self, newv):
+        "Sets the open database (or None) and filename"
+        (db, dbfilename)=newv
+        if self._db:
+            self._db.close()
+            self._db=None
+        self._db=db
+        self.dbfilename=dbfilename
+
+    db=property(_ensure_db, _set_db, None, "The current :class:`Connection`")
+
+    def process_args(self, args):
+        """Process command line options specified in args.  It is safe to
+        call this multiple times.  We try to be compatible with SQLite shell
+        argument parsing.
+
+        :param args: A list of string options.  Do not include the
+           program as args[0]
+
+        :returns: A tuple of (databasefilename, initfiles,
+           sqlncommands).  This is provided for informational purposes
+           only - they have already been acted upon.  An example use
+           is that the SQLite shell does not enter the main interactive
+           loop if any sql/commands were provided.
+
+        The first non-option is the database file name.  Each
+        remaining non-option is treated as a complete input (ie it
+        isn't joined with others looking for a trailing semi-colon).
+
+        The SQLite shell uses single dash in front of options.  We
+        allow both single and double dashes.  When an unrecognized
+        argument is encountered then
+        :meth:`process_unknown_args` is called.
+        """
+        # we don't use optparse as we need to use single dashes for
+        # options - all hand parsed
+        if not args:
+            return None, [], []
+
+        # are options still valid?
+        options=True
+        # have we seen the database name?
+        havedbname=False
+        # List of init files to read
+        inits=[]
+        # List of sql/dot commands
+        sqls=[]
+
+        while args:
+            if not options or not args[0].startswith("-"):
+                options=False
+                if not havedbname:
+                    # grab new database
+                    self.db=None, args[0]
+                    havedbname=True
+                else:
+                    sqls.append(args[0])
+                args=args[1:]
+                continue
+
+            # remove initial single or double dash
+            args[0]=args[0][1:]
+            if args[0].startswith("-"):
+                args[0]=args[0][1:]
+
+            if args[0]=="init":
+                if len(args)<2:
+                    raise self.Error("You need to specify a filename after -init")
+                inits.append(args[1])
+                args=args[2:]
+                continue
+
+            if args[0]=="header" or args[0]=="noheader":
+                self.header=args[0]=="header"
+                args=args[1:]
+                continue
+
+            if args[0] in ("echo", "bail", "interactive"):
+                setattr(self, args[0], True)
+                args=args[1:]
+                continue
+
+            if args[0]=="batch":
+                self.interactive=False
+                args=args[1:]
+                continue
+
+            if args[0] in ("separator", "nullvalue", "encoding"):
+                if len(args)<2:
+                    raise self.Error("You need to specify a value after -"+args[0])
+                getattr(self, "command_"+args[0])([args[1]])
+                args=args[2:]
+                continue
+
+            if args[0]=="version":
+                self.write(self.stdout, apsw.sqlitelibversion()+"\n")
+                # A pretty gnarly thing to do
+                sys.exit(0)
+
+            if args[0]=="help":
+                self.write(self.stderr, self.usage())
+                sys.exit(0)
+
+            if args[0] in ("no-colour", "no-color", "nocolour", "nocolor"):
+                self.colour_scheme="off"
+                self._out_colour()
+                args=args[1:]
+                continue
+
+            # only remaining known args are output modes
+            if getattr(self, "output_"+args[0], None):
+                self.command_mode(args[:1])
+                args=args[1:]
+                continue
+
+            newargs=self.process_unknown_args(args)
+            if newargs is None:
+                raise self.Error("Unrecognized argument '"+args[0]+"'")
+            args=newargs
+
+        for f in inits:
+            self.command_read([f])
+
+        for s in sqls:
+            self.process_complete_line(s)
+
+        return self.dbfilename, inits, sqls
+
+    def process_unknown_args(self, args):
+        """This is called when :meth:`process_args` encounters an
+        argument it doesn't understand.  Override this method if you
+        want to be able to understand additional command line arguments.
+
+        :param args: A list of the remaining arguments.  The initial one will
+           have had the leading dashes removed (eg if it was --foo on the command
+           line then args[0] will be "foo"
+        :returns: None if you don't recognize the argument either.  Otherwise
+           return the list of remaining arguments after you have processed
+           yours.
+        """
+        return None
+
+    def usage(self):
+        "Returns the usage message.  Make sure it is newline terminated"
+
+        msg="""
+Usage: program [OPTIONS] FILENAME [SQL|CMD] [SQL|CMD]...
+FILENAME is the name of a SQLite database. A new database is
+created if the file does not exist.
+OPTIONS include:
+   -init filename       read/process named file
+   -echo                print commands before execution
+   -[no]header          turn headers on or off
+   -bail                stop after hitting an error
+   -interactive         force interactive I/O
+   -batch               force batch I/O
+   -column              set output mode to 'column'
+   -csv                 set output mode to 'csv'
+   -html                set output mode to 'html'
+   -line                set output mode to 'line'
+   -list                set output mode to 'list'
+   -python              set output mode to 'python'
+   -separator 'x'       set output field separator (|)
+   -nullvalue 'text'    set text string for NULL values
+   -version             show SQLite version
+   -encoding 'name'     the encoding to use for files
+                        opened via .import, .read & .output
+   -nocolour            disables colour output to screen
+"""
+        return msg.lstrip()
+
+    ###
+    ### Value formatting routines.  They take a value and return a
+    ### text formatting of them.  Mostly used by the various output's
+    ### but also by random other pieces of code.
+    ###
+
+    _binary_type = eval(("buffer", "bytes") [sys.version_info>=(3,0)])
+    _basestring = eval(("basestring", "str") [sys.version_info>=(3,0)])
+
+    # bytes that are ok in C strings - no need for quoting
+    _printable=[ord(x) for x in
+                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~!@#$%^&*()`_-+={}[]:;,.<>/?|"
+                ]
+
+    def _fmt_c_string(self, v):
+        "Format as a C string including surrounding double quotes"
+        if isinstance(v, self._basestring):
+            op=['"']
+            for c in v:
+                if c=="\\":
+                    op.append("\\\\")
+                elif c=="\r":
+                    op.append("\\r")
+                elif c=="\n":
+                    op.append("\\n")
+                elif c=="\t":
+                    op.append("\\t")
+                elif ord(c) not in self._printable:
+                    op.append("\\"+c)
+                else:
+                    op.append(c)
+            op.append('"')
+            return "".join(op)
+        elif v is None:
+            return '"'+self.nullvalue+'"'
+        elif isinstance(v, self._binary_type):
+            if sys.version_info<(3,0):
+                o=lambda x: ord(x)
+                fromc=lambda x: x
+            else:
+                o=lambda x: x
+                fromc=lambda x: chr(x)
+            res=['"']
+            for c in v:
+                if o(c) in self._printable:
+                    res.append(fromc(c))
+                else:
+                    res.append("\\x%02X" % (o(c),))
+            res.append('"')
+            return "".join(res)
+        else:
+            # number of some kind
+            return '"%s"' % (v,)
+
+    def _fmt_html_col(self, v):
+        "Format as HTML (mainly escaping &/</>"
+        return self._fmt_text_col(v).\
+           replace("&", "&amp;"). \
+           replace(">", "&gt;"). \
+           replace("<", "&lt;"). \
+           replace("'", "&apos;"). \
+           replace('"', "&quot;")
+
+    def _fmt_json_value(self, v):
+        "Format a value."
+        if isinstance(v, self._basestring):
+            # we assume utf8 so only some characters need to be escaed
+            op=['"']
+            for c in v:
+                if c=="\\":
+                    op.append("\\\\")
+                elif c=="\r":
+                    op.append("\\r")
+                elif c=="\n":
+                    op.append("\\n")
+                elif c=="\t":
+                    op.append("\\t")
+                elif c=="/": # yes you have to escape forward slash for some reason
+                    op.append("\\/")
+                elif c=='"':
+                    op.append("\\"+c)
+                elif c=="\\b":
+                    op.append("\\b")
+                elif c=="\\f":
+                    op.append("\\f")
+                else:
+                    # It isn't clear when \u sequences *must* be used.
+                    # Assuming not needed due to utf8 output which
+                    # corresponds to what rfc4627 implies.
+                    op.append(c)
+            op.append('"')
+            return "".join(op)
+        elif v is None:
+            return 'null'
+        elif isinstance(v, self._binary_type):
+            if sys.version_info<(3,0):
+                o=base64.encodestring(v)
+            else:
+                o=base64.encodebytes(v).decode("ascii")
+            if o[-1]=="\n":
+                o=o[:-1]
+            return '"'+o+'"'
+        else:
+            # number of some kind
+            return '%s' % (v,)
+
+
+    def _fmt_python(self, v):
+        "Format as python literal"
+        if v is None:
+            return "None"
+        elif isinstance(v, self._basestring):
+            return repr(v)
+        elif isinstance(v, self._binary_type):
+            if sys.version_info<(3,0):
+                res=["buffer(\""]
+                for i in v:
+                    if ord(i) in self._printable:
+                        res.append(i)
+                    else:
+                        res.append("\\x%02X" % (ord(i),))
+                res.append("\")")
+                return "".join(res)
+            else:
+                res=['b"']
+                for i in v:
+                    if i in self._printable:
+                        res.append(chr(i))
+                    else:
+                        res.append("\\x%02X" % (i,))
+                res.append('"')
+                return "".join(res)
+        else:
+            return "%s" % (v,)
+
+    def _fmt_sql_identifier(self, v):
+        "Return the identifier quoted in SQL syntax if needed (eg table and column names)"
+        if not len(v): # yes sqlite does allow zero length identifiers
+            return '""'
+        nonalnum=re.sub("[A-Za-z_0-9]+", "", v)
+        if len(nonalnum)==0:
+            if v.upper() not in self._sqlite_reserved:
+                # Ok providing it doesn't start with a digit
+                if v[0] not in "0123456789":
+                    return v
+        # double quote it unless there are any double quotes in it
+        if '"' in nonalnum:
+            return "[%s]" % (v,)
+        return '"%s"' % (v,)
+
+    def _fmt_text_col(self, v):
+        "Regular text formatting"
+        if v is None:
+            return self.nullvalue
+        elif isinstance(v, self._basestring):
+            return v
+        elif isinstance(v, self._binary_type):
+            # sqlite gives back raw bytes!
+            return "<Binary data>"
+        else:
+            return "%s" % (v,)
+
+    ###
+    ### The various output routines.  They are always called with the
+    ### header irrespective of the setting allowing for some per query
+    ### setup. (see output_column for example).  The doc strings are
+    ### used to generate help.
+    ###
+
+    def output_column(self, header, line):
+        """
+        Items left aligned in space padded columns.  They are
+        truncated if they do not fit. If the width hasn't been
+        specified for a column then 10 is used unless the column name
+        (header) is longer in which case that width is used.  Use the
+        .width command to change column sizes.
+        """
+        # as an optimization we calculate self._actualwidths which is
+        # reset for each query
+        if header:
+            def gw(n):
+                if n<len(self.widths) and self.widths[n]!=0:
+                    return self.widths[n]
+                # if width is not present or 0 then autosize
+                text=self._fmt_text_col(line[n])
+                return max(len(text), 10)
+
+            widths=[gw(i) for i in range(len(line))]
+
+            if self.truncate:
+                self._actualwidths=["%"+("-%d.%ds", "%d.%ds")[w<0]%(abs(w), abs(w)) for w in widths]
+            else:
+                self._actualwidths=["%"+("-%ds", "%ds")[w<0]%(abs(w),) for w in widths]
+
+            if self.header:
+                # output the headers
+                c=self.colour
+                cols=[c.header+(self._actualwidths[i] % (self._fmt_text_col(line[i]),))+c.header_ for i in range(len(line))]
+                # sqlite shell uses two spaces between columns
+                self.write(self.stdout, "  ".join(cols)+"\n")
+                if c is self._colours["off"]:
+                    self.output_column(False, ["-"*abs(widths[i]) for i in range(len(widths))])
+            return
+        cols=[self.colour.colour_value(line[i], self._actualwidths[i] % (self._fmt_text_col(line[i]),)) for i in range(len(line))]
+        # sqlite shell uses two spaces between columns
+        self.write(self.stdout, "  ".join(cols)+"\n")
+
+    def output_csv(self, header, line):
+        """
+        Items in csv format (comma separated).  Use tabs mode for tab
+        separated.  You can use the .separator command to use a
+        different one after switching mode.  A separator of comma uses
+        double quotes for quoting while other separators do not do any
+        quoting.  The Python csv library used for this only supports
+        single character separators.
+        """
+
+        # we use self._csv for the work, setup when header is
+        # supplied. _csv is a tuple of a StringIO and the csv.writer
+        # instance.
+
+        # Sigh
+        if sys.version_info<(3,0):
+            fixdata=lambda x: x.encode("utf8")
+        else:
+            fixdata=lambda x: x
+
+        if header:
+            if sys.version_info<(3,0):
+                import StringIO as io
+            else:
+                import io
+            s=io.StringIO()
+            kwargs={}
+            if self.separator==",":
+                kwargs["dialect"]="excel"
+            elif self.separator=="\t":
+                kwargs["dialect"]="excel-tab"
+            else:
+                kwargs["quoting"]=csv.QUOTE_NONE
+                kwargs["delimiter"]=fixdata(self.separator)
+                kwargs["doublequote"]=False
+                # csv module is bug ridden junk - I already say no
+                # quoting so it still looks for the quotechar and then
+                # gets upset that it can't be quoted.  Which bit of no
+                # quoting was ambiguous?
+                kwargs["quotechar"]="\x00"
+
+            writer=csv.writer(s, **kwargs)
+            self._csv=(s, writer)
+            if self.header:
+                self.output_csv(None, line)
+            return
+
+        if header is None:
+            c=self.colour
+            line=[c.header+fixdata(self._fmt_text_col(l))+c.header_ for l in line]
+        else:
+            fmt=lambda x: self.colour.colour_value(x, fixdata(self._fmt_text_col(x)))
+            line=[fmt(l) for l in line]
+        self._csv[1].writerow(line)
+        t=self._csv[0].getvalue()
+        if sys.version_info<(3,0):
+            t=t.decode("utf8")
+        # csv lib always does DOS eol
+        assert(t.endswith("\r\n"))
+        t=t[:-2]
+        # should not be other eol irregularities
+        assert(not t.endswith("\r") and not  t.endswith("\n"))
+        self.write(self.stdout, t+"\n")
+        self._csv[0].truncate(0)
+        self._csv[0].seek(0)
+
+    def output_html(self, header, line):
+        "HTML table style"
+        if header:
+            if not self.header:
+                return
+            fmt=lambda x: self.colour.header+self._fmt_html_col(x)+self.colour.header_
+        else:
+            fmt=lambda x: self.colour.colour_value(x, self._fmt_html_col(x))
+        line=[fmt(l) for l in line]
+        out=["<TR>"]
+        for l in line:
+            out.append(("<TD>","<TH>")[header])
+            out.append(l)
+            out.append(("</TD>\n","</TH>\n")[header])
+        out.append("</TR>\n")
+        self.write(self.stdout, "".join(out))
+
+    def output_insert(self, header, line):
+        """
+        Lines as SQL insert statements.  The table name is "table"
+        unless you specified a different one as the second parameter
+        to the .mode command.
+        """
+        if header:
+            return
+        fmt=lambda x: self.colour.colour_value(x, apsw.format_sql_value(x))
+        out="INSERT INTO "+self._output_table+" VALUES("+",".join([fmt(l) for l in line])+");\n"
+        self.write(self.stdout, out)
+
+    def output_json(self, header, line):
+        """
+        Each line as a JSON object with a trailing comma.  Blobs are
+        output as base64 encoded strings.  You should be using UTF8
+        output encoding.
+        """
+        if header:
+            self._output_json_cols=line
+            return
+        fmt=lambda x: self.colour.colour_value(x, self._fmt_json_value(x))
+        out=["%s: %s" % (self._fmt_json_value(k), fmt(line[i])) for i,k in enumerate(self._output_json_cols)]
+        self.write(self.stdout, "{ "+", ".join(out)+"},\n")
+
+    def output_line(self, header, line):
+        """
+        One value per line in the form 'column = value' with a blank
+        line between rows.
+        """
+        if header:
+            w=5
+            for l in line:
+                if len(l)>w:
+                    w=len(l)
+            self._line_info=(w, line)
+            return
+        fmt=lambda x: self.colour.colour_value(x, self._fmt_text_col(x))
+        w=self._line_info[0]
+        for i in range(len(line)):
+            self.write(self.stdout, "%*s = %s\n" % (w, self._line_info[1][i], fmt(line[i])))
+        self.write(self.stdout, "\n")
+
+    def output_list(self, header, line):
+        "All items on one line with separator"
+        if header:
+            if not self.header:
+                return
+            c=self.colour
+            fmt=lambda x: c.header+x+c.header_
+        else:
+            fmt=lambda x: self.colour.colour_value(x, self._fmt_text_col(x))
+        self.write(self.stdout, self.separator.join([fmt(x) for x in line])+"\n")
+
+    def output_python(self, header, line):
+        "Tuples in Python source form for each row"
+        if header:
+            if not self.header:
+                return
+            c=self.colour
+            fmt=lambda x: c.header+self._fmt_python(x)+c.header_
+        else:
+            fmt=lambda x: self.colour.colour_value(x, self._fmt_python(x))
+        self.write(self.stdout, '('+", ".join([fmt(l) for l in line])+"),\n")
+
+    def output_tcl(self, header, line):
+        "Outputs TCL/C style strings using current separator"
+        # In theory you could paste the output into your source ...
+        if header:
+            if not self.header:
+                return
+            c=self.colour
+            fmt=lambda x: c.header+self._fmt_c_string(x)+c.header_
+        else:
+            fmt=lambda x: self.colour.colour_value(x, self._fmt_c_string(x))
+        self.write(self.stdout, self.separator.join([fmt(l) for l in line])+"\n")
+
+    def _output_summary(self, summary):
+        # internal routine to output a summary line or two
+        self.write(self.stdout, self.colour.summary+summary+self.colour.summary_)
+
+    ###
+    ### Various routines
+    ###
+
+    def cmdloop(self, intro=None):
+        """Runs the main interactive command loop.
+
+        :param intro: Initial text banner to display instead of the
+           default.  Make sure you newline terminate it.
+        """
+        if intro is None:
+            intro="""
+SQLite version %s (APSW %s)
+Enter ".help" for instructions
+Enter SQL statements terminated with a ";"
+""" % (apsw.sqlitelibversion(), apsw.apswversion())
+            intro=intro.lstrip()
+        if self.interactive and intro:
+            if sys.version_info<(3,0):
+                intro=unicode(intro)
+            c=self.colour
+            self.write(self.stdout, c.intro+intro+c.intro_)
+
+        using_readline=False
+        try:
+            if self.interactive and self.stdin is sys.stdin:
+                import readline
+                old_completer=readline.get_completer()
+                readline.set_completer(self.complete)
+                readline.parse_and_bind("tab: complete")
+                using_readline=True
+                try:
+                    readline.read_history_file(os.path.expanduser(self.history_file))
+                except:
+                    # We only expect IOError here but if the history
+                    # file does not exist and this code has been
+                    # compiled into the module it is possible to get
+                    # an IOError that doesn't match the IOError from
+                    # Python parse time resulting in an IOError
+                    # exception being raised.  Consequently we just
+                    # catch all exceptions.
+                    pass
+        except ImportError:
+            pass
+
+        try:
+            while True:
+                self._input_descriptions=[]
+                if using_readline:
+                    # we drop completion cache because it contains
+                    # table and column names which could have changed
+                    # with last executed SQL
+                    self._completion_cache=None
+                    self._using_readline=True
+                try:
+                    command=self.getcompleteline()
+                    if command is None: # EOF
+                        return
+                    self.process_complete_line(command)
+                except:
+                    self._append_input_description()
+                    try:
+                        self.handle_exception()
+                    except UnicodeDecodeError:
+                        self.handle_exception()
+        finally:
+            if using_readline:
+                readline.set_completer(old_completer)
+                readline.set_history_length(256)
+                readline.write_history_file(os.path.expanduser(self.history_file))
+
+    def handle_exception(self):
+        """Handles the current exception, printing a message to stderr as appropriate.
+        It will reraise the exception if necessary (eg if bail is true)"""
+        eclass,eval,etb=sys.exc_info() # py2&3 compatible way of doing this
+        if isinstance(eval, SystemExit):
+            eval._handle_exception_saw_this=True
+            raise
+
+        self._out_colour()
+        self.write(self.stderr, self.colour.error)
+
+        if isinstance(eval, KeyboardInterrupt):
+            self.handle_interrupt()
+            text="Interrupted"
+        else:
+            text=str(eval)
+
+        if not text.endswith("\n"):
+            text=text+"\n"
+
+        if len(self._input_descriptions):
+            for i in range(len(self._input_descriptions)):
+                if i==0:
+                    pref="At "
+                else:
+                    pref=" "*i+"From "
+                self.write(self.stderr, pref+self._input_descriptions[i]+"\n")
+
+        self.write(self.stderr, text)
+        if self.exceptions:
+            stack=[]
+            while etb:
+                stack.append(etb.tb_frame)
+                etb = etb.tb_next
+
+            for frame in stack:
+                self.write(self.stderr, "\nFrame %s in %s at line %d\n" %
+                           (frame.f_code.co_name, frame.f_code.co_filename,
+                            frame.f_lineno))
+                vars=list(frame.f_locals.items())
+                vars.sort()
+                for k,v in vars:
+                    try:
+                        v=repr(v)[:80]
+                    except:
+                        v="<Unable to convert to string>"
+                    self.write(self.stderr, "%10s = %s\n" % (k,v))
+            self.write(self.stderr, "\n%s: %s\n" % (eclass, repr(eval)))
+
+        self.write(self.stderr, self.colour.error_)
+
+        eval._handle_exception_saw_this=True
+        if self.bail:
+            raise
+
+    def process_sql(self, sql, bindings=None, internal=False, summary=None):
+        """Processes SQL text consisting of one or more statements
+
+        :param sql: SQL to execute
+
+        :param bindings: bindings for the *sql*
+
+        :param internal: If True then this is an internal execution
+          (eg the .tables or .database command).  When executing
+          internal sql timings are not shown nor is the SQL echoed.
+
+        :param summary: If not None then should be a tuple of two
+          items.  If the ``sql`` returns any data then the first item
+          is printed before the first row, and the second item is
+          printed after the last row.  An example usage is the .find
+          command which shows table names.
+        """
+        cur=self.db.cursor()
+        # we need to know when each new statement is executed
+        state={'newsql': True, 'timing': None}
+        def et(cur, sql, bindings):
+            state['newsql']=True
+            # if time reporting, do so now
+            if not internal and self.timer:
+                if state['timing']:
+                    self.display_timing(state['timing'], self.get_resource_usage())
+            # print statement if echo is on
+            if not internal and self.echo:
+                # ? should we strip leading and trailing whitespace? backslash quote stuff?
+                if bindings:
+                    self.write(self.stderr, "%s [%s]\n" % (sql, bindings))
+                else:
+                    self.write(self.stderr, sql+"\n")
+            # save resource from begining of command (ie don't include echo time above)
+            if not internal and self.timer:
+                state['timing']=self.get_resource_usage()
+            return True
+        cur.setexectrace(et)
+        # processing loop
+        try:
+            for row in cur.execute(sql, bindings):
+                if state['newsql']:
+                    # summary line?
+                    if summary:
+                        self._output_summary(summary[0])
+                    # output a header always
+                    cols=[h for h,d in cur.getdescription()]
+                    self.output(True, cols)
+                    state['newsql']=False
+                self.output(False, row)
+            if not state['newsql'] and summary:
+                self._output_summary(summary[1])
+        except:
+            # If echo is on and the sql to execute is a syntax error
+            # then the exec tracer won't have seen it so it won't be
+            # printed and the user will be wondering exactly what sql
+            # had the error.  We look in the traceback and deduce if
+            # the error was happening in a prepare or not.  Also we
+            # need to ignore the case where SQLITE_SCHEMA happened and
+            # a reprepare is being done since the exec tracer will
+            # have been called in that situation.
+            if not internal and self.echo:
+                tb=sys.exc_info()[2]
+                last=None
+                while tb:
+                    last=tb.tb_frame
+                    tb=tb.tb_next
+
+                if last and last.f_code.co_name=="sqlite3_prepare" \
+                   and last.f_code.co_filename.endswith("statementcache.c") \
+                   and "sql" in last.f_locals:
+                    self.write(self.stderr, last.f_locals["sql"]+"\n")
+            raise
+
+        if not internal and self.timer:
+            self.display_timing(state['timing'], self.get_resource_usage())
+
+    def process_command(self, cmd):
+        """Processes a dot command.  It is split into parts using the
+        `shlex.split
+        <http://docs.python.org/library/shlex.html#shlex.split>`__
+        function which is roughly the same method used by Unix/POSIX
+        shells.
+        """
+        if self.echo:
+            self.write(self.stderr, cmd+"\n")
+        # broken with unicode on Python 2!!!
+        if sys.version_info<(3,0):
+            cmd=cmd.encode("utf8")
+            cmd=[c.decode("utf8") for c in shlex.split(cmd)]
+        else:
+            cmd=shlex.split(cmd)
+        assert cmd[0][0]=="."
+        cmd[0]=cmd[0][1:]
+        fn=getattr(self, "command_"+cmd[0], None)
+        if not fn:
+            raise self.Error("Unknown command \"%s\".  Enter \".help\" for help" % (cmd[0],))
+        res=fn(cmd[1:])
+
+    ###
+    ### Commands start here
+    ###
+
+    def _boolean_command(self, name, cmd):
+        "Parse and verify boolean parameter"
+        if len(cmd)!=1 or cmd[0].lower() not in ("on", "off"):
+            raise self.Error(name+" expected ON or OFF")
+        return cmd[0].lower()=="on"
+
+
+    # Note that doc text is used for generating help output.
+
+    def command_backup(self, cmd):
+        """backup ?DB? FILE: Backup DB (default "main") to FILE
+
+        Copies the contents of the current database to FILE
+        overwriting whatever was in FILE.  If you have attached databases
+        then you can specify their name instead of the default of "main".
+
+        The backup is done at the page level - SQLite copies the pages
+        as is.  There is no round trip through SQL code.
+        """
+        dbname="main"
+        if len(cmd)==1:
+            fname=cmd[0]
+        elif len(cmd)==2:
+            dbname=cmd[0]
+            fname=cmd[1]
+        else:
+            raise self.Error("Backup takes one or two parameters")
+        out=apsw.Connection(fname)
+        b=out.backup("main", self.db, dbname)
+        try:
+            while not b.done:
+                b.step()
+        finally:
+            b.finish()
+            out.close()
+
+
+    def command_bail(self, cmd):
+        """bail ON|OFF: Stop after hitting an error (default OFF)
+
+        If an error is encountered while processing commands or SQL
+        then exit.  (Note this is different than SQLite shell which
+        only exits for errors in SQL.)
+        """
+        self.bail=self._boolean_command("bail", cmd)
+
+    def command_colour(self, cmd=[]):
+        """colour SCHEME: Selects a colour scheme
+
+        Residents of both countries that have not adopted the metric
+        system may also spell this command without a 'u'.  If using a
+        colour terminal in interactive mode then output is
+        automatically coloured to make it more readable.  Use 'off' to
+        turn off colour, and no name or 'default' for the default.
+        """
+        if len(cmd)>1:
+            raise self.Error("Too many colour schemes")
+        c=cmd and cmd[0] or "default"
+        if c not in self._colours:
+            raise self.Error("No such colour scheme: "+c)
+        self.colour_scheme=c
+        self._out_colour()
+
+    command_color=command_colour
+
+    def command_databases(self, cmd):
+        """databases: Lists names and files of attached databases
+
+        """
+        if len(cmd):
+            raise self.Error("databases command doesn't take any parameters")
+        self.push_output()
+        self.header=True
+        self.output=self.output_column
+        self.truncate=False
+        self.widths=[3,15,58]
+        try:
+            self.process_sql("pragma database_list", internal=True)
+        finally:
+            self.pop_output()
+
+    def command_dump(self, cmd):
+        """dump ?TABLE? [TABLE...]: Dumps all or specified tables in SQL text format
+
+        The table name is treated as like pattern so you can use % as
+        a wildcard.  You can use dump to make a text based backup of
+        the database.  It is also useful for comparing differences or
+        making the data available to other databases.  Indices and
+        triggers for the table(s) are also dumped.  Finally views
+        matching the table pattern name are dumped (it isn't possible
+        to work out which views access which table and views can
+        access multiple tables anyway).
+
+        Note that if you are dumping virtual tables such as used by
+        the FTS3 module then they may use other tables to store
+        information.  For example if you create a FTS3 table named
+        *recipes* then it also creates *recipes_content*,
+        *recipes_segdir* etc.  Consequently to dump this example
+        correctly use::
+
+           .dump recipes recipes_%
+
+        If the database is empty or no tables/views match then there
+        is no output.
+        """
+        # Simple tables are easy to dump.  More complicated is dealing
+        # with virtual tables, foreign keys etc.
+
+        # Lock the database while doing the dump so nothing changes
+        # under our feet
+        self.process_sql("BEGIN IMMEDIATE", internal=True)
+
+        try:
+            # first pass -see if virtual tables or foreign keys are in
+            # use.  If they are we emit pragmas to deal with them, but
+            # prefer not to emit them
+            v={"virtuals": False,
+               "foreigns": False}
+            def check(name, sql):
+                if name.lower().startswith("sqlite_"):
+                    return False
+                sql=sql.lower()
+                if re.match(r"^\s*create\s+virtual\s+.*", sql):
+                    v["virtuals"]=True
+                # pragma table_info doesn't tell us if foreign keys
+                # are involved so we guess if any the various strings are
+                # in the sql somewhere
+                if re.match(r".*\b(foreign\s*key|references)\b.*", sql):
+                    v["foreigns"]=True
+                return True
+
+            if len(cmd)==0:
+                cmd=["%"]
+
+            tables=[]
+            for pattern in cmd:
+                for name,sql in self.db.cursor().execute("SELECT name,sql FROM sqlite_master "
+                                                         "WHERE sql NOT NULL AND type IN ('table','view') "
+                                                         "AND tbl_name LIKE ?1", (pattern,)):
+                    if check(name, sql) and name not in tables:
+                        tables.append(name)
+
+            if not tables:
+                return
+
+            # will we need to analyze anything later?
+            analyze_needed=[]
+            for stat in self.db.cursor().execute("select name from sqlite_master where sql not null and type='table' and tbl_name like 'sqlite_stat%'"):
+                for name in tables:
+                    if len(self.db.cursor().execute("select * from "+self._fmt_sql_identifier(stat[0])+" WHERE tbl=?", (name,)).fetchall()):
+                        if name not in analyze_needed:
+                            analyze_needed.append(name)
+            analyze_needed.sort()
+
+            def blank():
+                self.write(self.stdout, "\n")
+
+            def comment(s):
+                self.write(self.stdout, textwrap.fill(s, 78, initial_indent="-- ", subsequent_indent="-- ")+"\n")
+
+            pats=", ".join([(x,"(All)")[x=="%"] for x in cmd])
+            comment("SQLite dump (by APSW %s)" % (apsw.apswversion(),))
+            comment("SQLite version " + apsw.sqlitelibversion())
+            comment("Date: " +time.ctime())
+            comment("Tables like: "+pats)
+            comment("Database: "+self.db.filename)
+            try:
+                import getpass
+                import socket
+                comment("User: %s @ %s" % (getpass.getuser(), socket.gethostname()))
+            except ImportError:
+                pass
+            blank()
+
+            comment("The values of various per-database settings")
+            comment("PRAGMA page_size="+str(self.db.cursor().execute("pragma page_size").fetchall()[0][0])+";\n")
+            comment("PRAGMA encoding='"+self.db.cursor().execute("pragma encoding").fetchall()[0][0]+"';\n")
+            vac={0: "NONE", 1: "FULL", 2: "INCREMENTAL"}
+            vacvalue=self.db.cursor().execute("pragma auto_vacuum").fetchall()[0][0]
+            comment("PRAGMA auto_vacuum="+vac.get(vacvalue, str(vacvalue))+";\n")
+            comment("PRAGMA max_page_count="+str(self.db.cursor().execute("pragma max_page_count").fetchall()[0][0])+";\n")
+            blank()
+
+            # different python versions have different requirements
+            # about specifying cmp to sort routine so we use this
+            # portable workaround with a decorated list instead
+            dectables=[(x.lower(), x) for x in tables]
+            dectables.sort()
+            tables=[y for x,y in dectables]
+
+            virtuals=v["virtuals"]
+            foreigns=v["foreigns"]
+
+            if virtuals:
+                comment("This pragma is needed to restore virtual tables")
+                self.write(self.stdout, "PRAGMA writable_schema=ON;\n")
+            if foreigns:
+                comment("This pragma turns off checking of foreign keys "
+                        "as tables would be inconsistent while restoring.  It was introduced "
+                        "in SQLite 3.6.19.")
+                self.write(self.stdout, "PRAGMA foreign_keys=OFF;\n")
+
+            if virtuals or foreigns:
+                blank()
+
+            self.write(self.stdout, "BEGIN TRANSACTION;\n")
+            blank()
+
+            def sqldef(s):
+                # return formatted sql watching out for embedded
+                # comments at the end forcing trailing ; onto next
+                # line https://sqlite.org/src/info/c04a8b8a4f
+                if "--" in s.split("\n")[-1]:
+                    nl="\n"
+                else:
+                    nl=""
+                return s+nl+";\n"
+
+            # do the table dumping loops
+            oldtable=self._output_table
+            try:
+                self.push_output()
+                self.output=self.output_insert
+                # Dump the table
+                for table in tables:
+                    for sql in self.db.cursor().execute("SELECT sql FROM sqlite_master WHERE name=?1 AND type='table'", (table,)):
+                        comment("Table  "+table)
+                        # Special treatment for virtual tables - they
+                        # get called back on drops and creates and
+                        # could thwart us so we have to manipulate
+                        # sqlite_master directly
+                        if sql[0].lower().split()[:3]==["create", "virtual", "table"]:
+                            self.write(self.stdout, "DELETE FROM sqlite_master WHERE name="+apsw.format_sql_value(table)+" AND type='table';\n")
+                            self.write(self.stdout, "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql) VALUES('table',%s,%s,0,%s);\n"
+                                       % (apsw.format_sql_value(table), apsw.format_sql_value(table), apsw.format_sql_value(sql[0])))
+                        else:
+                            self.write(self.stdout, "DROP TABLE IF EXISTS "+self._fmt_sql_identifier(table)+";\n")
+                            self.write(self.stdout, sqldef(sql[0]))
+                            self._output_table=self._fmt_sql_identifier(table)
+                            self.process_sql("select * from "+self._fmt_sql_identifier(table), internal=True)
+                        # Now any indices or triggers
+                        first=True
+                        for name,sql in self.db.cursor().execute("SELECT name,sql FROM sqlite_master "
+                                                                 "WHERE sql NOT NULL AND type IN ('index', 'trigger') "
+                                                                 "AND tbl_name=?1 AND name NOT LIKE 'sqlite_%' "
+                                                                 "ORDER BY lower(name)", (table,)):
+                            if first:
+                                comment("Triggers and indices on  "+table)
+                                first=False
+                            self.write(self.stdout, sqldef(sql))
+                        blank()
+                # Views done last.  They have to be done in the same order as they are in sqlite_master
+                # as they could refer to each other
+                first=True
+                for name,sql in self.db.cursor().execute("SELECT name,sql FROM sqlite_master "
+                                                         "WHERE sql NOT NULL AND type='view' "
+                                                         "AND name IN ( "+",".join([apsw.format_sql_value(i) for i in tables])+
+                                                         ") ORDER BY _ROWID_"):
+                    if first:
+                        comment("Views")
+                        first=False
+                    self.write(self.stdout, "DROP VIEW IF EXISTS %s;\n" % (self._fmt_sql_identifier(name),))
+                    self.write(self.stdout, sqldef(sql))
+                if not first:
+                    blank()
+
+                # sqlite sequence
+                # does it exist
+                if len(self.db.cursor().execute("select * from sqlite_master where name='sqlite_sequence'").fetchall()):
+                    first=True
+                    for t in tables:
+                        v=self.db.cursor().execute("select seq from main.sqlite_sequence where name=?1", (t,)).fetchall()
+                        if len(v):
+                            assert len(v)==1
+                            if first:
+                                comment("For primary key autoincrements the next id "
+                                        "to use is stored in sqlite_sequence")
+                                first=False
+                            self.write(self.stdout, 'DELETE FROM main.sqlite_sequence WHERE name=%s;\n' % (apsw.format_sql_value(t),))
+                            self.write(self.stdout, 'INSERT INTO main.sqlite_sequence VALUES (%s, %s);\n' % (apsw.format_sql_value(t), v[0][0]))
+                    if not first:
+                        blank()
+            finally:
+                self.pop_output()
+                self._output_table=oldtable
+
+            # analyze
+            if analyze_needed:
+                comment("You had used the analyze command on these tables before.  Rerun for this new data.")
+                for n in analyze_needed:
+                    self.write(self.stdout, "ANALYZE "+self._fmt_sql_identifier(n)+";\n")
+                blank()
+
+            # user version pragma
+            uv=self.db.cursor().execute("pragma user_version").fetchall()[0][0]
+            if uv:
+                comment("Your database may need this.  It is sometimes used to keep track of the schema version (eg Firefox does this).")
+                comment("pragma user_version=%d;" % (uv,))
+                blank()
+
+            # Save it all
+            self.write(self.stdout, "COMMIT TRANSACTION;\n")
+
+            # cleanup pragmas
+            if foreigns:
+                blank()
+                comment("Restoring foreign key checking back on.  Note that SQLite 3.6.19 is off by default")
+                self.write(self.stdout, "PRAGMA foreign_keys=ON;\n")
+            if virtuals:
+                blank()
+                comment("Restoring writable schema back to default")
+                self.write(self.stdout, "PRAGMA writable_schema=OFF;\n")
+                # schema reread
+                blank()
+                comment("We need to force SQLite to reread the schema because otherwise it doesn't know that "
+                        "the virtual tables we inserted directly into sqlite_master exist.  See "
+                        "last comments of https://sqlite.org/cvstrac/tktview?tn=3425")
+                self.write(self.stdout, "BEGIN;\nCREATE TABLE no_such_table(x,y,z);\nROLLBACK;\n")
+
+        finally:
+            self.process_sql("END", internal=True)
+
+
+    def command_echo(self, cmd):
+        """echo ON|OFF: If ON then each SQL statement or command is printed before execution (default OFF)
+
+        The SQL statement or command is sent to error output so that
+        it is not intermingled with regular output.
+        """
+        self.echo=self._boolean_command("echo", cmd)
+
+    def set_encoding(self, enc):
+        """Saves *enc* as the default encoding, after verifying that
+        it is valid.  You can also include :error to specify error
+        handling - eg 'cp437:replace'
+
+        Raises an exception on invalid encoding or error
+        """
+        enc=enc.split(":", 1)
+        if len(enc)>1:
+            enc, errors=enc
+        else:
+            enc=enc[0]
+            errors=None
+        try:
+            codecs.lookup(enc)
+        except LookupError:
+            raise self.Error("No known encoding '%s'" % (enc,))
+        try:
+            if errors is not None:
+                codecs.lookup_error(errors)
+        except LookupError:
+            raise self.Error("No known codec error handler '%s'" % (errors,))
+        self.encoding=enc, errors
+
+
+    def command_encoding(self, cmd):
+        """encoding ENCODING: Set the encoding used for new files opened via .output and imports
+
+        SQLite and APSW work internally using Unicode and characters.
+        Files however are a sequence of bytes.  An encoding describes
+        how to convert between bytes and characters.  The default
+        encoding is utf8 and that is generally the best value to use
+        when other programs give you a choice.
+
+        You can also specify an error handler.  For example
+        'cp437:replace' will use code page 437 and any Unicode
+        codepoints not present in cp437 will be replaced (typically
+        with something like a question mark).  Other error handlers
+        include 'ignore', 'strict' (default) and 'xmlcharrefreplace'.
+
+        For the default input/output/error streams on startup the
+        shell defers to Python's detection of encoding.  For example
+        on Windows it asks what code page is in use and on Unix it
+        looks at the LC_CTYPE environment variable.  You can set the
+        PYTHONIOENCODING environment variable to override this
+        detection.
+
+        This command affects files opened after setting the encoding
+        as well as imports.
+
+        See the online APSW documentation for more details.
+        """
+        if len(cmd)!=1:
+            raise self.Error("Encoding takes one argument")
+        self.set_encoding(cmd[0])
+
+    def command_exceptions(self, cmd):
+        """exceptions ON|OFF: If ON then detailed tracebacks are shown on exceptions (default OFF)
+
+        Normally when an exception occurs the error string only is
+        displayed.  However it is sometimes useful to get a full
+        traceback.  An example would be when you are developing
+        virtual tables and using the shell to exercise them.  In
+        addition to displaying each stack frame, the local variables
+        within each frame are also displayed.
+        """
+        self.exceptions=self._boolean_command("exceptions", cmd)
+
+
+    def command_exit(self, cmd):
+        """exit:Exit this program"""
+        if len(cmd):
+            raise self.Error("Exit doesn't take any parameters")
+        sys.exit(0)
+
+    def command_quit(self, cmd):
+        """quit:Exit this program"""
+        if len(cmd):
+            raise self.Error("Quit doesn't take any parameters")
+        sys.exit(0)
+
+    def command_explain(self, cmd):
+        """explain ON|OFF: Set output mode suitable for explain (default OFF)
+
+        Explain shows the underlying SQLite virtual machine code for a
+        statement.  You need to prefix the SQL with explain.  For example:
+
+           explain select * from table;
+
+        This output mode formats the explain output nicely.  If you do
+        '.explain OFF' then the output mode and settings in place when
+        you did '.explain ON' are restored.
+        """
+        if len(cmd)==0 or self._boolean_command("explain", cmd):
+            self.push_output()
+            self.header=True
+            self.widths=[4,13,4,4,4,13,2,13]
+            self.truncate=False
+            self.output=self.output_column
+        else:
+            self.pop_output()
+
+    def command_find(self, cmd):
+        """find what ?TABLE?: Searches all columns of all tables for a value
+
+        The find command helps you locate data across your database
+        for example to find a string or any references to an id.
+
+        You can specify a like pattern to limit the search to a subset
+        of tables (eg specifying 'CUSTOMER%' for all tables beginning
+        with CUSTOMER).
+
+        The what value will be treated as a string and/or integer if
+        possible.  If what contains % or _ then it is also treated as
+        a like pattern.
+
+        This command will take a long time to execute needing to read
+        all of the relevant tables.
+        """
+        if len(cmd)<1 or len(cmd)>2:
+            raise self.Error("At least one argument required and at most two accepted")
+        tablefilter="%"
+        if len(cmd)==2:
+            tablefilter=cmd[1]
+        querytemplate=[]
+        queryparams=[]
+        def qp(): # binding for current queryparams
+            return "?"+str(len(queryparams))
+        s=cmd[0]
+        if '%' in s or '_' in s:
+            queryparams.append(s)
+            querytemplate.append("%s LIKE "+qp())
+        queryparams.append(s)
+        querytemplate.append("%s = "+qp())
+        try:
+            i=int(s)
+            queryparams.append(i)
+            querytemplate.append("%s = "+qp())
+        except ValueError:
+            pass
+        querytemplate=" OR ".join(querytemplate)
+        for (table,) in self.db.cursor().execute("SELECT name FROM sqlite_master WHERE type='table' AND name LIKE ?1", (tablefilter,)):
+            t=self._fmt_sql_identifier(table)
+            query="SELECT * from %s WHERE " % (t,)
+            colq=[]
+            for _,column,_,_,_,_ in self.db.cursor().execute("pragma table_info(%s)" % (t,)):
+                colq.append(querytemplate % ((self._fmt_sql_identifier(column),)*len(queryparams)))
+            query=query+" OR ".join(colq)
+            self.process_sql(query, queryparams, internal=True, summary=("Table "+table+"\n", "\n"))
+
+    def command_header(self, cmd):
+        """header(s) ON|OFF: Display the column names in output (default OFF)
+
+        """
+        self.header=self._boolean_command("header", cmd)
+
+    command_headers=command_header
+
+    _help_info=None
+
+    def command_help(self, cmd):
+        """help ?COMMAND?: Shows list of commands and their usage.  If COMMAND is specified then shows detail about that COMMAND.  ('.help all' will show detailed help about all commands.)
+        """
+        if not self._help_info:
+            # buildup help database
+            self._help_info={}
+            for c in dir(self):
+                if not c.startswith("command_"):
+                    continue
+                # help is 3 parts
+                # - the syntax string (eg backup ?dbname? filename)
+                # - the one liner description (eg saves database to filename)
+                # - the multi-liner detailed description
+                # We grab this from the doc string for the function in the form
+                #   syntax: one liner\nmulti\nliner
+                d=getattr(self, c).__doc__
+                assert d, c+" command must have documentation"
+                c=c[len("command_"):]
+                if c in ("headers", "color"): continue
+                while d[0]=="\n":
+                    d=d[1:]
+                parts=d.split("\n", 1)
+                firstline=parts[0].strip().split(":", 1)
+                assert len(firstline)==2, c+" command must have usage: description doc"
+                if len(parts)==1 or len(parts[1].strip())==0: # work around textwrap bug
+                    multi=""
+                else:
+                    multi=textwrap.dedent(parts[1])
+                if c=="mode":
+                    if not self._output_modes:
+                        self._cache_output_modes()
+                    firstline[1]=firstline[1]+" "+" ".join(self._output_modes)
+                    multi=multi+"\n\n"+"\n\n".join(self._output_modes_detail)
+                if c=="colour":
+                    colours=list(self._colours.keys())
+                    colours.sort()
+                    firstline[1]=firstline[1]+" from "+", ".join(colours)
+                if len(multi.strip())==0: # All whitespace
+                    multi=None
+                else:
+                    multi=multi.strip("\n")
+                    # we need to keep \n\n as a newline but turn all others into spaces
+                    multi=multi.replace("\n\n", "\x00")
+                    multi=multi.replace("\n", " ")
+                    multi=multi.replace("\x00", "\n\n")
+                    multi=multi.split("\n\n")
+                self._help_info[c]=('.'+firstline[0].strip(), firstline[1].strip(), multi)
+
+        self.write(self.stderr, "\n")
+
+        tw=self._terminal_width()
+        if tw<32:
+            tw=32
+        if len(cmd)==0:
+            commands=list(self._help_info.keys())
+            commands.sort()
+            w=0
+            for command in commands:
+                if len(self._help_info[command][0])>w:
+                    w=len(self._help_info[command][0])
+            out=[]
+            for command in commands:
+                hi=self._help_info[command]
+                # usage string
+                out.append(hi[0])
+                # space padding (including 2 for between columns)
+                out.append(" "*(2+w-len(hi[0])))
+                # usage message wrapped if need be
+                out.append(("\n"+" "*(2+w)).join(textwrap.wrap(hi[1], tw-w-2)))
+                # newline
+                out.append("\n")
+            self.write(self.stderr, "".join(out))
+        else:
+            if cmd[0]=="all":
+                cmd=list(self._help_info.keys())
+                cmd.sort()
+            w=0
+            for command in self._help_info:
+                if len(self._help_info[command][0])>w:
+                    w=len(self._help_info[command][0])
+
+            for command in cmd:
+                if command=="headers": command="header"
+                if command not in self._help_info:
+                    raise self.Error("No such command \"%s\"" % (command,))
+                out=[]
+                hi=self._help_info[command]
+                # usage string
+                out.append(hi[0])
+                # space padding (2)
+                out.append(" "*(2+w-len(hi[0])))
+                # usage message wrapped if need be
+                out.append(("\n"+" "*(2+w)).join(textwrap.wrap(hi[1], tw-w-2))+"\n")
+                if hi[2]:
+                    # newlines
+                    out.append("\n")
+                    # detailed message
+                    for i,para in enumerate(hi[2]):
+                        out.append(textwrap.fill(para, tw)+"\n")
+                        if i<len(hi[2])-1:
+                            out.append("\n")
+                # if not first one then print separator header
+                if command!=cmd[0]:
+                    self.write(self.stderr, "\n"+"="*tw+"\n")
+                self.write(self.stderr, "".join(out))
+        self.write(self.stderr, "\n")
+
+    def command_import(self, cmd):
+        """import FILE TABLE: Imports separated data from FILE into TABLE
+
+        Reads data from the file into the named table using the
+        current separator and encoding.  For example if the separator
+        is currently a comma then the file should be CSV (comma
+        separated values).
+
+        All values read in are supplied to SQLite as strings.  If you
+        want SQLite to treat them as other types then declare your
+        columns appropriately.  For example declaring a column 'REAL'
+        will result in the values being stored as floating point if
+        they can be safely converted.  See this page for more details:
+
+          https://sqlite.org/datatype3.html
+
+        Another alternative is to create a tempory table, insert the
+        values into that and then use casting.
+
+          CREATE TEMPORARY TABLE import(a,b,c);
+
+          .import filename import
+
+          CREATE TABLE final AS SELECT cast(a as BLOB), cast(b as INTEGER), cast(c as CHAR) from import;
+
+          DROP TABLE import;
+
+        You can also get more sophisticated using the SQL CASE
+        operator.  For example this will turn zero length strings into
+        null:
+
+          SELECT CASE col WHEN '' THEN null ELSE col END FROM ...
+        """
+        if len(cmd)!=2:
+            raise self.Error("import takes two parameters")
+
+        try:
+            final=None
+            # start transaction so database can't be changed
+            # underneath us
+            self.db.cursor().execute("BEGIN IMMEDIATE")
+            final="ROLLBACK"
+
+            # how many columns?
+            ncols=len(self.db.cursor().execute("pragma table_info("+self._fmt_sql_identifier(cmd[1])+")").fetchall())
+            if ncols<1:
+                raise self.Error("No such table '%s'" % (cmd[1],))
+
+            cur=self.db.cursor()
+            sql="insert into %s values(%s)" % (self._fmt_sql_identifier(cmd[1]), ",".join("?"*ncols))
+
+            kwargs={}
+            if self.separator==",":
+                kwargs["dialect"]="excel"
+            elif self.separator=="\t":
+                kwargs["dialect"]="excel-tab"
+            else:
+                kwargs["quoting"]=csv.QUOTE_NONE
+                kwargs["delimiter"]=self.separator
+                kwargs["doublequote"]=False
+                kwargs["quotechar"]="\x00"
+            row=1
+            for line in self._csvin_wrapper(cmd[0], kwargs):
+                if len(line)!=ncols:
+                    raise self.Error("row %d has %d columns but should have %d" % (row, len(line), ncols))
+                try:
+                    cur.execute(sql, line)
+                except:
+                    self.write(self.stderr, "Error inserting row %d" % (row,))
+                    raise
+                row+=1
+            self.db.cursor().execute("COMMIT")
+
+        except:
+            if final:
+                self.db.cursor().execute(final)
+            raise
+
+    def _csvin_wrapper(self, filename, dialect):
+        # Returns a csv reader that works around python bugs and uses
+        # dialect dict to configure reader
+
+        # Very easy for python 3
+        if sys.version_info>=(3,0):
+            thefile=codecs.open(filename, "r", self.encoding[0])
+            for line in csv.reader(thefile, **dialect.copy()):
+                yield line
+            thefile.close()
+            return
+
+        ###
+        ### csv module is not good at unicode so we have to
+        ### indirect unless utf8 is in use
+        ###
+        if self.encoding[0].lower()=="utf8": # no need for tempfile
+            thefile=open(filename, "rb")
+        else:
+            import tempfile
+            thefile=tempfile.TemporaryFile(prefix="apsw_import")
+            thefile.write(codecs.open(filename, "r", self.encoding[0]).read().encode("utf8"))
+            # move back to beginning
+            thefile.seek(0,0)
+
+        # Ensure all values are utf8 not unicode
+        for k,v in dialect.items():
+            if isinstance(v, unicode):
+                dialect[k]=v.encode("utf8")
+        for line in csv.reader(thefile, **dialect):
+            # back to unicode again
+            yield [x.decode("utf8") for x in line]
+        thefile.close()
+
+    def command_autoimport(self, cmd):
+        """autoimport FILENAME ?TABLE?: Imports filename creating a table and automatically working out separators and data types (alternative to .import command)
+
+        The import command requires that you precisely pre-setup the
+        table and schema, and set the data separators (eg commas or
+        tabs).  In many cases this information can be automatically
+        deduced from the file contents which is what this command
+        does.  There must be at least two columns and two rows.
+
+        If the table is not specified then the basename of the file
+        will be used.
+
+        Additionally the type of the contents of each column is also
+        deduced - for example if it is a number or date.  Empty values
+        are turned into nulls.  Dates are normalized into YYYY-MM-DD
+        format and DateTime are normalized into ISO8601 format to
+        allow easy sorting and searching.  4 digit years must be used
+        to detect dates.  US (swapped day and month) versus rest of
+        the world is also detected providing there is at least one
+        value that resolves the ambiguity.
+
+        Care is taken to ensure that columns looking like numbers are
+        only treated as numbers if they do not have unnecessary
+        leading zeroes or plus signs.  This is to avoid treating phone
+        numbers and similar number like strings as integers.
+
+        This command can take quite some time on large files as they
+        are effectively imported twice.  The first time is to
+        determine the format and the types for each column while the
+        second pass actually imports the data.
+        """
+        if len(cmd)<1 or len(cmd)>2:
+            raise self.Error("Expected one or two parameters")
+        if not os.path.exists(cmd[0]):
+            raise self.Error("File \"%s\" does not exist" % (cmd[0],))
+        if len(cmd)==2:
+            tablename=cmd[1]
+        else:
+            tablename=None
+        try:
+            final=None
+            c=self.db.cursor()
+            c.execute("BEGIN IMMEDIATE")
+            final="ROLLBACK"
+
+            if not tablename:
+                tablename=os.path.splitext(os.path.basename(cmd[0]))[0]
+
+            if c.execute("pragma table_info(%s)" % (self._fmt_sql_identifier(tablename),)).fetchall():
+                raise self.Error("Table \"%s\" already exists" % (tablename,))
+
+            # The types we support deducing
+            def DateUS(v): # US formatted date with wrong ordering of day and month
+                return DateWorld(v, switchdm=True)
+            def DateWorld(v, switchdm=False): # Sensibly formatted date as used anywhere else in the world
+                y,m,d=self._getdate(v)
+                if switchdm: m,d=d,m
+                if m<1 or m>12 or d<1 or d>31:
+                    raise ValueError
+                return "%d-%02d-%02d" % (y,m,d)
+            def DateTimeUS(v): # US date and time
+                return DateTimeWorld(v, switchdm=True)
+            def DateTimeWorld(v, switchdm=False): # Sensible date and time
+                y,m,d,h,M,s=self._getdatetime(v)
+                if switchdm: m,d=d,m
+                if m<1 or m>12 or d<1 or d>31 or h<0 or h>23 or M<0 or M>59 or s<0 or s>65:
+                    raise ValueError
+                return "%d-%02d-%02dT%02d:%02d:%02d" % (y,m,d,h,M,s)
+            def Number(v): # we really don't want phone numbers etc to match
+                # Python's float & int constructors allow whitespace which we don't
+                if re.search(r"\s", v):
+                    raise ValueError
+                if v=="0": return 0
+                if v[0]=="+": # idd prefix
+                    raise ValueError
+                if re.match("^[0-9]+$", v):
+                    if v[0]=="0": raise ValueError # also a phone number
+                    return int(v)
+                if v[0]=="0" and not v.startswith("0."): # deceptive not a number
+                    raise ValueError
+                return float(v)
+
+            # Work out the file format
+            formats=[
+                {"dialect": "excel"},
+                {"dialect": "excel-tab"}]
+            seps=["|", ";", ":"]
+            if self.separator not in seps:
+                seps.append(self.separator)
+            for sep in seps:
+                formats.append(
+                    {"quoting": csv.QUOTE_NONE,
+                     "delimiter": sep,
+                     "doublequote": False,
+                     "quotechar": "\x00"}
+                    )
+            possibles=[]
+            errors=[]
+            encodingissue=False
+            # format is copy() on every use.  This appears bizarre and
+            # unnecessary.  However Python 2.3 and 2.4 somehow manage
+            # to empty it if not copied.
+            for format in formats:
+                ncols=-1
+                lines=0
+                try:
+                    for line in self._csvin_wrapper(cmd[0], format.copy()):
+                        if lines==0:
+                            lines=1
+                            ncols=len(line)
+                            # data type guess setup
+                            datas=[]
+                            for i in range(ncols):
+                                datas.append([DateUS, DateWorld, DateTimeUS, DateTimeWorld, Number])
+                            allblanks=[True]*ncols
+                            continue
+                        if len(line)!=ncols:
+                            raise ValueError("Expected %d columns - got %d" % (ncols, len(line)))
+                        lines+=1
+                        for i in range(ncols):
+                            if not line[i]:
+                                continue
+                            allblanks[i]=False
+                            if not datas[i]:
+                                continue
+                            # remove datas that give ValueError
+                            d=[]
+                            for dd in datas[i]:
+                                try:
+                                    dd(line[i])
+                                    d.append(dd)
+                                except ValueError:
+                                    pass
+                            datas[i]=d
+                    if ncols>1 and lines>1:
+                        # if a particular column was allblank then clear datas for it
+                        for i in range(ncols):
+                            if allblanks[i]:
+                                datas[i]=[]
+                        possibles.append((format.copy(), ncols, lines, datas))
+                except UnicodeDecodeError:
+                    encodingissue=True
+                except:
+                    s=str(sys.exc_info()[1])
+                    if s not in errors:
+                        errors.append(s)
+
+            if len(possibles)==0:
+                if encodingissue:
+                    raise self.Error("The file is probably not in the current encoding \"%s\" and didn't match a known file format" % (self.encoding[0],))
+                v="File doesn't appear to match a known type."
+                if len(errors):
+                    v+="  Errors reported:\n"+"\n".join(["  "+e for e in errors])
+                raise self.Error(v)
+            if len(possibles)>1:
+                raise self.Error("File matches more than one type!")
+            format, ncols, lines, datas=possibles[0]
+            fmt=format.get("dialect", None)
+            if fmt is None:
+                fmt="(delimited by \"%s\")" % (format["delimiter"],)
+            self.write(self.stdout, "Detected Format %s  Columns %d  Rows %d\n" % (fmt, ncols, lines))
+            # Header row
+            reader=self._csvin_wrapper(cmd[0], format)
+            for header in reader:
+                break
+            # Check schema
+            identity=lambda x:x
+            for i in range(ncols):
+                if len(datas[i])>1:
+                    raise self.Error("Column #%d \"%s\" has ambiguous data format - %s" % (i+1, header[i], ", ".join([d.__name__ for d in datas[i]])))
+                if datas[i]:
+                    datas[i]=datas[i][0]
+                else:
+                    datas[i]=identity
+            # Make the table
+            sql="CREATE TABLE %s(%s)" % (self._fmt_sql_identifier(tablename), ", ".join([self._fmt_sql_identifier(h) for h in header]))
+            c.execute(sql)
+            # prep work for each row
+            sql="INSERT INTO %s VALUES(%s)" % (self._fmt_sql_identifier(tablename), ",".join(["?"]*ncols))
+            for line in reader:
+                vals=[]
+                for i in range(ncols):
+                    l=line[i]
+                    if not l:
+                        vals.append(None)
+                    else:
+                        vals.append(datas[i](l))
+                c.execute(sql, vals)
+
+            c.execute("COMMIT")
+            self.write(self.stdout, "Auto-import into table \"%s\" complete\n" % (tablename,))
+        except:
+            if final:
+                self.db.cursor().execute(final)
+            raise
+
+    def _getdate(self, v):
+        # Returns a tuple of 3 items y,m,d from string v
+        m=re.match(r"^([0-9]+)[^0-9]([0-9]+)[^0-9]([0-9]+)$", v)
+        if not m:
+            raise ValueError
+        y,m,d=int(m.group(1)), int(m.group(2)), int(m.group(3))
+        if d>1000: # swap order
+            y,m,d=d,m,y
+        if y<1000 or y>9999:
+            raise ValueError
+        return y,m,d
+
+    def _getdatetime(self, v):
+        # must be at least HH:MM
+        m=re.match(r"^([0-9]+)[^0-9]([0-9]+)[^0-9]([0-9]+)[^0-9]+([0-9]+)[^0-9]([0-9]+)([^0-9]([0-9]+))?$", v)
+        if not m:
+            raise ValueError
+        items=list(m.group(1,2,3,4,5,7))
+        for i in range(len(items)):
+            if items[i] is None:
+                items[i]=0
+        items=[int(i) for i in items]
+        if items[2]>1000:
+            items=[items[2], items[1], items[0]]+items[3:]
+        if items[0]<1000 or items[0]>9999:
+            raise ValueError
+        return items
+
+    def command_indices(self, cmd):
+        """indices TABLE: Lists all indices on table TABLE
+
+        """
+        if len(cmd)!=1:
+            raise self.Error("indices takes one table name")
+        self.push_output()
+        self.header=False
+        self.output=self.output_list
+        try:
+            self.process_sql("SELECT name FROM sqlite_master WHERE type='index' AND tbl_name LIKE ?1 "
+                             "UNION ALL SELECT name FROM sqlite_temp_master WHERE type='index' AND tbl_name LIKE "
+                             "?1 ORDER by name", cmd, internal=True)
+        finally:
+            self.pop_output()
+
+    def command_load(self, cmd):
+        """load FILE ?ENTRY?: Loads a SQLite extension library
+
+        Note: Extension loading may not be enabled in the SQLite
+        library version you are using.
+
+        Extensions are an easy way to add new functions and
+        functionality.  For a useful extension look at the bottom of
+        https://sqlite.org/contrib
+
+        By default sqlite3_extension_init is called in the library but
+        you can specify an alternate entry point.
+
+        If you get an error about the extension not being found you
+        may need to explicitly specify the directory.  For example if
+        it is in the current directory then use:
+
+          .load ./extension.so
+        """
+        if len(cmd)<1 or len(cmd)>2:
+            raise self.Error("load takes one or two parameters")
+        try:
+            self.db.enableloadextension(True)
+        except:
+            raise self.Error("Extension loading is not supported")
+
+        self.db.loadextension(*cmd)
+
+    _output_modes=None
+
+    def command_mode(self, cmd):
+        """mode MODE ?TABLE?: Sets output mode to one of"""
+        if len(cmd) in (1,2):
+            w=cmd[0]
+            if w=="tabs":
+                w="list"
+            m=getattr(self, "output_"+w, None)
+            if w!="insert":
+                if len(cmd)==2:
+                    raise self.Error("Output mode %s doesn't take parameters" % (cmd[0]))
+            if m:
+                self.output=m
+                # set some defaults
+                self.truncate=True
+                if cmd[0]=="csv":
+                    self.separator=","
+                elif cmd[0]=="tabs":
+                    self.separator="\t"
+                else:
+                    pass
+                    #self.separator=self._output_stack[0]["separator"]
+                if w=="insert":
+                    if len(cmd)==2:
+                        self._output_table=cmd[1]
+                    else:
+                        self._output_table="table"
+                    self._output_table=self._fmt_sql_identifier(self._output_table)
+                return
+        if not self._output_modes:
+            self._cache_output_modes()
+        raise self.Error("Expected a valid output mode: "+", ".join(self._output_modes))
+
+    # needed so command completion and help can use it
+    def _cache_output_modes(self):
+        modes=[m[len("output_"):] for m in dir(self) if m.startswith("output_")]
+        modes.append("tabs")
+        modes.sort()
+        self._output_modes=modes
+
+        detail=[]
+
+        for m in modes:
+            if m=='tabs': continue
+            d=getattr(self, "output_"+m).__doc__
+            assert d, "output mode "+m+" needs doc"
+            d=d.replace("\n", " ").strip()
+            while "  " in d:
+                d=d.replace("  ", " ")
+            detail.append(m+": "+d)
+        self._output_modes_detail=detail
+
+    def command_nullvalue(self, cmd):
+        """nullvalue STRING: Print STRING in place of null values
+
+        This affects textual output modes like column and list and
+        sets how SQL null values are shown.  The default is a zero
+        length string.  Insert mode and dumps are not affected by this
+        setting.  You can use double quotes to supply a zero length
+        string.  For example:
+
+          .nullvalue ""         # the default
+          .nullvalue <NULL>     # rather obvious
+          .nullvalue " \\t "     # A tab surrounded by spaces
+        """
+        if len(cmd)!=1:
+            raise self.Error("nullvalue takes exactly one parameter")
+        self.nullvalue=self.fixup_backslashes(cmd[0])
+
+    def command_output(self, cmd):
+        """output FILENAME: Send output to FILENAME (or stdout)
+
+        If the FILENAME is stdout then output is sent to standard
+        output from when the shell was started.  The file is opened
+        using the current encoding (change with .encoding command).
+        """
+        # Flush everything
+        self.stdout.flush()
+        self.stderr.flush()
+        if hasattr(self.stdin, "flush"):
+            try:
+                self.stdin.flush()
+            except IOError: # see issue 117
+                pass
+
+        # we will also close stdout but only do so once we have a
+        # replacement so that stdout is always valid
+
+        if len(cmd)!=1:
+            raise self.Error("You must specify a filename")
+
+        try:
+            fname=cmd[0]
+            if fname=="stdout":
+                old=None
+                if self.stdout!=self._original_stdout:
+                    old=self.stdout
+                self.stdout=self._original_stdout
+                if old is not None: # done here in case close raises exception
+                    old.close()
+                return
+
+            newf=codecs.open(fname, "w", self.encoding[0], self.encoding[1])
+            old=None
+            if self.stdout!=self._original_stdout:
+                old=self.stdout
+            self.stdout=newf
+            if old is not None:
+                old.close()
+        finally:
+            self._out_colour()
+
+    def command_print(self, cmd):
+        """print STRING: print the literal STRING
+
+        If more than one argument is supplied then they are printed
+        space separated.  You can use backslash escapes such as \\n
+        and \\t.
+        """
+        self.write(self.stdout, " ".join([self.fixup_backslashes(i) for i in cmd])+"\n")
+
+    def command_prompt(self, cmd):
+        """prompt MAIN ?CONTINUE?: Changes the prompts for first line and continuation lines
+
+        The default is to print 'sqlite> ' for the main prompt where
+        you can enter a dot command or a SQL statement.  If the SQL
+        statement is complete (eg not ; terminated) then you are
+        prompted for more using the continuation prompt which defaults
+        to ' ..> '.  Example:
+
+          .prompt "Yes, Master> " "More, Master> "
+
+        You can use backslash escapes such as \\n and \\t.
+        """
+        if len(cmd)<1 or len(cmd)>2:
+            raise self.Error("prompt takes one or two arguments")
+        self.prompt=self.fixup_backslashes(cmd[0])
+        if len(cmd)==2:
+            self.moreprompt=self.fixup_backslashes(cmd[1])
+
+    def command_read(self, cmd):
+        """read FILENAME: Processes SQL and commands in FILENAME (or Python if FILENAME ends with .py)
+
+        Treats the specified file as input (a mixture or SQL and/or
+        dot commands).  If the filename ends in .py then it is treated
+        as Python code instead.
+
+        For Python code the symbol 'shell' refers to the instance of
+        the shell and 'apsw' is the apsw module.
+        """
+        if len(cmd)!=1:
+            raise self.Error("read takes a single filename")
+        if cmd[0].lower().endswith(".py"):
+            g={}
+            g.update({'apsw': apsw, 'shell': self})
+            if sys.version_info<(3,0):
+                execfile(cmd[0], g, g)
+            else:
+                # compile step is needed to associate name with code
+                exec(compile(open(cmd[0]).read(), cmd[0], 'exec'), g, g)
+        else:
+            f=codecs.open(cmd[0], "rU", self.encoding[0])
+            try:
+                try:
+                    self.push_input()
+                    self.stdin=f
+                    self.interactive=False
+                    self.input_line_number=0
+                    while True:
+                        line=self.getcompleteline()
+                        if line is None:
+                            break
+                        self.process_complete_line(line)
+                except:
+                    eval=sys.exc_info()[1]
+                    if not isinstance(eval, SystemExit):
+                        self._append_input_description()
+                    raise
+
+            finally:
+                self.pop_input()
+                f.close()
+
+    def command_restore(self, cmd):
+        """restore ?DB? FILE: Restore database from FILE into DB (default "main")
+
+        Copies the contents of FILE to the current database (default "main").
+        The backup is done at the page level - SQLite copies the pages as
+        is.  There is no round trip through SQL code.
+        """
+        dbname="main"
+        if len(cmd)==1:
+            fname=cmd[0]
+        elif len(cmd)==2:
+            dbname=cmd[0]
+            fname=cmd[1]
+        else:
+            raise self.Error("Restore takes one or two parameters")
+        input=apsw.Connection(fname)
+        b=self.db.backup(dbname, input, "main")
+        try:
+            while not b.done:
+                b.step()
+        finally:
+            b.finish()
+            input.close()
+
+    def command_schema(self, cmd):
+        """schema ?TABLE? [TABLE...]: Shows SQL for table
+
+        If you give one or more tables then their schema is listed
+        (including indices).  If you don't specify any then all
+        schemas are listed. TABLE is a like pattern so you can % for
+        wildcards.
+        """
+        self.push_output()
+        self.output=self.output_list
+        self.header=False
+        try:
+            if len(cmd)==0:
+                cmd=['%']
+            for n in cmd:
+                self.process_sql("SELECT sql||';' FROM "
+                                 "(SELECT sql sql, type type, tbl_name tbl_name, name name "
+                                 "FROM sqlite_master UNION ALL "
+                                 "SELECT sql, type, tbl_name, name FROM sqlite_temp_master) "
+                                 "WHERE tbl_name LIKE ?1 AND type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "
+                                 "ORDER BY substr(type,2,1), name", (n,), internal=True)
+        finally:
+            self.pop_output()
+
+    def command_separator(self, cmd):
+        """separator STRING: Change separator for output mode and .import
+
+        You can use quotes and backslashes.  For example to set the
+        separator to space tab space you can use:
+
+          .separator " \\t "
+
+        The setting is automatically changed when you switch to csv or
+        tabs output mode.  You should also set it before doing an
+        import (ie , for CSV and \\t for TSV).
+        """
+        if len(cmd)!=1:
+            raise self.Error("separator takes exactly one parameter")
+        self.separator=self.fixup_backslashes(cmd[0])
+
+    _shows=("echo", "explain", "headers", "mode", "nullvalue", "output", "separator", "width", "exceptions", "encoding")
+
+    def command_show(self, cmd):
+        """show: Show the current values for various settings."""
+        if len(cmd)>1:
+            raise self.Error("show takes at most one parameter")
+        if len(cmd):
+            what=cmd[0]
+            if what not in self._shows:
+                raise self.Error("Unknown show: '%s'" % (what,))
+        else:
+            what=None
+
+        outs=[]
+        for i in self._shows:
+            k=i
+            if what and i!=what:
+                continue
+            # boolean settings
+            if i in ("echo", "headers", "exceptions"):
+                if i=="headers": i="header"
+                v="off"
+                if getattr(self, i):
+                    v="on"
+            elif i=="explain":
+                # we cheat by looking at truncate setting!
+                v="on"
+                if self.truncate:
+                    v="off"
+            elif i in ("nullvalue", "separator"):
+                v=self._fmt_c_string(getattr(self, i))
+            elif i=="mode":
+                if not self._output_modes:
+                    self._cache_output_modes()
+                for v in self._output_modes:
+                    if self.output==getattr(self, "output_"+v):
+                        break
+                else:
+                    assert False, "Bug: didn't find output mode"
+            elif i=="output":
+                if self.stdout is self._original_stdout:
+                    v="stdout"
+                else:
+                    v=getattr(self.stdout, "name", "<unknown stdout>")
+            elif i=="width":
+                v=" ".join(["%d"%(i,) for i in self.widths])
+            elif i=="encoding":
+                v=self.encoding[0]
+                if self.encoding[1]:
+                    v+=" (Errors "+self.encoding[1]+")"
+            else:
+                assert False, "Bug: unknown show handling"
+            outs.append( (k,v) )
+
+        # find width of k column
+        l=0
+        for k,v in outs:
+            if len(k)>l:
+                l=len(k)
+
+        for k,v in outs:
+            self.write(self.stderr, "%*.*s: %s\n" % (l,l, k, v))
+
+    def command_tables(self, cmd):
+        """tables ?PATTERN?: Lists names of tables matching LIKE pattern
+
+        This also returns views.
+        """
+        self.push_output()
+        self.output=self.output_list
+        self.header=False
+        try:
+            if len(cmd)==0:
+                cmd=['%']
+
+            # The SQLite shell code filters out sqlite_ prefixes if
+            # you specified an argument else leaves them in.  It also
+            # has a hand coded output mode that does space separation
+            # plus wrapping at 80 columns.
+            for n in cmd:
+                self.process_sql("SELECT name FROM sqlite_master "
+                                 "WHERE type IN ('table', 'view') AND name NOT LIKE 'sqlite_%' "
+                                 "AND name like ?1 "
+                                 "UNION ALL "
+                                 "SELECT name FROM sqlite_temp_master "
+                                 "WHERE type IN ('table', 'view') AND name NOT LIKE 'sqlite_%' "
+                                 "ORDER BY 1", (n,), internal=True)
+        finally:
+            self.pop_output()
+
+    def command_timeout(self, cmd):
+        """timeout MS: Try opening locked tables for MS milliseconds
+
+        If a database is locked by another process SQLite will keep
+        retrying.  This sets how many thousandths of a second it will
+        keep trying for.  If you supply zero or a negative number then
+        all busy handlers are disabled.
+        """
+        if len(cmd)!=1:
+            raise self.Error("timeout takes a number")
+        try:
+            t=int(cmd[0])
+        except:
+            raise self.Error("%s is not a number" % (cmd[0],))
+        self.db.setbusytimeout(t)
+
+    def command_timer(self, cmd):
+        """timer ON|OFF: Control printing of time and resource usage after each query
+
+        The values displayed are in seconds when shown as floating
+        point or an absolute count.  Only items that have changed
+        since starting the query are shown.  On non-Windows platforms
+        considerably more information can be shown.
+        """
+        if self._boolean_command("timer", cmd):
+            try:
+                self.get_resource_usage()
+            except:
+                raise self.Error("Timing not supported by this Python version/platform")
+            self.timer=True
+        else:
+            self.timer=False
+
+    def command_width(self, cmd):
+        """width NUM NUM ...: Set the column widths for "column" mode
+
+        In "column" output mode, each column is a fixed width with values truncated to
+        fit.  Specify new widths using this command.  Use a negative number
+        to right justify and zero for default column width.
+        """
+        if len(cmd)==0:
+            raise self.Error("You need to specify some widths!")
+        w=[]
+        for i in cmd:
+            try:
+                w.append(int(i))
+            except:
+                raise self.Error("'%s' is not a valid number" % (i,))
+        self.widths=w
+
+    def _terminal_width(self):
+        """Works out the terminal width which is used for word wrapping
+        some output (eg .help)"""
+        try:
+            if sys.platform=="win32":
+                import ctypes, struct
+                h=ctypes.windll.kernel32.GetStdHandle(-12) # -12 is stderr
+                buf=ctypes.create_string_buffer(22)
+                if ctypes.windll.kernel32.GetConsoleScreenBufferInfo(h, buf):
+                    _,_,_,_,_,left,top,right,bottom,_,_=struct.unpack("hhhhHhhhhhh", buf.raw)
+                    return right-left
+                raise Exception()
+            else:
+                # posix
+                import struct, fcntl, termios
+                s=struct.pack('HHHH', 0,0,0,0)
+                x=fcntl.ioctl(2, termios.TIOCGWINSZ, s)
+                return struct.unpack('HHHH', x)[1]
+        except:
+            try:
+                v=int(os.getenv("COLUMNS"))
+                if v<10:
+                    return 80
+                return v
+            except:
+                return 80
+
+    def push_output(self):
+        """Saves the current output settings onto a stack.  See
+        :meth:`pop_output` for more details as to why you would use
+        this."""
+        o={}
+        for k in "separator", "header", "nullvalue", "output", "widths", "truncate":
+            o[k]=getattr(self, k)
+        self._output_stack.append(o)
+
+    def pop_output(self):
+        """Restores most recently pushed output.  There are many
+        output parameters such as nullvalue, mode
+        (list/tcl/html/insert etc), column widths, header etc.  If you
+        temporarily need to change some settings then
+        :meth:`push_output`, change the settings and then pop the old
+        ones back.
+
+        A simple example is implementing a command like .dump.  Push
+        the current output, change the mode to insert so we get SQL
+        inserts printed and then pop to go back to what was there
+        before.
+
+        """
+        # first item should always be present
+        assert len(self._output_stack)
+        if len(self._output_stack)==1:
+            o=self._output_stack[0]
+        else:
+            o=self._output_stack.pop()
+        for k,v in o.items():
+            setattr(self,k,v)
+
+    def _append_input_description(self):
+        """When displaying an error in :meth:`handle_exception` we
+        want to give context such as when the commands being executed
+        came from a .read command (which in turn could execute another
+        .read).
+        """
+        if self.interactive:
+            return
+        res=[]
+        res.append("Line %d" % (self.input_line_number,))
+        res.append(": "+getattr(self.stdin, "name", "<stdin>"))
+        self._input_descriptions.append(" ".join(res))
+
+    def fixup_backslashes(self, s):
+        """Implements the various backlash sequences in s such as
+        turning backslash t into a tab.
+
+        This function is needed because shlex does not do it for us.
+        """
+        if "\\" not in s: return s
+        # See the resolve_backslashes function in SQLite shell source
+        res=[]
+        i=0
+        while i<len(s):
+            if s[i]!="\\":
+                res.append(s[i])
+                i+=1
+                continue
+            i+=1
+            if i>=len(s):
+                raise self.Error("Backslash with nothing following")
+            c=s[i]
+            res.append({
+                "\\": "\\",
+                "r": "\r",
+                "n": "\n",
+                "t": "\t"
+                }.get(c, None))
+            i+=1 # advance again
+            if res[-1] is None:
+                raise self.Error("Unknown backslash sequence \\"+c)
+        return "".join(res)
+
+    if sys.version_info<(3,0):
+        def write(self, dest, text):
+            """Writes text to dest.  dest will typically be one of self.stdout or self.stderr."""
+            # ensure text is unicode to catch codeset issues here
+            if type(text)!=unicode:
+                text=unicode(text)
+            try:
+                dest.write(text)
+            except UnicodeEncodeError:
+                ev=sys.exc_info()[1]
+                # See issue108 and try to work around it
+                if ev.args[0]=="ascii" and dest.encoding and ev.args[0]!=dest.encoding and hasattr(dest, "fileno") and \
+                   isinstance(dest.fileno(), int) and dest.fileno()>=0:
+                    args=[dest.encoding,]
+                    if dest.errors:
+                        args.append(dest.errors)
+                    dest.write(text.encode(*args))
+                else:
+                    raise
+
+        _raw_input=raw_input
+    else:
+        def write(self, dest, text):
+            "Writes text to dest.  dest will typically be one of self.stdout or self.stderr."
+            dest.write(text)
+        _raw_input=input
+
+    def getline(self, prompt=""):
+        """Returns a single line of input (may be incomplete SQL) from self.stdin.
+
+        If EOF is reached then return None.  Do not include trailing
+        newline in return.
+        """
+        self.stdout.flush()
+        self.stderr.flush()
+        try:
+            if self.interactive:
+                if self.stdin is sys.stdin:
+                    c=self.colour.prompt, self.colour.prompt_
+                    if self._using_readline and sys.platform!="win32":
+                        # these are needed so that readline knows they are non-printing characters
+                        c="\x01"+c[0]+"\x02", "\x01"+c[1]+"\x02",
+                    line=self._raw_input(c[0]+prompt+c[1])+"\n" # raw_input excludes newline
+                else:
+                    self.write(self.stdout, prompt)
+                    line=self.stdin.readline()  # includes newline unless last line of file doesn't have one
+            else:
+                line=self.stdin.readline()  # includes newline unless last line of file doesn't have one
+            self.input_line_number+=1
+            if sys.version_info<(3,0):
+                if type(line)!=unicode:
+                    enc=getattr(self.stdin, "encoding", self.encoding[0])
+                    if not enc: enc=self.encoding[0]
+                    line=line.decode(enc)
+        except EOFError:
+            return None
+        if len(line)==0: # always a \n on the end normally so this is EOF
+            return None
+        if line[-1]=="\n":
+            line=line[:-1]
+        return line
+
+    def getcompleteline(self):
+        """Returns a complete input.
+
+        For dot commands it will be one line.  For SQL statements it
+        will be as many as is necessary to have a
+        :meth:`~apsw.complete` statement (ie semicolon terminated).
+        Returns None on end of file."""
+        try:
+            self._completion_first=True
+            command=self.getline(self.prompt)
+            if command is None:
+                return None
+            if len(command.strip())==0:
+                return ""
+            if command[0]=="?": command=".help "+command[1:]
+            # incomplete SQL?
+            while command[0]!="." and not apsw.complete(command):
+                self._completion_first=False
+                line=self.getline(self.moreprompt)
+                if line is None: # unexpected eof
+                    raise self.Error("Incomplete SQL (line %d of %s): %s\n" % (self.input_line_number, getattr(self.stdin, "name", "<stdin>"), command))
+                if line in ("go", "/"):
+                    break
+                command=command+"\n"+line
+            return command
+        except KeyboardInterrupt:
+            self.handle_interrupt()
+            return ""
+
+    def handle_interrupt(self):
+        """Deal with keyboard interrupt (typically Control-C).  It
+        will :meth:`~Connection.interrupt` the database and print"^C" if interactive."""
+        self.db.interrupt()
+        if not self.bail and self.interactive:
+            self.write(self.stderr, "^C\n")
+            return
+        raise
+
+    def process_complete_line(self, command):
+        """Given some text will call the appropriate method to process
+        it (eg :meth:`process_sql` or :meth:`process_command`)"""
+        try:
+            if len(command.strip())==0:
+                return
+            if command[0]==".":
+                self.process_command(command)
+            else:
+                self.process_sql(command)
+        except KeyboardInterrupt:
+            self.handle_interrupt()
+
+    def push_input(self):
+        """Saves the current input paramaters to a stack.  See :meth:`pop_input`."""
+        d={}
+        for i in "interactive", "stdin", "input_line_number":
+            d[i]=getattr(self, i)
+        self._input_stack.append(d)
+
+    def pop_input(self):
+        """Restore most recently pushed input parameters (interactive,
+        self.stdin, linenumber etc).  Use this if implementing a
+        command like read.  Push the current input, read the file and
+        then pop the input to go back to before.
+        """
+        assert(len(self._input_stack))>1
+        d=self._input_stack.pop()
+        for k,v in d.items():
+            setattr(self, k, v)
+
+    def complete(self, token, state):
+        """Return a possible completion for readline
+
+        This function is called with state starting at zero to get the
+        first completion, then one/two/three etc until you return None.  The best
+        implementation is to generate the list when state==0, save it,
+        and provide members on each increase.
+
+        The default implementation extracts the current full input
+        from readline and then calls :meth:`complete_command` or
+        :meth:`complete_sql` as appropriate saving the results for
+        subsequent calls.
+        """
+        if state==0:
+            import readline
+            # the whole line
+            line=readline.get_line_buffer()
+            # begining and end(+1) of the token in line
+            beg=readline.get_begidx()
+            end=readline.get_endidx()
+            # Are we matching a command?
+            try:
+                if self._completion_first and line.startswith("."):
+                    self.completions=self.complete_command(line, token, beg, end)
+                else:
+                    self.completions=self.complete_sql(line, token, beg, end)
+            except:
+                # Readline swallows any exceptions we raise.  We
+                # shouldn't be raising any so this is to catch that
+                import traceback; traceback.print_exc()
+                raise
+
+        if state>len(self.completions):
+            return None
+        return self.completions[state]
+
+    # Taken from https://sqlite.org/lang_keywords.html
+    _sqlite_keywords="""ABORTADD AFTER ALL ALTER ANALYZE AND AS ASC ATTACH AUTOINCREMENT
+           BEFORE BEGIN BETWEEN BY CASCADE CASE CAST CHECK COLLATE COLUMN COMMIT
+           CONFLICT CONSTRAINT CREATE CROSS CURRENT_DATE CURRENT_TIME
+           CURRENT_TIMESTAMP DATABASE DEFAULT DEFERRABLE DEFERRED DELETE DESC
+           DETACH DISTINCT DROP EACH ELSE END ESCAPE EXCEPT EXCLUSIVE EXISTS
+           EXPLAIN FAIL FOR FOREIGN FROM FULL GLOB GROUP HAVING IF IGNORE
+           IMMEDIATE IN INDEX INDEXED INITIALLY INNER INSERT INSTEAD INTERSECT
+           INTO IS ISNULL JOIN KEY LEFT LIKE LIMIT MATCH NATURAL NOT NOTNULL NULL
+           OF OFFSET ON OR ORDER OUTER PLAN PRAGMA PRIMARY QUERY RAISE REFERENCES
+           REGEXP REINDEX RELEASE RENAME REPLACE RESTRICT RIGHT ROLLBACK ROW
+           SAVEPOINT SELECT SET TABLE TEMP TEMPORARY THEN TO TRANSACTION TRIGGER
+           UNION UNIQUE UPDATE USING VACUUM VALUES VIEW VIRTUAL WHEN WHERE""".split()
+    # reserved words need to be quoted.  Only a subset of the above are reserved
+    # but what the heck
+    _sqlite_reserved=_sqlite_keywords
+    # add a space after each of them except functions which get parentheses
+    _sqlite_keywords=[x+(" ", "(")[x in ("VALUES", "CAST")] for x in _sqlite_keywords]
+
+    _sqlite_special_names="""_ROWID_ OID ROWID SQLITE_MASTER
+           SQLITE_SEQUENCE""".split()
+
+    _sqlite_functions="""abs( changes() char( coalesce( glob( ifnull(
+           hex( instr( last_insert_rowid() length( like(
+           load_extension( lower( ltrim( max( min( nullif( quote(
+           random() randomblob( replace( round( rtrim( soundex(
+           sqlite_compileoption_get( sqlite_compileoption_used(
+           sqlite_source_id() sqlite_version() substr( total_changes()
+           trim( typeof( unicode( upper( zeroblob( date( time( datetime(
+           julianday( strftime(  avg( count( group_concat( sum( total(""".split()
+
+    _pragmas_bool=("yes", "true", "on", "no", "false", "off")
+    _pragmas={"application_id": None,
+              "auto_vacuum=": ("NONE", "FULL", "INCREMENTAL"),
+              "automatic_index=": _pragmas_bool,
+              "cache_size=": None,
+              "case_sensitive_like=": _pragmas_bool,
+              "checkpoint_fullfsync=": _pragmas_bool,
+              "collation_list": None,
+              "compile_options": None,
+              "database_list": None,
+              "default_cache_size=": None,
+              "encoding=": None,
+              # ('"UTF-8"', '"UTF-16"', '"UTF-16le"', '"UTF16-16be"'),
+              # too hard to get " to be part of token just in this special case
+              "foreign_key_check": None,
+              "foreign_key_list(": None,
+              "foreign_keys": _pragmas_bool,
+              "freelist_count": None,
+              "fullfsync=": _pragmas_bool,
+              "ignore_check_constraints": _pragmas_bool,
+              "incremental_vacuum(": None,
+              "index_info(": None,
+              "index_list(": None,
+              "integrity_check": None,
+              "journal_mode=": ("DELETE", "TRUNCATE", "PERSIST", "MEMORY", "OFF", "WAL"),
+              "journal_size_limit=": None,
+              "legacy_file_format=": _pragmas_bool,
+              "locking_mode=": ("NORMAL", "EXCLUSIVE"),
+              "max_page_count=": None,
+              "page_count;": None,
+              "page_size=": None,
+              "quick_check": None,
+              "read_uncommitted=": _pragmas_bool,
+              "recursive_triggers=": _pragmas_bool,
+              "reverse_unordered_selects=": _pragmas_bool,
+              "schema_version": None,
+              "secure_delete=": _pragmas_bool,
+              "shrink_memory": None,
+              "synchronous=": ("OFF", "NORMAL", "FULL"),
+              "table_info(": None,
+              "temp_store=": ("DEFAULT", "FILE", "MEMORY"),
+              "temp_store_directory=": None,
+              "wal_autocheckpoint=": None,
+              "wal_checkpoint": None,
+              "writable_schema": _pragmas_bool,
+              }
+
+    def _get_prev_tokens(self, line, end):
+        "Returns the tokens prior to pos end in the line"
+        return re.findall(r'"?\w+"?', line[:end])
+
+
+    def complete_sql(self, line, token, beg, end):
+        """Provide some completions for SQL
+
+        :param line: The current complete input line
+        :param token: The word readline is looking for matches
+        :param beg: Integer offset of token in line
+        :param end: Integer end of token in line
+        :return: A list of completions, or an empty list if none
+        """
+        if self._completion_cache is None:
+            cur=self.db.cursor()
+            collations=[row[1] for row in cur.execute("pragma collation_list")]
+            databases=[row[1] for row in cur.execute("pragma database_list")]
+            other=[]
+            for db in databases:
+                if db=="temp":
+                    master="sqlite_temp_master"
+                else:
+                    master="[%s].sqlite_master" % (db,)
+                for row in cur.execute("select * from "+master).fetchall():
+                    for col in (1,2):
+                        if row[col] not in other and not row[col].startswith("sqlite_"):
+                            other.append(row[col])
+                    if row[0]=="table":
+                        try:
+                            for table in cur.execute("pragma [%s].table_info([%s])" % (db, row[1],)).fetchall():
+                                if table[1] not in other:
+                                    other.append(table[1])
+                                for item in table[2].split():
+                                    if item not in other:
+                                        other.append(item)
+                        except apsw.SQLError:
+                            # See https://code.google.com/p/apsw/issues/detail?id=86
+                            pass
+
+            self._completion_cache=[self._sqlite_keywords, self._sqlite_functions, self._sqlite_special_names, collations, databases, other]
+            for i in range(len(self._completion_cache)):
+                self._completion_cache[i].sort()
+
+        # be somewhat sensible about pragmas
+        if "pragma " in line.lower():
+            t=self._get_prev_tokens(line.lower(), end)
+
+            # pragma foo = bar
+            if len(t)>2 and t[-3]=="pragma":
+                # t[-2] should be a valid one
+                for p in self._pragmas:
+                    if p.replace("=","")==t[-2]:
+                        vals=self._pragmas[p]
+                        if not vals:
+                            return []
+                        return [x+";" for x in vals if x.startswith(token)]
+            # at equals?
+            if len(t)>1 and t[-2]=="pragma" and line[:end].replace(" ","").endswith("="):
+                for p in self._pragmas:
+                    if p.replace("=","")==t[-1]:
+                        vals=self._pragmas[p]
+                        if not vals:
+                            return []
+                        return vals
+            # pragma foo
+            if len(t)>1 and t[-2]=="pragma":
+                res=[x for x in self._pragmas.keys() if x.startswith(token)]
+                res.sort()
+                return res
+
+            # pragma
+            if len(t) and t[-1]=="pragma":
+                res=list(self._pragmas.keys())
+                res.sort()
+                return res
+
+        # This is currently not context sensitive (eg it doesn't look
+        # to see if last token was 'FROM' and hence next should only
+        # be table names.  That is a SMOP like pragmas above
+        res=[]
+        ut=token.upper()
+        for corpus in self._completion_cache:
+            for word in corpus:
+                if word.upper().startswith(ut):
+                    # potential match - now match case
+                    if word.startswith(token): # exact
+                        if word not in res:
+                            res.append(word)
+                    elif word.lower().startswith(token): # lower
+                        if word.lower() not in res:
+                            res.append(word.lower())
+                    elif word.upper().startswith(token): # upper
+                        if word.upper() not in res:
+                            res.append(word.upper())
+                    else:
+                        # match letter by letter otherwise readline mangles what was typed in
+                        w=token+word[len(token):]
+                        if w not in res:
+                            res.append(w)
+        return res
+
+    _builtin_commands=None
+
+    def complete_command(self, line, token, beg, end):
+        """Provide some completions for dot commands
+
+        :param line: The current complete input line
+        :param token: The word readline is looking for matches
+        :param beg: Integer offset of token in line
+        :param end: Integer end of token in line
+        :return: A list of completions, or an empty list if none
+        """
+        if not self._builtin_commands:
+            self._builtin_commands=["."+x[len("command_"):] for x in dir(self) if x.startswith("command_") and x!="command_headers"]
+        if beg==0:
+            # some commands don't need a space because they take no
+            # params but who cares?
+            return [x+" " for x in self._builtin_commands if x.startswith(token)]
+        return None
+
+    def get_resource_usage(self):
+        """Return a dict of various numbers (ints or floats).  The
+        .timer command shows the difference between before and after
+        results of what this returns by calling :meth:`display_timing`"""
+        if sys.platform=="win32":
+            import ctypes, time, platform
+            ctypes.windll.kernel32.GetProcessTimes.argtypes=[
+                platform.architecture()[0]=='64bit' and ctypes.c_int64 or ctypes.c_int32,
+                ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]
+
+            # All 4 out params have to be present.  FILETIME is really
+            # just a 64 bit quantity in 100 nanosecond granularity
+            dummy=ctypes.c_ulonglong()
+            utime=ctypes.c_ulonglong()
+            stime=ctypes.c_ulonglong()
+            rc=ctypes.windll.kernel32.GetProcessTimes(
+                ctypes.windll.kernel32.GetCurrentProcess(),
+                ctypes.byref(dummy),  # creation time
+                ctypes.byref(dummy),  # exit time
+                ctypes.byref(stime),
+                ctypes.byref(utime))
+            if rc:
+                return {'Wall clock': time.time(),
+                        'User time': float(utime.value)/10000000,
+                        'System time': float(stime.value)/10000000}
+            return {}
+        else:
+            import resource, time
+            r=resource.getrusage(resource.RUSAGE_SELF)
+            res={'Wall clock': time.time()}
+            for i,desc in ( ("utime", "User time"),
+                       ("stime", "System time"),
+                       ("maxrss", "Max rss"),
+                       ("idrss", "Memory"),
+                       ("isrss", "Stack"),
+                       ("ixrss", "Shared Memory"),
+                       ("minflt", "PF (no I/O)"),
+                       ("majflt", "PF (I/O)"),
+                       ("inblock", "Blocks in"),
+                       ("oublock", "Blocks out"),
+                       ("nsignals", "Signals"),
+                       ("nvcsw", "Voluntary context switches"),
+                       ("nivcsw", "Involunary context switches"),
+                       ("msgrcv", "Messages received"),
+                       ("msgsnd", "Messages sent"),
+                       ("nswap", "Swaps"),
+                       ):
+                f="ru_"+i
+                if hasattr(r, f):
+                    res[desc]=getattr(r,f)
+            return res
+
+    def display_timing(self, b4, after):
+        """Writes the difference between b4 and after to self.stderr.
+        The data is dictionaries returned from
+        :meth:`get_resource_usage`."""
+        v=list(b4.keys())
+        for i in after:
+            if i not in v:
+                v.append(i)
+        v.sort()
+        for k in v:
+            if k in b4 and k in after:
+                one=b4[k]
+                two=after[k]
+                val=two-one
+                if val:
+                    if type(val)==float:
+                        self.write(self.stderr, "+ %s: %.4f\n" % (k, val))
+                    else:
+                        self.write(self.stderr, "+ %s: %d\n" % (k, val))
+
+    ### Colour support
+
+    def _out_colour(self):
+        # Sets up color for output.  Input being interactive doesn't
+        # matter.  This method needs to be called on all changes to
+        # output.
+        if getattr(self.stdout, "isatty", False) and self.stdout.isatty():
+            self.colour=self._colours[self.colour_scheme]
+        else:
+            self.colour=self._colours["off"]
+
+    # This class returns an empty string for all undefined attributes
+    # so that it doesn't matter if a colour scheme leaves something
+    # out.
+    class _colourscheme:
+        def __init__(self, **kwargs):
+            for k,v in kwargs.items():
+                setattr(self, k, v)
+        def __nonzero__(self): return True
+        def __str__(self): return "_colourscheme("+str(self.__dict__)+")"
+        def __getattr__(self, k):
+            return ""
+        def colour_value(self, val, formatted):
+            c=self.colour
+            if val is None:
+                return self.vnull+formatted+self.vnull_
+            if isinstance(val, Shell._basestring):
+                return self.vstring+formatted+self.vstring_
+            if isinstance(val, Shell._binary_type):
+                return self.vblob+formatted+self.vblob_
+            # must be a number - we don't distinguish between float/int
+            return self.vnumber+formatted+self.vnumber_
+
+    # The colour definitions - the convention is the name to turn
+    # something on and the name with an underscore suffix to turn it
+    # off
+    d=_colourscheme(**dict([(v, "\x1b["+str(n)+"m") for n,v in {0: "reset", 1: "bold", 4: "underline", 22: "bold_", 24: "underline_",
+     7: "inverse", 27: "inverse_",
+     30: "fg_black", 31: "fg_red", 32: "fg_green", 33: "fg_yellow", 34: "fg_blue", 35: "fg_magenta", 36: "fg_cyan", 37: "fg_white", 39: "fg_",
+     40: "bg_black", 41: "bg_red", 42: "bg_green", 43: "bg_yellow", 44: "bg_blue", 45: "bg_magenta", 46: "bg_cyan", 47: "bg_white", 49: "bg_"}.items()]))
+
+    _colours={"off": _colourscheme(colour_value=lambda x,y: y)}
+
+    _colours["default"]=_colourscheme(prompt=d.bold, prompt_=d.bold_,
+                                      error=d.fg_red+d.bold, error_=d.bold_+d.fg_,
+                                      intro=d.fg_blue+d.bold, intro_=d.bold_+d.fg_,
+                                      summary=d.fg_blue+d.bold, summary_=d.bold_+d.fg_,
+                                      header=sys.platform=="win32" and d.inverse or d.underline,
+                                      header_=sys.platform=="win32" and d.inverse_ or d.underline_,
+                                      vnull=d.fg_red, vnull_=d.fg_,
+                                      vstring=d.fg_yellow, vstring_=d.fg_,
+                                      vblob=d.fg_blue, vblob_=d.fg_,
+                                      vnumber=d.fg_magenta, vnumber_=d.fg_)
+    if sys.platform=="win32":
+        if not _win_colour:
+            for k in _colours:
+                _colours[k]=_colours["off"]
+    # unpollute namespace
+    del d
+    del _colourscheme
+    try:
+        del n
+        del x
+        del v
+    except:
+        pass
+
+def main():
+    # Docstring must start on second line so dedenting works correctly
+    """
+    Call this to run the interactive shell.  It automatically passes
+    in sys.argv[1:] and exits Python when done.
+
+    """
+    try:
+        s=Shell()
+        _,_,cmds=s.process_args(sys.argv[1:])
+        if len(cmds)==0:
+            s.cmdloop()
+    except:
+        v=sys.exc_info()[1]
+        if getattr(v, "_handle_exception_saw_this", False):
+            pass
+        else:
+            # Where did this exception come from?
+            import traceback; traceback.print_exc()
+        sys.exit(1)
+
+if __name__=='__main__':
+    main()
diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 04e0c7c8f8..2d6f88b405 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -988,9 +988,10 @@ class DB(object):
         uv = int(self.user_version)
 
         if sql is None:
+            from apsw_shell import Shell
             callback(_('Dumping database to SQL') + '...')
             buf = StringIO()
-            shell = apsw.Shell(db=self.conn, stdout=buf)
+            shell = Shell(db=self.conn, stdout=buf)
             shell.process_command('.dump')
             sql = buf.getvalue()
 
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index f4b8553164..921b3fb6e6 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -581,3 +581,13 @@ class WritingTest(BaseTest):
         cache.add_format(1, 'ADD', BytesIO(b'xxxx'))
         test_invalidate()
     # }}}
+
+    def test_dump_and_restore(self):  # {{{
+        ' Test roundtripping the db through SQL '
+        cache = self.init_cache()
+        all_ids = cache.all_book_ids()
+        cache.dump_and_restore()
+        self.assertEqual(cache.set_field('title', {1:'nt'}), set([1]), 'database connection broken')
+        cache = self.init_cache()
+        self.assertEqual(cache.all_book_ids(), all_ids, 'dump and restore broke database')
+    # }}}

From 7bb70415bc8ff8785c96e4bc718d9c8671c62344 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 23 Aug 2013 15:30:24 +0200
Subject: [PATCH 0620/1154] Fix (I think) for bug #1215885 - refresh rows when
 convert finishes so composites can update.

---
 src/calibre/gui2/actions/convert.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index aaadd1a452..dd5121abf9 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -263,9 +263,11 @@ class ConvertAction(InterfaceAction):
                     pass
         self.gui.tags_view.recount()
         if self.gui.current_view() is self.gui.library_view:
-            current = self.gui.library_view.currentIndex()
+            lv = self.gui.library_view
+            current = lv.currentIndex()
             if current.isValid():
-                self.gui.library_view.model().current_changed(current, QModelIndex())
+                lv.model().refresh_ids((book_id,))
+                lv.model().current_changed(current, QModelIndex())
         if manually_fine_tune_toc:
             self.gui.iactions['Edit ToC'].do_one(book_id, fmt.upper())
 

From ef3e011d967371c319749eb2313f3425b4b612bc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 20:01:38 +0530
Subject: [PATCH 0621/1154] pep8

---
 src/calibre/gui2/actions/convert.py | 35 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index fed921ece6..dd1f26b255 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -71,10 +71,11 @@ class ConvertAction(InterfaceAction):
 
     def auto_convert(self, book_ids, on_card, format):
         previous = self.gui.library_view.currentIndex()
-        rows = [x.row() for x in \
+        rows = [x.row() for x in
                 self.gui.library_view.selectionModel().selectedRows()]
         jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
-        if jobs == []: return
+        if jobs == []:
+            return
         self.queue_convert_jobs(jobs, changed, bad, rows, previous,
                 self.book_auto_converted, extra_job_args=[on_card])
 
@@ -92,16 +93,18 @@ class ConvertAction(InterfaceAction):
             jobs, changed, bad = convert_single_ebook(self.gui,
                     self.gui.library_view.model().db, needed, True, of,
                     show_no_format_warning=False)
-            if not jobs: return
+            if not jobs:
+                return
             self.queue_convert_jobs(jobs, changed, bad, list(needed), previous,
                     self.book_converted, rows_are_ids=True)
 
     def auto_convert_mail(self, to, fmts, delete_from_library, book_ids, format, subject):
         previous = self.gui.library_view.currentIndex()
-        rows = [x.row() for x in \
+        rows = [x.row() for x in
                 self.gui.library_view.selectionModel().selectedRows()]
         jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
-        if jobs == []: return
+        if jobs == []:
+            return
         self.queue_convert_jobs(jobs, changed, bad, rows, previous,
                 self.book_auto_converted_mail,
                 extra_job_args=[delete_from_library, to, fmts, subject])
@@ -110,31 +113,34 @@ class ConvertAction(InterfaceAction):
         previous = self.gui.library_view.currentIndex()
         rows = [x.row() for x in self.gui.library_view.selectionModel().selectedRows()]
         jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, ofmt)
-        if jobs == []: return
+        if jobs == []:
+            return
         self.queue_convert_jobs(jobs, changed, bad, rows, previous,
                 self.book_auto_converted_multiple_mail,
                 extra_job_args=[delete_from_library, data])
 
     def auto_convert_news(self, book_ids, format):
         previous = self.gui.library_view.currentIndex()
-        rows = [x.row() for x in \
+        rows = [x.row() for x in
                 self.gui.library_view.selectionModel().selectedRows()]
         jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
-        if jobs == []: return
+        if jobs == []:
+            return
         self.queue_convert_jobs(jobs, changed, bad, rows, previous,
                 self.book_auto_converted_news)
 
     def auto_convert_catalogs(self, book_ids, format):
         previous = self.gui.library_view.currentIndex()
-        rows = [x.row() for x in \
+        rows = [x.row() for x in
                 self.gui.library_view.selectionModel().selectedRows()]
         jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
-        if jobs == []: return
+        if jobs == []:
+            return
         self.queue_convert_jobs(jobs, changed, bad, rows, previous,
                 self.book_auto_converted_catalogs)
 
     def get_books_for_conversion(self):
-        rows = [r.row() for r in \
+        rows = [r.row() for r in
                 self.gui.library_view.selectionModel().selectedRows()]
         if not rows or len(rows) == 0:
             d = error_dialog(self.gui, _('Cannot convert'),
@@ -145,12 +151,13 @@ class ConvertAction(InterfaceAction):
 
     def convert_ebook(self, checked, bulk=None):
         book_ids = self.get_books_for_conversion()
-        if book_ids is None: return
+        if book_ids is None:
+            return
         self.do_convert(book_ids, bulk=bulk)
 
     def do_convert(self, book_ids, bulk=None):
         previous = self.gui.library_view.currentIndex()
-        rows = [x.row() for x in \
+        rows = [x.row() for x in
                 self.gui.library_view.selectionModel().selectedRows()]
         num = 0
         if bulk or (bulk is None and len(book_ids) > 1):
@@ -252,7 +259,7 @@ class ConvertAction(InterfaceAction):
 
             with open(temp_files[-1].name, 'rb') as data:
                 db.add_format(book_id, fmt, data, index_is_id=True)
-            self.gui.status_bar.show_message(job.description + \
+            self.gui.status_bar.show_message(job.description +
                     (' completed'), 2000)
         finally:
             for f in temp_files:

From 86d400d6e81b9002e8f658492b3695cb3bb32f02 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 20:25:46 +0530
Subject: [PATCH 0622/1154] dump and restore: retry after some time if rename
 fails

---
 src/calibre/db/backend.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 2d6f88b405..fed5f002e8 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1003,7 +1003,14 @@ class DB(object):
 
             self.close()
             try:
-                atomic_rename(tmpdb, self.dbpath)
+                try:
+                    atomic_rename(tmpdb, self.dbpath)
+                except:
+                    import gc
+                    for i in xrange(3):
+                        gc.collect()
+                    time.sleep(5)
+                    atomic_rename(tmpdb, self.dbpath)
             finally:
                 self.reopen()
 

From f43f0bba89993994c94ab50e48e4cef23c915ae8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 20:35:09 +0530
Subject: [PATCH 0623/1154] Increase the max sleep time

---
 src/calibre/db/backend.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index fed5f002e8..ed1b53218b 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1009,8 +1009,17 @@ class DB(object):
                     import gc
                     for i in xrange(3):
                         gc.collect()
-                    time.sleep(5)
-                    atomic_rename(tmpdb, self.dbpath)
+                    # Try the rename repeatedly in case something like a virus
+                    # scanner has opened one of the files (I love windows)
+                    for i in xrange(10):
+                        time.sleep(1)
+                        try:
+                            atomic_rename(tmpdb, self.dbpath)
+                            break
+                        except:
+                            if i > 8:
+                                raise
+
             finally:
                 self.reopen()
 

From 4e090c09b801377d7e3fa70c72567d544f6cd8af Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 20:53:53 +0530
Subject: [PATCH 0624/1154] OEB Reader: Properly serialize OPF using utf-8 when
 reading metadata

HTML Input: Handle malformed OPF files when converting.  Fixes #1215924 [Mobipocket conversion fail with error TypeError: Invalid input object: NoneType](https://bugs.launchpad.net/calibre/+bug/1215924)

When reading metadata from OPF files during conversion, the OPF was
serialized in ascii with no encoding declaration which could break for
some bad OPF files.
---
 src/calibre/ebooks/metadata/opf2.py | 2 ++
 src/calibre/ebooks/oeb/reader.py    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 25d4855980..6ae40d157d 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -554,6 +554,8 @@ class OPF(object):  # {{{
                 resolve_entities=True, assume_utf8=True)
         raw = raw[raw.find('<'):]
         self.root     = etree.fromstring(raw, self.PARSER)
+        if self.root is None:
+            raise ValueError('Not an OPF file')
         try:
             self.package_version = float(self.root.get('version', None))
         except (AttributeError, TypeError, ValueError):
diff --git a/src/calibre/ebooks/oeb/reader.py b/src/calibre/ebooks/oeb/reader.py
index cb10b4ccce..b99f5d1087 100644
--- a/src/calibre/ebooks/oeb/reader.py
+++ b/src/calibre/ebooks/oeb/reader.py
@@ -127,7 +127,7 @@ class OEBReader(object):
     def _metadata_from_opf(self, opf):
         from calibre.ebooks.metadata.opf2 import OPF
         from calibre.ebooks.oeb.transforms.metadata import meta_info_to_oeb_metadata
-        stream = cStringIO.StringIO(etree.tostring(opf))
+        stream = cStringIO.StringIO(etree.tostring(opf, xml_declaration=True, encoding='utf-8'))
         mi = OPF(stream).to_book_metadata()
         if not mi.language:
             mi.language = get_lang().replace('_', '-')

From 47d0b6175eda9c7173b1233b5bbdd406cc986d82 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 22:00:48 +0530
Subject: [PATCH 0625/1154] Details on how to add formats to an existing book

---
 manual/gui.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/manual/gui.rst b/manual/gui.rst
index 5b3b96152d..03e012f31e 100755
--- a/manual/gui.rst
+++ b/manual/gui.rst
@@ -62,7 +62,13 @@ Add books
 The :guilabel:`Add books` action can read metadata from a wide variety of ebook formats. In addition, it tries to guess metadata from the filename.
 See the :ref:`config_filename_metadata` section, to learn how to configure this.
 
-To add an additional format for an existing book use the :ref:`edit_meta_information` action.
+To add an additional format for an existing book you can do any of three things:
+
+    1. Drag and drop the file onto the book details panel on the right side of the main window
+           
+    2. Right click the Add books button and choose :guilabel`:Add files to selected books`.
+           
+    3. Click the red add books button in the top right area of the :guilabel:`Edit Metadata` dialog, accessed by the :ref:`edit_meta_information` action.
 
 .. _edit_meta_information:
 

From c5472fe4893b16a78c79f90f061a1ec905140623 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Aug 2013 22:01:32 +0530
Subject: [PATCH 0626/1154] PocketBook driver: Scan for books files in the
 entire device not just in the 'books' folder

---
 src/calibre/devices/eb600/driver.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index e51633f3a1..0c51c8c79d 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -267,6 +267,7 @@ class POCKETBOOK602(USBMS):
 
     EBOOK_DIR_MAIN = 'books'
     SUPPORTS_SUB_DIRS = True
+    SCAN_FROM_ROOT = True
 
     VENDOR_ID   = [0x0525]
     PRODUCT_ID  = [0xa4a5]

From 4daace586008229d876d0dc6747ea7fbc53c1e57 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 08:28:48 +0530
Subject: [PATCH 0627/1154] newdb: Allow sorting on ids

Fix regression that broke calibredb catalog when sorting on the id
field. Fixes #1216090 [calibredb catalog fails on sort_key - KeyError: 'id'](https://bugs.launchpad.net/calibre/+bug/1216090)
---
 src/calibre/db/cache.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 7a6e040218..7ead59ac06 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -820,8 +820,11 @@ class Cache(object):
                 ans = self.fields[fm.get(field, field)].sort_keys_for_books(
                     get_metadata, lang_map, all_book_ids)
             except KeyError:
-                ans = virtual_fields[fm.get(field, field)].sort_keys_for_books(
-                    get_metadata, lang_map, all_book_ids)
+                if field == 'id':
+                    ans = {bid:bid for bid in ids_to_sort}
+                else:
+                    ans = virtual_fields[fm.get(field, field)].sort_keys_for_books(
+                        get_metadata, lang_map, all_book_ids)
             if is_series:
                 idx_ans = self.fields[idx].sort_keys_for_books(
                     get_metadata, lang_map, all_book_ids)

From 14b348b3912962d7333ccd795e46bdad09ff18bb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 11:22:22 +0530
Subject: [PATCH 0628/1154] newdb: Handle damaged one-one text tables

Ignore text records in the database that are damaged, instead of erroring
out. Lets the rest of the data be used. Fixes #1215981 [calibre 1.0 can't find database](https://bugs.launchpad.net/calibre/+bug/1215981)
---
 src/calibre/db/tables.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index c8d974fcf7..6d578e788c 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -92,7 +92,14 @@ class OneToOneTable(Table):
         query = db.conn.execute('SELECT {0}, {1} FROM {2}'.format(idcol,
             self.metadata['column'], self.metadata['table']))
         if self.unserialize is None:
-            self.book_col_map = dict(query)
+            try:
+                self.book_col_map = dict(query)
+            except UnicodeDecodeError:
+                # The db is damaged, try to work around it by ignoring
+                # failures to decode utf-8
+                query = db.conn.execute('SELECT {0}, cast({1} as blob) FROM {2}'.format(idcol,
+                    self.metadata['column'], self.metadata['table']))
+                self.book_col_map = {k:bytes(val).decode('utf-8', 'ignore') for k, val in query}
         else:
             us = self.unserialize
             self.book_col_map = {book_id:us(val) for book_id, val in query}

From 403865c914aad5a93e7b2bc32b418ce82cf8d6f6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 11:22:59 +0530
Subject: [PATCH 0629/1154] Replace instead of ignoring

---
 src/calibre/db/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 6d578e788c..57ca395f4c 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -99,7 +99,7 @@ class OneToOneTable(Table):
                 # failures to decode utf-8
                 query = db.conn.execute('SELECT {0}, cast({1} as blob) FROM {2}'.format(idcol,
                     self.metadata['column'], self.metadata['table']))
-                self.book_col_map = {k:bytes(val).decode('utf-8', 'ignore') for k, val in query}
+                self.book_col_map = {k:bytes(val).decode('utf-8', 'replace') for k, val in query}
         else:
             us = self.unserialize
             self.book_col_map = {book_id:us(val) for book_id, val in query}

From e90ba09426db87c4ea8d1559e73f0b33f36fac14 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 13:08:21 +0530
Subject: [PATCH 0630/1154] Use pysqlite for db re-init as apsw cannot discard
 problem statements

Also move the atomic_rename retry logic into atomic_rename itself,
making it simpler.
---
 src/calibre/db/backend.py      | 18 +-------
 src/calibre/debug.py           | 78 ++++++++++++++++------------------
 src/calibre/library/sqlite.py  | 45 +++++++++++---------
 src/calibre/utils/filenames.py | 11 ++++-
 4 files changed, 72 insertions(+), 80 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index ed1b53218b..2d6f88b405 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1003,23 +1003,7 @@ class DB(object):
 
             self.close()
             try:
-                try:
-                    atomic_rename(tmpdb, self.dbpath)
-                except:
-                    import gc
-                    for i in xrange(3):
-                        gc.collect()
-                    # Try the rename repeatedly in case something like a virus
-                    # scanner has opened one of the files (I love windows)
-                    for i in xrange(10):
-                        time.sleep(1)
-                        try:
-                            atomic_rename(tmpdb, self.dbpath)
-                            break
-                        except:
-                            if i > 8:
-                                raise
-
+                atomic_rename(tmpdb, self.dbpath)
             finally:
                 self.reopen()
 
diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 904ee11be8..043d425c14 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -54,11 +54,7 @@ Everything after the -- is passed to the script.
             'plugin code.')
     parser.add_option('--reinitialize-db', default=None,
             help='Re-initialize the sqlite calibre database at the '
-            'specified path. Useful to recover from db corruption.'
-            ' You can also specify the path to an SQL dump which '
-            'will be used instead of trying to dump the database.'
-            ' This can be useful when dumping fails, but dumping '
-            'with sqlite3 works.')
+            'specified path. Useful to recover from db corruption.')
     parser.add_option('-p', '--py-console', help='Run python console',
             default=False, action='store_true')
     parser.add_option('-m', '--inspect-mobi', action='store_true',
@@ -84,39 +80,42 @@ Everything after the -- is passed to the script.
 
     return parser
 
-def reinit_db(dbpath, callback=None, sql_dump=None):
-    from calibre.db.backend import Connection
-    import apsw
-    import shutil
-    from io import StringIO
+def reinit_db(dbpath):
     from contextlib import closing
-    if callback is None:
-        callback = lambda x, y: None
-    if not os.path.exists(dbpath):
-        raise ValueError(dbpath + ' does not exist')
-
-    with closing(Connection(dbpath)) as conn:
-        uv = int(conn.get('PRAGMA user_version;', all=False))
-        if sql_dump is None:
-            buf = StringIO()
-            shell = apsw.Shell(db=conn, stdout=buf)
-            shell.process_command('.dump')
-            sql = buf.getvalue()
-        else:
-            sql = open(sql_dump, 'rb').read().decode('utf-8')
-
-    dest = dbpath + '.tmp'
-    callback(1, True)
-    try:
-        with closing(Connection(dest)) as conn:
-            conn.execute(sql)
-            conn.execute('PRAGMA user_version=%d;'%int(uv))
-        os.remove(dbpath)
-        shutil.copyfile(dest, dbpath)
-    finally:
-        callback(1, False)
-        if os.path.exists(dest):
-            os.remove(dest)
+    from calibre import as_unicode
+    from calibre.ptempfile import TemporaryFile
+    from calibre.utils.filenames import atomic_rename
+    # We have to use sqlite3 instead of apsw as apsw has no way to discard
+    # problematic statements
+    import sqlite3
+    from calibre.library.sqlite import do_connect
+    with TemporaryFile(suffix='_tmpdb.db', dir=os.path.dirname(dbpath)) as tmpdb:
+        with closing(do_connect(dbpath)) as src, closing(do_connect(tmpdb)) as dest:
+            dest.execute('create temporary table temp_sequence(id INTEGER PRIMARY KEY AUTOINCREMENT)')
+            dest.commit()
+            uv = int(src.execute('PRAGMA user_version;').fetchone()[0])
+            dump = src.iterdump()
+            last_restore_error = None
+            while True:
+                try:
+                    statement = next(dump)
+                except StopIteration:
+                    break
+                except sqlite3.OperationalError as e:
+                    prints('Failed to dump a line:', as_unicode(e))
+                if last_restore_error:
+                    prints('Failed to restore a line:', last_restore_error)
+                    last_restore_error = None
+                try:
+                    dest.execute(statement)
+                except sqlite3.OperationalError as e:
+                    last_restore_error = as_unicode(e)
+                    # The dump produces an extra commit at the end, so
+                    # only print this error if there are more
+                    # statements to be restored
+            dest.execute('PRAGMA user_version=%d;'%uv)
+            dest.commit()
+        atomic_rename(tmpdb, dbpath)
     prints('Database successfully re-initialized')
 
 def debug_device_driver():
@@ -238,10 +237,7 @@ def main(args=sys.argv):
         prints('CALIBRE_EXTENSIONS_PATH='+sys.extensions_location)
         prints('CALIBRE_PYTHON_PATH='+os.pathsep.join(sys.path))
     elif opts.reinitialize_db is not None:
-        sql_dump = None
-        if len(args) > 1 and os.access(args[-1], os.R_OK):
-            sql_dump = args[-1]
-        reinit_db(opts.reinitialize_db, sql_dump=sql_dump)
+        reinit_db(opts.reinitialize_db)
     elif opts.inspect_mobi:
         for path in args[1:]:
             inspect_mobi(path)
diff --git a/src/calibre/library/sqlite.py b/src/calibre/library/sqlite.py
index 2e438ceb55..2ffc38b50f 100644
--- a/src/calibre/library/sqlite.py
+++ b/src/calibre/library/sqlite.py
@@ -206,6 +206,29 @@ def load_c_extensions(conn, debug=DEBUG):
             print e
     return False
 
+def do_connect(path, row_factory=None):
+    conn = sqlite.connect(path, factory=Connection,
+                                detect_types=sqlite.PARSE_DECLTYPES|sqlite.PARSE_COLNAMES)
+    conn.execute('pragma cache_size=5000')
+    encoding = conn.execute('pragma encoding').fetchone()[0]
+    conn.create_aggregate('sortconcat', 2, SortedConcatenate)
+    conn.create_aggregate('sortconcat_bar', 2, SortedConcatenateBar)
+    conn.create_aggregate('sortconcat_amper', 2, SortedConcatenateAmper)
+    conn.create_aggregate('identifiers_concat', 2, IdentifiersConcat)
+    load_c_extensions(conn)
+    conn.row_factory = sqlite.Row if row_factory else (lambda cursor, row : list(row))
+    conn.create_aggregate('concat', 1, Concatenate)
+    conn.create_aggregate('aum_sortconcat', 4, AumSortedConcatenate)
+    conn.create_collation('PYNOCASE', partial(pynocase,
+        encoding=encoding))
+    conn.create_function('title_sort', 1, title_sort)
+    conn.create_function('author_to_author_sort', 1,
+            _author_to_author_sort)
+    conn.create_function('uuid4', 0, lambda : str(uuid.uuid4()))
+    # Dummy functions for dynamically created filters
+    conn.create_function('books_list_filter', 1, lambda x: 1)
+    conn.create_collation('icucollate', icu_collator)
+    return conn
 
 class DBThread(Thread):
 
@@ -222,27 +245,7 @@ class DBThread(Thread):
         self.conn = None
 
     def connect(self):
-        self.conn = sqlite.connect(self.path, factory=Connection,
-                                   detect_types=sqlite.PARSE_DECLTYPES|sqlite.PARSE_COLNAMES)
-        self.conn.execute('pragma cache_size=5000')
-        encoding = self.conn.execute('pragma encoding').fetchone()[0]
-        self.conn.create_aggregate('sortconcat', 2, SortedConcatenate)
-        self.conn.create_aggregate('sortconcat_bar', 2, SortedConcatenateBar)
-        self.conn.create_aggregate('sortconcat_amper', 2, SortedConcatenateAmper)
-        self.conn.create_aggregate('identifiers_concat', 2, IdentifiersConcat)
-        load_c_extensions(self.conn)
-        self.conn.row_factory = sqlite.Row if self.row_factory else  lambda cursor, row : list(row)
-        self.conn.create_aggregate('concat', 1, Concatenate)
-        self.conn.create_aggregate('aum_sortconcat', 4, AumSortedConcatenate)
-        self.conn.create_collation('PYNOCASE', partial(pynocase,
-            encoding=encoding))
-        self.conn.create_function('title_sort', 1, title_sort)
-        self.conn.create_function('author_to_author_sort', 1,
-                _author_to_author_sort)
-        self.conn.create_function('uuid4', 0, lambda : str(uuid.uuid4()))
-        # Dummy functions for dynamically created filters
-        self.conn.create_function('books_list_filter', 1, lambda x: 1)
-        self.conn.create_collation('icucollate', icu_collator)
+        self.conn = do_connect(self.path, self.row_factory)
 
     def run(self):
         try:
diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index 30645e7380..a701c44947 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -406,6 +406,15 @@ def atomic_rename(oldpath, newpath):
     or may not exist. If it exists, it is replaced. '''
     if iswindows:
         import win32file
-        win32file.MoveFileEx(oldpath, newpath, win32file.MOVEFILE_REPLACE_EXISTING|win32file.MOVEFILE_WRITE_THROUGH)
+        for i in xrange(10):
+            try:
+                win32file.MoveFileEx(oldpath, newpath, win32file.MOVEFILE_REPLACE_EXISTING|win32file.MOVEFILE_WRITE_THROUGH)
+                break
+            except:
+                if i > 8:
+                    raise
+                # Try the rename repeatedly in case something like a virus
+                # scanner has opened one of the files (I love windows)
+                time.sleep(1)
     else:
         os.rename(oldpath, newpath)

From f0e040639c1125212f51ed98e4f32f7fbd2b7edc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 13:59:10 +0530
Subject: [PATCH 0631/1154] Fix duplicated sections in PDF user manual

Fixes #1215799 [double-sized calibre manual in pdf version](https://bugs.launchpad.net/calibre/+bug/1215799)
---
 manual/index.rst |  1 +
 setup/publish.py | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/manual/index.rst b/manual/index.rst
index b8f98a5561..fa19761b1b 100755
--- a/manual/index.rst
+++ b/manual/index.rst
@@ -38,6 +38,7 @@ Sections
    glossary
 
 
+.. REMOVE_IN_PDF
 The main |app| user interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/setup/publish.py b/setup/publish.py
index 40d002ee8a..ec4b7b31eb 100644
--- a/setup/publish.py
+++ b/setup/publish.py
@@ -84,7 +84,8 @@ class Manual(Command):
                                    '-d', '.build/doctrees', '.', '.build/html'])
             subprocess.check_call(['sphinx-build', '-b', 'myepub', '-d',
                                    '.build/doctrees', '.', '.build/epub'])
-            subprocess.check_call(['sphinx-build', '-b', 'mylatex', '-d',
+            with self:
+                subprocess.check_call(['sphinx-build', '-b', 'mylatex', '-d',
                                    '.build/doctrees', '.', '.build/latex'])
             pwd = os.getcwdu()
             os.chdir('.build/latex')
@@ -107,6 +108,18 @@ class Manual(Command):
         if os.path.exists(path):
             shutil.rmtree(path)
 
+    def __enter__(self):
+        with open('index.rst', 'r+b') as f:
+            raw = self.orig_index = f.read()
+            f.seek(0)
+            f.truncate()
+            pos = raw.index(b'.. REMOVE_IN_PDF')
+            f.write(raw[:pos])
+
+    def __exit__(self, *args):
+        with open('index.rst', 'wb') as f:
+            f.write(self.orig_index)
+
 class TagRelease(Command):
 
     description = 'Tag a new release in git'

From 2f36a67ff9fe1f3cf5494c6020976e9662a3975f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 14:15:09 +0530
Subject: [PATCH 0632/1154] VL tabs: Change name of all books tab when hidden
 VL is activated

Virtual Library tabs: If the user activates a hidden tab via the Virtual
Library button, change the name of the All Books tab to reflect the
hidden virtual library. Fixes #1216174 [Wrong VL tab activitad when the right one is hidden](https://bugs.launchpad.net/calibre/+bug/1216174)
---
 src/calibre/gui2/init.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index da89d7b764..4d15279f63 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -334,6 +334,8 @@ class VLTabs(QTabBar):  # {{{
             if not vl:
                 all_idx = i
         self.setCurrentIndex(all_idx if current_idx is None else current_idx)
+        if current_idx is None and current_lib:
+            self.setTabText(all_idx, current_lib)
         self.currentChanged.connect(self.tab_changed)
         try:
             self.tabButton(all_idx, self.RightSide).setVisible(False)

From 7287ca8f59e6a55de9133895f3d731dfdd82dee7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 16:27:22 +0530
Subject: [PATCH 0633/1154] pep8

---
 src/calibre/utils/config_base.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index a9860b60fa..c099574cb0 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -116,7 +116,6 @@ class OptionSet(object):
         if name in self.preferences:
             self.preferences.remove(name)
 
-
     def add_opt(self, name, switches=[], help=None, type=None, choices=None,
                  group=None, default=None, action=None, metavar=None):
         '''
@@ -174,7 +173,6 @@ class OptionSet(object):
                         )
             g.add_option(*pref.switches, **args)
 
-
         return parser
 
     def get_override_section(self, src):
@@ -230,7 +228,7 @@ class OptionSet(object):
 
     def serialize(self, opts):
         src = '# %s\n\n'%(self.description.replace('\n', '\n# '))
-        groups = [self.render_group(name, self.groups.get(name, ''), opts) \
+        groups = [self.render_group(name, self.groups.get(name, ''), opts)
                                         for name in [None] + self.group_list]
         return src + '\n\n'.join(groups)
 
@@ -265,7 +263,6 @@ class Config(ConfigInterface):
         ConfigInterface.__init__(self, description)
         self.config_file_path = os.path.join(config_dir, basename+'.py')
 
-
     def parse(self):
         src = ''
         if os.path.exists(self.config_file_path):
@@ -369,7 +366,6 @@ class ConfigProxy(object):
         return self.__config.get_option(key).help
 
 
-
 def _prefs():
     c = Config('global', 'calibre wide preferences')
     c.add_opt('database_path',

From d056f8fed708ad1d9a857d052f2ea3fe363d6ec9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 16:38:57 +0530
Subject: [PATCH 0634/1154] newdb: Fix tweak to sort dates by visible fields
 not being respected

---
 src/calibre/db/fields.py         | 11 ++++++++++-
 src/calibre/db/tests/reading.py  |  9 +++++++++
 src/calibre/utils/config_base.py | 11 +++++++++++
 src/calibre/utils/date.py        | 12 ++++++------
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 35ed4a25ef..aeee1b6f45 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -10,13 +10,14 @@ __docformat__ = 'restructuredtext en'
 
 from threading import Lock
 from collections import defaultdict, Counter
+from functools import partial
 
 from calibre.db.tables import ONE_ONE, MANY_ONE, MANY_MANY, null
 from calibre.db.write import Writer
 from calibre.ebooks.metadata import title_sort, author_to_author_sort
 from calibre.utils.config_base import tweaks
 from calibre.utils.icu import sort_key
-from calibre.utils.date import UNDEFINED_DATE
+from calibre.utils.date import UNDEFINED_DATE, clean_date_for_sort
 from calibre.utils.localization import calibre_langcode_to_name
 
 class Field(object):
@@ -44,6 +45,14 @@ class Field(object):
             self._default_sort_key = None
         elif dt == 'datetime':
             self._default_sort_key = UNDEFINED_DATE
+            if tweaks['sort_dates_using_visible_fields']:
+                fmt = None
+                if name in {'timestamp', 'pubdate', 'last_modified'}:
+                    fmt = tweaks['gui_%s_display_format' % name]
+                elif self.metadata['is_custom']:
+                    fmt = self.metadata.get('display', {}).get('date_format', None)
+                self._sort_key = partial(clean_date_for_sort, fmt=fmt)
+
         if self.name == 'languages':
             self._sort_key = lambda x:sort_key(calibre_langcode_to_name(x))
         self.is_multiple = (bool(self.metadata['is_multiple']) or self.name ==
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 5f752dbfa2..4c87662de3 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -180,6 +180,15 @@ class ReadingTest(BaseTest):
             self.assertEqual([1, 3, 2], cache.multisort([(field, True)], ids_to_sort=(1, 2, 3)))
             self.assertEqual([2, 3, 1], cache.multisort([(field, False)], ids_to_sort=(1, 2, 3)))
 
+        # Test tweak to sort dates by visible format
+        from calibre.utils.date import parse_only_date as p
+        from calibre.utils.config_base import Tweak
+        self.assertEqual(cache.set_field('pubdate', {1:p('2001-3-3'), 2:p('2002-2-3'), 3:p('2003-1-3')}), {1, 2, 3})
+        self.assertEqual([1, 2, 3], cache.multisort([('pubdate', True)]))
+        with Tweak('gui_pubdate_display_format', 'MMM'), Tweak('sort_dates_using_visible_fields', True):
+            c2 = self.init_cache()
+            self.assertEqual([3, 2, 1], c2.multisort([('pubdate', True)]))
+
     # }}}
 
     def test_get_metadata(self):  # {{{
diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index c099574cb0..d9110d1279 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -478,3 +478,14 @@ def reset_tweaks_to_default():
     exec default_tweaks in dg, dl
     tweaks = dl
 
+class Tweak(object):
+
+    def __init__(self, name, value):
+        self.name, self.value = name, value
+
+    def __enter__(self):
+        self.origval = tweaks[self.name]
+        tweaks[self.name] = self.value
+
+    def __exit__(self, *args):
+        tweaks[self.name] = self.origval
diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index a0c1c77a7a..4e57dc1bf3 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -357,10 +357,10 @@ def cd_repl_func(tt, dt, match_object):
         return ''
     return cd_function_index[s[0]](tt, dt)
 
-def clean_date_for_sort(dt, format):
+def clean_date_for_sort(dt, fmt=None):
     ''' Return dt with fields not in shown in format set to a default '''
-    if not format:
-        format = 'yyMd'
+    if not fmt:
+        fmt = 'yyMd'
 
     if not isinstance(dt, datetime):
         dt = datetime.combine(dt, dtime())
@@ -370,15 +370,15 @@ def clean_date_for_sort(dt, format):
             dt = dt.replace(tzinfo=_local_tz)
         dt = as_local_time(dt)
 
-    if format == 'iso':
-        format = 'yyMdhms'
+    if fmt == 'iso':
+        fmt = 'yyMdhms'
 
     tt = {'year':UNDEFINED_DATE.year, 'mon':UNDEFINED_DATE.month,
           'day':UNDEFINED_DATE.day, 'hour':UNDEFINED_DATE.hour,
           'min':UNDEFINED_DATE.minute, 'sec':UNDEFINED_DATE.second}
 
     repl_func = partial(cd_repl_func, tt, dt)
-    re.sub('(s{1,2})|(m{1,2})|(h{1,2})|(d{1,4}|M{1,4}|(?:yyyy|yy))', repl_func, format)
+    re.sub('(s{1,2})|(m{1,2})|(h{1,2})|(d{1,4}|M{1,4}|(?:yyyy|yy))', repl_func, fmt)
     return dt.replace(year=tt['year'], month=tt['mon'], day=tt['day'], hour=tt['hour'],
                       minute=tt['min'], second=tt['sec'], microsecond=0)
 

From 7214608282f610a9c985316f735ad95ceb9d912d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 16:59:49 +0530
Subject: [PATCH 0635/1154] newdb: Fix bools_are_tristate preference not being
 respected when sorting

---
 src/calibre/db/cache.py         |  5 +++--
 src/calibre/db/fields.py        | 12 ++++++++----
 src/calibre/db/tests/reading.py |  9 +++++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 7ead59ac06..101932a777 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -286,14 +286,15 @@ class Cache(object):
         '''
         with self.write_lock:
             self.backend.read_tables()
+            bools_are_tristate = self.backend.prefs['bools_are_tristate']
 
             for field, table in self.backend.tables.iteritems():
-                self.fields[field] = create_field(field, table)
+                self.fields[field] = create_field(field, table, bools_are_tristate)
                 if table.metadata['datatype'] == 'composite':
                     self.composites[field] = self.fields[field]
 
             self.fields['ondevice'] = create_field('ondevice',
-                    VirtualTable('ondevice'))
+                    VirtualTable('ondevice'), bools_are_tristate)
 
             for name, field in self.fields.iteritems():
                 if name[0] == '#' and name.endswith('_index'):
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index aeee1b6f45..7ade57b1a2 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -26,7 +26,7 @@ class Field(object):
     is_many_many = False
     is_composite = False
 
-    def __init__(self, name, table):
+    def __init__(self, name, table, bools_are_tristate):
         self.name, self.table = name, table
         dt = self.metadata['datatype']
         self.has_text_data = dt in {'text', 'comments', 'series', 'enumeration'}
@@ -43,6 +43,10 @@ class Field(object):
             self._default_sort_key = 0
         elif dt == 'bool':
             self._default_sort_key = None
+            if bools_are_tristate:
+                self._sort_key = lambda x:{True: 1, False: 2, None: 3}.get(x, 3)
+            else:
+                self._sort_key = lambda x:{True: 1, False: 2, None: 2}.get(x, 2)
         elif dt == 'datetime':
             self._default_sort_key = UNDEFINED_DATE
             if tweaks['sort_dates_using_visible_fields']:
@@ -248,7 +252,7 @@ class CompositeField(OneToOneField):
 
 class OnDeviceField(OneToOneField):
 
-    def __init__(self, name, table):
+    def __init__(self, name, table, bools_are_tristate):
         self.name = name
         self.book_on_device_func = None
         self.is_multiple = False
@@ -565,7 +569,7 @@ class TagsField(ManyToManyField):
                 ans.append(c)
         return ans
 
-def create_field(name, table):
+def create_field(name, table, bools_are_tristate):
     cls = {
             ONE_ONE: OneToOneField,
             MANY_ONE: ManyToOneField,
@@ -585,5 +589,5 @@ def create_field(name, table):
         cls = CompositeField
     elif table.metadata['datatype'] == 'series':
         cls = SeriesField
-    return cls(name, table)
+    return cls(name, table, bools_are_tristate)
 
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 4c87662de3..5d1061ecae 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -125,7 +125,7 @@ class ReadingTest(BaseTest):
 
     def test_sorting(self):  # {{{
         'Test sorting'
-        cache = self.init_cache(self.library_path)
+        cache = self.init_cache()
         for field, order in {
             'title'  : [2, 1, 3],
             'authors': [2, 1, 3],
@@ -147,7 +147,7 @@ class ReadingTest(BaseTest):
             '#rating':[3, 2, 1],
             '#series':[3, 2, 1],
             '#tags':[3, 2, 1],
-            '#yesno':[3, 1, 2],
+            '#yesno':[2, 1, 3],
             '#comments':[3, 2, 1],
         }.iteritems():
             x = list(reversed(order))
@@ -189,6 +189,11 @@ class ReadingTest(BaseTest):
             c2 = self.init_cache()
             self.assertEqual([3, 2, 1], c2.multisort([('pubdate', True)]))
 
+        # Test bool sorting when not tristate
+        cache.set_pref('bools_are_tristate', False)
+        c2 = self.init_cache()
+        self.assertEqual([2, 3, 1], c2.multisort([('#yesno', True), ('id', False)]))
+
     # }}}
 
     def test_get_metadata(self):  # {{{

From a4e0eeb85424e3c5bdceaafa01a13e7b3f9d047c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 24 Aug 2013 17:05:21 +0530
Subject: [PATCH 0636/1154] reset_tweaks_to_default and with Tweak not
 co-operating

---
 src/calibre/utils/config_base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index d9110d1279..779fd84b54 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -471,12 +471,12 @@ def write_tweaks(raw):
 tweaks = read_tweaks()
 
 def reset_tweaks_to_default():
-    global tweaks
     default_tweaks = P('default_tweaks.py', data=True,
             allow_user_override=False)
     dl, dg = {}, {}
     exec default_tweaks in dg, dl
-    tweaks = dl
+    tweaks.clear()
+    tweaks.update(dl)
 
 class Tweak(object):
 

From 6d41bf2f5e98870da37376a28bae17d3e3f52132 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 24 Aug 2013 22:18:49 +0200
Subject: [PATCH 0637/1154] Fix searching on is_multiple composite columns.

---
 src/calibre/db/fields.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 7ade57b1a2..8d818b716d 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -216,8 +216,16 @@ class CompositeField(OneToOneField):
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         val_map = defaultdict(set)
+        splitter = self.table.metadata['is_multiple'].get('cache_to_list', None)
         for book_id in candidates:
-            val_map[self.get_value_with_cache(book_id, get_metadata)].add(book_id)
+            vals = self.get_value_with_cache(book_id, get_metadata)
+            if splitter:
+                vals = [vv.strip() for vv in vals.split(splitter)]
+            else:
+                vals = [vals]
+            for v in vals:
+                if v:
+                    val_map[v].add(book_id)
         for val, book_ids in val_map.iteritems():
             yield val, book_ids
 

From 2cafeffc2e32bff7aef254dd6ef4dd354f063847 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 06:47:39 +0530
Subject: [PATCH 0638/1154] Fix tweaks not being reset for single tests

---
 src/calibre/db/tests/base.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index e541b410f2..82f5360585 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -21,14 +21,11 @@ class BaseTest(unittest.TestCase):
     longMessage = True
     maxDiff = None
 
-    @classmethod
-    def setUpClass(cls):
-        from calibre.utils.config_base import reset_tweaks_to_default
-        reset_tweaks_to_default()
-
     def setUp(self):
         from calibre.utils.recycle_bin import nuke_recycle
         nuke_recycle()
+        from calibre.utils.config_base import reset_tweaks_to_default
+        reset_tweaks_to_default()
         self.library_path = self.mkdtemp()
         self.create_db(self.library_path)
 

From be776e5900bf74d7b16a93fb14a2d3a1ae6d5b53 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 07:23:57 +0530
Subject: [PATCH 0639/1154] Fix a regression that broke moving libraries in 1.0

Fixes #1216401 [calibre, version 1.0.0 'function' object has no attribute 'exists_at'](https://bugs.launchpad.net/calibre/+bug/1216401)
---
 src/calibre/gui2/actions/choose_library.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index daaa893bab..650545fd64 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -142,7 +142,7 @@ class MovedDialog(QDialog):  # {{{
 
     def accept(self):
         newloc = unicode(self.loc.text())
-        if not db_class.exists_at(newloc):
+        if not db_class().exists_at(newloc):
             error_dialog(self, _('No library found'),
                     _('No existing calibre library found at %s')%newloc,
                     show=True)

From 50634ff252f0f07f6ff2fa53a68204f6178b9fda Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 08:11:17 +0530
Subject: [PATCH 0640/1154] newdb: Handle multiple different case items when
 setting many-many fields

Fixes #1216398 [Same tag twice in different case causes ConstraintError](https://bugs.launchpad.net/calibre/+bug/1216398)
---
 src/calibre/db/tests/writing.py |  2 ++
 src/calibre/db/write.py         | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 921b3fb6e6..b0862a147d 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -294,6 +294,8 @@ class WritingTest(BaseTest):
 
         # Test setting with the same value repeated
         ae(sf('tags', {3: ('a', 'b', 'a')}), {3})
+        ae(sf('tags', {3: ('x', 'X')}), {3}, 'Failed when setting tag twice with different cases')
+        ae(('x',), cache.field_for('tags', 3))
 
     # }}}
 
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 5f486445db..fc8691aa42 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -10,6 +10,7 @@ __docformat__ = 'restructuredtext en'
 import re
 from functools import partial
 from datetime import datetime
+from future_builtins import zip
 
 from calibre.constants import preferred_encoding, ispy3
 from calibre.ebooks.metadata import author_to_author_sort, title_sort
@@ -338,12 +339,14 @@ def many_one(book_id_val_map, db, field, allow_case_change, *args):
 
 # Many-Many fields {{{
 
-def uniq(vals):
-    ' Remove all duplicates from vals, while preserving order. Items in vals must be hashable '
+def uniq(vals, kmap):
+    ''' Remove all duplicates from vals, while preserving order. kmap must be a
+    callable that returns a hashable value for every item in vals '''
     vals = vals or ()
+    lvals = (kmap(x) for x in vals)
     seen = set()
     seen_add = seen.add
-    return tuple(x for x in vals if x not in seen and not seen_add(x))
+    return tuple(x for x, k in zip(vals, lvals) if k not in seen and not seen_add(k))
 
 def many_many(book_id_val_map, db, field, allow_case_change, *args):
     dirtied = set()
@@ -357,7 +360,7 @@ def many_many(book_id_val_map, db, field, allow_case_change, *args):
     rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
     val_map = {}
     case_changes = {}
-    book_id_val_map = {k:uniq(vals) for k, vals in book_id_val_map.iteritems()}
+    book_id_val_map = {k:uniq(vals, kmap) for k, vals in book_id_val_map.iteritems()}
     for vals in book_id_val_map.itervalues():
         for val in vals:
             get_db_id(val, db, m, table, kmap, rid_map, allow_case_change,

From 14d50b58afee8ea4cf1ec392797345eb098787c2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 08:59:48 +0530
Subject: [PATCH 0641/1154] Avoid reading splitter on every call, only read
 once at startup

---
 src/calibre/db/fields.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 05957169ed..bf97c97309 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -182,6 +182,10 @@ class CompositeField(OneToOneField):
         self._render_cache = {}
         self._lock = Lock()
         self._composite_name = '#' + self.metadata['label']
+        try:
+            self.splitter = self.metadata['is_multiple'].get('cache_to_list', None)
+        except AttributeError:
+            self.splitter = None
 
     def render_composite(self, book_id, mi):
         with self._lock:
@@ -216,16 +220,10 @@ class CompositeField(OneToOneField):
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         val_map = defaultdict(set)
-        try:
-            splitter = self.table.metadata['is_multiple'].get('cache_to_list', None)
-        except AttributeError:
-            splitter = None
+        splitter = self.splitter
         for book_id in candidates:
             vals = self.get_value_with_cache(book_id, get_metadata)
-            if splitter:
-                vals = (vv.strip() for vv in vals.split(splitter))
-            else:
-                vals = (vals,)
+            vals = (vv.strip() for vv in vals.split(splitter)) if splitter else (vals,)
             for v in vals:
                 if v:
                     val_map[v].add(book_id)

From 109066baf3f46d036e56e7d08012b4193dfc034d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 09:17:52 +0530
Subject: [PATCH 0642/1154] Tests for searching on composite fields

---
 src/calibre/db/tests/reading.py | 13 +++++++++++++
 src/calibre/db/tests/writing.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 5d1061ecae..a292340013 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -555,3 +555,16 @@ class ReadingTest(BaseTest):
         self.assertListEqual([2, 3, 1], ids)
     # }}}
 
+    def test_composites(self):  # {{{
+        cache = self.init_cache()
+        cache.create_custom_column('mult', 'CC1', 'composite', True, display={'composite_template': 'b,a,c'})
+        cache.create_custom_column('single', 'CC1', 'composite', False, display={'composite_template': 'b,a,c'})
+
+        cache = self.init_cache()
+        # Test searching
+        self.assertEqual({1,2,3}, cache.search('#mult:=a'))
+        self.assertEqual(set(), cache.search('#mult:=b,a,c'))
+        self.assertEqual({1,2,3}, cache.search('#single:=b,a,c'))
+        self.assertEqual(set(), cache.search('#single:=b'))
+    # }}}
+
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index b0862a147d..be24647dcd 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -556,7 +556,7 @@ class WritingTest(BaseTest):
             self.assertEqual(c.field_for('#series_index', 2), 4.0)
     # }}}
 
-    def test_composite(self):  # {{{
+    def test_composite_cache(self):  # {{{
         ' Test that the composite field cache is properly invalidated on writes '
         cache = self.init_cache()
         cache.create_custom_column('tc', 'TC', 'composite', False, display={

From 4cf1539c37464233ada7a7f4e1779dd6a1688380 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 10:08:29 +0530
Subject: [PATCH 0643/1154] Fix sorting for composite cols that are marked as
 numeric

Incidentally, the implementation of size suffixes in the old db was
broken.
---
 src/calibre/db/fields.py        | 25 ++++++++++++++++++++++---
 src/calibre/db/tests/reading.py | 10 +++++++++-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index bf97c97309..1d4215434e 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -8,6 +8,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+from locale import atof
 from threading import Lock
 from collections import defaultdict, Counter
 from functools import partial
@@ -175,17 +176,35 @@ class OneToOneField(Field):
 class CompositeField(OneToOneField):
 
     is_composite = True
+    SIZE_SUFFIX_MAP = {suffix:i for i, suffix in enumerate(('', 'K', 'M', 'G', 'T', 'P', 'E'))}
 
     def __init__(self, *args, **kwargs):
         OneToOneField.__init__(self, *args, **kwargs)
 
         self._render_cache = {}
         self._lock = Lock()
-        self._composite_name = '#' + self.metadata['label']
+        m = self.metadata
+        self._composite_name = '#' + m['label']
         try:
-            self.splitter = self.metadata['is_multiple'].get('cache_to_list', None)
+            self.splitter = m['is_multiple'].get('cache_to_list', None)
         except AttributeError:
             self.splitter = None
+        composite_sort = m.get('display', {}).get('composite_sort', None)
+        if composite_sort == 'number':
+            self._sort_key = self.number_sort_key
+        else:
+            self._sort_key = sort_key
+
+    def number_sort_key(self, val):
+        try:
+            p = 1
+            if val and val.endswith('B'):
+                p = 1 << (10 * self.SIZE_SUFFIX_MAP.get(val[-2:-1], 0))
+                val = val[:(-2 if p > 1 else -1)].strip()
+            val = atof(val) * p
+        except (TypeError, AttributeError, ValueError):
+            val = 0.0
+        return val
 
     def render_composite(self, book_id, mi):
         with self._lock:
@@ -215,7 +234,7 @@ class CompositeField(OneToOneField):
         return ans
 
     def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
-        return {id_: sort_key(self.get_value_with_cache(id_, get_metadata)) for id_ in
+        return {id_: self._sort_key(self.get_value_with_cache(id_, get_metadata)) for id_ in
                 all_book_ids}
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index a292340013..691a115617 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -558,7 +558,9 @@ class ReadingTest(BaseTest):
     def test_composites(self):  # {{{
         cache = self.init_cache()
         cache.create_custom_column('mult', 'CC1', 'composite', True, display={'composite_template': 'b,a,c'})
-        cache.create_custom_column('single', 'CC1', 'composite', False, display={'composite_template': 'b,a,c'})
+        cache.create_custom_column('single', 'CC2', 'composite', False, display={'composite_template': 'b,a,c'})
+        cache.create_custom_column('number', 'CC3', 'composite', False, display={'composite_template': '{#float}', 'composite_sort':'number'})
+        cache.create_custom_column('size', 'CC4', 'composite', False, display={'composite_template': '{#float:human_readable()}', 'composite_sort':'number'})
 
         cache = self.init_cache()
         # Test searching
@@ -566,5 +568,11 @@ class ReadingTest(BaseTest):
         self.assertEqual(set(), cache.search('#mult:=b,a,c'))
         self.assertEqual({1,2,3}, cache.search('#single:=b,a,c'))
         self.assertEqual(set(), cache.search('#single:=b'))
+
+        # Test numeric sorting
+        cache.set_field('#float', {1:2, 2:10, 3:0.0001})
+        self.assertEqual([3, 1, 2], cache.multisort([('#number', True)]))
+        cache.set_field('#float', {1:3, 2:2*1024, 3:3*1024*1024})
+        self.assertEqual([1, 2, 3], cache.multisort([('#size', True)]))
     # }}}
 

From 798baa863b5f8437e5202a888e3a1e7572e600b0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 10:16:26 +0530
Subject: [PATCH 0644/1154] ...

---
 src/calibre/db/tests/reading.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 691a115617..daf7bddc6a 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -572,7 +572,7 @@ class ReadingTest(BaseTest):
         # Test numeric sorting
         cache.set_field('#float', {1:2, 2:10, 3:0.0001})
         self.assertEqual([3, 1, 2], cache.multisort([('#number', True)]))
-        cache.set_field('#float', {1:3, 2:2*1024, 3:3*1024*1024})
+        cache.set_field('#float', {1:3, 2:2*1024, 3:1*1024*1024})
         self.assertEqual([1, 2, 3], cache.multisort([('#size', True)]))
     # }}}
 

From 521320657d2b03bdd5da034ae37cd0ea599ceea8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 10:36:47 +0530
Subject: [PATCH 0645/1154] Sorting for composite cols marked as dates

---
 src/calibre/db/fields.py        | 19 +++++++++++++++++--
 src/calibre/db/tests/reading.py |  7 +++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 1d4215434e..d176f10c07 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -18,7 +18,7 @@ from calibre.db.write import Writer
 from calibre.ebooks.metadata import title_sort, author_to_author_sort
 from calibre.utils.config_base import tweaks
 from calibre.utils.icu import sort_key
-from calibre.utils.date import UNDEFINED_DATE, clean_date_for_sort
+from calibre.utils.date import UNDEFINED_DATE, clean_date_for_sort, parse_date
 from calibre.utils.localization import calibre_langcode_to_name
 
 class Field(object):
@@ -191,7 +191,15 @@ class CompositeField(OneToOneField):
             self.splitter = None
         composite_sort = m.get('display', {}).get('composite_sort', None)
         if composite_sort == 'number':
+            self._default_sort_key = 0
             self._sort_key = self.number_sort_key
+        elif composite_sort == 'date':
+            self._default_sort_key = UNDEFINED_DATE
+            self._filter_date = lambda x: x
+            if tweaks['sort_dates_using_visible_fields']:
+                fmt = m.get('display', {}).get('date_format', None)
+                self._filter_date = partial(clean_date_for_sort, fmt=fmt)
+            self._sort_key = self.date_sort_key
         else:
             self._sort_key = sort_key
 
@@ -202,10 +210,17 @@ class CompositeField(OneToOneField):
                 p = 1 << (10 * self.SIZE_SUFFIX_MAP.get(val[-2:-1], 0))
                 val = val[:(-2 if p > 1 else -1)].strip()
             val = atof(val) * p
-        except (TypeError, AttributeError, ValueError):
+        except (TypeError, AttributeError, ValueError, KeyError):
             val = 0.0
         return val
 
+    def date_sort_key(self, val):
+        try:
+            val = self._filter_date(parse_date(val))
+        except (TypeError, ValueError, AttributeError, KeyError):
+            val = UNDEFINED_DATE
+        return val
+
     def render_composite(self, book_id, mi):
         with self._lock:
             ans = self._render_cache.get(book_id, None)
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index daf7bddc6a..f0477872d7 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -556,11 +556,14 @@ class ReadingTest(BaseTest):
     # }}}
 
     def test_composites(self):  # {{{
+        from calibre.utils.date import parse_only_date as p
         cache = self.init_cache()
         cache.create_custom_column('mult', 'CC1', 'composite', True, display={'composite_template': 'b,a,c'})
         cache.create_custom_column('single', 'CC2', 'composite', False, display={'composite_template': 'b,a,c'})
         cache.create_custom_column('number', 'CC3', 'composite', False, display={'composite_template': '{#float}', 'composite_sort':'number'})
         cache.create_custom_column('size', 'CC4', 'composite', False, display={'composite_template': '{#float:human_readable()}', 'composite_sort':'number'})
+        cache.create_custom_column('ccdate', 'CC5', 'composite', False,
+                                   display={'composite_template': '{pubdate:format_date(d-M-yy)}', 'composite_sort':'date'})
 
         cache = self.init_cache()
         # Test searching
@@ -574,5 +577,9 @@ class ReadingTest(BaseTest):
         self.assertEqual([3, 1, 2], cache.multisort([('#number', True)]))
         cache.set_field('#float', {1:3, 2:2*1024, 3:1*1024*1024})
         self.assertEqual([1, 2, 3], cache.multisort([('#size', True)]))
+
+        # Test date sorting
+        cache.set_field('pubdate', {1:p('2001-2-6'), 2:p('2001-10-6'), 3:p('2001-6-6')})
+        self.assertEqual([1, 3, 2], cache.multisort([('#ccdate', True)]))
     # }}}
 

From f8463a2ddc6f6462a28d42acd49e87f6c090189a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 11:17:18 +0530
Subject: [PATCH 0646/1154] Composite column bool sorting

---
 src/calibre/db/fields.py        | 20 ++++++++++++++------
 src/calibre/db/search.py        | 17 +----------------
 src/calibre/db/tests/reading.py |  4 ++++
 src/calibre/db/utils.py         | 16 ++++++++++++++++
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index d176f10c07..88c6908de7 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -15,12 +15,16 @@ from functools import partial
 
 from calibre.db.tables import ONE_ONE, MANY_ONE, MANY_MANY, null
 from calibre.db.write import Writer
+from calibre.db.utils import force_to_bool
 from calibre.ebooks.metadata import title_sort, author_to_author_sort
 from calibre.utils.config_base import tweaks
 from calibre.utils.icu import sort_key
 from calibre.utils.date import UNDEFINED_DATE, clean_date_for_sort, parse_date
 from calibre.utils.localization import calibre_langcode_to_name
 
+def bool_sort_key(bools_are_tristate):
+    return (lambda x:{True: 1, False: 2, None: 3}.get(x, 3)) if bools_are_tristate else lambda x:{True: 1, False: 2, None: 2}.get(x, 2)
+
 class Field(object):
 
     is_many = False
@@ -44,10 +48,7 @@ class Field(object):
             self._default_sort_key = 0
         elif dt == 'bool':
             self._default_sort_key = None
-            if bools_are_tristate:
-                self._sort_key = lambda x:{True: 1, False: 2, None: 3}.get(x, 3)
-            else:
-                self._sort_key = lambda x:{True: 1, False: 2, None: 2}.get(x, 2)
+            self._sort_key = bool_sort_key(bools_are_tristate)
         elif dt == 'datetime':
             self._default_sort_key = UNDEFINED_DATE
             if tweaks['sort_dates_using_visible_fields']:
@@ -178,8 +179,8 @@ class CompositeField(OneToOneField):
     is_composite = True
     SIZE_SUFFIX_MAP = {suffix:i for i, suffix in enumerate(('', 'K', 'M', 'G', 'T', 'P', 'E'))}
 
-    def __init__(self, *args, **kwargs):
-        OneToOneField.__init__(self, *args, **kwargs)
+    def __init__(self, name, table, bools_are_tristate):
+        OneToOneField.__init__(self, name, table, bools_are_tristate)
 
         self._render_cache = {}
         self._lock = Lock()
@@ -200,6 +201,10 @@ class CompositeField(OneToOneField):
                 fmt = m.get('display', {}).get('date_format', None)
                 self._filter_date = partial(clean_date_for_sort, fmt=fmt)
             self._sort_key = self.date_sort_key
+        elif composite_sort == 'bool':
+            self._default_sort_key = None
+            self._bool_sort_key = bool_sort_key(bools_are_tristate)
+            self._sort_key = self.bool_sort_key
         else:
             self._sort_key = sort_key
 
@@ -221,6 +226,9 @@ class CompositeField(OneToOneField):
             val = UNDEFINED_DATE
         return val
 
+    def bool_sort_key(self, val):
+        return self._bool_sort_key(force_to_bool(val))
+
     def render_composite(self, book_id, mi):
         with self._lock:
             ans = self._render_cache.get(book_id, None)
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index 6a6fbb0a56..b5f2f3ed49 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -13,6 +13,7 @@ from datetime import timedelta
 from collections import deque
 
 from calibre.constants import preferred_encoding
+from calibre.db.utils import force_to_bool
 from calibre.utils.config_base import prefs
 from calibre.utils.date import parse_date, UNDEFINED_DATE, now, dt_as_local
 from calibre.utils.icu import primary_find, sort_key
@@ -25,22 +26,6 @@ REGEXP_MATCH   = 2
 
 # Utils {{{
 
-def force_to_bool(val):
-    if isinstance(val, (str, unicode)):
-        try:
-            val = icu_lower(val)
-            if not val:
-                val = None
-            elif val in [_('yes'), _('checked'), 'true', 'yes']:
-                val = True
-            elif val in [_('no'), _('unchecked'), 'false', 'no']:
-                val = False
-            else:
-                val = bool(int(val))
-        except:
-            val = None
-    return val
-
 def _matchkind(query):
     matchkind = CONTAINS_MATCH
     if (len(query) > 1):
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index f0477872d7..f2ad7337b3 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -564,6 +564,7 @@ class ReadingTest(BaseTest):
         cache.create_custom_column('size', 'CC4', 'composite', False, display={'composite_template': '{#float:human_readable()}', 'composite_sort':'number'})
         cache.create_custom_column('ccdate', 'CC5', 'composite', False,
                                    display={'composite_template': '{pubdate:format_date(d-M-yy)}', 'composite_sort':'date'})
+        cache.create_custom_column('bool', 'CC6', 'composite', False, display={'composite_template': '{#yesno}', 'composite_sort':'bool'})
 
         cache = self.init_cache()
         # Test searching
@@ -581,5 +582,8 @@ class ReadingTest(BaseTest):
         # Test date sorting
         cache.set_field('pubdate', {1:p('2001-2-6'), 2:p('2001-10-6'), 3:p('2001-6-6')})
         self.assertEqual([1, 3, 2], cache.multisort([('#ccdate', True)]))
+
+        # Test bool sorting
+        self.assertEqual([2, 1, 3], cache.multisort([('#bool', True)]))
     # }}}
 
diff --git a/src/calibre/db/utils.py b/src/calibre/db/utils.py
index 8f77b9204e..dad05c2022 100644
--- a/src/calibre/db/utils.py
+++ b/src/calibre/db/utils.py
@@ -14,6 +14,22 @@ from threading import Lock
 from calibre import as_unicode, prints
 from calibre.constants import cache_dir
 
+def force_to_bool(val):
+    if isinstance(val, (str, unicode)):
+        try:
+            val = icu_lower(val)
+            if not val:
+                val = None
+            elif val in [_('yes'), _('checked'), 'true', 'yes']:
+                val = True
+            elif val in [_('no'), _('unchecked'), 'false', 'no']:
+                val = False
+            else:
+                val = bool(int(val))
+        except:
+            val = None
+    return val
+
 Entry = namedtuple('Entry', 'path size timestamp thumbnail_size')
 class CacheError(Exception):
     pass

From 7c9b460f521c241194fbcaccddd00b44f45b8a3f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 11:43:15 +0530
Subject: [PATCH 0647/1154] Fix sorting for is_multiple custom cols

---
 src/calibre/db/fields.py        | 7 +++++++
 src/calibre/db/tests/reading.py | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index 88c6908de7..fc7bee2c51 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -205,9 +205,16 @@ class CompositeField(OneToOneField):
             self._default_sort_key = None
             self._bool_sort_key = bool_sort_key(bools_are_tristate)
             self._sort_key = self.bool_sort_key
+        elif self.splitter is not None:
+            self._default_sort_key = ()
+            self._sort_key = self.multiple_sort_key
         else:
             self._sort_key = sort_key
 
+    def multiple_sort_key(self, val):
+        val = (sort_key(x.strip()) for x in (val or '').split(self.splitter))
+        return tuple(sorted(val))
+
     def number_sort_key(self, val):
         try:
             p = 1
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index f2ad7337b3..2dcd519cad 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -556,6 +556,7 @@ class ReadingTest(BaseTest):
     # }}}
 
     def test_composites(self):  # {{{
+        ' Test sorting and searching in composite columns '
         from calibre.utils.date import parse_only_date as p
         cache = self.init_cache()
         cache.create_custom_column('mult', 'CC1', 'composite', True, display={'composite_template': 'b,a,c'})
@@ -565,6 +566,7 @@ class ReadingTest(BaseTest):
         cache.create_custom_column('ccdate', 'CC5', 'composite', False,
                                    display={'composite_template': '{pubdate:format_date(d-M-yy)}', 'composite_sort':'date'})
         cache.create_custom_column('bool', 'CC6', 'composite', False, display={'composite_template': '{#yesno}', 'composite_sort':'bool'})
+        cache.create_custom_column('ccm', 'CC7', 'composite', True, display={'composite_template': '{#tags}'})
 
         cache = self.init_cache()
         # Test searching
@@ -585,5 +587,9 @@ class ReadingTest(BaseTest):
 
         # Test bool sorting
         self.assertEqual([2, 1, 3], cache.multisort([('#bool', True)]))
+
+        # Test is_multiple sorting
+        cache.set_field('#tags', {1:'b, a, c', 2:'a, b, c', 3:'a, c, b'})
+        self.assertEqual([1, 2, 3], cache.multisort([('#ccm', True)]))
     # }}}
 

From 167d44f2348cf206fe2bc826d9edc32a4e66f857 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 11:52:15 +0530
Subject: [PATCH 0648/1154] Sort is_multiple composite columns when displaying
 them in the book list

---
 src/calibre/gui2/library/models.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 181f145cbe..5601bf0767 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -683,15 +683,25 @@ class BooksModel(QAbstractTableModel):  # {{{
                 def func(idx):
                     return by if fffunc(field_obj, idfunc(idx)) else bb
             elif dt in {'text', 'comments', 'composite', 'enumeration'}:
-                if m['is_multiple'] and not field_obj.is_composite:
+                if m['is_multiple']:
                     jv = m['is_multiple']['list_to_ui']
                     do_sort = '&' not in jv
-                    if do_sort:
-                        def func(idx):
-                            return QVariant(jv.join(sorted(fffunc(field_obj, idfunc(idx), default_value=()), key=sort_key)))
+                    if field_obj.is_composite:
+                        if do_sort:
+                            sv = m['is_multiple']['cache_to_list']
+                            def func(idx):
+                                val = fffunc(field_obj, idfunc(idx), default_value='') or ''
+                                return QVariant(jv.join(sorted((x.strip() for x in val.split(sv)), key=sort_key)))
+                        else:
+                            def func(idx):
+                                return QVariant(fffunc(field_obj, idfunc(idx), default_value=''))
                     else:
-                        def func(idx):
-                            return QVariant(jv.join(fffunc(field_obj, idfunc(idx), default_value=())))
+                        if do_sort:
+                            def func(idx):
+                                return QVariant(jv.join(sorted(fffunc(field_obj, idfunc(idx), default_value=()), key=sort_key)))
+                        else:
+                            def func(idx):
+                                return QVariant(jv.join(fffunc(field_obj, idfunc(idx), default_value=())))
                 else:
                     if dt in {'text', 'composite', 'enumeration'} and m['display'].get('use_decorations', False):
                         def func(idx):

From 172e4def716815a9cccf5e576afd20db729fc714 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 12:09:09 +0530
Subject: [PATCH 0649/1154] Remove unused olddb code paths

---
 src/calibre/db/__init__.py                  |   2 +-
 src/calibre/gui2/actions/choose_library.py  |  12 +-
 src/calibre/gui2/dialogs/check_library.py   | 133 +---------
 src/calibre/gui2/dialogs/metadata_bulk.py   | 271 +-------------------
 src/calibre/gui2/library/alternate_views.py |   2 -
 src/calibre/gui2/library/models.py          | 189 +-------------
 src/calibre/gui2/ui.py                      |   7 +-
 src/calibre/library/server/browse.py        |  10 +-
 8 files changed, 28 insertions(+), 598 deletions(-)

diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index f59612449a..03575360e5 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -89,7 +89,7 @@ def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None, conve
         x = {}
         for field in FIELDS:
             x[field] = record[self.FIELD_MAP[field]]
-        if convert_to_local_tz and hasattr(self, 'new_api'):
+        if convert_to_local_tz:
             for tf in ('timestamp', 'pubdate', 'last_modified'):
                 x[tf] = as_local_time(x[tf])
 
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 650545fd64..ec158b6718 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -190,10 +190,7 @@ class BackupStatus(QDialog):  # {{{
 
     def mark_all_dirty(self):
         db = self.db()
-        if hasattr(db, 'new_api'):
-            db.new_api.mark_as_dirty(db.new_api.all_book_ids())
-        else:
-            db.dirtied(list(db.data.iterallids()))
+        db.new_api.mark_as_dirty(db.new_api.all_book_ids())
 
 # }}}
 
@@ -454,17 +451,14 @@ class ChooseLibraryAction(InterfaceAction):
             self.gui.library_moved(db.library_path, call_close=False)
 
     def check_library(self):
-        from calibre.gui2.dialogs.check_library import CheckLibraryDialog, DBCheck, DBCheckNew
+        from calibre.gui2.dialogs.check_library import CheckLibraryDialog, DBCheck
         self.gui.library_view.save_state()
         m = self.gui.library_view.model()
         m.stop_metadata_backup()
         db = m.db
         db.prefs.disable_setting = True
 
-        if hasattr(db, 'new_api'):
-            d = DBCheckNew(self.gui, db)
-        else:
-            d = DBCheck(self.gui, db)
+        d = DBCheck(self.gui, db)
         d.start()
         try:
             d.conn.close()
diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index 73dcadd596..2cb15c50d1 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -3,22 +3,20 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __license__   = 'GPL v3'
 
-import os, shutil
+import os
 from threading import Thread
 
-from PyQt4.Qt import (QDialog, QVBoxLayout, QHBoxLayout, QTreeWidget, QLabel,
-            QPushButton, QDialogButtonBox, QApplication, QTreeWidgetItem,
-            QLineEdit, Qt, QProgressBar, QSize, QTimer, QIcon, QTextEdit,
-            QSplitter, QWidget, pyqtSignal)
+from PyQt4.Qt import (
+    QDialog, QVBoxLayout, QHBoxLayout, QTreeWidget, QLabel, QPushButton,
+    QDialogButtonBox, QApplication, QTreeWidgetItem, QLineEdit, Qt, QSize,
+    QTimer, QIcon, QTextEdit, QSplitter, QWidget, pyqtSignal)
 
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.library.check_library import CheckLibrary, CHECKS
 from calibre.utils.recycle_bin import delete_file, delete_tree
 from calibre import prints, as_unicode
-from calibre.ptempfile import PersistentTemporaryFile
-from calibre.library.sqlite import DBThread, OperationalError
 
-class DBCheckNew(QDialog):  # {{{
+class DBCheck(QDialog):  # {{{
 
     update_msg = pyqtSignal(object)
 
@@ -75,125 +73,6 @@ class DBCheckNew(QDialog):  # {{{
 
 # }}}
 
-class DBCheck(QDialog):  # {{{
-
-    def __init__(self, parent, db):
-        QDialog.__init__(self, parent)
-        self.l = QVBoxLayout()
-        self.setLayout(self.l)
-        self.l1 = QLabel(_('Checking database integrity')+'...')
-        self.setWindowTitle(_('Checking database integrity'))
-        self.l.addWidget(self.l1)
-        self.pb = QProgressBar(self)
-        self.l.addWidget(self.pb)
-        self.pb.setMaximum(0)
-        self.pb.setMinimum(0)
-        self.msg = QLabel('')
-        self.l.addWidget(self.msg)
-        self.msg.setWordWrap(True)
-        self.bb = QDialogButtonBox(QDialogButtonBox.Cancel)
-        self.l.addWidget(self.bb)
-        self.bb.rejected.connect(self.reject)
-        self.resize(self.sizeHint() + QSize(100, 50))
-        self.error = None
-        self.db = db
-        self.closed_orig_conn = False
-
-    def start(self):
-        self.user_version = self.db.user_version
-        self.rejected = False
-        self.db.clean()
-        self.db.close()
-        self.closed_orig_conn = True
-        t = DBThread(self.db.dbpath, False)
-        t.connect()
-        self.conn = t.conn
-        self.dump = self.conn.iterdump()
-        self.statements = []
-        self.count = 0
-        self.msg.setText(_('Dumping database to SQL'))
-        # Give the backup thread time to stop
-        QTimer.singleShot(2000, self.do_one_dump)
-        self.exec_()
-
-    def do_one_dump(self):
-        if self.rejected:
-            return
-        try:
-            try:
-                self.statements.append(self.dump.next())
-                self.count += 1
-            except StopIteration:
-                self.start_load()
-                return
-            QTimer.singleShot(0, self.do_one_dump)
-        except Exception as e:
-            import traceback
-            self.error = (as_unicode(e), traceback.format_exc())
-            self.reject()
-
-    def start_load(self):
-        try:
-            self.conn.close()
-            self.pb.setMaximum(self.count)
-            self.pb.setValue(0)
-            self.msg.setText(_('Loading database from SQL'))
-            self.db.close()
-            self.ndbpath = PersistentTemporaryFile('.db')
-            self.ndbpath.close()
-            self.ndbpath = self.ndbpath.name
-            t = DBThread(self.ndbpath, False)
-            t.connect()
-            self.conn = t.conn
-            self.conn.execute('create temporary table temp_sequence(id INTEGER PRIMARY KEY AUTOINCREMENT)')
-            self.conn.commit()
-
-            QTimer.singleShot(0, self.do_one_load)
-        except Exception as e:
-            import traceback
-            self.error = (as_unicode(e), traceback.format_exc())
-            self.reject()
-
-    def do_one_load(self):
-        if self.rejected:
-            return
-        if self.count > 0:
-            try:
-                try:
-                    self.conn.execute(self.statements.pop(0))
-                except OperationalError:
-                    if self.count > 1:
-                        # The last statement in the dump could be an extra
-                        # commit, so ignore it.
-                        raise
-                self.pb.setValue(self.pb.value() + 1)
-                self.count -= 1
-                QTimer.singleShot(0, self.do_one_load)
-            except Exception as e:
-                import traceback
-                self.error = (as_unicode(e), traceback.format_exc())
-                self.reject()
-
-        else:
-            self.replace_db()
-
-    def replace_db(self):
-        self.conn.commit()
-        self.conn.execute('pragma user_version=%d'%int(self.user_version))
-        self.conn.commit()
-        self.conn.close()
-        shutil.copyfile(self.ndbpath, self.db.dbpath)
-        self.db = None
-        self.accept()
-
-    def break_cycles(self):
-        self.statements = self.unpickler = self.db = self.conn = None
-
-    def reject(self):
-        self.rejected = True
-        QDialog.reject(self)
-# }}}
-
 class Item(QTreeWidgetItem):
     pass
 
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 5f6d3bcc3a..11716124e3 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -26,8 +26,7 @@ from calibre.utils.icu import sort_key, capitalize
 from calibre.utils.config import prefs, tweaks
 from calibre.utils.magick.draw import identify_data
 from calibre.utils.date import qt_to_dt
-from calibre.ptempfile import SpooledTemporaryFile
-from calibre.db import SPOOL_SIZE, _get_next_series_num_for_list
+from calibre.db import _get_next_series_num_for_list
 
 def get_cover_data(stream, ext):  # {{{
     from calibre.ebooks.metadata.meta import get_metadata
@@ -59,7 +58,7 @@ Settings = namedtuple('Settings', 'remove_all remove add au aus do_aus rating pu
                       'remove_format do_swap_ta do_remove_conv do_auto_author series do_series_restart series_start_value '
                       'do_title_case cover_action clear_series pubdate adddate do_title_sort languages clear_languages restore_original')
 
-class MyBlockingBusyNew(QDialog):  # {{{
+class MyBlockingBusy(QDialog):  # {{{
 
     all_done = pyqtSignal()
 
@@ -279,256 +278,6 @@ class MyBlockingBusyNew(QDialog):  # {{{
                 self.s_r_func(book_id)
 # }}}
 
-class MyBlockingBusy(QDialog):  # {{{
-
-    do_one_signal = pyqtSignal()
-
-    phases = ['',
-              _('Title/Author'),
-              _('Standard metadata'),
-              _('Custom metadata'),
-              _('Search/Replace'),
-    ]
-
-    def __init__(self, msg, args, db, ids, cc_widgets, s_r_func,
-                 parent=None, window_title=_('Working')):
-        QDialog.__init__(self, parent)
-
-        self._layout = QVBoxLayout()
-        self.setLayout(self._layout)
-        self.msg_text = msg
-        self.msg = QLabel(msg+'        ')  # Ensure dialog is wide enough
-        # self.msg.setWordWrap(True)
-        self.font = QFont()
-        self.font.setPointSize(self.font.pointSize() + 8)
-        self.msg.setFont(self.font)
-        self.pi = ProgressIndicator(self)
-        self.pi.setDisplaySize(100)
-        self._layout.addWidget(self.pi, 0, Qt.AlignHCenter)
-        self._layout.addSpacing(15)
-        self._layout.addWidget(self.msg, 0, Qt.AlignHCenter)
-        self.setWindowTitle(window_title)
-        self.resize(self.sizeHint())
-        self.start()
-
-        self.args = args
-        self.series_start_value = None
-        self.db = db
-        self.ids = ids
-        self.error = None
-        self.cc_widgets = cc_widgets
-        self.s_r_func = s_r_func
-        self.do_one_signal.connect(self.do_one_safe, Qt.QueuedConnection)
-
-    def start(self):
-        self.pi.startAnimation()
-
-    def stop(self):
-        self.pi.stopAnimation()
-
-    def accept(self):
-        self.stop()
-        return QDialog.accept(self)
-
-    def exec_(self):
-        self.current_index = 0
-        self.current_phase = 1
-        self.do_one_signal.emit()
-        return QDialog.exec_(self)
-
-    def do_one_safe(self):
-        try:
-            if self.current_index >= len(self.ids):
-                self.current_phase += 1
-                self.current_index = 0
-                if self.current_phase > 4:
-                    self.db.commit()
-                    return self.accept()
-            id = self.ids[self.current_index]
-            percent = int((self.current_index*100)/float(len(self.ids)))
-            self.msg.setText(self.msg_text.format(self.phases[self.current_phase],
-                                        percent))
-            self.do_one(id)
-        except Exception as err:
-            import traceback
-            try:
-                err = unicode(err)
-            except:
-                err = repr(err)
-            self.error = (err, traceback.format_exc())
-            return self.accept()
-
-    def do_one(self, id):
-        remove_all, remove, add, au, aus, do_aus, rating, pub, do_series, \
-            do_autonumber, do_remove_format, remove_format, do_swap_ta, \
-            do_remove_conv, do_auto_author, series, do_series_restart, \
-            series_start_value, do_title_case, cover_action, clear_series, \
-            pubdate, adddate, do_title_sort, languages, clear_languages, \
-            restore_original = self.args
-
-        # first loop: All changes that modify the filesystem and commit
-        # immediately. We want to
-        # try hard to keep the DB and the file system in sync, even in the face
-        # of exceptions or forced exits.
-        if self.current_phase == 1:
-            title_set = False
-            if do_swap_ta:
-                title = self.db.title(id, index_is_id=True)
-                aum = self.db.authors(id, index_is_id=True)
-                if aum:
-                    aum = [a.strip().replace('|', ',') for a in aum.split(',')]
-                    new_title = authors_to_string(aum)
-                    if do_title_case:
-                        new_title = titlecase(new_title)
-                    self.db.set_title(id, new_title, notify=False)
-                    title_set = True
-                if title:
-                    new_authors = string_to_authors(title)
-                    self.db.set_authors(id, new_authors, notify=False)
-            if do_title_case and not title_set:
-                title = self.db.title(id, index_is_id=True)
-                self.db.set_title(id, titlecase(title), notify=False)
-            if do_title_sort:
-                title = self.db.title(id, index_is_id=True)
-                if languages:
-                    lang = languages[0]
-                else:
-                    lang = self.db.languages(id, index_is_id=True)
-                    if lang:
-                        lang = lang.partition(',')[0]
-                self.db.set_title_sort(id, title_sort(title, lang=lang),
-                        notify=False)
-            if au:
-                self.db.set_authors(id, string_to_authors(au), notify=False)
-            if cover_action == 'remove':
-                self.db.remove_cover(id)
-            elif cover_action == 'generate':
-                from calibre.ebooks import calibre_cover
-                from calibre.ebooks.metadata import fmt_sidx
-                from calibre.gui2 import config
-                mi = self.db.get_metadata(id, index_is_id=True)
-                series_string = None
-                if mi.series:
-                    series_string = _('Book %(sidx)s of %(series)s')%dict(
-                        sidx=fmt_sidx(mi.series_index,
-                        use_roman=config['use_roman_numerals_for_series_number']),
-                        series=mi.series)
-
-                cdata = calibre_cover(mi.title, mi.format_field('authors')[-1],
-                        series_string=series_string)
-                self.db.set_cover(id, cdata)
-            elif cover_action == 'fromfmt':
-                fmts = self.db.formats(id, index_is_id=True, verify_formats=False)
-                if fmts:
-                    covers = []
-                    for fmt in fmts.split(','):
-                        fmtf = self.db.format(id, fmt, index_is_id=True,
-                                as_file=True)
-                        if fmtf is None:
-                            continue
-                        cdata, area = get_cover_data(fmtf, fmt)
-                        if cdata:
-                            covers.append((cdata, area))
-                    covers.sort(key=lambda x: x[1])
-                    if covers:
-                        self.db.set_cover(id, covers[-1][0])
-                    covers = []
-            elif cover_action == 'trim':
-                from calibre.utils.magick import Image
-                cdata = self.db.cover(id, index_is_id=True)
-                if cdata:
-                    im = Image()
-                    im.load(cdata)
-                    im.trim(tweaks['cover_trim_fuzz_value'])
-                    cdata = im.export('jpg')
-                    self.db.set_cover(id, cdata)
-
-            if do_remove_format:
-                self.db.remove_format(id, remove_format, index_is_id=True,
-                        notify=False, commit=True)
-
-            if restore_original:
-                formats = self.db.formats(id, index_is_id=True)
-                formats = formats.split(',') if formats else []
-                originals = [x.upper() for x in formats if
-                        x.upper().startswith('ORIGINAL_')]
-                for ofmt in originals:
-                    fmt = ofmt.replace('ORIGINAL_', '')
-                    with SpooledTemporaryFile(SPOOL_SIZE) as stream:
-                        self.db.copy_format_to(id, ofmt, stream,
-                                index_is_id=True)
-                        stream.seek(0)
-                        self.db.add_format(id, fmt, stream, index_is_id=True,
-                                notify=False)
-                    self.db.remove_format(id, ofmt, index_is_id=True,
-                            notify=False, commit=True)
-
-        elif self.current_phase == 2:
-            # All of these just affect the DB, so we can tolerate a total rollback
-            if do_auto_author:
-                x = self.db.author_sort_from_book(id, index_is_id=True)
-                if x:
-                    self.db.set_author_sort(id, x, notify=False, commit=False)
-
-            if aus and do_aus:
-                self.db.set_author_sort(id, aus, notify=False, commit=False)
-
-            if rating != -1:
-                self.db.set_rating(id, 2*rating, notify=False, commit=False)
-
-            if pub:
-                self.db.set_publisher(id, pub, notify=False, commit=False)
-
-            if clear_series:
-                self.db.set_series(id, '', notify=False, commit=False)
-
-            if pubdate is not None:
-                self.db.set_pubdate(id, pubdate, notify=False, commit=False)
-
-            if adddate is not None:
-                self.db.set_timestamp(id, adddate, notify=False, commit=False)
-
-            if do_series:
-                if do_series_restart:
-                    if self.series_start_value is None:
-                        self.series_start_value = series_start_value
-                    next = self.series_start_value
-                    self.series_start_value += 1
-                else:
-                    next = self.db.get_next_series_num_for(series)
-                self.db.set_series(id, series, notify=False, commit=False)
-                if not series:
-                    self.db.set_series_index(id, 1.0, notify=False, commit=False)
-                elif do_autonumber:  # is True if do_series_restart is True
-                    self.db.set_series_index(id, next, notify=False, commit=False)
-                elif tweaks['series_index_auto_increment'] != 'no_change':
-                    self.db.set_series_index(id, 1.0, notify=False, commit=False)
-
-            if do_remove_conv:
-                self.db.delete_conversion_options(id, 'PIPE', commit=False)
-
-            if clear_languages:
-                self.db.set_languages(id, [], notify=False, commit=False)
-            elif languages:
-                self.db.set_languages(id, languages, notify=False, commit=False)
-
-        elif self.current_phase == 3:
-            # both of these are fast enough to just do them all
-            for w in self.cc_widgets:
-                w.commit(self.ids)
-            if remove_all:
-                self.db.remove_all_tags(self.ids)
-            self.db.bulk_modify_tags(self.ids, add=add, remove=remove,
-                                         notify=False)
-            self.current_index = len(self.ids)
-        elif self.current_phase == 4:
-            self.s_r_func(id)
-        # do the next one
-        self.current_index += 1
-        self.do_one_signal.emit()
-
-    # }}}
-
 class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
 
     s_r_functions = {''              : lambda x: x,
@@ -1242,17 +991,11 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
                 pubdate, adddate, do_title_sort, languages, clear_languages,
                 restore_original)
 
-        if hasattr(self.db, 'new_api'):
-            source = self.s_r_sf_itemdata(None)
-            do_sr = source and self.s_r_obj
-            bb = MyBlockingBusyNew(args, self.ids, self.db,
-                getattr(self, 'custom_column_widgets', []),
-                self.do_search_replace, do_sr, parent=self)
-        else:
-            bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.')
-                %len(self.ids), args, self.db, self.ids,
-                getattr(self, 'custom_column_widgets', []),
-                self.do_search_replace, parent=self)
+        source = self.s_r_sf_itemdata(None)
+        do_sr = source and self.s_r_obj
+        bb = MyBlockingBusy(args, self.ids, self.db,
+            getattr(self, 'custom_column_widgets', []),
+            self.do_search_replace, do_sr, parent=self)
 
         # The metadata backup thread causes database commits
         # which can slow down bulk editing of large numbers of books
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index f2023e2a44..d805a682e7 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -685,8 +685,6 @@ class GridView(QListView):
         self.thumbnail_cache.shutdown()
 
     def set_database(self, newdb, stage=0):
-        if not hasattr(newdb, 'new_api'):
-            return
         if stage == 0:
             self.ignore_render_requests.set()
             try:
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 5601bf0767..cfa687ab37 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -11,7 +11,7 @@ from collections import defaultdict, namedtuple
 from PyQt4.Qt import (QAbstractTableModel, Qt, pyqtSignal, QIcon, QImage,
         QModelIndex, QVariant, QDateTime, QColor, QPixmap)
 
-from calibre.gui2 import NONE, UNDEFINED_QDATETIME, error_dialog
+from calibre.gui2 import NONE, error_dialog
 from calibre.utils.search_query_parser import ParseException
 from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_authors
 from calibre.ebooks.metadata.book.formatter import SafeFormat
@@ -227,20 +227,14 @@ class BooksModel(QAbstractTableModel):  # {{{
             elif col in self.custom_columns:
                 self.headers[col] = self.custom_columns[col]['name']
 
-        if hasattr(self.db, 'new_api'):
-            self.build_new_data_convertors()
-        else:
-            self.build_data_convertors()
+        self.build_data_convertors()
         self.reset()
         self.database_changed.emit(db)
         self.stop_metadata_backup()
         self.start_metadata_backup()
 
     def start_metadata_backup(self):
-        if hasattr(self.db, 'new_api'):
-            from calibre.db.backup import MetadataBackup
-        else:
-            from calibre.library.caches import MetadataBackup
+        from calibre.db.backup import MetadataBackup
         self.metadata_backup = MetadataBackup(self.db)
         self.metadata_backup.start()
 
@@ -315,14 +309,9 @@ class BooksModel(QAbstractTableModel):  # {{{
         return ids
 
     def delete_books_by_id(self, ids, permanent=False):
-        if hasattr(self.db, 'new_api'):
-            self.db.new_api.remove_books(ids, permanent=permanent)
-            self.db.data.books_deleted(tuple(ids))
-            self.db.notify('delete', list(ids))
-        else:
-            for id in ids:
-                self.db.delete_book(id, permanent=permanent, do_clean=False)
-            self.db.clean()
+        self.db.new_api.remove_books(ids, permanent=permanent)
+        self.db.data.books_deleted(tuple(ids))
+        self.db.notify('delete', list(ids))
         self.books_deleted()
 
     def books_added(self, num):
@@ -646,7 +635,7 @@ class BooksModel(QAbstractTableModel):  # {{{
             img = self.default_image
         return img
 
-    def build_new_data_convertors(self):
+    def build_data_convertors(self):
 
         def renderer(field, decorator=False):
             idfunc = self.db.id
@@ -762,170 +751,6 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.column_to_dc_map = [self.dc[col] for col in self.column_map]
         self.column_to_dc_decorator_map = [self.dc_decorator.get(col, None) for col in self.column_map]
 
-    def build_data_convertors(self):
-        def authors(r, idx=-1):
-            au = self.db.data[r][idx]
-            if au:
-                au = [a.strip().replace('|', ',') for a in au.split(',')]
-                return QVariant(' & '.join(au))
-            else:
-                return None
-
-        def languages(r, idx=-1):
-            lc = self.db.data[r][idx]
-            if lc:
-                langs = [calibre_langcode_to_name(l.strip()) for l in lc.split(',')]
-                return QVariant(', '.join(langs))
-            return None
-
-        def tags(r, idx=-1):
-            tags = self.db.data[r][idx]
-            if tags:
-                return QVariant(', '.join(sorted(tags.split(','), key=sort_key)))
-            return None
-
-        def series_type(r, idx=-1, siix=-1):
-            series = self.db.data[r][idx]
-            if series:
-                idx = fmt_sidx(self.db.data[r][siix])
-                return QVariant(series + ' [%s]'%idx)
-            return None
-
-        def size(r, idx=-1):
-            size = self.db.data[r][idx]
-            if size:
-                ans = '%.1f'%(float(size)/(1024*1024))
-                if size > 0 and ans == '0.0':
-                    ans = '<0.1'
-                return QVariant(ans)
-            return None
-
-        def rating_type(r, idx=-1):
-            r = self.db.data[r][idx]
-            r = r/2.0 if r else 0
-            return QVariant(int(r))
-
-        def datetime_type(r, idx=-1):
-            val = self.db.data[r][idx]
-            if val is not None:
-                return QVariant(QDateTime(as_local_time(val)))
-            else:
-                return QVariant(UNDEFINED_QDATETIME)
-
-        def bool_type(r, idx=-1):
-            return None  # displayed using a decorator
-
-        def bool_type_decorator(r, idx=-1, bool_cols_are_tristate=True):
-            val = force_to_bool(self.db.data[r][idx])
-            if val is None:
-                if not bool_cols_are_tristate:
-                    return self.bool_no_icon
-                return NONE
-            if val:
-                return self.bool_yes_icon
-            return self.bool_no_icon
-
-        def ondevice_decorator(r, idx=-1):
-            text = self.db.data[r][idx]
-            if text:
-                return self.bool_yes_icon
-            return self.bool_blank_icon
-
-        def text_type(r, mult=None, idx=-1):
-            text = self.db.data[r][idx]
-            if text and mult:
-                jv = mult['list_to_ui']
-                sv = mult['cache_to_list']
-                return QVariant(jv.join(
-                    sorted([t.strip() for t in text.split(sv)], key=sort_key)))
-            return QVariant(text)
-
-        def decorated_text_type(r, idx=-1):
-            text = self.db.data[r][idx]
-            if force_to_bool(text) is not None:
-                return None
-            return QVariant(text)
-
-        def number_type(r, idx=-1, fmt=None):
-            if fmt is not None:
-                try:
-                    return QVariant(fmt.format(self.db.data[r][idx]))
-                except:
-                    pass
-            return QVariant(self.db.data[r][idx])
-
-        self.dc = {
-                   'title'    : functools.partial(text_type,
-                                idx=self.db.field_metadata['title']['rec_index'], mult=None),
-                   'authors'  : functools.partial(authors,
-                                idx=self.db.field_metadata['authors']['rec_index']),
-                   'size'     : functools.partial(size,
-                                idx=self.db.field_metadata['size']['rec_index']),
-                   'timestamp': functools.partial(datetime_type,
-                                idx=self.db.field_metadata['timestamp']['rec_index']),
-                   'pubdate'  : functools.partial(datetime_type,
-                                idx=self.db.field_metadata['pubdate']['rec_index']),
-                   'last_modified': functools.partial(datetime_type,
-                                idx=self.db.field_metadata['last_modified']['rec_index']),
-                   'rating'   : functools.partial(rating_type,
-                                idx=self.db.field_metadata['rating']['rec_index']),
-                   'publisher': functools.partial(text_type,
-                                idx=self.db.field_metadata['publisher']['rec_index'], mult=None),
-                   'tags'     : functools.partial(tags,
-                                idx=self.db.field_metadata['tags']['rec_index']),
-                   'series'   : functools.partial(series_type,
-                                idx=self.db.field_metadata['series']['rec_index'],
-                                siix=self.db.field_metadata['series_index']['rec_index']),
-                   'ondevice' : functools.partial(text_type,
-                                idx=self.db.field_metadata['ondevice']['rec_index'], mult=None),
-                   'languages': functools.partial(languages,
-                                idx=self.db.field_metadata['languages']['rec_index']),
-                   }
-
-        self.dc_decorator = {
-                'ondevice':functools.partial(ondevice_decorator,
-                    idx=self.db.field_metadata['ondevice']['rec_index']),
-                    }
-
-        # Add the custom columns to the data converters
-        for col in self.custom_columns:
-            idx = self.custom_columns[col]['rec_index']
-            datatype = self.custom_columns[col]['datatype']
-            if datatype in ('text', 'comments', 'composite', 'enumeration'):
-                mult=self.custom_columns[col]['is_multiple']
-                self.dc[col] = functools.partial(text_type, idx=idx, mult=mult)
-                if datatype in ['text', 'composite', 'enumeration'] and not mult:
-                    if self.custom_columns[col]['display'].get('use_decorations', False):
-                        self.dc[col] = functools.partial(decorated_text_type, idx=idx)
-                        self.dc_decorator[col] = functools.partial(
-                            bool_type_decorator, idx=idx,
-                            bool_cols_are_tristate=
-                                self.db.prefs.get('bools_are_tristate'))
-            elif datatype in ('int', 'float'):
-                fmt = self.custom_columns[col]['display'].get('number_format', None)
-                self.dc[col] = functools.partial(number_type, idx=idx, fmt=fmt)
-            elif datatype == 'datetime':
-                self.dc[col] = functools.partial(datetime_type, idx=idx)
-            elif datatype == 'bool':
-                self.dc[col] = functools.partial(bool_type, idx=idx)
-                self.dc_decorator[col] = functools.partial(
-                            bool_type_decorator, idx=idx,
-                            bool_cols_are_tristate=
-                                self.db.prefs.get('bools_are_tristate'))
-            elif datatype == 'rating':
-                self.dc[col] = functools.partial(rating_type, idx=idx)
-            elif datatype == 'series':
-                self.dc[col] = functools.partial(series_type, idx=idx,
-                    siix=self.db.field_metadata.cc_series_index_column_for(col))
-            else:
-                print 'What type is this?', col, datatype
-        # build a index column to data converter map, to remove the string lookup in the data loop
-        self.column_to_dc_map = []
-        self.column_to_dc_decorator_map = []
-        for col in self.column_map:
-            self.column_to_dc_map.append(self.dc[col])
-            self.column_to_dc_decorator_map.append(self.dc_decorator.get(col, None))
-
     def data(self, index, role):
         col = index.column()
         # in obscure cases where custom columns are both edited and added, for a time
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 925300b619..a5b73fc296 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -544,11 +544,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             self.activateWindow()
         elif msg.startswith('refreshdb:'):
             db = self.library_view.model().db
-            if hasattr(db, 'new_api'):
-                db.new_api.reload_from_db()
-                self.library_view.model().resort()
-            else:
-                self.library_view.model().refresh()
+            db.new_api.reload_from_db()
+            self.library_view.model().resort()
             self.library_view.model().research()
             self.tags_view.recount()
             self.library_view.model().db.refresh_format_cache()
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 3096c8da9d..5c2ffe7865 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -681,10 +681,7 @@ class BrowseServer(object):
                 ids = self.db.get_books_for_category(q, cid)
                 ids = [x for x in ids if x in all_ids]
 
-        if hasattr(self.db, 'new_api'):
-            items = [self.db.data.tablerow_for_id(x) for x in ids]
-        else:
-            items = [self.db.data._data[x] for x in ids]
+        items = [self.db.data.tablerow_for_id(x) for x in ids]
         if category == 'newest':
             list_sort = 'timestamp'
         if dt == 'series':
@@ -948,10 +945,7 @@ class BrowseServer(object):
         if isbytestring(query):
             query = query.decode('UTF-8')
         ids = self.db.search_getting_ids(query.strip(), self.search_restriction)
-        if hasattr(self.db, 'new_api'):
-            items = [self.db.data.tablerow_for_id(x) for x in ids]
-        else:
-            items = [self.db.data._data[x] for x in ids]
+        items = [self.db.data.tablerow_for_id(x) for x in ids]
         sort = self.browse_sort_book_list(items, list_sort)
         ids = [x[0] for x in items]
         html = render_book_list(ids, self.opts.url_prefix,

From ec1c6d43cfe2a17b515ed290d019d6d265eec8c6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 12:53:56 +0530
Subject: [PATCH 0650/1154] Fis reset tweaks in test not applying to
 field_metadata in Metadata objects

---
 src/calibre/db/tests/base.py             | 2 --
 src/calibre/db/tests/main.py             | 4 ++++
 src/calibre/ebooks/metadata/book/base.py | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index 82f5360585..fae9ae944f 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -24,8 +24,6 @@ class BaseTest(unittest.TestCase):
     def setUp(self):
         from calibre.utils.recycle_bin import nuke_recycle
         nuke_recycle()
-        from calibre.utils.config_base import reset_tweaks_to_default
-        reset_tweaks_to_default()
         self.library_path = self.mkdtemp()
         self.create_db(self.library_path)
 
diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 461edc95bb..822a12f4e2 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -18,6 +18,10 @@ def find_tests():
     return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')
 
 if __name__ == '__main__':
+    from calibre.utils.config_base import reset_tweaks_to_default
+    from calibre.ebooks.metadata.book.base import reset_field_metadata
+    reset_tweaks_to_default()
+    reset_field_metadata()
     parser = argparse.ArgumentParser()
     parser.add_argument('name', nargs='?', default=None,
                         help='The name of the test to run, for e.g. writing.WritingTest.many_many_basic or .many_many_basic for a shortcut')
diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 046690890c..2f964bc4ee 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -42,6 +42,10 @@ NULL_VALUES = {
 
 field_metadata = FieldMetadata()
 
+def reset_field_metadata():
+    global field_metadata
+    field_metadata = FieldMetadata()
+
 ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '')
 cv = lambda val: val.strip().replace(',', '|').replace(':', '|')
 

From 302b68135f01f6a4bdbda321a09403d89185d758 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 14:10:03 +0530
Subject: [PATCH 0651/1154] Print out how long each test takes and slowest
 tests

---
 src/calibre/db/tests/main.py | 49 ++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 822a12f4e2..f38913a7f0 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -7,13 +7,56 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import unittest, os, argparse
+import unittest, os, argparse, time, functools
 
 try:
     import init_calibre  # noqa
 except ImportError:
     pass
 
+def no_endl(f):
+    @functools.wraps(f)
+    def func(*args, **kwargs):
+        self = f.__self__
+        orig = self.stream.writeln
+        self.stream.writeln = self.stream.write
+        try:
+            return f(*args, **kwargs)
+        finally:
+            self.stream.writeln = orig
+    return func
+
+class TestResult(unittest.TextTestResult):
+
+    def __init__(self, *args, **kwargs):
+        super(TestResult, self).__init__(*args, **kwargs)
+        self.start_time = {}
+        for x in ('Success', 'Error', 'Failure', 'Skip', 'ExpectedFailure', 'UnexpectedSuccess'):
+            x = 'add' + x
+            setattr(self, x, no_endl(getattr(self, x)))
+        self.times = {}
+
+    def startTest(self, test):
+        self.start_time[test] = time.time()
+        return super(TestResult, self).startTest(test)
+
+    def stopTest(self, test):
+        orig = self.stream.writeln
+        self.stream.writeln = self.stream.write
+        super(TestResult, self).stopTest(test)
+        elapsed = time.time()
+        elapsed -= self.start_time.get(test, elapsed)
+        self.times[test] = elapsed
+        self.stream.writeln = orig
+        self.stream.writeln(' [%.1g secs]' % elapsed)
+
+    def stopTestRun(self):
+        super(TestResult, self).stopTestRun()
+        if self.wasSuccessful():
+            tests = sorted(self.times, key=self.times.get, reverse=True)
+        slowest = ['%s [%g]' % (t.id(), self.times[t]) for t in tests[:3]]
+        self.stream.writeln('\nSlowest tests: %s' % ' '.join(slowest))
+
 def find_tests():
     return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')
 
@@ -47,5 +90,7 @@ if __name__ == '__main__':
         tests = ans
     else:
         tests = unittest.defaultTestLoader.loadTestsFromName(args.name) if args.name else find_tests()
-    unittest.TextTestRunner(verbosity=4).run(tests)
+    r = unittest.TextTestRunner
+    r.resultclass = TestResult
+    r(verbosity=4).run(tests)
 

From 50ce1c08af1c70231a533f39c484a87bbbed35c3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 14:13:52 +0530
Subject: [PATCH 0652/1154] ...

---
 src/calibre/db/tests/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index f38913a7f0..200c9b357b 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -48,13 +48,13 @@ class TestResult(unittest.TextTestResult):
         elapsed -= self.start_time.get(test, elapsed)
         self.times[test] = elapsed
         self.stream.writeln = orig
-        self.stream.writeln(' [%.1g secs]' % elapsed)
+        self.stream.writeln(' [%.1g s]' % elapsed)
 
     def stopTestRun(self):
         super(TestResult, self).stopTestRun()
         if self.wasSuccessful():
             tests = sorted(self.times, key=self.times.get, reverse=True)
-        slowest = ['%s [%g]' % (t.id(), self.times[t]) for t in tests[:3]]
+        slowest = ['%s [%g s]' % (t.id(), self.times[t]) for t in tests[:3]]
         self.stream.writeln('\nSlowest tests: %s' % ' '.join(slowest))
 
 def find_tests():

From 1ea50f3d403ce364106b24d6462cffb07b9fc339 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 14:16:35 +0530
Subject: [PATCH 0653/1154] ...

---
 src/calibre/db/tests/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 200c9b357b..83b8dd7d8f 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -55,7 +55,8 @@ class TestResult(unittest.TextTestResult):
         if self.wasSuccessful():
             tests = sorted(self.times, key=self.times.get, reverse=True)
         slowest = ['%s [%g s]' % (t.id(), self.times[t]) for t in tests[:3]]
-        self.stream.writeln('\nSlowest tests: %s' % ' '.join(slowest))
+        if len(slowest) > 1:
+            self.stream.writeln('\nSlowest tests: %s' % ' '.join(slowest))
 
 def find_tests():
     return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')

From 138de9b6994994420c925f6fa597947b0ae7faf2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 17:30:34 +0530
Subject: [PATCH 0654/1154] newdb: Speed up S&R in the bulk metadata edit
 dialog

---
 src/calibre/gui2/actions/edit_metadata.py |  6 ++-
 src/calibre/gui2/dialogs/metadata_bulk.py | 56 +++++++----------------
 2 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index dcf86923dd..4983640291 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -352,11 +352,12 @@ class EditMetadataAction(InterfaceAction):
         # Prevent the TagView from updating due to signals from the database
         self.gui.tags_view.blockSignals(True)
         changed = False
+        refresh_books = set(book_ids)
         try:
             current_tab = 0
             while True:
                 dialog = MetadataBulkDialog(self.gui, rows,
-                                self.gui.library_view.model(), current_tab)
+                                self.gui.library_view.model(), current_tab, refresh_books)
                 if dialog.changed:
                     changed = True
                 if not dialog.do_again:
@@ -365,12 +366,13 @@ class EditMetadataAction(InterfaceAction):
         finally:
             self.gui.tags_view.blockSignals(False)
         if changed:
+            refresh_books |= dialog.refresh_books
             m = self.gui.library_view.model()
             if gprefs['refresh_book_list_on_bulk_edit']:
                 m.refresh(reset=False)
                 m.research()
             else:
-                m.refresh_ids(book_ids)
+                m.refresh_ids(refresh_books)
             self.gui.tags_view.recount()
             if self.gui.cover_flow:
                 self.gui.cover_flow.dataChanged()
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 11716124e3..0b01b5b2a7 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -3,8 +3,8 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 '''Dialog to edit metadata in bulk'''
 
-import re, os, inspect
-from collections import namedtuple
+import re, os
+from collections import namedtuple, defaultdict
 from threading import Thread
 
 from PyQt4.Qt import Qt, QDialog, QGridLayout, QVBoxLayout, QFont, QLabel, \
@@ -62,7 +62,7 @@ class MyBlockingBusy(QDialog):  # {{{
 
     all_done = pyqtSignal()
 
-    def __init__(self, args, ids, db, cc_widgets, s_r_func, do_sr, parent=None, window_title=_('Working')):
+    def __init__(self, args, ids, db, refresh_books, cc_widgets, s_r_func, do_sr, sr_calls, parent=None, window_title=_('Working')):
         QDialog.__init__(self, parent)
 
         self._layout =  l = QVBoxLayout()
@@ -86,6 +86,8 @@ class MyBlockingBusy(QDialog):  # {{{
         self.db, self.cc_widgets = db, cc_widgets
         self.s_r_func = FunctionDispatcher(s_r_func)
         self.do_sr = do_sr
+        self.sr_calls = sr_calls
+        self.refresh_books = refresh_books
 
     def accept(self):
         pass
@@ -276,6 +278,10 @@ class MyBlockingBusy(QDialog):  # {{{
         if self.do_sr:
             for book_id in self.ids:
                 self.s_r_func(book_id)
+            if self.sr_calls:
+                for field, book_id_val_map in self.sr_calls.iteritems():
+                    self.refresh_books.update(self.db.new_api.set_field(field, book_id_val_map))
+
 # }}}
 
 class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
@@ -296,7 +302,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
                             _('Append to field'),
                         ]
 
-    def __init__(self, window, rows, model, tab):
+    def __init__(self, window, rows, model, tab, refresh_books):
         ResizableDialog.__init__(self, window)
         Ui_MetadataBulkDialog.__init__(self)
         self.model = model
@@ -309,6 +315,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
                 len(rows))
         self.write_series = False
         self.changed = False
+        self.refresh_books = refresh_books
 
         all_tags = self.db.all_tags()
         self.tags.update_items_cache(all_tags)
@@ -790,7 +797,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
                 self.s_r_set_colors()
                 break
 
-    def do_search_replace(self, id):
+    def do_search_replace(self, book_id):
         source = self.s_r_sf_itemdata(None)
         if not source or not self.s_r_obj:
             return
@@ -798,7 +805,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         if not dest:
             dest = source
         dfm = self.db.field_metadata[dest]
-        mi = self.db.get_metadata(id, index_is_id=True)
+        mi = self.db.new_api.get_proxy_metadata(book_id)
         val = self.s_r_do_regexp(mi)
         val = self.s_r_do_destination(mi, val)
         if dfm['is_multiple']:
@@ -823,37 +830,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
             if dest == 'title' and len(val) == 0:
                 val = _('Unknown')
 
-        if dfm['is_custom']:
-            extra = self.db.get_custom_extra(id, label=dfm['label'], index_is_id=True)
-            books_to_refresh = self.db.set_custom(id, val, label=dfm['label'],
-                                                  extra=extra, commit=False,
-                                                  allow_case_change=True)
-        elif dest.startswith('#') and dest.endswith('_index'):
-            label = self.db.field_metadata[dest[:-6]]['label']
-            series = self.db.get_custom(id, label=label, index_is_id=True)
-            books_to_refresh = self.db.set_custom(id, series, label=label,
-                                                  extra=val, commit=False,
-                                                  allow_case_change=True)
-        else:
-            if dest == 'comments':
-                setter = self.db.set_comment
-            elif dest == 'sort':
-                setter = self.db.set_title_sort
-            else:
-                setter = getattr(self.db, 'set_'+dest)
-
-            args = inspect.getargspec(setter)
-            if args and 'allow_case_change' in args.args:
-                books_to_refresh = setter(id, val, notify=False, commit=False,
-                                          allow_case_change=True)
-            else:
-                setter(id, val, notify=False, commit=False)
-                books_to_refresh = set([])
-        if books_to_refresh:
-            # Must commit here because we are telling the gui that the data is
-            # permanent. Make sure it really is.
-            self.db.commit()
-            self.model.refresh_ids(list(books_to_refresh))
+        self.set_field_calls[dest][book_id] = val
     # }}}
 
     def create_custom_column_editors(self):
@@ -993,9 +970,10 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
 
         source = self.s_r_sf_itemdata(None)
         do_sr = source and self.s_r_obj
-        bb = MyBlockingBusy(args, self.ids, self.db,
+        self.set_field_calls = defaultdict(dict)
+        bb = MyBlockingBusy(args, self.ids, self.db, self.refresh_books,
             getattr(self, 'custom_column_widgets', []),
-            self.do_search_replace, do_sr, parent=self)
+            self.do_search_replace, do_sr, self.set_field_calls, parent=self)
 
         # The metadata backup thread causes database commits
         # which can slow down bulk editing of large numbers of books

From 308b7cfb234ed8b7f68af9926f6ceae02bfd7f07 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 17:36:14 +0530
Subject: [PATCH 0655/1154] Add a prominent reference to the user manual in the
 adv search dialog

---
 src/calibre/gui2/dialogs/search.ui | 126 +++++++++++++++--------------
 1 file changed, 64 insertions(+), 62 deletions(-)

diff --git a/src/calibre/gui2/dialogs/search.ui b/src/calibre/gui2/dialogs/search.ui
index a5c2c0a256..60aa0431fa 100644
--- a/src/calibre/gui2/dialogs/search.ui
+++ b/src/calibre/gui2/dialogs/search.ui
@@ -18,33 +18,35 @@
     <normaloff>:/images/search.png</normaloff>:/images/search.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>&amp;What kind of match to use:</string>
+   <item row="0" column="2" rowspan="3">
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="buddy">
-      <cstring>matchkind</cstring>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="matchkind">
-     <item>
-      <property name="text">
-       <string>Contains: the word or phrase matches anywhere in the metadata field</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Equals: the word or phrase must match the entire metadata field</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Regular expression: the expression must match anywhere in the metadata field</string>
-      </property>
-     </item>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QLabel" name="label_12">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>&lt;p&gt;You can also perform other kinds of advanced searches, for example searching date columns for dates after a particular date, or checking for books that have no covers and  so on. See the &lt;a href=&quot;http://manual.calibre-ebook.com/gui.html#the-search-interface&quot;&gt;The Search Interface&lt;/a&gt; for more information.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="2" column="0" colspan="2">
@@ -57,6 +59,16 @@
        <string>A&amp;dvanced Search</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
+       <item row="5" column="0">
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
@@ -140,26 +152,10 @@
             </item>
            </layout>
           </item>
-          <item>
-           <widget class="QLabel" name="label_6">
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>See the &lt;a href=&quot;http://manual.calibre-ebook.com/gui.html#the-search-interface&quot;&gt;User Manual&lt;/a&gt; for more help</string>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -172,16 +168,6 @@
          </property>
         </spacer>
        </item>
-       <item row="3" column="0">
-        <widget class="QDialogButtonBox" name="buttonBox">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="standardButtons">
-          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
@@ -305,18 +291,34 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="1">
-    <spacer name="verticalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>&amp;What kind of match to use:</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+     <property name="buddy">
+      <cstring>matchkind</cstring>
      </property>
-    </spacer>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="matchkind">
+     <item>
+      <property name="text">
+       <string>Contains: the word or phrase matches anywhere in the metadata field</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Equals: the word or phrase must match the entire metadata field</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Regular expression: the expression must match anywhere in the metadata field</string>
+      </property>
+     </item>
+    </widget>
    </item>
   </layout>
  </widget>

From 819f4b1daa16ce88015d82359ec986aa6e5d7245 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 18:47:47 +0530
Subject: [PATCH 0656/1154] Retry cleanup to avoid errors due to transient file
 locks on windows

---
 src/calibre/db/tests/base.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index fae9ae944f..45f3eb39a4 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import unittest, os, shutil, tempfile, atexit, gc
+import unittest, os, shutil, tempfile, atexit, gc, time
 from functools import partial
 from io import BytesIO
 from future_builtins import map
@@ -31,7 +31,13 @@ class BaseTest(unittest.TestCase):
         from calibre.utils.recycle_bin import restore_recyle
         restore_recyle()
         gc.collect(), gc.collect()
-        shutil.rmtree(self.library_path)
+        try:
+            shutil.rmtree(self.library_path)
+        except EnvironmentError:
+            # Try again in case something transient has a file lock on windows
+            gc.collect(), gc.collect()
+            time.sleep(2)
+            shutil.rmtree(self.library_path)
 
     def create_db(self, library_path):
         from calibre.library.database2 import LibraryDatabase2

From a94af603ffc29c6b4e79942c137af32f06341909 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Aug 2013 09:18:12 +0530
Subject: [PATCH 0657/1154] ...

---
 src/calibre/db/tests/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 83b8dd7d8f..85b5cf473f 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -54,9 +54,9 @@ class TestResult(unittest.TextTestResult):
         super(TestResult, self).stopTestRun()
         if self.wasSuccessful():
             tests = sorted(self.times, key=self.times.get, reverse=True)
-        slowest = ['%s [%g s]' % (t.id(), self.times[t]) for t in tests[:3]]
-        if len(slowest) > 1:
-            self.stream.writeln('\nSlowest tests: %s' % ' '.join(slowest))
+            slowest = ['%s [%g s]' % (t.id(), self.times[t]) for t in tests[:3]]
+            if len(slowest) > 1:
+                self.stream.writeln('\nSlowest tests: %s' % ' '.join(slowest))
 
 def find_tests():
     return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')

From a9992f90b8bdc26588366d4c599cccf4e5ae9f25 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Aug 2013 09:25:11 +0530
Subject: [PATCH 0658/1154] newdb: Handle renaming of many-many items when new
 name contains separator

Fix a regression that broke splitting of multiple valued field like tags
into many items during a rename. Fixes #1216699 [Renaming tags and adding "," to split tags does not work anymore](https://bugs.launchpad.net/calibre/+bug/1216699)
---
 src/calibre/db/cache.py         | 14 ++++++++++++--
 src/calibre/db/tests/writing.py | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 101932a777..74455b046f 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1388,12 +1388,22 @@ class Cache(object):
         affected_books = set()
         moved_books = set()
         id_map = {}
+        try:
+            sv = f.metadata['is_multiple']['ui_to_list']
+        except (TypeError, KeyError, AttributeError):
+            sv = None
         for item_id, new_name in item_id_to_new_name_map.iteritems():
-            books, new_id = func(item_id, new_name, self.backend)
+            new_names = tuple(x.strip() for x in new_name.split(sv)) if sv else (new_name,)
+            books, new_id = func(item_id, new_names[0], self.backend)
             affected_books.update(books)
             id_map[item_id] = new_id
             if new_id != item_id:
                 moved_books.update(books)
+            if len(new_names) > 1:
+                # Add the extra items to the books
+                extra = new_names[1:]
+                self._set_field(field, {book_id:self._fast_field_for(f, book_id) + extra for book_id in books})
+
         if affected_books:
             if field == 'authors':
                 self._set_field('author_sort',
@@ -1401,7 +1411,7 @@ class Cache(object):
                 self._update_path(affected_books, mark_as_dirtied=False)
             elif change_index and hasattr(f, 'index_field') and tweaks['series_index_auto_increment'] != 'no_change':
                 for book_id in moved_books:
-                    self._set_field(f.index_field.name, {book_id:self._get_next_series_num_for(self._field_for(field, book_id), field=field)})
+                    self._set_field(f.index_field.name, {book_id:self._get_next_series_num_for(self._fast_field_for(f, book_id), field=field)})
             self._mark_as_dirty(affected_books)
         return affected_books, id_map
 
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index be24647dcd..68f740743d 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -554,6 +554,20 @@ class WritingTest(BaseTest):
             self.assertEqual(c.field_for('#series', 2), 'My Series Two')
             self.assertEqual(c.field_for('#series_index', 1), 3.0)
             self.assertEqual(c.field_for('#series_index', 2), 4.0)
+
+        # Test renaming many-many items to multiple items
+        cache = self.init_cache(self.cloned_library)
+        t = {v:k for k, v in cache.get_id_map('tags').iteritems()}['Tag One']
+        affected_books, id_map = cache.rename_items('tags', {t:'Something, Else, Entirely'})
+        self.assertEqual({1, 2}, affected_books)
+        tmap = cache.get_id_map('tags')
+        self.assertEqual('Something', tmap[id_map[t]])
+        self.assertEqual(1, len(id_map))
+        f1, f2 = cache.field_for('tags', 1), cache.field_for('tags', 2)
+        for f in (f1, f2):
+            for t in 'Something,Else,Entirely'.split(','):
+                self.assertIn(t, f)
+            self.assertNotIn('Tag One', f)
     # }}}
 
     def test_composite_cache(self):  # {{{

From 106f7d5b3442e17b6c9614c7e091aa5edec1e369 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Aug 2013 13:48:12 +0530
Subject: [PATCH 0659/1154] Ensure no comments in the apsw dump cause problems

---
 src/apsw_shell.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/apsw_shell.py b/src/apsw_shell.py
index 61f78c45e6..d8215e65b3 100644
--- a/src/apsw_shell.py
+++ b/src/apsw_shell.py
@@ -1088,6 +1088,8 @@ Enter SQL statements terminated with a ";"
                 self.write(self.stdout, "\n")
 
             def comment(s):
+                if isinstance(s, bytes):
+                    s = s.decode('utf-8', 'replace')
                 self.write(self.stdout, textwrap.fill(s, 78, initial_indent="-- ", subsequent_indent="-- ")+"\n")
 
             pats=", ".join([(x,"(All)")[x=="%"] for x in cmd])

From ed35c29f690d3320b9190484b27d23804503fce7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Aug 2013 14:27:27 +0530
Subject: [PATCH 0660/1154] Remember last used sort when sorting on an unsorted
 col

Book list: When sorting on a currently unsorted column, use the last
used sort for that column, instead of always sorting in ascending order.
Fixes #1216714 [[Feature request] I'd like Calibre to memorize the sorting order of a column](https://bugs.launchpad.net/calibre/+bug/1216714)
---
 src/calibre/gui2/actions/sort.py  |  7 +++--
 src/calibre/gui2/library/views.py | 49 +++++++++++++++++++++++--------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
index 6fa25b263c..3a4462511f 100644
--- a/src/calibre/gui2/actions/sort.py
+++ b/src/calibre/gui2/actions/sort.py
@@ -69,7 +69,7 @@ class SortByAction(InterfaceAction):
                 name = _('Title')
             if key == 'ondevice' and self.gui.device_connected is None:
                     continue
-            ascending = True
+            ascending = None
             if key == sort_col:
                 name = _('%s [reverse current sort]') % name
                 ascending = not order
@@ -80,6 +80,9 @@ class SortByAction(InterfaceAction):
             menu.addAction(sac)
 
     def sort_requested(self, key, ascending):
-        self.gui.library_view.sort_by_named_field(key, ascending)
+        if ascending is None:
+            self.gui.library_view.intelligent_sort(key, True)
+        else:
+            self.gui.library_view.sort_by_named_field(key, ascending)
 
 
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 34716445cc..5661ec96e7 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -220,6 +220,8 @@ class BooksView(QTableView):  # {{{
         self.was_restored = False
         self.column_header = HeaderView(Qt.Horizontal, self)
         self.setHorizontalHeader(self.column_header)
+        self.column_header.sortIndicatorChanged.disconnect()
+        self.column_header.sortIndicatorChanged.connect(self.user_sort_requested)
         self.column_header.setMovable(True)
         self.column_header.setClickable(True)
         self.column_header.sectionMoved.connect(self.save_state)
@@ -257,9 +259,9 @@ class BooksView(QTableView):  # {{{
                 sz = h.sectionSizeHint(idx)
                 h.resizeSection(idx, sz)
         elif action == 'ascending':
-            self.sortByColumn(idx, Qt.AscendingOrder)
+            self.sort_by_column_and_order(idx, True)
         elif action == 'descending':
-            self.sortByColumn(idx, Qt.DescendingOrder)
+            self.sort_by_column_and_order(idx, False)
         elif action == 'defaults':
             self.apply_state(self.get_default_state())
         elif action == 'addcustcol':
@@ -368,6 +370,30 @@ class BooksView(QTableView):  # {{{
     # }}}
 
     # Sorting {{{
+    def sort_by_column_and_order(self, col, ascending):
+        self.column_header.blockSignals(True)
+        self.sortByColumn(col, Qt.AscendingOrder if ascending else Qt.DescendingOrder)
+        self.column_header.blockSignals(False)
+
+    def user_sort_requested(self, col, order=Qt.AscendingOrder):
+        if col >= len(self.column_map) or col < 0:
+            return QTableView.sortByColumn(self, col)
+        field = self.column_map[col]
+        self.intelligent_sort(field, order == Qt.AscendingOrder)
+
+    def intelligent_sort(self, field, ascending):
+        m = self.model()
+        pname = 'previous_sort_order_' + self.__class__.__name__
+        previous = gprefs.get(pname, {})
+        if field == m.sorted_on[0] or field not in previous:
+            self.sort_by_named_field(field, ascending)
+            previous[field] = ascending
+            gprefs[pname] = previous
+            return
+        previous[m.sorted_on[0]] = m.sorted_on[1]
+        gprefs[pname] = previous
+        self.sort_by_named_field(field, previous[field])
+
     def about_to_be_sorted(self, idc):
         selected_rows = [r.row() for r in self.selectionModel().selectedRows()]
         self.selected_ids = [idc(r) for r in selected_rows]
@@ -382,12 +408,12 @@ class BooksView(QTableView):  # {{{
     def sort_by_named_field(self, field, order, reset=True):
         if field in self.column_map:
             idx = self.column_map.index(field)
-            if order:
-                self.sortByColumn(idx, Qt.AscendingOrder)
-            else:
-                self.sortByColumn(idx, Qt.DescendingOrder)
+            self.sort_by_column_and_order(idx, order)
         else:
             self._model.sort_by_named_field(field, order, reset)
+            self.column_header.blockSignals(True)
+            self.column_header.setSortIndicator(-1, Qt.AscendingOrder)
+            self.column_header.blockSignals(False)
 
     def multisort(self, fields, reset=True, only_if_different=False):
         if len(fields) == 0:
@@ -413,11 +439,11 @@ class BooksView(QTableView):  # {{{
         dir = Qt.AscendingOrder if fields[0][1] else Qt.DescendingOrder
         if col in self.column_map:
             col = self.column_map.index(col)
-            hdrs = self.horizontalHeader()
+            self.column_header.blockSignals(True)
             try:
-                hdrs.setSortIndicator(col, dir)
-            except:
-                pass
+                self.column_header.setSortIndicator(col, dir)
+            finally:
+                self.column_header.blockSignals(False)
     # }}}
 
     # Ondevice column {{{
@@ -481,8 +507,7 @@ class BooksView(QTableView):  # {{{
             return
         for col, order in reversed(self.cleanup_sort_history(
                 saved_history)[:max_sort_levels]):
-            self.sortByColumn(self.column_map.index(col),
-                              Qt.AscendingOrder if order else Qt.DescendingOrder)
+            self.sort_by_column_and_order(self.column_map.index(col), order)
 
     def apply_state(self, state, max_sort_levels=3):
         h = self.column_header

From 8a1f46a389322665d9450c3490e37ef848db2391 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Aug 2013 15:14:09 +0530
Subject: [PATCH 0661/1154] EPUB metadata: Handle multiple title elements when
 setting titles

EPUB metadata: When changing the title in an EPUB 2.0 file that has
multiple titles, remove the extra titles. Fixes #1211949 [Private bug](https://bugs.launchpad.net/calibre/+bug/1211949)
---
 src/calibre/ebooks/metadata/opf2.py | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 6ae40d157d..52b8238a8f 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -518,7 +518,6 @@ class OPF(object):  # {{{
     spine_path      = XPath('descendant::*[re:match(name(), "spine", "i")]/*[re:match(name(), "itemref", "i")]')
     guide_path      = XPath('descendant::*[re:match(name(), "guide", "i")]/*[re:match(name(), "reference", "i")]')
 
-    title           = MetadataField('title', formatter=lambda x: re.sub(r'\s+', ' ', x))
     publisher       = MetadataField('publisher')
     comments        = MetadataField('description')
     category        = MetadataField('type')
@@ -781,6 +780,29 @@ class OPF(object):  # {{{
         for item in self.iterguide():
             item.set('href', get_href(item))
 
+    @dynamic_property
+    def title(self):
+        # TODO: Add support for EPUB 3 refinements
+
+        def fget(self):
+            for elem in self.title_path(self.metadata):
+                title = self.get_text(elem)
+                if title and title.strip():
+                    return re.sub(r'\s+', ' ', title.strip())
+
+        def fset(self, val):
+            val = (val or '').strip()
+            titles = self.title_path(self.metadata)
+            if not val or self.package_version < 3:
+                for title in titles:
+                    title.getparent().remove(title)
+            if val:
+                titles = self.title_path(self.metadata)
+                title = titles[0] if titles else self.create_metadata_element('title')
+                title.text = re.sub(r'\s+', ' ', unicode(val))
+
+        return property(fget=fget, fset=fset)
+
     @dynamic_property
     def authors(self):
 
@@ -1132,10 +1154,7 @@ class OPF(object):  # {{{
     def get_metadata_element(self, name):
         matches = self.metadata_elem_path(self.metadata, name=name)
         if matches:
-            num = -1
-            if self.package_version >= 3 and name == 'title':
-                num = 0
-            return matches[num]
+            return matches[-1]
 
     def create_metadata_element(self, name, attrib=None, is_dc=True):
         if is_dc:

From aad985ad06f24e9c04054a55f87a21d2369af7f5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Aug 2013 15:30:44 +0530
Subject: [PATCH 0662/1154] Do not delete titles in EPUB 3

In EPUB 3 titles are not titles they can be series or sub titles or
hobgoblins and we have no well defined way to find out what they are, so
just replace the first title and call it quits.
---
 src/calibre/ebooks/metadata/opf2.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 52b8238a8f..d0e04b72a3 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -793,11 +793,13 @@ class OPF(object):  # {{{
         def fset(self, val):
             val = (val or '').strip()
             titles = self.title_path(self.metadata)
-            if not val or self.package_version < 3:
+            if self.package_version < 3:
+                # EPUB 3 allows multiple title elements containing sub-titles,
+                # series and other things. We all loooove EPUB 3.
                 for title in titles:
                     title.getparent().remove(title)
+                titles = ()
             if val:
-                titles = self.title_path(self.metadata)
                 title = titles[0] if titles else self.create_metadata_element('title')
                 title.text = re.sub(r'\s+', ' ', unicode(val))
 

From e4697037936dd87fd2663317f758ee8c98069d71 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Aug 2013 15:37:52 +0530
Subject: [PATCH 0663/1154] Fix content server error if return to top level
 after using virt libs

Fix content server giving an error if you return to the top level page
after using the virtual libraries. Fixes #1216838 [500 Internal Server Error  The server encountered an unexpected condition which prevented it from fulfilling the request.](https://bugs.launchpad.net/calibre/+bug/1216838)
---
 src/calibre/library/server/browse.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 5c2ffe7865..a770f19856 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -358,7 +358,10 @@ class BrowseServer(object):
             cats.append((_('Virtual Libs.'), 'virt_libs', 'lt.png'))
 
         def getter(x):
-            return category_meta[x]['name'].lower()
+            try:
+                return category_meta[x]['name'].lower()
+            except KeyError:
+                return x
 
         displayed_custom_fields = custom_fields_to_display(self.db)
         uc_displayed = set()

From b0d36402c2f313f4bf521221b1c3646bd88a0f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Mon, 26 Aug 2013 21:57:13 +0200
Subject: [PATCH 0664/1154] use ads4books in ebookpoint plugin

---
 .../gui2/store/stores/ebookpoint_plugin.py    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/store/stores/ebookpoint_plugin.py b/src/calibre/gui2/store/stores/ebookpoint_plugin.py
index dd8f45d4ae..427cde6217 100644
--- a/src/calibre/gui2/store/stores/ebookpoint_plugin.py
+++ b/src/calibre/gui2/store/stores/ebookpoint_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 2 # Needed for dynamic plugin loading
+store_version = 3 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2013, Tomasz Długosz <tomek3d@gmail.com>'
@@ -9,6 +9,7 @@ __docformat__ = 'restructuredtext en'
 
 import re
 import urllib
+from base64 import b64encode
 from contextlib import closing
 
 from lxml import html
@@ -25,20 +26,20 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog
 class EbookpointStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
-        pid = '5557Y'
+        aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/32/58/'
+
+        url = 'http://ebookpoint.pl/'
+
+        aff_url = aff_root + str(b64encode(url))
 
-        url = 'http://ebookpoint.pl/view/' + pid
         detail_url = None
-
         if detail_item:
-            book_id = re.sub(r'http://ebookpoint.pl/ksiazki', '', detail_item)
-            if book_id:
-                detail_url = url + book_id
+            detail_url = aff_root + str(b64encode(detail_item))
 
         if external or self.config.get('open_external', False):
-            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else aff_url)))
         else:
-            d = WebStoreDialog(self.gui, url, parent, detail_url)
+            d = WebStoreDialog(self.gui, url, parent, detail_url if detail_url else aff_url)
             d.setWindowTitle(self.name)
             d.set_tags(self.config.get('tags', ''))
             d.exec_()

From efc4ac3446d1091f7ddf0e2d1cf3910b7054e71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Mon, 26 Aug 2013 22:04:44 +0200
Subject: [PATCH 0665/1154] use ads4books in legimi plugin

---
 src/calibre/gui2/store/stores/legimi_plugin.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/store/stores/legimi_plugin.py b/src/calibre/gui2/store/stores/legimi_plugin.py
index 0af9220f75..f72abe5758 100644
--- a/src/calibre/gui2/store/stores/legimi_plugin.py
+++ b/src/calibre/gui2/store/stores/legimi_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2013, Tomasz Długosz <tomek3d@gmail.com>'
@@ -9,6 +9,7 @@ __docformat__ = 'restructuredtext en'
 
 import re
 import urllib
+from base64 import b64encode
 from contextlib import closing
 
 from lxml import html
@@ -25,18 +26,20 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog
 class LegimiStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
+        aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/9/58/'
+
+        url = 'http://www.legimi.com/pl/ebooki/'
+
+        aff_url = aff_root + str(b64encode(url))
 
-        plain_url = 'http://www.legimi.com/pl/ebooki/'
-        url = 'https://ssl.afiliant.com/affskrypt,,2f9de2,,11483,,,?u=(' + plain_url + ')'
         detail_url = None
-
         if detail_item:
-            detail_url = 'https://ssl.afiliant.com/affskrypt,,2f9de2,,11483,,,?u=(' + detail_item + ')'
+            detail_url = aff_root + str(b64encode(detail_item))
 
         if external or self.config.get('open_external', False):
-            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else aff_url)))
         else:
-            d = WebStoreDialog(self.gui, url, parent, detail_url)
+            d = WebStoreDialog(self.gui, url, parent, detail_url if detail_url else aff_url)
             d.setWindowTitle(self.name)
             d.set_tags(self.config.get('tags', ''))
             d.exec_()

From f542b8babe4dd28d467d0241011af6543e817d96 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 08:52:08 +0530
Subject: [PATCH 0666/1154] Fix error in MTP driver debug on some non english
 windows locales

---
 src/calibre/devices/mtp/windows/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/mtp/windows/driver.py b/src/calibre/devices/mtp/windows/driver.py
index 154bde0d8d..268ac07a41 100644
--- a/src/calibre/devices/mtp/windows/driver.py
+++ b/src/calibre/devices/mtp/windows/driver.py
@@ -12,7 +12,7 @@ from functools import wraps, partial
 from future_builtins import zip
 from itertools import chain
 
-from calibre import as_unicode, prints
+from calibre import as_unicode, prints, force_unicode
 from calibre.constants import plugins, __appname__, numeric_version, isxp
 from calibre.ptempfile import SpooledTemporaryFile
 from calibre.devices.errors import OpenFailed, DeviceError, BlacklistedDevice
@@ -142,7 +142,7 @@ class MTP_DEVICE(MTPDeviceBase):
             return True
         if self.wpd_error:
             p('Cannot detect MTP devices')
-            p(self.wpd_error)
+            p(force_unicode(self.wpd_error))
             return False
         try:
             pnp_ids = frozenset(self.wpd.enumerate_devices())

From c28160058103f6da4ed5a01d847b4f7fabb2de7f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 09:18:36 +0530
Subject: [PATCH 0667/1154] newdb: Optimize setting the same value as before
 for author data

Do not mark books as dirty if the same value as before is set for
author_sort or author_link.
---
 src/calibre/db/cache.py         | 14 ++++++++------
 src/calibre/db/tables.py        |  4 ++++
 src/calibre/db/tests/writing.py | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 74455b046f..96c4f65e99 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1531,11 +1531,11 @@ class Cache(object):
 
     @write_api
     def set_sort_for_authors(self, author_id_to_sort_map, update_books=True):
-        self.fields['authors'].table.set_sort_names(author_id_to_sort_map, self.backend)
+        sort_map = self.fields['authors'].table.set_sort_names(author_id_to_sort_map, self.backend)
         changed_books = set()
         if update_books:
             val_map = {}
-            for author_id in author_id_to_sort_map:
+            for author_id in sort_map:
                 books = self._books_for_field('authors', author_id)
                 changed_books |= books
                 for book_id in books:
@@ -1545,16 +1545,18 @@ class Cache(object):
                     val_map[book_id] = ' & '.join(sorts)
             if val_map:
                 self._set_field('author_sort', val_map)
-        self._mark_as_dirty(changed_books)
+        if changed_books:
+            self._mark_as_dirty(changed_books)
         return changed_books
 
     @write_api
     def set_link_for_authors(self, author_id_to_link_map):
-        self.fields['authors'].table.set_links(author_id_to_link_map, self.backend)
+        link_map = self.fields['authors'].table.set_links(author_id_to_link_map, self.backend)
         changed_books = set()
-        for author_id in author_id_to_link_map:
+        for author_id in link_map:
             changed_books |= self._books_for_field('authors', author_id)
-        self._mark_as_dirty(changed_books)
+        if changed_books:
+            self._mark_as_dirty(changed_books)
         return changed_books
 
     @read_api
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 57ca395f4c..edb16d8e3a 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -366,15 +366,19 @@ class AuthorsTable(ManyToManyTable):
 
     def set_sort_names(self, aus_map, db):
         aus_map = {aid:(a or '').strip() for aid, a in aus_map.iteritems()}
+        aus_map = {aid:a for aid, a in aus_map.iteritems() if a != self.asort_map.get(aid, None)}
         self.asort_map.update(aus_map)
         db.conn.executemany('UPDATE authors SET sort=? WHERE id=?',
             [(v, k) for k, v in aus_map.iteritems()])
+        return aus_map
 
     def set_links(self, link_map, db):
         link_map = {aid:(l or '').strip() for aid, l in link_map.iteritems()}
+        link_map = {aid:l for aid, l in link_map.iteritems() if l != self.alink_map.get(aid, None)}
         self.alink_map.update(link_map)
         db.conn.executemany('UPDATE authors SET link=? WHERE id=?',
             [(v, k) for k, v in link_map.iteritems()])
+        return link_map
 
     def remove_books(self, book_ids, db):
         clean = ManyToManyTable.remove_books(self, book_ids, db)
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 68f740743d..a199da6b28 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -607,3 +607,21 @@ class WritingTest(BaseTest):
         cache = self.init_cache()
         self.assertEqual(cache.all_book_ids(), all_ids, 'dump and restore broke database')
     # }}}
+
+    def test_set_author_data(self):  # {{{
+        cache = self.init_cache()
+        adata = cache.author_data()
+        ldata = {aid:str(aid) for aid in adata}
+        self.assertEqual({1,2,3}, cache.set_link_for_authors(ldata))
+        for c in (cache, self.init_cache()):
+            self.assertEqual(ldata, {aid:d['link'] for aid, d in c.author_data().iteritems()})
+        self.assertEqual({3}, cache.set_link_for_authors({aid:'xxx' if aid == max(adata) else str(aid) for aid in adata}),
+                         'Setting the author link to the same value as before, incorrectly marked some books as dirty')
+        sdata = {aid:'%s, changed' % aid for aid in adata}
+        self.assertEqual({1,2,3}, cache.set_sort_for_authors(sdata))
+        for bid in (1, 2, 3):
+            self.assertIn(', changed', cache.field_for('author_sort', bid))
+        sdata = {aid:'%s, changed' % (aid*2 if aid == max(adata) else aid) for aid in adata}
+        self.assertEqual({3}, cache.set_sort_for_authors(sdata),
+                         'Setting the author sort to the same value as before, incorrectly marked some books as dirty')
+    # }}}

From 4751aa1286041f9e6a8a9b479fe7fa93e6c8921c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 09:38:37 +0530
Subject: [PATCH 0668/1154] newdb: Fix temp duplicate catalog entries in book
 list

Creating a catalog with an already existing catalog in the library would
cause a temporary duplicate entry in the book list (the entry would go
away on restart. Also fix the author sort for catalogs generated in the
AZW3 format not being correct.
---
 src/calibre/db/adding.py | 5 ++++-
 src/calibre/db/legacy.py | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py
index 0ca8c611d8..2377d4b02a 100644
--- a/src/calibre/db/adding.py
+++ b/src/calibre/db/adding.py
@@ -106,6 +106,7 @@ def add_catalog(cache, path, title):
     from calibre.utils.date import utcnow
 
     fmt = os.path.splitext(path)[1][1:].lower()
+    new_book_added = False
     with lopen(path, 'rb') as stream:
         with cache.write_lock:
             matches = cache._search('title:="%s" and tags:="%s"' % (title.replace('"', '\\"'), _('Catalog')), None)
@@ -118,17 +119,19 @@ def add_catalog(cache, path, title):
             except:
                 mi = Metadata(title, ['calibre'])
             mi.title, mi.authors = title, ['calibre']
+            mi.author_sort = 'calibre'  # The MOBI/AZW3 format sets author sort to date
             mi.tags = [_('Catalog')]
             mi.pubdate = mi.timestamp = utcnow()
             if fmt == 'mobi':
                 mi.cover, mi.cover_data = None, (None, None)
             if db_id is None:
                 db_id = cache._create_book_entry(mi, apply_import_tags=False)
+                new_book_added = True
             else:
                 cache._set_metadata(db_id, mi)
         cache.add_format(db_id, fmt, stream)  # Cant keep write lock since post-import hooks might run
 
-    return db_id
+    return db_id, new_book_added
 
 def add_news(cache, path, arg):
     from calibre.ebooks.metadata.meta import get_metadata
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b794d2c14c..384c75d71b 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -252,8 +252,8 @@ class LibraryDatabase(object):
         return recursive_import(self, root, single_book_per_directory=single_book_per_directory, callback=callback, added_ids=added_ids)
 
     def add_catalog(self, path, title):
-        book_id = add_catalog(self.new_api, path, title)
-        if book_id is not None:
+        book_id, new_book_added = add_catalog(self.new_api, path, title)
+        if book_id is not None and new_book_added:
             self.data.books_added((book_id,))
         return book_id
 

From 121469daa5fdbd3814e1eb5aaba5bfb1504b4b2e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 10:27:27 +0530
Subject: [PATCH 0669/1154] Fix a regression that broke downloading news when
 output format is set to PDF

---
 src/calibre/gui2/tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py
index db15837227..25a925ffbb 100644
--- a/src/calibre/gui2/tools.py
+++ b/src/calibre/gui2/tools.py
@@ -291,7 +291,7 @@ def fetch_scheduled_recipe(arg):  # {{{
         from calibre.customize.ui import plugin_for_output_format
         p = plugin_for_output_format('pdf')
         for opt in p.options:
-            recs.append(opt.name, pdf.get(opt.name, opt.recommended_value), OptionRecommendation.HIGH)
+            recs.append((opt.option.name, pdf.get(opt.option.name, opt.recommended_value), OptionRecommendation.HIGH))
 
     args = [arg['recipe'], pt.name, recs]
     if arg['username'] is not None:

From 41bcffea9245a04cb903ff570e3d31b51196c4fb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 14:23:42 +0530
Subject: [PATCH 0670/1154] newdb: Fix replacing formats in a book creating
 orphans

When replacing formats in a book with a very long title+authors on
windows, newdb could leave behind the old format file, because the
filename shortening algorithm has changed. Handle that case.
---
 src/calibre/db/backend.py          | 18 +++++++++++++++++-
 src/calibre/db/cache.py            |  3 ++-
 src/calibre/db/tests/add_remove.py | 18 +++++++++++++++++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 2d6f88b405..34629752da 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1337,7 +1337,7 @@ class DB(object):
                         if wam is not None:
                             wam.close_handles()
 
-    def add_format(self, book_id, fmt, stream, title, author, path):
+    def add_format(self, book_id, fmt, stream, title, author, path, current_name):
         fmt = ('.' + fmt.lower()) if fmt else ''
         fname = self.construct_file_name(book_id, title, author, len(fmt))
         path = os.path.join(self.library_path, path)
@@ -1345,6 +1345,22 @@ class DB(object):
         if not os.path.exists(path):
             os.makedirs(path)
         size = 0
+        if current_name is not None:
+            old_path = os.path.join(path, current_name + fmt)
+            if old_path != dest:
+                # Ensure that the old format file is not orphaned, this can
+                # happen if the algorithm in construct_file_name is changed.
+                try:
+                    # rename rather than remove, so that if something goes
+                    # wrong in the rest of this function, at least the file is
+                    # not deleted
+                    os.rename(old_path, dest)
+                except EnvironmentError as e:
+                    if getattr(e, 'errno', None) != errno.ENOENT:
+                        # Failing to rename the old format will at worst leave a
+                        # harmless orphan, so log and ignore the error
+                        import traceback
+                        traceback.print_exc()
 
         if (not getattr(stream, 'name', False) or not samefile(dest, stream.name)):
             with lopen(dest, 'wb') as f:
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 96c4f65e99..9551a2b434 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1201,7 +1201,8 @@ class Cache(object):
             title = self._field_for('title', book_id, default_value=_('Unknown'))
             author = self._field_for('authors', book_id, default_value=(_('Unknown'),))[0]
             stream = stream_or_path if hasattr(stream_or_path, 'read') else lopen(stream_or_path, 'rb')
-            size, fname = self.backend.add_format(book_id, fmt, stream, title, author, path)
+
+            size, fname = self.backend.add_format(book_id, fmt, stream, title, author, path, name)
             del stream
 
             max_size = self.fields['formats'].table.update_fmt(book_id, fmt, fname, size, self.backend)
diff --git a/src/calibre/db/tests/add_remove.py b/src/calibre/db/tests/add_remove.py
index fb44d0e62c..4077b96e81 100644
--- a/src/calibre/db/tests/add_remove.py
+++ b/src/calibre/db/tests/add_remove.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os
+import os, glob
 from io import BytesIO
 from tempfile import NamedTemporaryFile
 from datetime import timedelta
@@ -285,3 +285,19 @@ class AddRemoveTest(BaseTest):
         af(db.has_format(1, 'ORIGINAL_FMT1'))
         ae(set(fmts), set(db.formats(1, verify_formats=False)))
     # }}}
+
+    def test_format_orphan(self):  # {{{
+        ' Test that adding formats does not create orphans if the file name algorithm changes '
+        cache = self.init_cache()
+        path = cache.format_abspath(1, 'FMT1')
+        base, name = os.path.split(path)
+        prefix = 'mushroomxx'
+        os.rename(path, os.path.join(base, prefix + name))
+        cache.fields['formats'].table.fname_map[1]['FMT1'] = prefix + os.path.splitext(name)[0]
+        old = glob.glob(os.path.join(base, '*.fmt1'))
+        cache.add_format(1, 'FMT1', BytesIO(b'xxxx'), run_hooks=False)
+        new = glob.glob(os.path.join(base, '*.fmt1'))
+        self.assertNotEqual(old, new)
+        self.assertEqual(len(old), len(new))
+        self.assertNotIn(prefix, cache.fields['formats'].format_fname(1, 'FMT1'))
+    # }}}

From c7d5ac84e7a2ee0df57490bf428c26172000d4f9 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 27 Aug 2013 11:36:40 +0200
Subject: [PATCH 0671/1154] Fix bug #1217096

---
 src/calibre/gui2/custom_column_widgets.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 4c5b1cce27..4223a638f2 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -12,7 +12,7 @@ from PyQt4.Qt import (QComboBox, QLabel, QSpinBox, QDoubleSpinBox, QDateTimeEdit
         QSpacerItem, QIcon, QCheckBox, QWidget, QHBoxLayout, SIGNAL,
         QPushButton, QMessageBox, QToolButton, Qt)
 
-from calibre.utils.date import qt_to_dt, now
+from calibre.utils.date import qt_to_dt, now, as_local_time, as_utc
 from calibre.gui2.complete2 import EditWithComplete
 from calibre.gui2.comments_editor import Editor as CommentsEditor
 from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog
@@ -189,10 +189,10 @@ class DateTime(Base):
         l.addStretch(2)
 
         w = self.widgets[1]
-        format = cm['display'].get('date_format','')
-        if not format:
-            format = 'dd MMM yyyy hh:mm'
-        w.setDisplayFormat(format)
+        format_ = cm['display'].get('date_format','')
+        if not format_:
+            format_ = 'dd MMM yyyy hh:mm'
+        w.setDisplayFormat(format_)
         w.setCalendarPopup(True)
         w.setMinimumDateTime(UNDEFINED_QDATETIME)
         w.setSpecialValueText(_('Undefined'))
@@ -214,6 +214,12 @@ class DateTime(Base):
             val = qt_to_dt(val)
         return val
 
+    def normalize_db_val(self, val):
+        return as_local_time(val) if val is not None else None
+
+    def normalize_ui_val(self, val):
+        return as_utc(val) if val is not None else None
+
 class Comments(Base):
 
     def setup_ui(self, parent):
@@ -823,6 +829,12 @@ class BulkDateTime(BulkBase):
             val = qt_to_dt(val)
         return val
 
+    def normalize_db_val(self, val):
+        return as_local_time(val) if val is not None else None
+
+    def normalize_ui_val(self, val):
+        return as_utc(val) if val is not None else None
+
 class BulkSeries(BulkBase):
 
     def setup_ui(self, parent):

From 838c832f019906b8c45701eab0ded613aaba8db0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 18:40:02 +0530
Subject: [PATCH 0672/1154] Move delete to recycle bin into a separate process
 on windows

This will hopefully fix any remaining locking errors on windows.
---
 setup/installer/windows/freeze.py |  22 +-
 setup/installer/windows/recycle.c |  28 +++
 src/calibre/test_build.py         |   8 -
 src/calibre/utils/recycle_bin.py  | 100 +++++++-
 src/calibre/utils/winshell.py     | 400 ------------------------------
 5 files changed, 145 insertions(+), 413 deletions(-)
 create mode 100644 setup/installer/windows/recycle.c
 delete mode 100644 src/calibre/utils/winshell.py

diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
index 6237fa0071..b15a0abbcb 100644
--- a/setup/installer/windows/freeze.py
+++ b/setup/installer/windows/freeze.py
@@ -41,6 +41,7 @@ DESCRIPTIONS = {
         'calibre-server': 'Standalone calibre content server',
         'calibre-parallel': 'calibre worker process',
         'calibre-smtp' : 'Command line interface for sending books via email',
+        'calibre-recycle' : 'Helper program for deleting to recycle bin',
 }
 
 def walk(dir):
@@ -81,6 +82,7 @@ class Win32Freeze(Command, WixMixIn):
 
         self.initbase()
         self.build_launchers()
+        self.build_recycle()
         self.add_plugins()
         self.freeze()
         self.embed_manifests()
@@ -218,7 +220,10 @@ class Win32Freeze(Command, WixMixIn):
 
         self.info('Adding calibre sources...')
         for x in glob.glob(self.j(self.SRC, '*')):
-            shutil.copytree(x, self.j(sp_dir, self.b(x)))
+            if os.path.isdir(x):
+                shutil.copytree(x, self.j(sp_dir, self.b(x)))
+            else:
+                shutil.copy(x, self.j(sp_dir, self.b(x)))
 
         for x in (r'calibre\manual', r'calibre\trac', 'pythonwin'):
             deld = self.j(sp_dir, x)
@@ -534,6 +539,21 @@ class Win32Freeze(Command, WixMixIn):
         finally:
             os.chdir(cwd)
 
+    def build_recycle(self):
+        self.info('Building calibre-recycle.exe')
+        base = self.j(self.src_root, 'setup', 'installer', 'windows')
+        src = self.j(base, 'recycle.c')
+        obj = self.j(self.obj_dir, self.b(src)+'.obj')
+        cflags  = '/c /EHsc /MD /W3 /Ox /nologo /D_UNICODE'.split()
+        if self.newer(obj, src):
+            cmd = [msvc.cc] + cflags + ['/Fo'+obj, '/Tc'+src]
+            self.run_builder(cmd, show_output=True)
+        exe = self.j(self.base, 'calibre-recycle.exe')
+        cmd = [msvc.linker] + ['/MACHINE:'+machine,
+                '/SUBSYSTEM:CONSOLE', '/RELEASE',
+                '/OUT:'+exe] + [self.embed_resources(exe), obj, 'Shell32.lib']
+        self.run_builder(cmd)
+
     def build_launchers(self, debug=False):
         if not os.path.exists(self.obj_dir):
             os.makedirs(self.obj_dir)
diff --git a/setup/installer/windows/recycle.c b/setup/installer/windows/recycle.c
new file mode 100644
index 0000000000..3e51bc07a1
--- /dev/null
+++ b/setup/installer/windows/recycle.c
@@ -0,0 +1,28 @@
+/*
+ * recycle.c
+ * Copyright (C) 2013 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the GPL3 license.
+ */
+
+#include "Windows.h"
+#include "Shellapi.h"
+/* #include <wchar.h> */
+
+int wmain(int argc, wchar_t *argv[ ]) {
+    wchar_t buf[512] = {0};
+    SHFILEOPSTRUCTW op = {0};
+    if (argc != 2) return 1;
+    if (wcsnlen_s(argv[1], 512) > 510) return 1;
+    if (wcscpy_s(buf, 512, argv[1]) != 0) return 1; 
+
+    op.wFunc = FO_DELETE;
+    op.pFrom = buf;
+    op.pTo = NULL;
+    op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_SILENT | FOF_RENAMEONCOLLISION;
+
+    /* wprintf(L"%ls\n", buf); */
+    return SHFileOperationW(&op);
+}
+
+
diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
index 62443f85ac..17bc829427 100644
--- a/src/calibre/test_build.py
+++ b/src/calibre/test_build.py
@@ -39,13 +39,6 @@ def test_winutil():
         raise RuntimeError('win_pnp_drives returned no drives')
     print ('win_pnp_drives OK!')
 
-def test_win32():
-    from calibre.utils.winshell import desktop
-    d = desktop()
-    if not d:
-        raise RuntimeError('winshell failed')
-    print ('winshell OK! (%s is the desktop)'%d)
-
 def test_sqlite():
     import sqlite3
     conn = sqlite3.connect(':memory:')
@@ -121,7 +114,6 @@ def test():
     test_woff()
     test_qt()
     if iswindows:
-        test_win32()
         test_winutil()
         test_wpd()
 
diff --git a/src/calibre/utils/recycle_bin.py b/src/calibre/utils/recycle_bin.py
index 7b1b38261b..9721b1e623 100644
--- a/src/calibre/utils/recycle_bin.py
+++ b/src/calibre/utils/recycle_bin.py
@@ -6,17 +6,109 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import os, shutil, time
-from functools import partial
 
-from calibre import isbytestring
+from calibre import isbytestring, force_unicode
 from calibre.constants import (iswindows, isosx, plugins, filesystem_encoding,
         islinux)
 
 recycle = None
 
 if iswindows:
-    import calibre.utils.winshell as winshell
-    recycle = partial(winshell.delete_file, silent=True, no_confirm=True)
+    import ctypes, subprocess, sys
+    from ctypes import POINTER, Structure
+    from ctypes.wintypes import HANDLE, LPVOID, WORD, DWORD, BOOL, ULONG, LPCWSTR
+    RECYCLE = force_unicode(os.path.join(os.path.dirname(sys.executable), 'calibre-recycle.exe'), filesystem_encoding)
+    LPDWORD = POINTER(DWORD)
+    LPHANDLE = POINTER(HANDLE)
+    ULONG_PTR = POINTER(ULONG)
+    CREATE_NO_WINDOW = 0x08000000
+    INFINITE = 0xFFFFFFFF
+    WAIT_FAILED = 0xFFFFFFFF
+
+    class SECURITY_ATTRIBUTES(Structure):
+        _fields_ = [("nLength", DWORD),
+                    ("lpSecurityDescriptor", LPVOID),
+                    ("bInheritHandle", BOOL)]
+    LPSECURITY_ATTRIBUTES = POINTER(SECURITY_ATTRIBUTES)
+
+    class STARTUPINFO(Structure):
+        _fields_ = [("cb", DWORD),
+                    ("lpReserved", LPCWSTR),
+                    ("lpDesktop", LPCWSTR),
+                    ("lpTitle", LPCWSTR),
+                    ("dwX", DWORD),
+                    ("dwY", DWORD),
+                    ("dwXSize", DWORD),
+                    ("dwYSize", DWORD),
+                    ("dwXCountChars", DWORD),
+                    ("dwYCountChars", DWORD),
+                    ("dwFillAttribute", DWORD),
+                    ("dwFlags", DWORD),
+                    ("wShowWindow", WORD),
+                    ("cbReserved2", WORD),
+                    ("lpReserved2", LPVOID),
+                    ("hStdInput", HANDLE),
+                    ("hStdOutput", HANDLE),
+                    ("hStdError", HANDLE)]
+    LPSTARTUPINFO = POINTER(STARTUPINFO)
+
+    class PROCESS_INFORMATION(Structure):
+        _fields_ = [("hProcess", HANDLE),
+                    ("hThread", HANDLE),
+                    ("dwProcessId", DWORD),
+                    ("dwThreadId", DWORD)]
+    LPPROCESS_INFORMATION = POINTER(PROCESS_INFORMATION)
+
+    CreateProcess = ctypes.windll.kernel32.CreateProcessW
+    CreateProcess.argtypes = [LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES,
+        LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, LPCWSTR, LPSTARTUPINFO,
+        LPPROCESS_INFORMATION]
+    CreateProcess.restype = BOOL
+
+    WaitForSingleObject = ctypes.windll.kernel32.WaitForSingleObject
+    WaitForSingleObject.argtypes = [HANDLE, DWORD]
+    WaitForSingleObject.restype = DWORD
+
+    GetExitCodeProcess = ctypes.windll.kernel32.GetExitCodeProcess
+    GetExitCodeProcess.argtypes = [HANDLE, LPDWORD]
+    GetExitCodeProcess.restype = BOOL
+
+    CloseHandle = ctypes.windll.kernel32.CloseHandle
+    CloseHandle.argtypes = [HANDLE]
+    CloseHandle.restype = BOOL
+
+    def recycle(path):
+        # We have to run the delete to recycle bin in a separate process as the
+        # morons who wrote SHFileOperation designed it to spin the event loop
+        # even when no UI is created. And there is no other way to send files
+        # to the recycle bin on windows. Le Sigh. We dont use subprocess since
+        # there is no way to pass unicode arguments with subprocess in 2.7 and
+        # the twit that maintains subprocess believes that this is not an
+        # bug but a request for a new feature.
+        if isinstance(path, bytes):
+            path = path.decode(filesystem_encoding)
+        si = STARTUPINFO()
+        si.cb = ctypes.sizeof(si)
+        pi = PROCESS_INFORMATION()
+        exit_code = DWORD()
+        cmd = subprocess.list2cmdline([RECYCLE, path])
+        dwCreationFlags = CREATE_NO_WINDOW
+        if not CreateProcess(None, cmd, None, None, False, dwCreationFlags,
+                None, None, ctypes.byref(si), ctypes.byref(pi)):
+            raise ctypes.WinError()
+        try:
+            if WaitForSingleObject(pi.hProcess, INFINITE) == WAIT_FAILED:
+                raise ctypes.WinError()
+            if not GetExitCodeProcess(pi.hProcess, ctypes.byref(exit_code)):
+                raise ctypes.WinError()
+
+        finally:
+            CloseHandle(pi.hThread)
+            CloseHandle(pi.hProcess)
+        exit_code = exit_code.value
+        if exit_code != 0:
+            raise ctypes.WinError(exit_code)
+
 elif isosx:
     u = plugins['usbobserver'][0]
     if hasattr(u, 'send2trash'):
diff --git a/src/calibre/utils/winshell.py b/src/calibre/utils/winshell.py
deleted file mode 100644
index 9769f52e4a..0000000000
--- a/src/calibre/utils/winshell.py
+++ /dev/null
@@ -1,400 +0,0 @@
-"""winshell - convenience functions to access Windows shell functionality
-
-Certain aspects of the Windows user interface are grouped by
- Microsoft as Shell functions. These include the Desktop, shortcut
- icons, special folders (such as My Documents) and a few other things.
-
-These are mostly available via the shell module of the win32all
- extensions, but whenever I need to use them, I've forgotten the
- various constants and so on.
-
-Several of the shell items have two variants: personal and common,
- or User and All Users. These refer to systems with profiles in use:
- anything from NT upwards, and 9x with Profiles turned on. Where
- relevant, the Personal/User version refers to that owned by the
- logged-on user and visible only to that user; the Common/All Users
- version refers to that maintained by an Administrator and visible
- to all users of the system.
-
-(c) Tim Golden <winshell@timgolden.me.uk> 25th November 2003
-Licensed under the (GPL-compatible) MIT License:
-http://www.opensource.org/licenses/mit-license.php
-
-9th Nov 2005  0.2  . License changed to MIT
-                   . Added functionality using SHFileOperation
-25th Nov 2003 0.1  . Initial release by Tim Golden
-"""
-
-__VERSION__ = "0.2"
-
-import os
-from win32com import storagecon
-from win32com.shell import shell, shellcon
-import pythoncom
-
-class x_winshell (Exception):
-  pass
-
-#
-# Although this can be done in one call, Win9x didn't
-#  support it, so I added this workaround.
-#
-def get_path (folder_id):
-  return shell.SHGetPathFromIDList (shell.SHGetSpecialFolderLocation (0, folder_id))
-
-def desktop (common=0):
-  "What folder is equivalent to the current desktop?"
-  return get_path ((shellcon.CSIDL_DESKTOP, shellcon.CSIDL_COMMON_DESKTOPDIRECTORY)[common])
-
-def common_desktop ():
-#
-# Only here because already used in code
-#
-  return desktop (common=1)
-
-def application_data (common=0):
-  "What folder holds application configuration files?"
-  return get_path ((shellcon.CSIDL_APPDATA, shellcon.CSIDL_COMMON_APPDATA)[common])
-
-def favourites (common=0):
-  "What folder holds the Explorer favourites shortcuts?"
-  return get_path ((shellcon.CSIDL_FAVORITES, shellcon.CSIDL_COMMON_FAVORITES)[common])
-bookmarks = favourites
-
-def start_menu (common=0):
-  "What folder holds the Start Menu shortcuts?"
-  return get_path ((shellcon.CSIDL_STARTMENU, shellcon.CSIDL_COMMON_STARTMENU)[common])
-
-def programs (common=0):
-  "What folder holds the Programs shortcuts (from the Start Menu)?"
-  return get_path ((shellcon.CSIDL_PROGRAMS, shellcon.CSIDL_COMMON_PROGRAMS)[common])
-
-def startup (common=0):
-  "What folder holds the Startup shortcuts (from the Start Menu)?"
-  return get_path ((shellcon.CSIDL_STARTUP, shellcon.CSIDL_COMMON_STARTUP)[common])
-
-def personal_folder ():
-  "What folder holds the My Documents files?"
-  return get_path (shellcon.CSIDL_PERSONAL)
-my_documents = personal_folder
-
-def recent ():
-  "What folder holds the Documents shortcuts (from the Start Menu)?"
-  return get_path (shellcon.CSIDL_RECENT)
-
-def sendto ():
-  "What folder holds the SendTo shortcuts (from the Context Menu)?"
-  return get_path (shellcon.CSIDL_SENDTO)
-
-#
-# Internally abstracted function to handle one
-#  of several shell-based file manipulation
-#  routines. Not all the possible parameters
-#  are covered which might be passed to the
-#  underlying SHFileOperation API call, but
-#  only those which seemed useful to me at
-#  the time.
-#
-def _file_operation (
-  operation,
-  source_path,
-  target_path=None,
-  allow_undo=True,
-  no_confirm=False,
-  rename_on_collision=True,
-  silent=False,
-  hWnd=None
-):
-  #
-  # At present the Python wrapper around SHFileOperation doesn't
-  # allow lists of files. Hopefully it will at some point, so
-  # take account of it here.
-  # If you pass this shell function a "/"-separated path with
-  # a wildcard, eg c:/temp/*.tmp, it gets confused. It's ok
-  # with a backslash, so convert here.
-  #
-  source_path = source_path or ""
-  if isinstance (source_path, basestring):
-    source_path = os.path.abspath (source_path)
-  else:
-    source_path = [os.path.abspath (i) for i in source_path]
-
-  target_path = target_path or ""
-  if isinstance (target_path, basestring):
-    target_path = os.path.abspath (target_path)
-  else:
-    target_path = [os.path.abspath (i) for i in target_path]
-
-  flags = 0
-  if allow_undo: flags |= shellcon.FOF_ALLOWUNDO
-  if no_confirm: flags |= shellcon.FOF_NOCONFIRMATION
-  if rename_on_collision: flags |= shellcon.FOF_RENAMEONCOLLISION
-  if silent: flags |= shellcon.FOF_SILENT
-
-  result, n_aborted = shell.SHFileOperation (
-    (hWnd or 0, operation, source_path, target_path, flags, None, None)
-  )
-  if result <> 0:
-    raise x_winshell, result
-  elif n_aborted:
-    raise x_winshell, "%d operations were aborted by the user" % n_aborted
-
-def copy_file (
-  source_path,
-  target_path,
-  allow_undo=True,
-  no_confirm=False,
-  rename_on_collision=True,
-  silent=False,
-  hWnd=None
-):
-  """Perform a shell-based file copy. Copying in
-   this way allows the possibility of undo, auto-renaming,
-   and showing the "flying file" animation during the copy.
-
-  The default options allow for undo, don't automatically
-   clobber on a name clash, automatically rename on collision
-   and display the animation.
-  """
-  _file_operation (
-    shellcon.FO_COPY,
-    source_path,
-    target_path,
-    allow_undo,
-    no_confirm,
-    rename_on_collision,
-    silent,
-    hWnd
-  )
-
-def move_file (
-  source_path,
-  target_path,
-  allow_undo=True,
-  no_confirm=False,
-  rename_on_collision=True,
-  silent=False,
-  hWnd=None
-):
-  """Perform a shell-based file move. Moving in
-   this way allows the possibility of undo, auto-renaming,
-   and showing the "flying file" animation during the copy.
-
-  The default options allow for undo, don't automatically
-   clobber on a name clash, automatically rename on collision
-   and display the animation.
-  """
-  _file_operation (
-    shellcon.FO_MOVE,
-    source_path,
-    target_path,
-    allow_undo,
-    no_confirm,
-    rename_on_collision,
-    silent,
-    hWnd
-  )
-
-def rename_file (
-  source_path,
-  target_path,
-  allow_undo=True,
-  no_confirm=False,
-  rename_on_collision=True,
-  silent=False,
-  hWnd=None
-):
-  """Perform a shell-based file rename. Renaming in
-   this way allows the possibility of undo, auto-renaming,
-   and showing the "flying file" animation during the copy.
-
-  The default options allow for undo, don't automatically
-   clobber on a name clash, automatically rename on collision
-   and display the animation.
-  """
-  _file_operation (
-    shellcon.FO_RENAME,
-    source_path,
-    target_path,
-    allow_undo,
-    no_confirm,
-    rename_on_collision,
-    silent,
-    hWnd
-  )
-
-def delete_file (
-  source_path,
-  allow_undo=True,
-  no_confirm=False,
-  rename_on_collision=True,
-  silent=False,
-  hWnd=None
-):
-  """Perform a shell-based file delete. Deleting in
-   this way uses the system recycle bin, allows the
-   possibility of undo, and showing the "flying file"
-   animation during the delete.
-
-  The default options allow for undo, don't automatically
-   clobber on a name clash, automatically rename on collision
-   and display the animation.
-  """
-  _file_operation (
-    shellcon.FO_DELETE,
-    source_path,
-    None,
-    allow_undo,
-    no_confirm,
-    rename_on_collision,
-    silent,
-    hWnd
-  )
-
-def CreateShortcut (Path, Target, Arguments = "", StartIn = "", Icon = ("",0), Description = ""):
-  """Create a Windows shortcut:
-
-  Path - As what file should the shortcut be created?
-  Target - What command should the desktop use?
-  Arguments - What arguments should be supplied to the command?
-  StartIn - What folder should the command start in?
-  Icon - (filename, index) What icon should be used for the shortcut?
-  Description - What description should the shortcut be given?
-
-  eg
-  CreateShortcut (
-    Path=os.path.join (desktop (), "PythonI.lnk"),
-    Target=r"c:\python\python.exe",
-    Icon=(r"c:\python\python.exe", 0),
-    Description="Python Interpreter"
-  )
-  """
-  sh = pythoncom.CoCreateInstance (
-    shell.CLSID_ShellLink,
-    None,
-    pythoncom.CLSCTX_INPROC_SERVER,
-    shell.IID_IShellLink
-  )
-
-  sh.SetPath (Target)
-  sh.SetDescription (Description)
-  sh.SetArguments (Arguments)
-  sh.SetWorkingDirectory (StartIn)
-  sh.SetIconLocation (Icon[0], Icon[1])
-
-  persist = sh.QueryInterface (pythoncom.IID_IPersistFile)
-  persist.Save (Path, 1)
-
-#
-# Constants for structured storage
-#
-# These come from ObjIdl.h
-FMTID_USER_DEFINED_PROPERTIES = "{F29F85E0-4FF9-1068-AB91-08002B27B3D9}"
-FMTID_CUSTOM_DEFINED_PROPERTIES = "{D5CDD505-2E9C-101B-9397-08002B2CF9AE}"
-
-PIDSI_TITLE               = 0x00000002
-PIDSI_SUBJECT             = 0x00000003
-PIDSI_AUTHOR              = 0x00000004
-PIDSI_CREATE_DTM          = 0x0000000c
-PIDSI_KEYWORDS            = 0x00000005
-PIDSI_COMMENTS            = 0x00000006
-PIDSI_TEMPLATE            = 0x00000007
-PIDSI_LASTAUTHOR          = 0x00000008
-PIDSI_REVNUMBER           = 0x00000009
-PIDSI_EDITTIME            = 0x0000000a
-PIDSI_LASTPRINTED         = 0x0000000b
-PIDSI_LASTSAVE_DTM        = 0x0000000d
-PIDSI_PAGECOUNT           = 0x0000000e
-PIDSI_WORDCOUNT           = 0x0000000f
-PIDSI_CHARCOUNT           = 0x00000010
-PIDSI_THUMBNAIL           = 0x00000011
-PIDSI_APPNAME             = 0x00000012
-PROPERTIES = (
-  PIDSI_TITLE,
-  PIDSI_SUBJECT,
-  PIDSI_AUTHOR,
-  PIDSI_CREATE_DTM,
-  PIDSI_KEYWORDS,
-  PIDSI_COMMENTS,
-  PIDSI_TEMPLATE,
-  PIDSI_LASTAUTHOR,
-  PIDSI_EDITTIME,
-  PIDSI_LASTPRINTED,
-  PIDSI_LASTSAVE_DTM,
-  PIDSI_PAGECOUNT,
-  PIDSI_WORDCOUNT,
-  PIDSI_CHARCOUNT,
-  PIDSI_APPNAME
-)
-
-#
-# This was taken from someone else's example,
-#  but I can't find where. If you know, please
-#  tell me so I can give due credit.
-#
-def structured_storage (filename):
-  """Pick out info from MS documents with embedded
-   structured storage (typically MS Word docs etc.)
-
-  Returns a dictionary of information found
-  """
-
-  if not pythoncom.StgIsStorageFile (filename):
-    return {}
-
-  flags = storagecon.STGM_READ | storagecon.STGM_SHARE_EXCLUSIVE
-  storage = pythoncom.StgOpenStorage (filename, None, flags)
-  try:
-    properties_storage = storage.QueryInterface (pythoncom.IID_IPropertySetStorage)
-  except pythoncom.com_error:
-    return {}
-
-  property_sheet = properties_storage.Open (FMTID_USER_DEFINED_PROPERTIES)
-  try:
-    data = property_sheet.ReadMultiple (PROPERTIES)
-  finally:
-    property_sheet = None
-
-  title, subject, author, created_on, keywords, comments, template_used, \
-   updated_by, edited_on, printed_on, saved_on, \
-   n_pages, n_words, n_characters, \
-   application = data
-
-  result = {}
-  if title: result['title'] = title
-  if subject: result['subject'] = subject
-  if author: result['author'] = author
-  if created_on: result['created_on'] = created_on
-  if keywords: result['keywords'] = keywords
-  if comments: result['comments'] = comments
-  if template_used: result['template_used'] = template_used
-  if updated_by: result['updated_by'] = updated_by
-  if edited_on: result['edited_on'] = edited_on
-  if printed_on: result['printed_on'] = printed_on
-  if saved_on: result['saved_on'] = saved_on
-  if n_pages: result['n_pages'] = n_pages
-  if n_words: result['n_words'] = n_words
-  if n_characters: result['n_characters'] = n_characters
-  if application: result['application'] = application
-  return result
-
-if __name__ == '__main__':
-  try:
-    print 'Desktop =>', desktop ()
-    print 'Common Desktop =>', desktop (1)
-    print 'Application Data =>', application_data ()
-    print 'Common Application Data =>', application_data (1)
-    print 'Bookmarks =>', bookmarks ()
-    print 'Common Bookmarks =>', bookmarks (1)
-    print 'Start Menu =>', start_menu ()
-    print 'Common Start Menu =>', start_menu (1)
-    print 'Programs =>', programs ()
-    print 'Common Programs =>', programs (1)
-    print 'Startup =>', startup ()
-    print 'Common Startup =>', startup (1)
-    print 'My Documents =>', my_documents ()
-    print 'Recent =>', recent ()
-    print 'SendTo =>', sendto ()
-  finally:
-    raw_input ("Press enter...")
-

From d5a7efdefa1d87c9bf209f56ad3c085991d20e2c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 18:46:04 +0530
Subject: [PATCH 0673/1154] Move apsw_shell.py as the build system does not
 support modules in src/

And I have better things to do than fix and test the build system.
---
 src/calibre/db/backend.py             | 2 +-
 src/{ => calibre/utils}/apsw_shell.py | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/{ => calibre/utils}/apsw_shell.py (100%)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 34629752da..0eb4eb1aa0 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -988,7 +988,7 @@ class DB(object):
         uv = int(self.user_version)
 
         if sql is None:
-            from apsw_shell import Shell
+            from calibre.utils.apsw_shell import Shell
             callback(_('Dumping database to SQL') + '...')
             buf = StringIO()
             shell = Shell(db=self.conn, stdout=buf)
diff --git a/src/apsw_shell.py b/src/calibre/utils/apsw_shell.py
similarity index 100%
rename from src/apsw_shell.py
rename to src/calibre/utils/apsw_shell.py

From 097ea82129399abd3a9347b291b5168dbe774f14 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Aug 2013 18:54:25 +0530
Subject: [PATCH 0674/1154] E-book viewer: Indicate if a KF8 file is a joint
 MOBI

---
 src/calibre/ebooks/conversion/plugins/mobi_input.py | 3 +++
 src/calibre/ebooks/oeb/iterator/book.py             | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/conversion/plugins/mobi_input.py b/src/calibre/ebooks/conversion/plugins/mobi_input.py
index 55e3c7f0d3..27729ff4f0 100644
--- a/src/calibre/ebooks/conversion/plugins/mobi_input.py
+++ b/src/calibre/ebooks/conversion/plugins/mobi_input.py
@@ -17,6 +17,7 @@ class MOBIInput(InputFormatPlugin):
     def convert(self, stream, options, file_ext, log,
                 accelerators):
         self.is_kf8 = False
+        self.mobi_is_joint = False
 
         from calibre.ebooks.mobi.reader.mobi6 import MobiReader
         from lxml import html
@@ -35,6 +36,8 @@ class MOBIInput(InputFormatPlugin):
 
         if mr.kf8_type is not None:
             log('Found KF8 MOBI of type %r'%mr.kf8_type)
+            if mr.kf8_type == 'joint':
+                self.mobi_is_joint = True
             from calibre.ebooks.mobi.reader.mobi8 import Mobi8Reader
             mr = Mobi8Reader(mr, log)
             opf = os.path.abspath(mr())
diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py
index d3cedce688..8868e7cbb1 100644
--- a/src/calibre/ebooks/oeb/iterator/book.py
+++ b/src/calibre/ebooks/oeb/iterator/book.py
@@ -113,7 +113,8 @@ class EbookIterator(BookmarksMixin):
 
         self.book_format = os.path.splitext(self.pathtoebook)[1][1:].upper()
         if getattr(plumber.input_plugin, 'is_kf8', False):
-            self.book_format = 'KF8'
+            fs = ':joint' if getattr(plumber.input_plugin, 'mobi_is_joint', False) else ''
+            self.book_format = 'KF8' + fs
 
         self.opf = getattr(plumber.input_plugin, 'optimize_opf_parsing', None)
         if self.opf is None:

From 4954e91a623e7d445f0586de7adb611b93b52777 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Aug 2013 08:04:15 +0530
Subject: [PATCH 0675/1154] Update Daily Mirror

---
 recipes/daily_mirror.recipe | 53 ++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/recipes/daily_mirror.recipe b/recipes/daily_mirror.recipe
index 91a274ab8c..d8cb6e024e 100644
--- a/recipes/daily_mirror.recipe
+++ b/recipes/daily_mirror.recipe
@@ -7,50 +7,50 @@ class AdvancedUserRecipe1306061239(BasicNewsRecipe):
     description = 'News as provided by The Daily Mirror -UK'
 
     __author__ = 'Dave Asbury'
-    # last updated 19/10/12
+    # last updated 27/8/13
     language = 'en_GB'
     #cover_url = 'http://yookeo.com/screens/m/i/mirror.co.uk.jpg'
 
     masthead_url = 'http://www.nmauk.co.uk/nma/images/daily_mirror.gif'
-
+    #recursions = 10
     compress_news_images = True
-    oldest_article = 1
-    max_articles_per_feed = 12
+    compress_news_images_max_size = 30
+    oldest_article = 1.5
+    max_articles_per_feed = 10
     remove_empty_feeds = True
     remove_javascript     = True
     no_stylesheets = True
-    ignore_duplicate_articles = {'title'}
+    ignore_duplicate_articles = {'url'}
 
-   # auto_cleanup = True
+    #auto_cleanup = True
     #conversion_options = { 'linearize_tables' : True }
 
-
-
-    keep_only_tags = [         dict(name='h1'),
+    keep_only_tags = [dict(name='h1'),
                          dict(name='div',attrs={'class' : 'lead-text'}),
-                         dict(name='div',attrs={'class' : 'styleGroup clearfix'}),
+                         dict(attrs={'class' : 'tools clearfix'}),
                          dict(name='div',attrs={'class' : 'widget relatedContents pictures widget-editable viziwyg-section-245 inpage-widget-158123'}),
                         # dict(name='figure',attrs={'class' : 'clearfix'}),
                          dict(name='div',attrs={'class' :'body '}),
-
+                 dict(name='div',attrs={'class' :'thumb'}),
+                         dict(attrs={'img alt' : ['Perishers','Horace']}),
+                 #dict(attrs={'class' : 'tmRow span-15-5 col-1 article-page'}),
        #dict(attrs={'class' : ['article-attr','byline append-1','published']}),
-       #dict(name='p'),
+       # dict(name='p'),
         ]
 
-
     remove_tags = [
-           dict(attrs={'class' : ['article sa-teaser type-opinion','image-gallery','gallery-caption']}),
+           dict(attrs={'class' : ['article sa-teaser type-opinion','last','gallery-caption','gallery-data','ir btn-fullscreen','avatar']}),  # ,'image-gallery'
            dict(attrs={'class' : 'comment'}),
            dict(name='title'),
            dict(name='ul',attrs={'class' :  'clearfix breadcrumbs '}),
            dict(name='ul',attrs={'id' : 'login-201109171215'}),
-           dict(name='div',attrs={'class' : ['inline-ad span-16 last','caption']}),#'widget navigation breadcrumb widget-editable viziwyg-section-198 inpage-widget-80721 span-17','image-credit'
+           #'widget navigation breadcrumb widget-editable viziwyg-section-198 inpage-widget-80721 span-17','image-credit'
+           dict(name='div',attrs={'class' : ['inline-ad span-16 last','caption']}),
                     ]
 
     preprocess_regexps = [
         (re.compile(r'- mirror.co.uk', re.IGNORECASE | re.DOTALL), lambda match: '')]
 
-
     feeds          = [
         (u'News',u'http://www.mirror.co.uk/news/rss.xml'),
         (u'Sports',u'http://www.mirror.co.uk/sport/rss.xml'),
@@ -63,26 +63,31 @@ class AdvancedUserRecipe1306061239(BasicNewsRecipe):
            # example of commented out feed not needed ,(u'Travel','http://www.mirror.co.uk/advice/travel/rss.xml')
   ]
     extra_css = '''
-                    h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
-                    h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
-                    p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
-                    body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
-		'''
+                    h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:170%;}
+                    .article figure figcaption {display: block;margin-left: auto;margin-right: auto;
+                    width:100%;font-family:Arial,Helvetica,sans-serif;font-size:40%;}
+
+                    #h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal;}
+                    p{font-family:Arial,Helvetica,sans-serif;}
+                    body{font-family:Helvetica,Arial,sans-serif;}
+                    .article figure{display: block;margin-left: auto;margin-right: auto;width:100%;}
+                    .lead-text p {font-size:150%}
+    '''
 
     def get_cover_url(self):
         soup = self.index_to_soup('http://www.politicshome.com/uk/latest_frontpage.html')
-# look for the block containing the mirror button and url
+        # look for the block containing the mirror button and url
         cov = soup.find(attrs={'style' : 'background-image: url(http://www.politicshome.com/images/sources/source_frontpage_button_92.gif);'})
         cov2 = str(cov)
         cov2='http://www.politicshome.com'+cov2[9:-142]
-#cov2 now contains url of the page containing pic
+        # cov2 now contains url of the page containing pic
         soup = self.index_to_soup(cov2)
         cov = soup.find(attrs={'id' : 'large'})
         cov=str(cov)
         cov2 =  re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', cov)
         cov2 = str(cov2)
         cov2=cov2[2:len(cov2)-2]
-        #cov2 now is pic url, now  go back to original function
+        # cov2 now is pic url, now  go back to original function
         br = browser()
         br.set_handle_redirect(False)
         try:

From 9f09120346180040d98ede0a4e1552be496ac357 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Aug 2013 09:19:56 +0530
Subject: [PATCH 0676/1154] Fix #1217623 [Set Undefined
 'date'](https://bugs.launchpad.net/calibre/+bug/1217623)

---
 src/calibre/gui2/library/delegates.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index c1b4248c26..6cf95c866a 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -36,7 +36,7 @@ class DateTimeEdit(QDateTimeEdit):  # {{{
     def keyPressEvent(self, ev):
         if ev.key() == Qt.Key_Minus:
             ev.accept()
-            self.setDateTime(self.minimumDateTime())
+            self.setDateTime(UNDEFINED_QDATETIME)
         elif ev.key() == Qt.Key_Equal:
             ev.accept()
             self.setDateTime(QDateTime.currentDateTime())

From 20817c399218fff5555e800ad40b4303d0b47213 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Aug 2013 10:17:49 +0530
Subject: [PATCH 0677/1154] ...

---
 src/calibre/db/cache.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 9551a2b434..dbc28a4200 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -822,7 +822,7 @@ class Cache(object):
                     get_metadata, lang_map, all_book_ids)
             except KeyError:
                 if field == 'id':
-                    ans = {bid:bid for bid in ids_to_sort}
+                    ans = {bid:bid for bid in all_book_ids}
                 else:
                     ans = virtual_fields[fm.get(field, field)].sort_keys_for_books(
                         get_metadata, lang_map, all_book_ids)

From f1d71a068e27d361ca0a5d2e5116bcac0899484f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Aug 2013 15:58:32 +0530
Subject: [PATCH 0678/1154] newdb: Speed up multisort() by lazy evaluation

The sort keys for the sub-sorted columns are now only evaluated on demand.
The common case is that the keys from the first column will differ,
therefore we can speed up sorting on average by delaying evaluation of
the sort keys for the second and later columns, only evaluating them
when the sort keys of the first column for a particular book differ.
The gains will be particularly noticeable for columns where calculating
the sort key is expensive, like composite columns or the series column.
---
 src/calibre/db/cache.py         |  78 +++++++++--------
 src/calibre/db/fields.py        | 146 +++++++++++++++++++++-----------
 src/calibre/db/tests/reading.py |  47 ++++++----
 src/calibre/db/view.py          |   5 +-
 4 files changed, 170 insertions(+), 106 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index dbc28a4200..18ef989988 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -10,7 +10,8 @@ __docformat__ = 'restructuredtext en'
 import os, traceback, random, shutil, re
 from io import BytesIO
 from collections import defaultdict
-from functools import wraps, partial
+from functools import wraps
+from future_builtins import zip
 
 from calibre import isbytestring
 from calibre.constants import iswindows, preferred_encoding
@@ -19,7 +20,7 @@ from calibre.db import SPOOL_SIZE, _get_next_series_num_for_list
 from calibre.db.categories import get_categories
 from calibre.db.locking import create_locks
 from calibre.db.errors import NoSuchFormat
-from calibre.db.fields import create_field
+from calibre.db.fields import create_field, IDENTITY
 from calibre.db.search import Search
 from calibre.db.tables import VirtualTable
 from calibre.db.write import get_series_values
@@ -804,42 +805,59 @@ class Cache(object):
         ascending=True or False). The most significant field is the first
         2-tuple.
         '''
-        all_book_ids = frozenset(self._all_book_ids() if ids_to_sort is None
-                else ids_to_sort)
-        ids_to_sort = all_book_ids if ids_to_sort is None else ids_to_sort
+        ids_to_sort = self._all_book_ids() if ids_to_sort is None else ids_to_sort
         get_metadata = self._get_proxy_metadata
         lang_map = self.fields['languages'].book_value_map
         virtual_fields = virtual_fields or {}
 
         fm = {'title':'sort', 'authors':'author_sort'}
 
-        def sort_key(field):
-            'Handle series type fields'
+        def sort_key_func(field):
+            'Handle series type fields, virtual fields and the id field'
             idx = field + '_index'
             is_series = idx in self.fields
             try:
-                ans = self.fields[fm.get(field, field)].sort_keys_for_books(
-                    get_metadata, lang_map, all_book_ids)
+                func = self.fields[fm.get(field, field)].sort_keys_for_books(get_metadata, lang_map)
             except KeyError:
                 if field == 'id':
-                    ans = {bid:bid for bid in all_book_ids}
+                    return IDENTITY
                 else:
-                    ans = virtual_fields[fm.get(field, field)].sort_keys_for_books(
-                        get_metadata, lang_map, all_book_ids)
+                    return virtual_fields[fm.get(field, field)].sort_keys_for_books(get_metadata, lang_map)
             if is_series:
-                idx_ans = self.fields[idx].sort_keys_for_books(
-                    get_metadata, lang_map, all_book_ids)
-                ans = {k:(v, idx_ans[k]) for k, v in ans.iteritems()}
-            return ans
+                idx_func = self.fields[idx].sort_keys_for_books(get_metadata, lang_map)
+                def skf(book_id):
+                    return (func(book_id), idx_func(book_id))
+                return skf
+            return func
 
-        sort_keys = tuple(sort_key(field[0]) for field in fields)
+        if len(fields) == 1:
+            return sorted(ids_to_sort, key=sort_key_func(fields[0][0]),
+                          reverse=not fields[0][1])
+        sort_key_funcs = tuple(sort_key_func(field) for field, order in fields)
+        orders = tuple(1 if order else -1 for _, order in fields)
+        Lazy = object()  # Lazy load the sort keys for sub-sort fields
 
-        if len(sort_keys) == 1:
-            sk = sort_keys[0]
-            return sorted(ids_to_sort, key=lambda i:sk[i], reverse=not
-                    fields[0][1])
-        else:
-            return sorted(ids_to_sort, key=partial(SortKey, fields, sort_keys))
+        class SortKey(object):
+
+            __slots__ = ('book_id', 'sort_key')
+
+            def __init__(self, book_id):
+                self.book_id = book_id
+                # Calculate only the first sub-sort key since that will always be used
+                self.sort_key = [key(book_id) if i == 0 else Lazy for i, key in enumerate(sort_key_funcs)]
+
+            def __cmp__(self, other):
+                for i, (order, self_key, other_key) in enumerate(zip(orders, self.sort_key, other.sort_key)):
+                    if self_key is Lazy:
+                        self_key = self.sort_key[i] = sort_key_funcs[i](self.book_id)
+                    if other_key is Lazy:
+                        other_key = other.sort_key[i] = sort_key_funcs[i](other.book_id)
+                    ans = cmp(self_key, other_key)
+                    if ans != 0:
+                        return ans * order
+                return 0
+
+        return sorted(ids_to_sort, key=SortKey)
 
     @read_api
     def search(self, query, restriction='', virtual_fields=None, book_ids=None):
@@ -1713,17 +1731,3 @@ class Cache(object):
 
     # }}}
 
-class SortKey(object):  # {{{
-
-    def __init__(self, fields, sort_keys, book_id):
-        self.orders = tuple(1 if f[1] else -1 for f in fields)
-        self.sort_key = tuple(sk[book_id] for sk in sort_keys)
-
-    def __cmp__(self, other):
-        for i, order in enumerate(self.orders):
-            ans = cmp(self.sort_key[i], other.sort_key[i])
-            if ans != 0:
-                return ans * order
-        return 0
-# }}}
-
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index fc7bee2c51..b59fc58608 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -25,6 +25,8 @@ from calibre.utils.localization import calibre_langcode_to_name
 def bool_sort_key(bools_are_tristate):
     return (lambda x:{True: 1, False: 2, None: 3}.get(x, 3)) if bools_are_tristate else lambda x:{True: 1, False: 2, None: 2}.get(x, 2)
 
+IDENTITY = lambda x: x
+
 class Field(object):
 
     is_many = False
@@ -36,7 +38,7 @@ class Field(object):
         dt = self.metadata['datatype']
         self.has_text_data = dt in {'text', 'comments', 'series', 'enumeration'}
         self.table_type = self.table.table_type
-        self._sort_key = (sort_key if dt in ('text', 'series', 'enumeration') else lambda x: x)
+        self._sort_key = (sort_key if dt in ('text', 'series', 'enumeration') else IDENTITY)
 
         # This will be compared to the output of sort_key() which is a
         # bytestring, therefore it is safer to have it be a bytestring.
@@ -112,12 +114,11 @@ class Field(object):
         '''
         return iter(())
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
+    def sort_keys_for_books(self, get_metadata, lang_map):
         '''
-        Return a mapping of book_id -> sort_key. The sort key is suitable for
+        Return a function that maps book_id to sort_key. The sort key is suitable for
         use in sorting the list of all books by this field, via the python cmp
-        method. all_book_ids is the list/set of book ids for which sort_keys
-        should be generated.
+        method.
         '''
         raise NotImplementedError()
 
@@ -165,9 +166,13 @@ class OneToOneField(Field):
     def __iter__(self):
         return self.table.book_col_map.iterkeys()
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
-        return {id_: self._sort_key(self.table.book_col_map.get(id_,
-            self._default_sort_key)) for id_ in all_book_ids}
+    def sort_keys_for_books(self, get_metadata, lang_map):
+        bcmg = self.table.book_col_map.get
+        dk = self._default_sort_key
+        sk = self._sort_key
+        if sk is IDENTITY:
+            return lambda book_id:bcmg(book_id, dk)
+        return lambda book_id:sk(bcmg(book_id, dk))
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         cbm = self.table.book_col_map
@@ -263,9 +268,12 @@ class CompositeField(OneToOneField):
                 self._render_cache[book_id] = ans
         return ans
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
-        return {id_: self._sort_key(self.get_value_with_cache(id_, get_metadata)) for id_ in
-                all_book_ids}
+    def sort_keys_for_books(self, get_metadata, lang_map):
+        gv = self.get_value_with_cache
+        sk = self._sort_key
+        if sk is IDENTITY:
+            return lambda book_id:gv(book_id, get_metadata)
+        return lambda book_id:sk(gv(book_id, get_metadata))
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         val_map = defaultdict(set)
@@ -362,9 +370,8 @@ class OnDeviceField(OneToOneField):
     def __iter__(self):
         return iter(())
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
-        return {id_: self.for_book(id_) for id_ in
-                all_book_ids}
+    def sort_keys_for_books(self, get_metadata, lang_map):
+        return self.for_book
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         val_map = defaultdict(set)
@@ -373,6 +380,27 @@ class OnDeviceField(OneToOneField):
         for val, book_ids in val_map.iteritems():
             yield val, book_ids
 
+class LazySortMap(object):
+
+    __slots__ = ('default_sort_key', 'sort_key_func', 'id_map', 'cache')
+
+    def __init__(self, default_sort_key, sort_key_func, id_map):
+        self.default_sort_key = default_sort_key
+        self.sort_key_func = sort_key_func
+        self.id_map = id_map
+        self.cache = {None:default_sort_key}
+
+    def __call__(self, item_id):
+        try:
+            return self.cache[item_id]
+        except KeyError:
+            try:
+                val = self.cache[item_id] = self.sort_key_func(self.id_map[item_id])
+            except KeyError:
+                val = self.cache[item_id] = self.default_sort_key
+            return val
+
+
 class ManyToOneField(Field):
 
     is_many = True
@@ -397,13 +425,10 @@ class ManyToOneField(Field):
     def __iter__(self):
         return self.table.id_map.iterkeys()
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
-        ans = {id_: self.table.book_col_map.get(id_, None)
-                for id_ in all_book_ids}
-        sk_map = {cid: (self._default_sort_key if cid is None else
-                self._sort_key(self.table.id_map[cid]))
-                for cid in ans.itervalues()}
-        return {id_: sk_map[cid] for id_, cid in ans.iteritems()}
+    def sort_keys_for_books(self, get_metadata, lang_map):
+        sk_map = LazySortMap(self._default_sort_key, self._sort_key, self.table.id_map)
+        bcmg = self.table.book_col_map.get
+        return lambda book_id:sk_map(bcmg(book_id, None))
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         cbm = self.table.col_book_map
@@ -447,17 +472,17 @@ class ManyToManyField(Field):
     def __iter__(self):
         return self.table.id_map.iterkeys()
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
-        ans = {id_: self.table.book_col_map.get(id_, ())
-                for id_ in all_book_ids}
-        all_cids = set()
-        for cids in ans.itervalues():
-            all_cids = all_cids.union(set(cids))
-        sk_map = {cid: self._sort_key(self.table.id_map[cid]) for cid in all_cids}
-        sort_func = (lambda x:tuple(sorted(x))) if self.sort_sort_key else tuple
-        return {id_: (sort_func(sk_map[cid] for cid in cids) if cids else
-                        (self._default_sort_key,))
-                for id_, cids in ans.iteritems()}
+    def sort_keys_for_books(self, get_metadata, lang_map):
+        sk_map = LazySortMap(self._default_sort_key, self._sort_key, self.table.id_map)
+        bcmg = self.table.book_col_map.get
+        dsk = (self._default_sort_key,)
+        if self.sort_sort_key:
+            def sk(book_id):
+                return tuple(sorted(sk_map(x) for x in bcmg(book_id, ()))) or dsk
+        else:
+            def sk(book_id):
+                return tuple(sk_map(x) for x in bcmg(book_id, ())) or dsk
+        return sk
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         cbm = self.table.col_book_map
@@ -491,13 +516,11 @@ class IdentifiersField(ManyToManyField):
                 ids = default_value
         return ids
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
+    def sort_keys_for_books(self, get_metadata, lang_map):
         'Sort by identifier keys'
-        ans = {id_: self.table.book_col_map.get(id_, ())
-                for id_ in all_book_ids}
-        return {id_: (tuple(sorted(cids.iterkeys())) if cids else
-                        (self._default_sort_key,))
-                for id_, cids in ans.iteritems()}
+        bcmg = self.table.book_col_map.get
+        dv = {self._default_sort_key:None}
+        return lambda book_id: tuple(sorted(bcmg(book_id, dv).iterkeys()))
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=()):
         bcm = self.table.book_col_map
@@ -566,22 +589,43 @@ class FormatsField(ManyToManyField):
                 ans.append(c)
         return ans
 
+class LazySeriesSortMap(object):
+
+    __slots__ = ('default_sort_key', 'sort_key_func', 'id_map', 'cache')
+
+    def __init__(self, default_sort_key, sort_key_func, id_map):
+        self.default_sort_key = default_sort_key
+        self.sort_key_func = sort_key_func
+        self.id_map = id_map
+        self.cache = {}
+
+    def __call__(self, item_id, lang):
+        try:
+            return self.cache[(item_id, lang)]
+        except KeyError:
+            try:
+                val = self.cache[(item_id, lang)] = self.sort_key_func(self.id_map[item_id], lang)
+            except KeyError:
+                val = self.cache[(item_id, lang)] = self.default_sort_key
+            return val
+
 class SeriesField(ManyToOneField):
 
-    def sort_key_for_series(self, book_id, lang_map, series_sort_order):
-        sid = self.table.book_col_map.get(book_id, None)
-        if sid is None:
-            return self._default_sort_key
-        lang = lang_map.get(book_id, None) or None
-        if lang:
-            lang = lang[0]
-        return self._sort_key(title_sort(self.table.id_map[sid],
-                                         order=series_sort_order, lang=lang))
-
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
+    def sort_keys_for_books(self, get_metadata, lang_map):
         sso = tweaks['title_series_sorting']
-        return {book_id:self.sort_key_for_series(book_id, lang_map, sso) for book_id
-                in all_book_ids}
+        ssk = self._sort_key
+        ts = title_sort
+        def sk(val, lang):
+            return ssk(ts(val, order=sso, lang=lang))
+        sk_map = LazySeriesSortMap(self._default_sort_key, sk, self.table.id_map)
+        bcmg = self.table.book_col_map.get
+        lang_map = {k:v[0] if v else None for k, v in lang_map.iteritems()}
+
+        def key(book_id):
+            lang = lang_map.get(book_id, None)
+            return sk_map(bcmg(book_id, None), lang)
+
+        return key
 
     def category_sort_value(self, item_id, book_ids, lang_map):
         lang = None
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 2dcd519cad..101d1b12cc 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -126,6 +126,7 @@ class ReadingTest(BaseTest):
     def test_sorting(self):  # {{{
         'Test sorting'
         cache = self.init_cache()
+        ae = self.assertEqual
         for field, order in {
             'title'  : [2, 1, 3],
             'authors': [2, 1, 3],
@@ -151,49 +152,63 @@ class ReadingTest(BaseTest):
             '#comments':[3, 2, 1],
         }.iteritems():
             x = list(reversed(order))
-            self.assertEqual(order, cache.multisort([(field, True)],
+            ae(order, cache.multisort([(field, True)],
                 ids_to_sort=x),
                     'Ascending sort of %s failed'%field)
-            self.assertEqual(x, cache.multisort([(field, False)],
+            ae(x, cache.multisort([(field, False)],
                 ids_to_sort=order),
                     'Descending sort of %s failed'%field)
 
-        # Test subsorting
-        self.assertEqual([3, 2, 1], cache.multisort([('identifiers', True),
-            ('title', True)]), 'Subsort failed')
-
         # Test sorting of is_multiple fields.
 
         # Author like fields should be sorted by generating sort names from the
         # actual values in entry order
         for field in ('authors', '#authors'):
-            self.assertEqual(
+            ae(
                 cache.set_field(field, {1:('aa bb', 'bb cc', 'cc dd'), 2:('bb aa', 'xx yy'), 3: ('aa bb', 'bb aa')}), {1, 2, 3})
-            self.assertEqual([2, 3, 1], cache.multisort([(field, True)], ids_to_sort=(1, 2, 3)))
-            self.assertEqual([1, 3, 2], cache.multisort([(field, False)], ids_to_sort=(1, 2, 3)))
+            ae([2, 3, 1], cache.multisort([(field, True)], ids_to_sort=(1, 2, 3)))
+            ae([1, 3, 2], cache.multisort([(field, False)], ids_to_sort=(1, 2, 3)))
 
         # All other is_multiple fields should be sorted by sorting the values
         # for each book and using that as the sort key
         for field in ('tags', '#tags'):
-            self.assertEqual(
+            ae(
                 cache.set_field(field, {1:('b', 'a'), 2:('c', 'y'), 3: ('b', 'z')}), {1, 2, 3})
-            self.assertEqual([1, 3, 2], cache.multisort([(field, True)], ids_to_sort=(1, 2, 3)))
-            self.assertEqual([2, 3, 1], cache.multisort([(field, False)], ids_to_sort=(1, 2, 3)))
+            ae([1, 3, 2], cache.multisort([(field, True)], ids_to_sort=(1, 2, 3)))
+            ae([2, 3, 1], cache.multisort([(field, False)], ids_to_sort=(1, 2, 3)))
 
         # Test tweak to sort dates by visible format
         from calibre.utils.date import parse_only_date as p
         from calibre.utils.config_base import Tweak
-        self.assertEqual(cache.set_field('pubdate', {1:p('2001-3-3'), 2:p('2002-2-3'), 3:p('2003-1-3')}), {1, 2, 3})
-        self.assertEqual([1, 2, 3], cache.multisort([('pubdate', True)]))
+        ae(cache.set_field('pubdate', {1:p('2001-3-3'), 2:p('2002-2-3'), 3:p('2003-1-3')}), {1, 2, 3})
+        ae([1, 2, 3], cache.multisort([('pubdate', True)]))
         with Tweak('gui_pubdate_display_format', 'MMM'), Tweak('sort_dates_using_visible_fields', True):
             c2 = self.init_cache()
-            self.assertEqual([3, 2, 1], c2.multisort([('pubdate', True)]))
+            ae([3, 2, 1], c2.multisort([('pubdate', True)]))
 
         # Test bool sorting when not tristate
         cache.set_pref('bools_are_tristate', False)
         c2 = self.init_cache()
-        self.assertEqual([2, 3, 1], c2.multisort([('#yesno', True), ('id', False)]))
+        ae([2, 3, 1], c2.multisort([('#yesno', True), ('id', False)]))
 
+        # Test subsorting
+        ae([3, 2, 1], cache.multisort([('identifiers', True),
+            ('title', True)]), 'Subsort failed')
+        from calibre.ebooks.metadata.book.base import Metadata
+        for i in xrange(7):
+            cache.create_book_entry(Metadata('title%d' % i), apply_import_tags=False)
+        cache.create_custom_column('one', 'CC1', 'int', False)
+        cache.create_custom_column('two', 'CC2', 'int', False)
+        cache.create_custom_column('three', 'CC3', 'int', False)
+        cache.close()
+        cache = self.init_cache()
+        cache.set_field('#one', {(i+(5*m)):m for m in (0, 1) for i in xrange(1, 6)})
+        cache.set_field('#two', {i+(m*3):m for m in (0, 1, 2) for i in (1, 2, 3)})
+        cache.set_field('#two', {10:2})
+        cache.set_field('#three', {i:i for i in xrange(1, 11)})
+        ae(list(xrange(1, 11)), cache.multisort([('#one', True), ('#two', True)], ids_to_sort=sorted(cache.all_book_ids())))
+        ae([4, 5, 1, 2, 3, 7,8, 9, 10, 6], cache.multisort([('#one', True), ('#two', False)], ids_to_sort=sorted(cache.all_book_ids())))
+        ae([5, 4, 3, 2, 1, 10, 9, 8, 7, 6], cache.multisort([('#one', True), ('#two', False), ('#three', False)], ids_to_sort=sorted(cache.all_book_ids())))
     # }}}
 
     def test_get_metadata(self):  # {{{
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 43243318d5..04f205f21f 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -30,8 +30,9 @@ class MarkedVirtualField(object):
         for book_id in candidates:
             yield self.marked_ids.get(book_id, default_value), {book_id}
 
-    def sort_keys_for_books(self, get_metadata, lang_map, all_book_ids):
-        return {bid:self.marked_ids.get(bid, None) for bid in all_book_ids}
+    def sort_keys_for_books(self, get_metadata, lang_map):
+        g = self.marked_ids.get
+        return lambda book_id:g(book_id, None)
 
 class TableRow(object):
 

From 6dafe81eaf2afd5848792262e8abad18de8fedd0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Aug 2013 16:00:27 +0530
Subject: [PATCH 0679/1154] VFR Magazine by Krittika Goyal

---
 recipes/vfr_magazine.recipe | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 recipes/vfr_magazine.recipe

diff --git a/recipes/vfr_magazine.recipe b/recipes/vfr_magazine.recipe
new file mode 100644
index 0000000000..788d91cab7
--- /dev/null
+++ b/recipes/vfr_magazine.recipe
@@ -0,0 +1,19 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+
+class HindustanTimes(BasicNewsRecipe):
+    title = u'VFR Magazine'
+    language = 'fr'
+    __author__ = 'Krittika Goyal'
+    oldest_article = 31  # days
+    max_articles_per_feed = 25
+    #encoding = 'cp1252'
+    use_embedded_content = False
+
+    no_stylesheets = True
+    auto_cleanup = True
+
+    feeds = [
+        ('VFR Magazine',
+            'http://feeds.feedburner.com/vfrmagazine'),
+    ]

From 0feb5749a079a1524054eff4da719b67e3ff401e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Aug 2013 16:26:46 +0530
Subject: [PATCH 0680/1154] ...

---
 src/calibre/db/tables.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index edb16d8e3a..00eeaa5a1d 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -41,9 +41,7 @@ def c_parse(val):
 
 ONE_ONE, MANY_ONE, MANY_MANY = xrange(3)
 
-class Null:
-    pass
-null = Null()
+null = object()
 
 class Table(object):
 

From f4de88d780f3c80262dea21153234c1d8e156dcb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Aug 2013 10:54:24 +0530
Subject: [PATCH 0681/1154] Refactor HTML metadata parser

Rewrite the HTML metadata parser to make it faster and more robust.
Fixes #1217751 [adding XHTML book: some METADATA  is not used](https://bugs.launchpad.net/calibre/+bug/1217751)
---
 src/calibre/ebooks/metadata/html.py | 298 +++++++++++-----------------
 1 file changed, 115 insertions(+), 183 deletions(-)

diff --git a/src/calibre/ebooks/metadata/html.py b/src/calibre/ebooks/metadata/html.py
index 03aa4cf32a..a233eee7da 100644
--- a/src/calibre/ebooks/metadata/html.py
+++ b/src/calibre/ebooks/metadata/html.py
@@ -1,177 +1,146 @@
-#!/usr/bin/env  python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
 
 __license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 '''
 Try to read metadata from an HTML file.
 '''
 
 import re
 
-from calibre.ebooks.metadata import MetaInformation
+from calibre.ebooks.metadata import string_to_authors
+from calibre.ebooks.metadata.book.base import Metadata
 from calibre.ebooks.chardet import xml_to_unicode
-from calibre import entity_to_unicode
-from calibre.utils.date import parse_date
+from calibre import replace_entities, isbytestring
+from calibre.utils.date import parse_date, is_date_undefined
 
 def get_metadata(stream):
     src = stream.read()
     return get_metadata_(src)
 
-def get_meta_regexp_(name):
-    return re.compile('<meta name=[\'"]' + name + r'[\'"]\s+content=[\'"](.+?)[\'"]\s*/?>', re.IGNORECASE)
+COMMENT_NAMES = {
+    'title': 'TITLE',
+    'authors': 'AUTHOR',
+    'publisher': 'PUBLISHER',
+    'isbn': 'ISBN',
+    'language': 'LANGUAGE',
+    'pubdate': 'PUBDATE',
+    'timestamp': 'TIMESTAMP',
+    'series': 'SERIES',
+    'series_index': 'SERIESNUMBER',
+    'rating': 'RATING',
+    'comments': 'COMMENTS',
+    'tags': 'TAGS',
+}
+
+META_NAMES = {
+    'title' : ('dc.title', 'dcterms.title', 'title'),
+    'authors': ('author', 'dc.creator.aut', 'dcterms.creator.aut', 'dc.creator'),
+    'publisher': ('publisher', 'dc.publisher', 'dcterms.publisher'),
+    'isbn': ('isbn', 'dc.identifier.isbn', 'dcterms.identifier.isbn'),
+    'language': ('dc.language', 'dcterms.language'),
+    'pubdate': ('pubdate', 'date of publication', 'dc.date.published', 'dc.date.publication', 'dc.date.issued', 'dcterms.issued'),
+    'timestamp': ('timestamp', 'date of creation', 'dc.date.created', 'dc.date.creation', 'dcterms.created'),
+    'series': ('series',),
+    'series_index': ('seriesnumber', 'series_index', 'series.index'),
+    'rating': ('rating',),
+    'comments': ('comments',),
+    'tags': ('tags',),
+}
+
+# Extract an HTML attribute value, supports both single and double quotes and
+# single quotes inside double quotes and vice versa.
+attr_pat = r'''(?:(?P<sq>')|(?P<dq>"))(?P<content>(?(sq)[^']+|[^"]+))(?(sq)'|")'''
+
+def parse_meta_tags(src):
+    rmap = {}
+    for field, names in META_NAMES.iteritems():
+        for name in names:
+            rmap[name.lower()] = field
+    all_names = '|'.join(rmap)
+    ans = {}
+    npat = r'''name\s*=\s*['"]{0,1}(?P<name>%s)['"]{0,1}''' % all_names
+    cpat = 'content\s*=\s*%s' % attr_pat
+    for pat in (
+        '<meta\s+%s\s+%s' % (npat, cpat),
+        '<meta\s+%s\s+%s' % (cpat, npat),
+    ):
+        for match in re.finditer(pat, src, flags=re.IGNORECASE):
+            field = rmap[match.group('name').lower()]
+            if field not in ans:
+                ans[field] = replace_entities(match.group('content'))
+            if len(ans) == len(META_NAMES):
+                return ans
+    return ans
+
+def parse_comment_tags(src):
+    all_names = '|'.join(COMMENT_NAMES.itervalues())
+    rmap = {v:k for k, v in COMMENT_NAMES.iteritems()}
+    ans = {}
+    for match in re.finditer(r'''<!--\s*(?P<name>%s)\s*=\s*%s''' % (all_names, attr_pat), src):
+        field = rmap[match.group('name')]
+        if field not in ans:
+            ans[field] = replace_entities(match.group('content'))
+        if len(ans) == len(COMMENT_NAMES):
+            break
+    return ans
 
 def get_metadata_(src, encoding=None):
-    if not isinstance(src, unicode):
+    # Meta data definitions as in
+    # http://www.mobileread.com/forums/showpost.php?p=712544&postcount=9
+
+    if isbytestring(src):
         if not encoding:
             src = xml_to_unicode(src)[0]
         else:
             src = src.decode(encoding, 'replace')
+    src = src[:150000]  # Searching shouldn't take too long
+    comment_tags = parse_comment_tags(src)
+    meta_tags = parse_meta_tags(src)
 
-    # Meta data definitions as in
-    # http://www.mobileread.com/forums/showpost.php?p=712544&postcount=9
+    def get(field):
+        ans = comment_tags.get(field, meta_tags.get(field, None))
+        if ans:
+            ans = ans.strip()
+        if not ans:
+            ans = None
+        return ans
 
     # Title
-    title = None
-    pat = re.compile(r'<!--.*?TITLE=(?P<q>[\'"])(.+?)(?P=q).*?-->', re.DOTALL)
-    src = src[:150000] # Searching shouldn't take too long
-    match = pat.search(src)
-    if match:
-        title = match.group(2)
-    else:
-        for x in ('DC.title','DCTERMS.title','Title'):
-            pat = get_meta_regexp_(x)
-            match = pat.search(src)
-            if match:
-                title = match.group(1)
-                break
+    title = get('title')
     if not title:
         pat = re.compile('<title>([^<>]+?)</title>', re.IGNORECASE)
         match = pat.search(src)
         if match:
-            title = match.group(1)
+            title = replace_entities(match.group(1))
 
     # Author
-    author = None
-    pat = re.compile(r'<!--.*?AUTHOR=(?P<q>[\'"])(.+?)(?P=q).*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        author = match.group(2).replace(',', ';')
-    else:
-        for x in ('Author','DC.creator.aut','DCTERMS.creator.aut', 'DC.creator'):
-            pat = get_meta_regexp_(x)
-            match = pat.search(src)
-            if match:
-                author = match.group(1)
-                break
+    authors = get('authors') or _('Unknown')
 
     # Create MetaInformation with Title and Author
-    ent_pat = re.compile(r'&(\S+)?;')
-    if title:
-        title = ent_pat.sub(entity_to_unicode, title)
-    if author:
-        author = ent_pat.sub(entity_to_unicode, author)
-    mi = MetaInformation(title, [author] if author else None)
+    mi = Metadata(title or _('Unknown'), string_to_authors(authors))
 
-    # Publisher
-    publisher = None
-    pat = re.compile(r'<!--.*?PUBLISHER=(?P<q>[\'"])(.+?)(?P=q).*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        publisher = match.group(2)
-    else:
-        for x in ('Publisher','DC.publisher','DCTERMS.publisher'):
-            pat = get_meta_regexp_(x)
-            match = pat.search(src)
-            if match:
-                publisher = match.group(1)
-                break
-    if publisher:
-        mi.publisher = ent_pat.sub(entity_to_unicode, publisher)
+    for field in ('publisher', 'isbn', 'language', 'comments'):
+        val = get(field)
+        if val:
+            setattr(mi, field, val)
 
-    # ISBN
-    isbn = None
-    pat = re.compile(r'<!--.*?ISBN=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        isbn = match.group(1)
-    else:
-        for x in ('ISBN','DC.identifier.ISBN','DCTERMS.identifier.ISBN'):
-            pat = get_meta_regexp_(x)
-            match = pat.search(src)
-            if match:
-                isbn = match.group(1)
-                break
-    if isbn:
-        mi.isbn = re.sub(r'[^0-9xX]', '', isbn)
-
-    # LANGUAGE
-    language = None
-    pat = re.compile(r'<!--.*?LANGUAGE=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        language = match.group(1)
-    else:
-        for x in ('DC.language','DCTERMS.language'):
-            pat = get_meta_regexp_(x)
-            match = pat.search(src)
-            if match:
-                language = match.group(1)
-                break
-    if language:
-        mi.language = language
-
-    # PUBDATE
-    pubdate = None
-    pat = re.compile(r'<!--.*?PUBDATE=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        pubdate = match.group(1)
-    else:
-        for x in ('Pubdate','Date of publication','DC.date.published','DC.date.publication','DC.date.issued','DCTERMS.issued'):
-            pat = get_meta_regexp_(x)
-            match = pat.search(src)
-            if match:
-                pubdate = match.group(1)
-                break
-    if pubdate:
+    for field in ('pubdate', 'timestamp'):
         try:
-            mi.pubdate = parse_date(pubdate)
-        except:
-            pass
-
-    # TIMESTAMP
-    timestamp = None
-    pat = re.compile(r'<!--.*?TIMESTAMP=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        timestamp = match.group(1)
-    else:
-        for x in ('Timestamp','Date of creation','DC.date.created','DC.date.creation','DCTERMS.created'):
-            pat = get_meta_regexp_(x)
-            match = pat.search(src)
-            if match:
-                timestamp = match.group(1)
-                break
-    if timestamp:
-        try:
-            mi.timestamp = parse_date(timestamp)
+            val = parse_date(get(field))
         except:
             pass
+        else:
+            if not is_date_undefined(val):
+                setattr(mi, field, val)
 
     # SERIES
-    series = None
-    pat = re.compile(r'<!--.*?SERIES=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        series = match.group(1)
-    else:
-        pat = get_meta_regexp_("Series")
-        match = pat.search(src)
-        if match:
-            series = match.group(1)
+    series = get('series')
     if series:
-        pat = re.compile(r'\[([.0-9]+)\]')
+        pat = re.compile(r'\[([.0-9]+)\]$')
         match = pat.search(series)
         series_index = None
         if match is not None:
@@ -180,30 +149,18 @@ def get_metadata_(src, encoding=None):
             except:
                 pass
             series = series.replace(match.group(), '').strip()
-
-        mi.series = ent_pat.sub(entity_to_unicode, series)
+        mi.series = series
         if series_index is None:
-            pat = get_meta_regexp_("Seriesnumber")
-            match = pat.search(src)
-            if match:
-                try:
-                    series_index = float(match.group(1))
-                except:
-                    pass
+            series_index = get('series_index')
+            try:
+                series_index = float(series_index)
+            except:
+                pass
         if series_index is not None:
             mi.series_index = series_index
 
     # RATING
-    rating = None
-    pat = re.compile(r'<!--.*?RATING=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        rating = match.group(1)
-    else:
-        pat = get_meta_regexp_("Rating")
-        match = pat.search(src)
-        if match:
-            rating = match.group(1)
+    rating = get('rating')
     if rating:
         try:
             mi.rating = float(rating)
@@ -216,36 +173,11 @@ def get_metadata_(src, encoding=None):
         except:
             pass
 
-    # COMMENTS
-    comments = None
-    pat = re.compile(r'<!--.*?COMMENTS=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        comments = match.group(1)
-    else:
-        pat = get_meta_regexp_("Comments")
-        match = pat.search(src)
-        if match:
-            comments = match.group(1)
-    if comments:
-        mi.comments = ent_pat.sub(entity_to_unicode, comments)
-
     # TAGS
-    tags = None
-    pat = re.compile(r'<!--.*?TAGS=[\'"]([^"\']+)[\'"].*?-->', re.DOTALL)
-    match = pat.search(src)
-    if match:
-        tags = match.group(1)
-    else:
-        pat = get_meta_regexp_("Tags")
-        match = pat.search(src)
-        if match:
-            tags = match.group(1)
+    tags = get('tags')
     if tags:
-        mi.tags = [x.strip() for x in ent_pat.sub(entity_to_unicode,
-            tags).split(",")]
+        tags = [x.strip() for x in tags.split(',') if x.strip()]
+        if tags:
+            mi.tags = tags
 
-    # Ready to return MetaInformation
     return mi
-
-

From 746c2689287d548472bcc448bf862026ea9dc394 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Aug 2013 11:24:17 +0530
Subject: [PATCH 0682/1154] newdb: Fix refreshdb not working in GUI

Fix calibredb not updating the running calibre instance properly.
Fixes #1218177 [Running app does not refresh list when book added with calibredb add](https://bugs.launchpad.net/calibre/+bug/1218177)
---
 src/calibre/db/view.py |  4 ++--
 src/calibre/gui2/ui.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 04f205f21f..e9d42c97a1 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -335,14 +335,14 @@ class View(object):
         # be shared by multiple views. This is not ideal, but...
         self.cache.clear_search_caches(old_marked_ids | set(self.marked_ids))
 
-    def refresh(self, field=None, ascending=True, clear_caches=True):
+    def refresh(self, field=None, ascending=True, clear_caches=True, do_search=True):
         self._map = tuple(sorted(self.cache.all_book_ids()))
         self._map_filtered = tuple(self._map)
         if clear_caches:
             self.cache.clear_caches()
         if field is not None:
             self.sort(field, ascending)
-        if self.search_restriction or self.base_restriction:
+        if do_search and self.search_restriction or self.base_restriction:
             self.search('', return_matches=False)
 
     def refresh_ids(self, ids):
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index a5b73fc296..a7554f62f0 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -543,12 +543,12 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             self.raise_()
             self.activateWindow()
         elif msg.startswith('refreshdb:'):
-            db = self.library_view.model().db
-            db.new_api.reload_from_db()
-            self.library_view.model().resort()
-            self.library_view.model().research()
+            m = self.library_view.model()
+            m.db.new_api.reload_from_db()
+            m.db.data.refresh(clear_caches=False, do_search=False)
+            m.resort()
+            m.research()
             self.tags_view.recount()
-            self.library_view.model().db.refresh_format_cache()
         elif msg.startswith('shutdown:'):
             self.quit(confirm_quit=False)
         else:

From c16d95877edd5820ed2c5eac82ace087d1b9de27 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Aug 2013 11:28:23 +0530
Subject: [PATCH 0683/1154] ...

---
 src/calibre/db/view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index e9d42c97a1..17fd624057 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -342,7 +342,7 @@ class View(object):
             self.cache.clear_caches()
         if field is not None:
             self.sort(field, ascending)
-        if do_search and self.search_restriction or self.base_restriction:
+        if do_search and (self.search_restriction or self.base_restriction):
             self.search('', return_matches=False)
 
     def refresh_ids(self, ids):

From c10d73e5c6dc1e595f3b34e2fad8dc9142cf78e8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Aug 2013 12:33:25 +0530
Subject: [PATCH 0684/1154] multisort: Sort only once on any given field

---
 src/calibre/db/cache.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 18ef989988..fc1dd0ef3c 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, traceback, random, shutil, re
+import os, traceback, random, shutil, re, operator
 from io import BytesIO
 from collections import defaultdict
 from functools import wraps
@@ -23,7 +23,7 @@ from calibre.db.errors import NoSuchFormat
 from calibre.db.fields import create_field, IDENTITY
 from calibre.db.search import Search
 from calibre.db.tables import VirtualTable
-from calibre.db.write import get_series_values
+from calibre.db.write import get_series_values, uniq
 from calibre.db.lazy import FormatMetadata, FormatsList, ProxyMetadata
 from calibre.ebooks import check_ebook_format
 from calibre.ebooks.metadata import string_to_authors, author_to_author_sort, get_title_sort_pat
@@ -830,6 +830,9 @@ class Cache(object):
                 return skf
             return func
 
+        # Sort only once on any given field
+        fields = uniq(fields, operator.itemgetter(0))
+
         if len(fields) == 1:
             return sorted(ids_to_sort, key=sort_key_func(fields[0][0]),
                           reverse=not fields[0][1])

From 6908eea3e916f380219742475861226d216090eb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 08:10:01 +0530
Subject: [PATCH 0685/1154] Ensure that the all_ids() call does not cause
 locking issues

---
 src/calibre/db/legacy.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 384c75d71b..acab647f07 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -143,8 +143,8 @@ class LibraryDatabase(object):
         self.data.cache.initialize_template_cache()
 
     def all_ids(self):
-        for book_id in self.new_api.all_book_ids():
-            yield book_id
+        'All book ids in the db. This can no longer be a generator because of db locking.'
+        return tuple(self.new_api.all_book_ids())
 
     def is_empty(self):
         with self.new_api.read_lock:

From e933f57798ad97cd76fdc0424bcb93318b1b9409 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 08:27:28 +0530
Subject: [PATCH 0686/1154] newdb: Do not error out if the db contains null
 entries in the authors table

---
 src/calibre/db/cache.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index fc1dd0ef3c..10ce4e75f5 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1289,11 +1289,15 @@ class Cache(object):
         string. '''
         table = self.fields['authors'].table
         result = []
-        rmap = {icu_lower(v):k for k, v in table.id_map.iteritems()}
+        try:
+            rmap = {icu_lower(v):k for k, v in table.id_map.iteritems()}
+        except AttributeError:
+            # Somehow, the authors table has some authors that are None. Corrupted db?
+            rmap = {icu_lower(v or ''):k for k, v in table.id_map.iteritems()}
         for aut in authors:
             aid = rmap.get(icu_lower(aut), None)
             result.append(author_to_author_sort(aut) if aid is None else table.asort_map[aid])
-        return ' & '.join(result)
+        return ' & '.join(filter(None, result))
 
     @read_api
     def has_book(self, mi):

From fd3978d9d12f0192a383d28e35fa129bcf5f202f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 08:46:50 +0530
Subject: [PATCH 0687/1154] Fix warnings from pyflakes

---
 src/calibre/utils/apsw_shell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/apsw_shell.py b/src/calibre/utils/apsw_shell.py
index d8215e65b3..528cf38d8a 100644
--- a/src/calibre/utils/apsw_shell.py
+++ b/src/calibre/utils/apsw_shell.py
@@ -924,7 +924,7 @@ Enter SQL statements terminated with a ";"
         fn=getattr(self, "command_"+cmd[0], None)
         if not fn:
             raise self.Error("Unknown command \"%s\".  Enter \".help\" for help" % (cmd[0],))
-        res=fn(cmd[1:])
+        fn(cmd[1:])
 
     ###
     ### Commands start here
@@ -2861,7 +2861,7 @@ Enter SQL statements terminated with a ";"
         def __getattr__(self, k):
             return ""
         def colour_value(self, val, formatted):
-            c=self.colour
+            self.colour
             if val is None:
                 return self.vnull+formatted+self.vnull_
             if isinstance(val, Shell._basestring):

From 726e4cd5fcf1f9c8d39f2815043ba7d1f7caef35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 08:50:41 +0530
Subject: [PATCH 0688/1154] Test for sort by id

---
 src/calibre/db/tests/reading.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 101d1b12cc..84e254e398 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -150,6 +150,7 @@ class ReadingTest(BaseTest):
             '#tags':[3, 2, 1],
             '#yesno':[2, 1, 3],
             '#comments':[3, 2, 1],
+            'id': [1, 2, 3],
         }.iteritems():
             x = list(reversed(order))
             ae(order, cache.multisort([(field, True)],

From 394ef2d7850e8445338b2e1222bc44b04efcba01 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 08:51:38 +0530
Subject: [PATCH 0689/1154] version 1.1.0

---
 Changelog.yaml           | 75 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 1599e0617f..ea0cbdf18b 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,81 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.1.0
+  date: 2013-08-30
+
+  new features:
+    - title: "Rewrite the HTML metadata parser to make it faster and more robust."
+      tickets: [1217751]
+
+    - title: "Book list: When sorting on a currently unsorted column, use the last applied sort for that column, instead of always sorting in ascending order."
+      tickets: [1216714]
+
+    - title: "PocketBook driver: Scan for books files in the entire device not just in the 'books' folder"
+ 
+  bug fixes:
+    - title: "Fix a regression in 1.0 that could cause the dates in custom date-type columns to change in some timezones when using the edit metadata dialog to make unrelated changes."
+      tickets: [1217096]
+
+    - title: "When replacing formats in a book with a very long title+authors on windows, calibre could leave behind the old format file, because the filename shortening algorithm has changed. Handle that case."
+
+    - title: "Fix content server giving an error if you return to the top level page after using the virtual libraries."
+      tickets: [1216838]
+
+    - title: "Fix calibredb not updating the running calibre instance properly in 1.0"
+      tickets: [1218177]
+
+    - title: "Fix a regression in 1.0 that broke splitting of multiple valued field like tags into many items during a rename."
+      tickets: [1216699]
+
+    - title: "Fix a regression in 1.0 that caused an error when trying to set values for tags with the same item repeated, with different case."
+      tickets: [1216398]
+
+    - title: "Fix a regression that broke downloading news when output format is set to PDF"
+
+    - title: "Creating a catalog with an already existing catalog in the library would cause a temporary duplicate entry in the book list. Also fix the author sort for catalogs generated in the AZW3 format not being correct."
+
+    - title: "EPUB metadata: When changing the title in an EPUB 2.0 file that has multiple titles, remove the extra titles."
+      tickets: [1211949]
+
+    - title: "Fix a regression in 1.0 that caused Search and Replace in the bulk metadata edit dialog to be much slower than before"
+
+    - title: "Fix a regression in 1.0 that caused incorrect sorting and searching on some composite columns (columns built from other columns)."
+
+    - title: "Fix a regression in 1.0 that prevented the moving of libraries inside calibre"
+      tickets: [1216401]
+
+    - title: "Virtual Library tabs: If the user activates a hidden tab via the Virtual Library button, change the name of the All Books tab to reflect the hidden virtual library."
+      tickets: [1216174]
+
+    - title: "Ignore text records in the database that are damaged, instead of erroring out. Lets the rest of the data be used."
+      tickets: [1215981]
+
+    - title: "Fix regression that broke calibredb catalog when sorting on the id field."
+      tickets: [1216090]
+
+    - title: "HTML Input: Handle malformed OPF files when converting. "
+      tickets: [1215924]
+
+    - title: "Ensure that the Formats custom column (if present) is updated when a new format is created as a result of a conversion."
+      tickets: [1215885]
+
+    - title: "Fix a bug in 1.0 that broke the Check Library function on computers with non-English locales."
+      tickets: [1215819]
+
+    - title: "Content server: Fix blank username causing error on startup."
+      tickets: [1215893]
+
+    - title: "Fix sorting of book list by multi-valued fields like tags not correct in the new backend."
+      tickets: [1215820]
+
+  improved recipes:
+    - Daily Mirror
+
+  new recipes:
+    - title: VFR Magazine 
+      author: Krittika Goyal
+
 - version: 1.0.0
   date: 2013-08-23
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 06e780b713..07dfac1d03 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 0, 0)
+numeric_version = (1, 1, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 9d73fd3750a9b980caba8960d2445573bdd4798d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 09:53:31 +0530
Subject: [PATCH 0690/1154] Fix save to disk with books on an MTP device not
 working on windows.

---
 src/calibre/gui2/device.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index bddfa3efa9..056b47b821 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -591,12 +591,11 @@ class DeviceManager(Thread): # {{{
     def _save_books(self, paths, target):
         '''Copy books from device to disk'''
         for path in paths:
-            name = path.rpartition(os.sep)[2]
+            name = ascii_filename(os.path.basename(path))
             dest = os.path.join(target, name)
             if os.path.abspath(dest) != os.path.abspath(path):
-                f = open(dest, 'wb')
-                self.device.get_file(path, f)
-                f.close()
+                with open(dest, 'wb') as f:
+                    self.device.get_file(path, f)
 
     def save_books(self, done, paths, target, add_as_step_to_job=None):
         return self.create_job_step(self._save_books, done, args=[paths, target],

From 610f29d2239d4f09e19a2058c9f73ba0766f864c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 11:18:33 +0530
Subject: [PATCH 0691/1154] Use sanitize file name instead of ascii_filename
 when saving to disk from device

---
 src/calibre/gui2/device.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 056b47b821..77517b94f9 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -22,7 +22,7 @@ from calibre.gui2 import (config, error_dialog, Dispatcher, dynamic,
         warning_dialog, info_dialog, choose_dir, FunctionDispatcher,
         show_restart_warning, gprefs, question_dialog)
 from calibre.ebooks.metadata import authors_to_string
-from calibre import preferred_encoding, prints, force_unicode, as_unicode
+from calibre import preferred_encoding, prints, force_unicode, as_unicode, sanitize_file_name2
 from calibre.utils.filenames import ascii_filename
 from calibre.devices.errors import (FreeSpaceError, WrongDestinationError,
         BlacklistedDevice)
@@ -591,7 +591,7 @@ class DeviceManager(Thread): # {{{
     def _save_books(self, paths, target):
         '''Copy books from device to disk'''
         for path in paths:
-            name = ascii_filename(os.path.basename(path))
+            name = sanitize_file_name2(os.path.basename(path))
             dest = os.path.join(target, name)
             if os.path.abspath(dest) != os.path.abspath(path):
                 with open(dest, 'wb') as f:

From ae439f110e61a18219c9dcd983dc3f4fe602cec2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 14:58:57 +0530
Subject: [PATCH 0692/1154] Fix for broken file type plugins

Prevent file type plugins that spin the event loop by displaying a
dialog from causing locking errors. The lock is now acquired only after
the file type plugin has run on import.
---
 src/calibre/db/cache.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 10ce4e75f5..11005ecf0b 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1200,14 +1200,14 @@ class Cache(object):
 
     @api
     def add_format(self, book_id, fmt, stream_or_path, replace=True, run_hooks=True, dbapi=None):
-        with self.write_lock:
-            if run_hooks:
-                # Run import plugins
-                npath = run_import_plugins(stream_or_path, fmt)
-                fmt = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
-                stream_or_path = lopen(npath, 'rb')
-                fmt = check_ebook_format(stream_or_path, fmt)
+        if run_hooks:
+            # Run import plugins
+            npath = run_import_plugins(stream_or_path, fmt)
+            fmt = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
+            stream_or_path = lopen(npath, 'rb')
+            fmt = check_ebook_format(stream_or_path, fmt)
 
+        with self.write_lock:
             fmt = (fmt or '').upper()
             self.format_metadata_cache[book_id].pop(fmt, None)
             try:

From e35a7bd6fb5d0e59798342a1cf6641b52f5e15d1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 15:06:29 +0530
Subject: [PATCH 0693/1154] ...

---
 src/calibre/db/cache.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 11005ecf0b..830447c22e 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1201,7 +1201,9 @@ class Cache(object):
     @api
     def add_format(self, book_id, fmt, stream_or_path, replace=True, run_hooks=True, dbapi=None):
         if run_hooks:
-            # Run import plugins
+            # Run import plugins, the write lock is not held to cater for
+            # broken plugins that might spin the event loop by popping up a
+            # message in the GUI during the processing.
             npath = run_import_plugins(stream_or_path, fmt)
             fmt = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
             stream_or_path = lopen(npath, 'rb')

From 5b1ba794b12653010e34a871a92094b4ca2e04b5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 16:06:27 +0530
Subject: [PATCH 0694/1154] newdb: Automatically fix broken link tables

Fixes #1218783 [Beim Starten von Calibre bleibt das Startlogo bestehen und Pythons meldet einen Fehler.](https://bugs.launchpad.net/calibre/+bug/1218783)
---
 src/calibre/db/cache.py  | 18 +++++++++++++-----
 src/calibre/db/fields.py | 16 ++++++++++++++--
 src/calibre/db/tables.py | 25 +++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 830447c22e..a3b9e0618f 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -20,7 +20,7 @@ from calibre.db import SPOOL_SIZE, _get_next_series_num_for_list
 from calibre.db.categories import get_categories
 from calibre.db.locking import create_locks
 from calibre.db.errors import NoSuchFormat
-from calibre.db.fields import create_field, IDENTITY
+from calibre.db.fields import create_field, IDENTITY, InvalidLinkTable
 from calibre.db.search import Search
 from calibre.db.tables import VirtualTable
 from calibre.db.write import get_series_values, uniq
@@ -866,10 +866,18 @@ class Cache(object):
     def search(self, query, restriction='', virtual_fields=None, book_ids=None):
         return self._search_api(self, query, restriction, virtual_fields=virtual_fields, book_ids=book_ids)
 
-    @read_api
-    def get_categories(self, sort='name', book_ids=None, icon_map=None):
-        return get_categories(self, sort=sort, book_ids=book_ids,
-                              icon_map=icon_map)
+    @api
+    def get_categories(self, sort='name', book_ids=None, icon_map=None, already_fixed=None):
+        try:
+            with self.read_lock:
+                return get_categories(self, sort=sort, book_ids=book_ids, icon_map=icon_map)
+        except InvalidLinkTable as err:
+            bad_field = err.field_name
+            if bad_field == already_fixed:
+                raise
+            with self.write_lock:
+                self.fields[bad_field].table.fix_link_table(self.backend)
+            return self.get_categories(sort=sort, book_ids=book_ids, icon_map=icon_map, already_fixed=bad_field)
 
     @write_api
     def update_last_modified(self, book_ids, now=None):
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index b59fc58608..fbed097143 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -27,6 +27,12 @@ def bool_sort_key(bools_are_tristate):
 
 IDENTITY = lambda x: x
 
+class InvalidLinkTable(Exception):
+
+    def __init__(self, name):
+        Exception.__init__(self, name)
+        self.field_name = name
+
 class Field(object):
 
     is_many = False
@@ -144,9 +150,15 @@ class Field(object):
                 ratings = tuple(r for r in (book_rating_map.get(book_id, 0) for
                                             book_id in item_book_ids) if r > 0)
                 avg = sum(ratings)/len(ratings) if ratings else 0
-                name = self.category_formatter(id_map[item_id])
+                try:
+                    name = self.category_formatter(id_map[item_id])
+                except KeyError:
+                    # db has entries in the link table without entries in the
+                    # id table, for example, see
+                    # https://bugs.launchpad.net/bugs/1218783
+                    raise InvalidLinkTable(self.name)
                 sval = (self.category_sort_value(item_id, item_book_ids, lang_map)
-                        if special_sort else name)
+                    if special_sort else name)
                 c = tag_class(name, id=item_id, sort=sval, avg=avg,
                               id_set=item_book_ids, count=len(item_book_ids))
                 ans.append(c)
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 00eeaa5a1d..f2ccbe0c39 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -64,6 +64,9 @@ class Table(object):
     def remove_books(self, book_ids, db):
         return set()
 
+    def fix_link_table(self, db):
+        pass
+
 class VirtualTable(Table):
 
     '''
@@ -201,6 +204,17 @@ class ManyToOneTable(Table):
             cbm[item_id].add(book)
             bcm[book] = item_id
 
+    def fix_link_table(self, db):
+        linked_item_ids = {item_id for item_id in self.book_col_map.itervalues()}
+        extra_item_ids = linked_item_ids - set(self.id_map)
+        if extra_item_ids:
+            for item_id in extra_item_ids:
+                book_ids = self.col_book_map.pop(item_id, ())
+                for book_id in book_ids:
+                    self.book_col_map.pop(book_id, None)
+            db.conn.executemany('DELETE FROM {0} WHERE {1}=?'.format(
+                self.link_table, self.metadata['link_column']), tuple((x,) for x in extra_item_ids))
+
     def remove_books(self, book_ids, db):
         clean = set()
         for book_id in book_ids:
@@ -284,6 +298,17 @@ class ManyToManyTable(ManyToOneTable):
 
         self.book_col_map = {k:tuple(v) for k, v in bcm.iteritems()}
 
+    def fix_link_table(self, db):
+        linked_item_ids = {item_id for item_ids in self.book_col_map.itervalues() for item_id in item_ids}
+        extra_item_ids = linked_item_ids - set(self.id_map)
+        if extra_item_ids:
+            for item_id in extra_item_ids:
+                book_ids = self.col_book_map.pop(item_id, ())
+                for book_id in book_ids:
+                    self.book_col_map[book_id] = tuple(iid for iid in self.book_col_map.pop(book_id, ()) if iid not in extra_item_ids)
+            db.conn.executemany('DELETE FROM {0} WHERE {1}=?'.format(
+                self.link_table, self.metadata['link_column']), tuple((x,) for x in extra_item_ids))
+
     def remove_books(self, book_ids, db):
         clean = set()
         for book_id in book_ids:

From 6d667dbc8f016367d39152ae996955d245820604 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 17:25:59 +0530
Subject: [PATCH 0695/1154] newdb: Handle databases that have empty author
 records

Fixes #1218465 [Can not Edit Metadata](https://bugs.launchpad.net/calibre/+bug/1218465)
---
 src/calibre/db/cache.py  | 6 +-----
 src/calibre/db/tables.py | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index a3b9e0618f..e16079efb2 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1299,11 +1299,7 @@ class Cache(object):
         string. '''
         table = self.fields['authors'].table
         result = []
-        try:
-            rmap = {icu_lower(v):k for k, v in table.id_map.iteritems()}
-        except AttributeError:
-            # Somehow, the authors table has some authors that are None. Corrupted db?
-            rmap = {icu_lower(v or ''):k for k, v in table.id_map.iteritems()}
+        rmap = {icu_lower(v):k for k, v in table.id_map.iteritems()}
         for aut in authors:
             aid = rmap.get(icu_lower(aut), None)
             result.append(author_to_author_sort(aut) if aid is None else table.asort_map[aid])
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index f2ccbe0c39..295558c313 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -56,7 +56,7 @@ class Table(object):
         }.get(metadata['datatype'], None)
         if name == 'authors':
             # Legacy
-            self.unserialize = lambda x: x.replace('|', ',') if x else None
+            self.unserialize = lambda x: x.replace('|', ',') if x else ''
 
         self.link_table = (link_table if link_table else
                 'books_%s_link'%self.metadata['table'])

From fb8ab757f5088417a54db25363158153a9d1a3a6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 30 Aug 2013 21:21:19 +0530
Subject: [PATCH 0696/1154] newdb: Automatically sanitize ratings tables that
 contain rating records

---
 src/calibre/db/backend.py |  7 ++++---
 src/calibre/db/tables.py  | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 0eb4eb1aa0..5c0ffcf022 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -32,7 +32,7 @@ from calibre.utils.magick.draw import save_cover_data_to
 from calibre.utils.formatter_functions import load_user_template_functions
 from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable,
         SizeTable, FormatsTable, AuthorsTable, IdentifiersTable, PathTable,
-        CompositeTable, UUIDTable)
+        CompositeTable, UUIDTable, RatingTable)
 # }}}
 
 '''
@@ -702,14 +702,15 @@ class DB(object):
                 metadata['column'] = col
             tables[col] = (PathTable if col == 'path' else UUIDTable if col == 'uuid' else OneToOneTable)(col, metadata)
 
-        for col in ('series', 'publisher', 'rating'):
+        for col in ('series', 'publisher'):
             tables[col] = ManyToOneTable(col, self.field_metadata[col].copy())
 
-        for col in ('authors', 'tags', 'formats', 'identifiers', 'languages'):
+        for col in ('authors', 'tags', 'formats', 'identifiers', 'languages', 'rating'):
             cls = {
                     'authors':AuthorsTable,
                     'formats':FormatsTable,
                     'identifiers':IdentifiersTable,
+                    'rating':RatingTable,
                   }.get(col, ManyToManyTable)
             tables[col] = cls(col, self.field_metadata[col].copy())
 
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 295558c313..d8b623b352 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -276,6 +276,20 @@ class ManyToOneTable(Table):
                 self.link_table, lcol, table), (existing_item, item_id, item_id))
         return affected_books, new_id
 
+class RatingTable(ManyToOneTable):
+
+    def read_id_maps(self, db):
+        ManyToOneTable.read_id_maps(self, db)
+        # Ensure there are no records with rating=0 in the table. These should
+        # be represented as rating:None instead.
+        bad_ids = {item_id for item_id, rating in self.id_map.iteritems() if rating == 0}
+        if bad_ids:
+            self.id_map = {item_id:rating for item_id, rating in self.id_map.iteritems() if rating != 0}
+            db.conn.executemany('DELETE FROM {0} WHERE {1}=?'.format(self.link_table, self.metadata['link_column']),
+                                tuple((x,) for x in bad_ids))
+            db.conn.execute('DELETE FROM {0} WHERE {1}=0'.format(
+                self.metadata['table'], self.metadata['column']))
+
 class ManyToManyTable(ManyToOneTable):
 
     '''

From 601f6e87db6e8a5b0806ae16cb3127debbaba25d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2013 08:31:39 +0530
Subject: [PATCH 0697/1154] Update Instapaper

---
 recipes/instapaper.recipe | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/instapaper.recipe b/recipes/instapaper.recipe
index ef7f72ce1e..0753d0aa52 100644
--- a/recipes/instapaper.recipe
+++ b/recipes/instapaper.recipe
@@ -33,8 +33,8 @@ class AdvancedUserRecipe1299694372(BasicNewsRecipe):
             (u'Instapaper Starred', u'http://www.instapaper.com/starred')
             ]
 
-    #Adds the title tag to the body of the recipe. Use this if your articles miss headings.
-    add_title_tag = False;
+    # Adds the title tag to the body of the recipe. Use this if your articles miss headings.
+    add_title_tag = False
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
@@ -43,7 +43,7 @@ class AdvancedUserRecipe1299694372(BasicNewsRecipe):
             br.select_form(nr=0)
             br['username'] = self.username
             if self.password is not None:
-               br['password'] = self.password
+                br['password'] = self.password
             br.submit()
         return br
 
@@ -55,7 +55,7 @@ class AdvancedUserRecipe1299694372(BasicNewsRecipe):
             self.report_progress(0, 'Fetching feed'+' %s...'%(feedtitle if feedtitle else feedurl))
             articles = []
             soup = self.index_to_soup(feedurl)
-            for item in soup.findAll('div', attrs={'class':'cornerControls'}):
+            for item in soup.findAll('div', attrs={'class':'title_row'}):
                 #description = self.tag_to_string(item.div)
                 atag = item.a
                 if atag and atag.has_key('href'):
@@ -73,10 +73,10 @@ class AdvancedUserRecipe1299694372(BasicNewsRecipe):
         article.title  = soup.find('title').contents[0].strip()
 
     def postprocess_html(self, soup, first_fetch):
-        #adds the title to each story, as it is not always included
+        # adds the title to each story, as it is not always included
         if self.add_title_tag:
             for link_tag in soup.findAll(attrs={"id" : "story"}):
                 link_tag.insert(0,'<h1>'+soup.find('title').contents[0].strip()+'</h1>')
 
-        #print repr(soup)
+        # print repr(soup)
         return soup

From 508c8ea6d1cd700b7a1472166aa6aba7d391b7a9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2013 09:19:56 +0530
Subject: [PATCH 0698/1154] Use approx_formats when creating the formats column

Have the template used for the formats column when clicking the Formats
shortcut in the create columns dialog use approximate_formats() instead
of formats.
---
 src/calibre/gui2/preferences/create_custom_column.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py
index 7896d85fe7..c354e1cc99 100644
--- a/src/calibre/gui2/preferences/create_custom_column.py
+++ b/src/calibre/gui2/preferences/create_custom_column.py
@@ -183,7 +183,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
             self.composite_box.setText(
                 {
                     'isbn': '{identifiers:select(isbn)}',
-                    'formats': '{formats}',
+                    'formats': "{:'approximate_formats()'}",
                     }[which])
             self.composite_sort_by.setCurrentIndex(0)
 

From dcc9c294312d87441cec639cfdbb6b1005ed90c3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2013 10:13:23 +0530
Subject: [PATCH 0699/1154] Amazon metadata download: Update to handle website
 changes at amazon.com

---
 src/calibre/ebooks/metadata/sources/amazon.py | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index bc9b67c219..44241f5c10 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -398,7 +398,10 @@ class Worker(Thread):  # Get details {{{
     def parse_title(self, root):
         h1 = root.xpath('//h1[@id="title"]')
         if h1:
-            return self.totext(h1[0])
+            h1 = h1[0]
+            for child in h1.xpath('./*[contains(@class, "a-color-secondary")]'):
+                h1.remove(child)
+            return self.totext(h1)
         tdiv = root.xpath('//h1[contains(@class, "parseasinTitle")]')[0]
         actual_title = tdiv.xpath('descendant::*[@id="btAsinTitle"]')
         if actual_title:
@@ -413,6 +416,8 @@ class Worker(Thread):  # Get details {{{
 
     def parse_authors(self, root):
         matches = CSSSelect('#byline .author .contributorNameID')(root)
+        if not matches:
+            matches = CSSSelect('#byline .author a.a-link-normal')(root)
         if matches:
             authors = [self.totext(x) for x in matches]
             return [a for a in authors if a]
@@ -431,11 +436,15 @@ class Worker(Thread):  # Get details {{{
         return authors
 
     def parse_rating(self, root):
-        ratings = root.xpath('//div[@class="jumpBar"]/descendant::span[contains(@class,"asinReviewsSummary")]')
-        if not ratings:
-            ratings = root.xpath('//div[@class="buying"]/descendant::span[contains(@class,"asinReviewsSummary")]')
-        if not ratings:
-            ratings = root.xpath('//span[@class="crAvgStars"]/descendant::span[contains(@class,"asinReviewsSummary")]')
+        rating_paths = ('//div[@data-feature-name="averageCustomerReviews"]',
+                        '//div[@class="jumpBar"]/descendant::span[contains(@class,"asinReviewsSummary")]',
+                        '//div[@class="buying"]/descendant::span[contains(@class,"asinReviewsSummary")]',
+                        '//span[@class="crAvgStars"]/descendant::span[contains(@class,"asinReviewsSummary")]')
+        ratings = None
+        for p in rating_paths:
+            ratings = root.xpath(p)
+            if ratings:
+                break
         if ratings:
             for elem in ratings[0].xpath('descendant::*[@title]'):
                 t = elem.get('title').strip()
@@ -528,6 +537,8 @@ class Worker(Thread):  # Get details {{{
         imgs = root.xpath('//img[(@id="prodImage" or @id="original-main-image" or @id="main-image") and @src]')
         if not imgs:
             imgs = root.xpath('//div[@class="main-image-inner-wrapper"]/img[@src]')
+            if not imgs:
+                imgs = root.xpath('//div[@id="main-image-container"]//img[@src]')
         if imgs:
             src = imgs[0].get('src')
             if 'loading-' in src:
@@ -622,7 +633,7 @@ class Amazon(Source):
     capabilities = frozenset(['identify', 'cover'])
     touched_fields = frozenset(['title', 'authors', 'identifier:amazon',
         'identifier:isbn', 'rating', 'comments', 'publisher', 'pubdate',
-        'languages', 'series', 'tags'])
+        'languages', 'series'])
     has_html_comments = True
     supports_gzip_transfer_encoding = True
 
@@ -1001,8 +1012,7 @@ class Amazon(Source):
     # }}}
 
 if __name__ == '__main__':  # tests {{{
-    # To run these test use: calibre-debug -e
-    # src/calibre/ebooks/metadata/sources/amazon.py
+    # To run these test use: calibre-debug src/calibre/ebooks/metadata/sources/amazon.py
     from calibre.ebooks.metadata.sources.test import (test_identify_plugin,
             isbn_test, title_test, authors_test, comments_test)
     com_tests = [  # {{{
@@ -1027,7 +1037,7 @@ if __name__ == '__main__':  # tests {{{
                 [title_test(
                 "Griffin's Destiny: Book Three: The Griffin's Daughter Trilogy",
                 exact=True),
-                comments_test('Jelena'), comments_test('Leslie'),
+                comments_test('Jelena'), comments_test('Ashinji'),
                 ]
             ),
 

From 10d96d43eaf79e6224df074a9159611c33edca5a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2013 11:25:25 +0530
Subject: [PATCH 0700/1154] ...

---
 src/calibre/gui2/comments_editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index 921c8676e9..5ead06138a 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -214,7 +214,7 @@ class EditorWidget(QWebView):  # {{{
             if is_image:
                 self.exec_command('insertHTML',
                         '<img src="%s" alt="%s"></img>'%(prepare_string_for_xml(url, True),
-                            prepare_string_for_xml(name or '', True)))
+                            prepare_string_for_xml(name or _('Image'), True)))
             elif name:
                 self.exec_command('insertHTML',
                         '<a href="%s">%s</a>'%(prepare_string_for_xml(url, True),

From da951ddee720f2841add88542f73c47798139486 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2013 11:44:53 +0530
Subject: [PATCH 0701/1154] Various translation fixes

Fixes #1219227 [Enhancement and missing translation strings](https://bugs.launchpad.net/calibre/+bug/1219227)
---
 src/calibre/gui2/library/models.py | 2 +-
 src/calibre/utils/localization.py  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index cfa687ab37..ebf5e1d188 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -863,7 +863,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                 if ht == 'timestamp':  # change help text because users know this field as 'date'
                     ht = 'date'
                 if self.db.field_metadata[self.column_map[section]]['is_category']:
-                    is_cat = '.\n\n' + _('Click in this column and press Q to Quickview books with the same %s' % ht)
+                    is_cat = '.\n\n' + _('Click in this column and press Q to Quickview books with the same %s') % ht
                 else:
                     is_cat = ''
                 return QVariant(_('The lookup/search name is "{0}"{1}').format(ht, is_cat))
diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py
index 20688e44e8..e558df75b3 100644
--- a/src/calibre/utils/localization.py
+++ b/src/calibre/utils/localization.py
@@ -217,6 +217,15 @@ if False:
     _('Fonts')
     _('&Step up')
     _('Step &down')
+    _('Basic colors')
+    _('Custom colors')
+    _('&Add to Custom Colors')
+    _('Hu&e')
+    _('&Sat')
+    _('&Val')
+    _('&Red')
+    _('&Green')
+    _('Bl&ue')
 
 _lcase_map = {}
 for k in _extra_lang_codes:

From e21957872ea9db2ffb798cd3611748a51ee83202 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2013 12:52:26 +0530
Subject: [PATCH 0702/1154] Edit metadata dialog: Add an undo option for the
 Trim cover button

See #1219227 (Enhancement and missing translation strings)
---
 src/calibre/gui2/metadata/basic_widgets.py | 61 +++++++++++++---------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index 6238d0c08a..a0f4fe6586 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -9,11 +9,11 @@ __docformat__ = 'restructuredtext en'
 
 import textwrap, re, os, errno, shutil
 
-from PyQt4.Qt import (Qt, QDateTimeEdit, pyqtSignal, QMessageBox, QIcon,
-        QToolButton, QWidget, QLabel, QGridLayout, QApplication,
-        QDoubleSpinBox, QListWidgetItem, QSize, QPixmap, QDialog, QMenu,
-        QPushButton, QSpinBox, QLineEdit, QSizePolicy, QDialogButtonBox,
-        QAction, QCalendarWidget, QDate, QDateTime)
+from PyQt4.Qt import (
+    Qt, QDateTimeEdit, pyqtSignal, QMessageBox, QIcon, QToolButton, QWidget,
+    QLabel, QGridLayout, QApplication, QDoubleSpinBox, QListWidgetItem, QSize,
+    QPixmap, QDialog, QMenu, QSpinBox, QLineEdit, QSizePolicy,
+    QDialogButtonBox, QAction, QCalendarWidget, QDate, QDateTime)
 
 from calibre.gui2.widgets import EnLineEdit, FormatList as _FormatList, ImageView
 from calibre.utils.icu import sort_key
@@ -896,28 +896,34 @@ class Cover(ImageView):  # {{{
         self.show_size = True
         self.dialog = parent
         self._cdata = None
+        self.cdata_before_trim = None
         self.cover_changed.connect(self.set_pixmap_from_data)
 
-        self.select_cover_button = QPushButton(QIcon(I('document_open.png')),
-                _('&Browse'), parent)
-        self.trim_cover_button = QPushButton(QIcon(I('trim.png')),
-                _('T&rim'), parent)
-        self.trim_cover_button.setToolTip(_(
+        class CB(QToolButton):
+
+            def __init__(self, text, icon=None, action=None):
+                QToolButton.__init__(self, parent)
+                self.setText(text)
+                if icon is not None:
+                    self.setIcon(QIcon(I(icon)))
+                self.setSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Preferred)
+                self.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+                if action is not None:
+                    self.clicked.connect(action)
+
+        self.select_cover_button = CB(_('&Browse'), 'document_open.png', self.select_cover)
+        self.trim_cover_button = b = CB(_('T&rim borders'), 'trim.png', self.trim_cover)
+        b.setToolTip(_(
             'Automatically detect and remove extra space at the cover\'s edges.\n'
             'Pressing it repeatedly can sometimes remove stubborn borders.'))
-        self.remove_cover_button = QPushButton(QIcon(I('trash.png')),
-            _('&Remove'), parent)
-
-        self.select_cover_button.clicked.connect(self.select_cover)
-        self.remove_cover_button.clicked.connect(self.remove_cover)
-        self.trim_cover_button.clicked.connect(self.trim_cover)
-
-        self.download_cover_button = QPushButton(_('Download co&ver'), parent)
-        self.generate_cover_button = QPushButton(_('&Generate cover'), parent)
-
-        self.download_cover_button.clicked.connect(self.download_cover)
-        self.generate_cover_button.clicked.connect(self.generate_cover)
+        b.m = m = QMenu()
+        b.setPopupMode(QToolButton.DelayedPopup)
+        m.addAction(QIcon(I('edit-undo.png')), _('Undo last trim'), self.undo_trim)
+        b.setMenu(m)
+        self.remove_cover_button = CB(_('&Remove'), 'trash.png', self.remove_cover)
 
+        self.download_cover_button = CB(_('Download co&ver'), 'arrow-down.png', self.download_cover)
+        self.generate_cover_button = CB(_('&Generate cover'), 'default_cover.png', self.generate_cover)
         self.buttons = [self.select_cover_button, self.remove_cover_button,
                 self.trim_cover_button, self.download_cover_button,
                 self.generate_cover_button]
@@ -926,6 +932,11 @@ class Cover(ImageView):  # {{{
         self.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,
             QSizePolicy.Preferred))
 
+    def undo_trim(self):
+        if self.cdata_before_trim:
+            self.current_val = self.cdata_before_trim
+            self.cdata_before_trim = None
+
     def frame_resized(self, ev):
         sz = ev.size()
         self.frame_size = (sz.width()//3, sz.height())
@@ -977,8 +988,8 @@ class Cover(ImageView):  # {{{
         im = Image()
         im.load(cdata)
         im.trim(tweaks['cover_trim_fuzz_value'])
-        cdata = im.export('png')
-        self.current_val = cdata
+        self.current_val = im.export('png')
+        self.cdata_before_trim = cdata
 
     def generate_cover(self, *args):
         from calibre.ebooks import calibre_cover
@@ -1014,6 +1025,7 @@ class Cover(ImageView):  # {{{
 
     def initialize(self, db, id_):
         self._cdata = None
+        self.cdata_before_trim = None
         self.current_val = db.cover(id_, index_is_id=True)
         self.original_val = self.current_val
 
@@ -1027,6 +1039,7 @@ class Cover(ImageView):  # {{{
             return self._cdata
         def fset(self, cdata):
             self._cdata = None
+            self.cdata_before_trim = None
             pm = QPixmap()
             if cdata:
                 pm.loadFromData(cdata)

From 54a56df2f26d8d6b127394238c6a94f2ab9f5222 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2013 13:46:18 +0530
Subject: [PATCH 0703/1154] MOBI Output: Fix some sub/super scripts missing

MOBI Output: Fix conversion of some super/sub scripts failling if they
are the first or last element in a paragraph. Fixes #1218858 [Subscripted text is generated by chance (MOBI)](https://bugs.launchpad.net/calibre/+bug/1218858)
---
 src/calibre/ebooks/mobi/mobiml.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/ebooks/mobi/mobiml.py b/src/calibre/ebooks/mobi/mobiml.py
index 26edeab24c..741b0d6a8d 100644
--- a/src/calibre/ebooks/mobi/mobiml.py
+++ b/src/calibre/ebooks/mobi/mobiml.py
@@ -525,6 +525,8 @@ class MobiMLizer(object):
                     else:
                         break
                 if vbstate.para is not None:
+                    if vbstate.para.text:
+                        vtag.text = vbstate.para.text
                     for child in vbstate.para:
                         vtag.append(child)
                 return

From 55b40e7e65b4f6ccd3c9cd2e8ac413366bda3a74 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 08:43:53 +0530
Subject: [PATCH 0704/1154] Fix chunking in libimobiledevice and remove
 obsolete logging code

---
 .../devices/idevice/libimobiledevice.py       | 196 +++++++++---------
 1 file changed, 99 insertions(+), 97 deletions(-)

diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py
index ba0f4d0f38..bf87d30449 100644
--- a/src/calibre/devices/idevice/libimobiledevice.py
+++ b/src/calibre/devices/idevice/libimobiledevice.py
@@ -182,9 +182,8 @@ class libiMobileDevice():
     # iDevice udid string
     UDID_SIZE = 40
 
-    def __init__(self, log=debug_print, verbose=False):
-        self.log = log
-        self.verbose = verbose
+    def __init__(self, **kwargs):
+        self.verbose = kwargs.get('verbose', False)
 
         self._log_location()
         self.afc = None
@@ -218,7 +217,7 @@ class libiMobileDevice():
             self.device_connected = True
 
         except libiMobileDeviceException as e:
-            self.log(e.value)
+            self._log(e.value)
             self.disconnect_idevice()
 
         return self.device_connected
@@ -240,12 +239,10 @@ class libiMobileDevice():
         handle = self._afc_file_open(str(dst), mode=mode)
         if handle is not None:
             success = self._afc_file_write(handle, content, mode=mode)
-            if self.verbose:
-                self.log(" success: %s" % success)
+            self._log(" success: %s" % success)
             self._afc_file_close(handle)
         else:
-            if self.verbose:
-                self.log(" could not create copy")
+            self._log(" could not create copy")
 
     def copy_from_idevice(self, src, dst):
         '''
@@ -255,13 +252,42 @@ class libiMobileDevice():
         dst: file object on local filesystem
         '''
         self._log_location("src='%s', dst='%s'" % (src, dst.name))
-        data = self.read(src, mode='rb')
-        dst.write(data)
-        dst.close()
+        BUFFER_SIZE = 10 * 1024 * 1024
+        data = None
+        mode = 'rb'
+        handle = self._afc_file_open(src, mode)
+        if handle is not None:
+            file_stats = self._afc_get_file_info(src)
+            file_size = int(file_stats['st_size'])
+            self._log("file_size: {:,} bytes".format(file_size))
+            if file_size > BUFFER_SIZE:
+                bytes_remaining = file_size
+                while bytes_remaining:
+                    if bytes_remaining > BUFFER_SIZE:
+                        self._log("copying {:,} byte chunk".format(BUFFER_SIZE))
+                        data = self._afc_file_read(handle, BUFFER_SIZE, mode)
+                        dst.write(data)
+                        bytes_remaining -= BUFFER_SIZE
+                    else:
+                        self._log("copying final {:,} bytes".format(bytes_remaining))
+                        data = self._afc_file_read(handle, bytes_remaining, mode)
+                        dst.write(data)
+                        bytes_remaining = 0
+            else:
+                self._log("copying %d {:,} bytes".format(file_size))
+                data = self._afc_file_read(handle, file_size, mode)
+                dst.write(data)
 
-        # Update timestamps to match
-        file_stats = self._afc_get_file_info(src)
-        os.utime(dst.name, (file_stats['st_mtime'], file_stats['st_mtime']))
+            self._afc_file_close(handle)
+            dst.close()
+
+            # Update timestamps to match
+            file_stats = self._afc_get_file_info(src)
+            os.utime(dst.name, (file_stats['st_mtime'], file_stats['st_mtime']))
+
+        else:
+            self._log(" could not open file")
+            raise libiMobileDeviceIOException("could not open file %s for reading" % repr(src))
 
     def disconnect_idevice(self):
         '''
@@ -275,8 +301,7 @@ class libiMobileDevice():
             self._idevice_free()
             self.device_mounted = False
         else:
-            if self.verbose:
-                self.log(" device already disconnected")
+            self._log(" device already disconnected")
 
     def dismount_ios_media_folder(self):
         self._afc_client_free()
@@ -412,8 +437,8 @@ class libiMobileDevice():
             self.plist_lib = cdll.LoadLibrary('libplist.dll')
 
         self._log_location(env)
-        self.log(" libimobiledevice loaded from '%s'" % self.lib._name)
-        self.log(" libplist loaded from '%s'" % self.plist_lib._name)
+        self._log(" libimobiledevice loaded from '%s'" % self.lib._name)
+        self._log(" libplist loaded from '%s'" % self.plist_lib._name)
 
         if False:
             self._idevice_set_debug_level(DEBUG)
@@ -455,7 +480,7 @@ class libiMobileDevice():
                 self._instproxy_client_free()
 
                 if not app_name in self.installed_apps:
-                    self.log(" '%s' not installed on this iDevice" % app_name)
+                    self._log(" '%s' not installed on this iDevice" % app_name)
                     self.disconnect_idevice()
                 else:
                     # Mount the app's Container
@@ -470,7 +495,7 @@ class libiMobileDevice():
                     self.device_mounted = True
 
             except libiMobileDeviceException as e:
-                self.log(e.value)
+                self._log(e.value)
                 self.disconnect_idevice()
 
         elif app_id:
@@ -487,7 +512,7 @@ class libiMobileDevice():
                 self.device_mounted = True
 
             except libiMobileDeviceException as e:
-                self.log(e.value)
+                self._log(e.value)
                 self.disconnect_idevice()
 
         if self.device_mounted:
@@ -524,12 +549,14 @@ class libiMobileDevice():
             self.device_mounted = True
 
         except libiMobileDeviceException as e:
-            self.log(e.value)
+            self._log(e.value)
             self.dismount_ios_media_folder()
 
     def read(self, path, mode='r'):
         '''
-        Convenience method to read from path on iDevice
+        Convenience method to read from path on iDevice to memory buffer.
+        Use for small files.
+        For larger files copied to local file, use copy_from_idevice()
         '''
         self._log_location("'%s', mode='%s'" % (path, mode))
 
@@ -540,8 +567,7 @@ class libiMobileDevice():
             data = self._afc_file_read(handle, int(file_stats['st_size']), mode)
             self._afc_file_close(handle)
         else:
-            if self.verbose:
-                self.log(" could not open file")
+            self._log(" could not open file")
             raise libiMobileDeviceIOException("could not open file %s for reading" % repr(path))
 
         return data
@@ -559,8 +585,8 @@ class libiMobileDevice():
         error = self.lib.afc_rename_path(byref(self.afc),
                                          str(from_name),
                                          str(to_name))
-        if error and self.verbose:
-            self.log(" ERROR: %s" % self.afc_error(error))
+        if error:
+            self._log(" ERROR: %s" % self.afc_error(error))
 
     def remove(self, path):
         '''
@@ -573,8 +599,8 @@ class libiMobileDevice():
 
         error = self.lib.afc_remove_path(byref(self.afc), str(path))
 
-        if error and self.verbose:
-            self.log(" ERROR: %s" % self.afc_error(error))
+        if error:
+            self._log(" ERROR: %s" % self.afc_error(error))
 
     def stat(self, path):
         '''
@@ -600,12 +626,10 @@ class libiMobileDevice():
         handle = self._afc_file_open(destination, mode=mode)
         if handle is not None:
             success = self._afc_file_write(handle, content, mode=mode)
-            if self.verbose:
-                self.log(" success: %s" % success)
+            self._log(" success: %s" % success)
             self._afc_file_close(handle)
         else:
-            if self.verbose:
-                self.log(" could not open file for writing")
+            self._log(" could not open file for writing")
             raise libiMobileDeviceIOException("could not open file for writing")
 
     # ~~~ AFC functions ~~~
@@ -624,8 +648,8 @@ class libiMobileDevice():
         self._log_location()
 
         error = self.lib.afc_client_free(byref(self.afc)) & 0xFFFF
-        if error and self.verbose:
-            self.log(" ERROR: %s" % self.afc_error(error))
+        if error:
+            self._log(" ERROR: %s" % self.afc_error(error))
 
     def _afc_client_new(self):
         '''
@@ -784,8 +808,8 @@ class libiMobileDevice():
 
         error = self.lib.afc_file_close(byref(self.afc),
                                         handle) & 0xFFFF
-        if error and self.verbose:
-            self.log(" ERROR: %s" % self._afc_error(error))
+        if error:
+            self._log(" ERROR: %s" % self._afc_error(error))
 
     def _afc_file_open(self, filename, mode='r'):
         '''
@@ -825,8 +849,7 @@ class libiMobileDevice():
                                            byref(handle)) & 0xFFFF
 
         if error:
-            if self.verbose:
-                self.log(" ERROR: %s" % self._afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
             return None
         else:
             return handle
@@ -863,15 +886,13 @@ class libiMobileDevice():
                                            size,
                                            byref(bytes_read)) & 0xFFFF
             if error:
-                if self.verbose:
-                    self.log(" ERROR: %s" % self._afc_error(error))
+                self._log(" ERROR: %s" % self._afc_error(error))
             return data
         else:
             data = create_string_buffer(size)
             error = self.lib.afc_file_read(byref(self.afc), handle, byref(data), size, byref(bytes_read))
             if error:
-                if self.verbose:
-                    self.log(" ERROR: %s" % self._afc_error(error))
+                self._log(" ERROR: %s" % self._afc_error(error))
             return data.value
 
     def _afc_file_write(self, handle, content, mode='w'):
@@ -911,8 +932,7 @@ class libiMobileDevice():
                                         len(content),
                                         byref(bytes_written)) & 0xFFFF
         if error:
-            if self.verbose:
-                self.log(" ERROR: %s" % self._afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
             return False
         return True
 
@@ -953,13 +973,11 @@ class libiMobileDevice():
                     device_info[item_list[i]] = item_list[i+1]
                 if self.verbose:
                     for key in device_info.keys():
-                        self.log("{0:>16}: {1}".format(key, device_info[key]))
+                        self._log("{0:>16}: {1}".format(key, device_info[key]))
             else:
-                if self.verbose:
-                    self.log(" ERROR: %s" % self._afc_error(error))
+                self._log(" ERROR: %s" % self._afc_error(error))
         else:
-            if self.verbose:
-                self.log(" ERROR: AFC not initialized, can't get device info")
+            self._log(" ERROR: AFC not initialized, can't get device info")
         return device_info
 
     def _afc_get_file_info(self, path):
@@ -993,8 +1011,7 @@ class libiMobileDevice():
                                            byref(infolist)) & 0xFFFF
         file_stats = {}
         if error:
-            if self.verbose:
-                self.log(" ERROR: %s" % self._afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
         else:
             num_items = 0
             item_list = []
@@ -1012,7 +1029,7 @@ class libiMobileDevice():
 
             if False and self.verbose:
                 for key in file_stats.keys():
-                    self.log(" %s: %s" % (key, file_stats[key]))
+                    self._log(" %s: %s" % (key, file_stats[key]))
         return file_stats
 
     def _afc_make_directory(self, path):
@@ -1031,8 +1048,7 @@ class libiMobileDevice():
         error = self.lib.afc_make_directory(byref(self.afc),
                                             str(path)) & 0xFFFF
         if error:
-            if self.verbose:
-                self.log(" ERROR: %s" % self._afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
 
         return error
 
@@ -1061,8 +1077,7 @@ class libiMobileDevice():
                                             str(directory),
                                             byref(dirs)) & 0xFFFF
         if error:
-            if self.verbose:
-                self.log(" ERROR: %s" % self._afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
         else:
             num_dirs = 0
             dir_list = []
@@ -1110,8 +1125,7 @@ class libiMobileDevice():
         error = self.lib.house_arrest_client_free(byref(self.house_arrest)) & 0xFFFF
         if error:
             error = error - 0x10000
-            if self.verbose:
-                self.log(" ERROR: %s" % self._house_arrest_error(error))
+            self._log(" ERROR: %s" % self._house_arrest_error(error))
 
     def _house_arrest_client_new(self):
         '''
@@ -1144,12 +1158,11 @@ class libiMobileDevice():
             raise libiMobileDeviceException(error_description)
         else:
             if not house_arrest_client_t:
-                if self.verbose:
-                    self.log(" Could not start document sharing service")
-                    self.log("  1: Bad command")
-                    self.log("  2: Bad device")
-                    self.log("  3. Connection refused")
-                    self.log("  6. Bad version")
+                self._log(" Could not start document sharing service")
+                self._log("  1: Bad command")
+                self._log("  2: Bad device")
+                self._log("  3. Connection refused")
+                self._log("  6. Bad version")
                 return None
             else:
                 return house_arrest_client_t.contents
@@ -1204,11 +1217,9 @@ class libiMobileDevice():
 
         # To determine success, we need to inspect the returned plist
         if 'Status' in result:
-            if self.verbose:
-                self.log("          STATUS: %s" % result['Status'])
+            self._log("          STATUS: %s" % result['Status'])
         elif 'Error' in result:
-            if self.verbose:
-                self.log("           ERROR: %s" % result['Error'])
+            self._log("           ERROR: %s" % result['Error'])
             raise libiMobileDeviceException(result['Error'])
 
     def _house_arrest_send_command(self, command=None, appid=None):
@@ -1237,8 +1248,7 @@ class libiMobileDevice():
         commands = ['VendContainer', 'VendDocuments']
 
         if command not in commands:
-            if self.verbose:
-                self.log(" ERROR: available commands: %s" % ', '.join(commands))
+            self._log(" ERROR: available commands: %s" % ', '.join(commands))
             return
 
         _command = create_string_buffer(command)
@@ -1291,8 +1301,7 @@ class libiMobileDevice():
 
         if error:
             error = error - 0x10000
-            if self.verbose:
-                self.log(" ERROR: %s" % self._idevice_error(error))
+            self._log(" ERROR: %s" % self._idevice_error(error))
 
     def _idevice_get_device_list(self):
         '''
@@ -1313,12 +1322,10 @@ class libiMobileDevice():
         if error:
             error = error - 0x10000
             if error == -3:
-                if self.verbose:
-                    self.log(" no connected devices")
+                self._log(" no connected devices")
             else:
                 device_list = None
-                if self.verbose:
-                    self.log(" ERROR: %s" % self._idevice_error(error))
+                self._log(" ERROR: %s" % self._idevice_error(error))
         else:
             index = 0
             while devices[index]:
@@ -1326,8 +1333,7 @@ class libiMobileDevice():
                 if devices[index].contents.value not in device_list:
                     device_list.append(devices[index].contents.value)
                 index += 1
-            if self.verbose:
-                self.log(" %s" % repr(device_list))
+            self._log(" %s" % repr(device_list))
         #self.lib.idevice_device_list_free()
         return device_list
 
@@ -1358,12 +1364,11 @@ class libiMobileDevice():
                 desc=self._idevice_error(error))
             raise libiMobileDeviceException(error_description)
         else:
-            if self.verbose:
-                if idevice_t.contents.conn_type == 1:
-                    self.log("       conn_type: CONNECTION_USBMUXD")
-                else:
-                    self.log("       conn_type: Unknown (%d)" % idevice_t.contents.conn_type)
-                self.log("            udid: %s" % idevice_t.contents.udid)
+            if idevice_t.contents.conn_type == 1:
+                self._log("       conn_type: CONNECTION_USBMUXD")
+            else:
+                self._log("       conn_type: Unknown (%d)" % idevice_t.contents.conn_type)
+            self._log("            udid: %s" % idevice_t.contents.udid)
             return idevice_t.contents
 
     def _idevice_set_debug_level(self, debug):
@@ -1400,7 +1405,7 @@ class libiMobileDevice():
         else:
             # Get the number of apps
             #app_count = self.lib.plist_array_get_size(apps)
-            #self.log("       app_count: %d" % app_count)
+            #self._log("       app_count: %d" % app_count)
 
             # Convert the app plist to xml
             xml = POINTER(c_void_p)()
@@ -1416,9 +1421,9 @@ class libiMobileDevice():
                 elif 'CFBundleExecutable' in app:
                     app_name = app['CFBundleExecutable']
                 else:
-                    self.log(" unable to find app name in bundle:")
+                    self._log(" unable to find app name in bundle:")
                     for key in sorted(app.keys()):
-                        self.log("  %s   %s" % (repr(key), repr(app[key])))
+                        self._log("  %s   %s" % (repr(key), repr(app[key])))
                     continue
 
                 if not applist:
@@ -1434,7 +1439,7 @@ class libiMobileDevice():
             if self.verbose:
                 for app in sorted(installed_apps, key=lambda s: s.lower()):
                     attrs = {'app_name': app, 'app_id': installed_apps[app]['app_id'], 'app_version': installed_apps[app]['app_version']}
-                    self.log("  {app_name:<30}  {app_id:<40} {app_version}".format(**attrs))
+                    self._log("  {app_name:<30}  {app_id:<40} {app_version}".format(**attrs))
 
         self.plist_lib.plist_free(apps)
         return installed_apps
@@ -1657,8 +1662,7 @@ class libiMobileDevice():
             raise libiMobileDeviceException(error_description)
         else:
             device_name = device_name_p.contents.value
-            if self.verbose:
-                self.log("     device_name: %s" % device_name)
+            self._log("     device_name: %s" % device_name)
         return device_name
 
     def _lockdown_get_value(self, requested_items=[]):
@@ -1806,11 +1810,9 @@ class libiMobileDevice():
         if self.control:
             error = self.lib.lockdownd_goodbye(byref(self.control)) & 0xFFFF
             error = error - 0x10000
-            if self.verbose:
-                self.log(" ERROR: %s" % self.error_lockdown(error))
+            self._log(" ERROR: %s" % self.error_lockdown(error))
         else:
-            if self.verbose:
-                self.log(" connection already closed")
+            self._log(" connection already closed")
 
     def _lockdown_start_service(self, service_name):
         '''
@@ -1869,5 +1871,5 @@ class libiMobileDevice():
         if len(args) > 1:
             arg2 = args[1]
 
-        self.log(self.LOCATION_TEMPLATE.format(cls=self.__class__.__name__,
-                 func=sys._getframe(1).f_code.co_name, arg1=arg1, arg2=arg2))
+        debug_print(self.LOCATION_TEMPLATE.format(cls=self.__class__.__name__,
+            func=sys._getframe(1).f_code.co_name, arg1=arg1, arg2=arg2))

From 807213d5d05af9d1543036ea4fc26eb2a4a4d352 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 08:54:03 +0530
Subject: [PATCH 0705/1154] Update Countryfile

---
 recipes/countryfile.recipe | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/recipes/countryfile.recipe b/recipes/countryfile.recipe
index 717f81afce..f0680b5434 100644
--- a/recipes/countryfile.recipe
+++ b/recipes/countryfile.recipe
@@ -20,27 +20,22 @@ class AdvancedUserRecipe1325006965(BasicNewsRecipe):
     #article_already_exists = False
     #feed_hash = ''
     def get_cover_url(self):
-            soup = self.index_to_soup('http://www.countryfile.com/magazine')
-            cov = soup.find(attrs={'class' : re.compile('imagecache imagecache-250px_wide')})#'width' : '160',
-            print '&&&&&&&& ',cov,' ***'
-            cov=str(cov)
-            #cov2 =  re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', cov)
-            cov2 =  re.findall('/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', cov)
+        soup = self.index_to_soup('http://www.countryfile.com/magazine')
+        cov = soup.find(attrs={'class' : re.compile('imagecache imagecache-250px')})  # 'width' : '160',
 
-            cov2 = str(cov2)
-            cov2= "http://www.countryfile.com"+cov2[2:len(cov2)-8]
-
-            print '******** ',cov2,' ***'
-             # try to get cover - if can't get known cover
-            br = browser()
-
-            br.set_handle_redirect(False)
-            try:
-                br.open_novisit(cov2)
-                cover_url = cov2
-            except:
-                  cover_url = 'http://www.countryfile.com/sites/default/files/imagecache/160px_wide/cover/2_1.jpg'
-            return cover_url
+        cov=str(cov)
+        cov=cov[10:]
+        cov=cov[:-135]
+        br = browser()
+        br.set_handle_redirect(False)
+        try:
+            br.open_novisit(cov)
+            cover_url = cov
+        except:
+            cover_url = 'http://www.countryfile.com/sites/default/files/imagecache/160px_wide/cover/2_1.jpg'
+        return cover_url
+    preprocess_regexps = [
+        (re.compile(r' \| Countryfile.com', re.IGNORECASE | re.DOTALL), lambda match: '')]
     remove_tags    = [
                              # dict(attrs={'class' : ['player']}),
 
@@ -48,6 +43,5 @@ class AdvancedUserRecipe1325006965(BasicNewsRecipe):
     feeds          = [
     (u'Homepage', u'http://www.countryfile.com/rss/home'),
     (u'Country News', u'http://www.countryfile.com/rss/news'),
-            (u'Countryside', u'http://www.countryfile.com/rss/countryside'),
+    (u'Countryside', u'http://www.countryfile.com/rss/countryside'),
             ]
-

From 8d693050a5d93deba6cc5f763b9a1f7a50e5ea83 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 09:23:05 +0530
Subject: [PATCH 0706/1154] Conversion: Handle invalid font-family when
 subsetting

Conversion: Fix font declarations with invalid font-family values
causing conversion to abort when subsetting is enabled.
---
 src/calibre/ebooks/oeb/transforms/subset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/transforms/subset.py b/src/calibre/ebooks/oeb/transforms/subset.py
index 96170bd49c..a079f1d4fc 100644
--- a/src/calibre/ebooks/oeb/transforms/subset.py
+++ b/src/calibre/ebooks/oeb/transforms/subset.py
@@ -27,7 +27,7 @@ def get_font_properties(rule, default=None):
             val = s.getProperty(q).propertyValue[0]
             val = getattr(val, g)
             if q == 'font-family':
-                val = [x.value for x in s.getProperty(q).propertyValue]
+                val = [x.value for x in s.getProperty(q).propertyValue if hasattr(x.value, 'lower')]
                 if val and val[0] == 'inherit':
                     val = None
         except (IndexError, KeyError, AttributeError, TypeError, ValueError):

From 9d848e14a78c3992f599ff550faa9e4607b88ff2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 09:26:10 +0530
Subject: [PATCH 0707/1154] Metadata editor: Fix adding an image to an empty
 comments block not working

---
 src/calibre/gui2/comments_editor.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index 5ead06138a..0d2e6e779a 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -308,14 +308,14 @@ class EditorWidget(QWebView):  # {{{
 
         def fget(self):
             ans = u''
-            check = unicode(self.page().mainFrame().toPlainText()).strip()
-            if not check:
-                return ans
             try:
+                check = unicode(self.page().mainFrame().toPlainText()).strip()
                 raw = unicode(self.page().mainFrame().toHtml())
                 raw = xml_to_unicode(raw, strip_encoding_pats=True,
                                     resolve_entities=True)[0]
                 raw = self.comments_pat.sub('', raw)
+                if not check and '<img' not in raw.lower():
+                    return ans
 
                 try:
                     root = html.fromstring(raw)

From 528a1617dedc45e79fc528e9c3463c3036d80714 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 09:32:27 +0530
Subject: [PATCH 0708/1154] Change thumbnail cache to use a LIFO queue

This should fix the problem of covers being rendered slowly at the end
when scrolling through a very large number of covers very quickly.
---
 src/calibre/gui2/library/alternate_views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index d805a682e7..63f0dc42cd 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -10,7 +10,7 @@ import itertools, operator, os
 from types import MethodType
 from time import time
 from threading import Event, Thread
-from Queue import Queue
+from Queue import LifoQueue
 from functools import wraps, partial
 from textwrap import wrap
 
@@ -313,7 +313,7 @@ class CoverDelegate(QStyledItemDelegate):
         self.animation.setDuration(500)
         self.set_dimensions()
         self.cover_cache = CoverCache(limit=gprefs['cover_grid_cache_size'])
-        self.render_queue = Queue()
+        self.render_queue = LifoQueue()
         self.animating = None
         self.highlight_color = QColor(Qt.white)
 

From f0de577d0dc5b8307425d031beb782af1595a384 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 10:23:48 +0530
Subject: [PATCH 0709/1154] ...

---
 src/calibre/gui2/library/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 5661ec96e7..34896c413f 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -183,7 +183,6 @@ class BooksView(QTableView):  # {{{
 
         setup_dnd_interface(self)
         self.setAlternatingRowColors(True)
-        self.setSelectionBehavior(self.SelectRows)
         self.setShowGrid(False)
         self.setWordWrap(False)
 

From 42d6ffc249f78aea1ebcc2272f8566cd711b23bb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 10:31:50 +0530
Subject: [PATCH 0710/1154] ...

---
 src/calibre/gui2/library/alternate_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 63f0dc42cd..cd8f78202d 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -750,7 +750,7 @@ class GridView(QListView):
 
     def handle_mouse_press_event(self, ev):
         if QApplication.keyboardModifiers() & Qt.ShiftModifier:
-            # Shift-Click in QLitView is broken. It selects extra items in
+            # Shift-Click in QListView is broken. It selects extra items in
             # various circumstances, for example, click on some item in the
             # middle of a row then click on an item in the next row, all items
             # in the first row will be selected instead of only items after the

From f6eb9b0ba56194400e021ca9910cc60b0bf78b25 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 11:24:02 +0530
Subject: [PATCH 0711/1154] PDF Output: Accept commas in custom paper size
 specification

Used in some European countries.
---
 src/calibre/ebooks/pdf/render/from_html.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/pdf/render/from_html.py b/src/calibre/ebooks/pdf/render/from_html.py
index ad27635c59..aaa4fbd5a2 100644
--- a/src/calibre/ebooks/pdf/render/from_html.py
+++ b/src/calibre/ebooks/pdf/render/from_html.py
@@ -41,8 +41,8 @@ def get_page_size(opts, for_comic=False):  # {{{
             width, sep, height = opts.custom_size.partition('x')
             if height:
                 try:
-                    width = float(width)
-                    height = float(height)
+                    width = float(width.replace(',', '.'))
+                    height = float(height.replace(',', '.'))
                 except:
                     pass
                 else:

From 86564b27e9ad0d065bda36ddf81ada5b85cd99c7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 12:53:13 +0530
Subject: [PATCH 0712/1154] Fix test breakage caused by code to remove rating=0
 entries

---
 src/calibre/db/tests/legacy.py   |  15 +++++++++++++--
 src/calibre/db/tests/metadata.db | Bin 245760 -> 245760 bytes
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 4baf1a627e..6ffb7f987d 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -51,7 +51,8 @@ def run_funcs(self, db, ndb, funcs):
             if meth[0] in {'!', '@', '#', '+', '$', '-', '%'}:
                 if meth[0] != '+':
                     fmt = {'!':dict, '@':lambda x:frozenset(x or ()), '#':lambda x:set((x or '').split(',')),
-                           '$':lambda x:set(tuple(y) for y in x), '-':lambda x:None, '%':lambda x: set((x or '').split(','))}[meth[0]]
+                           '$':lambda x:set(tuple(y) for y in x), '-':lambda x:None,
+                           '%':lambda x: set((x or '').split(','))}[meth[0]]
                 else:
                     fmt = args[-1]
                     args = args[:-1]
@@ -66,6 +67,16 @@ class LegacyTest(BaseTest):
 
     def test_library_wide_properties(self):  # {{{
         'Test library wide properties'
+        def to_unicode(x):
+            if isinstance(x, bytes):
+                return x.decode('utf-8')
+            if isinstance(x, dict):
+                # We ignore the key rec_index, since it is not stable for
+                # custom columns (it is created by iterating over a dict)
+                return {k.decode('utf-8') if isinstance(k, bytes) else k:to_unicode(v)
+                        for k, v in x.iteritems() if k != 'rec_index'}
+            return x
+
         def get_props(db):
             props = ('user_version', 'is_second_db', 'library_id', 'field_metadata',
                     'custom_column_label_map', 'custom_column_num_map', 'library_path', 'dbpath')
@@ -73,7 +84,7 @@ class LegacyTest(BaseTest):
             ans = {x:getattr(db, x) for x in props}
             ans.update({x:getattr(db, x)() for x in fprops})
             ans['all_ids'] = frozenset(db.all_ids())
-            return ans
+            return to_unicode(ans)
 
         old = self.init_old()
         oldvals = get_props(old)
diff --git a/src/calibre/db/tests/metadata.db b/src/calibre/db/tests/metadata.db
index 88a76ac41091f0ca305d89add74c4f6ac9138a60..75402c873b1476d0b3611b9be6cb1f0836402747 100644
GIT binary patch
delta 9666
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

delta 11265
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


From 9ec829f46c20bf6ceef1b853daa846930780bdb7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Sep 2013 15:36:21 +0530
Subject: [PATCH 0713/1154] Speed up sorting when book list is showing a subset

Speed up sorting when the book list is showing a restricted set of
books, such as when the results of a search are displayed or a virtual
library is used. Fixes #1217622 [calculated column sorts update the entire database while inside a Virtual Library](https://bugs.launchpad.net/calibre/+bug/1217622)
---
 src/calibre/db/view.py                       | 57 ++++++++++++++++----
 src/calibre/devices/kindle/driver.py         |  2 +-
 src/calibre/gui2/library/models.py           |  2 +-
 src/calibre/gui2/search_restriction_mixin.py |  2 +-
 src/calibre/gui2/tag_browser/model.py        |  2 +-
 src/calibre/library/caches.py                |  6 +--
 src/calibre/library/catalogs/epub_mobi.py    |  2 +-
 src/calibre/library/server/ajax.py           |  2 +-
 src/calibre/library/server/browse.py         |  2 +-
 src/calibre/library/server/cache.py          |  2 +-
 src/calibre/library/server/mobile.py         |  2 +-
 src/calibre/library/server/xml.py            |  2 +-
 12 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 17fd624057..80453e6878 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -7,13 +7,14 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import weakref
+import weakref, operator
 from functools import partial
 from itertools import izip, imap
 from future_builtins import map
 
 from calibre.ebooks.metadata import title_sort
 from calibre.utils.config_base import tweaks
+from calibre.db.write import uniq
 
 def sanitize_sort_field_name(field_metadata, field):
     field = field_metadata.search_term_to_field_key(field.lower().strip())
@@ -123,6 +124,12 @@ class View(object):
 
         self._map = tuple(sorted(self.cache.all_book_ids()))
         self._map_filtered = tuple(self._map)
+        self.full_map_is_sorted = True
+        self.sort_history = [('id', True)]
+
+    def add_to_sort_history(self, items):
+        self.sort_history = uniq((list(items) + list(self.sort_history)),
+                                 operator.itemgetter(0))[:tweaks['maximum_resort_levels']]
 
     def count(self):
         return len(self._map)
@@ -218,7 +225,7 @@ class View(object):
             ans = [':::'.join((adata[aid]['name'], adata[aid]['sort'], adata[aid]['link'])) for aid in ids if aid in adata]
         return ':#:'.join(ans) if ans else default_value
 
-    def multisort(self, fields=[], subsort=False, only_ids=None):
+    def _do_sort(self, ids_to_sort, fields=(), subsort=False):
         fields = [(sanitize_sort_field_name(self.field_metadata, x), bool(y)) for x, y in fields]
         keys = self.field_metadata.sortable_field_keys()
         fields = [x for x in fields if x[0] in keys]
@@ -227,11 +234,16 @@ class View(object):
         if not fields:
             fields = [('timestamp', False)]
 
-        sorted_book_ids = self.cache.multisort(
-            fields, ids_to_sort=self._map if only_ids is None else only_ids,
+        return self.cache.multisort(
+            fields, ids_to_sort=ids_to_sort,
             virtual_fields={'marked':MarkedVirtualField(self.marked_ids)})
+
+    def multisort(self, fields=[], subsort=False, only_ids=None):
+        sorted_book_ids = self._do_sort(self._map if only_ids is None else only_ids, fields=fields, subsort=subsort)
         if only_ids is None:
             self._map = tuple(sorted_book_ids)
+            self.full_map_is_sorted = True
+            self.add_to_sort_history(fields)
             if len(self._map_filtered) == len(self._map):
                 self._map_filtered = tuple(self._map)
             else:
@@ -241,9 +253,16 @@ class View(object):
             smap = {book_id:i for i, book_id in enumerate(sorted_book_ids)}
             only_ids.sort(key=smap.get)
 
-    def search(self, query, return_matches=False):
+    def incremental_sort(self, fields=(), subsort=False):
+        if len(self._map) == len(self._map_filtered):
+            return self.multisort(fields=fields, subsort=subsort)
+        self._map_filtered = tuple(self._do_sort(self._map_filtered, fields=fields, subsort=subsort))
+        self.full_map_is_sorted = False
+        self.add_to_sort_history(fields)
+
+    def search(self, query, return_matches=False, sort_results=True):
         ans = self.search_getting_ids(query, self.search_restriction,
-                                      set_restriction_count=True)
+                                      set_restriction_count=True, sort_results=sort_results)
         if return_matches:
             return ans
         self._map_filtered = tuple(ans)
@@ -258,7 +277,7 @@ class View(object):
             return restriction
 
     def search_getting_ids(self, query, search_restriction,
-                           set_restriction_count=False, use_virtual_library=True):
+                           set_restriction_count=False, use_virtual_library=True, sort_results=True):
         if use_virtual_library:
             search_restriction = self._build_restriction_string(search_restriction)
         q = ''
@@ -271,10 +290,28 @@ class View(object):
         if not q:
             if set_restriction_count:
                 self.search_restriction_book_count = len(self._map)
-            return list(self._map)
+            rv = list(self._map)
+            if sort_results and not self.full_map_is_sorted:
+                rv = self._do_sort(rv, fields=self.sort_history)
+                self._map = tuple(rv)
+                self.full_map_is_sorted = True
+            return rv
         matches = self.cache.search(
             query, search_restriction, virtual_fields={'marked':MarkedVirtualField(self.marked_ids)})
-        rv = [x for x in self._map if x in matches]
+        if len(matches) == len(self._map):
+            rv = list(self._map)
+        else:
+            rv = [x for x in self._map if x in matches]
+        if sort_results and not self.full_map_is_sorted:
+            # We need to sort the search results
+            if matches.issubset(frozenset(self._map_filtered)):
+                rv = [x for x in self._map_filtered if x in matches]
+            else:
+                rv = self._do_sort(rv, fields=self.sort_history)
+            if len(matches) == len(self._map):
+                # We have sorted all ids, update self._map
+                self._map = tuple(rv)
+                self.full_map_is_sorted = True
         if set_restriction_count and q == search_restriction:
             self.search_restriction_book_count = len(rv)
         return rv
@@ -338,6 +375,8 @@ class View(object):
     def refresh(self, field=None, ascending=True, clear_caches=True, do_search=True):
         self._map = tuple(sorted(self.cache.all_book_ids()))
         self._map_filtered = tuple(self._map)
+        self.full_map_is_sorted = True
+        self.sort_history = [('id', True)]
         if clear_caches:
             self.cache.clear_caches()
         if field is not None:
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index 4e083fbe04..214f8cc65c 100644
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -270,7 +270,7 @@ class KINDLE(USBMS):
         elif bm.type == 'kindle_clippings':
             # Find 'My Clippings' author=Kindle in database, or add
             last_update = 'Last modified %s' % strftime(u'%x %X',bm.value['timestamp'].timetuple())
-            mc_id = list(db.data.search_getting_ids('title:"My Clippings"', ''))
+            mc_id = list(db.data.search_getting_ids('title:"My Clippings"', '', sort_results=False))
             if mc_id:
                 db.add_format_with_hooks(mc_id[0], 'TXT', bm.value['path'],
                         index_is_id=True)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index ebf5e1d188..f3b8cbde56 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -407,7 +407,7 @@ class BooksModel(QAbstractTableModel):  # {{{
 
     def _sort(self, label, order, reset):
         self.about_to_be_sorted.emit(self.db.id)
-        self.db.sort(label, order)
+        self.db.data.incremental_sort([(label, order)])
         if reset:
             self.reset()
         self.sorted_on = (label, order)
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 52e456c4dc..2ab5959800 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -285,7 +285,7 @@ class CreateVirtualLibrary(QDialog):  # {{{
 
         try:
             db = self.gui.library_view.model().db
-            recs = db.data.search_getting_ids('', v, use_virtual_library=False)
+            recs = db.data.search_getting_ids('', v, use_virtual_library=False, sort_results=False)
         except ParseException as e:
             error_dialog(self.gui, _('Invalid search'),
                          _('The search in the search box is not valid'),
diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py
index 48ac9045dd..60081fd5b5 100644
--- a/src/calibre/gui2/tag_browser/model.py
+++ b/src/calibre/gui2/tag_browser/model.py
@@ -846,7 +846,7 @@ class TagsModel(QAbstractItemModel):  # {{{
             try:
                 data = self.db.get_categories(sort=sort,
                         icon_map=self.category_icon_map,
-                        ids=self.db.search('', return_matches=True))
+                        ids=self.db.search('', return_matches=True, sort_results=False))
             except:
                 data = self.db.get_categories(sort=sort, icon_map=self.category_icon_map)
                 self.restriction_error.emit()
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index a7ceb706f7..33c2f82707 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -816,9 +816,9 @@ class ResultCache(SearchQueryParser):  # {{{
                 current_candidates -= matches
         return matches
 
-    def search(self, query, return_matches=False):
+    def search(self, query, return_matches=False, sort_results=True):
         ans = self.search_getting_ids(query, self.search_restriction,
-                                      set_restriction_count=True)
+                                      set_restriction_count=True, sort_results=sort_results)
         if return_matches:
             return ans
         self._map_filtered = ans
@@ -833,7 +833,7 @@ class ResultCache(SearchQueryParser):  # {{{
             return restriction
 
     def search_getting_ids(self, query, search_restriction,
-                           set_restriction_count=False, use_virtual_library=True):
+                           set_restriction_count=False, use_virtual_library=True, sort_results=True):
         if use_virtual_library:
             search_restriction = self._build_restriction_string(search_restriction)
         q = ''
diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py
index 673d764593..e2c80b8cdc 100644
--- a/src/calibre/library/catalogs/epub_mobi.py
+++ b/src/calibre/library/catalogs/epub_mobi.py
@@ -447,7 +447,7 @@ class EPUB_MOBI(CatalogPlugin):
             try:
                 search_text = 'title:"%s" author:%s' % (
                         opts.catalog_title.replace('"', '\\"'), 'calibre')
-                matches = db.search(search_text, return_matches=True)
+                matches = db.search(search_text, return_matches=True, sort_results=False)
                 if matches:
                     cpath = db.cover(matches[0], index_is_id=True, as_path=True)
                     if cpath and os.path.exists(cpath):
diff --git a/src/calibre/library/server/ajax.py b/src/calibre/library/server/ajax.py
index 05ddfc5015..80ead51d00 100644
--- a/src/calibre/library/server/ajax.py
+++ b/src/calibre/library/server/ajax.py
@@ -594,7 +594,7 @@ class AjaxServer(object):
 
         if isbytestring(query):
             query = query.decode('UTF-8')
-        ids = self.db.search_getting_ids(query.strip(), self.search_restriction)
+        ids = self.db.search_getting_ids(query.strip(), self.search_restriction, sort_results=False)
         ids = list(ids)
         self.db.data.multisort(fields=[(sfield, sort_order == 'asc')], subsort=True,
                 only_ids=ids)
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index a770f19856..5e98d70c27 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -922,7 +922,7 @@ class BrowseServer(object):
         import random
         try:
             book_id = random.choice(self.db.search_getting_ids(
-                '', self.search_restriction))
+                '', self.search_restriction, sort_results=False))
         except IndexError:
             raise cherrypy.HTTPError(404, 'This library has no books')
         ans = self.browse_render_details(book_id, add_random_button=True)
diff --git a/src/calibre/library/server/cache.py b/src/calibre/library/server/cache.py
index 2ad7b543cb..2d27962dcc 100644
--- a/src/calibre/library/server/cache.py
+++ b/src/calibre/library/server/cache.py
@@ -21,7 +21,7 @@ class Cache(object):
     def search_cache(self, search):
         old = self._search_cache.pop(search, None)
         if old is None or old[0] <= self.db.last_modified():
-            matches = self.db.data.search_getting_ids(search, self.search_restriction)
+            matches = self.db.data.search_getting_ids(search, self.search_restriction, sort_results=False)
             if not matches:
                 matches = []
             self._search_cache[search] = (utcnow(), frozenset(matches))
diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py
index 767a48a9d9..a18109c924 100644
--- a/src/calibre/library/server/mobile.py
+++ b/src/calibre/library/server/mobile.py
@@ -222,7 +222,7 @@ class MobileServer(object):
             search = ''
         if isbytestring(search):
             search = search.decode('UTF-8')
-        ids = self.db.search_getting_ids(search.strip(), self.search_restriction)
+        ids = self.db.search_getting_ids(search.strip(), self.search_restriction, sort_results=False)
         FM = self.db.FIELD_MAP
         items = [r for r in iter(self.db) if r[FM['id']] in ids]
         if sort is not None:
diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py
index 18ddf6bb43..091ec43f36 100644
--- a/src/calibre/library/server/xml.py
+++ b/src/calibre/library/server/xml.py
@@ -53,7 +53,7 @@ class XMLServer(object):
         if isbytestring(search):
             search = search.decode('UTF-8')
 
-        ids = self.db.search_getting_ids(search.strip(), self.search_restriction)
+        ids = self.db.search_getting_ids(search.strip(), self.search_restriction, sort_results=False)
 
         FM = self.db.FIELD_MAP
 

From b00e3b0a3eb3108b89bd13da6b4ec963bba615fc Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 2 Sep 2013 13:29:44 +0200
Subject: [PATCH 0714/1154] Change quickview to not sort search results. They
 are sorted in QV's table.

---
 src/calibre/gui2/dialogs/quickview.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py
index 7ea75bc6ae..8763501391 100644
--- a/src/calibre/gui2/dialogs/quickview.py
+++ b/src/calibre/gui2/dialogs/quickview.py
@@ -215,7 +215,8 @@ class Quickview(QDialog, Ui_Quickview):
             sv = selected_item
         sv = sv.replace('"', r'\"')
         self.last_search = self.current_key+':"=' + sv + '"'
-        books = self.db.search(self.last_search, return_matches=True)
+        books = self.db.search(self.last_search, return_matches=True,
+                               sort_results=False)
 
         self.books_table.setRowCount(len(books))
         self.books_label.setText(_('Books with selected item "{0}": {1}').

From 4dd983542e6cdae7f4a0c5e81f11aa69b56c8250 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 2 Sep 2013 14:58:42 +0200
Subject: [PATCH 0715/1154] Increase timeout for detecting disconnected clients
 to avoid problems when there are many thousands of books on the device.

---
 src/calibre/devices/smart_device_app/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index f8d679152d..33b3b6a74c 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -213,7 +213,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     # Some network protocol constants
     BASE_PACKET_LEN             = 4096
     PROTOCOL_VERSION            = 1
-    MAX_CLIENT_COMM_TIMEOUT     = 60.0 # Wait at most N seconds for an answer
+    MAX_CLIENT_COMM_TIMEOUT     = 300.0 # Wait at most N seconds for an answer
     MAX_UNSUCCESSFUL_CONNECTS   = 5
 
     SEND_NOOP_EVERY_NTH_PROBE   = 5

From e687b24c1fde53391ae659f4fa904949d154c32e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 10:05:17 +0530
Subject: [PATCH 0716/1154] Add speculative T3 device names to the driver

---
 src/calibre/devices/prst1/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py
index d2482d51a0..0bf1cbede8 100644
--- a/src/calibre/devices/prst1/driver.py
+++ b/src/calibre/devices/prst1/driver.py
@@ -51,10 +51,10 @@ class PRST1(USBMS):
 
     VENDOR_NAME        = 'SONY'
     WINDOWS_MAIN_MEM   = re.compile(
-            r'(PRS-T(1|2|2N)&)'
+            r'(PRS-T(1|2|2N|3)&)'
             )
     WINDOWS_CARD_A_MEM = re.compile(
-            r'(PRS-T(1|2|2N)_{1,2}SD&)'
+            r'(PRS-T(1|2|2N|3)_{1,2}SD&)'
             )
     MAIN_MEMORY_VOLUME_LABEL = 'SONY Reader Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'SONY Reader Storage Card'

From 2023fb01d0b787d201231073540a3e8cf2c27ddb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 10:34:54 +0530
Subject: [PATCH 0717/1154] newdb: Replace dump and restore with vacuum

apsw has various issues with dump and restore, so replace it with
vacuum. Fixes #1217988 [Database integrity issue with V 1.0.0](https://bugs.launchpad.net/calibre/+bug/1217988)
---
 src/calibre/db/backend.py                 |  5 +++++
 src/calibre/db/cache.py                   |  4 ++++
 src/calibre/gui2/dialogs/check_library.py | 13 +++++--------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 5c0ffcf022..1dab3cb2f5 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -995,6 +995,8 @@ class DB(object):
             shell = Shell(db=self.conn, stdout=buf)
             shell.process_command('.dump')
             sql = buf.getvalue()
+            del shell
+            del buf
 
         with TemporaryFile(suffix='_tmpdb.db', dir=os.path.dirname(self.dbpath)) as tmpdb:
             callback(_('Restoring database from SQL') + '...')
@@ -1008,6 +1010,9 @@ class DB(object):
             finally:
                 self.reopen()
 
+    def vacuum(self):
+        self.conn.execute('VACUUM')
+
     @dynamic_property
     def user_version(self):
         doc = 'The user version of this database'
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index e16079efb2..40840f5910 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1715,6 +1715,10 @@ class Cache(object):
     def dump_and_restore(self, callback=None, sql=None):
         return self.backend.dump_and_restore(callback=callback, sql=sql)
 
+    @write_api
+    def vacuum(self):
+        self.backend.vacuum()
+
     @write_api
     def close(self):
         self.backend.close()
diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index 2cb15c50d1..8c5e89ec2e 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -24,18 +24,15 @@ class DBCheck(QDialog):  # {{{
         QDialog.__init__(self, parent)
         self.l = QVBoxLayout()
         self.setLayout(self.l)
-        self.l1 = QLabel(_('Checking database integrity') + ' ' +
+        self.l1 = QLabel(_('Vacuuming database to improve performance.') + ' ' +
                          _('This will take a while, please wait...'))
-        self.setWindowTitle(_('Checking database integrity'))
+        self.setWindowTitle(_('Vacuuming...'))
         self.l1.setWordWrap(True)
         self.l.addWidget(self.l1)
         self.msg = QLabel('')
         self.update_msg.connect(self.msg.setText, type=Qt.QueuedConnection)
         self.l.addWidget(self.msg)
         self.msg.setWordWrap(True)
-        self.bb = QDialogButtonBox(QDialogButtonBox.Cancel)
-        self.l.addWidget(self.bb)
-        self.bb.rejected.connect(self.reject)
         self.resize(self.sizeHint() + QSize(100, 50))
         self.error = None
         self.db = db.new_api
@@ -43,15 +40,15 @@ class DBCheck(QDialog):  # {{{
         self.rejected = False
 
     def start(self):
-        t = self.thread = Thread(target=self.dump_and_restore)
+        t = self.thread = Thread(target=self.vacuum)
         t.daemon = True
         t.start()
         QTimer.singleShot(100, self.check)
         self.exec_()
 
-    def dump_and_restore(self):
+    def vacuum(self):
         try:
-            self.db.dump_and_restore(self.update_msg.emit)
+            self.db.vacuum()
         except Exception as e:
             import traceback
             self.error = (as_unicode(e), traceback.format_exc())

From 28b104d10df803d4df256fedf5ec6374709ae75e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 11:06:20 +0530
Subject: [PATCH 0718/1154] Nicer error message when virtual library has no
 books

Fixes #1220030 [Content Server No Books Error](https://bugs.launchpad.net/calibre/+bug/1220030)
---
 src/calibre/library/server/browse.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 5e98d70c27..b489ed58db 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -675,6 +675,16 @@ class BrowseServer(object):
                 which = unhexlify(cid).decode('utf-8')
                 vls = self.db.prefs.get('virtual_libraries', {})
                 ids = self.search_cache(vls[which])
+                if not ids:
+                    msg = _('The virtual library <b>%s</b> has no books.') % prepare_string_for_xml(which)
+                    if self.search_restriction:
+                        msg += ' ' + _(
+                            'This is probably because you have applied a virtual library'
+                            ' to the content server in Preferences->Sharing over the net.'
+                            ' This virtual library is applied globally and combined with'
+                            ' the current virtual library.')
+                    return self.browse_template('name').format(title='',
+                        script='', main='<p>%s</p>'%msg)
             else:
                 if fm.get(category, {'datatype':None})['datatype'] == 'composite':
                     cid = cid.decode('utf-8')

From 0fd842dd9a3cc37d1622c857e03a19d8d8587b66 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 11:06:53 +0530
Subject: [PATCH 0719/1154] Expand ~ in content-server --with-library

---
 src/calibre/library/server/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/main.py b/src/calibre/library/server/main.py
index d38960da67..78420e1534 100644
--- a/src/calibre/library/server/main.py
+++ b/src/calibre/library/server/main.py
@@ -116,7 +116,7 @@ def main(args=sys.argv):
         print('No saved library path. Use the --with-library option'
                 ' to specify the path to the library you want to use.')
         return 1
-    db = LibraryDatabase(opts.with_library)
+    db = LibraryDatabase(os.path.expanduser(opts.with_library))
     server = LibraryServer(db, opts, show_tracebacks=opts.develop)
     server.start()
     return 0

From b1f17de41c467c229eeb55ad1fa7e8d524a327fe Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 11:17:44 +0530
Subject: [PATCH 0720/1154] pep8

---
 src/calibre/library/server/ajax.py   | 12 ++++--------
 src/calibre/library/server/cache.py  |  1 -
 src/calibre/library/server/mobile.py | 12 ++++++------
 src/calibre/library/server/xml.py    |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/calibre/library/server/ajax.py b/src/calibre/library/server/ajax.py
index 80ead51d00..f6f3f686d7 100644
--- a/src/calibre/library/server/ajax.py
+++ b/src/calibre/library/server/ajax.py
@@ -23,7 +23,7 @@ from calibre.library.server import custom_fields_to_display
 from calibre import force_unicode, isbytestring
 from calibre.library.field_metadata import category_icon_map
 
-class Endpoint(object): # {{{
+class Endpoint(object):  # {{{
     'Manage mime-type json serialization, etc.'
 
     def __init__(self, mimetype='application/json; charset=utf-8',
@@ -55,7 +55,7 @@ class Endpoint(object): # {{{
         return wrapper
 # }}}
 
-def category_icon(category, meta): # {{{
+def category_icon(category, meta):  # {{{
     if category in category_icon_map:
         icon = category_icon_map[category]
     elif meta['is_custom']:
@@ -117,7 +117,6 @@ class AjaxServer(object):
         # Search
         connect('ajax_search', base_href+'/search', self.ajax_search)
 
-
     # Get book metadata {{{
     def ajax_book_to_json(self, book_id, get_category_urls=True,
                           device_compatible=False):
@@ -214,7 +213,7 @@ class AjaxServer(object):
                 book_id = int(book_id)
             data, last_modified = self.ajax_book_to_json(book_id,
                     get_category_urls=category_urls.lower()=='true',
-                    device_compatible=device_compatible.lower()=='true');
+                    device_compatible=device_compatible.lower()=='true')
         except:
             raise cherrypy.HTTPError(404, 'No book with id: %r'%book_id)
 
@@ -291,7 +290,6 @@ class AjaxServer(object):
 
         displayed_custom_fields = custom_fields_to_display(self.db)
 
-
         for category in sorted(categories, key=lambda x: sort_key(getter(x))):
             if len(categories[category]) == 0:
                 continue
@@ -314,7 +312,7 @@ class AjaxServer(object):
         ans = [{'url':k, 'name':v[0], 'icon':v[1], 'is_category':True}
                 for k, v in ans.iteritems()]
         ans.sort(key=lambda x: sort_key(x['name']))
-        for name, url, icon in  [
+        for name, url, icon in [
                 (_('All books'), 'allbooks', 'book.png'),
                 (_('Newest'), 'newest', 'forward.png'),
                 ]:
@@ -505,7 +503,6 @@ class AjaxServer(object):
                 'items':items,
         }
 
-
     # }}}
 
     # Books in the specified category {{{
@@ -569,7 +566,6 @@ class AjaxServer(object):
                 'book_ids':ids
         }
 
-
     # }}}
 
     # Search {{{
diff --git a/src/calibre/library/server/cache.py b/src/calibre/library/server/cache.py
index 2d27962dcc..2c7f49162e 100644
--- a/src/calibre/library/server/cache.py
+++ b/src/calibre/library/server/cache.py
@@ -31,7 +31,6 @@ class Cache(object):
             self._search_cache[search] = old
         return self._search_cache[search][1]
 
-
     def categories_cache(self, restrict_to=frozenset([])):
         base_restriction = self.search_cache('')
         if restrict_to:
diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py
index a18109c924..9740216b5a 100644
--- a/src/calibre/library/server/mobile.py
+++ b/src/calibre/library/server/mobile.py
@@ -23,12 +23,12 @@ from calibre.utils.date import utcfromtimestamp, as_local_time
 from calibre.utils.filenames import ascii_filename
 from calibre.utils.icu import sort_key
 
-def CLASS(*args, **kwargs): # class is a reserved word in Python
+def CLASS(*args, **kwargs):  # class is a reserved word in Python
     kwargs['class'] = ' '.join(args)
     return kwargs
 
 
-def build_search_box(num, search, sort, order, prefix): # {{{
+def build_search_box(num, search, sort, order, prefix):  # {{{
     div = DIV(id='search_box')
     form = FORM('Show ', method='get', action=prefix+'/mobile')
     form.set('accept-charset', 'UTF-8')
@@ -69,7 +69,7 @@ def build_search_box(num, search, sort, order, prefix): # {{{
     return div
     # }}}
 
-def build_navigation(start, num, total, url_base): # {{{
+def build_navigation(start, num, total, url_base):  # {{{
     end = min((start+num-1), total)
     tagline = SPAN('Books %d to %d of %d'%(start, end, total),
             style='display: block; text-align: center;')
@@ -150,7 +150,7 @@ def build_index(books, num, search, sort, order, start, total, url_base, CKEYS,
         first = SPAN(u'\u202f%s %s by %s' % (book['title'], series,
             book['authors']), CLASS('first-line'))
         div.append(first)
-        second = SPAN(u'%s - %s %s %s' % ( book['size'],
+        second = SPAN(u'%s - %s %s %s' % (book['size'],
             book['timestamp'],
             tags, ctext), CLASS('second-line'))
         div.append(second)
@@ -173,9 +173,9 @@ def build_index(books, num, search, sort, order, start, total, url_base, CKEYS,
             LINK(rel='stylesheet', type='text/css',
                 href=prefix+'/mobile/style.css'),
             LINK(rel='apple-touch-icon', href="/static/calibre.png")
-        ), # End head
+        ),  # End head
         body
-    ) # End html
+    )  # End html
 
 
 class MobileServer(object):
diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py
index 091ec43f36..5f3fe5ec35 100644
--- a/src/calibre/library/server/xml.py
+++ b/src/calibre/library/server/xml.py
@@ -134,7 +134,7 @@ class XMLServer(object):
 
         updated = self.db.last_modified()
         kwargs = dict(
-                start = str(start),
+                start=str(start),
                 updated=updated.strftime('%Y-%m-%dT%H:%M:%S+00:00'),
                 total=str(len(ids)),
                 num=str(len(books)))

From 7905b2e4ef0f3d64822abbd0ba1d2688bad6292b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 12:16:43 +0530
Subject: [PATCH 0721/1154] Serialize dates in local tz in csv/xml catalogs

---
 src/calibre/library/catalogs/csv_xml.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/catalogs/csv_xml.py b/src/calibre/library/catalogs/csv_xml.py
index c594a346d4..702bde3b1e 100644
--- a/src/calibre/library/catalogs/csv_xml.py
+++ b/src/calibre/library/catalogs/csv_xml.py
@@ -136,7 +136,7 @@ class CSV_XML(CatalogPlugin):
                         # Could be 9, 10 or 13 digits, with hyphens, possibly ending in 'X'
                         item = u'%s' % re.sub(r'[^\dX-]', '', item)
                     elif field in ['pubdate', 'timestamp']:
-                        item = isoformat(item)
+                        item = isoformat(item, as_utc=False)
                     elif field == 'comments':
                         item = item.replace(u'\r\n', u' ')
                         item = item.replace(u'\n', u' ')
@@ -198,7 +198,7 @@ class CSV_XML(CatalogPlugin):
 
                 for field in ('timestamp', 'pubdate'):
                     if field in fields:
-                        record.append(getattr(E, field)(r[field].isoformat()))
+                        record.append(getattr(E, field)(isoformat(r[field], as_utc=False)))
 
                 if 'tags' in fields and r['tags']:
                     tags = E.tags()

From a4f2d0d664245c9fa927683ee927eb7d5c80ca84 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 12:37:20 +0530
Subject: [PATCH 0722/1154] Content server: Ignore current VL in GUI when
 embedded

Content server: When running from inside the main calibre program, do not
restrict the books shown based on the current virtual library in the
main program. If you wish to restrict the books shown in the content
server, use Preferences->Sharing over the net.
---
 src/calibre/library/server/ajax.py   | 3 +--
 src/calibre/library/server/base.py   | 6 ++++++
 src/calibre/library/server/browse.py | 5 ++---
 src/calibre/library/server/cache.py  | 4 +---
 src/calibre/library/server/mobile.py | 2 +-
 src/calibre/library/server/xml.py    | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/calibre/library/server/ajax.py b/src/calibre/library/server/ajax.py
index f6f3f686d7..eac53b91bc 100644
--- a/src/calibre/library/server/ajax.py
+++ b/src/calibre/library/server/ajax.py
@@ -590,8 +590,7 @@ class AjaxServer(object):
 
         if isbytestring(query):
             query = query.decode('UTF-8')
-        ids = self.db.search_getting_ids(query.strip(), self.search_restriction, sort_results=False)
-        ids = list(ids)
+        ids = list(self.search_for_books(query))
         self.db.data.multisort(fields=[(sfield, sort_order == 'asc')], subsort=True,
                 only_ids=ids)
         total_num = len(ids)
diff --git a/src/calibre/library/server/base.py b/src/calibre/library/server/base.py
index 0fc301662f..e64319e88b 100644
--- a/src/calibre/library/server/base.py
+++ b/src/calibre/library/server/base.py
@@ -314,3 +314,9 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
         t.daemon = True
         t.start()
 
+    def search_for_books(self, query):
+        return self.db.search_getting_ids(
+            (query or '').strip(), self.search_restriction,
+            sort_results=False, use_virtual_library=False)
+
+
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index b489ed58db..6496ac09b9 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -931,8 +931,7 @@ class BrowseServer(object):
     def browse_random(self, *args, **kwargs):
         import random
         try:
-            book_id = random.choice(self.db.search_getting_ids(
-                '', self.search_restriction, sort_results=False))
+            book_id = random.choice(self.search_for_books(''))
         except IndexError:
             raise cherrypy.HTTPError(404, 'This library has no books')
         ans = self.browse_render_details(book_id, add_random_button=True)
@@ -957,7 +956,7 @@ class BrowseServer(object):
     def browse_search(self, query='', list_sort=None):
         if isbytestring(query):
             query = query.decode('UTF-8')
-        ids = self.db.search_getting_ids(query.strip(), self.search_restriction)
+        ids = self.search_for_books(query)
         items = [self.db.data.tablerow_for_id(x) for x in ids]
         sort = self.browse_sort_book_list(items, list_sort)
         ids = [x[0] for x in items]
diff --git a/src/calibre/library/server/cache.py b/src/calibre/library/server/cache.py
index 2c7f49162e..4133e4d31d 100644
--- a/src/calibre/library/server/cache.py
+++ b/src/calibre/library/server/cache.py
@@ -21,9 +21,7 @@ class Cache(object):
     def search_cache(self, search):
         old = self._search_cache.pop(search, None)
         if old is None or old[0] <= self.db.last_modified():
-            matches = self.db.data.search_getting_ids(search, self.search_restriction, sort_results=False)
-            if not matches:
-                matches = []
+            matches = self.search_for_books(search) or []
             self._search_cache[search] = (utcnow(), frozenset(matches))
             if len(self._search_cache) > 50:
                 self._search_cache.popitem(last=False)
diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py
index 9740216b5a..1b6479250e 100644
--- a/src/calibre/library/server/mobile.py
+++ b/src/calibre/library/server/mobile.py
@@ -222,7 +222,7 @@ class MobileServer(object):
             search = ''
         if isbytestring(search):
             search = search.decode('UTF-8')
-        ids = self.db.search_getting_ids(search.strip(), self.search_restriction, sort_results=False)
+        ids = self.search_for_books(search)
         FM = self.db.FIELD_MAP
         items = [r for r in iter(self.db) if r[FM['id']] in ids]
         if sort is not None:
diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py
index 5f3fe5ec35..9808f8d9a8 100644
--- a/src/calibre/library/server/xml.py
+++ b/src/calibre/library/server/xml.py
@@ -53,7 +53,7 @@ class XMLServer(object):
         if isbytestring(search):
             search = search.decode('UTF-8')
 
-        ids = self.db.search_getting_ids(search.strip(), self.search_restriction, sort_results=False)
+        ids = self.search_for_books(search)
 
         FM = self.db.FIELD_MAP
 

From cca7c89f249df2262861e8c9e88cb2b72db53911 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 3 Sep 2013 13:21:47 +0530
Subject: [PATCH 0723/1154] Line numbers for OOM exceptions in the unrar module

---
 src/calibre/utils/unrar.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/calibre/utils/unrar.cpp b/src/calibre/utils/unrar.cpp
index b728ba4ac4..6ec3bb44d0 100644
--- a/src/calibre/utils/unrar.cpp
+++ b/src/calibre/utils/unrar.cpp
@@ -30,6 +30,10 @@ static int wcscpy_s(wchar_t *dest, size_t sz, const wchar_t *src) {
 }
 #endif
 
+#define STRFY(x) #x
+#define STRFY2(x) STRFY(x)
+#define NOMEM PyErr_SetString(PyExc_MemoryError, "Out of memory at line number: " STRFY2(__LINE__))
+
 static wchar_t *unicode_to_wchar(PyObject *o) {
     wchar_t *buf;
     Py_ssize_t len;
@@ -37,7 +41,7 @@ static wchar_t *unicode_to_wchar(PyObject *o) {
     if (!PyUnicode_Check(o)) {PyErr_Format(PyExc_TypeError, "The python object must be a unicode object"); return NULL;}
     len = PyUnicode_GET_SIZE(o);
     buf = (wchar_t *)calloc(len+2, sizeof(wchar_t));
-    if (buf == NULL) { PyErr_NoMemory(); return NULL; }
+    if (buf == NULL) { NOMEM; return NULL; }
     len = PyUnicode_AsWideChar((PyUnicodeObject*)o, buf, len);
     if (len == -1) { free(buf); PyErr_Format(PyExc_TypeError, "Invalid python unicode object."); return NULL; }
     return buf;
@@ -47,7 +51,7 @@ static PyObject *wchar_to_unicode(const wchar_t *o) {
     PyObject *ans;
     if (o == NULL) return NULL;
     ans = PyUnicode_FromWideChar(o, wcslen(o));
-    if (ans == NULL) PyErr_NoMemory();
+    if (ans == NULL) NOMEM;
     return ans;
 }
 
@@ -237,14 +241,14 @@ RAR_init(RARArchive *self, PyObject *args, PyObject *kwds) {
     self->Cmd.UserData = (LPARAM)pycallback;
 
     self->archive = new (std::nothrow) PyArchive(file, cname, &self->Cmd);
-    if (self->archive == NULL) { PyErr_NoMemory(); return -1; }
+    if (self->archive == NULL) { NOMEM; return -1; }
     free(cname);
 
     self->DataIO.UnpArcSize=self->archive->FileLength();
     self->DataIO.UnpVolume=false;
 
     self->Unp = new (std::nothrow) Unpack(&self->DataIO);
-    if (self->Unp == NULL) { PyErr_NoMemory(); return -1; }
+    if (self->Unp == NULL) { NOMEM; return -1; }
     self->file_count = 0;
 
     try {
@@ -259,7 +263,7 @@ RAR_init(RARArchive *self, PyObject *args, PyObject *kwds) {
             Array<byte> cdata;
             if (self->archive->GetComment(&cdata, NULL)) {
                 self->comment = PyBytes_FromStringAndSize((const char*)&cdata[0], cdata.Size());
-                if (self->comment == NULL) { PyErr_NoMemory(); return -1; }
+                if (self->comment == NULL) { NOMEM; return -1; }
             } else {
                 self->comment = Py_None;
                 Py_INCREF(self->comment);
@@ -275,7 +279,7 @@ RAR_init(RARArchive *self, PyObject *args, PyObject *kwds) {
         return -1;
     } catch (std::bad_alloc) {
         if (!PyErr_Occurred()) 
-            PyErr_NoMemory();
+            NOMEM;
         return -1;
     }
 
@@ -328,7 +332,7 @@ RAR_current_item(RARArchive *self, PyObject *args) {
         return NULL;
     } catch (std::bad_alloc) {
         if (!PyErr_Occurred()) 
-            PyErr_NoMemory();
+            NOMEM;
         return NULL;
     }
 
@@ -451,7 +455,7 @@ RAR_process_item(RARArchive *self, PyObject *args) {
         return NULL;
     } catch (std::bad_alloc) {
         if (!PyErr_Occurred()) 
-            PyErr_NoMemory();
+            NOMEM;
         return NULL;
     }
     Py_RETURN_NONE;

From db195e6b75a7f4b00a1f1bf1b7200e97dd9c1f56 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 4 Sep 2013 08:26:36 +0530
Subject: [PATCH 0724/1154] newdb: Fix setting author names with | in them

Fixes #1220348 [Vertical bar "|" in author name causes ConstraintError](https://bugs.launchpad.net/calibre/+bug/1220348)
---
 src/calibre/db/tests/writing.py | 5 +++++
 src/calibre/db/write.py         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index a199da6b28..762517a294 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -297,6 +297,11 @@ class WritingTest(BaseTest):
         ae(sf('tags', {3: ('x', 'X')}), {3}, 'Failed when setting tag twice with different cases')
         ae(('x',), cache.field_for('tags', 3))
 
+        # Test setting of authors with | in their names (for legacy database
+        # format compatibility | is replaced by ,)
+        ae(sf('authors', {3: ('Some| Author',)}), {3})
+        ae(('Some, Author',), cache.field_for('authors', 3))
+
     # }}}
 
     def test_dirtied(self):  # {{{
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index fc8691aa42..ee81659984 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -156,7 +156,7 @@ def get_adapter(name, metadata):
     if name == 'author_sort':
         return lambda x: ans(x) or ''
     if name == 'authors':
-        return lambda x: ans(x) or (_('Unknown'),)
+        return lambda x: tuple(y.replace('|', ',') for y in ans(x)) or (_('Unknown'),)
     if name in {'timestamp', 'last_modified'}:
         return lambda x: ans(x) or UNDEFINED_DATE
     if name == 'series_index':

From f10a409a3890648718adc2759164e78e54f7db2f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 4 Sep 2013 09:03:08 +0530
Subject: [PATCH 0725/1154] pep8

---
 src/calibre/devices/mtp/unix/driver.py    | 20 ++++++++++------
 src/calibre/devices/mtp/windows/driver.py | 29 +++++++++++++++--------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/calibre/devices/mtp/unix/driver.py b/src/calibre/devices/mtp/unix/driver.py
index 0e4461df7d..864daef046 100644
--- a/src/calibre/devices/mtp/unix/driver.py
+++ b/src/calibre/devices/mtp/unix/driver.py
@@ -52,7 +52,8 @@ class MTP_DEVICE(MTPDeviceBase):
     def is_device_mtp(self, d, debug=None):
         ''' Returns True iff the _is_device_mtp check returns True and libmtp
         is able to probe the device successfully. '''
-        if self._is_device_mtp is None: return False
+        if self._is_device_mtp is None:
+            return False
         return (self._is_device_mtp(d, debug=debug) and
                 self.libmtp.is_mtp_device(d.busnum, d.devnum))
 
@@ -61,7 +62,8 @@ class MTP_DEVICE(MTPDeviceBase):
 
     @synchronous
     def detect_managed_devices(self, devices_on_system, force_refresh=False):
-        if self.libmtp is None: return None
+        if self.libmtp is None:
+            return None
         # First remove blacklisted devices.
         devs = set()
         for d in devices_on_system:
@@ -109,13 +111,14 @@ class MTP_DEVICE(MTPDeviceBase):
             p(err)
             return False
         devs = [d for d in devices_on_system if
-            ( (d.vendor_id, d.product_id) in self.known_devices or
+            ((d.vendor_id, d.product_id) in self.known_devices or
                self.is_device_mtp(d, debug=p)) and d.vendor_id != APPLE]
         if not devs:
             p('No MTP devices connected to system')
             return False
         p('MTP devices connected:')
-        for d in devs: p(d)
+        for d in devs:
+            p(d)
 
         for d in devs:
             p('\nTrying to open:', d)
@@ -144,7 +147,8 @@ class MTP_DEVICE(MTPDeviceBase):
 
     @synchronous
     def eject(self):
-        if self.currently_connected_dev is None: return
+        if self.currently_connected_dev is None:
+            return
         self.ejected_devices.add(self.currently_connected_dev)
         self.post_yank_cleanup()
 
@@ -244,7 +248,8 @@ class MTP_DEVICE(MTPDeviceBase):
                 storage, all_items, all_errs = [], [], []
                 for sid, capacity in zip([self._main_id, self._carda_id,
                     self._cardb_id], self.total_space()):
-                    if sid is None: continue
+                    if sid is None:
+                        continue
                     name = _('Unknown')
                     for x in self.dev.storage_info:
                         if x['id'] == sid:
@@ -384,7 +389,8 @@ def develop():
     dev.startup()
     try:
         cd = dev.detect_managed_devices(scanner.devices)
-        if cd is None: raise RuntimeError('No MTP device found')
+        if cd is None:
+            raise RuntimeError('No MTP device found')
         dev.open(cd, 'develop')
         pprint.pprint(dev.dev.storage_info)
         dev.filesystem_cache
diff --git a/src/calibre/devices/mtp/windows/driver.py b/src/calibre/devices/mtp/windows/driver.py
index 268ac07a41..53f6d1abfa 100644
--- a/src/calibre/devices/mtp/windows/driver.py
+++ b/src/calibre/devices/mtp/windows/driver.py
@@ -80,7 +80,8 @@ class MTP_DEVICE(MTPDeviceBase):
 
     @same_thread
     def detect_managed_devices(self, devices_on_system, force_refresh=False):
-        if self.wpd is None: return None
+        if self.wpd is None:
+            return None
         if self.eject_dev_on_next_scan:
             self.eject_dev_on_next_scan = False
             if self.currently_connected_pnp_id is not None:
@@ -166,7 +167,8 @@ class MTP_DEVICE(MTPDeviceBase):
                 p(traceback.format_exc())
                 continue
             protocol = data.get('protocol', '').lower()
-            if not protocol.startswith('mtp:'): continue
+            if not protocol.startswith('mtp:'):
+                continue
             p('MTP device:', pnp_id)
             p(pprint.pformat(data))
             if not self.is_suitable_wpd_device(data):
@@ -195,10 +197,12 @@ class MTP_DEVICE(MTPDeviceBase):
     def is_suitable_wpd_device(self, devdata):
         # Check that protocol is MTP
         protocol = devdata.get('protocol', '').lower()
-        if not protocol.startswith('mtp:'): return False
+        if not protocol.startswith('mtp:'):
+            return False
 
         # Check that the device has some read-write storage
-        if not devdata.get('has_storage', False): return False
+        if not devdata.get('has_storage', False):
+            return False
         has_rw_storage = False
         for s in devdata.get('storage', []):
             if s.get('filesystem', None) == 'DCF':
@@ -206,11 +210,12 @@ class MTP_DEVICE(MTPDeviceBase):
                 # See https://bugs.launchpad.net/calibre/+bug/1054562
                 continue
             if s.get('type', 'unknown_unknown').split('_')[-1] == 'rom':
-                continue # Read only storage
+                continue  # Read only storage
             if s.get('rw', False):
                 has_rw_storage = True
                 break
-        if not has_rw_storage: return False
+        if not has_rw_storage:
+            return False
 
         return True
 
@@ -234,7 +239,8 @@ class MTP_DEVICE(MTPDeviceBase):
             items = []
             for storage_id, capacity in zip([self._main_id, self._carda_id,
                 self._cardb_id], ts):
-                if storage_id is None: continue
+                if storage_id is None:
+                    continue
                 name = _('Unknown')
                 for s in self.dev.data['storage']:
                     if s['id'] == storage_id:
@@ -245,7 +251,8 @@ class MTP_DEVICE(MTPDeviceBase):
                 self._currently_getting_sid = unicode(storage_id)
                 id_map = self.dev.get_filesystem(storage_id,
                         self._filesystem_callback)
-                for x in id_map.itervalues(): x['storage_id'] = storage_id
+                for x in id_map.itervalues():
+                    x['storage_id'] = storage_id
                 all_storage.append(storage)
                 items.append(id_map.itervalues())
             self._filesystem_cache = FilesystemCache(all_storage, chain(*items))
@@ -255,7 +262,8 @@ class MTP_DEVICE(MTPDeviceBase):
 
     @same_thread
     def do_eject(self):
-        if self.currently_connected_pnp_id is None: return
+        if self.currently_connected_pnp_id is None:
+            return
         self.ejected_devices.add(self.currently_connected_pnp_id)
         self.currently_connected_pnp_id = self.current_friendly_name = None
         self._main_id = self._carda_id = self._cardb_id = None
@@ -273,7 +281,8 @@ class MTP_DEVICE(MTPDeviceBase):
         return self.currently_connected_pnp_id is not None
 
     def eject(self):
-        if self.currently_connected_pnp_id is None: return
+        if self.currently_connected_pnp_id is None:
+            return
         self.eject_dev_on_next_scan = True
         self.current_serial_num = None
 

From 5e55a83ea5a9246bea476cd12087c85167b6a4c6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 4 Sep 2013 11:05:31 +0530
Subject: [PATCH 0726/1154] Update FAQ for change in calibre button

---
 manual/faq.rst | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index 9809d4f22c..44646ad521 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -622,13 +622,29 @@ should fix by hand.
 The list of books in |app| is blank!
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In order to understand why that happened, you have to understand what a |app| library is. At the most basic level, a |app| library is just a folder. Whenever you add a book to |app|, that book's files are copied into this folder (arranged into sub folders by author and title). Inside the |app| library folder, at the top level, you will see a file called metadata.db. This file is where |app| stores the metadata like title/author/rating/tags etc. for *every* book in your |app| library. The list of books that |app| displays is created by reading the contents of this metadata.db file.
+In order to understand why that happened, you have to understand what a |app|
+library is. At the most basic level, a |app| library is just a folder. Whenever
+you add a book to |app|, that book's files are copied into this folder
+(arranged into sub folders by author and title). Inside the |app| library
+folder, at the top level, you will see a file called metadata.db. This file is
+where |app| stores the metadata like title/author/rating/tags etc. for *every*
+book in your |app| library. The list of books that |app| displays is created by
+reading the contents of this metadata.db file.
 
 There can be two reasons why |app| is showing a empty list of books:
 
-  * Your |app| library folder changed its location. This can happen if it was on an external disk and the drive letter for that disk changed. Or if you accidentally moved the folder. In this case, |app| cannot find its library and so starts up with an empty library instead. To remedy this, do a right-click on the |app| icon in the |app| toolbar (it will say 0 books underneath it) and select Switch/create library. Click the little blue icon to select the new location of your |app| library and click OK.
+  * Your |app| library folder changed its location. This can happen if it was
+    on an external disk and the drive letter for that disk changed. Or if you
+    accidentally moved the folder. In this case, |app| cannot find its library
+    and so starts up with an empty library instead. To remedy this, do a
+    right-click on the |app| icon in the |app| toolbar and select Switch/create
+    library. Click the little blue icon to select the new location of your
+    |app| library and click OK.
 
-  * Your metadata.db file was deleted/corrupted. In this case, you can ask |app| to rebuild the metadata.db from its backups. Right click the |app| icon in the |app| toolbar (it will say 0 books underneath it) and select Library maintenance->Restore database. |app| will automatically rebuild metadata.db.
+  * Your metadata.db file was deleted/corrupted. In this case, you can ask
+    |app| to rebuild the metadata.db from its backups. Right click the |app|
+    icon in the |app| toolbar and select Library maintenance->Restore database.
+    |app| will automatically rebuild metadata.db.
 
 I am getting errors with my calibre library on a networked drive/NAS?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 36f595f5a8d997f8790d41c8da1b5310dc100799 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 4 Sep 2013 12:29:21 +0530
Subject: [PATCH 0727/1154] ...

---
 manual/faq.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index 44646ad521..22d20e224b 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -716,8 +716,14 @@ Take your pick:
 |app| is pronounced as cal-i-ber *not* ca-li-bre. If you're wondering, |app| is the British/commonwealth spelling for caliber. Being Indian, that's the natural spelling for me. 
 
 Why does |app| show only some of my fonts on OS X?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-|app| embeds fonts in ebook files it creates. Ebook files support embedding only TrueType (.ttf) fonts. Most fonts on OS X systems are in .dfont format, thus they cannot be embedded. |app| shows only TrueType fonts found on your system. You can obtain many TrueType fonts on the web. Simply download the .ttf files and add them to the Library/Fonts directory in your home directory.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+
+|app| embeds fonts in ebook files it creates. Ebook files support embedding
+only TrueType and OpenType (.ttf and .otf) fonts. Most fonts on OS X systems
+are in .dfont format, thus they cannot be embedded. |app| shows only TrueType
+and OpenType fonts found on your system. You can obtain many such fonts on the
+web. Simply download the .ttf/.otf files and add them to the Library/Fonts
+directory in your home directory.
 
 |app| is not starting on Windows?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From f0a5fd521b8c362e037eebebd50e76f6c476facf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 4 Sep 2013 15:56:02 +0530
Subject: [PATCH 0728/1154] MTP driver: Allow ignoring any folder on the device

MTP driver: Allow ignoring any folder on the device, not just top level
folders. For newly connected devices, scan
/Android/data/com.amazon.kindle for books by default (newer versions of
the Kindle app place downloaded files there).
---
 src/calibre/devices/mtp/driver.py             |  33 ++++--
 src/calibre/devices/mtp/unix/driver.py        |  23 +++-
 src/calibre/devices/mtp/windows/driver.py     |  32 ++++--
 src/calibre/gui2/device_drivers/mtp_config.py |   4 +-
 .../gui2/device_drivers/mtp_folder_browser.py | 107 ++++++++++++------
 5 files changed, 138 insertions(+), 61 deletions(-)

diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py
index 40fa9d900b..d80a7e7679 100644
--- a/src/calibre/devices/mtp/driver.py
+++ b/src/calibre/devices/mtp/driver.py
@@ -70,20 +70,34 @@ class MTP_DEVICE(BASE):
 
         return self._prefs
 
-    def is_folder_ignored(self, storage_or_storage_id, name,
+    def is_folder_ignored(self, storage_or_storage_id, path,
                           ignored_folders=None):
         storage_id = unicode(getattr(storage_or_storage_id, 'object_id',
                              storage_or_storage_id))
-        name = icu_lower(name)
+        lpath = tuple(icu_lower(name) for name in path)
         if ignored_folders is None:
             ignored_folders = self.get_pref('ignored_folders')
         if storage_id in ignored_folders:
-            return name in {icu_lower(x) for x in ignored_folders[storage_id]}
+            # Use the users ignored folders settings
+            return '/'.join(lpath) in {icu_lower(x) for x in ignored_folders[storage_id]}
 
-        return name in {
-            'alarms', 'android', 'dcim', 'movies', 'music', 'notifications',
+        # Implement the default ignore policy
+
+        # Top level ignores
+        if lpath[0] in {
+            'alarms', 'dcim', 'movies', 'music', 'notifications',
             'pictures', 'ringtones', 'samsung', 'sony', 'htc', 'bluetooth',
-            'games', 'lost.dir', 'video', 'whatsapp', 'image', 'com.zinio.mobile.android.reader'}
+            'games', 'lost.dir', 'video', 'whatsapp', 'image', 'com.zinio.mobile.android.reader'}:
+            return True
+
+        if len(lpath) > 1 and lpath[0] == 'android':
+            # Ignore everything in Android apart from a few select folders
+            if lpath[1] != 'data':
+                return True
+            if len(lpath) > 2 and lpath[2] != 'com.amazon.kindle':
+                return True
+
+        return False
 
     def configure_for_kindle_app(self):
         proxy = self.prefs
@@ -398,8 +412,8 @@ class MTP_DEVICE(BASE):
 
         for infile, fname, mi in izip(files, names, metadata):
             path = self.create_upload_path(prefix, mi, fname, routing)
-            if path and self.is_folder_ignored(storage, path[0]):
-                raise MTPInvalidSendPathError(path[0])
+            if path and self.is_folder_ignored(storage, path):
+                raise MTPInvalidSendPathError('/'.join(path))
             parent = self.ensure_parent(storage, path)
             if hasattr(infile, 'read'):
                 pos = infile.tell()
@@ -549,6 +563,3 @@ if __name__ == '__main__':
         print ('Prefix for main mem:', dev.prefix_for_location(None))
     finally:
         dev.shutdown()
-
-
-
diff --git a/src/calibre/devices/mtp/unix/driver.py b/src/calibre/devices/mtp/unix/driver.py
index 864daef046..fa23268336 100644
--- a/src/calibre/devices/mtp/unix/driver.py
+++ b/src/calibre/devices/mtp/unix/driver.py
@@ -21,6 +21,7 @@ from calibre.devices.mtp.base import MTPDeviceBase, synchronous, debug
 MTPDevice = namedtuple('MTPDevice', 'busnum devnum vendor_id product_id '
         'bcd serial manufacturer product')
 
+null = object()
 def fingerprint(d):
     return MTPDevice(d.busnum, d.devnum, d.vendor_id, d.product_id, d.bcd,
             d.serial, d.manufacturer, d.product)
@@ -230,13 +231,23 @@ class MTP_DEVICE(MTPDeviceBase):
         ans += pprint.pformat(storage)
         return ans
 
-    def _filesystem_callback(self, entry, level):
+    def _filesystem_callback(self, fs_map, entry, level):
         name = entry.get('name', '')
         self.filesystem_callback(_('Found object: %s')%name)
-        if (level == 0 and
-            self.is_folder_ignored(self._currently_getting_sid, name)):
-            return False
-        return True
+        fs_map[entry.get('id', null)] = entry
+        path = [name]
+        pid = entry.get('parent_id', 0)
+        while pid != 0 and pid in fs_map:
+            parent = fs_map[pid]
+            path.append(parent.get('name', ''))
+            pid = parent.get('parent_id', 0)
+            if fs_map.get(pid, None) is parent:
+                break  # An object is its own parent
+        path = tuple(reversed(path))
+        ok = not self.is_folder_ignored(self._currently_getting_sid, path)
+        if not ok:
+            debug('Ignored object: %s' % '/'.join(path))
+        return ok
 
     @property
     def filesystem_cache(self):
@@ -260,7 +271,7 @@ class MTP_DEVICE(MTPDeviceBase):
                         'is_system':True})
                     self._currently_getting_sid = unicode(sid)
                     items, errs = self.dev.get_filesystem(sid,
-                            self._filesystem_callback)
+                            partial(self._filesystem_callback, {}))
                     all_items.extend(items), all_errs.extend(errs)
                 if not all_items and all_errs:
                     raise DeviceError(
diff --git a/src/calibre/devices/mtp/windows/driver.py b/src/calibre/devices/mtp/windows/driver.py
index 53f6d1abfa..ca5d34b93f 100644
--- a/src/calibre/devices/mtp/windows/driver.py
+++ b/src/calibre/devices/mtp/windows/driver.py
@@ -18,6 +18,8 @@ from calibre.ptempfile import SpooledTemporaryFile
 from calibre.devices.errors import OpenFailed, DeviceError, BlacklistedDevice
 from calibre.devices.mtp.base import MTPDeviceBase, debug
 
+null = object()
+
 class ThreadingViolation(Exception):
 
     def __init__(self):
@@ -219,14 +221,26 @@ class MTP_DEVICE(MTPDeviceBase):
 
         return True
 
-    def _filesystem_callback(self, obj, level):
-        n = obj.get('name', '')
-        msg = _('Found object: %s')%n
-        if (level == 0 and
-            self.is_folder_ignored(self._currently_getting_sid, n)):
+    def _filesystem_callback(self, fs_map, obj, level):
+        name = obj.get('name', '')
+        self.filesystem_callback(_('Found object: %s')%name)
+        if not obj.get('is_folder', False):
             return False
-        self.filesystem_callback(msg)
-        return obj.get('is_folder', False)
+        fs_map[obj.get('id', null)] = obj
+        path = [name]
+        pid = obj.get('parent_id', 0)
+        while pid != 0 and pid in fs_map:
+            parent = fs_map[pid]
+            path.append(parent.get('name', ''))
+            pid = parent.get('parent_id', 0)
+            if fs_map.get(pid, None) is parent:
+                break  # An object is its own parent
+
+        path = tuple(reversed(path))
+        ok = not self.is_folder_ignored(self._currently_getting_sid, path)
+        if not ok:
+            debug('Ignored object: %s' % '/'.join(path))
+        return ok
 
     @property
     def filesystem_cache(self):
@@ -249,8 +263,8 @@ class MTP_DEVICE(MTPDeviceBase):
                 storage = {'id':storage_id, 'size':capacity, 'name':name,
                         'is_folder':True, 'can_delete':False, 'is_system':True}
                 self._currently_getting_sid = unicode(storage_id)
-                id_map = self.dev.get_filesystem(storage_id,
-                        self._filesystem_callback)
+                id_map = self.dev.get_filesystem(storage_id, partial(
+                        self._filesystem_callback, {}))
                 for x in id_map.itervalues():
                     x['storage_id'] = storage_id
                 all_storage.append(storage)
diff --git a/src/calibre/gui2/device_drivers/mtp_config.py b/src/calibre/gui2/device_drivers/mtp_config.py
index b71766b7da..2670a7a5f6 100644
--- a/src/calibre/gui2/device_drivers/mtp_config.py
+++ b/src/calibre/gui2/device_drivers/mtp_config.py
@@ -19,7 +19,7 @@ from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.gui2 import error_dialog
 from calibre.gui2.dialogs.template_dialog import TemplateDialog
 from calibre.utils.date import parse_date
-from calibre.gui2.device_drivers.mtp_folder_browser import Browser, TopLevel
+from calibre.gui2.device_drivers.mtp_folder_browser import Browser, IgnoredFolders
 
 class FormatsConfig(QWidget): # {{{
 
@@ -424,7 +424,7 @@ class MTPConfig(QTabWidget):
         d.exec_()
 
     def change_ignored_folders(self):
-        d = TopLevel(self.device,
+        d = IgnoredFolders(self.device,
                      self.current_ignored_folders, parent=self)
         if d.exec_() == d.Accepted:
             self.current_ignored_folders = d.ignored_folders
diff --git a/src/calibre/gui2/device_drivers/mtp_folder_browser.py b/src/calibre/gui2/device_drivers/mtp_folder_browser.py
index 6a54f65b38..e84542df9e 100644
--- a/src/calibre/gui2/device_drivers/mtp_folder_browser.py
+++ b/src/calibre/gui2/device_drivers/mtp_folder_browser.py
@@ -10,12 +10,11 @@ __docformat__ = 'restructuredtext en'
 from operator import attrgetter
 
 from PyQt4.Qt import (QTabWidget, QTreeWidget, QTreeWidgetItem, Qt, QDialog,
-        QDialogButtonBox, QVBoxLayout, QSize, pyqtSignal, QIcon, QLabel,
-        QListWidget, QListWidgetItem)
+        QDialogButtonBox, QVBoxLayout, QSize, pyqtSignal, QIcon, QLabel)
 
 from calibre.gui2 import file_icon_provider
 
-def item(f, parent):
+def browser_item(f, parent):
     name = f.name
     if not f.is_folder:
         name += ' [%s]'%f.last_mod_string
@@ -31,22 +30,24 @@ def item(f, parent):
 
 class Storage(QTreeWidget):
 
-    def __init__(self, storage, show_files):
+    def __init__(self, storage, show_files=False, item_func=browser_item):
         QTreeWidget.__init__(self)
+        self.item_func = item_func
         self.show_files = show_files
         self.create_children(storage, self)
         self.name = storage.name
         self.object_id = storage.persistent_id
         self.setMinimumHeight(350)
         self.setHeaderHidden(True)
+        self.storage = storage
 
     def create_children(self, f, parent):
         for child in sorted(f.folders, key=attrgetter('name')):
-            i = item(child, parent)
+            i = self.item_func(child, parent)
             self.create_children(child, i)
         if self.show_files:
             for child in sorted(f.files, key=attrgetter('name')):
-                i = item(child, parent)
+                i = self.item_func(child, parent)
 
     @property
     def current_item(self):
@@ -96,14 +97,14 @@ class Browser(QDialog):
     def current_item(self):
         return self.folders.current_item
 
-class TopLevel(QDialog):
+class IgnoredFolders(QDialog):
 
     def __init__(self, dev, ignored_folders=None, parent=None):
         QDialog.__init__(self, parent)
         self.l = l = QVBoxLayout()
         self.setLayout(l)
         self.la = la = QLabel('<p>'+ _('<b>Scanned folders:</b>') + ' ' +
-            _('You can select which top level folders calibre will '
+            _('You can select which folders calibre will '
               'scan when searching this device for books.'))
         la.setWordWrap(True)
         l.addWidget(la)
@@ -112,17 +113,18 @@ class TopLevel(QDialog):
         self.widgets = []
 
         for storage in dev.filesystem_cache.entries:
-            w = QListWidget(self)
-            w.storage = storage
+            self.dev = dev
+            w = Storage(storage, item_func=self.create_item)
+            del self.dev
             self.tabs.addTab(w, storage.name)
             self.widgets.append(w)
-            for child in sorted(storage.folders, key=attrgetter('name')):
-                i = QListWidgetItem(child.name)
-                i.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
-                i.setCheckState(Qt.Unchecked if
-                    dev.is_folder_ignored(storage, child.name,
-                            ignored_folders=ignored_folders) else Qt.Checked)
-                w.addItem(i)
+            w.itemChanged.connect(self.item_changed)
+
+        self.la2 = la = QLabel(_(
+            'If you a select a previously unselected folder, any sub-folders'
+            ' will not be visible until you restart calibre.'))
+        l.addWidget(la)
+        la.setWordWrap(True)
 
         self.bb = QDialogButtonBox(QDialogButtonBox.Ok |
                                    QDialogButtonBox.Cancel)
@@ -136,29 +138,68 @@ class TopLevel(QDialog):
         self.setWindowTitle(_('Choose folders to scan'))
         self.setWindowIcon(QIcon(I('devices/tablet.png')))
 
-        self.resize(500, 500)
+        self.resize(600, 500)
+
+    def item_changed(self, item, column):
+        w = item.treeWidget()
+        root = w.invisibleRootItem()
+        w.itemChanged.disconnect(self.item_changed)
+        try:
+            if item.checkState(0) == Qt.Checked:
+                # Ensure that the parents of this item are checked
+                p = item.parent()
+                while p is not None and p is not root:
+                    p.setCheckState(0, Qt.Checked)
+                    p = p.parent()
+            # Set the state of all descendants to the same state as this item
+            for child in self.iterchildren(item):
+                child.setCheckState(0, item.checkState(0))
+        finally:
+            w.itemChanged.connect(self.item_changed)
+
+    def iterchildren(self, node):
+        ' Iterate over all descendants of node '
+        for i in xrange(node.childCount()):
+            child = node.child(i)
+            yield child
+            for gc in self.iterchildren(child):
+                yield gc
+
+    def create_item(self, f, parent):
+        name = f.name
+        ans = QTreeWidgetItem(parent, [name])
+        ans.setData(0, Qt.UserRole, '/'.join(f.full_path[1:]))
+        ans.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
+        ans.setCheckState(0,
+            Qt.Unchecked if self.dev.is_folder_ignored(f.storage_id, f.full_path[1:]) else Qt.Checked)
+        ans.setData(0, Qt.DecorationRole, file_icon_provider().icon_from_ext('dir'))
+        return ans
 
     def select_all(self):
         w = self.tabs.currentWidget()
-        for i in xrange(w.count()):
-            x = w.item(i)
-            x.setCheckState(Qt.Checked)
+        for i in xrange(w.invisibleRootItem().childCount()):
+            c = w.invisibleRootItem().child(i)
+            c.setCheckState(0, Qt.Checked)
 
     def select_none(self):
         w = self.tabs.currentWidget()
-        for i in xrange(w.count()):
-            x = w.item(i)
-            x.setCheckState(Qt.Unchecked)
+        for i in xrange(w.invisibleRootItem().childCount()):
+            c = w.invisibleRootItem().child(i)
+            c.setCheckState(0, Qt.Unchecked)
 
     @property
     def ignored_folders(self):
         ans = {}
         for w in self.widgets:
-            ans[unicode(w.storage.object_id)] = folders = []
-            for i in xrange(w.count()):
-                x = w.item(i)
-                if x.checkState() != Qt.Checked:
-                    folders.append(unicode(x.text()))
+            folders = set()
+            for node in self.iterchildren(w.invisibleRootItem()):
+                if node.checkState(0) == Qt.Checked:
+                    continue
+                path = unicode(node.data(0, Qt.UserRole).toString())
+                parent = path.rpartition('/')[0]
+                if '/' not in path or icu_lower(parent) not in folders:
+                    folders.add(icu_lower(path))
+            ans[unicode(w.storage.storage_id)] = list(folders)
         return ans
 
 def setup_device():
@@ -184,17 +225,17 @@ def browse():
     dev.shutdown()
     return d.current_item
 
-def top_level():
+def ignored_folders():
     from calibre.gui2 import Application
     app = Application([])
     app
     dev = setup_device()
-    d = TopLevel(dev, None)
+    d = IgnoredFolders(dev)
     d.exec_()
     dev.shutdown()
     return d.ignored_folders
 
 if __name__ == '__main__':
-    # print (browse())
-    print ('Ignored:', top_level())
+    print (browse())
+    # print ('Ignored:', ignored_folders())
 

From d313792645bd1a0d3b7d21f98ed33d0e7a9fb858 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 4 Sep 2013 17:22:08 +0530
Subject: [PATCH 0729/1154] Possible fix for 1220468

---
 src/calibre/devices/idevice/libimobiledevice.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py
index bf87d30449..4a2b26239b 100644
--- a/src/calibre/devices/idevice/libimobiledevice.py
+++ b/src/calibre/devices/idevice/libimobiledevice.py
@@ -304,10 +304,11 @@ class libiMobileDevice():
             self._log(" device already disconnected")
 
     def dismount_ios_media_folder(self):
-        self._afc_client_free()
-        #self._lockdown_goodbye()
-        self._idevice_free()
-        self.device_mounted = False
+        if self.device_mounted:
+            self._afc_client_free()
+            #self._lockdown_goodbye()
+            self._idevice_free()
+            self.device_mounted = False
 
     def exists(self, path):
         '''

From a7bec029de45a6299478202e45ceb292b0ab3f87 Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Wed, 4 Sep 2013 22:36:55 +1000
Subject: [PATCH 0730/1154] Add device ids for new Kobo Aura

Fixes #1220693 [Add device id for new Kobo Aura](https://bugs.launchpad.net/calibre/+bug/1220693)
---
 src/calibre/devices/kobo/driver.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index a32f458a18..13f2f9236d 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -44,7 +44,7 @@ class KOBO(USBMS):
     gui_name = 'Kobo Reader'
     description = _('Communicate with the Kobo Reader')
     author = 'Timothy Legge and David Forrester'
-    version = (2, 1, 1)
+    version = (2, 1, 2)
 
     dbversion = 0
     fwversion = 0
@@ -1321,11 +1321,12 @@ class KOBOTOUCH(KOBO):
 
     TIMESTAMP_STRING = "%Y-%m-%dT%H:%M:%SZ"
 
+    AURA_PRODUCT_ID     = [0x4203]
     AURA_HD_PRODUCT_ID  = [0x4193]
     GLO_PRODUCT_ID      = [0x4173]
     MINI_PRODUCT_ID     = [0x4183]
     TOUCH_PRODUCT_ID    = [0x4163]
-    PRODUCT_ID          = AURA_HD_PRODUCT_ID + GLO_PRODUCT_ID + MINI_PRODUCT_ID + TOUCH_PRODUCT_ID
+    PRODUCT_ID          = AURA_PRODUCT_ID + AURA_HD_PRODUCT_ID + GLO_PRODUCT_ID + MINI_PRODUCT_ID + TOUCH_PRODUCT_ID
 
     BCD = [0x0110, 0x0326]
 
@@ -2704,6 +2705,8 @@ class KOBOTOUCH(KOBO):
                 opts.extra_customization = extra_customization
         return opts
 
+    def isAura(self):
+        return self.detected_device.idProduct in self.AURA_PRODUCT_ID
     def isAuraHD(self):
         return self.detected_device.idProduct in self.AURA_HD_PRODUCT_ID
     def isGlo(self):
@@ -2714,11 +2717,13 @@ class KOBOTOUCH(KOBO):
         return self.detected_device.idProduct in self.TOUCH_PRODUCT_ID
 
     def cover_file_endings(self):
-        return self.GLO_COVER_FILE_ENDINGS if self.isGlo() else self.AURA_HD_COVER_FILE_ENDINGS if self.isAuraHD() else self.COVER_FILE_ENDINGS
+        return self.GLO_COVER_FILE_ENDINGS if self.isGlo() or self.isAura() else self.AURA_HD_COVER_FILE_ENDINGS if self.isAuraHD() else self.COVER_FILE_ENDINGS
 
     def set_device_name(self):
         device_name = self.gui_name
-        if self.isAuraHD():
+        if self.isAura():
+            device_name = 'Kobo Aura'
+        elif self.isAuraHD():
             device_name = 'Kobo Aura HD'
         elif self.isGlo():
             device_name = 'Kobo Glo'

From ffc0b5af73ddebc51b95c6894801a7eef75614a9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 08:47:12 +0530
Subject: [PATCH 0731/1154] pep8

---
 src/calibre/library/field_metadata.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py
index 08c26e95a9..dcca9ef5e7 100644
--- a/src/calibre/library/field_metadata.py
+++ b/src/calibre/library/field_metadata.py
@@ -391,9 +391,7 @@ class FieldMetadata(dict):
     # }}}
 
     # search labels that are not db columns
-    search_items = [    'all',
-                        'search',
-                    ]
+    search_items = ['all', 'search']
 
     def __init__(self):
         self._field_metadata = copy.deepcopy(self._field_metadata_prototype)
@@ -434,12 +432,10 @@ class FieldMetadata(dict):
             yield key
 
     def __contains__(self, key):
-        return self.has_key(key)
+        return key in self._tb_cats or key == 'title_sort'
 
     def has_key(self, key):
-        if key == 'title_sort':
-            return True
-        return key in self._tb_cats
+        return key in self
 
     def keys(self):
         return self._tb_cats.keys()

From e7bcf65c34bc10aae181826ca13dc336e97f5040 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 09:43:58 +0530
Subject: [PATCH 0732/1154] Fix changing language in welcome wizard

Fix changing the user interface language in the welcome wizard causing
some parts of the interface to remain in the old language until calibre
is restarted. Fixes #1220767 [Language mismatch on the welcome wizard e-mail page & throughout the rest of the program UI](https://bugs.launchpad.net/calibre/+bug/1220767)
---
 src/calibre/gui2/main.py              |  19 ++--
 src/calibre/gui2/main_window.py       |  19 ++--
 src/calibre/gui2/wizard/__init__.py   |  14 ++-
 src/calibre/library/field_metadata.py | 129 +++++++++++++-------------
 4 files changed, 98 insertions(+), 83 deletions(-)

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 28dcd5dc34..10bc6c464c 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -11,7 +11,6 @@ from PyQt4.Qt import (QCoreApplication, QIcon, QObject, QTimer,
 from calibre import prints, plugins, force_unicode
 from calibre.constants import (iswindows, __appname__, isosx, DEBUG, islinux,
         filesystem_encoding, get_portable_base)
-from calibre.db.legacy import LibraryDatabase
 from calibre.utils.ipc import gui_socket_address, RC
 from calibre.gui2 import (ORG_NAME, APP_UID, initialize_file_icon_provider,
     Application, choose_dir, error_dialog, question_dialog, gprefs)
@@ -83,7 +82,6 @@ def find_portable_library():
         os.mkdir(lib)
 
 def init_qt(args):
-    from calibre.gui2.ui import Main
     parser = option_parser()
     opts, args = parser.parse_args(args)
     find_portable_library()
@@ -99,9 +97,8 @@ def init_qt(args):
     override = 'calibre-gui' if islinux else None
     app = Application(args, override_program_name=override)
     app.file_event_hook = EventAccumulator()
-    actions = tuple(Main.create_application_menubar())
     app.setWindowIcon(QIcon(I('lt.png')))
-    return app, opts, args, actions
+    return app, opts, args
 
 
 def get_default_library_path():
@@ -208,6 +205,7 @@ class GuiRunner(QObject):
         raise SystemExit(1)
 
     def initialize_db_stage2(self, db, tb):
+        from calibre.db.legacy import LibraryDatabase
 
         if db is None and tb is not None:
             # DB Repair failed
@@ -241,6 +239,7 @@ class GuiRunner(QObject):
                          det_msg=traceback.format_exc(), show=True)
 
     def initialize_db(self):
+        from calibre.db.legacy import LibraryDatabase
         db = None
         try:
             db = LibraryDatabase(self.library_path)
@@ -307,13 +306,15 @@ def run_in_debug_mode(logpath=None):
             stderr=subprocess.STDOUT, stdin=open(os.devnull, 'r'),
             creationflags=creationflags)
 
-def run_gui(opts, args, actions, listener, app, gui_debug=None):
+def run_gui(opts, args, listener, app, gui_debug=None):
     initialize_file_icon_provider()
     app.load_builtin_fonts(scan_for_fonts=True)
     if not dynamic.get('welcome_wizard_was_run', False):
         from calibre.gui2.wizard import wizard
         wizard().exec_()
         dynamic.set('welcome_wizard_was_run', True)
+    from calibre.gui2.ui import Main
+    actions = tuple(Main.create_application_menubar())
     runner = GuiRunner(opts, args, actions, listener, app, gui_debug=gui_debug)
     ret = app.exec_()
     if getattr(runner.main, 'run_wizard_b4_shutdown', False):
@@ -419,7 +420,7 @@ def main(args=sys.argv):
         args = ['calibre']
 
     try:
-        app, opts, args, actions = init_qt(args)
+        app, opts, args = init_qt(args)
     except AbortInit:
         return 1
     from calibre.utils.lock import singleinstance
@@ -440,10 +441,10 @@ def main(args=sys.argv):
             except socket.error:
                 cant_start()
             else:
-                return run_gui(opts, args, actions, listener, app,
+                return run_gui(opts, args, listener, app,
                         gui_debug=gui_debug)
         else:
-            return run_gui(opts, args, actions, listener, app,
+            return run_gui(opts, args, listener, app,
                     gui_debug=gui_debug)
     otherinstance = False
     try:
@@ -454,7 +455,7 @@ def main(args=sys.argv):
         # On windows only singleinstance can be trusted
         otherinstance = True if iswindows else False
     if not otherinstance and not opts.shutdown_running_calibre:
-        return run_gui(opts, args, actions, listener, app, gui_debug=gui_debug)
+        return run_gui(opts, args, listener, app, gui_debug=gui_debug)
 
     communicate(opts, args)
 
diff --git a/src/calibre/gui2/main_window.py b/src/calibre/gui2/main_window.py
index 150c437148..d73cb8d565 100644
--- a/src/calibre/gui2/main_window.py
+++ b/src/calibre/gui2/main_window.py
@@ -78,15 +78,16 @@ class MainWindow(QMainWindow):
 
     @classmethod
     def create_application_menubar(cls):
-        mb = QMenuBar(None)
-        menu = QMenu()
-        for action in cls.get_menubar_actions():
-            menu.addAction(action)
-            cls.__actions.append(action)
-            yield action
-        mb.addMenu(menu)
-        cls.___menu_bar = mb
-        cls.___menu = menu
+        if not cls.__actions:
+            mb = QMenuBar(None)
+            menu = QMenu()
+            for action in cls.get_menubar_actions():
+                menu.addAction(action)
+                cls.__actions.append(action)
+            mb.addMenu(menu)
+            cls.___menu_bar = mb
+            cls.___menu = menu
+        return cls.__actions
 
     @classmethod
     def get_menubar_actions(cls):
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 572e6a8bfe..519e38d499 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -14,7 +14,6 @@ from contextlib import closing
 from PyQt4.Qt import (QWizard, QWizardPage, QPixmap, Qt, QAbstractListModel,
     QVariant, QItemSelectionModel, SIGNAL, QObject, QTimer, pyqtSignal)
 from calibre import __appname__, patheq
-from calibre.db.legacy import LibraryDatabase
 from calibre.library.move import MoveLibrary
 from calibre.constants import (filesystem_encoding, iswindows, plugins,
         isportable)
@@ -29,7 +28,6 @@ from calibre.gui2 import min_available_height, available_width
 from calibre.utils.config import dynamic, prefs
 from calibre.gui2 import NONE, choose_dir, error_dialog
 from calibre.gui2.dialogs.progress import ProgressDialog
-from calibre.customize.ui import device_plugins
 
 if iswindows:
     winutil = plugins['winutil'][0]
@@ -272,6 +270,7 @@ class Android(Device):
 
     @classmethod
     def commit(cls):
+        from calibre.customize.ui import device_plugins
         super(Android, cls).commit()
         for plugin in device_plugins(include_disabled=True):
             if hasattr(plugin, 'configure_for_generic_epub_app'):
@@ -292,6 +291,7 @@ class AndroidPhoneWithKindle(Android):
 
     @classmethod
     def commit(cls):
+        from calibre.customize.ui import device_plugins
         super(Android, cls).commit()
         for plugin in device_plugins(include_disabled=True):
             if hasattr(plugin, 'configure_for_kindle_app'):
@@ -461,6 +461,11 @@ class KindlePage(QWizardPage, KindleUI):
     def nextId(self):
         return FinishPage.ID
 
+    def retranslateUi(self, widget):
+        KindleUI.retranslateUi(self, widget)
+        if hasattr(self, 'send_email_widget'):
+            self.send_email_widget.retranslateUi(self.send_email_widget)
+
 class StanzaPage(QWizardPage, StanzaUI):
 
     ID = 5
@@ -617,6 +622,7 @@ class Callback(object):
 
 _mm = None
 def move_library(oldloc, newloc, parent, callback_on_complete):
+    from calibre.db.legacy import LibraryDatabase
     callback = Callback(callback_on_complete)
     try:
         if not os.path.exists(os.path.join(newloc, 'metadata.db')):
@@ -710,10 +716,12 @@ class LibraryPage(QWizardPage, LibraryUI):
         __builtin__.__dict__['_'] = lambda(x): x
         from calibre.utils.localization import set_translators
         from calibre.gui2 import qt_app
+        from calibre.ebooks.metadata.book.base import reset_field_metadata
         set_translators()
         qt_app.load_translations()
         self.retranslate.emit()
         self.init_languages()
+        reset_field_metadata()
         try:
             lang = prefs['language'].lower()[:2]
             metadata_plugins = {
@@ -728,6 +736,7 @@ class LibraryPage(QWizardPage, LibraryUI):
             pass
 
     def is_library_dir_suitable(self, x):
+        from calibre.db.legacy import LibraryDatabase
         try:
             return LibraryDatabase.exists_at(x) or not os.listdir(x)
         except:
@@ -741,6 +750,7 @@ class LibraryPage(QWizardPage, LibraryUI):
         return True
 
     def change(self):
+        from calibre.db.legacy import LibraryDatabase
         x = choose_dir(self, 'database location dialog',
                          _('Select location for books'))
         if x:
diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py
index dcca9ef5e7..a76d78da0b 100644
--- a/src/calibre/library/field_metadata.py
+++ b/src/calibre/library/field_metadata.py
@@ -3,7 +3,7 @@ Created on 25 May 2010
 
 @author: charles
 '''
-import copy, traceback
+import traceback
 from collections import OrderedDict
 
 from calibre.utils.config_base import tweaks
@@ -40,67 +40,13 @@ category_icon_map = {
                     'languages'  : 'languages.png',
             }
 
+# Builtin metadata {{{
 
-class FieldMetadata(dict):
-    '''
-    key: the key to the dictionary is:
-    - for standard fields, the metadata field name.
-    - for custom fields, the metadata field name prefixed by '#'
-    This is done to create two 'namespaces' so the names don't clash
-
-    label: the actual column label. No prefixing.
-
-    datatype: the type of information in the field. Valid values are listed in
-    VALID_DATA_TYPES below.
-    is_multiple: valid for the text datatype. If {}, the field is to be
-    treated as a single term. If not None, it contains a dict of the form
-            {'cache_to_list': ',',
-             'ui_to_list': ',',
-             'list_to_ui': ', '}
-    where the cache_to_list contains the character used to split the value in
-    the meta2 table, ui_to_list contains the character used to create a list
-    from a value shown in the ui (each resulting value must be strip()ed and
-    empty values removed), and list_to_ui contains the string used in join()
-    to create a displayable string from the list.
-
-    kind == field: is a db field.
-    kind == category: standard tag category that isn't a field. see news.
-    kind == user: user-defined tag category.
-    kind == search: saved-searches category.
-
-    is_category: is a tag browser category. If true, then:
-       table: name of the db table used to construct item list
-       column: name of the column in the normalized table to join on
-       link_column: name of the column in the connection table to join on. This
-                    key should not be present if there is no link table
-       category_sort: the field in the normalized table to sort on. This
-                      key must be present if is_category is True
-       If these are None, then the category constructor must know how
-       to build the item list (e.g., formats, news).
-       The order below is the order that the categories will
-       appear in the tags pane.
-
-    name: the text that is to be used when displaying the field. Column headings
-    in the GUI, etc.
-
-    search_terms: the terms that can be used to identify the field when
-    searching. They can be thought of as aliases for metadata keys, but are only
-    valid when passed to search().
-
-    is_custom: the field has been added by the user.
-
-    rec_index: the index of the field in the db metadata record.
-
-    is_csp: field contains colon-separated pairs. Must also be text, is_multiple
-
-    '''
-
-    VALID_DATA_TYPES = frozenset([None, 'rating', 'text', 'comments', 'datetime',
-                'int', 'float', 'bool', 'series', 'composite', 'enumeration'])
-
-    # Builtin metadata {{{
-
-    _field_metadata_prototype = [
+def _builtin_field_metadata():
+    # This is a function so that changing the UI language allows newly created
+    # field metadata objects to have correctly translated labels for builtin
+    # fields.
+    return [
             ('authors',   {'table':'authors',
                            'column':'name',
                            'link_column':'author',
@@ -388,13 +334,70 @@ class FieldMetadata(dict):
                            'is_category':False,
                            'is_csp': False}),
         ]
-    # }}}
+# }}}
+
+class FieldMetadata(dict):
+    '''
+    key: the key to the dictionary is:
+    - for standard fields, the metadata field name.
+    - for custom fields, the metadata field name prefixed by '#'
+    This is done to create two 'namespaces' so the names don't clash
+
+    label: the actual column label. No prefixing.
+
+    datatype: the type of information in the field. Valid values are listed in
+    VALID_DATA_TYPES below.
+    is_multiple: valid for the text datatype. If {}, the field is to be
+    treated as a single term. If not None, it contains a dict of the form
+            {'cache_to_list': ',',
+             'ui_to_list': ',',
+             'list_to_ui': ', '}
+    where the cache_to_list contains the character used to split the value in
+    the meta2 table, ui_to_list contains the character used to create a list
+    from a value shown in the ui (each resulting value must be strip()ed and
+    empty values removed), and list_to_ui contains the string used in join()
+    to create a displayable string from the list.
+
+    kind == field: is a db field.
+    kind == category: standard tag category that isn't a field. see news.
+    kind == user: user-defined tag category.
+    kind == search: saved-searches category.
+
+    is_category: is a tag browser category. If true, then:
+       table: name of the db table used to construct item list
+       column: name of the column in the normalized table to join on
+       link_column: name of the column in the connection table to join on. This
+                    key should not be present if there is no link table
+       category_sort: the field in the normalized table to sort on. This
+                      key must be present if is_category is True
+       If these are None, then the category constructor must know how
+       to build the item list (e.g., formats, news).
+       The order below is the order that the categories will
+       appear in the tags pane.
+
+    name: the text that is to be used when displaying the field. Column headings
+    in the GUI, etc.
+
+    search_terms: the terms that can be used to identify the field when
+    searching. They can be thought of as aliases for metadata keys, but are only
+    valid when passed to search().
+
+    is_custom: the field has been added by the user.
+
+    rec_index: the index of the field in the db metadata record.
+
+    is_csp: field contains colon-separated pairs. Must also be text, is_multiple
+
+    '''
+
+    VALID_DATA_TYPES = frozenset([None, 'rating', 'text', 'comments', 'datetime',
+                'int', 'float', 'bool', 'series', 'composite', 'enumeration'])
 
     # search labels that are not db columns
     search_items = ['all', 'search']
 
     def __init__(self):
-        self._field_metadata = copy.deepcopy(self._field_metadata_prototype)
+        self._field_metadata = _builtin_field_metadata()
         self._tb_cats = OrderedDict()
         self._tb_custom_fields = {}
         self._search_term_map = {}

From ff18978f1c5c0739c7b487ddcfaedd4e79a72733 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 09:53:51 +0530
Subject: [PATCH 0733/1154] Delay eval column headers so that language change
 works

---
 src/calibre/gui2/library/models.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index f3b8cbde56..3d46b0e01e 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -121,7 +121,9 @@ class BooksModel(QAbstractTableModel):  # {{{
     count_changed_signal = pyqtSignal(int)
     searched             = pyqtSignal(object)
 
-    orig_headers = {
+    def __init__(self, parent=None, buffer=40):
+        QAbstractTableModel.__init__(self, parent)
+        self.orig_headers = {
                         'title'     : _("Title"),
                         'ondevice'   : _("On Device"),
                         'authors'   : _("Author(s)"),
@@ -134,10 +136,8 @@ class BooksModel(QAbstractTableModel):  # {{{
                         'series'    : ngettext("Series", 'Series', 1),
                         'last_modified' : _('Modified'),
                         'languages' : _('Languages'),
-    }
+        }
 
-    def __init__(self, parent=None, buffer=40):
-        QAbstractTableModel.__init__(self, parent)
         self.db = None
 
         self.formatter = SafeFormat()

From 58ac84cb57897dde9c544c89e3f16386cc156e10 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 10:07:30 +0530
Subject: [PATCH 0734/1154] Fix set_custom legacy API for series fields with
 index in value

Fixes #1220914 [db.set_custom on custom series column ignores [number]](https://bugs.launchpad.net/calibre/+bug/1220914)
---
 src/calibre/db/legacy.py       | 8 +++++---
 src/calibre/db/tests/legacy.py | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index acab647f07..150edf9c0a 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -20,7 +20,7 @@ from calibre.db.cache import Cache
 from calibre.db.errors import NoSuchFormat
 from calibre.db.categories import CATEGORY_SORTS
 from calibre.db.view import View
-from calibre.db.write import clean_identifier
+from calibre.db.write import clean_identifier, get_series_values
 from calibre.utils.date import utcnow
 from calibre.utils.search_query_parser import set_saved_searches
 
@@ -645,8 +645,10 @@ class LibraryDatabase(object):
             else:
                 affected_books = self.new_api._set_field(field, {book_id:val}, allow_case_change=allow_case_change)
             if data['datatype'] == 'series':
-                extra = 1.0 if extra is None else extra
-                self.new_api._set_field(field + '_index', {book_id:extra})
+                s, sidx = get_series_values(val)
+                if sidx is None:
+                    extra = 1.0 if extra is None else extra
+                    self.new_api._set_field(field + '_index', {book_id:extra})
         if notify and affected_books:
             self.notify('metadata', list(affected_books))
         return affected_books
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 6ffb7f987d..2387e7f35f 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -760,6 +760,12 @@ class LegacyTest(BaseTest):
         ndb.delete_custom_column('created')
         ndb = self.init_legacy(n)
         self.assertRaises(KeyError, ndb.custom_field_name, num=num)
+
+        # Test setting custom series
+        ndb = self.init_legacy(self.cloned_library)
+        ndb.set_custom(1, 'TS [9]', label='series')
+        self.assertEqual(ndb.new_api.field_for('#series', 1), 'TS')
+        self.assertEqual(ndb.new_api.field_for('#series_index', 1), 9)
     # }}}
 
     def test_legacy_original_fmt(self):  # {{{

From d7a206c5634c48ee50f9f8b33b2733f76c8cf595 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 10:49:45 +0530
Subject: [PATCH 0735/1154] Conversion: Add support for the CSS3 rem font size
 unit

---
 src/calibre/ebooks/__init__.py               | 9 ++++++---
 src/calibre/ebooks/oeb/stylizer.py           | 3 ++-
 src/calibre/ebooks/oeb/transforms/flatcss.py | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py
index bdbdca85c8..b308b092e9 100644
--- a/src/calibre/ebooks/__init__.py
+++ b/src/calibre/ebooks/__init__.py
@@ -133,7 +133,8 @@ def render_html(path_to_html, width=590, height=750, as_xhtml=True):
     from PyQt4.QtWebKit import QWebPage
     from PyQt4.Qt import QEventLoop, QPalette, Qt, QUrl, QSize
     from calibre.gui2 import is_ok_to_use_qt
-    if not is_ok_to_use_qt(): return None
+    if not is_ok_to_use_qt():
+        return None
     path_to_html = os.path.abspath(path_to_html)
     with CurrentDir(os.path.dirname(path_to_html)):
         page = QWebPage()
@@ -214,9 +215,9 @@ def calibre_cover(title, author_string, series_string=None,
         if cleanup:
             os.remove(font_path)
 
-UNIT_RE = re.compile(r'^(-*[0-9]*[.]?[0-9]*)\s*(%|em|ex|en|px|mm|cm|in|pt|pc)$')
+UNIT_RE = re.compile(r'^(-*[0-9]*[.]?[0-9]*)\s*(%|em|ex|en|px|mm|cm|in|pt|pc|rem)$')
 
-def unit_convert(value, base, font, dpi):
+def unit_convert(value, base, font, dpi, body_font_size=12):
     ' Return value in pts'
     if isinstance(value, (int, long, float)):
         return value
@@ -250,6 +251,8 @@ def unit_convert(value, base, font, dpi):
             result = value * 2.8346456693
         elif unit == 'cm':
             result = value * 28.346456693
+        elif unit == 'rem':
+            result = value * body_font_size
     return result
 
 def generate_masthead(title, output_path=None, width=600, height=60):
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index f9618099a4..fbb8fb1f49 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -210,6 +210,7 @@ class Stylizer(object):
         if self.profile is None:
             # Just in case the default profile is removed in the future :)
             self.profile = opts.output_profile
+        self.body_font_size = self.profile.fbase
         self.logger = oeb.logger
         item = oeb.manifest.hrefs[path]
         basename = os.path.basename(path)
@@ -630,7 +631,7 @@ class Style(object):
             base = self.width
         if not font and font != 0:
             font = self.fontSize
-        return unit_convert(value, base, font, self._profile.dpi)
+        return unit_convert(value, base, font, self._profile.dpi, body_font_size=self._stylizer.body_font_size)
 
     def pt_to_px(self, value):
         return (self._profile.dpi / 72.0) * value
diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index 1b678a3fe5..eadcdff4d0 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -310,6 +310,8 @@ class CSSFlattener(object):
         except:
             font_size = self.sbase if self.sbase is not None else \
                 self.context.source.fbase
+        if tag == 'body' and isinstance(font_size, (int, float)):
+            stylizer.body_font_size = font_size
         if 'align' in node.attrib:
             if tag != 'img':
                 cssdict['text-align'] = node.attrib['align']

From 9c5d2646e37bfd3d66a3d0c03e7e5831c4ec71a7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 10:59:34 +0530
Subject: [PATCH 0736/1154] pep8

---
 src/calibre/utils/fonts/sfnt/metrics.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/fonts/sfnt/metrics.py b/src/calibre/utils/fonts/sfnt/metrics.py
index 6f8deff31b..2c9b3b98d5 100644
--- a/src/calibre/utils/fonts/sfnt/metrics.py
+++ b/src/calibre/utils/fonts/sfnt/metrics.py
@@ -31,8 +31,8 @@ class FontMetrics(object):
         hhea.read_data(self.sfnt[b'hmtx'])
         self.ascent = hhea.ascender
         self.descent = hhea.descender
-        self.bbox = ( self.head.x_min, self.head.y_min, self.head.x_max,
-                     self.head.y_max )
+        self.bbox = (self.head.x_min, self.head.y_min, self.head.x_max,
+                     self.head.y_max)
         self._advance_widths = hhea.advance_widths
         self.cmap = self.sfnt[b'cmap']
         self.units_per_em = self.head.units_per_em

From 80887a8a1400ab9faf5209688782693a568b216a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 11:02:07 +0530
Subject: [PATCH 0737/1154] pep8

---
 src/calibre/ebooks/pdf/render/engine.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/pdf/render/engine.py b/src/calibre/ebooks/pdf/render/engine.py
index 4cdebdce8c..17b4d255da 100644
--- a/src/calibre/ebooks/pdf/render/engine.py
+++ b/src/calibre/ebooks/pdf/render/engine.py
@@ -108,7 +108,7 @@ class PdfEngine(QPaintEngine):
 
     def init_page(self):
         self.pdf.transform(self.pdf_system)
-        self.pdf.apply_fill(color=(1, 1, 1)) # QPainter has a default background brush of white
+        self.pdf.apply_fill(color=(1, 1, 1))  # QPainter has a default background brush of white
         self.graphics.reset()
         self.pdf.save_stack()
         self.current_page_inited = True
@@ -150,7 +150,8 @@ class PdfEngine(QPaintEngine):
         return QPaintEngine.Pdf
 
     def add_image(self, img, cache_key):
-        if img.isNull(): return
+        if img.isNull():
+            return
         return self.pdf.add_image(img, cache_key)
 
     @store_error
@@ -271,7 +272,8 @@ class PdfEngine(QPaintEngine):
     @store_error
     def drawPolygon(self, points, mode):
         self.apply_graphics_state()
-        if not points: return
+        if not points:
+            return
         p = Path()
         p.move_to(points[0].x(), points[0].y())
         for point in points[1:]:
@@ -303,8 +305,7 @@ class PdfEngine(QPaintEngine):
             link.append((llx, lly, urx, ury))
         self.pdf.links.add(current_item, start_page, links, anchors)
 
-class PdfDevice(QPaintDevice): # {{{
-
+class PdfDevice(QPaintDevice):  # {{{
 
     def __init__(self, file_object, page_size=A4, left_margin=inch,
                  top_margin=inch, right_margin=inch, bottom_margin=inch,

From 0aeec73eae1aea3ed03e83fb1610030cf509c49a Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Thu, 5 Sep 2013 15:39:44 +1000
Subject: [PATCH 0738/1154] Kobo driver: Sideloaded kepubs not added from
 device properly

When a sideloaded kepub is added from a Kobo device to the calibre
library, it is added as an epub, but the file copied is corrupt.
Fixes #1221035 [Sideloaded kepubs not added to library correctly](https://bugs.launchpad.net/calibre/+bug/1221035)
---
 src/calibre/devices/kobo/driver.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 13f2f9236d..9a86f61ef2 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -13,7 +13,7 @@ Originally developed by Timothy Legge <timlegge@gmail.com>.
 Extended to support Touch firmware 2.0.0 and later and newer devices by David Forrester <davidfor@internode.on.net>
 '''
 
-import os, time
+import os, time, shutil
 
 from contextlib import closing
 from calibre.devices.usbms.books import BookList
@@ -1001,9 +1001,10 @@ class KOBO(USBMS):
         '''
         for idx, path in enumerate(paths):
             if path.find('kepub') >= 0:
-                with closing(open(path)) as r:
+                with closing(open(path, 'rb')) as r:
                     tf = PersistentTemporaryFile(suffix='.epub')
-                    tf.write(r.read())
+                    shutil.copyfileobj(r, tf)
+#                    tf.write(r.read())
                     paths[idx] = tf.name
         return paths
 

From 8e009161b13e6d073aa1d0aa9bf5abc55a623085 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 16:03:02 +0530
Subject: [PATCH 0739/1154] PDF Output: Workaround for broken Qt font-variant
 handling

PDF Output: Workaround a bug in the library calibre uses to render HTML
to PDF that caused text in some documents that used small-caps fonts to
not render correctly. Fixes #1216354 [Private bug](https://bugs.launchpad.net/calibre/+bug/1216354)
---
 .../ebooks/conversion/plugins/pdf_output.py   | 44 +++++++++++++++++++
 src/calibre/ebooks/oeb/stylizer.py            |  4 +-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/pdf_output.py b/src/calibre/ebooks/conversion/plugins/pdf_output.py
index 4db9c07c48..be48afc8dd 100644
--- a/src/calibre/ebooks/conversion/plugins/pdf_output.py
+++ b/src/calibre/ebooks/conversion/plugins/pdf_output.py
@@ -285,5 +285,49 @@ class PDFOutput(OutputFormatPlugin):
         if close:
             out_stream.close()
 
+    def specialize_css_for_output(self, log, opts, item, stylizer):
+        ''' Qt WebKit (4.8.x) cannot handle font-variant: small-caps. It tries to fake the small caps,
+        which is ok, but the faking continues on to subsequent text that should not be in small-caps.
+        So we workaround the problem by faking small caps ourselves. A minimal example that Qt chokes on:
+        <html><body>
+        <p style="font-variant:small-caps">Some Small-caps Text</p>
+        <p style="text-align:justify">Some non small-caps text with enough text for at least one
+        full line and justification enabled. Both of these are needed for the example to work.</p>
+        </body></html> '''
+        from calibre.ebooks.oeb.base import XHTML
+        import itertools, string
+        if not hasattr(item.data, 'xpath'):
+            return
+        ws = unicode(string.whitespace)
 
+        def fake_small_caps(elem):
+            spans = []
+            for lowercase, textiter in itertools.groupby(elem.text, lambda x:x not in ws and icu_lower(x)==x):
+                text = ''.join(textiter)
+                if lowercase:
+                    text = icu_upper(text)
+                span = elem.makeelement(XHTML('span'))
+                span.text = text
+                style = stylizer.style(span)
+                if lowercase:
+                    style.set('font-size', '0.65em')
+                spans.append(span)
+            elem.text = None
+            elem[0:] = spans
+
+        def process_elem(elem, parent_fv=None):
+            children = tuple(elem)
+            style = stylizer.style(elem)
+            fv = style.drop('font-variant')
+            if not fv or fv.lower() == 'inherit':
+                fv = parent_fv
+            if fv and fv.lower() in {'smallcaps', 'small-caps'}:
+                if elem.text:
+                    fake_small_caps(elem)
+            for child in children:
+                if hasattr(getattr(child, 'tag', None), 'lower'):
+                    process_elem(child, parent_fv=fv)
+
+        for body in item.data.xpath('//*[local-name()="body"]'):
+            process_elem(body)
 
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index fbb8fb1f49..a19a36de8c 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -569,8 +569,8 @@ class Style(object):
     def set(self, prop, val):
         self._style[prop] = val
 
-    def drop(self, prop):
-        self._style.pop(prop, None)
+    def drop(self, prop, default=None):
+        return self._style.pop(prop, default)
 
     def _update_cssdict(self, cssdict):
         self._style.update(cssdict)

From 9c4c9cf07f35fceb759fa17895961d0c29159ea9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 16:31:25 +0530
Subject: [PATCH 0740/1154] ...

---
 src/calibre/ebooks/oeb/stylizer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index a19a36de8c..626af21b97 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -848,7 +848,7 @@ class Style(object):
             self._get('padding-bottom'), base=self.height)
 
     def __str__(self):
-        items = sorted(self._style.items())
+        items = sorted(self._style.iteritems())
         return '; '.join("%s: %s" % (key, val) for key, val in items)
 
     def cssdict(self):

From fa392c42a8e6e6eb5d782159dd5d7d29570ad683 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 Sep 2013 16:57:41 +0530
Subject: [PATCH 0741/1154] User manual updates

---
 manual/faq.rst   | 23 +++++++++++++++++++----
 manual/index.rst |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index 22d20e224b..8dd3dd3379 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -928,10 +928,25 @@ Why doesn't |app| have an automatic update?
 
 For many reasons:
 
-  * *There is no need to update every week*. If you are happy with how |app| works turn off the update notification and be on your merry way. Check back to see if you want to update once a year or so.
-  * Pre downloading the updates for all users in the background would require about 80TB of bandwidth *every week*. That costs thousands of dollars a month. And |app| is currently growing at 300,000 new users every month.
-  * If I implement a dialog that downloads the update and launches it, instead of going to the website as it does now, that would save the most ardent |app| updater, *at most five clicks a week*. There are far higher priority things to do in |app| development.
-  * If you really, really hate downloading |app| every week but still want to be up to the latest, I encourage you to run from source, which makes updating trivial. Instructions are :ref:`available here <develop>`.
+  * *There is no need to update every week*. If you are happy with how |app|
+    works turn off the update notification and be on your merry way. Check back
+    to see if you want to update once a year or so. There is a check box to
+    turn off the update notification, on the update notification itself.
+
+  * |app| downloads currently use `about 100TB of bandwidth a month
+    <http://status.calibre-ebook.com/downloads>`_. Implementing automatic
+    updates would greatly increase that and end up costing thousands of dollars
+    a month, which someone has to pay. And |app| is currently growing at `half
+    a million new installs a month <https://status.calibre-ebook.com>`_.
+
+  * If I implement a dialog that downloads the update and launches it, instead
+    of going to the website as it does now, that would save the most ardent
+    |app| updater, *at most five clicks a week*. There are far higher priority
+    things to do in |app| development.
+
+  * If you really, really hate downloading |app| every week but still want to
+    be up to the latest, I encourage you to run from source, which makes
+    updating trivial. Instructions are :ref:`available here <develop>`.
 
 How is |app| licensed?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/manual/index.rst b/manual/index.rst
index fa19761b1b..3d057ec740 100755
--- a/manual/index.rst
+++ b/manual/index.rst
@@ -39,6 +39,7 @@ Sections
 
 
 .. REMOVE_IN_PDF
+
 The main |app| user interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

From b5e7eaa2c7a3784d3ef0e588e0c1be1b4de981ed Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 6 Sep 2013 09:50:23 +0530
Subject: [PATCH 0742/1154] Show number of dups found

---
 src/calibre/gui2/dialogs/duplicates.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/dialogs/duplicates.py b/src/calibre/gui2/dialogs/duplicates.py
index 14072c0fbb..0204fde022 100644
--- a/src/calibre/gui2/dialogs/duplicates.py
+++ b/src/calibre/gui2/dialogs/duplicates.py
@@ -20,7 +20,10 @@ class DuplicatesQuestion(QDialog):
         QDialog.__init__(self, parent)
         self.l = l = QGridLayout()
         self.setLayout(l)
-        self.setWindowTitle(_('Duplicates found!'))
+        t = ngettext('Duplicate found', 'Duplicates found', len(duplicates))
+        if len(duplicates) > 1:
+            t = '%d %s' % (len(duplicates), t)
+        self.setWindowTitle(t)
         self.i = i = QIcon(I('dialog_question.png'))
         self.setWindowIcon(i)
 

From 61abebaf965e333de040e6e80a2d338020db0bd9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 6 Sep 2013 09:58:39 +0530
Subject: [PATCH 0743/1154] version 1.2

---
 Changelog.yaml           | 49 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index ea0cbdf18b..c6940440ca 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,55 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.2.0
+  date: 2013-09-06
+
+  new features:
+    - title: "Conversion: Add support for the CSS3 rem font size unit"
+
+    - title: "MTP devices, such as Android tablets/phones: Allow ignoring any folder on the device, not just top level folders. For newly connected devices, also scan /Android/data/com.amazon.kindle for books by default (newer versions of the Kindle app place downloaded files there)."
+
+    - title: "Speed up sorting when the book list is showing a restricted set of books, such as when the results of a search are displayed or a virtual library is used."
+      tickets: [1217622]
+
+    - title: "Edit metadata dialog: Add an undo option for the Trim cover button."
+      tickets: [1219227]
+ 
+  bug fixes:
+    - title: "Amazon metadata download: Update to handle website changes at amazon.com"
+
+    - title: "PDF Output: Workaround a bug in the library calibre uses to render HTML to PDF that caused text in some documents that used small-caps fonts to not render correctly."
+      tickets: [1216354]
+
+    - title: "Kobo driver: When a sideloaded kepub is added from a Kobo device to the calibre library, it is added as an epub, but the file copied is corrupt."
+      tickets: [1221035]
+
+    - title: "Fix changing the user interface language in the welcome wizard causing some parts of the interface to remain in the old language until calibre is restarted."
+      tickets: [1220767]
+
+    - title: "Fix regression in 1.0 that broke setting author names with the | character in them."
+      tickets: [1220348]
+
+    - title: "Content server: When running from inside the main calibre program, do not restrict the books shown based on the current virtual library in the main program. If you wish to restrict the books shown in the content server, use Preferences->Sharing over the net."
+
+    - title: "Output dates in the local timezone instead of UTC when generating CSV catalogs"
+
+    - title: "Library maintenance: When doing a check library instead of dumping the database to SQL and restoring it, run a VACUUM. This works around various bugs in the dump and restore capabilities of apsw."
+      tickets: [1217988] 
+
+    - title: "Edit metadata dialog: Fix adding an image to an empty comments block not working"
+
+    - title: "Conversion: Fix font declarations with invalid font-family values causing conversion to abort when subsetting is enabled."
+
+    - title: "MOBI Output: Fix conversion of some super/sub scripts failling if they are the first or last element in a paragraph."
+      tickets: [1218858]
+
+    - title: "New database backend: Various improvements to make the backend more robust against databases with invalid/corrupt data in them."
+      tickets: [1218465, 1218783]
+
+  improved recipes:
+    - Countryfile
+
 - version: 1.1.0
   date: 2013-08-30
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 07dfac1d03..bca14a0cbf 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 1, 0)
+numeric_version = (1, 2, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 00bd5a658ee45170ea36cedac79bdf7676ef227f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 6 Sep 2013 21:02:19 +0530
Subject: [PATCH 0744/1154] Update High Country News

---
 recipes/high_country_news.recipe | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/recipes/high_country_news.recipe b/recipes/high_country_news.recipe
index b1de2f3005..59214efb58 100644
--- a/recipes/high_country_news.recipe
+++ b/recipes/high_country_news.recipe
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 # Written:      2012-01-28
-# Last Edited:  2013-08-18
-# Remark:       Version 1.2
-# Integration of former separated Blog-News
+# Last Edited:  2013-09-06
+# Remark:       Version 1.3
+# Update cleanup for new web article design
 #
 __license__   = 'GPL v3'
 __copyright__ = '2013, Armin Geller'
@@ -28,7 +28,7 @@ class HighCountryNews(BasicNewsRecipe):
     no_stylesheets        = True
     auto_cleanup          = False
     remove_javascript     = True
-    remove_empty_feeds    = True  # 2013-08-18 AGe add
+    remove_empty_feeds    = True
     use_embedded_content  = False
 
     masthead_url          = 'http://www.hcn.org/logo.jpg'
@@ -43,10 +43,10 @@ class HighCountryNews(BasicNewsRecipe):
               (u'Most recent', u'http://feeds.feedburner.com/hcn/most-recent?format=xml'),
               (u'Current Issue', u'http://feeds.feedburner.com/hcn/current-issue?format=xml'),
 
-              (u'From the Blogs', u'http://feeds.feedburner.com/hcn/FromTheBlogs?format=xml'),  # 2013-07-23 AGe add
-              (u'Heard around the West', u'http://feeds.feedburner.com/hcn/heard?format=xml'),  # 2013-07-23 AGe add
-              (u'The GOAT Blog', u'http://feeds.feedburner.com/hcn/goat?format=xml'),          # 2013-07-23 AGe add
-              (u'The Range', u'http://feeds.feedburner.com/hcn/range?format=xml'),             # 2013-07-23 AGe add
+              (u'From the Blogs', u'http://feeds.feedburner.com/hcn/FromTheBlogs?format=xml'),
+              (u'Heard around the West', u'http://feeds.feedburner.com/hcn/heard?format=xml'),
+              (u'The GOAT Blog', u'http://feeds.feedburner.com/hcn/goat?format=xml'),
+              (u'The Range', u'http://feeds.feedburner.com/hcn/range?format=xml'),
 
               (u'Writers on the Range', u'http://feeds.feedburner.com/hcn/wotr'),
               (u'High Country Views', u'http://feeds.feedburner.com/hcn/HighCountryViews'),
@@ -65,13 +65,15 @@ class HighCountryNews(BasicNewsRecipe):
                                                       'image-viewer-controls nojs',
                                                       'protectedArticleWrapper',
                                                       'visualClear',
-                                                     ]})
+                                                      'feed-icons',  # 2013-09-06 AGe add
+                                                      'PayWallEmail',  # 2013-09-06 AGe add
+                                                     ]}),
+                    dict(name='div', attrs={'id':['offer-below-locked-article']}),  # 2013-09-06 AGe add
                   ]
 
     INDEX                 = ''
     def append_page(self, soup, appendtag, position):
         pager = soup.find('span',attrs={'class':'next'})
-        print 'AGE-append_page-------------->: ', pager
         if pager:
             nexturl = self.INDEX + pager.a['href']
             soup2 = self.index_to_soup(nexturl)

From 18e3f9464b8328d40307c5a18de5133a7a3cb337 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Sep 2013 12:55:11 +0530
Subject: [PATCH 0745/1154] Fix dump and restore on memory limited systems

---
 src/calibre/db/backend.py       | 42 +++++++++++++++++----------------
 src/calibre/db/tests/writing.py |  2 ++
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 1dab3cb2f5..513ed92a6c 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -982,33 +982,35 @@ class DB(object):
         self.conn
 
     def dump_and_restore(self, callback=None, sql=None):
-        from io import StringIO
+        import codecs
+        from calibre.utils.apsw_shell import Shell
         from contextlib import closing
         if callback is None:
             callback = lambda x: x
         uv = int(self.user_version)
 
-        if sql is None:
-            from calibre.utils.apsw_shell import Shell
-            callback(_('Dumping database to SQL') + '...')
-            buf = StringIO()
-            shell = Shell(db=self.conn, stdout=buf)
-            shell.process_command('.dump')
-            sql = buf.getvalue()
-            del shell
-            del buf
+        with TemporaryFile(suffix='.sql') as fname:
+            if sql is None:
+                callback(_('Dumping database to SQL') + '...')
+                with codecs.open(fname, 'wb', encoding='utf-8') as buf:
+                    shell = Shell(db=self.conn, stdout=buf)
+                    shell.process_command('.dump')
+            else:
+                with open(fname, 'wb') as buf:
+                    buf.write(sql if isinstance(sql, bytes) else sql.encode('utf-8'))
 
-        with TemporaryFile(suffix='_tmpdb.db', dir=os.path.dirname(self.dbpath)) as tmpdb:
-            callback(_('Restoring database from SQL') + '...')
-            with closing(Connection(tmpdb)) as conn:
-                conn.execute(sql)
-                conn.execute('PRAGMA user_version=%d;'%uv)
+            with TemporaryFile(suffix='_tmpdb.db', dir=os.path.dirname(self.dbpath)) as tmpdb:
+                callback(_('Restoring database from SQL') + '...')
+                with closing(Connection(tmpdb)) as conn:
+                    shell = Shell(db=conn, encoding='utf-8')
+                    shell.process_command('.read ' + fname)
+                    conn.execute('PRAGMA user_version=%d;'%uv)
 
-            self.close()
-            try:
-                atomic_rename(tmpdb, self.dbpath)
-            finally:
-                self.reopen()
+                self.close()
+                try:
+                    atomic_rename(tmpdb, self.dbpath)
+                finally:
+                    self.reopen()
 
     def vacuum(self):
         self.conn.execute('VACUUM')
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 762517a294..a42d47e67f 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -606,11 +606,13 @@ class WritingTest(BaseTest):
     def test_dump_and_restore(self):  # {{{
         ' Test roundtripping the db through SQL '
         cache = self.init_cache()
+        uv = int(cache.backend.user_version)
         all_ids = cache.all_book_ids()
         cache.dump_and_restore()
         self.assertEqual(cache.set_field('title', {1:'nt'}), set([1]), 'database connection broken')
         cache = self.init_cache()
         self.assertEqual(cache.all_book_ids(), all_ids, 'dump and restore broke database')
+        self.assertEqual(int(cache.backend.user_version), uv)
     # }}}
 
     def test_set_author_data(self):  # {{{

From f0d61014ab621814082e08abf219ab3c6764bb93 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Sep 2013 13:21:45 +0530
Subject: [PATCH 0746/1154] newdb: Handle databases with case duplicates

databases created with pre 1.0 versions of calibre could have multiple
tags/series/publishers/etc. that differ only in the case. This is
because sqlite's case handling only works for ascii characters.
This could cause problems when setting metadata.
Automatically detect and fix these databases. Fixes #1221545 [edit metadata individually>Download Metadata>press ok>unhandled exception](https://bugs.launchpad.net/calibre/+bug/1221545)
---
 src/calibre/db/tables.py        | 70 +++++++++++++++++++++++++++++++++
 src/calibre/db/tests/writing.py | 60 ++++++++++++++++++++++++++++
 src/calibre/db/write.py         | 10 ++++-
 3 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index d8b623b352..219f12a613 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -67,6 +67,13 @@ class Table(object):
     def fix_link_table(self, db):
         pass
 
+    def fix_case_duplicates(self, db):
+        ''' If this table contains entries that differ only by case, then merge
+        those entries. This can happen in databases created with old versions
+        of calibre and non-ascii values, since sqlite's NOCASE only works with
+        ascii text. '''
+        pass
+
 class VirtualTable(Table):
 
     '''
@@ -215,6 +222,26 @@ class ManyToOneTable(Table):
             db.conn.executemany('DELETE FROM {0} WHERE {1}=?'.format(
                 self.link_table, self.metadata['link_column']), tuple((x,) for x in extra_item_ids))
 
+    def fix_case_duplicates(self, db):
+        case_map = defaultdict(set)
+        for item_id, val in self.id_map.iteritems():
+            case_map[icu_lower(val)].add(item_id)
+
+        for v in case_map.itervalues():
+            if len(v) > 1:
+                main_id = min(v)
+                v.discard(main_id)
+                for item_id in v:
+                    self.id_map.pop(item_id, None)
+                    books = self.col_book_map.pop(item_id, set())
+                    for book_id in books:
+                        self.book_col_map[book_id] = main_id
+                db.conn.executemany('UPDATE {0} SET {1}=? WHERE {1}=?'.format(
+                    self.link_table, self.metadata['link_column']),
+                    tuple((main_id, x) for x in v))
+                db.conn.executemany('DELETE FROM {0} WHERE id=?'.format(self.metadata['table']),
+                    tuple((x,) for x in v))
+
     def remove_books(self, book_ids, db):
         clean = set()
         for book_id in book_ids:
@@ -386,6 +413,43 @@ class ManyToManyTable(ManyToOneTable):
                 self.link_table, lcol, table), (existing_item, item_id, item_id))
         return affected_books, new_id
 
+    def fix_case_duplicates(self, db):
+        from calibre.db.write import uniq
+        case_map = defaultdict(set)
+        for item_id, val in self.id_map.iteritems():
+            case_map[icu_lower(val)].add(item_id)
+
+        for v in case_map.itervalues():
+            if len(v) > 1:
+                done_books = set()
+                main_id = min(v)
+                v.discard(main_id)
+                for item_id in v:
+                    self.id_map.pop(item_id, None)
+                    books = self.col_book_map.pop(item_id, set())
+                    for book_id in books:
+                        if book_id in done_books:
+                            continue
+                        done_books.add(book_id)
+                        orig = self.book_col_map.get(book_id, ())
+                        if not orig:
+                            continue
+                        vals = uniq(tuple(main_id if x in v else x for x in orig))
+                        self.book_col_map[book_id] = vals
+                        if len(orig) == len(vals):
+                            # We have a simple replacement
+                            db.conn.executemany(
+                                'UPDATE {0} SET {1}=? WHERE {1}=? AND book=?'.format(
+                                self.link_table, self.metadata['link_column']),
+                                tuple((main_id, x, book_id) for x in v))
+                        else:
+                            # duplicates
+                            db.conn.execute('DELETE FROM {0} WHERE book=?'.format(self.link_table), (book_id,))
+                            db.conn.executemany(
+                                'INSERT INTO {0} (book,{1}) VALUES (?,?)'.format(self.link_table, self.metadata['link_column']),
+                                tuple((book_id, x) for x in vals))
+                db.conn.executemany('DELETE FROM {0} WHERE id=?'.format(self.metadata['table']),
+                    tuple((x,) for x in v))
 
 class AuthorsTable(ManyToManyTable):
 
@@ -445,6 +509,9 @@ class FormatsTable(ManyToManyTable):
     def read_id_maps(self, db):
         pass
 
+    def fix_case_duplicates(self, db):
+        pass
+
     def read_maps(self, db):
         self.fname_map = fnm = defaultdict(dict)
         self.size_map = sm = defaultdict(dict)
@@ -524,6 +591,9 @@ class IdentifiersTable(ManyToManyTable):
     def read_id_maps(self, db):
         pass
 
+    def fix_case_duplicates(self, db):
+        pass
+
     def read_maps(self, db):
         self.book_col_map = defaultdict(dict)
         self.col_book_map = defaultdict(set)
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index a42d47e67f..572453dfad 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -632,3 +632,63 @@ class WritingTest(BaseTest):
         self.assertEqual({3}, cache.set_sort_for_authors(sdata),
                          'Setting the author sort to the same value as before, incorrectly marked some books as dirty')
     # }}}
+
+    def test_fix_case_duplicates(self):  # {{{
+        ' Test fixing of databases that have items in is_many fields that differ only by case '
+        ae = self.assertEqual
+        cache = self.init_cache()
+        conn = cache.backend.conn
+        conn.execute('INSERT INTO publishers (name) VALUES ("mūs")')
+        lid = conn.last_insert_rowid()
+        conn.execute('INSERT INTO publishers (name) VALUES ("MŪS")')
+        uid = conn.last_insert_rowid()
+        conn.execute('DELETE FROM books_publishers_link')
+        conn.execute('INSERT INTO books_publishers_link (book,publisher) VALUES (1, %d)' % lid)
+        conn.execute('INSERT INTO books_publishers_link (book,publisher) VALUES (2, %d)' % uid)
+        conn.execute('INSERT INTO books_publishers_link (book,publisher) VALUES (3, %d)' % uid)
+        cache.reload_from_db()
+        t = cache.fields['publisher'].table
+        for x in (lid, uid):
+            self.assertIn(x, t.id_map)
+            self.assertIn(x, t.col_book_map)
+        ae(t.book_col_map[1], lid)
+        ae(t.book_col_map[2], uid)
+        t.fix_case_duplicates(cache.backend)
+        for c in (cache, self.init_cache()):
+            t = c.fields['publisher'].table
+            self.assertNotIn(uid, t.id_map)
+            self.assertNotIn(uid, t.col_book_map)
+            for bid in (1, 2, 3):
+                ae(c.field_for('publisher', bid), "mūs")
+            c.close()
+
+        cache = self.init_cache()
+        conn = cache.backend.conn
+        conn.execute('INSERT INTO tags (name) VALUES ("mūūs")')
+        lid = conn.last_insert_rowid()
+        conn.execute('INSERT INTO tags (name) VALUES ("MŪŪS")')
+        uid = conn.last_insert_rowid()
+        conn.execute('INSERT INTO tags (name) VALUES ("mūŪS")')
+        mid = conn.last_insert_rowid()
+        conn.execute('INSERT INTO tags (name) VALUES ("t")')
+        norm = conn.last_insert_rowid()
+        conn.execute('DELETE FROM books_tags_link')
+        for book_id, vals in {1:(lid, uid), 2:(uid, mid), 3:(lid, norm)}.iteritems():
+            conn.executemany('INSERT INTO books_tags_link (book,tag) VALUES (?,?)',
+                             tuple((book_id, x) for x in vals))
+        cache.reload_from_db()
+        t = cache.fields['tags'].table
+        for x in (lid, uid, mid):
+            self.assertIn(x, t.id_map)
+            self.assertIn(x, t.col_book_map)
+        t.fix_case_duplicates(cache.backend)
+        for c in (cache, self.init_cache()):
+            t = c.fields['tags'].table
+            for x in (uid, mid):
+                self.assertNotIn(x, t.id_map)
+                self.assertNotIn(x, t.col_book_map)
+            ae(c.field_for('tags', 1), (t.id_map[lid],))
+            ae(c.field_for('tags', 2), (t.id_map[lid],), 'failed for book 2')
+            ae(c.field_for('tags', 3), (t.id_map[lid], t.id_map[norm]))
+    # }}}
+
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index ee81659984..6025bbad9b 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -278,6 +278,10 @@ def many_one(book_id_val_map, db, field, allow_case_change, *args):
     # Map values to db ids, including any new values
     kmap = safe_lower if dt in {'text', 'series'} else lambda x:x
     rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
+    if len(rid_map) != len(table.id_map):
+        # table has some entries that differ only in case, fix it
+        table.fix_case_duplicates(db)
+        rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
     val_map = {None:None}
     case_changes = {}
     for val in book_id_val_map.itervalues():
@@ -339,7 +343,7 @@ def many_one(book_id_val_map, db, field, allow_case_change, *args):
 
 # Many-Many fields {{{
 
-def uniq(vals, kmap):
+def uniq(vals, kmap=lambda x:x):
     ''' Remove all duplicates from vals, while preserving order. kmap must be a
     callable that returns a hashable value for every item in vals '''
     vals = vals or ()
@@ -358,6 +362,10 @@ def many_many(book_id_val_map, db, field, allow_case_change, *args):
     # Map values to db ids, including any new values
     kmap = safe_lower if dt == 'text' else lambda x:x
     rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
+    if len(rid_map) != len(table.id_map):
+        # table has some entries that differ only in case, fix it
+        table.fix_case_duplicates(db)
+        rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
     val_map = {}
     case_changes = {}
     book_id_val_map = {k:uniq(vals, kmap) for k, vals in book_id_val_map.iteritems()}

From 7d9081a4e458af5d3df78b1590ebf36456dc1345 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Sep 2013 13:51:10 +0530
Subject: [PATCH 0747/1154] DOCX Input: Handle images in footnotes and endnotes

Fixes #1221686 [conversion from docx cannot handle images in footnotes](https://bugs.launchpad.net/calibre/+bug/1221686)
---
 src/calibre/ebooks/docx/footnotes.py |  9 +++++----
 src/calibre/ebooks/docx/to_html.py   | 10 +++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/docx/footnotes.py b/src/calibre/ebooks/docx/footnotes.py
index ff2613cbb1..704edc88d7 100644
--- a/src/calibre/ebooks/docx/footnotes.py
+++ b/src/calibre/ebooks/docx/footnotes.py
@@ -12,9 +12,10 @@ from calibre.ebooks.docx.names import get, XPath, descendants
 
 class Note(object):
 
-    def __init__(self, parent):
+    def __init__(self, parent, rels):
         self.type = get(parent, 'w:type', 'normal')
         self.parent = parent
+        self.rels = rels
 
     def __iter__(self):
         for p in descendants(self.parent, 'w:p', 'w:tbl'):
@@ -28,18 +29,18 @@ class Footnotes(object):
         self.counter = 0
         self.notes = OrderedDict()
 
-    def __call__(self, footnotes, endnotes):
+    def __call__(self, footnotes, footnotes_rels, endnotes, endnotes_rels):
         if footnotes is not None:
             for footnote in XPath('./w:footnote[@w:id]')(footnotes):
                 fid = get(footnote, 'w:id')
                 if fid:
-                    self.footnotes[fid] = Note(footnote)
+                    self.footnotes[fid] = Note(footnote, footnotes_rels)
 
         if endnotes is not None:
             for endnote in XPath('./w:endnote[@w:id]')(endnotes):
                 fid = get(endnote, 'w:id')
                 if fid:
-                    self.endnotes[fid] = Note(endnote)
+                    self.endnotes[fid] = Note(endnote, endnotes_rels)
 
     def get_ref(self, ref):
         fid = get(ref, 'w:id')
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 05b4b7e9d3..103cf03e20 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -106,6 +106,7 @@ class Convert(object):
         self.styles.apply_section_page_breaks(self.section_starts[1:])
 
         notes_header = None
+        orig_rid_map = self.images.rid_map
         if self.footnotes.has_notes:
             dl = DL()
             dl.set('class', 'notes')
@@ -118,6 +119,7 @@ class Convert(object):
                 dl[-1][0].tail = ']'
                 dl.append(DD())
                 paras = []
+                self.images.rid_map = note.rels[0]
                 for wp in note:
                     if wp.tag.endswith('}tbl'):
                         self.tables.register(wp, self.styles)
@@ -127,6 +129,7 @@ class Convert(object):
                         dl[-1].append(p)
                         paras.append(wp)
                 self.styles.apply_contextual_spacing(paras)
+        self.images.rid_map = orig_rid_map
 
         self.resolve_links(relationships_by_id)
 
@@ -231,17 +234,22 @@ class Convert(object):
         fonts = self.fonts = Fonts()
 
         foraw = enraw = None
+        forel, enrel = ({}, {}), ({}, {})
         if foname is not None:
             try:
                 foraw = self.docx.read(foname)
             except KeyError:
                 self.log.warn('Footnotes %s do not exist' % foname)
+            else:
+                forel = self.docx.get_relationships(foname)
         if enname is not None:
             try:
                 enraw = self.docx.read(enname)
             except KeyError:
                 self.log.warn('Endnotes %s do not exist' % enname)
-        footnotes(fromstring(foraw) if foraw else None, fromstring(enraw) if enraw else None)
+            else:
+                enrel = self.docx.get_relationships(enname)
+        footnotes(fromstring(foraw) if foraw else None, forel, fromstring(enraw) if enraw else None, enrel)
 
         if fname is not None:
             embed_relationships = self.docx.get_relationships(fname)[0]

From f0b49de770910ef7349f6f0e23120e5ad537dd59 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Sep 2013 14:02:51 +0530
Subject: [PATCH 0748/1154] Do not scroll the book list horizontally after
 editing metadata

Fixes #1221552 [Changing column view of boooks to title as first column when starting to "edit metadata individually"](https://bugs.launchpad.net/calibre/+bug/1221552)
---
 src/calibre/gui2/actions/edit_metadata.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 4983640291..ca37239f5b 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -296,20 +296,21 @@ class EditMetadataAction(InterfaceAction):
                 list(range(self.gui.library_view.model().rowCount(QModelIndex())))
             current_row = row_list.index(cr)
 
-        changed, rows_to_refresh = self.do_edit_metadata(row_list, current_row)
+        with self.gui.library_view.preserve_state():
+            changed, rows_to_refresh = self.do_edit_metadata(row_list, current_row)
 
-        m = self.gui.library_view.model()
+            m = self.gui.library_view.model()
 
-        if rows_to_refresh:
-            m.refresh_rows(rows_to_refresh)
+            if rows_to_refresh:
+                m.refresh_rows(rows_to_refresh)
 
-        if changed:
-            m.refresh_ids(list(changed))
-            current = self.gui.library_view.currentIndex()
-            if self.gui.cover_flow:
-                self.gui.cover_flow.dataChanged()
-            m.current_changed(current, previous)
-            self.gui.tags_view.recount()
+            if changed:
+                m.refresh_ids(list(changed))
+                current = self.gui.library_view.currentIndex()
+                if self.gui.cover_flow:
+                    self.gui.cover_flow.dataChanged()
+                m.current_changed(current, previous)
+                self.gui.tags_view.recount()
 
     def do_edit_metadata(self, row_list, current_row):
         from calibre.gui2.metadata.single import edit_metadata

From 301dc7a70f41aea82d1eb19b13cb7dcef62fb60c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Sep 2013 14:55:32 +0530
Subject: [PATCH 0749/1154] Update Anandtech

---
 recipes/anandtech.recipe | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/recipes/anandtech.recipe b/recipes/anandtech.recipe
index b9aa4520db..6d5d6b4716 100644
--- a/recipes/anandtech.recipe
+++ b/recipes/anandtech.recipe
@@ -12,26 +12,30 @@ class anan(BasicNewsRecipe):
 
     title = 'Anandtech'
     description = 'comprehensive Hardware Tests'
-    __author__ = 'Oliver Niesner' # 2012-09-20 AGE: update
+    __author__ = 'Oliver Niesner, Armin Geller'  # 2013-09-07 AGE: update
     use_embedded_content   = False
     language = 'en'
     timefmt = ' [%d %b %Y]'
-    oldest_article        = 7 # 2012-09-20 AGE: update
+    oldest_article        = 7
     max_articles_per_feed = 40
     no_stylesheets = True
     remove_javascript = True
     encoding = 'utf-8'
 
-    cover_url = 'http://www.anandtech.com/content/images/globals/header_logo.png' # 2012-09-20 AGE: new
-    masthead_url = 'http://www.anandtech.com/content/images/globals/printheader.png' # 2012-09-20 AGE: update
+    cover_url = 'http://www.anandtech.com/content/images/globals/header_logo.png'
+    masthead_url = 'http://www.anandtech.com/content/images/globals/printheader.png'
 
+    keep_only_tags = [
+                       dict(name='section', attrs={'class':['main_cont']}),
+                     ]
+    remove_tags=[                                            # 2013-09-07 AGE: update
+                  dict(name='div', attrs={'class':['print',  # logo
+                                                    'breadcrumb_area noprint',
+                                                    'fl-rt noprint',
+                                                    'blog_top_right',]})
+                 ]
 
-    remove_tags=[
-                  dict(name='a', attrs={'class': 'bluebutton noprint'}),
-                  dict(name='img', attrs={'alt': 'header'}),
-                 ] # 2012-09-20 AGE: update
-  
-    feeds =  [ ('Anandtech', 'http://www.anandtech.com/rss/')]
+    feeds =  [('Anandtech', 'http://www.anandtech.com/rss/')]
 
     def print_version(self,url):
-        return url.replace('0Cshow0C', '0Cprint0C') # 2012-09-20 AGE: update
\ No newline at end of file
+        return url.replace("0Cshow0C", "0Cprint0C")  # 2013-09-07 AGE: update

From 233395c0d4ff037c11064e627f3249b9e1698fe0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Sep 2013 16:46:41 +0530
Subject: [PATCH 0750/1154] Content server: Fix key error in opds feed after
 using virtual libraries in the main server

Fixes #1222108 [KeyError virt_libs on opds](https://bugs.launchpad.net/calibre/+bug/1222108)
---
 src/calibre/library/server/opds.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
index b4e5c7b265..56e0067abc 100644
--- a/src/calibre/library/server/opds.py
+++ b/src/calibre/library/server/opds.py
@@ -586,7 +586,10 @@ class OPDSServer(object):
                 (_('Title'), _('Title'), 'Otitle'),
                 ]
         def getter(x):
-            return category_meta[x]['name'].lower()
+            try:
+                return category_meta[x]['name'].lower()
+            except KeyError:
+                return x
         for category in sorted(categories, key=lambda x: sort_key(getter(x))):
             if len(categories[category]) == 0:
                 continue

From 255fcce9e5d7bb2dc8d4a0b3ee76a213601bf655 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Sep 2013 16:47:25 +0530
Subject: [PATCH 0751/1154] pep8

---
 src/calibre/library/server/opds.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
index 56e0067abc..7dd07c064e 100644
--- a/src/calibre/library/server/opds.py
+++ b/src/calibre/library/server/opds.py
@@ -126,7 +126,7 @@ def CATALOG_ENTRY(item, item_kind, base_href, version, updated,
     if item.id is not None:
         iid = 'I' + str(item.id)
         iid += ':'+item_kind
-    link = NAVLINK(href = base_href + '/' + hexlify(iid))
+    link = NAVLINK(href=base_href + '/' + hexlify(iid))
     count = (_('%d books') if item.count > 1 else _('%d book'))%item.count
     if ignore_count:
         count = ''
@@ -145,7 +145,7 @@ def CATALOG_ENTRY(item, item_kind, base_href, version, updated,
 def CATALOG_GROUP_ENTRY(item, category, base_href, version, updated):
     id_ = 'calibre:category-group:'+category+':'+item.text
     iid = item.text
-    link = NAVLINK(href = base_href + '/' + hexlify(iid))
+    link = NAVLINK(href=base_href + '/' + hexlify(iid))
     return E.entry(
             TITLE(item.text),
             ID(id_),
@@ -176,7 +176,7 @@ def ACQUISITION_ENTRY(item, version, db, updated, CFM, CKEYS, prefix):
                                                            no_tag_count=True)))
     series = item[FM['series']]
     if series:
-        extra.append(_('SERIES: %(series)s [%(sidx)s]<br />')%\
+        extra.append(_('SERIES: %(series)s [%(sidx)s]<br />')%
                 dict(series=xml(series),
                 sidx=fmt_sidx(float(item[FM['series_index']]))))
     for key in CKEYS:
@@ -231,7 +231,7 @@ def ACQUISITION_ENTRY(item, version, db, updated, CFM, CKEYS, prefix):
 
 # }}}
 
-class Feed(object): # {{{
+class Feed(object):  # {{{
 
     def __init__(self, id_, updated, version, subtitle=None,
             title=__appname__ + ' ' + _('Library'),
@@ -267,14 +267,14 @@ class Feed(object): # {{{
                 xml_declaration=True)
     # }}}
 
-class TopLevel(Feed): # {{{
+class TopLevel(Feed):  # {{{
 
     def __init__(self,
             updated,  # datetime object in UTC
             categories,
             version,
-            id_       = 'urn:calibre:main',
-            subtitle  = _('Books in your library')
+            id_='urn:calibre:main',
+            subtitle=_('Books in your library')
             ):
         Feed.__init__(self, id_, updated, version, subtitle=subtitle)
 
@@ -335,7 +335,6 @@ class CategoryGroupFeed(NavFeed):
             self.root.append(CATALOG_GROUP_ENTRY(item, which, base_href, version, updated))
 
 
-
 class OPDSServer(object):
 
     def add_routes(self, connect):
@@ -452,7 +451,6 @@ class OPDSServer(object):
         return str(CategoryFeed(items, category, id_, updated, version, offsets,
             page_url, up_url, self.db))
 
-
     def opds_navcatalog(self, which=None, version=0, offset=0):
         try:
             offset = int(offset)
@@ -563,7 +561,8 @@ class OPDSServer(object):
             raise cherrypy.HTTPError(404, 'Non id categories not supported')
 
         q = category
-        if q == 'news': q = 'tags'
+        if q == 'news':
+            q = 'tags'
         ids = self.db.get_books_for_category(q, which)
         sort_by = 'series' if category == 'series' else 'title'
 
@@ -573,7 +572,6 @@ class OPDSServer(object):
 
     # }}}
 
-
     def opds(self, version=0):
         version = int(version)
         if version not in BASE_HREFS:

From 7a4f87b992d996926ca2c58d768ce15fa712f1ab Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 8 Sep 2013 11:22:34 +0530
Subject: [PATCH 0752/1154] DOCX Input: Specify zero default margins for
 headings

DOCX Input: Fix extra top/bottom margins around headings when the
heading style in word does not specify any top/bottom margins.
---
 src/calibre/ebooks/docx/styles.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/docx/styles.py b/src/calibre/ebooks/docx/styles.py
index 4572eb59f2..1201f696c2 100644
--- a/src/calibre/ebooks/docx/styles.py
+++ b/src/calibre/ebooks/docx/styles.py
@@ -437,7 +437,8 @@ class Styles(object):
             '''\
             body { font-family: %s; font-size: %s; color: %s }
 
-            ul, ol, p { margin: 0; padding: 0 }
+            /* In word all paragraphs have zero margins unless explicitly specified in a style */
+            ul, ol, p, h1, h2, h3, h4, h5, h6 { margin: 0; padding: 0 }
 
             sup.noteref a { text-decoration: none }
 

From 604530e569efb3a7899f626fd6fb630630486757 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 8 Sep 2013 12:40:52 +0530
Subject: [PATCH 0753/1154] DOCX Input: Line breaks at the end of a paragraph

DOCX Input: Fix a single line break at the end of a paragraph not being
rendered as a blank line.
---
 src/calibre/ebooks/docx/cleanup.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/calibre/ebooks/docx/cleanup.py b/src/calibre/ebooks/docx/cleanup.py
index 33f869faca..60db64b621 100644
--- a/src/calibre/ebooks/docx/cleanup.py
+++ b/src/calibre/ebooks/docx/cleanup.py
@@ -8,8 +8,12 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os
 
+from lxml.html.builder import P
+
 from calibre.ebooks.docx.names import XPath
 
+NBSP = '\xa0'
+
 def mergeable(previous, current):
     if previous.tail or current.tail:
         return False
@@ -161,6 +165,16 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
     for span in root.xpath('//span[not(@class) and not(@id)]'):
         lift(span)
 
+    # If a paragraph ends with a <br>, that <br> is not rendered in HTML, but
+    # it is in Word, so move it out
+    for br in root.xpath('//p/node()[position()=last()]/self::br'):
+        if not br.tail:
+            p = br.getparent()
+            p.remove(br)
+            gp = p.getparent()
+            blank = P(NBSP)
+            gp.insert(gp.index(p)+1, blank)
+
     if detect_cover:
         # Check if the first image in the document is possibly a cover
         img = root.xpath('//img[@src][1]')

From e9b531584fcb1ac272ba68efd390b0e82af2ced4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 8 Sep 2013 13:11:22 +0530
Subject: [PATCH 0754/1154] Nicer fix for trailing <br>

Also handles headings and list items with trailing <br>s
---
 src/calibre/ebooks/docx/cleanup.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/calibre/ebooks/docx/cleanup.py b/src/calibre/ebooks/docx/cleanup.py
index 60db64b621..8de6dff0ba 100644
--- a/src/calibre/ebooks/docx/cleanup.py
+++ b/src/calibre/ebooks/docx/cleanup.py
@@ -8,8 +8,6 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os
 
-from lxml.html.builder import P
-
 from calibre.ebooks.docx.names import XPath
 
 NBSP = '\xa0'
@@ -166,14 +164,10 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
         lift(span)
 
     # If a paragraph ends with a <br>, that <br> is not rendered in HTML, but
-    # it is in Word, so move it out
-    for br in root.xpath('//p/node()[position()=last()]/self::br'):
+    # it is in Word, so add a trailing space to ensure it is rendered.
+    for br in root.xpath('//*[contains("p,h1,h2,h3,h4,h5,h6,li", name())]/node()[position()=last()]/self::br'):
         if not br.tail:
-            p = br.getparent()
-            p.remove(br)
-            gp = p.getparent()
-            blank = P(NBSP)
-            gp.insert(gp.index(p)+1, blank)
+            br.tail = NBSP
 
     if detect_cover:
         # Check if the first image in the document is possibly a cover

From 14c1c6aabe9aa48af4560b15847f283e9b6e1804 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 9 Sep 2013 08:52:10 +0530
Subject: [PATCH 0755/1154] Show timestamps in local timezone in viewer
 metadata page

---
 src/calibre/ebooks/metadata/book/base.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 2f964bc4ee..bacf10dc73 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -742,6 +742,7 @@ class Metadata(object):
         A HTML representation of this object.
         '''
         from calibre.ebooks.metadata import authors_to_string
+        from calibre.utils.date import isoformat
         ans = [(_('Title'), unicode(self.title))]
         ans += [(_('Author(s)'), (authors_to_string(self.authors) if self.authors else _('Unknown')))]
         ans += [(_('Publisher'), unicode(self.publisher))]
@@ -753,9 +754,9 @@ class Metadata(object):
             ans += [(_('Series'), unicode(self.series) + ' #%s'%self.format_series_index())]
         ans += [(_('Languages'), u', '.join(self.languages))]
         if self.timestamp is not None:
-            ans += [(_('Timestamp'), unicode(self.timestamp.isoformat(' ')))]
+            ans += [(_('Timestamp'), unicode(isoformat(self.timestamp, as_utc=False, sep=' ')))]
         if self.pubdate is not None:
-            ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))]
+            ans += [(_('Published'), unicode(isoformat(self.pubdate, as_utc=False, sep=' ')))]
         if self.rights is not None:
             ans += [(_('Rights'), unicode(self.rights))]
         for key in self.custom_field_keys():

From ec29e28944a4e8cd28c5371476ce22ab5abec54f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 9 Sep 2013 11:13:35 +0530
Subject: [PATCH 0756/1154] DOCX Input: Fix various issues with
 numbering->lists

DOCX Input: Handle numbered paragraphs where the numbering is specified
in the paragraph style, instead of on the paragraph directly. Also
support the use of arbitrary, styled text for bullets.
---
 src/calibre/ebooks/docx/char_styles.py |  6 +--
 src/calibre/ebooks/docx/cleanup.py     | 14 ++----
 src/calibre/ebooks/docx/numbering.py   | 66 ++++++++++++++++----------
 src/calibre/ebooks/docx/styles.py      | 14 ++++--
 src/calibre/ebooks/docx/to_html.py     | 14 +++++-
 5 files changed, 71 insertions(+), 43 deletions(-)

diff --git a/src/calibre/ebooks/docx/char_styles.py b/src/calibre/ebooks/docx/char_styles.py
index c9a2fee4c9..e4c9383c68 100644
--- a/src/calibre/ebooks/docx/char_styles.py
+++ b/src/calibre/ebooks/docx/char_styles.py
@@ -196,9 +196,9 @@ class RunStyle(object):
             td = set()
             if self.text_decoration is not inherit:
                 td.add(self.text_decoration)
-            if self.strike:
+            if self.strike and self.strike is not inherit:
                 td.add('line-through')
-            if self.dstrike:
+            if self.dstrike and self.dstrike is not inherit:
                 td.add('line-through')
             if td:
                 c['text-decoration'] = ' '.join(td)
@@ -206,7 +206,7 @@ class RunStyle(object):
                 c['text-transform'] = 'uppercase'
             if self.i is True:
                 c['font-style'] = 'italic'
-            if self.shadow:
+            if self.shadow and self.shadow is not inherit:
                 c['text-shadow'] = '2px 2px'
             if self.smallCaps is True:
                 c['font-variant'] = 'small-caps'
diff --git a/src/calibre/ebooks/docx/cleanup.py b/src/calibre/ebooks/docx/cleanup.py
index 8de6dff0ba..bb421afc89 100644
--- a/src/calibre/ebooks/docx/cleanup.py
+++ b/src/calibre/ebooks/docx/cleanup.py
@@ -10,8 +10,6 @@ import os
 
 from calibre.ebooks.docx.names import XPath
 
-NBSP = '\xa0'
-
 def mergeable(previous, current):
     if previous.tail or current.tail:
         return False
@@ -116,7 +114,7 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
 
     # Merge consecutive spans that have the same styling
     current_run = []
-    for span in root.xpath('//span'):
+    for span in root.xpath('//span[not(@style)]'):
         if not current_run:
             current_run.append(span)
         else:
@@ -149,7 +147,7 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
                     parent.append(child)
 
     # Make spans whose only styling is bold or italic into <b> and <i> tags
-    for span in root.xpath('//span[@class]'):
+    for span in root.xpath('//span[@class and not(@style)]'):
         css = class_map.get(span.get('class', None), {})
         if len(css) == 1:
             if css == {'font-style':'italic'}:
@@ -160,15 +158,9 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
                 del span.attrib['class']
 
     # Get rid of <span>s that have no styling
-    for span in root.xpath('//span[not(@class) and not(@id)]'):
+    for span in root.xpath('//span[not(@class) and not(@id) and not(@style)]'):
         lift(span)
 
-    # If a paragraph ends with a <br>, that <br> is not rendered in HTML, but
-    # it is in Word, so add a trailing space to ensure it is rendered.
-    for br in root.xpath('//*[contains("p,h1,h2,h3,h4,h5,h6,li", name())]/node()[position()=last()]/self::br'):
-        if not br.tail:
-            br.tail = NBSP
-
     if detect_cover:
         # Check if the first image in the document is possibly a cover
         img = root.xpath('//img[@src][1]')
diff --git a/src/calibre/ebooks/docx/numbering.py b/src/calibre/ebooks/docx/numbering.py
index 2bf86eea27..602689a8cd 100644
--- a/src/calibre/ebooks/docx/numbering.py
+++ b/src/calibre/ebooks/docx/numbering.py
@@ -12,7 +12,7 @@ from collections import Counter
 from lxml.html.builder import OL, UL, SPAN
 
 from calibre.ebooks.docx.block_styles import ParagraphStyle
-from calibre.ebooks.docx.char_styles import RunStyle
+from calibre.ebooks.docx.char_styles import RunStyle, inherit
 from calibre.ebooks.docx.names import XPath, get
 
 STYLE_MAP = {
@@ -40,6 +40,7 @@ class Level(object):
         self.paragraph_style = self.character_style = None
         self.is_numbered = False
         self.num_template = None
+        self.bullet_template = None
         self.pic_id = None
 
         if lvl is not None:
@@ -47,17 +48,17 @@ class Level(object):
 
     def copy(self):
         ans = Level()
-        for x in ('restart', 'pic_id', 'start', 'fmt', 'para_link', 'paragraph_style', 'character_style', 'is_numbered', 'num_template'):
+        for x in ('restart', 'pic_id', 'start', 'fmt', 'para_link', 'paragraph_style', 'character_style', 'is_numbered', 'num_template', 'bullet_template'):
             setattr(ans, x, getattr(self, x))
         return ans
 
-    def format_template(self, counter, ilvl):
+    def format_template(self, counter, ilvl, template):
         def sub(m):
             x = int(m.group(1)) - 1
             if x > ilvl or x not in counter:
                 return ''
             return '%d' % (counter[x] - (0 if x == ilvl else 1))
-        return re.sub(r'%(\d+)', sub, self.num_template).rstrip() + '\xa0'
+        return re.sub(r'%(\d+)', sub, template).rstrip() + '\xa0'
 
     def read_from_xml(self, lvl, override=False):
         for lr in XPath('./w:lvlRestart[@w:val]')(lvl):
@@ -72,6 +73,13 @@ class Level(object):
             except (TypeError, ValueError):
                 pass
 
+        for rPr in XPath('./w:rPr')(lvl):
+            ps = RunStyle(rPr)
+            if self.character_style is None:
+                self.character_style = ps
+            else:
+                self.character_style.update(ps)
+
         lt = None
         for lr in XPath('./w:lvlText[@w:val]')(lvl):
             lt = get(lr, 'w:val')
@@ -80,7 +88,12 @@ class Level(object):
             val = get(lr, 'w:val')
             if val == 'bullet':
                 self.is_numbered = False
-                self.fmt = {'\uf0a7':'square', 'o':'circle'}.get(lt, 'disc')
+                cs = self.character_style
+                if lt in {'\uf0a7', 'o'} or (
+                    cs.font_family is not inherit and cs.font_family.lower() in {'wingdings', 'symbol'}):
+                    self.fmt = {'\uf0a7':'square', 'o':'circle'}.get(lt, 'disc')
+                else:
+                    self.bullet_template = lt
                 for lpid in XPath('./w:lvlPicBulletId[@w:val]')(lvl):
                     self.pic_id = get(lpid, 'w:val')
             else:
@@ -99,13 +112,6 @@ class Level(object):
             else:
                 self.paragraph_style.update(ps)
 
-        for rPr in XPath('./w:rPr')(lvl):
-            ps = RunStyle(rPr)
-            if self.character_style is None:
-                self.character_style = ps
-            else:
-                self.character_style.update(ps)
-
     def css(self, images, pic_map, rid_map):
         ans = {'list-style-type': self.fmt}
         if self.pic_id:
@@ -119,6 +125,14 @@ class Level(object):
                     ans['list-style-image'] = 'url("images/%s")' % fname
         return ans
 
+    def char_css(self):
+        try:
+            css = self.character_style.css
+        except AttributeError:
+            css = {}
+        css.pop('font-family', None)
+        return css
+
 class NumberingDefinition(object):
 
     def __init__(self, parent=None):
@@ -233,7 +247,10 @@ class Numbering(object):
                     p.set('list-lvl', str(ilvl))
                     p.set('list-id', num_id)
                     if lvl.num_template is not None:
-                        val = lvl.format_template(counter, ilvl)
+                        val = lvl.format_template(counter, ilvl, lvl.num_template)
+                        p.set('list-template', val)
+                    elif lvl.bullet_template is not None:
+                        val = lvl.format_template(counter, ilvl, lvl.bullet_template)
                         p.set('list-template', val)
                     self.update_counter(counter, ilvl, d.levels)
 
@@ -250,12 +267,15 @@ class Numbering(object):
             ilvl = int(start.get('list-lvl'))
             lvl = d.levels[ilvl]
             lvlid = start.get('list-id') + start.get('list-lvl')
-            wrap = (OL if lvl.is_numbered else UL)('\n\t')
             has_template = 'list-template' in start.attrib
+            wrap = (OL if lvl.is_numbered or has_template else UL)('\n\t')
             if has_template:
                 wrap.set('lvlid', lvlid)
             else:
                 wrap.set('class', styles.register(lvl.css(images, self.pic_map, self.rid_map), 'list'))
+            ccss = lvl.char_css()
+            if ccss:
+                ccss = styles.register(ccss, 'bullet')
             parent.insert(idx, wrap)
             last_val = None
             for child in current_run:
@@ -269,6 +289,8 @@ class Numbering(object):
                         span.append(gc)
                     child.append(span)
                     span = SPAN(child.get('list-template'))
+                    if ccss:
+                        span.set('class', ccss)
                     last = templates.get(lvlid, '')
                     if span.text and len(span.text) > len(last):
                         templates[lvlid] = span.text
@@ -299,15 +321,12 @@ class Numbering(object):
                     commit(current_run)
             commit(current_run)
 
+        # Convert the list items that use custom text for bullets into tables
+        # so that they display correctly
         for wrap in body.xpath('//ol[@lvlid]'):
-            lvlid = wrap.attrib.pop('lvlid')
+            wrap.attrib.pop('lvlid')
             wrap.tag = 'div'
-            text = ''
-            maxtext = templates.get(lvlid, '').replace('.', '')[:-1]
-            for li in wrap.iterchildren('li'):
-                t = li[0].text
-                if t and len(t) > len(text):
-                    text = t
+            wrap.set('style', 'display:table')
             for i, li in enumerate(wrap.iterchildren('li')):
                 li.tag = 'div'
                 li.attrib.pop('value', None)
@@ -315,9 +334,8 @@ class Numbering(object):
                 obj = object_map[li]
                 bs = styles.para_cache[obj]
                 if i == 0:
-                    m = len(maxtext)  # Move the table left to simulate the behavior of a list (number is to the left of text margin)
-                    wrap.set('style', 'display:table; margin-left: -%dem; padding-left: %s' % (m, bs.css.get('margin-left', 0)))
+                    wrap.set('style', 'display:table; padding-left:%s' %
+                             bs.css.get('margin-left', '0'))
                 bs.css.pop('margin-left', None)
                 for child in li:
                     child.set('style', 'display:table-cell')
-
diff --git a/src/calibre/ebooks/docx/styles.py b/src/calibre/ebooks/docx/styles.py
index 1201f696c2..142cb9e89d 100644
--- a/src/calibre/ebooks/docx/styles.py
+++ b/src/calibre/ebooks/docx/styles.py
@@ -92,7 +92,7 @@ class Style(object):
                 else:
                     self.character_style.update(rs)
 
-        if self.style_type == 'numbering':
+        if self.style_type in {'numbering', 'paragraph'}:
             self.numbering_style_link = None
             for x in XPath('./w:pPr/w:numPr/w:numId[@w:val]')(elem):
                 self.numbering_style_link = get(x, 'w:val')
@@ -150,7 +150,7 @@ class Styles(object):
                 self.id_map[s.style_id] = s
             if s.is_default:
                 self.default_styles[s.style_type] = s
-            if s.style_type == 'numbering' and s.numbering_style_link:
+            if getattr(s, 'numbering_style_link', None) is not None:
                 self.numbering_style_links[s.style_id] = s.numbering_style_link
 
         self.default_paragraph_style = self.default_character_style = None
@@ -212,6 +212,7 @@ class Styles(object):
     def resolve_paragraph(self, p):
         ans = self.para_cache.get(p, None)
         if ans is None:
+            linked_style = None
             ans = self.para_cache[p] = ParagraphStyle()
             ans.style_name = None
             direct_formatting = None
@@ -233,7 +234,7 @@ class Styles(object):
 
             default_para = self.default_styles.get('paragraph', None)
             if direct_formatting.linked_style is not None:
-                ls = self.get(direct_formatting.linked_style)
+                ls = linked_style = self.get(direct_formatting.linked_style)
                 if ls is not None:
                     ans.style_name = ls.name
                     ps = ls.paragraph_style
@@ -256,6 +257,11 @@ class Styles(object):
                     ps = self.numbering.get_para_style(num_id, lvl)
                     if ps is not None:
                         parent_styles.append(ps)
+            if not is_numbering and linked_style is not None and getattr(linked_style.paragraph_style, 'numbering', inherit) is not inherit:
+                num_id, lvl = linked_style.paragraph_style.numbering
+                if num_id is not None:
+                    p.set('calibre_num_id', '%s:%s' % (lvl, num_id))
+                is_numbering = True
 
             for attr in ans.all_properties:
                 if not (is_numbering and attr == 'text_indent'):  # skip text-indent for lists
@@ -379,7 +385,7 @@ class Styles(object):
 
     def resolve_numbering(self, numbering):
         # When a numPr element appears inside a paragraph style, the lvl info
-        # must be discarder and pStyle used instead.
+        # must be discarded and pStyle used instead.
         self.numbering = numbering
         for style in self:
             ps = style.paragraph_style
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 103cf03e20..cdb50fcffd 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -30,6 +30,8 @@ from calibre.ebooks.docx.fields import Fields
 from calibre.ebooks.metadata.opf2 import OPFCreator
 from calibre.utils.localization import canonicalize_lang, lang_as_iso639_1
 
+NBSP = '\xa0'
+
 class Text:
 
     def __init__(self, elem, attr, buf):
@@ -396,7 +398,17 @@ class Convert(object):
         if not dest.text and len(dest) == 0:
             # Empty paragraph add a non-breaking space so that it is rendered
             # by WebKit
-            dest.text = '\xa0'
+            dest.text = NBSP
+
+        # If the last element in a block is a <br> the <br> is not rendered in
+        # HTML, unless it is followed by a trailing space. Word, on the other
+        # hand inserts a blank line for trailing <br>s.
+        if len(dest) > 0 and not dest[-1].tail:
+            if dest[-1].tag == 'br':
+                dest[-1].tail = NBSP
+            elif len(dest[-1]) > 0 and dest[-1][-1].tag == 'br' and not dest[-1][-1].tail:
+                dest[-1][-1].tail = NBSP
+
         return dest
 
     def wrap_elems(self, elems, wrapper):

From c390b2e0ec408646e3547d3f440cc616e8450a77 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 9 Sep 2013 21:03:47 +0530
Subject: [PATCH 0757/1154] Increase default max cover size tweak

---
 resources/default_tweaks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index a4d3a5b540..51bb84883b 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -444,7 +444,7 @@ public_smtp_relay_delay = 301
 # All covers in the calibre library will be resized, preserving aspect ratio,
 # to fit within this size. This is to prevent slowdowns caused by extremely
 # large covers
-maximum_cover_size = (1200, 1600)
+maximum_cover_size = (1450, 2000)
 
 #: Where to send downloaded news
 # When automatically sending downloaded news to a connected device, calibre

From 778edcbab84cbca2696e517601ca2d482ecd10a9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Sep 2013 08:00:42 +0530
Subject: [PATCH 0758/1154] Update Daily Express

---
 recipes/daily_express.recipe | 45 ++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/recipes/daily_express.recipe b/recipes/daily_express.recipe
index 208fbc7172..dc55d3f0b8 100644
--- a/recipes/daily_express.recipe
+++ b/recipes/daily_express.recipe
@@ -1,10 +1,9 @@
-from calibre.web.feeds.news import BasicNewsRecipe
 import re
+from calibre.web.feeds.news import BasicNewsRecipe
 class AdvancedUserRecipe1376229553(BasicNewsRecipe):
     title          = u'Daily Express'
     __author__ = 'Dave Asbury'
-    language = 'en_GB'
-    # 13-08-17 remove quoted text from article
+    # 9-9-13 added article author and now use (re.compile(r'>[\w].+? News<'
     encoding    = 'utf-8'
     remove_empty_feeds = True
     #remove_javascript     = True
@@ -15,33 +14,49 @@ class AdvancedUserRecipe1376229553(BasicNewsRecipe):
     compress_news_images = True
     compress_news_images_max_size = 30
     ignore_duplicate_articles = {'title', 'url'}
+    masthead_url = 'http://cdn.images.dailyexpress.co.uk/img/page/express_logo.png'
+
+    preprocess_regexps = [
+
+                (re.compile(r'widget', re.IGNORECASE | re.DOTALL), lambda match: ''),
+                        (re.compile(r'Related articles', re.IGNORECASE | re.DOTALL), lambda match: ''),
+                        (re.compile(r'Add Your Comment<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                (re.compile(r'>More [\w].+?<', re.IGNORECASE), lambda match: '><'),
+                                (re.compile(r'>[\w].+? News<', re.IGNORECASE), lambda match: '><'),
+                                #(re.compile(r'Health News<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                        #(re.compile(r'Car News<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                        #(re.compile(r'TV & Radio News<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                        #(re.compile(r'Food & Recipe News<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                        #(re.compile(r'More City & Business<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                        #(re.compile(r'Travel News<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                        #(re.compile(r'Garden News<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                #(re.compile(r'Fashion & Beauty News<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                #(re.compile(r'More Personal Finance<', re.IGNORECASE | re.DOTALL), lambda match: '<'),
+                                #(re.compile(r'<h3>More UK</h3>', re.IGNORECASE | re.DOTALL), lambda match: ''),
+
+                ]
 
     remove_tags = [
                                 dict(attrs={'class' : 'quote'}),
-                dict(attrs={'class' : 'author'}),
+                #dict(attrs={'class' : 'author'}),
                                 dict(name='footer'),
                                 dict(attrs={'id' : 'header_addons'}),
                 dict(attrs={'class' : 'hoverException'}),
                                 dict(name='_li'),dict(name='li'),
                         dict(attrs={'class' : 'box related-articles clear'}),
                                 dict(attrs={'class' : 'news-list'}),
+                                dict(attrs={'class' : 'sponsored-section'}),
+                                dict(attrs={'class' : 'pull-quote on-right'}),
+                                dict(attrs={'class' : 'pull-quote on-left'}),
+
                              ]
     keep_only_tags = [
                 dict(name='h1'),
                                 dict(attrs={'class' : 'publish-info'}),
-                                # dict(name='h3'),
-                                #dict(name='section',attrs={'class' : 'photo'}),
-                #dict(name='section',attrs={'class' : 'text-description'}),
-
-                dict(attrs={'class' : 'clearfix hR new-style'}),
+                                dict(name='h3', limit=2),
+                                dict(attrs={'class' : 'clearfix hR new-style'}),
                              ]
 
-    preprocess_regexps = [
-        (re.compile(r'widget', re.IGNORECASE | re.DOTALL), lambda match: '')]
-
-    preprocess_regexps = [
-        (re.compile(r'<h3>More UK</h3>', re.IGNORECASE | re.DOTALL), lambda match: '')]
-
     feeds          = [(u'UK News', u'http://www.express.co.uk/posts/rss/1/uk'),
                  (u'World News',u'http://www.express.co.uk/posts/rss/78/world'),
                          (u'Finance',u'http://www.express.co.uk/posts/rss/21/finance'),

From c43a3e79698dcded673676c9df32b67ffb59fedd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Sep 2013 14:13:02 +0530
Subject: [PATCH 0759/1154] Preserve current book when doing searches

When doing searches or switching between virtual libraries in the main
book list, preserve the current book. The currently selected book will
remain visible if it is present in the results of the search or the
selected virtual library. Fixes #1216713 [After selecting books which belongs to same serie, when returning to main window, we are at the top of the list and not at previously selected item](https://bugs.launchpad.net/calibre/+bug/1216713)
---
 src/calibre/gui2/library/alternate_views.py | 32 +++++++++++++++++++
 src/calibre/gui2/library/models.py          |  2 ++
 src/calibre/gui2/library/views.py           | 35 ++++++++++++++++++++-
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index cd8f78202d..d460eec0bb 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -226,6 +226,7 @@ class AlternateViews(object):
         self.stack = None
         self.break_link = False
         self.main_connected = False
+        self.current_book_state = None
 
     def set_stack(self, stack):
         self.stack = stack
@@ -290,6 +291,15 @@ class AlternateViews(object):
         for view in self.views.itervalues():
             if view is not self.main_view:
                 view.set_context_menu(menu)
+
+    def save_current_book_state(self):
+        self.current_book_state = self.current_view, self.current_view.current_book_state()
+
+    def restore_current_book_state(self):
+        if self.current_book_state is not None:
+            if self.current_book_state[0] is self.current_view:
+                self.current_view.restore_current_book_state(self.current_book_state[1])
+            self.current_book_state = None
 # }}}
 
 # Rendering of covers {{{
@@ -773,4 +783,26 @@ class GridView(QListView):
             sm.select(QItemSelection(top, bottom), sm.Select)
         else:
             return QListView.mousePressEvent(self, ev)
+
+    @property
+    def current_book(self):
+        ci = self.currentIndex()
+        if ci.isValid():
+            try:
+                return self.model().db.data.index_to_id(ci.row())
+            except (IndexError, ValueError, KeyError, TypeError, AttributeError):
+                pass
+
+    def current_book_state(self):
+        return self.current_book
+
+    def restore_current_book_state(self, state):
+        book_id = state
+        try:
+            row = self.model().db.data.id_to_index(book_id)
+        except (IndexError, ValueError, KeyError, TypeError, AttributeError):
+            return
+        self.set_current_row(row)
+        self.select_rows((row,))
+        self.scrollTo(self.model().index(row, 0), self.PositionAtCenter)
 # }}}
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 3d46b0e01e..2db64fd8b3 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -120,6 +120,7 @@ class BooksModel(QAbstractTableModel):  # {{{
     new_bookdisplay_data = pyqtSignal(object)
     count_changed_signal = pyqtSignal(int)
     searched             = pyqtSignal(object)
+    search_done          = pyqtSignal()
 
     def __init__(self, parent=None, buffer=40):
         QAbstractTableModel.__init__(self, parent)
@@ -392,6 +393,7 @@ class BooksModel(QAbstractTableModel):  # {{{
             # Do not issue search done for the null search. It is used to clear
             # the search and count records for restrictions
             self.searched.emit(True)
+        self.search_done.emit()
 
     def sort(self, col, order, reset=True):
         if not self.db:
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 34896c413f..6711da1d9b 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -149,6 +149,7 @@ class BooksView(QTableView):  # {{{
 
     files_dropped = pyqtSignal(object)
     add_column_signal = pyqtSignal()
+    is_library_view = True
 
     def viewportEvent(self, event):
         if (event.type() == event.ToolTip and not gprefs['book_list_tooltips']):
@@ -776,6 +777,28 @@ class BooksView(QTableView):  # {{{
                     self.scrollTo(self.model().index(row, i), self.PositionAtCenter)
                     break
 
+    @property
+    def current_book(self):
+        ci = self.currentIndex()
+        if ci.isValid():
+            try:
+                return self.model().db.data.index_to_id(ci.row())
+            except (IndexError, ValueError, KeyError, TypeError, AttributeError):
+                pass
+
+    def current_book_state(self):
+        return self.current_book, self.horizontalScrollBar().value()
+
+    def restore_current_book_state(self, state):
+        book_id, hpos = state
+        try:
+            row = self.model().db.data.id_to_index(book_id)
+        except (IndexError, ValueError, KeyError, TypeError, AttributeError):
+            return
+        self.set_current_row(row)
+        self.scroll_to_row(row)
+        self.horizontalScrollBar().setValue(hpos)
+
     def set_current_row(self, row=0, select=True, for_sync=False):
         if row > -1 and row < self.model().rowCount(QModelIndex()):
             h = self.horizontalHeader()
@@ -929,18 +952,26 @@ class BooksView(QTableView):  # {{{
             self.select_rows([id_to_select], using_ids=True)
 
     def search_proxy(self, txt):
+        if self.is_library_view:
+            # Save the current book before doing the search, after the search
+            # is completed, this book will become the current book and be
+            # scrolled to if it is present in the search results
+            self.alternate_views.save_current_book_state()
         self._model.search(txt)
         id_to_select = self._model.get_current_highlighted_id()
         if id_to_select is not None:
             self.select_rows([id_to_select], using_ids=True)
         elif self._model.highlight_only:
             self.clearSelection()
-        self.setFocus(Qt.OtherFocusReason)
+        if self.isVisible():
+            self.setFocus(Qt.OtherFocusReason)
 
     def connect_to_search_box(self, sb, search_done):
         sb.search.connect(self.search_proxy)
         self._search_done = search_done
         self._model.searched.connect(self.search_done)
+        if self.is_library_view:
+            self._model.search_done.connect(self.alternate_views.restore_current_book_state)
 
     def connect_to_book_display(self, bd):
         self._model.new_bookdisplay_data.connect(bd)
@@ -955,6 +986,8 @@ class BooksView(QTableView):  # {{{
 
 class DeviceBooksView(BooksView):  # {{{
 
+    is_library_view = False
+
     def __init__(self, parent):
         BooksView.__init__(self, parent, DeviceBooksModel,
                            use_edit_metadata_dialog=False)

From 936baf7e145a3f34bd61730cdee8b10c1d1f9713 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 10 Sep 2013 10:46:53 +0200
Subject: [PATCH 0760/1154] Force a metadata backup when adding, deleting, or
 changing the structure/metadata of a custom column.

---
 src/calibre/gui2/library/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 3d46b0e01e..58dcb6245e 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -937,7 +937,8 @@ class BooksModel(QAbstractTableModel):  # {{{
             tmpl = unicode(value.toString()).strip()
             disp = cc['display']
             disp['composite_template'] = tmpl
-            self.db.set_custom_column_metadata(cc['colnum'], display=disp)
+            self.db.set_custom_column_metadata(cc['colnum'], display=disp,
+                                               immediate_backup=True)
             self.refresh(reset=True)
             return True
 

From c674ca13422201f916b6a5ee78f1553a5d96c9d6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Sep 2013 14:34:49 +0530
Subject: [PATCH 0761/1154] Update Dilema Veche

---
 recipes/dilemaveche.recipe | 117 +++++++++++++++++++++++++------------
 1 file changed, 79 insertions(+), 38 deletions(-)

diff --git a/recipes/dilemaveche.recipe b/recipes/dilemaveche.recipe
index 72920600f7..33e9a263b0 100644
--- a/recipes/dilemaveche.recipe
+++ b/recipes/dilemaveche.recipe
@@ -6,46 +6,87 @@ __copyright__ = u'2011, Silviu Cotoar\u0103'
 '''
 dilemaveche.ro
 '''
-
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class DilemaVeche(BasicNewsRecipe):
-    title                 = u'Dilema Veche'
-    __author__            = u'Silviu Cotoar\u0103'
-    description           = 'Sint vechi, domnule! (I.L. Caragiale)'
-    publisher             = u'Adev\u0103rul Holding'
-    oldest_article        = 5
-    language              = 'ro'
-    max_articles_per_feed = 100
-    no_stylesheets        = True
-    use_embedded_content  = False
-    category              = 'Ziare'
-    encoding              = 'utf-8'
-    cover_url             = 'http://dilemaveche.ro/sites/all/themes/dilema/theme/dilema_two/layouter/dilema_two_homepage/logo.png'
-
-    conversion_options = {
-                             'comments'   : description
-                            ,'tags'       : category
-                            ,'language'   : language
-							,'publisher'  : publisher
-                         }
-
-    keep_only_tags = [
-            dict(name='div', attrs={'class':'c_left_column'})
-                     ]
-
-    remove_tags = [
-             dict(name='div', attrs={'id':['adshop_widget_428x60']}) ,
-			 dict(name='div', attrs={'id':['gallery']})			 
-                  ]
-
-    remove_tags_after = [
-              dict(name='div', attrs={'id':['adshop_widget_428x60']})    
-            ]
-
-    feeds          = [
-            (u'Feeds', u'http://dilemaveche.ro/rss.xml')
+    # apare vinerea, mai pe dupa-masa,depinde de Luiza cred (care se semneaza ca fiind creatorul fiecarui articol in feed-ul RSS)
+    title          = u'Dilema Veche'
+    __author__            = 'song2'  # inspirat din scriptul pentru Le Monde. Inspired from the Le Monde script
+    description           = '"Sint vechi, domnule!" (I.L. Caragiale)'
+    publisher             = 'Adevarul Holding'
+    oldest_article        = 7
+    max_articles_per_feed = 200
+    encoding              = 'utf8'
+    language = 'ro'
+    masthead_url = 'http://www.dilemaveche.ro/sites/all/themes/dilema/theme/dilema_two/layouter/dilema_two_homepage/logo.png'
+    publication_type = 'magazine'
+    feeds = [
+                ('Editoriale si opinii - Situatiunea', 'http://www.dilemaveche.ro/taxonomy/term/37/0/feed'),
+                ('Editoriale si opinii - Pe ce lume traim', 'http://www.dilemaveche.ro/taxonomy/term/38/0/feed'),
+                ('Editoriale si opinii - Bordeie si obiceie', 'http://www.dilemaveche.ro/taxonomy/term/44/0/feed'),
+                ('Editoriale si opinii - Talc Show', 'http://www.dilemaveche.ro/taxonomy/term/44/0/feed'),
+                ('Tema saptamanii', 'http://www.dilemaveche.ro/taxonomy/term/19/0/feed'),
+                ('La zi in cultura - Dilema va recomanda', 'http://www.dilemaveche.ro/taxonomy/term/58/0/feed'),
+                ('La zi in cultura - Carte', 'http://www.dilemaveche.ro/taxonomy/term/14/0/feed'),
+                ('La zi in cultura - Film', 'http://www.dilemaveche.ro/taxonomy/term/13/0/feed'),
+                ('La zi in cultura - Muzica', 'http://www.dilemaveche.ro/taxonomy/term/1341/0/feed'),
+                ('La zi in cultura - Arte performative', 'http://www.dilemaveche.ro/taxonomy/term/1342/0/feed'),
+                ('La zi in cultura - Arte vizuale', 'http://www.dilemaveche.ro/taxonomy/term/1512/0/feed'),
+                ('Societate - Ieri cu vedere spre azi', 'http://www.dilemaveche.ro/taxonomy/term/15/0/feed'),
+                ('Societate - Din polul opus', 'http://www.dilemaveche.ro/taxonomy/term/41/0/feed'),
+                ('Societate - Mass comedia', 'http://www.dilemaveche.ro/taxonomy/term/43/0/feed'),
+                ('Societate - La singular si la plural', 'http://www.dilemaveche.ro/taxonomy/term/42/0/feed'),
+                ('Oameni si idei - Educatie', 'http://www.dilemaveche.ro/taxonomy/term/46/0/feed'),
+                ('Oameni si idei - Polemici si dezbateri', 'http://www.dilemaveche.ro/taxonomy/term/48/0/feed'),
+                ('Oameni si idei - Stiinta si tehnologie', 'http://www.dilemaveche.ro/taxonomy/term/46/0/feed'),
+                ('Dileme on-line', 'http://www.dilemaveche.ro/taxonomy/term/005/0/feed')
                  ]
+    remove_tags_before = dict(name='div',attrs={'class':'spacer_10'})
+    remove_tags = [
+        dict(name='div', attrs={'class':'art_related_left'}),
+        dict(name='div', attrs={'class':'controale'}),
+                dict(name='div', attrs={'class':'simple_overlay'}),
+    ]
+    remove_tags_after = [dict(id='facebookLike')]
+    remove_javascript = True
+    no_stylesheets        = True
+    remove_empty_feeds = True
+    extra_css             = """
+        body{font-family: Georgia,Times,serif }
+        img{margin-bottom: 0.4em; display:block}
+                            """
+    needs_subscription = 'optional'
+    cover_margins = (10, 15, '#ffffff')
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser(self)
+        if self.username is not None and self.password is not None:
+            br.open('http://dilemaveche.ro/user/login')
+            br.select_form(nr=0)
+            br['username'] = self.username
+            br['password'] = self.password
+            br.submit()
+        return br
+
+    def get_cover_url(self):
+        cover_url = None
+        soup = self.index_to_soup('http://dilemaveche.ro')
+        link_item = soup.find('div',attrs={'class':'box_dr_pdf_picture'})
+        if link_item and link_item.a:
+            cover_url = link_item.a['href']
+        br = BasicNewsRecipe.get_browser()
+        try:
+            br.open(cover_url)
+        except:  # daca nu gaseste pdf-ul
+            self.log("\nPDF indisponibil")
+            link_item = soup.find('div',attrs={'class':'box_dr_pdf_picture'})
+            if link_item and link_item.img:
+                cover_url = link_item.img['src']
+            br = BasicNewsRecipe.get_browser()
+            try:
+                br.open(cover_url)
+            except:  # daca nu gaseste nici imaginea mica mica
+                print('Mama lor de nenorociti! nu este nici pdf nici imagine')
+                cover_url ='http://www.dilemaveche.ro/sites/all/themes/dilema/theme/dilema_two/layouter/dilema_two_homepage/logo.png'
+        return cover_url
 
-    def preprocess_html(self, soup):
-        return self.adeify_images(soup)

From cdbab2c8e17ed52ad0990a575b161c96a79793aa Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 10 Sep 2013 11:08:10 +0200
Subject: [PATCH 0762/1154] Bah. Forgot to select all the changed files.

---
 src/calibre/db/backend.py |  7 ++++++-
 src/calibre/db/cache.py   | 15 +++++++++++----
 src/calibre/db/legacy.py  |  6 ++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 513ed92a6c..c642c46a5b 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -371,6 +371,8 @@ class DB(object):
         UPDATE authors SET sort=author_to_author_sort(name) WHERE sort IS NULL;
         ''')
 
+        # Initialize_prefs must be called before initialize_custom_columns because
+        # icc can set a pref.
         self.initialize_prefs(default_prefs, restore_all_prefs, progress_callback)
         self.initialize_custom_columns()
         self.initialize_tables()
@@ -425,6 +427,7 @@ class DB(object):
         defs['virtual_libraries'] = {}
         defs['virtual_lib_on_startup'] = defs['cs_virtual_lib_on_startup'] = ''
         defs['virt_libs_hidden'] = defs['virt_libs_order'] = ()
+        defs['backup_all_metadata_on_start'] = 'no'
 
         # Migrate the bool tristate tweak
         defs['bools_are_tristate'] = \
@@ -539,7 +542,7 @@ class DB(object):
                         DROP TABLE   IF EXISTS {lt};
                         '''.format(table=table, lt=lt)
                 )
-                self.custom_columns_deleted = True
+                self.prefs.set('backup_all_metadata_on_start', 'yes')
             self.conn.execute('DELETE FROM custom_columns WHERE mark_for_delete=1')
 
         # Load metadata for custom columns
@@ -808,6 +811,7 @@ class DB(object):
         if display is not None:
             self.conn.execute('UPDATE custom_columns SET display=? WHERE id=?', (json.dumps(display), num))
             changed = True
+        # Note: the caller is responsible for scheduling a metadata backup if necessary
         return changed
 
     def create_custom_column(self, label, name, datatype, is_multiple, editable=True, display={}):  # {{{
@@ -964,6 +968,7 @@ class DB(object):
             ]
         script = ' \n'.join(lines)
         self.conn.execute(script)
+        self.prefs.set('backup_all_metadata_on_start', 'yes')
         return num
     # }}}
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 40840f5910..d568709dac 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -308,9 +308,9 @@ class Cache(object):
                     field.author_sort_field = self.fields['author_sort']
                 elif name == 'title':
                     field.title_sort_field = self.fields['sort']
-        if self.backend.custom_columns_deleted:
+        if self.backend.prefs['backup_all_metadata_on_start'] == 'yes':
             self.mark_as_dirty(self.all_book_ids())
-        self.backend.custom_columns_deleted = False
+            self.backend.prefs.set('backup_all_metadata_on_start', 'no')
 
     @read_api
     def field_for(self, name, book_id, default_value=None):
@@ -1604,8 +1604,15 @@ class Cache(object):
         self.backend.create_custom_column(label, name, datatype, is_multiple, editable=editable, display=display)
 
     @write_api
-    def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None):
-        return self.backend.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
+    def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None,
+                                   display=None, immediate_backup=False):
+        changed = self.backend.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
+        if changed:
+            if immediate_backup:
+                self.mark_as_dirty(self._all_book_ids())
+            else:
+                self.backend.prefs.set('backup_all_metadata_on_start', 'yes')
+        return changed
 
     @read_api
     def get_books_for_category(self, category, item_id_or_composite_value):
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 150edf9c0a..41118e4da1 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -684,8 +684,10 @@ class LibraryDatabase(object):
     def create_custom_column(self, label, name, datatype, is_multiple, editable=True, display={}):
         self.new_api.create_custom_column(label, name, datatype, is_multiple, editable=editable, display=display)
 
-    def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None, notify=True):
-        changed = self.new_api.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
+    def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None,
+                                   notify=True, immediate_backup=False):
+        changed = self.new_api.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable,
+                                                          display=display, immediate_backup=immediate_backup)
         if changed and notify:
             self.notify('metadata', [])
 

From e2dcd9728f81fdd6dc79bfd60b346e28877c7002 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Sep 2013 14:46:49 +0530
Subject: [PATCH 0763/1154] Update Jakarta Post and Jakarta Globe

---
 recipes/jakarta_globe.recipe | 22 ++++++++--------------
 recipes/jakarta_post.recipe  |  7 +------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/recipes/jakarta_globe.recipe b/recipes/jakarta_globe.recipe
index f6f1715268..d33bd81fbe 100644
--- a/recipes/jakarta_globe.recipe
+++ b/recipes/jakarta_globe.recipe
@@ -6,29 +6,23 @@ class JakartaGlobe(BasicNewsRecipe):
     max_articles_per_feed = 100
 
     feeds          = [
-	(u'News', u'http://www.thejakartaglobe.com/pages/getrss/getrss-news.php'),
-	(u'Business', u'http://www.thejakartaglobe.com/pages/getrss/getrss-business.php'),
-	(u'Technology', u'http://www.thejakartaglobe.com/pages/getrss/getrss-tech.php'),
-	(u'My Jakarta', u'http://www.thejakartaglobe.com/pages/getrss/getrss-myjakarta.php'),
-	(u'International', u'http://www.thejakartaglobe.com/pages/getrss/getrss-international.php'),
-	(u'Life and Times', u'http://www.thejakartaglobe.com/pages/getrss/getrss-lifeandtimes.php'),
-	]
+    (u'News', u'http://www.thejakartaglobe.com/news/feed/'),
+    (u'Business', u'http://www.thejakartaglobe.com/business/feed/'),
+    (u'Opinion', u'http://www.thejakartaglobe.com/opinion/feed/'),
+    (u'Count me in', u'http://www.thejakartaglobe.com/count-me-in/feed/'),
+    (u'International', u'http://www.thejakartaglobe.com/international/feed/'),
+    (u'Sports', u'http://www.thejakartaglobe.com/sports/feed/'),
+    ]
     __author__ = 'rty'
     pubisher  = 'JakartaGlobe.com'
     description           = 'JakartaGlobe, Indonesia, Newspaper'
     category              = 'News, Indonesia'
 
-
     remove_javascript = True
     use_embedded_content   = False
     no_stylesheets = True
+    auto_cleanup = True
     language = 'en_ID'
     encoding               = 'utf-8'
     conversion_options = {'linearize_tables':True}
     masthead_url = 'http://www.thejakartaglobe.com/pages/2010/images/jak-globe-logo.jpg'
-    keep_only_tags = [
-							dict(name='div', attrs={'class':'story'}),
-							dict(name='span', attrs={'class':'headline'}),
-							dict(name='div', attrs={'class':'story'}),
-							dict(name='p', attrs={'id':'bodytext'})
-                               ]
diff --git a/recipes/jakarta_post.recipe b/recipes/jakarta_post.recipe
index d8d609469d..000c91628b 100644
--- a/recipes/jakarta_post.recipe
+++ b/recipes/jakarta_post.recipe
@@ -27,12 +27,11 @@ class JakartaPost(BasicNewsRecipe):
     use_embedded_content  = False
     no_javascript         = True
     remove_empty_feeds    = True
+    auto_cleanup = True
 
     timefmt               = ' [%A, %d %B, %Y]'
     encoding              = 'utf-8'
 
-    keep_only_tags = [dict(name='div', attrs ={'id':'news-main'})]
-
     extra_css = '''
                   h1{font-family:Georgia,"Times New Roman",Times,serif; font-weight:bold; font-size:large;}
                   .cT-storyDetails{font-family:Arial,Helvetica,sans-serif; color:#666666;font-size:x-small;}
@@ -51,10 +50,6 @@ class JakartaPost(BasicNewsRecipe):
                   body{font-family:Arial,Helvetica,sans-serif; font-size:x-small;}
                 '''
 
-    remove_tags     = [
-                        dict(name='div', attrs ={'class':['text-size']}),
-                       ]
-
     feeds          = [
 
                       (u'Breaking News', u'http://www.thejakartapost.com/breaking/feed'),

From b2794c9223368cc11f06bc8e916003204b8618a9 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Wed, 11 Sep 2013 10:25:54 +0200
Subject: [PATCH 0764/1154] Update last_mod times when custom column metadata
 changes instead of triggering a backup.

---
 src/calibre/db/backend.py |  6 +++---
 src/calibre/db/cache.py   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index c642c46a5b..e6d09af48a 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -427,7 +427,7 @@ class DB(object):
         defs['virtual_libraries'] = {}
         defs['virtual_lib_on_startup'] = defs['cs_virtual_lib_on_startup'] = ''
         defs['virt_libs_hidden'] = defs['virt_libs_order'] = ()
-        defs['backup_all_metadata_on_start'] = 'no'
+        defs['update_all_last_mod_dates_on_start'] = 'no'
 
         # Migrate the bool tristate tweak
         defs['bools_are_tristate'] = \
@@ -542,7 +542,7 @@ class DB(object):
                         DROP TABLE   IF EXISTS {lt};
                         '''.format(table=table, lt=lt)
                 )
-                self.prefs.set('backup_all_metadata_on_start', 'yes')
+                self.prefs.set('update_all_last_mod_dates_on_start', 'yes')
             self.conn.execute('DELETE FROM custom_columns WHERE mark_for_delete=1')
 
         # Load metadata for custom columns
@@ -968,7 +968,7 @@ class DB(object):
             ]
         script = ' \n'.join(lines)
         self.conn.execute(script)
-        self.prefs.set('backup_all_metadata_on_start', 'yes')
+        self.prefs.set('update_all_last_mod_dates_on_start', 'yes')
         return num
     # }}}
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d568709dac..d1d8edfbdc 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -308,9 +308,9 @@ class Cache(object):
                     field.author_sort_field = self.fields['author_sort']
                 elif name == 'title':
                     field.title_sort_field = self.fields['sort']
-        if self.backend.prefs['backup_all_metadata_on_start'] == 'yes':
-            self.mark_as_dirty(self.all_book_ids())
-            self.backend.prefs.set('backup_all_metadata_on_start', 'no')
+        if self.backend.prefs['update_all_last_mod_dates_on_start'] == 'yes':
+            self.update_last_modified(self.all_book_ids())
+            self.backend.prefs.set('update_all_last_mod_dates_on_start', 'no')
 
     @read_api
     def field_for(self, name, book_id, default_value=None):
@@ -1609,9 +1609,9 @@ class Cache(object):
         changed = self.backend.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
         if changed:
             if immediate_backup:
-                self.mark_as_dirty(self._all_book_ids())
+                self.update_last_modified(self._all_book_ids())
             else:
-                self.backend.prefs.set('backup_all_metadata_on_start', 'yes')
+                self.backend.prefs.set('update_all_last_mod_dates_on_start', 'yes')
         return changed
 
     @read_api

From 273771d80bc3e173a7c06b6e4659d8c7b03984f5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 11 Sep 2013 14:41:36 +0530
Subject: [PATCH 0765/1154] ...

---
 src/calibre/db/backend.py |  6 +++---
 src/calibre/db/cache.py   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index c642c46a5b..e50a03cbdd 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -427,7 +427,7 @@ class DB(object):
         defs['virtual_libraries'] = {}
         defs['virtual_lib_on_startup'] = defs['cs_virtual_lib_on_startup'] = ''
         defs['virt_libs_hidden'] = defs['virt_libs_order'] = ()
-        defs['backup_all_metadata_on_start'] = 'no'
+        defs['update_all_last_mod_dates_on_start'] = False
 
         # Migrate the bool tristate tweak
         defs['bools_are_tristate'] = \
@@ -542,7 +542,7 @@ class DB(object):
                         DROP TABLE   IF EXISTS {lt};
                         '''.format(table=table, lt=lt)
                 )
-                self.prefs.set('backup_all_metadata_on_start', 'yes')
+                self.prefs.set('update_all_last_mod_dates_on_start', True)
             self.conn.execute('DELETE FROM custom_columns WHERE mark_for_delete=1')
 
         # Load metadata for custom columns
@@ -968,7 +968,7 @@ class DB(object):
             ]
         script = ' \n'.join(lines)
         self.conn.execute(script)
-        self.prefs.set('backup_all_metadata_on_start', 'yes')
+        self.prefs.set('update_all_last_mod_dates_on_start', True)
         return num
     # }}}
 
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d568709dac..de306c2926 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -308,9 +308,9 @@ class Cache(object):
                     field.author_sort_field = self.fields['author_sort']
                 elif name == 'title':
                     field.title_sort_field = self.fields['sort']
-        if self.backend.prefs['backup_all_metadata_on_start'] == 'yes':
-            self.mark_as_dirty(self.all_book_ids())
-            self.backend.prefs.set('backup_all_metadata_on_start', 'no')
+        if self.backend.prefs['update_all_last_mod_dates_on_start']:
+            self.update_last_modified(self.all_book_ids())
+            self.backend.prefs.set('update_all_last_mod_dates_on_start', False)
 
     @read_api
     def field_for(self, name, book_id, default_value=None):
@@ -1609,9 +1609,9 @@ class Cache(object):
         changed = self.backend.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
         if changed:
             if immediate_backup:
-                self.mark_as_dirty(self._all_book_ids())
+                self._update_last_modified(self._all_book_ids())
             else:
-                self.backend.prefs.set('backup_all_metadata_on_start', 'yes')
+                self.backend.prefs.set('update_all_last_mod_dates_on_start', True)
         return changed
 
     @read_api

From ccf65bf82e3d373773dc0f04d59988e3ad652872 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 11 Sep 2013 21:06:14 +0530
Subject: [PATCH 0766/1154] Phys Org by Krittika Goyal

---
 recipes/phys_org.recipe | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 recipes/phys_org.recipe

diff --git a/recipes/phys_org.recipe b/recipes/phys_org.recipe
new file mode 100644
index 0000000000..cac0db29b2
--- /dev/null
+++ b/recipes/phys_org.recipe
@@ -0,0 +1,33 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+
+class HindustanTimes(BasicNewsRecipe):
+    title = u'PhysOrg'
+    language = 'en'
+    __author__ = 'Krittika Goyal'
+    oldest_article = 1  # days
+    max_articles_per_feed = 25
+    #encoding = 'cp1252'
+    use_embedded_content = False
+
+    no_stylesheets = True
+    auto_cleanup = True
+
+    feeds = [
+        ('Nanotechnology',
+         'http://phys.org/rss-feed/nanotech-news/'),
+        ('Physics',
+         'http://phys.org/rss-feed/physics-news/'),
+        ('Space and Earth',
+         'http://phys.org/rss-feed/space-news/'),
+        ('Electronics',
+         'http://phys.org/rss-feed/electronics-news/'),
+        ('Chemistry',
+         'http://phys.org/rss-feed/chemistry-news/'),
+        ('Biology',
+         'http://phys.org/rss-feed/biology-news/'),
+        ('Technology',
+         'http://phys.org/rss-feed/technology-news/'),
+        ('Other Sciences',
+         'http://phys.org/rss-feed/science-news/'),
+    ]

From 725bb967e553c863972cc6bcb40910a3bcd79e3c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 11 Sep 2013 21:32:00 +0530
Subject: [PATCH 0767/1154] PDF Output: Serialize ToC string as UTF-16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PDF Output: Fix non-breaking space characters incorrectly rendered in
PDF outline. Fixes #1223862 [PDF TOC -  &nbsp; appears sometimes as €](https://bugs.launchpad.net/calibre/+bug/1223862)
---
 src/calibre/ebooks/pdf/render/common.py | 9 ++++++++-
 src/calibre/ebooks/pdf/render/links.py  | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/pdf/render/common.py b/src/calibre/ebooks/pdf/render/common.py
index d5f4b6a66b..8470a1b2db 100644
--- a/src/calibre/ebooks/pdf/render/common.py
+++ b/src/calibre/ebooks/pdf/render/common.py
@@ -100,11 +100,18 @@ class String(unicode):
         try:
             raw = s.encode('latin1')
             if raw.startswith(codecs.BOM_UTF16_BE):
-                raise UnicodeEncodeError('')
+                raw = codecs.BOM_UTF16_BE + s.encode('utf-16-be')
         except UnicodeEncodeError:
             raw = codecs.BOM_UTF16_BE + s.encode('utf-16-be')
         stream.write(b'('+raw+b')')
 
+class UTF16String(unicode):
+
+    def pdf_serialize(self, stream):
+        s = self.replace('\\', '\\\\').replace('(', r'\(').replace(')', r'\)')
+        raw = codecs.BOM_UTF16_BE + s.encode('utf-16-be')
+        stream.write(b'('+raw+b')')
+
 class Dictionary(dict):
 
     def pdf_serialize(self, stream):
diff --git a/src/calibre/ebooks/pdf/render/links.py b/src/calibre/ebooks/pdf/render/links.py
index 4d0d588771..2f2b179ff4 100644
--- a/src/calibre/ebooks/pdf/render/links.py
+++ b/src/calibre/ebooks/pdf/render/links.py
@@ -11,7 +11,7 @@ import os
 from urlparse import urlparse
 from urllib2 import unquote
 
-from calibre.ebooks.pdf.render.common import Array, Name, Dictionary, String
+from calibre.ebooks.pdf.render.common import Array, Name, Dictionary, String, UTF16String
 
 class Destination(Array):
 
@@ -131,7 +131,7 @@ class Links(object):
         a = self.anchors[path]
         dest = a.get(frag, a[None])
         item = Dictionary({'Parent':parentref, 'Dest':dest,
-                           'Title':String(toc.text or _('Unknown'))})
+                           'Title':UTF16String(toc.text or _('Unknown'))})
         return self.pdf.objects.add(item)
 
 

From 0394f6d01f763dc35a9c60ad1c63ef20313ceed6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 11 Sep 2013 21:36:37 +0530
Subject: [PATCH 0768/1154] Driver for PocketBook Mini 515

Fixes #1223853 [Pocketbook 515 recognition](https://bugs.launchpad.net/calibre/+bug/1223853)
---
 src/calibre/devices/eb600/driver.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 0c51c8c79d..fbb323d6e5 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -259,7 +259,7 @@ class POCKETBOOK301(USBMS):
 class POCKETBOOK602(USBMS):
 
     name = 'PocketBook Pro 602/902 Device Interface'
-    description    = _('Communicate with the PocketBook 602/603/902/903/Pro 912 reader.')
+    description    = _('Communicate with the PocketBook 515/602/603/902/903/Pro 912 reader.')
     author         = 'Kovid Goyal'
     supported_platforms = ['windows', 'osx', 'linux']
     FORMATS = ['epub', 'fb2', 'prc', 'mobi', 'pdf', 'djvu', 'rtf', 'chm',
@@ -271,11 +271,11 @@ class POCKETBOOK602(USBMS):
 
     VENDOR_ID   = [0x0525]
     PRODUCT_ID  = [0xa4a5]
-    BCD         = [0x0324]
+    BCD         = [0x0324, 0x0330]
 
-    VENDOR_NAME = ''
+    VENDOR_NAME = ['', 'LINUX']
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['PB602', 'PB603', 'PB902',
-            'PB903', 'Pocket912', 'PB']
+            'PB903', 'Pocket912', 'PB', 'FILE-STOR_GADGET']
 
 class POCKETBOOK622(POCKETBOOK602):
 

From d32a1c7bb79b6eca8011e96b62493913f082a32a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 11 Sep 2013 21:49:30 +0530
Subject: [PATCH 0769/1154] Book polishing: Apply null comments

Book polishing: Do not leave behind the old comments when updating
metadata if the comments have been deleted in calibre.
---
 src/calibre/ebooks/metadata/epub.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py
index 177158b48c..f5a22ec2e0 100644
--- a/src/calibre/ebooks/metadata/epub.py
+++ b/src/calibre/ebooks/metadata/epub.py
@@ -30,7 +30,8 @@ class ContainerException(OCFException):
 
 class Container(dict):
     def __init__(self, stream=None):
-        if not stream: return
+        if not stream:
+            return
         soup = BeautifulStoneSoup(stream.read())
         container = soup.find(name=re.compile(r'container$', re.I))
         if not container:
@@ -256,7 +257,8 @@ def update_metadata(opf, mi, apply_null=False, update_timestamp=False):
         langs = []
         for lc in mi.languages:
             lc2 = lang_as_iso639_1(lc)
-            if lc2: lc = lc2
+            if lc2:
+                lc = lc2
             langs.append(lc)
         mi.languages = langs
 
@@ -270,6 +272,8 @@ def update_metadata(opf, mi, apply_null=False, update_timestamp=False):
             opf.tags = []
         if not getattr(mi, 'isbn', None):
             opf.isbn = None
+        if not getattr(mi, 'comments', None):
+            opf.comments = None
     if update_timestamp and mi.timestamp is not None:
         opf.timestamp = mi.timestamp
 

From 555b79c2552338ea6a45df56e37b4b0c650b033f Mon Sep 17 00:00:00 2001
From: Kirill Kuzminykh <kkuzminykh@asdco.ru>
Date: Wed, 11 Sep 2013 22:42:27 +0400
Subject: [PATCH 0770/1154] Driver for "OPPO Find 5" Android phone

---
 src/calibre/devices/android/driver.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index b59386b4df..89368b965e 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -203,6 +203,9 @@ class ANDROID(USBMS):
             # Prestigio and Teclast
             0x2207 : {0 : [0x222], 0x10 : [0x222]},
 
+            # OPPO
+            0x22d9 : {0x2768: [0x228]},
+
             }
     EBOOK_DIR_MAIN = ['eBooks/import', 'wordplayer/calibretransfer', 'Books',
             'sdcard/ebooks']

From 1e35898c83f86da2816740673632ab33bfcdb97f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 12 Sep 2013 10:27:55 +0530
Subject: [PATCH 0771/1154] Better name for immediate_backup

---
 src/calibre/db/cache.py               | 4 ++--
 src/calibre/db/legacy.py              | 4 ++--
 src/calibre/gui2/library/models.py    | 2 +-
 src/calibre/library/custom_columns.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index de306c2926..d12bf6a573 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1605,10 +1605,10 @@ class Cache(object):
 
     @write_api
     def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None,
-                                   display=None, immediate_backup=False):
+                                   display=None, update_last_modified=False):
         changed = self.backend.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable, display=display)
         if changed:
-            if immediate_backup:
+            if update_last_modified:
                 self._update_last_modified(self._all_book_ids())
             else:
                 self.backend.prefs.set('update_all_last_mod_dates_on_start', True)
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 41118e4da1..3bc36dc8d5 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -685,9 +685,9 @@ class LibraryDatabase(object):
         self.new_api.create_custom_column(label, name, datatype, is_multiple, editable=editable, display=display)
 
     def set_custom_column_metadata(self, num, name=None, label=None, is_editable=None, display=None,
-                                   notify=True, immediate_backup=False):
+                                   notify=True, update_last_modified=False):
         changed = self.new_api.set_custom_column_metadata(num, name=name, label=label, is_editable=is_editable,
-                                                          display=display, immediate_backup=immediate_backup)
+                                                          display=display, update_last_modified=update_last_modified)
         if changed and notify:
             self.notify('metadata', [])
 
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index b611cf406b..60768b481e 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -940,7 +940,7 @@ class BooksModel(QAbstractTableModel):  # {{{
             disp = cc['display']
             disp['composite_template'] = tmpl
             self.db.set_custom_column_metadata(cc['colnum'], display=disp,
-                                               immediate_backup=True)
+                                               update_last_modified=True)
             self.refresh(reset=True)
             return True
 
diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py
index 4e20c02b5f..415bd35559 100644
--- a/src/calibre/library/custom_columns.py
+++ b/src/calibre/library/custom_columns.py
@@ -377,7 +377,7 @@ class CustomColumns(object):
         self.conn.commit()
 
     def set_custom_column_metadata(self, num, name=None, label=None,
-            is_editable=None, display=None, notify=True, immediate_backup=False):
+            is_editable=None, display=None, notify=True, update_last_modified=False):
         changed = False
         if name is not None:
             self.conn.execute('UPDATE custom_columns SET name=? WHERE id=?',

From eb7ac6011b5a1c6e990ceb269f11129f0a1b4e79 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 12 Sep 2013 10:25:05 +0200
Subject: [PATCH 0772/1154] Remove non-existent columns from the set of columns
 to display. Having them there can cause exceptions.

---
 src/calibre/library/server/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/library/server/__init__.py b/src/calibre/library/server/__init__.py
index 2a08c0b9b7..4a7fdddc52 100644
--- a/src/calibre/library/server/__init__.py
+++ b/src/calibre/library/server/__init__.py
@@ -51,14 +51,14 @@ def server_config(defaults=None):
     return c
 
 def custom_fields_to_display(db):
-    ckeys = db.field_metadata.ignorable_field_keys()
+    ckeys = set(db.field_metadata.ignorable_field_keys())
     yes_fields = set(tweaks['content_server_will_display'])
     no_fields = set(tweaks['content_server_wont_display'])
     if '*' in yes_fields:
-        yes_fields = set(ckeys)
+        yes_fields = ckeys
     if '*' in no_fields:
-        no_fields = set(ckeys)
-    return frozenset(yes_fields - no_fields)
+        no_fields = ckeys
+    return frozenset(ckeys & (yes_fields - no_fields))
 
 def main():
     from calibre.library.server.main import main

From 54501ee576a23117dff61f1af7a722037e082f55 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 12 Sep 2013 15:28:40 +0530
Subject: [PATCH 0773/1154] Update Harvard Business Review

---
 recipes/hbr.recipe | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/recipes/hbr.recipe b/recipes/hbr.recipe
index a418ba96d4..f1a8614ecb 100644
--- a/recipes/hbr.recipe
+++ b/recipes/hbr.recipe
@@ -39,10 +39,10 @@ class HBR(BasicNewsRecipe):
             br.visit('https://hbr.org/login?request_url=/', timeout=20)
         except Timeout:
             pass
-        br.click('#accordion div[tabindex="0"]', wait_for_load=False)
-        f = br.select_form('#signin-form')
-        f['signin-form:username'] = username
-        f['signin-form:password'] = password
+        br.click('#form-wrapper h3[tabindex="0"]', wait_for_load=False)
+        f = br.select_form('#login-form')
+        f['username'] = username
+        f['password'] = password
         br.submit(wait_for_load=False)
         br.run_for_a_time(30)
 
@@ -56,7 +56,8 @@ class HBR(BasicNewsRecipe):
         articles = []
         for x in soup.find(id='issueFeaturesContent').findAll(['li', 'h4']):
             if x.name == 'h4':
-                if x.get('class', None) == 'basic':continue
+                if x.get('class', None) == 'basic':
+                    continue
                 if current_section is not None and articles:
                     feeds.append((current_section, articles))
                 current_section = self.tag_to_string(x).capitalize()
@@ -64,7 +65,8 @@ class HBR(BasicNewsRecipe):
                 self.log('\tFound section:', current_section)
             else:
                 a = x.find('a', href=True)
-                if a is None: continue
+                if a is None:
+                    continue
                 title = self.tag_to_string(a)
                 url = a['href']
                 if '/ar/' not in url:
@@ -90,11 +92,11 @@ class HBR(BasicNewsRecipe):
     def parse_index(self):
         soup0 = self.index_to_soup('http://hbr.org/magazine')
         datencover = soup0.find('ul', attrs={'id':'magazineArchiveCarousel'}).findAll('li')[-1]
-        #find date & cover
+        # find date & cover
         self.cover_url=datencover.img['src']
         dates=self.tag_to_string(datencover.img['alt'])
         self.timefmt = u' [%s]'%dates
-        soup = self.index_to_soup(self.INDEX + soup0.find('div', attrs = {'class':'magazine_page'}).a['href'])
+        soup = self.index_to_soup(self.INDEX + soup0.find('div', attrs={'class':'magazine_page'}).a['href'])
         feeds = self.hbr_parse_toc(soup)
         return feeds
 

From f1d49a1cb18ea773787fbc3e537aedade92b389a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 12 Sep 2013 20:08:54 +0530
Subject: [PATCH 0774/1154] Caravan Magazine by Kovid Goyal

---
 recipes/caravan_magazine.recipe | 92 +++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 recipes/caravan_magazine.recipe

diff --git a/recipes/caravan_magazine.recipe b/recipes/caravan_magazine.recipe
new file mode 100644
index 0000000000..e6ed872b8b
--- /dev/null
+++ b/recipes/caravan_magazine.recipe
@@ -0,0 +1,92 @@
+import html5lib
+from lxml import etree
+from calibre.web.feeds.recipes import BasicNewsRecipe
+from calibre.utils.cleantext import clean_xml_chars
+
+def is_title(tag):
+    return tag.name == 'h2' and tag.parent.name == 'div' and tag.parent['class'] == 'left-corner'
+
+class CaravanMagazine(BasicNewsRecipe):
+
+    title = 'Caravan Magazine'
+    __author__ = 'Kovid Goyal'
+    description = 'An Indian Journal of politics and culture'
+    language = 'en_IN'
+    timefmt = ' [%b, %Y]'
+
+    no_stylesheets = True
+
+    keep_only_tags = [
+        dict(name=is_title),
+        dict(attrs={'class':['subhheading', 'authorndate', 'full-image-view', 'fullpage-body']}),
+    ]
+    remove_tags = [
+        dict(attrs={'class':['share-with']}),
+        dict(attrs={'class':lambda x: x and 'thumb-image-view' in x}),
+    ]
+
+    def preprocess_raw_html(self, raw_html, url):
+        root = html5lib.parse(
+            clean_xml_chars(raw_html), treebuilder='lxml',
+            namespaceHTMLElements=False)
+        for s in root.xpath('//script'):
+            s.getparent().remove(s)
+        return etree.tostring(root, encoding=unicode)
+
+    def preprocess_html(self, soup):
+        # Handle the image thumbnails
+        for div in soup.findAll('div', attrs={'class':lambda x: x and x.startswith('show-image')}):
+            if div['class'] == 'show-image':
+                div.extract()
+            else:
+                div['style'] = 'page-break-inside:avoid'
+
+        return soup
+
+    # To parse artice toc
+    def parse_index(self):
+        raw = self.index_to_soup(
+            'http://caravanmagazine.in/current-issue', raw=True)
+        raw = raw.decode('utf-8')
+        raw = self.preprocess_raw_html(raw, None)
+        soup = self.index_to_soup(raw)
+
+        a = soup.find('a', rel=lambda x:x and '[field_c_issues_image]' in x)
+        if a is not None:
+            self.cover_url = a['href']
+
+        ci = soup.find(attrs={'class': 'current-issue-block'})
+        current_section = 'Section'
+        current_articles = []
+        feeds = []
+        for div in ci.findAll(
+                attrs={'class': ['view-header', 'view-content']}):
+            if div['class'] == 'view-header':
+                if current_articles:
+                    feeds.append((current_section, current_articles))
+                current_section = self.tag_to_string(div).replace('paging_filter', '')
+                current_articles = []
+                self.log('Section:', current_section)
+            else:
+                for art in div.findAll('div', attrs={'class': lambda x: x and 'views-row' in x.split()}):
+                    title = div.find(attrs={'class': 'views-field-title'})
+                    if title is not None:
+                        a = title.find('a', href=True)
+                        if a is not None:
+                            href = a['href']
+                            if href.startswith('/'):
+                                href = 'http://caravanmagazine.in' + href
+                            article = {
+                                'title': self.tag_to_string(title), 'url': href}
+                            title.extract()
+                            desc = self.tag_to_string(div).strip()
+                            if desc:
+                                article['description'] = desc
+                            current_articles.append(article)
+                            self.log('\t' + article['title'])
+                            self.log('\t\t' + article['url'])
+
+        if current_articles:
+            feeds.append((current_section, current_articles))
+
+        return feeds

From 187eb4e0659239a816bac9050a982f9f127bc071 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 12 Sep 2013 20:30:53 +0530
Subject: [PATCH 0775/1154] ODT Input: Only use the first image as cover

ODT Input: Only treat the first image as a cover if it is of suitable
size, instead of any image in the document. See #1224157 (ODT to MOBI - Images - Cover Image will not removed and other images are missed)
---
 src/calibre/ebooks/metadata/odt.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/calibre/ebooks/metadata/odt.py b/src/calibre/ebooks/metadata/odt.py
index b919885bfd..41b870b312 100644
--- a/src/calibre/ebooks/metadata/odt.py
+++ b/src/calibre/ebooks/metadata/odt.py
@@ -224,26 +224,28 @@ def read_cover(stream, zin, mi, opfmeta, extract_cover):
     cover_href = None
     cover_data = None
     cover_frame = None
+    imgnum = 0
     for frm in otext.topnode.getElementsByType(odFrame):
         img = frm.getElementsByType(odImage)
-        if len(img) > 0: # there should be only one
-            i_href = img[0].getAttribute('href')
-            try:
-                raw = zin.read(i_href)
-            except KeyError:
-                continue
-            try:
-                width, height, fmt = identify_data(raw)
-            except:
-                continue
-        else:
+        if len(img) == 0:
             continue
+        i_href = img[0].getAttribute('href')
+        try:
+            raw = zin.read(i_href)
+        except KeyError:
+            continue
+        try:
+            width, height, fmt = identify_data(raw)
+        except:
+            continue
+        imgnum += 1
         if opfmeta and frm.getAttribute('name').lower() == u'opf.cover':
             cover_href = i_href
             cover_data = (fmt, raw)
             cover_frame = frm.getAttribute('name') # could have upper case
             break
-        if cover_href is None and 0.8 <= height/width <= 1.8 and height*width >= 12000:
+        if cover_href is None and imgnum == 1 and 0.8 <= height/width <= 1.8 and height*width >= 12000:
+            # Pick the first image as the cover if it is of a suitable size
             cover_href = i_href
             cover_data = (fmt, raw)
             if not opfmeta:

From 7d1c82aad2b32b7d5b45422c3b37165f20b302b9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 12 Sep 2013 20:34:39 +0530
Subject: [PATCH 0776/1154] pep8

---
 src/calibre/ebooks/metadata/odt.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/calibre/ebooks/metadata/odt.py b/src/calibre/ebooks/metadata/odt.py
index 41b870b312..7ce907311c 100644
--- a/src/calibre/ebooks/metadata/odt.py
+++ b/src/calibre/ebooks/metadata/odt.py
@@ -122,7 +122,7 @@ class odfmetaparser(xml.sax.saxutils.XMLGenerator):
         if name == (OFFICENS,u'meta'):
             for k,v in self.addfields.items():
                 if len(v) > 0:
-                    if type(k) == type(''):
+                    if isinstance(k, basestring):
                         xml.sax.saxutils.XMLGenerator.startElementNS(self,(METANS,u'user-defined'),None,{(METANS,u'name'):k})
                         xml.sax.saxutils.XMLGenerator.characters(self, v)
                         xml.sax.saxutils.XMLGenerator.endElementNS(self, (METANS,u'user-defined'),None)
@@ -165,19 +165,19 @@ def get_metadata(stream, extract_cover=True):
     parser.parse(StringIO(content))
     data = odfs.seenfields
     mi = MetaInformation(None, [])
-    if data.has_key('title'):
+    if 'title' in data:
         mi.title = data['title']
     if data.get('initial-creator', '').strip():
         mi.authors = string_to_authors(data['initial-creator'])
-    elif data.has_key('creator'):
+    elif 'creator' in data:
         mi.authors = string_to_authors(data['creator'])
-    if data.has_key('description'):
+    if 'description' in data:
         mi.comments = data['description']
-    if data.has_key('language'):
+    if 'language' in data:
         mi.language = data['language']
     if data.get('keywords', ''):
         mi.tags = [x.strip() for x in data['keywords'].split(',') if x.strip()]
-    opfmeta = False # we need this later for the cover
+    opfmeta = False  # we need this later for the cover
     opfnocover = False
     if data.get('opf.metadata','') == 'true':
         # custom metadata contains OPF information
@@ -212,7 +212,7 @@ def get_metadata(stream, extract_cover=True):
         try:
             read_cover(stream, zin, mi, opfmeta, extract_cover)
         except:
-            pass # Do not let an error reading the cover prevent reading other data
+            pass  # Do not let an error reading the cover prevent reading other data
 
     return mi
 
@@ -242,7 +242,7 @@ def read_cover(stream, zin, mi, opfmeta, extract_cover):
         if opfmeta and frm.getAttribute('name').lower() == u'opf.cover':
             cover_href = i_href
             cover_data = (fmt, raw)
-            cover_frame = frm.getAttribute('name') # could have upper case
+            cover_frame = frm.getAttribute('name')  # could have upper case
             break
         if cover_href is None and imgnum == 1 and 0.8 <= height/width <= 1.8 and height*width >= 12000:
             # Pick the first image as the cover if it is of a suitable size

From 1ebb8a64eed11de276980fb919813fb1a2631ce4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 08:13:22 +0530
Subject: [PATCH 0777/1154] version 1.3

---
 Changelog.yaml           | 53 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index c6940440ca..336746bc42 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,59 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.3.0
+  date: 2013-09-13
+
+  new features:
+    - title: "When doing searches or switching between virtual libraries in the main book list, preserve the current book. The currently selected book will remain visible if it is present in the results of the search or the selected virtual library."
+      tickets: [1216713]
+
+    - title: "Drivers for Oppo Find 5 and PocketBook Mini 515"
+      tickets: [1223853]
+ 
+  bug fixes:
+    - title: "DOCX Input: Handle numbered paragraphs where the numbering is specified in the paragraph style, instead of on the paragraph directly. Also support the use of arbitrary, styled text for bullets."
+
+    - title: "DOCX Input: Fix a single line break at the end of a paragraph not being rendered as a blank line."
+
+    - title: "DOCX Input: Fix extra top/bottom margins around headings when the heading style in word does not specify any top/bottom margins."
+
+    - title: "DOCX Input: Handle images in footnotes and endnotes."
+      tickets: [1221686]
+
+    - title: "ODT Input: Only treat the first image as a cover if it is of suitable size, instead of any image in the document."
+      tickets: [1224157]
+
+    - title: "Book polishing: Do not leave behind the old comments when updating metadata if the comments have been deleted in calibre."
+
+    - title: "PDF Output: Fix non-breaking space characters incorrectly rendered in PDF outline."
+      tickets: [1223862]
+
+    - title: "Content server: Fix error in opds feed after using virtual libraries in the main server."
+      tickets: [1222108]
+
+    - title: "Do not scroll the book list horizontally after editing metadata."
+      tickets: [1221552]
+
+    - title: "New database backend: Handle databases that contain multiple tags/series/publishers/etc. that differ only in case."
+      tickets: [1221545] 
+
+  improved recipes:
+    - Harvard Business Review
+    - Jakarta Post 
+    - Jakarta Globe
+    - Dilema Veche
+    - Daily Express
+    - Anandtech
+    - High Country News
+
+  new recipes:
+    - title: Caravan Magazine
+      author: Kovid Goyal
+
+    - title: Phys Org 
+      author: Krittika Goyal
+     
 - version: 1.2.0
   date: 2013-09-06
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index bca14a0cbf..f15d4ffe18 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 2, 0)
+numeric_version = (1, 3, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 5271d1a2e1c7dc80e39644fbbdcdc2fe4c53aaaf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 15:17:09 +0530
Subject: [PATCH 0778/1154] Recognize EMF images

---
 src/calibre/utils/imghdr.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/imghdr.py b/src/calibre/utils/imghdr.py
index c4070f072e..fc8d0942d7 100644
--- a/src/calibre/utils/imghdr.py
+++ b/src/calibre/utils/imghdr.py
@@ -10,10 +10,10 @@ def what(file, h=None):
     if h is None:
         if isinstance(file, basestring):
             f = open(file, 'rb')
-            h = f.read(32)
+            h = f.read(44)
         else:
             location = file.tell()
-            h = file.read(32)
+            h = file.read(44)
             file.seek(location)
             f = None
     else:
@@ -120,6 +120,12 @@ def test_bmp(h, f):
 
 tests.append(test_bmp)
 
+def test_emf(h, f):
+    if h[:4] == b'\x01\0\0\0' and h[40:44] == b' EMF':
+        return 'emf'
+
+tests.append(test_emf)
+
 #--------------------#
 # Small test program #
 #--------------------#

From 740053ed367ac4be3cfb6882dfbc4db47f0a774c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 15:18:10 +0530
Subject: [PATCH 0779/1154] DOCX Input: Do not fail if the firs image is an EMF
 image

Fixes #1224849 [DOCX to EPUB conversion failed with devide by zero](https://bugs.launchpad.net/calibre/+bug/1224849)
---
 src/calibre/ebooks/docx/cleanup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/docx/cleanup.py b/src/calibre/ebooks/docx/cleanup.py
index bb421afc89..cea90f137f 100644
--- a/src/calibre/ebooks/docx/cleanup.py
+++ b/src/calibre/ebooks/docx/cleanup.py
@@ -173,7 +173,10 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover):
                     width, height, fmt = identify(path)
                 except:
                     width, height, fmt = 0, 0, None
-                is_cover = 0.8 <= height/width <= 1.8 and height*width >= 160000
+                try:
+                    is_cover = 0.8 <= height/width <= 1.8 and height*width >= 160000
+                except ZeroDivisionError:
+                    is_cover = False
                 if is_cover:
                     log.debug('Detected an image that looks like a cover')
                     img.getparent().remove(img)

From 258be8d13cebdaba22027e3e26c0d4017964732a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 15:34:22 +0530
Subject: [PATCH 0780/1154] Remove unused code

---
 src/calibre/utils/libwmf.c        |  83 -----------
 src/calibre/utils/wmf/__init__.py |  42 ------
 src/calibre/utils/wmf/wmf.c       | 233 ------------------------------
 3 files changed, 358 deletions(-)
 delete mode 100644 src/calibre/utils/libwmf.c
 delete mode 100644 src/calibre/utils/wmf/wmf.c

diff --git a/src/calibre/utils/libwmf.c b/src/calibre/utils/libwmf.c
deleted file mode 100644
index 7ec0ef533d..0000000000
--- a/src/calibre/utils/libwmf.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <libwmf/api.h>
-#include <libwmf/svg.h>
-
-#define False 0
-#define True 1
-typedef int bool;
-
-bool create_api(wmfAPI** API) {
-    wmfAPI_Options options;
-    wmf_error_t error;
-    unsigned long flags;
-
-    flags = WMF_OPT_FUNCTION;
-	flags |= WMF_OPT_IGNORE_NONFATAL;
-
-    options.function = wmf_svg_function;
-    error = wmf_api_create (API, flags, &options);
-    if (error != wmf_E_None) {
-        wmf_api_destroy (*API);
-        return False;
-    }
-    return True;
-}
-
-bool load_image(wmfAPI *API, const char *path) {
-    wmf_error_t error;
-    
-    error = wmf_file_open(API, path);
-    if (error != wmf_E_None) {
-        wmf_api_destroy (API);
-        return False;
-    }
-    return True;
-}
-
-bool scan_image(wmfAPI *API, wmfD_Rect *bbox) {
-    wmf_error_t error;
-
-    error = wmf_scan (API, 0, bbox);
-    if (error != wmf_E_None) {
-        wmf_api_destroy (API);
-        return False;
-    }
-    return True;
-}
-
-void get_image_size(wmfD_Rect *bbox, float *width, float *height) {
-    *width = bbox->BR.x - bbox->TL.x;
-    *height = bbox->BR.y - bbox->TL.y;
-}
-
-int main(int argc, char **argv) {
-    wmfAPI *API = NULL;
-    wmfD_Rect bbox;
-    wmf_svg_t *ddata;
-    float width, height;
-
-    if (argc != 2) {
-        fprintf(stderr, "Usage: wmf file\n");
-        return 1;
-    }
-    if (!create_api(&API)) {
-        fprintf(stderr, "Failed to create WMF API\n");
-        return 1;
-    }
-    ddata = WMF_SVG_GetData(API);
-
-    if (!load_image(API, argv[1])) {
-        fprintf(stderr, "Failed to load image: %s\n", argv[1]);
-        return 1;
-    }
-    if (!scan_image(API, &bbox)) {
-        fprintf(stderr, "Failed to scan image: %s\n", argv[1]);
-        return 1;
-    }
-
-
-    wmf_file_close(API);
-    get_image_size(&bbox, &width, &height);
-    printf("Image size: %f x %f\n", width, height);
-
-    return 0;
-}
diff --git a/src/calibre/utils/wmf/__init__.py b/src/calibre/utils/wmf/__init__.py
index cb7736e06a..d3e2ba2bb3 100644
--- a/src/calibre/utils/wmf/__init__.py
+++ b/src/calibre/utils/wmf/__init__.py
@@ -5,52 +5,10 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import glob
-
-from calibre.constants import plugins, iswindows, filesystem_encoding
-from calibre.ptempfile import TemporaryDirectory
-from calibre import CurrentDir
-from calibre.utils.magick import Image, PixelWand
-
 class Unavailable(Exception):
     pass
 
 class NoRaster(Exception):
     pass
 
-def extract_raster_image(wmf_data):
-    try:
-        wmf, wmf_err = plugins['wmf']
-    except KeyError:
-        raise Unavailable('libwmf not available on this platform')
-    if wmf_err:
-        raise Unavailable(wmf_err)
-
-    if iswindows:
-        import sys, os
-        appdir = sys.app_dir
-        if isinstance(appdir, unicode):
-            appdir = appdir.encode(filesystem_encoding)
-        fdir = os.path.join(appdir, 'wmffonts')
-        wmf.set_font_dir(fdir)
-
-    data = ''
-
-    with TemporaryDirectory('wmf2png') as tdir:
-        with CurrentDir(tdir):
-            wmf.render(wmf_data)
-
-            images = list(sorted(glob.glob('*.png')))
-            if not images:
-                raise NoRaster('No raster images in WMF')
-            data = open(images[0], 'rb').read()
-
-    im = Image()
-    im.load(data)
-    pw = PixelWand()
-    pw.color = '#ffffff'
-    im.rotate(pw, 180)
-
-    return im.export('png')
-
 
diff --git a/src/calibre/utils/wmf/wmf.c b/src/calibre/utils/wmf/wmf.c
deleted file mode 100644
index 74d3ca813f..0000000000
--- a/src/calibre/utils/wmf/wmf.c
+++ /dev/null
@@ -1,233 +0,0 @@
-#define UNICODE
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <libwmf/api.h>
-#include <libwmf/svg.h>
-//#include <libwmf/gd.h>
-
-typedef struct {
-    char *data;
-    size_t len;
-    size_t pos;
-} buf;
-
-//This code is taken mostly from the Abiword wmf plugin
-
-// Buffer read {{{
-// returns unsigned char cast to int, or EOF
-static int wmf_WMF_read(void * context) {
-    char c;
-	buf *info = (buf*)context;
-
-	if (info->pos == info->len)
-		return EOF;
-
-	c = info->data[info->pos];
-
-	info->pos++;
-
-	return (int)((unsigned char)c);
-}
-
-// returns (-1) on error, else 0
-static int wmf_WMF_seek(void * context, long pos) {
-	buf* info = (buf*) context;
-
-    if (pos < 0 || (size_t)pos > info->len) return -1;
-	info->pos = (size_t)pos;
-	return 0;
-}
-
-// returns (-1) on error, else pos
-static long wmf_WMF_tell(void * context) {
-	buf* info = (buf*) context;
-
-	return (long) info->pos;
-}
-// }}}
-
-
-char _png_name_buf[100];
-char *wmf_png_name(void *ctxt) {
-    int *num = (int*)ctxt;
-    *num = *num + 1;
-    snprintf(_png_name_buf, 90, "%04d.png", *num);
-    return _png_name_buf;
-}
-
-#define CLEANUP if(API) { if (stream) wmf_free(API, stream); wmf_api_destroy(API); };
-
-static PyObject *
-wmf_render(PyObject *self, PyObject *args) {
-    char *data;
-    Py_ssize_t sz;
-    PyObject *ans;
-
-	unsigned int disp_width  = 0;
-	unsigned int disp_height = 0;
-
-	float wmf_width;
-	float wmf_height;
-	float ratio_wmf;
-	float ratio_bounds;
-
-	unsigned long flags;
-
-	unsigned int max_width  = 1600;
-	unsigned int max_height = 1200;
-
-	static const char* Default_Description = "wmf2svg";
-    int fname_counter = 0;
-
-	wmf_error_t err;
-
-	wmf_svg_t* ddata = 0;
-
-	wmfAPI* API = 0;
-	wmfD_Rect bbox;
-
-	wmfAPI_Options api_options;
-
-    buf read_info;
-
-	char *stream = NULL;
-	unsigned long stream_len = 0;
-
-    if (!PyArg_ParseTuple(args, "s#", &data, &sz))
-        return NULL;
-
-	flags = WMF_OPT_IGNORE_NONFATAL | WMF_OPT_FUNCTION;
-	api_options.function = wmf_svg_function;
-
-	err = wmf_api_create(&API, flags, &api_options);
-
-	if (err != wmf_E_None) {
-        CLEANUP;
-        return PyErr_NoMemory();
-	}
-
-	read_info.data = data;
-	read_info.len = sz;
-	read_info.pos = 0;
-
-	err = wmf_bbuf_input(API, wmf_WMF_read, wmf_WMF_seek, wmf_WMF_tell, (void *) &read_info);
-	if (err != wmf_E_None) {
-        CLEANUP;
-        PyErr_SetString(PyExc_Exception, "Failed to initialize WMF input");
-        return NULL;
-	}
-
-	err = wmf_scan(API, 0, &(bbox));
-	if (err != wmf_E_None)
-	{	
-        CLEANUP;
-        PyErr_SetString(PyExc_ValueError, "Failed to scan the WMF");
-        return NULL;
-	}
-
-/* Okay, got this far, everything seems cool.
- */
-	ddata = WMF_SVG_GetData (API);
-
-	ddata->out = wmf_stream_create(API, NULL);
-
-	ddata->Description = (char *)Default_Description;
-
-	ddata->bbox = bbox;
-    ddata->image.context = (void *)&fname_counter;
-    ddata->image.name = wmf_png_name;
-
-	wmf_display_size(API, &disp_width, &disp_height, 96, 96);
-
-	wmf_width  = (float) disp_width;
-	wmf_height = (float) disp_height;
-
-	if ((wmf_width <= 0) || (wmf_height <= 0)) {
-        CLEANUP;
-        PyErr_SetString(PyExc_ValueError, "Bad WMF image size");
-        return NULL;
-	}
-
-	if ((wmf_width  > (float) max_width )
-	 || (wmf_height > (float) max_height)) {
-		ratio_wmf = wmf_height / wmf_width;
-		ratio_bounds = (float) max_height / (float) max_width;
-
-		if (ratio_wmf > ratio_bounds) {
-			ddata->height = max_height;
-			ddata->width  = (unsigned int) ((float) ddata->height / ratio_wmf);
-		}
-		else {
-			ddata->width  = max_width;
-			ddata->height = (unsigned int) ((float) ddata->width  * ratio_wmf);
-		}
-	}
-	else {
-		ddata->width  = (unsigned int) ceil ((double) wmf_width );
-		ddata->height = (unsigned int) ceil ((double) wmf_height);
-	}
-
-    // Needs GD
-	//ddata->flags |= WMF_SVG_INLINE_IMAGES;
-	//ddata->flags |= WMF_GD_OUTPUT_MEMORY | WMF_GD_OWN_BUFFER;
-
-    err = wmf_play(API, 0, &(bbox));
-
-    if (err != wmf_E_None) {
-        CLEANUP;
-        PyErr_SetString(PyExc_ValueError, "Playing of the WMF file failed");
-        return NULL;
-    }
-
-	wmf_stream_destroy(API, ddata->out, &stream, &stream_len);
-
-    ans = Py_BuildValue("s#", stream, stream_len);
-    
-    wmf_free(API, stream);
-    wmf_api_destroy (API);
-
-    return ans;
-}
-
-#ifdef _WIN32
-void set_libwmf_fontdir(const char *);
-
-static PyObject *
-wmf_setfontdir(PyObject *self, PyObject *args) {
-    char *path;
-    if (!PyArg_ParseTuple(args, "s", &path))
-        return NULL;
-    set_libwmf_fontdir(path);
-
-    Py_RETURN_NONE;
-}
-#endif
-
-
-
-
-static PyMethodDef wmf_methods[] = {
-    {"render", wmf_render, METH_VARARGS,
-        "render(data) -> Render wmf as svg."
-    },
-#ifdef _WIN32
-    {"set_font_dir", wmf_setfontdir, METH_VARARGS,
-        "set_font_dir(path) -> Set the path to the fonts dir on windows, must be called at least once before using render()"
-    },
-#endif
-
-    {NULL}  /* Sentinel */
-};
-
-
-PyMODINIT_FUNC
-initwmf(void) 
-{
-    PyObject* m;
-    m = Py_InitModule3("wmf", wmf_methods,
-                       "Wrapper for the libwmf library");
-
-
-}
-

From c6c17ef976fb5d9d2cfa6f0cb42b229e874eb328 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 15:38:24 +0530
Subject: [PATCH 0781/1154] Il Cambiamento by ghib9

---
 recipes/il_cambiamento.recipe | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 recipes/il_cambiamento.recipe

diff --git a/recipes/il_cambiamento.recipe b/recipes/il_cambiamento.recipe
new file mode 100644
index 0000000000..1ee044d8da
--- /dev/null
+++ b/recipes/il_cambiamento.recipe
@@ -0,0 +1,12 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class IC(BasicNewsRecipe):
+    title          = u'il Cambiamento'
+    oldest_article = 12
+    max_articles_per_feed = 50
+    language = 'it'
+    __author__ = 'ghib9'
+    auto_cleanup = True
+    use_embedded_content = False
+
+    feeds          = [(u'il Cambiamento', u'http://www.ilcambiamento.it/rss.xml')]

From beea0a48b51aca369154d46e54c49c5b9edfa5df Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 17:07:40 +0530
Subject: [PATCH 0782/1154] DOCX Input: Add support for EMF images

DOCX Input: Add support for embedded EMF images that are just wrappers
around an actual raster image. See #1224849 (DOCX to EPUB conversion failed with devide by zero)
---
 src/calibre/ebooks/docx/images.py  | 14 ++++-
 src/calibre/ebooks/docx/to_html.py |  2 +-
 src/calibre/utils/wmf/__init__.py  | 65 +++++++++++++++++++++
 src/calibre/utils/wmf/emf.py       | 93 ++++++++++++++++++++++++++++++
 src/calibre/utils/wmf/parse.py     | 73 ++---------------------
 5 files changed, 178 insertions(+), 69 deletions(-)
 create mode 100644 src/calibre/utils/wmf/emf.py

diff --git a/src/calibre/ebooks/docx/images.py b/src/calibre/ebooks/docx/images.py
index 3be3d51c05..4c0c8c8b6d 100644
--- a/src/calibre/ebooks/docx/images.py
+++ b/src/calibre/ebooks/docx/images.py
@@ -91,12 +91,13 @@ def get_hpos(anchor, page_width):
 
 class Images(object):
 
-    def __init__(self):
+    def __init__(self, log):
         self.rid_map = {}
         self.used = {}
         self.names = set()
         self.all_images = set()
         self.links = []
+        self.log = log
 
     def __call__(self, relationships_by_id):
         self.rid_map = relationships_by_id
@@ -109,6 +110,17 @@ class Images(object):
         raw = self.docx.read(fname)
         base = base or ascii_filename(rid_map[rid].rpartition('/')[-1]).replace(' ', '_') or 'image'
         ext = what(None, raw) or base.rpartition('.')[-1] or 'jpeg'
+        if ext == 'emf':
+            # For an example, see: https://bugs.launchpad.net/bugs/1224849
+            self.log('Found an EMF image: %s, trying to extract embedded raster image' % base)
+            from calibre.utils.wmf.emf import emf_unwrap
+            try:
+                raw = emf_unwrap(raw)
+            except Exception as e:
+                self.log.exception('Failed to extract embedded raster image from EMF')
+            else:
+                ext = 'png'
+
         base = base.rpartition('.')[0]
         if not base:
             base = 'image'
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index cdb50fcffd..b878714a76 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -57,7 +57,7 @@ class Convert(object):
         self.tables = Tables()
         self.fields = Fields()
         self.styles = Styles(self.tables)
-        self.images = Images()
+        self.images = Images(self.log)
         self.object_map = OrderedDict()
         self.html = HTML(
             HEAD(
diff --git a/src/calibre/utils/wmf/__init__.py b/src/calibre/utils/wmf/__init__.py
index d3e2ba2bb3..c1304c50be 100644
--- a/src/calibre/utils/wmf/__init__.py
+++ b/src/calibre/utils/wmf/__init__.py
@@ -5,6 +5,8 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+import struct
+
 class Unavailable(Exception):
     pass
 
@@ -12,3 +14,66 @@ class NoRaster(Exception):
     pass
 
 
+class DIBHeader(object):
+
+    '''
+    See http://en.wikipedia.org/wiki/BMP_file_format
+    '''
+
+    def __init__(self, raw):
+        hsize = struct.unpack(b'<I', raw[:4])[0]
+        if hsize == 40:
+            parts = struct.unpack(b'<IiiHHIIIIII', raw[:hsize])
+            for i, attr in enumerate((
+                'header_size', 'width', 'height', 'color_planes',
+                'bits_per_pixel', 'compression', 'image_size',
+                'hres', 'vres', 'ncols', 'nimpcols'
+                )):
+                setattr(self, attr, parts[i])
+        elif hsize == 12:
+            parts = struct.unpack(b'<IHHHH', raw[:hsize])
+            for i, attr in enumerate((
+                'header_size', 'width', 'height', 'color_planes',
+                'bits_per_pixel')):
+                setattr(self, attr, parts[i])
+        else:
+            raise ValueError('Unsupported DIB header type of size: %d'%hsize)
+
+        self.bitmasks_size = 12 if getattr(self, 'compression', 0) == 3 else 0
+        self.color_table_size = 0
+        if self.bits_per_pixel != 24:
+            # See http://support.microsoft.com/kb/q81498/
+            # for all the gory Micro and soft details
+            self.color_table_size = getattr(self, 'ncols', 0) * 4
+
+
+def create_bmp_from_dib(raw):
+    size = len(raw) + 14
+    dh = DIBHeader(raw)
+    pixel_array_offset = dh.header_size + dh.bitmasks_size + \
+                            dh.color_table_size
+    parts = [b'BM', struct.pack(b'<I', size), b'\0'*4, struct.pack(b'<I',
+        pixel_array_offset)]
+    return b''.join(parts) + raw
+
+def to_png(bmp):
+    # ImageMagick does not convert some bmp files correctly, while Qt does,
+    # so try Qt first. See for instance:
+    # https://bugs.launchpad.net/calibre/+bug/934167
+    # ImageMagick bug report:
+    # http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=20350
+    from PyQt4.Qt import QImage, QByteArray, QBuffer
+    i = QImage()
+    if i.loadFromData(bmp):
+        ba = QByteArray()
+        buf = QBuffer(ba)
+        buf.open(QBuffer.WriteOnly)
+        i.save(buf, 'png')
+        return bytes(ba.data())
+
+    from calibre.utils.magick import Image
+    img = Image()
+    img.load(bmp)
+    return img.export('png')
+
+
diff --git a/src/calibre/utils/wmf/emf.py b/src/calibre/utils/wmf/emf.py
new file mode 100644
index 0000000000..87a5863cbd
--- /dev/null
+++ b/src/calibre/utils/wmf/emf.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import sys
+from struct import unpack_from
+from collections import namedtuple
+
+from calibre.utils.wmf import create_bmp_from_dib, to_png
+
+# Record types {{{
+RECORD_TYPES = {
+    'EMR_BITBLT' : 0x4C,
+    'EMR_STRETCHBLT' : 0x4D,
+    'EMR_MASKBLT' : 0x4E,
+    'EMR_PLGBLT' : 0x4F,
+    'EMR_SETDIBITSTODEVICE' : 0x50,
+    'EMR_STRETCHDIBITS' : 0x51,
+    'EMR_ALPHABLEND' : 0x72,
+    'EMR_TRANSPARENTBLT' : 0x74,
+    'EOF' : 0xe,
+    'HEADER' : 0x1,
+}
+RECORD_RMAP = {v:k for k, v in RECORD_TYPES.iteritems()}
+
+StretchDiBits = namedtuple(
+    'StretchDiBits', 'left top right bottom x_dest y_dest x_src y_src cx_src'
+    ' cy_src bmp_hdr_offset bmp_header_size bmp_bits_offset'
+    ' bmp_bits_size usage op dest_width dest_height')
+# }}}
+
+class EMF(object):
+
+    def __init__(self, raw, verbose=0):
+        self.pos = 0
+        self.found_eof = False
+        self.verbose = verbose
+        self.func_map = {v:getattr(self, 'handle_%s' % (k.replace('EMR_', '').lower()), self.handle_unknown) for k, v in RECORD_TYPES.iteritems()}
+        self.bitmaps = []
+        while self.pos < len(raw) and not self.found_eof:
+            self.read_record(raw)
+        self.has_raster_image = bool(self.bitmaps)
+
+    def handle_unknown(self, rtype, size, raw):
+        if self.verbose:
+            print ('Ignoring unknown record:', RECORD_RMAP.get(rtype, hex(rtype).upper()))
+
+    def handle_header(self, rtype, size, raw):
+        pass
+
+    def handle_stretchdibits(self, rtype, size, raw):
+        data = StretchDiBits(*unpack_from(b'<18I', raw, 8))
+        hdr = raw[data.bmp_hdr_offset:data.bmp_hdr_offset + data.bmp_header_size]
+        bits = raw[data.bmp_bits_offset:data.bmp_bits_offset + data.bmp_bits_size]
+        bmp = create_bmp_from_dib(hdr + bits)
+        self.bitmaps.append(bmp)
+
+    def handle_eof(self, rtype, size, raw):
+        self.found_eof = True
+
+    def read_record(self, raw):
+        rtype, size = unpack_from(b'<II', raw, self.pos)
+        record = raw[self.pos:self.pos+size]
+        self.pos += size
+        self.func_map.get(rtype, self.handle_unknown)(rtype, size, record)
+
+    def to_png(self):
+        bmps = list(sorted(self.bitmaps, key=lambda x: len(x)))
+        bmp = bmps[-1]
+        return to_png(bmp)
+
+def emf_unwrap(raw, verbose=0):
+    '''
+    Return the largest embedded raster image in the EMF.
+    The returned data is in PNG format.
+    '''
+    w = EMF(raw, verbose=verbose)
+    if not w.has_raster_image:
+        raise ValueError('No raster image found in the EMF')
+    return w.to_png()
+
+
+if __name__ == '__main__':
+    with open(sys.argv[-1], 'rb') as f:
+        raw = f.read()
+    emf = EMF(raw, verbose=4)
+    open('/t/test.bmp', 'wb').write(emf.bitmaps[0])
+    open('/t/test.png', 'wb').write(emf.to_png())
+
diff --git a/src/calibre/utils/wmf/parse.py b/src/calibre/utils/wmf/parse.py
index f964be2d5f..a330ae5ef2 100644
--- a/src/calibre/utils/wmf/parse.py
+++ b/src/calibre/utils/wmf/parse.py
@@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
 
 import sys, struct
 
-
+from calibre.utils.wmf import create_bmp_from_dib, to_png
 
 class WMFHeader(object):
 
@@ -34,39 +34,6 @@ class WMFHeader(object):
 
         self.records_start_at = header_size * 2
 
-class DIBHeader(object):
-
-    '''
-    See http://en.wikipedia.org/wiki/BMP_file_format
-    '''
-
-    def __init__(self, raw):
-        hsize = struct.unpack('<I', raw[:4])[0]
-        if hsize == 40:
-            parts = struct.unpack('<IiiHHIIIIII', raw[:hsize])
-            for i, attr in enumerate((
-                'header_size', 'width', 'height', 'color_planes',
-                'bits_per_pixel', 'compression', 'image_size',
-                'hres', 'vres', 'ncols', 'nimpcols'
-                )):
-                setattr(self, attr, parts[i])
-        elif hsize == 12:
-            parts = struct.unpack('<IHHHH', raw[:hsize])
-            for i, attr in enumerate((
-                'header_size', 'width', 'height', 'color_planes',
-                'bits_per_pixel')):
-                setattr(self, attr, parts[i])
-        else:
-            raise ValueError('Unsupported DIB header type of size: %d'%hsize)
-
-        self.bitmasks_size = 12 if getattr(self, 'compression', 0) == 3 else 0
-        self.color_table_size = 0
-        if self.bits_per_pixel != 24:
-            # See http://support.microsoft.com/kb/q81498/
-            # for all the gory Micro and soft details
-            self.color_table_size = getattr(self, 'ncols', 0) * 4
-
-
 class WMF(object):
 
     def __init__(self, log=None, verbose=0):
@@ -80,7 +47,7 @@ class WMF(object):
         self.window_extent = None
         self.bitmaps = []
 
-        self.function_map = { # {{{
+        self.function_map = {  # {{{
                 30: 'SaveDC',
                 53: 'RealizePalette',
                 55: 'SetPalEntries',
@@ -160,7 +127,7 @@ class WMF(object):
                 2851: 'StretchBlt',
                 2881: 'DibStretchBlt',
                 3907: 'StretchDIBits'
-        } # }}}
+        }  # }}}
 
     def __call__(self, stream_or_data):
         data = stream_or_data
@@ -174,7 +141,7 @@ class WMF(object):
         self.records = []
         while offset < len(data)-6:
             size, func = struct.unpack_from('<IH', data, offset)
-            size *= 2 # Convert to bytes
+            size *= 2  # Convert to bytes
             offset += hsize
             params = ''
             delta = size - hsize
@@ -197,7 +164,6 @@ class WMF(object):
 
         self.has_raster_image = len(self.bitmaps) > 0
 
-
     def SetMapMode(self, params):
         if len(params) == 2:
             self.map_mode = struct.unpack('<H', params)[0]
@@ -231,40 +197,13 @@ class WMF(object):
             dest_width, y_dest, x_dest = struct.unpack_from('<IHHHHHHHH', raw, offset)
         offset += struct.calcsize(fmt)
         bmp_data = raw[offset:]
-        bmp = self.create_bmp_from_dib(bmp_data)
+        bmp = create_bmp_from_dib(bmp_data)
         self.bitmaps.append(bmp)
 
-    def create_bmp_from_dib(self, raw):
-        size = len(raw) + 14
-        dh = DIBHeader(raw)
-        pixel_array_offset = dh.header_size + dh.bitmasks_size + \
-                             dh.color_table_size
-        parts = ['BM', struct.pack('<I', size), '\0'*4, struct.pack('<I',
-            pixel_array_offset)]
-        return ''.join(parts) + raw
-
     def to_png(self):
         bmps = list(sorted(self.bitmaps, key=lambda x: len(x)))
         bmp = bmps[-1]
-
-        # ImageMagick does not convert some bmp files correctly, while Qt does,
-        # so try Qt first. See for instance:
-        # https://bugs.launchpad.net/calibre/+bug/934167
-        # ImageMagick bug report:
-        # http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=20350
-        from PyQt4.Qt import QImage, QByteArray, QBuffer
-        i = QImage()
-        if i.loadFromData(bmp):
-            ba = QByteArray()
-            buf = QBuffer(ba)
-            buf.open(QBuffer.WriteOnly)
-            i.save(buf, 'png')
-            return bytes(ba.data())
-
-        from calibre.utils.magick import Image
-        img = Image()
-        img.load(bmp)
-        return img.export('png')
+        return to_png(bmp)
 
 def wmf_unwrap(wmf_data, verbose=0):
     '''

From cc0d41d2e281cb758c6e2f523f9437ee05b111a4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 17:11:12 +0530
Subject: [PATCH 0783/1154] ...

---
 src/calibre/utils/wmf/emf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/utils/wmf/emf.py b/src/calibre/utils/wmf/emf.py
index 87a5863cbd..53b154a00b 100644
--- a/src/calibre/utils/wmf/emf.py
+++ b/src/calibre/utils/wmf/emf.py
@@ -13,6 +13,7 @@ from collections import namedtuple
 from calibre.utils.wmf import create_bmp_from_dib, to_png
 
 # Record types {{{
+# See: http://msdn.microsoft.com/en-us/library/cc231166.aspx
 RECORD_TYPES = {
     'EMR_BITBLT' : 0x4C,
     'EMR_STRETCHBLT' : 0x4D,
@@ -27,6 +28,7 @@ RECORD_TYPES = {
 }
 RECORD_RMAP = {v:k for k, v in RECORD_TYPES.iteritems()}
 
+# See http://msdn.microsoft.com/en-us/library/cc230601.aspx
 StretchDiBits = namedtuple(
     'StretchDiBits', 'left top right bottom x_dest y_dest x_src y_src cx_src'
     ' cy_src bmp_hdr_offset bmp_header_size bmp_bits_offset'

From 9c94ca0a9b75b370e6a7a6ca65f785235994d382 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 17:40:37 +0530
Subject: [PATCH 0784/1154] Show full path of library in status bar

Show full path of library under mouse in status bar when
switching/renaming/deleting libraries via the calibre library button.
Fixes #1224925 [[Enhancement]Show full path for libraries](https://bugs.launchpad.net/calibre/+bug/1224925)
---
 src/calibre/gui2/actions/choose_library.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index ec158b6718..898dc571ba 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -333,19 +333,23 @@ class ChooseLibraryAction(InterfaceAction):
         for name, loc in locations:
             ac = self.quick_menu.addAction(name, Dispatcher(partial(self.switch_requested,
                 loc)))
+            ac.setStatusTip(_('Switch to: %s') % loc)
             quick_actions.append(ac)
             ac = self.rename_menu.addAction(name, Dispatcher(partial(self.rename_requested,
                 name, loc)))
             rename_actions.append(ac)
+            ac.setStatusTip(_('Rename: %s') % loc)
             ac = self.delete_menu.addAction(name, Dispatcher(partial(self.delete_requested,
                 name, loc)))
             delete_actions.append(ac)
+            ac.setStatusTip(_('Remove: %s') % loc)
 
         qs_actions = []
         for i, x in enumerate(locations[:len(self.switch_actions)]):
             name, loc = x
             ac = self.switch_actions[i]
             ac.setText(name)
+            ac.setStatusTip(_('Switch to: %s') % loc)
             ac.setVisible(True)
             qs_actions.append(ac)
 

From d47db933929722558646e0f5a1f444703668da35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 18:01:49 +0530
Subject: [PATCH 0785/1154] ...

---
 src/calibre/gui2/comments_editor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index 0d2e6e779a..0347911ecd 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -244,8 +244,8 @@ class EditorWidget(QWebView):  # {{{
         d.la = la = QLabel(_(
             'Enter a URL. You can also choose to create a link to a file on '
             'your computer. If the selected file is an image, it will be '
-            'inserted as an image. Note that if you create a link to a file on '
-            'your computer, it will stop working if the file is moved.'))
+            'inserted as an image. Note that if you create a link to a file or image on '
+            'your computer, it will stop working if the file or image is moved.'))
         la.setWordWrap(True)
         la.setStyleSheet('QLabel { margin-bottom: 1.5ex }')
         l.setWidget(0, l.SpanningRole, la)

From 6624fd0e42547488cad229727a1d117882338cab Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Sep 2013 22:07:18 +0530
Subject: [PATCH 0786/1154] Ignore errors in third party UI plugins during
 genesis

---
 src/calibre/gui2/ui.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index a7554f62f0..5d939fbfdf 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -201,7 +201,14 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         self.check_messages_timer.start(1000)
 
         for ac in self.iactions.values():
-            ac.do_genesis()
+            try:
+                ac.do_genesis()
+            except Exception:
+                # Ignore errors in third party plugins
+                import traceback
+                traceback.print_exc()
+                if getattr(ac, 'plugin_path', None) is None:
+                    raise
         self.donate_action = QAction(QIcon(I('donate.png')),
                 _('&Donate to support calibre'), self)
         for st in self.istores.values():

From 6f4b23a4477d12e1ff6e487ceb56ff529cea15a3 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 13 Sep 2013 19:28:18 +0200
Subject: [PATCH 0787/1154] In the comments editor, permit insertion of
 references to images on the 'net (<img ...>) as well as links (<a ...>).

---
 src/calibre/gui2/comments_editor.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index 0d2e6e779a..cd479c7fb2 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -13,7 +13,8 @@ import sip
 from PyQt4.Qt import (QApplication, QFontInfo, QSize, QWidget, QPlainTextEdit,
     QToolBar, QVBoxLayout, QAction, QIcon, Qt, QTabWidget, QUrl, QFormLayout,
     QSyntaxHighlighter, QColor, QChar, QColorDialog, QMenu, QDialog, QLabel,
-    QHBoxLayout, QKeySequence, QLineEdit, QDialogButtonBox, QPushButton)
+    QHBoxLayout, QKeySequence, QLineEdit, QDialogButtonBox, QPushButton,
+    QCheckBox)
 from PyQt4.QtWebKit import QWebView, QWebPage
 
 from calibre.ebooks.chardet import xml_to_unicode
@@ -232,6 +233,7 @@ class EditorWidget(QWebView):  # {{{
         d.setLayout(l)
         d.url = QLineEdit(d)
         d.name = QLineEdit(d)
+        d.treat_as_image = QCheckBox(d)
         d.setMinimumWidth(600)
         d.bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
         d.br = b = QPushButton(_('&Browse'))
@@ -242,14 +244,18 @@ class EditorWidget(QWebView):  # {{{
                 d.url.setText(files[0])
         b.clicked.connect(cf)
         d.la = la = QLabel(_(
-            'Enter a URL. You can also choose to create a link to a file on '
+            'Enter a URL. If you check the "Treat the URL as an image" box '
+            'then the URL will be added as an image reference instead of as '
+            'a link. You can also choose to create a link to a file on '
             'your computer. If the selected file is an image, it will be '
-            'inserted as an image. Note that if you create a link to a file on '
-            'your computer, it will stop working if the file is moved.'))
+            'inserted as an image reference, otherwise it will be a link. '
+            'Note that if you create a link to a file on your computer, it '
+            'will stop working if the file is moved.'))
         la.setWordWrap(True)
         la.setStyleSheet('QLabel { margin-bottom: 1.5ex }')
         l.setWidget(0, l.SpanningRole, la)
         l.addRow(_('Enter &URL:'), d.url)
+        l.addRow(_('Treat the URL as an image'), d.treat_as_image)
         l.addRow(_('Enter &name (optional):'), d.name)
         l.addRow(_('Choose a file on your computer:'), d.br)
         l.addRow(d.bb)
@@ -263,6 +269,8 @@ class EditorWidget(QWebView):  # {{{
                 with lopen(link, 'rb') as f:
                     q = what(f)
                 is_image = q in {'jpeg', 'png', 'gif'}
+            else:
+                is_image = d.treat_as_image.isChecked()
         return link, name, is_image
 
     def parse_link(self, link):

From 95341e93c4eb585bba69188f3e8a78e3b9b6b4bf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 14 Sep 2013 10:16:48 +0530
Subject: [PATCH 0788/1154] Allow colons in identifier values

Fixes #1224885 [<dc:identifier opf:scheme="URI"> and semicolon #2](https://bugs.launchpad.net/calibre/+bug/1224885)
---
 src/calibre/db/write.py                    | 2 +-
 src/calibre/ebooks/metadata/book/base.py   | 2 +-
 src/calibre/gui2/metadata/basic_widgets.py | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 6025bbad9b..7207c268bc 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -111,7 +111,7 @@ def adapt_languages(to_tuple, x):
 
 def clean_identifier(typ, val):
     typ = icu_lower(typ or '').strip().replace(':', '').replace(',', '')
-    val = (val or '').strip().replace(',', '|').replace(':', '|')
+    val = (val or '').strip().replace(',', '|')
     return typ, val
 
 def adapt_identifiers(to_tuple, x):
diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index bacf10dc73..1eab61ec63 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -47,7 +47,7 @@ def reset_field_metadata():
     field_metadata = FieldMetadata()
 
 ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '')
-cv = lambda val: val.strip().replace(',', '|').replace(':', '|')
+cv = lambda val: val.strip().replace(',', '|')
 
 class Metadata(object):
 
diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index a0f4fe6586..801907b7cd 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -1264,11 +1264,12 @@ class IdentifiersEdit(QLineEdit):  # {{{
                 c = x.split(':')
                 if len(c) > 1:
                     itype = c[0].lower()
+                    c = ':'.join(c[1:])
                     if itype == 'isbn':
-                        v = check_isbn(c[1])
+                        v = check_isbn(c)
                         if v is not None:
-                            c[1] = v
-                    ans[itype] = c[1]
+                            c = v
+                    ans[itype] = c
             return ans
         def fset(self, val):
             if not val:

From 48757f89c3f8b146af590ccf63c79d487e126aa2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 08:38:56 +0530
Subject: [PATCH 0789/1154] Update Politika

---
 recipes/politika.recipe | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/recipes/politika.recipe b/recipes/politika.recipe
index 0cdd971027..08e6d8a000 100644
--- a/recipes/politika.recipe
+++ b/recipes/politika.recipe
@@ -1,5 +1,5 @@
 __license__   = 'GPL v3'
-__copyright__ = '2008-2010, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2008-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
 politika.rs
 '''
@@ -19,11 +19,11 @@ class Politika(BasicNewsRecipe):
     encoding              = 'utf8'
     delay                 = 1
     language              = 'sr'
-    publication_type      = 'newspaper'    
-    masthead_url          = 'http://static.politika.co.rs/images_new/politika.gif'    
-    extra_css             = """ 
-                               @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} 
-                               @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} 
+    publication_type      = 'newspaper'
+    masthead_url          = 'http://static.politika.co.rs/images_new/politika2.gif'
+    extra_css             = """
+                               @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
+                               @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
                                body{font-family: Arial,Helvetica,sans1,sans-serif}
                                h1{font-family: "Times New Roman",Times,serif1,serif}
                                .articledescription{font-family: sans1, sans-serif}
@@ -42,7 +42,7 @@ class Politika(BasicNewsRecipe):
     keep_only_tags     = [dict(name='div', attrs={'class':'big_article_home item_details'})]
     remove_tags_after  = dict(attrs={'class':'online_date'})
     remove_tags        = [dict(name=['link','meta','iframe','embed','object'])]
-    
+
     feeds          = [
                          (u'Politika'         , u'http://www.politika.rs/rubrike/Politika/index.1.lt.xml'         )
                         ,(u'Svet'             , u'http://www.politika.rs/rubrike/Svet/index.1.lt.xml'             )
@@ -59,8 +59,16 @@ class Politika(BasicNewsRecipe):
             del item['style']
         for item in soup.findAll('a', attrs={'class':'category'}):
             item.name='span'
-            if item.has_key('href'):            
+            if item.has_key('href'):
                del item['href']
-            if item.has_key('title'):            
+            if item.has_key('title'):
                del item['title']
         return soup
+
+    def get_cover_url(self):
+        soup = self.index_to_soup('http://www.politika.rs/')
+        coverlink = soup.find('a', attrs={'class':'home_print_img'})
+        if coverlink:
+           return coverlink['href']
+        return None
+        

From ac2dd2f7a24af7c3e71994fc21d6731cb9dc7f9a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 08:45:09 +0530
Subject: [PATCH 0790/1154] Fix #1225552 [Windows portable executable file
 description should be
 "Calibre"](https://bugs.launchpad.net/calibre/+bug/1225552)

---
 setup/installer/windows/freeze.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
index b15a0abbcb..194d298279 100644
--- a/setup/installer/windows/freeze.py
+++ b/setup/installer/windows/freeze.py
@@ -485,7 +485,7 @@ class Win32Freeze(Command, WixMixIn):
                     '/LIBPATH:'+self.obj_dir, '/SUBSYSTEM:WINDOWS',
                     '/RELEASE',
                     '/ENTRY:wWinMainCRTStartup',
-                    '/OUT:'+exe, self.embed_resources(exe),
+                    '/OUT:'+exe, self.embed_resources(exe, desc='Calibre Portable', product_description='Calibre Portable'),
                     obj, 'User32.lib']
             self.run_builder(cmd)
 

From 615cd01acb7e958260a27c1df90a9f73ed56c700 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 08:56:47 +0530
Subject: [PATCH 0791/1154] Book list should track edit metadata dialog

Fix regression in 1.3 that caused the book list to not track the
ecurrent book when using Next/Previous in the edit metadata dialog.
---
 src/calibre/gui2/actions/edit_metadata.py | 34 +++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index ca37239f5b..367e4bbc37 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -296,21 +296,31 @@ class EditMetadataAction(InterfaceAction):
                 list(range(self.gui.library_view.model().rowCount(QModelIndex())))
             current_row = row_list.index(cr)
 
-        with self.gui.library_view.preserve_state():
-            changed, rows_to_refresh = self.do_edit_metadata(row_list, current_row)
+        view = self.gui.library_view.alternate_views.current_view
+        try:
+            hpos = view.horizontalScrollBar().value()
+        except Exception:
+            hpos = 0
 
-            m = self.gui.library_view.model()
+        changed, rows_to_refresh = self.do_edit_metadata(row_list, current_row)
 
-            if rows_to_refresh:
-                m.refresh_rows(rows_to_refresh)
+        m = self.gui.library_view.model()
 
-            if changed:
-                m.refresh_ids(list(changed))
-                current = self.gui.library_view.currentIndex()
-                if self.gui.cover_flow:
-                    self.gui.cover_flow.dataChanged()
-                m.current_changed(current, previous)
-                self.gui.tags_view.recount()
+        if rows_to_refresh:
+            m.refresh_rows(rows_to_refresh)
+
+        if changed:
+            m.refresh_ids(list(changed))
+            current = self.gui.library_view.currentIndex()
+            if self.gui.cover_flow:
+                self.gui.cover_flow.dataChanged()
+            m.current_changed(current, previous)
+            self.gui.tags_view.recount()
+        if self.gui.library_view.alternate_views.current_view is view:
+            if hasattr(view, 'restore_hpos'):
+                view.restore_hpos(hpos)
+            else:
+                view.horizontalScrollBar().setValue(hpos)
 
     def do_edit_metadata(self, row_list, current_row):
         from calibre.gui2.metadata.single import edit_metadata

From 33875132ab29bea161539b0bb7322e21bd72e480 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 08:58:52 +0530
Subject: [PATCH 0792/1154] Fix #1225499 [non translatable "completed" for
 completed jobs](https://bugs.launchpad.net/calibre/+bug/1225499)

---
 src/calibre/gui2/actions/polish.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/polish.py b/src/calibre/gui2/actions/polish.py
index 0f21807afb..5320eb6a68 100644
--- a/src/calibre/gui2/actions/polish.py
+++ b/src/calibre/gui2/actions/polish.py
@@ -487,7 +487,7 @@ class PolishAction(InterfaceAction):
                 db.save_original_format(book_id, fmt, notify=False)
             with open(path, 'rb') as f:
                 db.add_format(book_id, fmt, f, index_is_id=True)
-        self.gui.status_bar.show_message(job.description + (' completed'), 2000)
+        self.gui.status_bar.show_message(job.description + _(' completed'), 2000)
         try:
             shutil.rmtree(base)
             parent = os.path.dirname(base)

From f730500c3d606daf6a9ba9a0cf166a454353752b Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 15 Sep 2013 09:09:02 +0200
Subject: [PATCH 0793/1154] Have metadata.book.set_all_user_metadata actually
 set the metadata, not merge it.

---
 src/calibre/ebooks/metadata/book/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index bacf10dc73..0f87edda0c 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -391,7 +391,7 @@ class Metadata(object):
                     m['#value#'] = None
             um[key] = m
         _data = object.__getattribute__(self, '_data')
-        _data['user_metadata'].update(um)
+        _data['user_metadata'] = um
 
     def set_user_metadata(self, field, metadata):
         '''

From 5c1998610f9bd34582a77873d24167b39a28d620 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Aug 2013 17:34:42 +0530
Subject: [PATCH 0794/1154] Conversion: Handle shorthand CSS properties

Conversion: Fix bugs in the handling of shorthand CSS properties
such as font or border, which could cause some properties to
not be resolved correctly during conversion.
---
 src/calibre/ebooks/oeb/normalize_css.py | 269 ++++++++++++++++++++++++
 src/calibre/ebooks/oeb/stylizer.py      | 152 +------------
 2 files changed, 280 insertions(+), 141 deletions(-)
 create mode 100644 src/calibre/ebooks/oeb/normalize_css.py

diff --git a/src/calibre/ebooks/oeb/normalize_css.py b/src/calibre/ebooks/oeb/normalize_css.py
new file mode 100644
index 0000000000..cadb58b5cb
--- /dev/null
+++ b/src/calibre/ebooks/oeb/normalize_css.py
@@ -0,0 +1,269 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from future_builtins import zip
+from functools import wraps
+
+try:
+    from cssutils.css import PropertyValue
+except ImportError:
+    raise RuntimeError('You need cssutils >= 0.9.9 for calibre')
+from cssutils import profile as cssprofiles
+
+DEFAULTS = {'azimuth': 'center', 'background-attachment': 'scroll',  # {{{
+            'background-color': 'transparent', 'background-image': 'none',
+            'background-position': '0% 0%', 'background-repeat': 'repeat',
+            'border-bottom-color': 'currentColor', 'border-bottom-style': 'none',
+            'border-bottom-width': 'medium', 'border-collapse': 'separate',
+            'border-left-color': 'currentColor', 'border-left-style': 'none',
+            'border-left-width': 'medium', 'border-right-color': 'currentColor',
+            'border-right-style': 'none', 'border-right-width': 'medium',
+            'border-spacing': 0, 'border-top-color': 'currentColor',
+            'border-top-style': 'none', 'border-top-width': 'medium', 'bottom':
+            'auto', 'caption-side': 'top', 'clear': 'none', 'clip': 'auto',
+            'color': 'black', 'content': 'normal', 'counter-increment': 'none',
+            'counter-reset': 'none', 'cue-after': 'none', 'cue-before': 'none',
+            'cursor': 'auto', 'direction': 'ltr', 'display': 'inline',
+            'elevation': 'level', 'empty-cells': 'show', 'float': 'none',
+            'font-family': 'serif', 'font-size': 'medium', 'font-style':
+            'normal', 'font-variant': 'normal', 'font-weight': 'normal',
+            'height': 'auto', 'left': 'auto', 'letter-spacing': 'normal',
+            'line-height': 'normal', 'list-style-image': 'none',
+            'list-style-position': 'outside', 'list-style-type': 'disc',
+            'margin-bottom': 0, 'margin-left': 0, 'margin-right': 0,
+            'margin-top': 0, 'max-height': 'none', 'max-width': 'none',
+            'min-height': 0, 'min-width': 0, 'orphans': '2',
+            'outline-color': 'invert', 'outline-style': 'none',
+            'outline-width': 'medium', 'overflow': 'visible', 'padding-bottom':
+            0, 'padding-left': 0, 'padding-right': 0, 'padding-top': 0,
+            'page-break-after': 'auto', 'page-break-before': 'auto',
+            'page-break-inside': 'auto', 'pause-after': 0, 'pause-before':
+            0, 'pitch': 'medium', 'pitch-range': '50', 'play-during': 'auto',
+            'position': 'static', 'quotes': u"'“' '”' '‘' '’'", 'richness':
+            '50', 'right': 'auto', 'speak': 'normal', 'speak-header': 'once',
+            'speak-numeral': 'continuous', 'speak-punctuation': 'none',
+            'speech-rate': 'medium', 'stress': '50', 'table-layout': 'auto',
+            'text-align': 'auto', 'text-decoration': 'none', 'text-indent':
+            0, 'text-transform': 'none', 'top': 'auto', 'unicode-bidi':
+            'normal', 'vertical-align': 'baseline', 'visibility': 'visible',
+            'voice-family': 'default', 'volume': 'medium', 'white-space':
+            'normal', 'widows': '2', 'width': 'auto', 'word-spacing': 'normal',
+            'z-index': 'auto'}
+# }}}
+
+EDGES = ('top', 'right', 'bottom', 'left')
+
+def normalize_edge(name, cssvalue):
+    style = {}
+    if isinstance(cssvalue, PropertyValue):
+        primitives = [v.cssText for v in cssvalue]
+    else:
+        primitives = [cssvalue.cssText]
+    if len(primitives) == 1:
+        value, = primitives
+        values = (value, value, value, value)
+    elif len(primitives) == 2:
+        vert, horiz = primitives
+        values = (vert, horiz, vert, horiz)
+    elif len(primitives) == 3:
+        top, horiz, bottom = primitives
+        values = (top, horiz, bottom, horiz)
+    else:
+        values = primitives[:4]
+    if '-' in name:
+        l, _, r = name.partition('-')
+        for edge, value in zip(EDGES, values):
+            style['%s-%s-%s' % (l, edge, r)] = value
+    else:
+        for edge, value in zip(EDGES, values):
+            style['%s-%s' % (name, edge)] = value
+    return style
+
+
+def simple_normalizer(prefix, names, check_inherit=True):
+    composition = tuple('%s-%s' %(prefix, n) for n in names)
+    @wraps(normalize_simple_composition)
+    def wrapper(name, cssvalue):
+        return normalize_simple_composition(name, cssvalue, composition, check_inherit=check_inherit)
+    return wrapper
+
+
+def normalize_simple_composition(name, cssvalue, composition, check_inherit=True):
+    if check_inherit and cssvalue.cssText == 'inherit':
+        style = {k:'inherit' for k in composition}
+    else:
+        style = {k:DEFAULTS[k] for k in composition}
+        try:
+            primitives = [v.cssText for v in cssvalue]
+        except TypeError:
+            primitives = [cssvalue.cssText]
+        while primitives:
+            value = primitives.pop()
+            for key in composition:
+                if cssprofiles.validate(key, value):
+                    style[key] = value
+                    break
+    return style
+
+font_composition = ('font-style', 'font-variant', 'font-weight', 'font-size', 'line-height', 'font-family')
+
+def normalize_font(name, cssvalue):
+    # See https://developer.mozilla.org/en-US/docs/Web/CSS/font
+    composition = font_composition
+    val = cssvalue.cssText
+    if val == 'inherit':
+        return {k:'inherit' for k in composition}
+    if val in {'caption', 'icon', 'menu', 'message-box', 'small-caption', 'status-bar'}:
+        return {k:DEFAULTS[k] for k in composition}
+    try:
+        primitives = list(v.cssText for v in cssvalue)
+    except TypeError:
+        primitives = [cssvalue.cssText]
+    if len(primitives) < 2:
+        return {}  # Mandatory to define both font size and font family
+    style = {k:DEFAULTS[k] for k in composition}
+    style['font-family'] = primitives.pop()
+    if len(primitives) > 1 and cssprofiles.validate('line-height', primitives[-1]) and cssprofiles.validate('font-size', primitives[-2]):
+        style['line-height'], style['font-size'] = primitives.pop(), primitives.pop()
+    else:
+        val = primitives.pop()
+        if not cssprofiles.validate('font-size', val):
+            return {}
+        style['font-size'] = val
+    composition = composition[:3]
+    while primitives:
+        value = primitives.pop()
+        for key in composition:
+            if cssprofiles.validate(key, value):
+                style[key] = value
+                break
+    return style
+
+def normalize_border(name, cssvalue):
+    style = normalizers['border-' + EDGES[0]]('border-' + EDGES[0], cssvalue)
+    vals = style.copy()
+    for edge in EDGES[1:]:
+        style.update({k.replace(EDGES[0], edge):v for k, v in vals.iteritems()})
+    return style
+
+normalizers = {
+    'list-style': simple_normalizer('list-style', ('type', 'position', 'image')),
+    'font': normalize_font,
+    'border': normalize_border,
+}
+
+for x in ('margin', 'padding', 'border-style', 'border-width', 'border-color'):
+    normalizers[x] = normalize_edge
+
+for x in EDGES:
+    name = 'border-' + x
+    normalizers[name] = simple_normalizer(name, ('color', 'style', 'width'), check_inherit=False)
+
+def test_normalization():
+    import unittest
+    from cssutils import parseStyle
+
+    class TestNormalization(unittest.TestCase):
+        longMessage = True
+        maxDiff = None
+
+        def test_font_normalization(self):
+            def font_dict(expected):
+                ans = {k:DEFAULTS[k] for k in font_composition}
+                ans.update(expected)
+                return ans
+
+            for raw, expected in {
+                'some_font': {}, 'none': {}, 'inherit':{k:'inherit' for k in font_composition},
+                '1.2pt/1.4 A_Font': {'font-family':'A_Font', 'font-size':'1.2pt', 'line-height':'1.4'},
+                'bad font': {}, '10% serif': {'font-family':'serif', 'font-size':'10%'},
+                'bold italic large serif': {'font-family':'serif', 'font-weight':'bold', 'font-style':'italic', 'font-size':'large'},
+                'bold italic small-caps larger/normal serif':
+                {'font-family':'serif', 'font-weight':'bold', 'font-style':'italic', 'font-size':'larger',
+                 'line-height':'normal', 'font-variant':'small-caps'},
+            }.iteritems():
+                val = tuple(parseStyle('font: %s' % raw, validate=False))[0].cssValue
+                style = normalizers['font']('font', val)
+                if expected:
+                    self.assertDictEqual(font_dict(expected), style)
+                else:
+                    self.assertDictEqual(expected, style)
+
+        def test_border_normalization(self):
+            def border_edge_dict(expected, edge='right'):
+                ans = {'border-%s-%s' % (edge, x): DEFAULTS['border-%s-%s' % (edge, x)] for x in ('style', 'width', 'color')}
+                for x, v in expected.iteritems():
+                    ans['border-%s-%s' % (edge, x)] = v
+                return ans
+            def border_dict(expected):
+                ans = {}
+                for edge in EDGES:
+                    ans.update(border_edge_dict(expected, edge))
+                return ans
+            def border_val_dict(expected, val='color'):
+                ans = {'border-%s-%s' % (edge, val): DEFAULTS['border-%s-%s' % (edge, val)] for edge in EDGES}
+                for edge in EDGES:
+                    ans['border-%s-%s' % (edge, val)] = expected
+                return ans
+
+            for raw, expected in {
+                'solid 1px red': {'color':'red', 'width':'1px', 'style':'solid'},
+                '1px': {'width': '1px'}, '#aaa': {'color': '#aaa'},
+                '2em groove': {'width':'2em', 'style':'groove'},
+            }.iteritems():
+                for edge in EDGES:
+                    br = 'border-%s' % edge
+                    val = tuple(parseStyle('%s: %s' % (br, raw), validate=False))[0].cssValue
+                    self.assertDictEqual(border_edge_dict(expected, edge), normalizers[br](br, val))
+
+            for raw, expected in {
+                'solid 1px red': {'color':'red', 'width':'1px', 'style':'solid'},
+                '1px': {'width': '1px'}, '#aaa': {'color': '#aaa'},
+                'thin groove': {'width':'thin', 'style':'groove'},
+            }.iteritems():
+                val = tuple(parseStyle('%s: %s' % ('border', raw), validate=False))[0].cssValue
+                self.assertDictEqual(border_dict(expected), normalizers['border']('border', val))
+
+            for name, val in {
+                'width': '10%', 'color': 'rgb(0, 1, 1)', 'style': 'double',
+            }.iteritems():
+                cval = tuple(parseStyle('border-%s: %s' % (name, val), validate=False))[0].cssValue
+                self.assertDictEqual(border_val_dict(val, name), normalizers['border-'+name]('border-'+name, cval))
+
+        def test_edge_normalization(self):
+            def edge_dict(prefix, expected):
+                return {'%s-%s' % (prefix, edge) : x for edge, x in zip(EDGES, expected)}
+            for raw, expected in {
+                '2px': ('2px', '2px', '2px', '2px'),
+                '1em 2em': ('1em', '2em', '1em', '2em'),
+                '1em 2em 3em': ('1em', '2em', '3em', '2em'),
+                '1 2 3 4': ('1', '2', '3', '4'),
+            }.iteritems():
+                for prefix in ('margin', 'padding'):
+                    cval = tuple(parseStyle('%s: %s' % (prefix, raw), validate=False))[0].cssValue
+                    self.assertDictEqual(edge_dict(prefix, expected), normalizers[prefix](prefix, cval))
+
+        def test_list_style_normalization(self):
+            def ls_dict(expected):
+                ans = {'list-style-%s' % x : DEFAULTS['list-style-%s' % x] for x in ('type', 'image', 'position')}
+                for k, v in expected.iteritems():
+                    ans['list-style-%s' % k] = v
+                return ans
+            for raw, expected in {
+                'url(http://www.example.com/images/list.png)': {'image': 'url(http://www.example.com/images/list.png)'},
+                'inside square': {'position':'inside', 'type':'square'},
+                'upper-roman url(img) outside': {'position':'outside', 'type':'upper-roman', 'image':'url(img)'},
+            }.iteritems():
+                cval = tuple(parseStyle('list-style: %s' % raw, validate=False))[0].cssValue
+                self.assertDictEqual(ls_dict(expected), normalizers['list-style']('list-style', cval))
+
+    tests = unittest.defaultTestLoader.loadTestsFromTestCase(TestNormalization)
+    unittest.TextTestRunner(verbosity=4).run(tests)
+
+if __name__ == '__main__':
+    test_normalization()
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index 626af21b97..7a559ca15c 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -8,15 +8,11 @@ from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
-import os, itertools, re, logging, copy, unicodedata
+import os, re, logging, copy, unicodedata
 from weakref import WeakKeyDictionary
 from xml.dom import SyntaxErr as CSSSyntaxError
 from cssutils.css import (CSSStyleRule, CSSPageRule, CSSFontFaceRule,
         cssproperties)
-try:
-    from cssutils.css import PropertyValue
-except ImportError:
-    raise RuntimeError('You need cssutils >= 0.9.9 for calibre')
 from cssutils import (profile as cssprofiles, parseString, parseStyle, log as
         cssutils_log, CSSParser, profiles, replaceUrls)
 from lxml import etree
@@ -24,8 +20,8 @@ from cssselect import HTMLTranslator
 
 from calibre import force_unicode
 from calibre.ebooks import unit_convert
-from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES
-from calibre.ebooks.oeb.base import XPNSMAP, xpath, urlnormalize
+from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES, XPNSMAP, xpath, urlnormalize
+from calibre.ebooks.oeb.normalize_css import DEFAULTS, normalizers
 
 cssutils_log.setLevel(logging.WARN)
 
@@ -54,46 +50,6 @@ INHERITED = set(['azimuth', 'border-collapse', 'border-spacing',
                  'visibility', 'voice-family', 'volume', 'white-space',
                  'widows', 'word-spacing'])
 
-DEFAULTS = {'azimuth': 'center', 'background-attachment': 'scroll',
-            'background-color': 'transparent', 'background-image': 'none',
-            'background-position': '0% 0%', 'background-repeat': 'repeat',
-            'border-bottom-color': ':color', 'border-bottom-style': 'none',
-            'border-bottom-width': 'medium', 'border-collapse': 'separate',
-            'border-left-color': ':color', 'border-left-style': 'none',
-            'border-left-width': 'medium', 'border-right-color': ':color',
-            'border-right-style': 'none', 'border-right-width': 'medium',
-            'border-spacing': 0, 'border-top-color': ':color',
-            'border-top-style': 'none', 'border-top-width': 'medium', 'bottom':
-            'auto', 'caption-side': 'top', 'clear': 'none', 'clip': 'auto',
-            'color': 'black', 'content': 'normal', 'counter-increment': 'none',
-            'counter-reset': 'none', 'cue-after': 'none', 'cue-before': 'none',
-            'cursor': 'auto', 'direction': 'ltr', 'display': 'inline',
-            'elevation': 'level', 'empty-cells': 'show', 'float': 'none',
-            'font-family': 'serif', 'font-size': 'medium', 'font-style':
-            'normal', 'font-variant': 'normal', 'font-weight': 'normal',
-            'height': 'auto', 'left': 'auto', 'letter-spacing': 'normal',
-            'line-height': 'normal', 'list-style-image': 'none',
-            'list-style-position': 'outside', 'list-style-type': 'disc',
-            'margin-bottom': 0, 'margin-left': 0, 'margin-right': 0,
-            'margin-top': 0, 'max-height': 'none', 'max-width': 'none',
-            'min-height': 0, 'min-width': 0, 'orphans': '2',
-            'outline-color': 'invert', 'outline-style': 'none',
-            'outline-width': 'medium', 'overflow': 'visible', 'padding-bottom':
-            0, 'padding-left': 0, 'padding-right': 0, 'padding-top': 0,
-            'page-break-after': 'auto', 'page-break-before': 'auto',
-            'page-break-inside': 'auto', 'pause-after': 0, 'pause-before':
-            0, 'pitch': 'medium', 'pitch-range': '50', 'play-during': 'auto',
-            'position': 'static', 'quotes': u"'“' '”' '‘' '’'", 'richness':
-            '50', 'right': 'auto', 'speak': 'normal', 'speak-header': 'once',
-            'speak-numeral': 'continuous', 'speak-punctuation': 'none',
-            'speech-rate': 'medium', 'stress': '50', 'table-layout': 'auto',
-            'text-align': 'auto', 'text-decoration': 'none', 'text-indent':
-            0, 'text-transform': 'none', 'top': 'auto', 'unicode-bidi':
-            'normal', 'vertical-align': 'baseline', 'visibility': 'visible',
-            'voice-family': 'default', 'volume': 'medium', 'white-space':
-            'normal', 'widows': '2', 'width': 'auto', 'word-spacing': 'normal',
-            'z-index': 'auto'}
-
 FONT_SIZE_NAMES = set(['xx-small', 'x-small', 'small', 'medium', 'large',
                        'x-large', 'xx-large'])
 
@@ -421,14 +377,11 @@ class Stylizer(object):
         style = {}
         for prop in cssstyle:
             name = prop.name
-            if name in ('margin', 'padding'):
-                style.update(self._normalize_edge(prop.cssValue, name))
-            elif name == 'font':
-                style.update(self._normalize_font(prop.cssValue))
-            elif name == 'list-style':
-                style.update(self._normalize_list_style(prop.cssValue))
+            normalizer = normalizers.get(name, None)
+            if normalizer is not None:
+                style.update(normalizer(name, prop.cssValue))
             elif name == 'text-align':
-                style.update(self._normalize_text_align(prop.cssValue))
+                style['text-align'] = self._apply_text_align(prop.value)
             else:
                 style[name] = prop.value
         if 'font-size' in style:
@@ -441,93 +394,10 @@ class Stylizer(object):
                 style['font-size'] = "%dpt" % self.profile.fnames[size]
         return style
 
-    def _normalize_edge(self, cssvalue, name):
-        style = {}
-        if isinstance(cssvalue, PropertyValue):
-            primitives = [v.cssText for v in cssvalue]
-        else:
-            primitives = [cssvalue.cssText]
-        if len(primitives) == 1:
-            value, = primitives
-            values = [value, value, value, value]
-        elif len(primitives) == 2:
-            vert, horiz = primitives
-            values = [vert, horiz, vert, horiz]
-        elif len(primitives) == 3:
-            top, horiz, bottom = primitives
-            values = [top, horiz, bottom, horiz]
-        else:
-            values = primitives[:4]
-        edges = ('top', 'right', 'bottom', 'left')
-        for edge, value in itertools.izip(edges, values):
-            style["%s-%s" % (name, edge)] = value
-        return style
-
-    def _normalize_list_style(self, cssvalue):
-        composition = ('list-style-type', 'list-style-position',
-                       'list-style-image')
-        style = {}
-        if cssvalue.cssText == 'inherit':
-            for key in composition:
-                style[key] = 'inherit'
-        else:
-            try:
-                primitives = [v.cssText for v in cssvalue]
-            except TypeError:
-                primitives = [cssvalue.cssText]
-            primitives.reverse()
-            value = primitives.pop()
-            for key in composition:
-                if cssprofiles.validate(key, value):
-                    style[key] = value
-                    if not primitives:
-                        break
-                    value = primitives.pop()
-            for key in composition:
-                if key not in style:
-                    style[key] = DEFAULTS[key]
-
-        return style
-
-    def _normalize_text_align(self, cssvalue):
-        style = {}
-        text = cssvalue.cssText
-        if text == 'inherit':
-            style['text-align'] = 'inherit'
-        else:
-            if text in ('left', 'justify') and self.opts.change_justification in ('left', 'justify'):
-                val = self.opts.change_justification
-                style['text-align'] = val
-            else:
-                style['text-align'] = text
-        return style
-
-    def _normalize_font(self, cssvalue):
-        composition = ('font-style', 'font-variant', 'font-weight',
-                       'font-size', 'line-height', 'font-family')
-        style = {}
-        if cssvalue.cssText == 'inherit':
-            for key in composition:
-                style[key] = 'inherit'
-        else:
-            try:
-                primitives = [v.cssText for v in cssvalue]
-            except TypeError:
-                primitives = [cssvalue.cssText]
-            primitives.reverse()
-            value = primitives.pop()
-            for key in composition:
-                if cssprofiles.validate(key, value):
-                    style[key] = value
-                    if not primitives:
-                        break
-                    value = primitives.pop()
-            for key in composition:
-                if key not in style:
-                    val = ('inherit' if key in {'font-family', 'font-size'}
-                        else 'normal')
-                    style[key] = val
-        return style
+    def _apply_text_align(self, text):
+        if text in ('left', 'justify') and self.opts.change_justification in ('left', 'justify'):
+            text = self.opts.change_justification
+        return text
 
     def style(self, element):
         try:

From 622306be962e61d7a00cd1d0a42fdef43f03f945 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Aug 2013 18:03:02 +0530
Subject: [PATCH 0795/1154] ...

---
 src/calibre/ebooks/oeb/normalize_css.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/normalize_css.py b/src/calibre/ebooks/oeb/normalize_css.py
index cadb58b5cb..dea3826c87 100644
--- a/src/calibre/ebooks/oeb/normalize_css.py
+++ b/src/calibre/ebooks/oeb/normalize_css.py
@@ -164,7 +164,7 @@ for x in EDGES:
     name = 'border-' + x
     normalizers[name] = simple_normalizer(name, ('color', 'style', 'width'), check_inherit=False)
 
-def test_normalization():
+def test_normalization():  # {{{
     import unittest
     from cssutils import parseStyle
 
@@ -264,6 +264,7 @@ def test_normalization():
 
     tests = unittest.defaultTestLoader.loadTestsFromTestCase(TestNormalization)
     unittest.TextTestRunner(verbosity=4).run(tests)
+# }}}
 
 if __name__ == '__main__':
     test_normalization()

From cdbf10ffabfc61339610707671d8552fd618af59 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 10:20:40 +0530
Subject: [PATCH 0796/1154] pep8

---
 src/calibre/ebooks/conversion/plugins/mobi_output.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/mobi_output.py b/src/calibre/ebooks/conversion/plugins/mobi_output.py
index b5dc6f17d5..0bdb26162c 100644
--- a/src/calibre/ebooks/conversion/plugins/mobi_output.py
+++ b/src/calibre/ebooks/conversion/plugins/mobi_output.py
@@ -148,7 +148,6 @@ class MOBIOutput(OutputFormatPlugin):
                         self.oeb.manifest.remove(self.oeb.manifest.hrefs[x.href])
                         x.href = articles_[0].href
 
-
             for sec in sections:
                 articles[id(sec)] = []
                 for a in list(sec):
@@ -179,7 +178,7 @@ class MOBIOutput(OutputFormatPlugin):
 
         mobi_type = opts.mobi_file_type
         if self.is_periodical:
-            mobi_type = 'old' # Amazon does not support KF8 periodicals
+            mobi_type = 'old'  # Amazon does not support KF8 periodicals
         create_kf8 = mobi_type in ('new', 'both')
 
         remove_html_cover(self.oeb, self.log)
@@ -188,12 +187,10 @@ class MOBIOutput(OutputFormatPlugin):
         self.check_for_periodical()
 
         if create_kf8:
-            # Split on pagebreaks so that the resulting KF8 works better with
-            # calibre's viewer, which does not support CSS page breaks
+            # Split on pagebreaks so that the resulting KF8 is faster to load
             from calibre.ebooks.oeb.transforms.split import Split
             Split()(self.oeb, self.opts)
 
-
         kf8 = self.create_kf8(resources, for_joint=mobi_type=='both'
                 ) if create_kf8 else None
         if mobi_type == 'new':

From a4f2288976736d76c61ffdb2f74732b1073767a9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 10:25:13 +0530
Subject: [PATCH 0797/1154] pep8

---
 src/calibre/ebooks/conversion/plugins/oeb_output.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/oeb_output.py b/src/calibre/ebooks/conversion/plugins/oeb_output.py
index 86d3b76a8c..19468425b1 100644
--- a/src/calibre/ebooks/conversion/plugins/oeb_output.py
+++ b/src/calibre/ebooks/conversion/plugins/oeb_output.py
@@ -18,7 +18,6 @@ class OEBOutput(OutputFormatPlugin):
 
     recommendations = set([('pretty_print', True, OptionRecommendation.HIGH)])
 
-
     def convert(self, oeb_book, output_path, input_plugin, opts, log):
         from urllib import unquote
         from lxml import etree
@@ -62,7 +61,7 @@ class OEBOutput(OutputFormatPlugin):
                     f.write(str(item))
                 item.unload_data_from_memory(memory=path)
 
-    def workaround_nook_cover_bug(self, root): # {{{
+    def workaround_nook_cover_bug(self, root):  # {{{
         cov = root.xpath('//*[local-name() = "meta" and @name="cover" and'
                 ' @content != "cover"]')
 
@@ -96,7 +95,7 @@ class OEBOutput(OutputFormatPlugin):
                     cov.set('content', 'cover')
     # }}}
 
-    def workaround_pocketbook_cover_bug(self, root): # {{{
+    def workaround_pocketbook_cover_bug(self, root):  # {{{
         m = root.xpath('//*[local-name() = "manifest"]/*[local-name() = "item" '
                 ' and @id="cover"]')
         if len(m) == 1:
@@ -106,7 +105,7 @@ class OEBOutput(OutputFormatPlugin):
             p.insert(0, m)
     # }}}
 
-    def migrate_lang_code(self, root): # {{{
+    def migrate_lang_code(self, root):  # {{{
         from calibre.utils.localization import lang_as_iso639_1
         for lang in root.xpath('//*[local-name() = "language"]'):
             clc = lang_as_iso639_1(lang.text)

From c6491d03a66b23e62ffe2881e0fe96223353bad1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 11:52:11 +0530
Subject: [PATCH 0798/1154] pep8

---
 src/calibre/ebooks/mobi/writer8/main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/mobi/writer8/main.py b/src/calibre/ebooks/mobi/writer8/main.py
index 564dc5521c..efdfb00ba8 100644
--- a/src/calibre/ebooks/mobi/writer8/main.py
+++ b/src/calibre/ebooks/mobi/writer8/main.py
@@ -48,8 +48,8 @@ class KF8Writer(object):
         self.toc_adder = TOCAdder(oeb, opts)
         self.used_images = set()
         self.resources = resources
-        self.flows = [None] # First flow item is reserved for the text
-        self.records = [None] # Placeholder for zeroth record
+        self.flows = [None]  # First flow item is reserved for the text
+        self.records = [None]  # Placeholder for zeroth record
 
         self.log('\tGenerating KF8 markup...')
         self.dup_data()
@@ -145,7 +145,7 @@ class KF8Writer(object):
                 cssutils.replaceUrls(sheet, replacer, ignoreImportRules=True)
 
     def extract_css_into_flows(self):
-        inlines = defaultdict(list) # Ensure identical <style>s not repeated
+        inlines = defaultdict(list)  # Ensure identical <style>s not repeated
         sheets = {}
 
         for item in self.oeb.manifest:
@@ -375,7 +375,7 @@ class KF8Writer(object):
                 key=lambda entry: (entry['depth'], entry['offset']))
         is_non_linear = original != linearized
         entries = linearized
-        is_non_linear = False # False as we are using the linearized entries
+        is_non_linear = False  # False as we are using the linearized entries
 
         if is_non_linear:
             for entry in entries:
@@ -428,7 +428,7 @@ class KF8Writer(object):
                 _('Unknown'), ref.type, (pos, fid)))
 
         if self.guide_table:
-            self.guide_table.sort(key=lambda x:x.type) # Needed by the Kindle
+            self.guide_table.sort(key=lambda x:x.type)  # Needed by the Kindle
             self.guide_records = GuideIndex(self.guide_table)()
 
 def create_kf8_book(oeb, opts, resources, for_joint=False):

From 57898355502c551a0a1fed9d03056f62b72fade1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 17:04:34 +0530
Subject: [PATCH 0799/1154] Use shorthand properties for margin, border and
 padding

---
 .../ebooks/conversion/plugins/oeb_output.py   |   5 +-
 src/calibre/ebooks/mobi/writer8/main.py       |   3 +
 src/calibre/ebooks/oeb/normalize_css.py       | 121 +++++++++++++++++-
 3 files changed, 127 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/oeb_output.py b/src/calibre/ebooks/conversion/plugins/oeb_output.py
index 19468425b1..d63be32fd9 100644
--- a/src/calibre/ebooks/conversion/plugins/oeb_output.py
+++ b/src/calibre/ebooks/conversion/plugins/oeb_output.py
@@ -25,7 +25,8 @@ class OEBOutput(OutputFormatPlugin):
         self.log, self.opts = log, opts
         if not os.path.exists(output_path):
             os.makedirs(output_path)
-        from calibre.ebooks.oeb.base import OPF_MIME, NCX_MIME, PAGE_MAP_MIME
+        from calibre.ebooks.oeb.base import OPF_MIME, NCX_MIME, PAGE_MAP_MIME, OEB_STYLES
+        from calibre.ebooks.oeb.normalize_css import condense_sheet
         with CurrentDir(output_path):
             results = oeb_book.to_opf2(page_map=True)
             for key in (OPF_MIME, NCX_MIME, PAGE_MAP_MIME):
@@ -53,6 +54,8 @@ class OEBOutput(OutputFormatPlugin):
                         f.write(raw)
 
             for item in oeb_book.manifest:
+                if item.media_type in OEB_STYLES and hasattr(item.data, 'cssText'):
+                    condense_sheet(item.data)
                 path = os.path.abspath(unquote(item.href))
                 dir = os.path.dirname(path)
                 if not os.path.exists(dir):
diff --git a/src/calibre/ebooks/mobi/writer8/main.py b/src/calibre/ebooks/mobi/writer8/main.py
index efdfb00ba8..e1e0981af1 100644
--- a/src/calibre/ebooks/mobi/writer8/main.py
+++ b/src/calibre/ebooks/mobi/writer8/main.py
@@ -22,6 +22,7 @@ from calibre.ebooks.mobi.utils import (create_text_record, to_base,
 from calibre.ebooks.compression.palmdoc import compress_doc
 from calibre.ebooks.oeb.base import (OEB_DOCS, OEB_STYLES, SVG_MIME, XPath,
         extract, XHTML, urlnormalize)
+from calibre.ebooks.oeb.normalize_css import condense_sheet
 from calibre.ebooks.oeb.parse_utils import barename
 from calibre.ebooks.mobi.writer8.skeleton import Chunker, aid_able_tags, to_href
 from calibre.ebooks.mobi.writer8.index import (NCXIndex, SkelIndex,
@@ -150,6 +151,8 @@ class KF8Writer(object):
 
         for item in self.oeb.manifest:
             if item.media_type in OEB_STYLES:
+                if hasattr(item.data, 'cssText'):
+                    condense_sheet(self.data(item))
                 data = self.data(item).cssText
                 sheets[item.href] = len(self.flows)
                 self.flows.append(force_unicode(data, 'utf-8'))
diff --git a/src/calibre/ebooks/oeb/normalize_css.py b/src/calibre/ebooks/oeb/normalize_css.py
index dea3826c87..d1f7eb0783 100644
--- a/src/calibre/ebooks/oeb/normalize_css.py
+++ b/src/calibre/ebooks/oeb/normalize_css.py
@@ -57,6 +57,7 @@ DEFAULTS = {'azimuth': 'center', 'background-attachment': 'scroll',  # {{{
 # }}}
 
 EDGES = ('top', 'right', 'bottom', 'left')
+BORDER_PROPS = ('color', 'style', 'width')
 
 def normalize_edge(name, cssvalue):
     style = {}
@@ -162,11 +163,85 @@ for x in ('margin', 'padding', 'border-style', 'border-width', 'border-color'):
 
 for x in EDGES:
     name = 'border-' + x
-    normalizers[name] = simple_normalizer(name, ('color', 'style', 'width'), check_inherit=False)
+    normalizers[name] = simple_normalizer(name, BORDER_PROPS, check_inherit=False)
+
+def condense_edge(vals):
+    edges = {x.name.rpartition('-')[-1]:x.value for x in vals}
+    if len(edges) != 4:
+        return
+    ce = {}
+    for (x, y) in [('left', 'right'), ('top', 'bottom')]:
+        if edges[x] == edges[y]:
+            ce[x] = edges[x]
+        else:
+            ce[x], ce[y] = edges[x], edges[y]
+    if len(ce) == 4:
+        return ' '.join(ce[x] for x in ('top', 'right', 'bottom', 'left'))
+    if len(ce) == 3:
+        if 'right' in ce:
+            return ' '.join(ce[x] for x in ('top', 'right', 'top', 'left'))
+        return ' '.join(ce[x] for x in ('top', 'left', 'bottom'))
+    if len(ce) == 2:
+        if ce['top'] == ce['left']:
+            return ce['top']
+        return ' '.join(ce[x] for x in ('top', 'left'))
+
+def simple_condenser(prefix, func):
+    @wraps(func)
+    def condense_simple(style, props):
+        cp = func(props)
+        if cp is not None:
+            for prop in props:
+                style.removeProperty(prop.name)
+            style.setProperty(prefix, cp)
+    return condense_simple
+
+def condense_border(style, props):
+    prop_map = {p.name:p for p in props}
+    edge_vals = []
+    for edge in EDGES:
+        name = 'border-%s' % edge
+        vals = []
+        for prop in BORDER_PROPS:
+            x = prop_map.get('%s-%s' % (name, prop), None)
+            if x is not None:
+                vals.append(x)
+        if len(vals) == 3:
+            for prop in vals:
+                style.removeProperty(prop.name)
+            style.setProperty(name, ' '.join(x.value for x in vals))
+            prop_map[name] = style.getProperty(name)
+        x = prop_map.get(name, None)
+        if x is not None:
+            edge_vals.append(x)
+    if len(edge_vals) == 4 and len({x.value for x in edge_vals}) == 1:
+        for prop in edge_vals:
+            style.removeProperty(prop.name)
+        style.setProperty('border', edge_vals[0].value)
+
+condensers = {'margin': simple_condenser('margin', condense_edge), 'padding': simple_condenser('padding', condense_edge), 'border': condense_border}
+
+
+def condense_rule(style):
+    expanded = {'margin-':[], 'padding-':[], 'border-':[]}
+    for prop in style.getProperties():
+        for x in expanded:
+            if prop.name and prop.name.startswith(x):
+                expanded[x].append(prop)
+                break
+    for prefix, vals in expanded.iteritems():
+        if len(vals) > 1 and {x.priority for x in vals} == {''}:
+            condensers[prefix[:-1]](style, vals)
+
+def condense_sheet(sheet):
+    for rule in sheet.cssRules:
+        if rule.type == rule.STYLE_RULE:
+            condense_rule(rule.style)
 
 def test_normalization():  # {{{
     import unittest
     from cssutils import parseStyle
+    from itertools import product
 
     class TestNormalization(unittest.TestCase):
         longMessage = True
@@ -262,6 +337,50 @@ def test_normalization():  # {{{
                 cval = tuple(parseStyle('list-style: %s' % raw, validate=False))[0].cssValue
                 self.assertDictEqual(ls_dict(expected), normalizers['list-style']('list-style', cval))
 
+        def test_edge_condensation(self):
+            for s, v in {
+                (1, 1, 3) : None,
+                (1, 2, 3, 4) : '2pt 3pt 4pt 1pt',
+                (1, 2, 3, 2) : '2pt 3pt 2pt 1pt',
+                (1, 2, 1, 3) : '2pt 1pt 3pt',
+                (1, 2, 1, 2) : '2pt 1pt',
+                (1, 1, 1, 1) : '1pt',
+                ('2%', '2%', '2%', '2%') : '2%',
+                tuple('0 0 0 0'.split()) : '0',
+            }.iteritems():
+                for prefix in ('margin', 'padding'):
+                    css = {'%s-%s' % (prefix, x) : str(y)+'pt' if isinstance(y, (int, float)) else y for x, y in zip(('left', 'top', 'right', 'bottom'), s)}
+                    css = '; '.join(('%s:%s' % (k, v) for k, v in css.iteritems()))
+                    style = parseStyle(css)
+                    condense_rule(style)
+                    val = getattr(style.getProperty(prefix), 'value', None)
+                    self.assertEqual(v, val)
+                    if val is not None:
+                        for edge in EDGES:
+                            self.assertFalse(getattr(style.getProperty('%s-%s' % (prefix, edge)), 'value', None))
+
+        def test_border_condensation(self):
+            vals = 'red solid 5px'
+            css = '; '.join('border-%s-%s: %s' % (edge, p, v) for edge in EDGES for p, v in zip(BORDER_PROPS, vals.split()))
+            style = parseStyle(css)
+            condense_rule(style)
+            for e, p in product(EDGES, BORDER_PROPS):
+                self.assertFalse(style.getProperty('border-%s-%s' % (e, p)))
+                self.assertFalse(style.getProperty('border-%s' % e))
+                self.assertFalse(style.getProperty('border-%s' % p))
+            self.assertEqual(style.getProperty('border').value, vals)
+            css = '; '.join('border-%s-%s: %s' % (edge, p, v) for edge in ('top',) for p, v in zip(BORDER_PROPS, vals.split()))
+            style = parseStyle(css)
+            condense_rule(style)
+            self.assertEqual(style.cssText, 'border-top: %s' % vals)
+            css += ';' + '; '.join('border-%s-%s: %s' % (edge, p, v) for edge in ('right', 'left', 'bottom') for p, v in
+                             zip(BORDER_PROPS, vals.replace('red', 'green').split()))
+            style = parseStyle(css)
+            condense_rule(style)
+            self.assertEqual(len(style.getProperties()), 4)
+            self.assertEqual(style.getProperty('border-top').value, vals)
+            self.assertEqual(style.getProperty('border-left').value, vals.replace('red', 'green'))
+
     tests = unittest.defaultTestLoader.loadTestsFromTestCase(TestNormalization)
     unittest.TextTestRunner(verbosity=4).run(tests)
 # }}}

From 7d77e8fe984c9a5dda5f14d386c489085acf4030 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 15 Sep 2013 14:24:17 +0200
Subject: [PATCH 0800/1154] When copying books from library A to library B,
 check that B contains the necessary custom columns. If not, tell the user and
 allow them to create any non-conflicting columns. Inform them about
 conflicting columns.

---
 src/calibre/gui2/actions/copy_to_library.py | 110 +++++++++++++++++++-
 1 file changed, 107 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index b93efa1dc4..059fa036e3 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -10,7 +10,8 @@ from functools import partial
 from threading import Thread
 from contextlib import closing
 
-from PyQt4.Qt import (QToolButton, QDialog, QGridLayout, QIcon, QLabel, QDialogButtonBox)
+from PyQt4.Qt import (QToolButton, QDialog, QGridLayout, QIcon, QLabel, QDialogButtonBox,
+                      QFormLayout, QCheckBox)
 
 from calibre.gui2.actions import InterfaceAction
 from calibre.gui2 import (error_dialog, Dispatcher, warning_dialog, gprefs,
@@ -19,6 +20,8 @@ from calibre.gui2.dialogs.progress import ProgressDialog
 from calibre.gui2.widgets import HistoryLineEdit
 from calibre.utils.config import prefs, tweaks
 from calibre.utils.date import now
+from calibre.utils.icu import sort_key
+
 
 class Worker(Thread):  # {{{
 
@@ -47,11 +50,11 @@ class Worker(Thread):  # {{{
 
         self.done()
 
-    def add_formats(self, id, paths, newdb, replace=True):
+    def add_formats(self, id_, paths, newdb, replace=True):
         for path in paths:
             fmt = os.path.splitext(path)[-1].replace('.', '').upper()
             with open(path, 'rb') as f:
-                newdb.add_format(id, fmt, f, index_is_id=True,
+                newdb.add_format(id_, fmt, f, index_is_id=True,
                         notify=False, replace=replace)
 
     def doit(self):
@@ -174,6 +177,10 @@ class ChooseLibrary(QDialog):  # {{{
         return (unicode(self.le.text()), self.delete_after_copy)
 # }}}
 
+# Static session-long set of pairs of libraries that have had their custom columns
+# checked for compatibility
+libraries_with_checked_columns = {}
+
 class CopyToLibraryAction(InterfaceAction):
 
     name = 'Copy To Library'
@@ -231,6 +238,11 @@ class CopyToLibraryAction(InterfaceAction):
                     _('Cannot copy to current library.'), show=True)
             self.copy_to_library(path, delete_after)
 
+    def _column_is_compatible(self, source_metadata, dest_metadata):
+        return (source_metadata['datatype'] == dest_metadata['datatype'] and
+                    (source_metadata['datatype'] != 'text' or
+                     source_metadata['is_multiple'] == dest_metadata['is_multiple']))
+
     def copy_to_library(self, loc, delete_after=False):
         rows = self.gui.library_view.selectionModel().selectedRows()
         if not rows or len(rows) == 0:
@@ -252,6 +264,39 @@ class CopyToLibraryAction(InterfaceAction):
             self.pd.set_msg(title)
             self.pd.set_value(idx)
 
+        # Open the new db so we can check the custom columns.
+
+        global libraries_with_checked_columns
+        if db.library_id not in libraries_with_checked_columns:
+            libraries_with_checked_columns[db.library_id] = set()
+
+        from calibre.db.legacy import LibraryDatabase
+        newdb = LibraryDatabase(loc, is_second_db=True)
+
+        continue_processing = True;
+        with closing(newdb):
+            if newdb.library_id not in libraries_with_checked_columns[db.library_id]:
+
+                newdb_meta = newdb.field_metadata.custom_field_metadata()
+                incompatible_columns = []
+                missing_columns = []
+                for k, m in db.field_metadata.custom_iteritems():
+                    if k not in newdb_meta:
+                        missing_columns.append(k)
+                    elif not self._column_is_compatible(m, newdb_meta[k]):
+                        incompatible_columns.append(k)
+
+                if missing_columns or incompatible_columns:
+                    continue_processing = self.custom_column_dialog(db, newdb,
+                                            missing_columns, incompatible_columns)
+                if continue_processing:
+                    libraries_with_checked_columns[db.library_id].add(newdb.library_id)
+
+        newdb.break_cycles()
+        del newdb
+        if not continue_processing:
+            return;
+
         self.worker = Worker(ids, db, loc, Dispatcher(progress),
                              Dispatcher(self.pd.accept), delete_after)
         self.worker.start()
@@ -295,4 +340,63 @@ class CopyToLibraryAction(InterfaceAction):
                     _('You cannot use other libraries while using the environment'
                       ' variable CALIBRE_OVERRIDE_DATABASE_PATH.'), show=True)
 
+    def custom_column_dialog(self, db, newdb, missing_cols, incompatible_cols):
+        source_metadata = db.field_metadata.custom_field_metadata(include_composites=True)
 
+        d = QDialog(self.gui)
+        d.setWindowTitle(_('Create link'))
+        l = QFormLayout()
+        d.setLayout(l)
+        d.setMinimumWidth(600)
+        d.bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
+
+        d.la = la = QLabel(_(
+            'The custom columns in the source library are different from the '
+            'custom columns in the destination library. Incompatible columns '
+            'are columns with the same lookup key but different column '
+            'types. These cannot be copied. Missing columns are columns '
+            'in the source library but not in the destination library. '
+            'If you check the "Create" box, these columns will be added '
+            'to the destination and their values copied with the books.'))
+        la.setWordWrap(True)
+        la.setStyleSheet('QLabel { margin-bottom: 1.5ex }')
+        l.setWidget(0, l.SpanningRole, la)
+        if incompatible_cols:
+            l.addRow(_('Incompatible custom columns:'),
+                     QLabel(', '.join(sorted(incompatible_cols, key=sort_key))))
+
+        incompatible_cols_widgets = []
+        if missing_cols:
+            l.addRow(QLabel(_('Missing custom columns')), QLabel(''))
+            for k in missing_cols:
+                widgets = (k, QCheckBox(_('Add column to new library')))
+                l.addRow(QLabel(k), widgets[1])
+                incompatible_cols_widgets.append(widgets)
+
+        l.addRow(d.bb)
+        d.bb.accepted.connect(d.accept)
+        d.bb.rejected.connect(d.reject)
+        d.resize(d.sizeHint())
+        if d.exec_() == d.Accepted:
+            count = 0
+            for k,cb in incompatible_cols_widgets:
+                if cb.isChecked():
+                    count += 1
+            if count:
+                pd = ProgressDialog(_('Creating custom columns'), min=0, max=count,
+                                         parent=self.gui, cancelable=False)
+                pd.show()
+                done_count = 0
+                for k,cb in incompatible_cols_widgets:
+                    if cb.isChecked():
+                        pd.set_value(done_count)
+                        pd.set_msg(_('Creating column {0}').format(k))
+                        done_count += 1
+                        col_meta = source_metadata[k]
+                        newdb.create_custom_column(
+                                    col_meta['label'], col_meta['name'], col_meta['datatype'],
+                                    len(col_meta['is_multiple']) > 0,
+                                    col_meta['is_editable'], col_meta['display'])
+                pd.done(0)
+            return True
+        return False
\ No newline at end of file

From 7d54d25844efebfb3d6de2bb2b9af77dbf72d8b8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 15 Sep 2013 21:58:18 +0530
Subject: [PATCH 0801/1154] Remove unused mount helper

Fixes #1225696 [Add patch to compile with CLANG](https://bugs.launchpad.net/calibre/+bug/1225696)
---
 setup/install.py                         | 20 +-------------------
 setup/installer/linux/freeze2.py         |  8 --------
 src/calibre/devices/linux_mount_helper.c |  7 -------
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 src/calibre/devices/linux_mount_helper.c

diff --git a/setup/install.py b/setup/install.py
index b1698d88ed..df691ae0f7 100644
--- a/setup/install.py
+++ b/setup/install.py
@@ -6,7 +6,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import sys, os, textwrap, subprocess, shutil, tempfile, atexit, shlex, glob
+import sys, os, textwrap, subprocess, shutil, tempfile, atexit, glob
 
 from setup import (Command, islinux, isbsd, basenames, modules, functions,
         __appname__, __version__)
@@ -133,7 +133,6 @@ class Develop(Command):
         self.regain_privileges()
         self.consolidate_paths()
         self.write_templates()
-        self.setup_mount_helper()
         self.install_files()
         self.run_postinstall()
         self.install_env_module()
@@ -150,23 +149,6 @@ class Develop(Command):
         else:
             self.warn('Cannot install calibre environment module to: '+libdir)
 
-    def setup_mount_helper(self):
-        def warn():
-            self.warn('Failed to compile mount helper. Auto mounting of',
-                ' devices will not work')
-
-        src = os.path.join(self.SRC, 'calibre', 'devices', 'linux_mount_helper.c')
-        dest = os.path.join(self.staging_bindir, 'calibre-mount-helper')
-        self.info('Installing mount helper to '+ dest)
-        cflags = os.environ.get('OVERRIDE_CFLAGS', '-Wall -pedantic')
-        cflags = shlex.split(cflags)
-        p = subprocess.Popen(['gcc']+cflags+[src, '-o', dest])
-        ret = p.wait()
-        if ret != 0:
-            return warn()
-        self.manifest.append(dest)
-        return dest
-
     def install_files(self):
         pass
 
diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index cb2d8e0070..b2e809e7ff 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -86,7 +86,6 @@ class LinuxFreeze(Command):
         self.initbase()
         self.copy_libs()
         self.copy_python()
-        self.compile_mount_helper()
         self.build_launchers()
         self.create_tarfile()
 
@@ -144,13 +143,6 @@ class LinuxFreeze(Command):
             else:
                 shutil.copyfile(x, d)
 
-    def compile_mount_helper(self):
-        self.info('Compiling mount helper...')
-        dest = self.j(self.bin_dir, 'calibre-mount-helper')
-        subprocess.check_call(['gcc', '-Wall', '-pedantic',
-            self.j(self.SRC, 'calibre', 'devices',
-                'linux_mount_helper.c'), '-o', dest])
-
     def copy_python(self):
         self.info('Copying python...')
 
diff --git a/src/calibre/devices/linux_mount_helper.c b/src/calibre/devices/linux_mount_helper.c
deleted file mode 100644
index 5cb2e52df3..0000000000
--- a/src/calibre/devices/linux_mount_helper.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-int main(int argc, char** argv)
-{
-    return EXIT_FAILURE;
-}
-

From d69211e3b1fce94873776fb4af8f3067109cb3e8 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 15 Sep 2013 19:07:47 +0200
Subject: [PATCH 0802/1154] Allow a device to determine the compression quality
 setting for thumbnail generation

---
 .../devices/smart_device_app/driver.py        | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 33b3b6a74c..f98d624e55 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -202,8 +202,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     # making this number effectively around 10 to 15 larger.
     PATH_FUDGE_FACTOR           = 40
 
-    THUMBNAIL_HEIGHT            = 160
-    DEFAULT_THUMBNAIL_HEIGHT    = 160
+    THUMBNAIL_HEIGHT              = 160
+    DEFAULT_THUMBNAIL_HEIGHT      = 160
+    THUMBNAIL_COMPRESSION_QUALITY = 70
 
     PREFIX                      = ''
     BACKLOADING_ERROR_MESSAGE   = None
@@ -292,12 +293,22 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
               'particular IP address. The driver will listen only on the '
               'entered address, and this address will be the one advertized '
               'over mDNS (bonjour).') + '</p>',
-        _('Replace books with the same calibre identifier') + ':::<p>' +
+        _('Replace books with same calibre ID') + ':::<p>' +
             _('Use this option to overwrite a book on the device if that book '
               'has the same calibre identifier as the book being sent. The file name of the '
               'book will not change even if the save template produces a '
               'different result. Using this option in most cases prevents '
               'having multiple copies of a book on the device.') + '</p>',
+        _('Cover thumbnail compression quality') + ':::<p>' +
+            _('Use this option to control the size and quality of the cover '
+              'file sent to the device. It must be between 50 and 99. '
+              'The larger the number the higher quality the cover, but also '
+              'the larger the file. For example, changing this from 70 to 90 '
+              'results in a much better cover that is approximately 2.5 '
+              'times as big. To see the changes you must force calibre '
+              'to resend metadata to the device, either by changing '
+              'the metadata for the book (updating the last modification '
+              'time) or resending the book itself.') + '</p>',
         ]
     EXTRA_CUSTOMIZATION_DEFAULT = [
                 False, '',
@@ -306,7 +317,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                 False, '',
                 '',    '',
                 True,  '',
-                True
+                True,   '70'
     ]
     OPT_AUTOSTART               = 0
     OPT_PASSWORD                = 2
@@ -317,6 +328,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     OPT_AUTODISCONNECT          = 10
     OPT_FORCE_IP_ADDRESS        = 11
     OPT_OVERWRITE_BOOKS_UUID    = 12
+    OPT_COMPRESSION_QUALITY     = 13
 
 
     def __init__(self, path):
@@ -1288,6 +1300,19 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         self.client_can_stream_metadata = False
         self.client_wants_uuid_file_names = False
 
+        compression_quality_ok = True
+        try:
+            cq = int(self.settings().extra_customization[self.OPT_COMPRESSION_QUALITY])
+            if cq < 50 or cq > 99:
+                compression_quality_ok = False
+        except:
+            compression_quality_ok = False
+        if not compression_quality_ok:
+            self.THUMBNAIL_COMPRESSION_QUALITY = 70
+            message = 'Bad compression quality setting. It must be a number between 50 and 99'
+            self._debug(message)
+            return message
+
         message = None
         try:
             self.listen_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

From 72cf895392983274f900505d4310166fc2dbd4fc Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 15 Sep 2013 19:09:57 +0200
Subject: [PATCH 0803/1154] Commit the other two files

---
 src/calibre/devices/interface.py | 5 +++++
 src/calibre/gui2/device.py       | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index 9b173b091e..920965ee6c 100644
--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@@ -43,6 +43,11 @@ class DevicePlugin(Plugin):
     #: than THUMBNAIL_HEIGHT
     # THUMBNAIL_WIDTH = 68
 
+    #: Compression quality for thumbnails. Set this closer to 100 to have better
+    #: quality thumbnails with fewer compression artifacts. Of course, the
+    #: thumbnails get larger as well.
+    THUMBNAIL_COMPRESSION_QUALITY=70
+
     #: Set this to True if the device supports updating cover thumbnails during
     #: sync_booklists. Setting it to true will ask device.py to refresh the
     #: cover thumbnails during book matching
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 77517b94f9..d97d44381e 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1233,7 +1233,8 @@ class DeviceMixin(object): # {{{
         ht = self.device_manager.device.THUMBNAIL_HEIGHT \
                 if self.device_manager else DevicePlugin.THUMBNAIL_HEIGHT
         try:
-            return thumbnail(data, ht, ht)
+            return thumbnail(data, ht, ht,
+                    compression_quality=self.device_manager.device.THUMBNAIL_COMPRESSION_QUALITY)
         except:
             pass
 

From 52c973ce797251adda97c985261585e7b0159903 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 16 Sep 2013 08:19:15 +0530
Subject: [PATCH 0804/1154] Handle broken code trying to set numeric columns
 with empty strings

---
 src/calibre/db/write.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 7207c268bc..175b484c91 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -83,7 +83,7 @@ def adapt_number(typ, x):
     if x is None:
         return None
     if isinstance(x, (unicode, bytes)):
-        if x.lower() == 'none':
+        if not x or x.lower() == 'none':
             return None
     return typ(x)
 

From 6a893e48d8e1c6648d02122f2c421a321939a8d3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 16 Sep 2013 11:44:58 +0530
Subject: [PATCH 0805/1154] Make default thumbnail quality 75

---
 src/calibre/devices/smart_device_app/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index f98d624e55..035c613387 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -204,7 +204,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
 
     THUMBNAIL_HEIGHT              = 160
     DEFAULT_THUMBNAIL_HEIGHT      = 160
-    THUMBNAIL_COMPRESSION_QUALITY = 70
+    THUMBNAIL_COMPRESSION_QUALITY = 75
 
     PREFIX                      = ''
     BACKLOADING_ERROR_MESSAGE   = None
@@ -317,7 +317,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                 False, '',
                 '',    '',
                 True,  '',
-                True,   '70'
+                True,   '75'
     ]
     OPT_AUTOSTART               = 0
     OPT_PASSWORD                = 2

From 8216d732f2cf6d465014cca60afc9db186f19aff Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 16 Sep 2013 10:11:48 +0200
Subject: [PATCH 0806/1154] Improve quality of images manipulated by calibre.
 In particular improve images dropped or pasted into edit metadata. Note: Qt's
 default compression quality is 75, which is very low. Perhaps calibre's
 default doesn't need to be as high as 90, but it should be higher than 75.
 Perhaps this is a good place for a tweak. (reverted from commit
 ae1255461f82656d83a78a5555f0810620449eba)

---
 src/calibre/gui2/__init__.py | 4 ++--
 src/calibre/gui2/widgets.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 5b8d2142a4..6116024938 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -738,14 +738,14 @@ def choose_images(window, name, title, select_only_single_file=True,
         return fd.get_files()
     return None
 
-def pixmap_to_data(pixmap, format='JPEG'):
+def pixmap_to_data(pixmap, format='JPEG', quality=90):
     '''
     Return the QPixmap pixmap as a string saved in the specified format.
     '''
     ba = QByteArray()
     buf = QBuffer(ba)
     buf.open(QBuffer.WriteOnly)
-    pixmap.save(buf, format)
+    pixmap.save(buf, format, quality=quality)
     return bytes(ba.data())
 
 class ResizableDialog(QDialog):
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 43963d81fd..71cc7b6169 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -236,7 +236,7 @@ class ImageDropMixin(object):  # {{{
 
     def handle_image_drop(self, pmap):
         self.set_pixmap(pmap)
-        self.cover_changed.emit(pixmap_to_data(pmap))
+        self.cover_changed.emit(pixmap_to_data(pmap, quality=100))
 
     def dragMoveEvent(self, event):
         event.acceptProposedAction()
@@ -268,7 +268,7 @@ class ImageDropMixin(object):  # {{{
         if not pmap.isNull():
             self.set_pixmap(pmap)
             self.cover_changed.emit(
-                    pixmap_to_data(pmap))
+                    pixmap_to_data(pmap, quality=100))
 # }}}
 
 class ImageView(QWidget, ImageDropMixin):  # {{{

From 3046339a18b22b01a80cfcfc0b9a152bc5fc6b7e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 16 Sep 2013 14:10:54 +0530
Subject: [PATCH 0807/1154] newdb: Fix passing in QImage to set_cover not
 working

---
 src/calibre/db/backend.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index e50a03cbdd..9d085935f0 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1273,22 +1273,21 @@ class DB(object):
         if callable(getattr(data, 'save', None)):
             from calibre.gui2 import pixmap_to_data
             data = pixmap_to_data(data)
-        else:
-            if callable(getattr(data, 'read', None)):
-                data = data.read()
-            if data is None:
-                if os.path.exists(path):
-                    try:
-                        os.remove(path)
-                    except (IOError, OSError):
-                        time.sleep(0.2)
-                        os.remove(path)
-            else:
+        elif callable(getattr(data, 'read', None)):
+            data = data.read()
+        if data is None:
+            if os.path.exists(path):
                 try:
-                    save_cover_data_to(data, path)
+                    os.remove(path)
                 except (IOError, OSError):
                     time.sleep(0.2)
-                    save_cover_data_to(data, path)
+                    os.remove(path)
+        else:
+            try:
+                save_cover_data_to(data, path)
+            except (IOError, OSError):
+                time.sleep(0.2)
+                save_cover_data_to(data, path)
 
     def copy_format_to(self, book_id, fmt, fname, path, dest,
                        windows_atomic_move=None, use_hardlink=False):

From 09af49caa6e4789c4e7828e44507458f9255fc89 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 16 Sep 2013 19:02:14 +0530
Subject: [PATCH 0808/1154] Cover grid: Respect the double click on library
 view tweak

---
 src/calibre/gui2/library/alternate_views.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index d460eec0bb..87c6c30fa2 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -25,7 +25,7 @@ from calibre import fit_image, prints, prepare_string_for_xml
 from calibre.ebooks.metadata import fmt_sidx
 from calibre.gui2 import gprefs, config
 from calibre.gui2.library.caches import CoverCache, ThumbnailCache
-from calibre.utils.config import prefs
+from calibre.utils.config import prefs, tweaks
 
 CM_TO_INCH = 0.393701
 CACHE_FORMAT = 'PPM'
@@ -562,7 +562,10 @@ class GridView(QListView):
         if d.animating is None and not config['disable_animations']:
             d.animating = index
             d.animation.start()
-        self.gui.iactions['View'].view_triggered(index)
+        if tweaks['doubleclick_on_library_view'] == 'open_viewer':
+            self.gui.iactions['View'].view_triggered(index)
+        elif tweaks['doubleclick_on_library_view'] in {'edit_metadata', 'edit_cell'}:
+            self.gui.iactions['Edit Metadata'].edit_metadata(False, False)
 
     def animation_value_changed(self, value):
         if self.delegate.animating is not None:

From b72a3f8e798afa212a064c61aaca4bf2f56394ac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 16 Sep 2013 19:09:53 +0530
Subject: [PATCH 0809/1154] AZW3 Output: Dont choke on invalid links in the
 input document

---
 src/calibre/ebooks/mobi/writer8/main.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/mobi/writer8/main.py b/src/calibre/ebooks/mobi/writer8/main.py
index e1e0981af1..00550d78d4 100644
--- a/src/calibre/ebooks/mobi/writer8/main.py
+++ b/src/calibre/ebooks/mobi/writer8/main.py
@@ -230,7 +230,11 @@ class KF8Writer(object):
                 count += 1
                 ref = item.abshref(a.get('href'))
                 href, _, frag = ref.partition('#')
-                href = urlnormalize(href)
+                try:
+                    href = urlnormalize(href)
+                except ValueError:
+                    # a non utf-8 quoted url? Since we cannot interpret it, pass it through.
+                    pass
                 if href in hrefs:
                     placeholder = 'kindle:pos:fid:0000:off:%s'%to_href(count)
                     self.link_map[placeholder] = (href, frag)

From 7f513ee1387f781847468833765942e0f1d0ca23 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 08:38:17 +0530
Subject: [PATCH 0810/1154] Update FAQ on Kobo brokenness

---
 manual/faq.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/manual/faq.rst b/manual/faq.rst
index 8dd3dd3379..66f6ee383f 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -499,11 +499,17 @@ that allows you to create collections on your Kindle from the |app| metadata. It
 I am getting an error when I try to use |app| with my Kobo Touch/Glo/etc.?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The Kobo has very buggy firmware. Connecting to it has been known to fail at random. Certain combinations of motherboard, USB ports/cables/hubs can exacerbate this tendency to fail. If you are getting an error when connecting to your touch with |app| try the following, each of which has solved the problem for *some* |app| users.
+The Kobo has very buggy firmware. Connecting to it has been known to fail at
+random. Certain combinations of motherboard, USB ports/cables/hubs can
+exacerbate this tendency to fail. If you are getting an error when connecting
+to your touch with |app| try the following, each of which has solved the
+problem for *some* |app| users.
 
   * Connect the Kobo directly to your computer, not via USB Hub
   * Try a different USB cable and a different USB port on your computer
-  * Try a different computer (preferably an older model)
+  * Try a different computer, in particular the Kobo does not work well with
+    some Windows XP machines. If you are on Windows XP, try a computer with a
+    newer version of windows.
   * Try upgrading the firmware on your Kobo Touch to the latest
   * Try resetting the Kobo (sometimes this cures the problem for a little while, but then it re-appears, in which case you have to reset again and again)
   * Try only putting one or two books onto the Kobo at a time and do not keep large collections on the Kobo

From cffaa528f2552b1927315a18a8fa613cae22c170 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 10:36:10 +0530
Subject: [PATCH 0811/1154] Metadata jackets: Use a safe formatter

Metadata jackets: Do not error out when using a custom template with
some custom fields that are not present. Fixes #1225357 [polish fails when adding jacket to epub](https://bugs.launchpad.net/calibre/+bug/1225357)
---
 src/calibre/ebooks/oeb/transforms/jacket.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/oeb/transforms/jacket.py b/src/calibre/ebooks/oeb/transforms/jacket.py
index a9cc10dc3d..bf506bfe29 100644
--- a/src/calibre/ebooks/oeb/transforms/jacket.py
+++ b/src/calibre/ebooks/oeb/transforms/jacket.py
@@ -8,6 +8,7 @@ __docformat__ = 'restructuredtext en'
 
 import sys, os
 from xml.sax.saxutils import escape
+from string import Formatter
 
 from lxml import etree
 
@@ -21,6 +22,14 @@ from calibre.ebooks.chardet import strip_encoding_declarations
 
 JACKET_XPATH = '//h:meta[@name="calibre-content" and @content="jacket"]'
 
+class SafeFormatter(Formatter):
+
+    def get_value(self, *args, **kwargs):
+        try:
+            return Formatter.get_value(self, *args, **kwargs)
+        except KeyError:
+            return ''
+
 class Jacket(object):
     '''
     Book jacket manipulation. Remove first image and insert comments at start of
@@ -217,8 +226,9 @@ def render_jacket(mi, output_profile,
         args['_genre_label'] = args.get('_genre_label', '{_genre_label}')
         args['_genre'] = args.get('_genre', '{_genre}')
 
-        generated_html = P('jacket/template.xhtml',
-                data=True).decode('utf-8').format(**args)
+        formatter = SafeFormatter()
+        generated_html = formatter.format(P('jacket/template.xhtml',
+                data=True).decode('utf-8'), **args)
 
         # Post-process the generated html to strip out empty header items
 

From 56eefcf43eefec02e5a4461b02e235b759b7b455 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 17 Sep 2013 07:25:26 +0200
Subject: [PATCH 0812/1154] Clear custom number columns to undefined when space
 is pressed

---
 src/calibre/gui2/library/delegates.py | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index 6cf95c866a..e14e79fb3e 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -44,6 +44,22 @@ class DateTimeEdit(QDateTimeEdit):  # {{{
             return QDateTimeEdit.keyPressEvent(self, ev)
 # }}}
 
+class ClearingSpinBox(QSpinBox):    # {{{
+    def keyPressEvent(self, ev):
+        if ev.key() == Qt.Key_Space:
+            self.setValue(-1000000)
+        else:
+            return QSpinBox.keyPressEvent(self, ev)
+# }}}
+
+class ClearingDoubleSpinBox(QDoubleSpinBox):    # {{{
+    def keyPressEvent(self, ev):
+        if ev.key() == Qt.Key_Space:
+            self.setValue(-1000000.0)
+        else:
+            return QDoubleSpinBox.keyPressEvent(self, ev)
+# }}}
+
 class RatingDelegate(QStyledItemDelegate):  # {{{
 
     def __init__(self, *args, **kwargs):
@@ -293,14 +309,14 @@ class CcNumberDelegate(QStyledItemDelegate):  # {{{
         m = index.model()
         col = m.column_map[index.column()]
         if m.custom_columns[col]['datatype'] == 'int':
-            editor = QSpinBox(parent)
+            editor = ClearingSpinBox(parent)
             editor.setRange(-1000000, 100000000)
             editor.setSpecialValueText(_('Undefined'))
             editor.setSingleStep(1)
         else:
-            editor = QDoubleSpinBox(parent)
+            editor = ClearingDoubleSpinBox(parent)
             editor.setSpecialValueText(_('Undefined'))
-            editor.setRange(-1000000., 100000000)
+            editor.setRange(-1000000., 100000000.)
             editor.setDecimals(2)
         return editor
 

From 50d619d471f14ef2ffac6870758ffb660d3ae7c3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 11:33:16 +0530
Subject: [PATCH 0813/1154] Book details: Render custom comments fields
 correctly

Book details panel: Render custom comments fields the same as the builtin
comments field. In particular this fixes problems caused by wide text and
images in custom comments fields. Fixes #1226350 [Image in Custom Comments Column](https://bugs.launchpad.net/calibre/+bug/1226350)
---
 src/calibre/gui2/book_details.py | 44 +++++++++++++-------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index ab51789fb0..1405a1be50 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -29,7 +29,7 @@ from calibre.utils.localization import calibre_langcode_to_name
 from calibre.utils.config import tweaks
 
 def render_html(mi, css, vertical, widget, all_fields=False):  # {{{
-    table = render_data(mi, all_fields=all_fields,
+    table, comment_fields = render_data(mi, all_fields=all_fields,
             use_roman_numbers=config['use_roman_numerals_for_series_number'])
 
     def color_to_string(col):
@@ -68,12 +68,9 @@ def render_html(mi, css, vertical, widget, all_fields=False):  # {{{
         </body>
     <html>
     '''%(f, fam, c, css)
-    fm = getattr(mi, 'field_metadata', field_metadata)
-    fl = dict(get_field_list(fm))
-    show_comments = (all_fields or fl.get('comments', True))
     comments = u''
-    if mi.comments and show_comments:
-        comments = comments_to_html(force_unicode(mi.comments))
+    if comment_fields:
+        comments = '\n'.join(u'<div>%s</div>' % x for x in comment_fields)
     right_pane = u'<div id="comments" class="comments">%s</div>'%comments
 
     if vertical:
@@ -106,8 +103,10 @@ def get_field_list(fm, use_defaults=False):
 
 def render_data(mi, use_roman_numbers=True, all_fields=False):
     ans = []
+    comment_fields = []
     isdevice = not hasattr(mi, 'id')
     fm = getattr(mi, 'field_metadata', field_metadata)
+    row = u'<td class="title">%s</td><td class="value">%s</td>'
 
     for field, display in get_field_list(fm):
         metadata = fm.get(field, None)
@@ -119,24 +118,23 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
             isnull = mi.get(field) is None
         else:
             isnull = mi.is_null(field)
-        if (not display or not metadata or isnull or field == 'comments'):
+        if (not display or not metadata or isnull):
             continue
         name = metadata['name']
         if not name:
             name = field
         name += ':'
-        if metadata['datatype'] == 'comments':
+        if metadata['datatype'] == 'comments' or field == 'comments':
             val = getattr(mi, field)
             if val:
                 val = force_unicode(val)
-                ans.append((field,
-                    u'<td class="comments" colspan="2">%s</td>'%comments_to_html(val)))
+                comment_fields.append(comments_to_html(val))
         elif metadata['datatype'] == 'rating':
             val = getattr(mi, field)
             if val:
                 val = val/2.0
                 ans.append((field,
-                    u'<td class="title">%s</td><td class="rating" '
+                    u'<td class="title">%s</td><td class="rating value" '
                     'style=\'font-family:"%s"\'>%s</td>'%(
                         name, rating_font(), u'\u2605'*int(val))))
         elif metadata['datatype'] == 'composite' and \
@@ -145,8 +143,7 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
             if val:
                 val = force_unicode(val)
                 ans.append((field,
-                    u'<td class="title">%s</td><td>%s</td>'%
-                        (name, comments_to_html(val))))
+                    row % (name, comments_to_html(val))))
         elif field == 'path':
             if mi.path:
                 path = force_unicode(mi.path, filesystem_encoding)
@@ -163,22 +160,20 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
                             prepare_string_for_xml(durl))
                 link = u'<a href="%s:%s" title="%s">%s</a>%s' % (scheme, url,
                         prepare_string_for_xml(path, True), pathstr, extra)
-                ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name, link)))
+                ans.append((field, row % (name, link)))
         elif field == 'formats':
             if isdevice:
                 continue
             fmts = [u'<a href="format:%s:%s">%s</a>' % (mi.id, x, x) for x
                         in mi.formats]
-            ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name,
-                u', '.join(fmts))))
+            ans.append((field, row % (name, u', '.join(fmts))))
         elif field == 'identifiers':
             urls = urls_from_identifiers(mi.identifiers)
             links = [u'<a href="%s" title="%s:%s">%s</a>' % (url, id_typ, id_val, name)
                     for name, id_typ, id_val, url in urls]
             links = u', '.join(links)
             if links:
-                ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(
-                    _('Ids')+':', links)))
+                ans.append((field, row % (_('Ids')+':', links)))
         elif field == 'authors' and not isdevice:
             authors = []
             formatter = EvalFormatter()
@@ -199,14 +194,12 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
                     authors.append(u'<a calibre-data="authors" href="%s">%s</a>'%(link, aut))
                 else:
                     authors.append(aut)
-            ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name,
-                u' & '.join(authors))))
+            ans.append((field, row % (name, u' & '.join(authors))))
         elif field == 'languages':
             if not mi.languages:
                 continue
             names = filter(None, map(calibre_langcode_to_name, mi.languages))
-            ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name,
-                u', '.join(names))))
+            ans.append((field, row % (name, u', '.join(names))))
         else:
             val = mi.format_field(field)[-1]
             if val is None:
@@ -224,14 +217,13 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
                 if is_date_undefined(aval):
                     continue
 
-            ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name, val)))
+            ans.append((field, row % (name, val)))
 
     dc = getattr(mi, 'device_collections', [])
     if dc:
         dc = u', '.join(sorted(dc, key=sort_key))
         ans.append(('device_collections',
-            u'<td class="title">%s</td><td>%s</td>'%(
-                _('Collections')+':', dc)))
+            row % (_('Collections')+':', dc)))
 
     def classname(field):
         try:
@@ -243,7 +235,7 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
     ans = [u'<tr id="%s" class="%s">%s</tr>'%(field.replace('#', '_'),
         classname(field), html) for field, html in ans]
     # print '\n'.join(ans)
-    return u'<table class="fields">%s</table>'%(u'\n'.join(ans))
+    return u'<table class="fields">%s</table>'%(u'\n'.join(ans)), comment_fields
 
 # }}}
 

From aca89b8540f6bd2892729106ae8b47b780fa33aa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 11:53:39 +0530
Subject: [PATCH 0814/1154] Sage News - Satire by Brian Hahn

Fixes #1226417 [[Enhancement] New Publication Recipe - The Sage News - Satire](https://bugs.launchpad.net/calibre/+bug/1226417)
---
 recipes/sage_news.recipe | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 recipes/sage_news.recipe

diff --git a/recipes/sage_news.recipe b/recipes/sage_news.recipe
new file mode 100644
index 0000000000..52a4979f23
--- /dev/null
+++ b/recipes/sage_news.recipe
@@ -0,0 +1,32 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1292550626(BasicNewsRecipe):
+    title = 'The Sage News - Satire'
+    __author__ = 'Brian Hahn'
+    description = 'News without boundaries, Satire'
+    oldest_article = 200
+    max_articles_per_feed = 150
+    no_stylesheets = True
+    #delay = 1
+    use_embedded_content = False
+    publisher = 'The Sage News Network'
+    category = 'News, Alberta, Canada'
+    language = 'en_CA'
+    encoding = 'iso-8859-1'
+    cover_url = 'http://www.sagenews.ca/images/satire-cover.jpg'
+    remove_tags_before = dict(id='ContentPanel')
+    remove_tags_after  = dict(id='ContentPanel')
+    remove_tags = [dict(name='div', attrs={'id':'BottomAds'}),dict(name='div', attrs={'id':'moreStories'}),dict(name='div', attrs={'id':'StoryNavigation'})]
+    extra_css = 'img { margin:5px }'
+    feeds = [
+('Satire World', 'http://www.sagenews.ca/Satire-World.rss'),
+('Satire Politics', 'http://www.sagenews.ca/Satire-Politics.rss'),
+('Satire Justice', 'http://www.sagenews.ca/Satire-Justice.rss'),
+('Satire Health', 'http://www.sagenews.ca/Satire-Health.rss'),
+('Satire Environment', 'http://www.sagenews.ca/Satire-Environment.rss'),
+('Satire Living', 'http://www.sagenews.ca/Satire-Living.rss'),
+('Satire Sports', 'http://www.sagenews.ca/Satire-Sports.rss'),
+('Satire Business', 'http://www.sagenews.ca/Satire-Business.rss'),
+('Satire Agriculture', 'http://www.sagenews.ca/Satire-Agriculture.rss'),
+('Satire Humour', 'http://www.sagenews.ca/Satire-Humour.rss'),
+]

From b78885e01fe344c71227b31fa48e92b0850c5c80 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 11:57:03 +0530
Subject: [PATCH 0815/1154] Sage News - Opinion by Brian Hahn

Fixes #1226420 [[ENHANCEMENT] New Publication Recipe - The Sage News - Opinion](https://bugs.launchpad.net/calibre/+bug/1226420)
---
 recipes/sage_news_opinion.recipe | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 recipes/sage_news_opinion.recipe

diff --git a/recipes/sage_news_opinion.recipe b/recipes/sage_news_opinion.recipe
new file mode 100644
index 0000000000..2a98053c2e
--- /dev/null
+++ b/recipes/sage_news_opinion.recipe
@@ -0,0 +1,35 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1292550626(BasicNewsRecipe):
+    title = 'The Sage News - Opinion'
+    __author__ = 'Brian Hahn'
+    description = 'News without boundaries, Opinion'
+    oldest_article = 200
+    max_articles_per_feed = 150
+    no_stylesheets = True
+    #delay = 1
+    use_embedded_content = False
+    publisher = 'The Sage News Network'
+    category = 'News, Alberta, Canada'
+    language = 'en_CA'
+    encoding = 'iso-8859-1'
+    cover_url = 'http://www.sagenews.ca/images/opinion-cover.jpg'
+    remove_tags_before = dict(id='ContentPanel')
+    remove_tags_after  = dict(id='ContentPanel')
+    remove_tags = [dict(name='div', attrs={'id':'BottomAds'}),dict(name='div', attrs={'id':'moreStories'}),dict(name='div', attrs={'id':'StoryNavigation'})]
+    extra_css = 'img { margin:5px }'
+    feeds = [
+('Editorial Comment', 'http://www.sagenews.ca/Editorial%20Comment.rss'),
+('Grumpy Old Man', 'http://www.sagenews.ca/Grumpy%20Old%20Man.rss'),
+('Bad Girl', 'http://www.sagenews.ca/Bad%20Girl.rss'),
+('Around the Edges with Dixie', 'http://www.sagenews.ca/Around%20the%20Edges%20with%20Dixie.rss'),
+('Man Vs. World', 'http://www.sagenews.ca/Man%20Vs.%20World.rss'),
+('Opinion World', 'http://www.sagenews.ca/Opinion-World.rss'),
+('Opinion Politics', 'http://www.sagenews.ca/Opinion-Politics.rss'),
+('Opinion Justice', 'http://www.sagenews.ca/Opinion-Justice.rss'),
+('Opinion Health', 'http://www.sagenews.ca/Opinion-Health.rss'),
+('Opinion Environment', 'http://www.sagenews.ca/Opinion-Environment.rss'),
+('Opinion Living', 'http://www.sagenews.ca/Opinion-Living.rss'),
+('Opinion Sports', 'http://www.sagenews.ca/Opinion-Sports.rss'),
+('Opinion Business', 'http://www.sagenews.ca/Opinion-Business.rss'),
+]

From 089d6c172f7564ab5511c19683278fe3deaa457a Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 17 Sep 2013 10:25:32 +0200
Subject: [PATCH 0816/1154] Allow an icon rule to put multiple icons on a
 column

---
 src/calibre/gui2/library/models.py       | 65 ++++++++++------
 src/calibre/gui2/library/views.py        |  1 +
 src/calibre/gui2/preferences/coloring.py | 96 +++++++++++++++++++-----
 3 files changed, 121 insertions(+), 41 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 60768b481e..c5d453b3ff 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -9,7 +9,7 @@ import functools, re, os, traceback, errno, time
 from collections import defaultdict, namedtuple
 
 from PyQt4.Qt import (QAbstractTableModel, Qt, pyqtSignal, QIcon, QImage,
-        QModelIndex, QVariant, QDateTime, QColor, QPixmap)
+        QModelIndex, QVariant, QDateTime, QColor, QPixmap, QPainter)
 
 from calibre.gui2 import NONE, error_dialog
 from calibre.utils.search_query_parser import ParseException
@@ -76,9 +76,10 @@ class ColumnColor(object):  # {{{
 
 class ColumnIcon(object):  # {{{
 
-    def __init__(self, formatter):
+    def __init__(self, formatter, model):
         self.mi = None
         self.formatter = formatter
+        self.model = model
 
     def __call__(self, id_, key, fmt, kind, db, icon_cache, icon_bitmap_cache):
         dex = key+kind
@@ -88,26 +89,44 @@ class ColumnIcon(object):  # {{{
         try:
             if self.mi is None:
                 self.mi = db.get_metadata(id_, index_is_id=True)
-            icon = self.formatter.safe_format(fmt, self.mi, '', self.mi)
-            if icon:
-                if icon in icon_bitmap_cache:
-                    icon_bitmap = icon_bitmap_cache[icon]
+            icons = self.formatter.safe_format(fmt, self.mi, '', self.mi)
+            if icons:
+                if icons in icon_bitmap_cache:
+                    icon_bitmap = icon_bitmap_cache[icons]
                     icon_cache[id_][dex] = icon_bitmap
                     return icon_bitmap
-                d = os.path.join(config_dir, 'cc_icons', icon)
-                if (os.path.exists(d)):
-                    icon_bitmap = QPixmap(d)
-                    h = icon_bitmap.height()
-                    w = icon_bitmap.width()
-                    # If the image is landscape and width is more than 50%
-                    # large than height, use the pixmap. This tells Qt to display
-                    # the image full width. It might be clipped to row height.
-                    if w < (3 * h)/2:
-                        icon_bitmap = QIcon(icon_bitmap)
-                    icon_cache[id_][dex] = icon_bitmap
-                    icon_bitmap_cache[icon] = icon_bitmap
-                    self.mi = None
-                    return icon_bitmap
+
+                icon_list = [ic.strip() for ic in icons.split(':')]
+                icon_bitmaps = []
+                total_width = 0
+                for icon in icon_list:
+                    d = os.path.join(config_dir, 'cc_icons', icon)
+                    if (os.path.exists(d)):
+                        bm = QPixmap(d)
+                        icon_bitmaps.append(bm)
+                        total_width += bm.width()
+                if len(icon_bitmaps) > 1:
+                    result = QPixmap(len(icon_list)*128, 128)
+                    result.fill()
+                    painter = QPainter(result)
+                    x = 0
+                    for bm in icon_bitmaps:
+                        painter.drawPixmap(x, 0, bm)
+                        x += bm.width()
+                    painter.end()
+                else:
+                    result = icon_bitmaps[0]
+
+                # If the image height is less than the row height, leave it alone
+                # The -2 allows for a pixel above and below. Also ensure that
+                # it is always a bit positive
+                rh = min(2, self.model.row_height - 2)
+                if result.height() > rh:
+                    result = result.scaledToHeight(rh, mode=Qt.SmoothTransformation)
+                icon_cache[id_][dex] = result
+                icon_bitmap_cache[icons] = result
+                self.mi = None
+                return result
         except:
             pass
 # }}}
@@ -145,7 +164,7 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.colors = frozenset([unicode(c) for c in QColor.colorNames()])
         self._clear_caches()
         self.column_color = ColumnColor(self.formatter, self.colors)
-        self.column_icon = ColumnIcon(self.formatter)
+        self.column_icon = ColumnIcon(self.formatter, self)
 
         self.book_on_device = None
         self.editable_cols = ['title', 'authors', 'rating', 'publisher',
@@ -168,6 +187,7 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.ids_to_highlight_set = set()
         self.current_highlighted_idx = None
         self.highlight_only = False
+        self.row_height = 0
         self.read_config()
 
     def _clear_caches(self):
@@ -176,6 +196,9 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.icon_bitmap_cache = {}
         self.color_row_fmt_cache = None
 
+    def set_row_height(self, height):
+        self.row_height = height
+
     def change_alignment(self, colname, alignment):
         if colname in self.column_map and alignment in ('left', 'right', 'center'):
             old = self.alignment_map.get(colname, 'left')
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 6711da1d9b..034f543429 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -649,6 +649,7 @@ class BooksView(QTableView):  # {{{
             self.resizeRowToContents(0)
             self.verticalHeader().setDefaultSectionSize(self.rowHeight(0) +
                                             gprefs['extra_row_spacing'])
+            self._model.set_row_height(self.rowHeight(0))
             self.row_sizing_done = True
 
     def resize_column_to_fit(self, column):
diff --git a/src/calibre/gui2/preferences/coloring.py b/src/calibre/gui2/preferences/coloring.py
index a195c948e5..8370762bba 100644
--- a/src/calibre/gui2/preferences/coloring.py
+++ b/src/calibre/gui2/preferences/coloring.py
@@ -13,7 +13,7 @@ from PyQt4.Qt import (QWidget, QDialog, QLabel, QGridLayout, QComboBox, QSize,
         QLineEdit, QIntValidator, QDoubleValidator, QFrame, QColor, Qt, QIcon,
         QScrollArea, QPushButton, QVBoxLayout, QDialogButtonBox, QToolButton,
         QListView, QAbstractListModel, pyqtSignal, QSizePolicy, QSpacerItem,
-        QApplication)
+        QApplication, QStandardItem, QStandardItemModel, QCheckBox)
 
 from calibre import prepare_string_for_xml, sanitize_file_name_unicode
 from calibre.constants import config_dir
@@ -331,7 +331,6 @@ class RuleEditor(QDialog): # {{{
             l.addItem(QSpacerItem(10, 10, QSizePolicy.Expanding), 2, 7)
         else:
             self.filename_box = QComboBox()
-            self.filename_box.setInsertPolicy(self.filename_box.InsertAlphabetically)
             d = os.path.join(config_dir, 'cc_icons')
             self.icon_file_names = []
             if os.path.exists(d):
@@ -341,9 +340,15 @@ class RuleEditor(QDialog): # {{{
                         if icon_file.endswith('.png'):
                             self.icon_file_names.append(icon_file)
             self.icon_file_names.sort(key=sort_key)
-            self.update_filename_box()
 
-            l.addWidget(self.filename_box, 2, 5)
+            vb = QVBoxLayout()
+            self.multiple_icon_cb = QCheckBox(_('Choose more than one icon'))
+            vb.addWidget(self.multiple_icon_cb)
+            self.update_filename_box()
+            self.multiple_icon_cb.clicked.connect(self.multiple_box_clicked)
+            vb.addWidget(self.filename_box)
+            l.addLayout(vb, 2, 5)
+
             self.filename_button = QPushButton(QIcon(I('document_open.png')),
                                                _('&Add icon'))
             l.addWidget(self.filename_button, 2, 6)
@@ -401,18 +406,37 @@ class RuleEditor(QDialog): # {{{
             self.update_color_label()
             self.color_box.currentIndexChanged.connect(self.update_color_label)
         else:
+            self.rule_icon_files = []
             self.filename_button.clicked.connect(self.filename_button_clicked)
 
         self.resize(self.sizeHint())
 
+    def multiple_box_clicked(self):
+        self.update_filename_box()
+        self.update_icon_filenames_in_box()
+
     def update_filename_box(self):
-        self.filename_box.clear()
+        doing_multiple = self.multiple_icon_cb.isChecked()
+
+        model = QStandardItemModel()
+        self.filename_box.setModel(model)
         self.icon_file_names.sort(key=sort_key)
-        self.filename_box.addItem('')
-        self.filename_box.addItems(self.icon_file_names)
+        if doing_multiple:
+            item = QStandardItem(_('Open to see checkboxes'))
+        else:
+            item = QStandardItem('')
+        model.appendRow(item)
+
         for i,filename in enumerate(self.icon_file_names):
+            item = QStandardItem(filename)
+            if doing_multiple:
+                item.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled);
+                item.setData(Qt.Unchecked, Qt.CheckStateRole)
+            else:
+                item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable);
             icon = QIcon(os.path.join(config_dir, 'cc_icons', filename))
-            self.filename_box.setItemIcon(i+1, icon)
+            item.setIcon(icon)
+            model.appendRow(item)
 
     def update_color_label(self):
         pal = QApplication.palette()
@@ -432,9 +456,9 @@ class RuleEditor(QDialog): # {{{
                     all_files=False, select_only_single_file=True)
             if path:
                 icon_path = path[0]
-                icon_name = sanitize_file_name_unicode(
+                icon_name = lower(sanitize_file_name_unicode(
                              os.path.splitext(
-                                   os.path.basename(icon_path))[0]+'.png')
+                                   os.path.basename(icon_path))[0]+'.png'))
                 if icon_name not in self.icon_file_names:
                     self.icon_file_names.append(icon_name)
                     self.update_filename_box()
@@ -449,13 +473,47 @@ class RuleEditor(QDialog): # {{{
                     except:
                         import traceback
                         traceback.print_exc()
-                self.filename_box.setCurrentIndex(self.filename_box.findText(icon_name))
+                if self.multiple_icon_cb.isChecked():
+                    if icon_name not in self.rule_icon_files:
+                        self.rule_icon_files.append(icon_name)
+                    self.update_icon_filenames_in_box()
+                else:
+                    self.filename_box.setCurrentIndex(self.filename_box.findText(icon_name))
                 self.filename_box.adjustSize()
         except:
             import traceback
             traceback.print_exc()
         return
 
+    def get_filenames_from_box(self):
+        if self.multiple_icon_cb.isChecked():
+            model = self.filename_box.model()
+            fnames = []
+            for i in range(1, model.rowCount()):
+                item = model.item(i, 0)
+                if item.checkState() == Qt.Checked:
+                    fnames.append(lower(unicode(item.text())))
+            fname = ' : '.join(fnames)
+        else:
+            fname = lower(unicode(self.filename_box.currentText()))
+        return fname
+
+    def update_icon_filenames_in_box(self):
+        if self.rule_icon_files:
+            if not self.multiple_icon_cb.isChecked():
+                idx = self.filename_box.findText(self.rule_icon_files[0])
+                if idx >= 0:
+                    self.filename_box.setCurrentIndex(idx)
+                else:
+                    self.filename_box.setCurrentIndex(0)
+            else:
+                model = self.filename_box.model()
+                for icon in self.rule_icon_files:
+                    idx = self.filename_box.findText(icon)
+                    if idx >= 0:
+                        item = model.item(idx)
+                        item.setCheckState(Qt.Checked)
+
     def add_blank_condition(self):
         c = ConditionEditor(self.fm, parent=self.conditions_widget)
         self.conditions.append(c)
@@ -469,12 +527,11 @@ class RuleEditor(QDialog): # {{{
                     self.color_box.setCurrentIndex(idx)
         else:
             self.kind_box.setCurrentIndex(0 if kind == 'icon' else 1)
-            if rule.color:
-                idx = self.filename_box.findText(rule.color)
-                if idx >= 0:
-                    self.filename_box.setCurrentIndex(idx)
-                else:
-                    self.filename_box.setCurrentIndex(0)
+            self.rule_icon_files = [ic.strip() for ic in rule.color.split(':')]
+            if len(self.rule_icon_files) > 1:
+                self.multiple_icon_cb.setChecked(True)
+            self.update_filename_box()
+            self.update_icon_filenames_in_box()
 
         for i in range(self.column_box.count()):
             c = unicode(self.column_box.itemData(i).toString())
@@ -492,10 +549,9 @@ class RuleEditor(QDialog): # {{{
                 import traceback
                 traceback.print_exc()
 
-
     def accept(self):
         if self.rule_kind != 'color':
-            fname = lower(unicode(self.filename_box.currentText()))
+            fname = self.get_filenames_from_box()
             if not fname:
                 error_dialog(self, _('No icon selected'),
                         _('You must choose an icon for this rule'), show=True)
@@ -528,7 +584,7 @@ class RuleEditor(QDialog): # {{{
     def rule(self):
         r = Rule(self.fm)
         if self.rule_kind != 'color':
-            r.color = unicode(self.filename_box.currentText())
+            r.color = self.get_filenames_from_box()
         else:
             r.color = unicode(self.color_box.currentText())
         idx = self.column_box.currentIndex()

From 64d62847e31fd17fbc43745d66b2f155f3c67181 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 15:20:23 +0530
Subject: [PATCH 0817/1154] Driver for Icarus Essence

Fixes #1226304 [request of support for new device](https://bugs.launchpad.net/calibre/+bug/1226304)
---
 src/calibre/devices/teclast/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/teclast/driver.py b/src/calibre/devices/teclast/driver.py
index 95d8c3cf3f..9e42b3dbde 100644
--- a/src/calibre/devices/teclast/driver.py
+++ b/src/calibre/devices/teclast/driver.py
@@ -72,7 +72,7 @@ class IPAPYRUS(TECLAST_K3):
 
     FORMATS = ['epub', 'pdf', 'txt']
 
-    VENDOR_NAME      = ['E_READER', 'EBOOKREA']
+    VENDOR_NAME      = ['E_READER', 'EBOOKREA', 'ICARUS']
     WINDOWS_MAIN_MEM = ''
 
 class SOVOS(TECLAST_K3):

From 7c101e4e09f2acbe5085f9dc4605dd17b7f8160e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 15:26:10 +0530
Subject: [PATCH 0818/1154] pep8

---
 src/calibre/gui2/dialogs/tag_editor.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py
index 843711713b..9185a56057 100644
--- a/src/calibre/gui2/dialogs/tag_editor.py
+++ b/src/calibre/gui2/dialogs/tag_editor.py
@@ -63,7 +63,6 @@ class TagEditor(QDialog, Ui_TagEditor):
         if geom is not None:
             self.restoreGeometry(geom)
 
-
     def delete_tags(self, item=None):
         confirms, deletes = [], []
         items = self.available_tags.selectedItems() if item is None else [item]
@@ -94,7 +93,6 @@ class TagEditor(QDialog, Ui_TagEditor):
                 self.db.refresh_ids(bks)
             self.available_tags.takeItem(self.available_tags.row(item))
 
-
     def apply_tags(self, item=None):
         items = self.available_tags.selectedItems() if item is None else [item]
         rows = [self.available_tags.row(i) for i in items]
@@ -116,7 +114,6 @@ class TagEditor(QDialog, Ui_TagEditor):
             item = self.available_tags.item(row)
             self.available_tags.scrollToItem(item)
 
-
     def unapply_tags(self, item=None):
         items = self.applied_tags.selectedItems() if item is None else [item]
         for item in items:

From fe26aea85a9e1b8df80aba330ad9ad90b4eb3c24 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 15:27:43 +0530
Subject: [PATCH 0819/1154] Keep position when deleting tags in the tag editor

Fixes #1226093 [[Enhancement] Tag editor should remember place](https://bugs.launchpad.net/calibre/+bug/1226093)
---
 src/calibre/gui2/dialogs/tag_editor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py
index 9185a56057..2a6529bb87 100644
--- a/src/calibre/gui2/dialogs/tag_editor.py
+++ b/src/calibre/gui2/dialogs/tag_editor.py
@@ -69,6 +69,7 @@ class TagEditor(QDialog, Ui_TagEditor):
         if not items:
             error_dialog(self, 'No tags selected', 'You must select at least one tag from the list of Available tags.').exec_()
             return
+        pos = self.available_tags.verticalScrollBar().value()
         for item in items:
             used = self.db.is_tag_used(unicode(item.text())) \
                 if self.key is None else \
@@ -92,6 +93,7 @@ class TagEditor(QDialog, Ui_TagEditor):
                                                         label=self.key)
                 self.db.refresh_ids(bks)
             self.available_tags.takeItem(self.available_tags.row(item))
+        self.available_tags.verticalScrollBar().setValue(pos)
 
     def apply_tags(self, item=None):
         items = self.available_tags.selectedItems() if item is None else [item]

From aea90e5c0323b588f6624bf511dfd6ac7e2a7fc7 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 17 Sep 2013 12:03:11 +0200
Subject: [PATCH 0820/1154] Fill with transparent instead of white, and fix
 silly typo.

---
 src/calibre/gui2/library/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index c5d453b3ff..8cd1a63d03 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -107,7 +107,7 @@ class ColumnIcon(object):  # {{{
                         total_width += bm.width()
                 if len(icon_bitmaps) > 1:
                     result = QPixmap(len(icon_list)*128, 128)
-                    result.fill()
+                    result.fill(Qt.transparent)
                     painter = QPainter(result)
                     x = 0
                     for bm in icon_bitmaps:
@@ -120,7 +120,7 @@ class ColumnIcon(object):  # {{{
                 # If the image height is less than the row height, leave it alone
                 # The -2 allows for a pixel above and below. Also ensure that
                 # it is always a bit positive
-                rh = min(2, self.model.row_height - 2)
+                rh = max(2, self.model.row_height - 2)
                 if result.height() > rh:
                     result = result.scaledToHeight(rh, mode=Qt.SmoothTransformation)
                 icon_cache[id_][dex] = result

From 7d61da1ab65b3af29bd59c9f342161e24bc7b3ee Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 17 Sep 2013 16:19:31 +0530
Subject: [PATCH 0821/1154] Update Liberation

Fixes #1226391 [Private bug](https://bugs.launchpad.net/calibre/+bug/1226391)
---
 recipes/liberation.recipe     |  60 +++++++++-----------
 recipes/liberation_sub.recipe | 103 ----------------------------------
 2 files changed, 25 insertions(+), 138 deletions(-)
 delete mode 100644 recipes/liberation_sub.recipe

diff --git a/recipes/liberation.recipe b/recipes/liberation.recipe
index 741e2e87d2..14cc23c1c2 100644
--- a/recipes/liberation.recipe
+++ b/recipes/liberation.recipe
@@ -21,42 +21,10 @@ class Liberation(BasicNewsRecipe):
     max_articles_per_feed  = 15
     no_stylesheets         = True
     remove_empty_feeds     = True
-    filterDuplicates       = True
+    needs_subscription     = 'optional'
 
-    extra_css = '''
-                    h1, h2, h3 {font-size:xx-large; font-family:Arial,Helvetica,sans-serif;}
-                    p.subtitle {font-size:xx-small; font-family:Arial,Helvetica,sans-serif;}
-                    h4, h5, h2.rubrique,  {font-size:xx-small; color:#4D4D4D; font-family:Arial,Helvetica,sans-serif;}
-                    .ref, .date, .author, .legende {font-size:xx-small; color:#4D4D4D; font-family:Arial,Helvetica,sans-serif;}
-                    .mna-body, entry-body  {font-size:medium; font-family:Arial,Helvetica,sans-serif;}
-                '''
-
-    keep_only_tags    = [
-                  dict(name='div', attrs={'class':'article'})
-                  ,dict(name='div', attrs={'class':'text-article m-bot-s1'})
-                  ,dict(name='div', attrs={'class':'entry'})
-                  ,dict(name='div', attrs={'class':'col_contenu'})
-    ]
-
-    remove_tags_after = [
-        dict(name='div',attrs={'class':['object-content text text-item', 'object-content', 'entry-content', 'col01', 'bloc_article_01']})
-        ,dict(name='p',attrs={'class':['chapo']})
-        ,dict(id='_twitter_facebook')
-    ]
-
-    remove_tags    = [
-                        dict(name='iframe')
-                        ,dict(name='a', attrs={'class':'lnk-comments'})
-                        ,dict(name='div', attrs={'class':'toolbox'})
-                        ,dict(name='ul', attrs={'class':'share-box'})
-                        ,dict(name='ul', attrs={'class':'tool-box'})
-                        ,dict(name='ul', attrs={'class':'rub'})
-                        ,dict(name='p',attrs={'class':['chapo']})
-                        ,dict(name='p',attrs={'class':['tag']})
-                        ,dict(name='div',attrs={'class':['blokLies']})
-                        ,dict(name='div',attrs={'class':['alire']})
-                        ,dict(id='_twitter_facebook')
-                     ]
+    keep_only_tags = [dict(name='article')]
+    remove_tags = [dict(attrs={'class':['tool-bar']})]
 
     feeds          = [
                          (u'La une', u'http://rss.liberation.fr/rss/9/')
@@ -69,6 +37,16 @@ class Liberation(BasicNewsRecipe):
                         ,(u'Sports', u'http://www.liberation.fr/rss/12/')
                      ]
 
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser(self)
+        if self.username is not None and self.password is not None:
+            br.open('http://token.liberation.fr/accounts/login/')
+            br.select_form(nr=0)
+            br['email']    = self.username
+            br['password'] = self.password
+            br.submit()
+        return br
+
     def get_masthead_url(self):
         masthead = 'http://s0.libe.com/libe/img/common/logo-liberation-150.png'
         br = BasicNewsRecipe.get_browser(self)
@@ -78,3 +56,15 @@ class Liberation(BasicNewsRecipe):
             self.log("\nCover unavailable")
             masthead = None
         return masthead
+
+    def get_article_url(self, article):
+        url = BasicNewsRecipe.get_article_url(self, article)
+        url = url.split('/')[-2]
+        encoding = {'0B': '.', '0C': '/', '0A': '0', '0F': '=', '0G': '&',
+                '0D': '?', '0E': '-', '0N': '.com', '0L': 'http://', '0S':
+                    'www.', '0I': '_'}
+        for k, v in encoding.iteritems():
+            url = url.replace(k, v)
+        return url.partition('?')[0]
+
+
diff --git a/recipes/liberation_sub.recipe b/recipes/liberation_sub.recipe
deleted file mode 100644
index 60450341e4..0000000000
--- a/recipes/liberation_sub.recipe
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env  python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-
-__license__   = 'GPL v3'
-__copyright__ = '2012, Rémi Vanicat <vanicat at debian.org>'
-'''
-liberation.fr
-'''
-# The cleanning is from the Liberation recipe, by Darko Miletic
-
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class Liberation(BasicNewsRecipe):
-
-    title                 = u'Libération: Édition abonnés'
-    __author__            = 'Rémi Vanicat'
-    description           = u'Actualités'
-    category              = 'Actualités, France, Monde'
-    language              = 'fr'
-    needs_subscription    = True
-
-    use_embedded_content   = False
-    no_stylesheets         = True
-    remove_empty_feeds     = True
-
-    extra_css = '''
-                    h1, h2, h3 {font-size:xx-large; font-family:Arial,Helvetica,sans-serif;}
-                    p.subtitle {font-size:xx-small; font-family:Arial,Helvetica,sans-serif;}
-                    h4, h5, h2.rubrique,  {font-size:xx-small; color:#4D4D4D; font-family:Arial,Helvetica,sans-serif;}
-                    .ref, .date, .author, .legende {font-size:xx-small; color:#4D4D4D; font-family:Arial,Helvetica,sans-serif;}
-                    .mna-body, entry-body  {font-size:medium; font-family:Arial,Helvetica,sans-serif;}
-                '''
-
-    keep_only_tags    = [
-                  dict(name='div', attrs={'class':'article'})
-                  ,dict(name='div', attrs={'class':'text-article m-bot-s1'})
-                  ,dict(name='div', attrs={'class':'entry'})
-                  ,dict(name='div', attrs={'class':'col_contenu'})
-    ]
-
-    remove_tags_after = [
-        dict(name='div',attrs={'class':['object-content text text-item', 'object-content', 'entry-content', 'col01', 'bloc_article_01']})
-        ,dict(name='p',attrs={'class':['chapo']})
-        ,dict(id='_twitter_facebook')
-    ]
-
-    remove_tags    = [
-                        dict(name='iframe')
-                        ,dict(name='a', attrs={'class':'lnk-comments'})
-                        ,dict(name='div', attrs={'class':'toolbox'})
-                        ,dict(name='ul', attrs={'class':'share-box'})
-                        ,dict(name='ul', attrs={'class':'tool-box'})
-                        ,dict(name='ul', attrs={'class':'rub'})
-                        ,dict(name='p',attrs={'class':['chapo']})
-                        ,dict(name='p',attrs={'class':['tag']})
-                        ,dict(name='div',attrs={'class':['blokLies']})
-                        ,dict(name='div',attrs={'class':['alire']})
-                        ,dict(id='_twitter_facebook')
-                     ]
-
-    index           = 'http://www.liberation.fr/abonnes/'
-
-    def get_browser(self):
-        br = BasicNewsRecipe.get_browser(self)
-        if self.username is not None and self.password is not None:
-            br.open('http://www.liberation.fr/jogger/login/')
-            br.select_form(nr=0)
-            br['email']    = self.username
-            br['password'] = self.password
-            br.submit()
-        return br
-
-    def parse_index(self):
-        soup=self.index_to_soup(self.index)
-
-        content = soup.find('div', { 'class':'block-content' })
-
-        articles = []
-        cat_articles = []
-
-        for tag in content.findAll(recursive=False):
-            if(tag['class']=='headrest headrest-basic-rounded'):
-                cat_articles = []
-                articles.append((tag.find('h5').contents[0],cat_articles))
-            else:
-                title = tag.find('h3').contents[0]
-                url = tag.find('a')['href']
-                print(url)
-                descripion = tag.find('p',{ 'class':'subtitle' }).contents[0]
-                article = {
-                    'title': title,
-                    'url': url,
-                    'descripion': descripion,
-                    'content': ''
-                    }
-                cat_articles.append(article)
-        return articles
-
-
-
-# Local Variables:
-# mode: python
-# End:

From 2fe01db0043f94bd67d45528b94078b38c8d0953 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 17 Sep 2013 14:29:08 +0200
Subject: [PATCH 0822/1154] Make icon rules composable.

---
 src/calibre/gui2/dialogs/template_dialog.py | 17 +++--
 src/calibre/gui2/dialogs/template_dialog.ui | 40 ++++-------
 src/calibre/gui2/library/models.py          | 80 +++++++++++++--------
 src/calibre/gui2/preferences/coloring.py    | 30 ++++----
 4 files changed, 91 insertions(+), 76 deletions(-)

diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py
index 3db6e37eb0..ab185d8a6a 100644
--- a/src/calibre/gui2/dialogs/template_dialog.py
+++ b/src/calibre/gui2/dialogs/template_dialog.py
@@ -7,7 +7,7 @@ import json, os, traceback
 
 from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QSyntaxHighlighter, QFont,
                       QRegExp, QApplication, QTextCharFormat, QColor, QCursor,
-                      QIcon, QSize)
+                      QIcon, QSize, QVariant)
 
 from calibre import sanitize_file_name_unicode
 from calibre.constants import config_dir
@@ -19,7 +19,6 @@ from calibre.ebooks.metadata.book.formatter import SafeFormat
 from calibre.library.coloring import (displayable_columns, color_row_key)
 from calibre.gui2 import error_dialog, choose_files, pixmap_to_data
 
-
 class ParenPosition:
 
     def __init__(self, block, pos, paren):
@@ -247,9 +246,15 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
                             self.icon_file_names.append(icon_file)
             self.icon_file_names.sort(key=sort_key)
             self.update_filename_box()
-            self.icon_with_text.setChecked(True)
-            if icon_rule_kind == 'icon_only':
-                self.icon_without_text.setChecked(True)
+
+            dex = 0
+            from calibre.gui2.preferences.coloring import icon_rule_kinds
+            for i,tup in enumerate(icon_rule_kinds):
+                txt,val = tup
+                self.icon_kind.addItem(txt, userData=QVariant(val))
+                if val == icon_rule_kind:
+                    dex = i
+            self.icon_kind.setCurrentIndex(dex)
             self.icon_field.setCurrentIndex(self.icon_field.findData(icon_field_key))
 
         if mi:
@@ -410,7 +415,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
             self.rule = (unicode(self.colored_field.itemData(
                                 self.colored_field.currentIndex()).toString()), txt)
         elif self.iconing:
-            rt = 'icon' if self.icon_with_text.isChecked() else 'icon_only'
+            rt = unicode(self.icon_kind.itemData(self.icon_kind.currentIndex()).toString())
             self.rule = (rt,
                          unicode(self.icon_field.itemData(
                                 self.icon_field.currentIndex()).toString()),
diff --git a/src/calibre/gui2/dialogs/template_dialog.ui b/src/calibre/gui2/dialogs/template_dialog.ui
index db9cc16dd9..11dafa4627 100644
--- a/src/calibre/gui2/dialogs/template_dialog.ui
+++ b/src/calibre/gui2/dialogs/template_dialog.ui
@@ -69,33 +69,19 @@
     <widget class="QWidget" name="icon_layout">
      <layout class="QGridLayout">
       <item row="0" column="0" colspan="2">
-       <widget class="QGroupBox">
-        <property name="title">
-         <string>Kind</string>
-        </property>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QRadioButton" name="icon_without_text">
-           <property name="text">
-            <string>icon with no text</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="icon_with_text">
-           <property name="text">
-            <string>icon with text</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>100</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout">
+        <item>
+         <widget class="QLabel">
+          <property name="text">
+           <string>Kind:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="icon_kind">
+         </widget>
+        </item>
+       </layout>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="icon_chooser_label">
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 8cd1a63d03..af6c3e440b 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -81,38 +81,49 @@ class ColumnIcon(object):  # {{{
         self.formatter = formatter
         self.model = model
 
-    def __call__(self, id_, key, fmt, kind, db, icon_cache, icon_bitmap_cache):
-        dex = key+kind
-        if id_ in icon_cache and dex in icon_cache[id_]:
+    def __call__(self, id_, key, fmts, cache_index, db, icon_cache, icon_bitmap_cache):
+        if id_ in icon_cache and cache_index in icon_cache[id_]:
             self.mi = None
-            return icon_cache[id_][dex]
+            return icon_cache[id_][cache_index]
         try:
             if self.mi is None:
                 self.mi = db.get_metadata(id_, index_is_id=True)
-            icons = self.formatter.safe_format(fmt, self.mi, '', self.mi)
+            icons = []
+            for kind,fmt in fmts:
+                rule_icons = self.formatter.safe_format(fmt, self.mi, '', self.mi)
+                if not rule_icons:
+                    continue
+                icon_list = [ic.strip() for ic in rule_icons.split(':')]
+                if icon_list and not kind.endswith('_composed'):
+                    icons = icon_list
+                    break
+                else:
+                    icons.extend(icon_list)
+
             if icons:
-                if icons in icon_bitmap_cache:
-                    icon_bitmap = icon_bitmap_cache[icons]
-                    icon_cache[id_][dex] = icon_bitmap
+                icon_string = ':'.join(icons)
+                if icon_string in icon_bitmap_cache:
+                    icon_bitmap = icon_bitmap_cache[icon_string]
+                    icon_cache[id_][cache_index] = icon_bitmap
                     return icon_bitmap
 
-                icon_list = [ic.strip() for ic in icons.split(':')]
                 icon_bitmaps = []
                 total_width = 0
-                for icon in icon_list:
+                for icon in icons:
                     d = os.path.join(config_dir, 'cc_icons', icon)
                     if (os.path.exists(d)):
                         bm = QPixmap(d)
                         icon_bitmaps.append(bm)
                         total_width += bm.width()
                 if len(icon_bitmaps) > 1:
-                    result = QPixmap(len(icon_list)*128, 128)
+                    i = len(icon_bitmaps)
+                    result = QPixmap((i * 128) + ((i-1)*2), 128)
                     result.fill(Qt.transparent)
                     painter = QPainter(result)
                     x = 0
                     for bm in icon_bitmaps:
                         painter.drawPixmap(x, 0, bm)
-                        x += bm.width()
+                        x += bm.width() + 2
                     painter.end()
                 else:
                     result = icon_bitmaps[0]
@@ -123,8 +134,8 @@ class ColumnIcon(object):  # {{{
                 rh = max(2, self.model.row_height - 2)
                 if result.height() > rh:
                     result = result.scaledToHeight(rh, mode=Qt.SmoothTransformation)
-                icon_cache[id_][dex] = result
-                icon_bitmap_cache[icons] = result
+                icon_cache[id_][cache_index] = result
+                icon_bitmap_cache[icon_string] = result
                 self.mi = None
                 return result
         except:
@@ -788,16 +799,21 @@ class BooksModel(QAbstractTableModel):  # {{{
             if rules:
                 key = self.column_map[col]
                 id_ = None
+                fmts = []
                 for kind, k, fmt in rules:
-                    if k == key and kind == 'icon_only':
+                    if k == key and kind in ('icon_only', 'icon_only_composed'):
                         if id_ is None:
                             id_ = self.id(index)
                             self.column_icon.mi = None
-                        ccicon = self.column_icon(id_, key, fmt, 'icon_only', self.db,
-                                              self.icon_cache, self.icon_bitmap_cache)
-                        if ccicon is not None:
-                            return NONE
-                self.icon_cache[id_][key+'icon_only'] = None
+                        fmts.append((kind, fmt))
+
+                if fmts:
+                    cache_index = key + ':'.join([kind for kind,fmt in fmts])
+                    ccicon = self.column_icon(id_, key, fmts, cache_index, self.db,
+                                      self.icon_cache, self.icon_bitmap_cache)
+                    if ccicon is not None:
+                        return NONE
+                    self.icon_cache[id_][cache_index] = None
             return self.column_to_dc_map[col](index.row())
         elif role in (Qt.EditRole, Qt.ToolTipRole):
             return self.column_to_dc_map[col](index.row())
@@ -854,21 +870,25 @@ class BooksModel(QAbstractTableModel):  # {{{
                 key = self.column_map[col]
                 id_ = None
                 need_icon_with_text = False
+                fmts = []
                 for kind, k, fmt in rules:
-                    if k == key and kind in ('icon', 'icon_only'):
+                    if k == key and kind.startswith('icon'):
                         if id_ is None:
                             id_ = self.id(index)
                             self.column_icon.mi = None
-                        if kind == 'icon':
+                        fmts.append((kind, fmt))
+                        if kind in ('icon', 'icon_composed'):
                             need_icon_with_text = True
-                        ccicon = self.column_icon(id_, key, fmt, kind, self.db,
-                                          self.icon_cache, self.icon_bitmap_cache)
-                        if ccicon is not None:
-                            return ccicon
-                if need_icon_with_text:
-                    self.icon_cache[id_][key+'icon'] = self.bool_blank_icon
-                    return self.bool_blank_icon
-                self.icon_cache[id_][key+'icon'] = None
+                if fmts:
+                    cache_index = key + ':'.join([kind for kind,fmt in fmts])
+                    ccicon = self.column_icon(id_, key, fmts, cache_index, self.db,
+                                  self.icon_cache, self.icon_bitmap_cache)
+                    if ccicon is not None:
+                        return ccicon
+                    if need_icon_with_text:
+                        self.icon_cache[id_][cache_index] = self.bool_blank_icon
+                        return self.bool_blank_icon
+                    self.icon_cache[id_][cache_index] = None
         elif role == Qt.TextAlignmentRole:
             cname = self.column_map[index.column()]
             ans = Qt.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname,
diff --git a/src/calibre/gui2/preferences/coloring.py b/src/calibre/gui2/preferences/coloring.py
index 8370762bba..774c0e00c6 100644
--- a/src/calibre/gui2/preferences/coloring.py
+++ b/src/calibre/gui2/preferences/coloring.py
@@ -29,7 +29,9 @@ from calibre.utils.icu import lower
 all_columns_string = _('All Columns')
 
 icon_rule_kinds = [(_('icon with text'), 'icon'),
-                   (_('icon with no text'), 'icon_only') ]
+                   (_('icon with no text'), 'icon_only'),
+                   (_('composed icons w/text'), 'icon_composed'),
+                   (_('composed icons w/no text'), 'icon_only_composed'),]
 
 class ConditionEditor(QWidget): # {{{
 
@@ -526,7 +528,10 @@ class RuleEditor(QDialog): # {{{
                 if idx >= 0:
                     self.color_box.setCurrentIndex(idx)
         else:
-            self.kind_box.setCurrentIndex(0 if kind == 'icon' else 1)
+            for i,tup in enumerate(icon_rule_kinds):
+                if kind == tup[1]:
+                    self.kind_box.setCurrentIndex(i)
+                    break
             self.rule_icon_files = [ic.strip() for ic in rule.color.split(':')]
             if len(self.rule_icon_files) > 1:
                 self.multiple_icon_cb.setChecked(True)
@@ -691,6 +696,15 @@ class RulesModel(QAbstractListModel): # {{{
         self.reset()
 
     def rule_to_html(self, kind, col, rule):
+        trans_kind = 'not found'
+        if kind == 'color':
+            trans_kind = _('color')
+        else:
+            for tt, t in icon_rule_kinds:
+                if kind == t:
+                    trans_kind = tt
+                    break
+
         if not isinstance(rule, Rule):
             if kind == 'color':
                 return _('''
@@ -702,21 +716,11 @@ class RulesModel(QAbstractListModel): # {{{
                 <p>Advanced Rule: set <b>%(typ)s</b> for column <b>%(col)s</b>:
                 <pre>%(rule)s</pre>
                 ''')%dict(col=col,
-                          typ=icon_rule_kinds[0][0]
-                            if kind == icon_rule_kinds[0][1] else icon_rule_kinds[1][0],
+                          typ=trans_kind,
                           rule=prepare_string_for_xml(rule))
 
         conditions = [self.condition_to_html(c) for c in rule.conditions]
 
-        trans_kind = 'not found'
-        if kind == 'color':
-            trans_kind = _('color')
-        else:
-            for tt, t in icon_rule_kinds:
-                if kind == t:
-                    trans_kind = tt
-                    break
-
         return _('''\
             <p>Set the <b>%(kind)s</b> of <b>%(col)s</b> to <b>%(color)s</b> if the following
             conditions are met:</p>

From 5acef6ba2feb8f464ac58743d5b51b8feef4be7a Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 17 Sep 2013 15:29:13 +0200
Subject: [PATCH 0823/1154] Get rid of over-elaborate cache naming

---
 src/calibre/gui2/library/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index af6c3e440b..44cf9fe39c 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -808,7 +808,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                         fmts.append((kind, fmt))
 
                 if fmts:
-                    cache_index = key + ':'.join([kind for kind,fmt in fmts])
+                    cache_index = key + ':DisplayRole'
                     ccicon = self.column_icon(id_, key, fmts, cache_index, self.db,
                                       self.icon_cache, self.icon_bitmap_cache)
                     if ccicon is not None:
@@ -880,7 +880,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                         if kind in ('icon', 'icon_composed'):
                             need_icon_with_text = True
                 if fmts:
-                    cache_index = key + ':'.join([kind for kind,fmt in fmts])
+                    cache_index = key + ':DecorationRole'
                     ccicon = self.column_icon(id_, key, fmts, cache_index, self.db,
                                   self.icon_cache, self.icon_bitmap_cache)
                     if ccicon is not None:

From 07547628cc5b164f9785fba2ea60bf5e8c8856d1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 18 Sep 2013 17:00:59 +0530
Subject: [PATCH 0824/1154] pep8

---
 src/calibre/devices/usbms/driver.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index 9dbb718fc0..e5ed2d3356 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -136,7 +136,7 @@ class USBMS(CLI, Device):
     def books(self, oncard=None, end_session=True):
         from calibre.ebooks.metadata.meta import path_to_ext
 
-        debug_print ('USBMS: Fetching list of books from device. Device=',
+        debug_print('USBMS: Fetching list of books from device. Device=',
                      self.__class__.__name__,
                      'oncard=', oncard)
 
@@ -160,7 +160,7 @@ class USBMS(CLI, Device):
             self.EBOOK_DIR_CARD_B if oncard == 'cardb' else \
             self.get_main_ebook_dir()
 
-        debug_print ('USBMS: dirs are:', prefix, ebook_dirs)
+        debug_print('USBMS: dirs are:', prefix, ebook_dirs)
 
         # get the metadata cache
         bl = self.booklist_class(oncard, prefix, self.settings)
@@ -185,13 +185,13 @@ class USBMS(CLI, Device):
                     if idx is not None:
                         bl_cache[lpath] = None
                         if self.update_metadata_item(bl[idx]):
-                            #print 'update_metadata_item returned true'
+                            # print 'update_metadata_item returned true'
                             changed = True
                     else:
                         if bl.add_book(self.book_from_path(prefix, lpath),
                                               replace_metadata=False):
                             changed = True
-                except: # Probably a filename encoding error
+                except:  # Probably a filename encoding error
                     import traceback
                     traceback.print_exc()
             return changed
@@ -202,11 +202,12 @@ class USBMS(CLI, Device):
             if self.SCAN_FROM_ROOT:
                 ebook_dir = self.normalize_path(prefix)
             else:
-                ebook_dir = self.normalize_path( \
-                            os.path.join(prefix, *(ebook_dir.split('/'))) \
+                ebook_dir = self.normalize_path(
+                            os.path.join(prefix, *(ebook_dir.split('/')))
                                     if ebook_dir else prefix)
             debug_print('USBMS: scan from root', self.SCAN_FROM_ROOT, ebook_dir)
-            if not os.path.exists(ebook_dir): continue
+            if not os.path.exists(ebook_dir):
+                continue
             # Get all books in the ebook_dir directory
             if self.SUPPORTS_SUB_DIRS or self.SUPPORTS_SUB_DIRS_FOR_SCAN:
                 # build a list of files to check, so we can accurately report progress
@@ -237,9 +238,9 @@ class USBMS(CLI, Device):
                 need_sync = True
                 del bl[idx]
 
-        debug_print('USBMS: count found in cache: %d, count of files in metadata: %d, need_sync: %s' % \
+        debug_print('USBMS: count found in cache: %d, count of files in metadata: %d, need_sync: %s' %
             (len(bl_cache), len(bl), need_sync))
-        if need_sync: #self.count_found_in_bl != len(bl) or need_sync:
+        if need_sync:  # self.count_found_in_bl != len(bl) or need_sync:
             if oncard == 'cardb':
                 self.sync_booklists((None, None, bl))
             elif oncard == 'carda':
@@ -272,7 +273,7 @@ class USBMS(CLI, Device):
                 self.upload_cover(os.path.dirname(filepath),
                                   os.path.splitext(os.path.basename(filepath))[0],
                                   mdata, filepath)
-            except: # Failure to upload cover is not catastrophic
+            except:  # Failure to upload cover is not catastrophic
                 import traceback
                 traceback.print_exc()
 

From c893f0de7e73f9c2cfa9021133a4bfb43fe4e0fb Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Wed, 18 Sep 2013 23:08:56 +1000
Subject: [PATCH 0825/1154] Add support for new cover handling in Kobo Aura

The new Kobo Aura has firmware version 2.9.0. The main change needed for
the driver is that cover images are stored in a different place.

Version number is set to 2.9.1 to handle the later release for other
Kobo devices.
---
 src/calibre/devices/kobo/driver.py | 86 +++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 9a86f61ef2..a49e6b16e0 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -31,6 +31,25 @@ from calibre.utils.config_base import prefs
 EPUB_EXT = '.epub'
 
 
+# Implementation of QtQHash for strings. This doesn't seem to be in the Python implemention. 
+def qhash (inputstr):
+    instr = ""
+    if isinstance (inputstr, str):
+        instr = inputstr 
+    elif isinstance (inputstr, unicode):
+        instr = inputstr.encode ("utf8")
+    else:
+        return -1
+
+    h = 0x00000000
+    for i in range (0, len (instr)):
+        h = (h << 4) + ord(instr[i])
+        h ^= (h & 0xf0000000) >> 23
+        h &= 0x0fffffff
+
+    return h
+
+
 class DummyCSSPreProcessor(object):
 
     def __call__(self, data, add_namespace=False):
@@ -44,11 +63,11 @@ class KOBO(USBMS):
     gui_name = 'Kobo Reader'
     description = _('Communicate with the Kobo Reader')
     author = 'Timothy Legge and David Forrester'
-    version = (2, 1, 2)
+    version = (2, 1, 3)
 
     dbversion = 0
     fwversion = 0
-    supported_dbversion = 80
+    supported_dbversion = 90
     has_kepubs = False
 
     supported_platforms = ['windows', 'osx', 'linux']
@@ -1221,16 +1240,18 @@ class KOBOTOUCH(KOBO):
     description = 'Communicate with the Kobo Touch, Glo, Mini and Aura HD ereaders. Based on the existing Kobo driver by %s.' % (KOBO.author)
 #    icon        = I('devices/kobotouch.jpg')
 
-    supported_dbversion             = 80
+    supported_dbversion             = 90
     min_supported_dbversion         = 53
     min_dbversion_series            = 65
     min_dbversion_externalid        = 65
     min_dbversion_archive           = 71
     min_dbversion_images_on_sdcard  = 77
     min_dbversion_activiy           = 77
+    min_dbversion_keywords          = 82
 
-    max_supported_fwversion         = (2,8,1)
+    max_supported_fwversion         = (2,9,1)
     min_fwversion_images_on_sdcard  = (2,4,1)
+    min_fwversion_images_tree       = (2,9,0) # Cover images stored in tree under .kobo-images
 
     has_kepubs = True
 
@@ -1331,15 +1352,16 @@ class KOBOTOUCH(KOBO):
 
     BCD = [0x0110, 0x0326]
 
-    # Image file name endings. Made up of: image size, min_dbversion, max_dbversion,
+    # Image file name endings. Made up of: image size, min_dbversion, max_dbversion, isFullSize,
     COVER_FILE_ENDINGS = {
                           ' - N3_FULL.parsed':[(600,800),0, 99,True,],            # Used for screensaver, home screen
-                          ' - N3_LIBRARY_FULL.parsed':[(355,473),0, 99,False,],   # Used for Details screen
+                          ' - N3_LIBRARY_FULL.parsed':[(355,473),0, 81,False,],   # Used for Details screen
                           ' - N3_LIBRARY_GRID.parsed':[(149,198),0, 99,False,],   # Used for library lists
                           ' - N3_LIBRARY_LIST.parsed':[(60,90),0, 53,False,],
+                          ' - AndroidBookLoadTablet_Aspect.parsed':[(355,473), 82, 99,False,],   # Used for Details screen
 #                          ' - N3_LIBRARY_SHELF.parsed': [(40,60),0, 52,],
                           }
-    GLO_COVER_FILE_ENDINGS = {
+    GLO_COVER_FILE_ENDINGS = {      # Glo and Aura share resolution, so the image sizes should be the same.
                           ' - N3_FULL.parsed':[(758,1024),0, 99,True,],           # Used for screensaver, home screen
                           ' - N3_LIBRARY_FULL.parsed':[(355,479),0, 99,False,],   # Used for Details screen
                           ' - N3_LIBRARY_GRID.parsed':[(149,201),0, 99,False,],   # Used for library lists
@@ -1404,6 +1426,7 @@ class KOBOTOUCH(KOBO):
         debug_print('Kobo device: %s' % self.gui_name)
         debug_print('Version of driver:', self.version, 'Has kepubs:', self.has_kepubs)
         debug_print('Version of firmware:', self.fwversion, 'Has kepubs:', self.has_kepubs)
+        debug_print('Firmware supports cover image tree:', self.fwversion >= self.min_fwversion_images_tree)
 
         self.booklist_class.rebuild_collections = self.rebuild_collections
 
@@ -1526,7 +1549,7 @@ class KOBOTOUCH(KOBO):
                     if (ContentType == '6' and MimeType != 'application/x-kobo-epub+zip'):
                         if os.path.exists(self.normalize_path(os.path.join(prefix, lpath))):
                             if self.update_metadata_item(bl[idx]):
-                                print 'update_metadata_item returned true'
+#                                print 'update_metadata_item returned true'
                                 changed = True
                         else:
                             debug_print("    Strange:  The file: ", prefix, lpath, " does not exist!")
@@ -1741,8 +1764,9 @@ class KOBOTOUCH(KOBO):
                 bookshelves = get_bookshelvesforbook(connection, row[3])
 
                 prefix = self._card_a_prefix if oncard == 'carda' else self._main_prefix
-                changed = update_booklist(prefix,   path, row[0], row[1], mime, row[2], row[3], row[5], row[
-                                          6], row[7], row[4], row[8], row[9], row[10], row[11], row[12], row[13], row[14], bookshelves)
+                changed = update_booklist(prefix, path, row[0], row[1], mime, row[2], row[3], row[5], 
+                                          row[6], row[7], row[4], row[8], row[9], row[10], row[11], 
+                                          row[12], row[13], row[14], bookshelves)
 
                 if changed:
                     need_sync = True
@@ -1812,11 +1836,11 @@ class KOBOTOUCH(KOBO):
     def imagefilename_from_imageID(self, prefix, ImageID):
         show_debug = self.is_debugging_title(ImageID)
 
-        path = self.images_path(prefix)
-        path = self.normalize_path(path.replace('/', os.sep))
+        path = self.images_path(prefix, ImageID)
+#        path = self.normalize_path(path.replace('/', os.sep))
 
         for ending, cover_options in self.cover_file_endings().items():
-            fpath = path + ImageID + ending
+            fpath = path + ending
             if os.path.exists(fpath):
                 if show_debug:
                     debug_print("KoboTouch:imagefilename_from_imageID - have cover image fpath=%s" % (fpath))
@@ -1917,8 +1941,6 @@ class KOBOTOUCH(KOBO):
         else:
             debug_print("KoboTouch:_modify_epub: received container")
 
-#        cssnames = [n for n in container.name_path_map if n.endswith('.css')]
-#        for cssname in cssnames:
         from calibre.ebooks.oeb.base import OEB_STYLES
         for cssname, mt in container.mime_map.iteritems():
             if mt in OEB_STYLES:
@@ -2009,16 +2031,22 @@ class KOBOTOUCH(KOBO):
     def delete_images(self, ImageID, book_path):
         debug_print("KoboTouch:delete_images - ImageID=", ImageID)
         if ImageID != None:
-            path = self.images_path(book_path)
-            path = path + ImageID
+            path = self.images_path(book_path, ImageID)
+            debug_print("KoboTouch:delete_images - path=%s" % path)
 
             for ending in self.cover_file_endings().keys():
                 fpath = path + ending
                 fpath = self.normalize_path(fpath)
+                debug_print("KoboTouch:delete_images - fpath=%s" % fpath)
 
                 if os.path.exists(fpath):
-                    # print 'Image File Exists: ' + fpath
+                    debug_print("KoboTouch:delete_images - Image File Exists")
                     os.unlink(fpath)
+                
+            try:
+                os.removedirs(os.path.dirname(path))
+            except:
+                pass
 
     def contentid_from_path(self, path, ContentType):
         show_debug = self.is_debugging_title(path) and True
@@ -2297,14 +2325,22 @@ class KOBOTOUCH(KOBO):
         ImageID = ImageID.replace('.', '_')
         return ImageID
 
-    def images_path(self, path):
+    def images_path(self, path, imageId=None):
         if self._card_a_prefix and os.path.abspath(path).startswith(os.path.abspath(self._card_a_prefix)) and self.supports_covers_on_sdcard():
-            path_prefix = 'koboExtStorage/images/'
+            path_prefix = 'koboExtStorage/images-cache/' if self.supports_images_tree() else 'koboExtStorage/images/'
             path = os.path.join(self._card_a_prefix, path_prefix)
         else:
-            path_prefix = '.kobo/images/'
+            path_prefix = '.kobo-images/' if self.supports_images_tree() else '.kobo/images/'
             path = os.path.join(self._main_prefix, path_prefix)
 
+        if self.supports_images_tree() and imageId:
+            hash1 = qhash(imageId)
+            dir1  = hash1 & (0xff * 1)
+            dir2  = (hash1 & (0xff00 * 1)) >> 8
+            path = os.path.join(path, "%s" % dir1, "%s" % dir2)
+
+        if imageId:
+            path = os.path.join(path, imageId)
         return path
 
     def _upload_cover(self, path, filename, metadata, filepath, uploadgrayscale, keep_cover_aspect=False):
@@ -2326,8 +2362,7 @@ class KOBOTOUCH(KOBO):
 
                 try:
                     import sqlite3 as sqlite
-                    with closing(sqlite.connect(self.normalize_path(self._main_prefix +
-                        '.kobo/KoboReader.sqlite'))) as connection:
+                    with closing(sqlite.connect(self.device_database_path())) as connection:
 
                         # return bytestrings if the content cannot the decoded as unicode
                         connection.text_factory = lambda x: unicode(x, "utf-8", "ignore")
@@ -2347,7 +2382,7 @@ class KOBOTOUCH(KOBO):
                         cursor.close()
 
                     if ImageID != None:
-                        path = os.path.join(self.images_path(path), ImageID)
+                        path = self.images_path(path, ImageID)
 
                         if show_debug:
                             debug_print("KoboTouch:_upload_cover - About to loop over cover endings")
@@ -2762,6 +2797,9 @@ class KOBOTOUCH(KOBO):
     def supports_covers_on_sdcard(self):
         return self.dbversion >= self.min_dbversion_images_on_sdcard and self.fwversion >= self.min_fwversion_images_on_sdcard
 
+    def supports_images_tree(self):
+        return self.fwversion >= self.min_fwversion_images_tree
+
     def has_externalid(self):
         return self.dbversion >= self.min_dbversion_externalid
 

From 3ab5097788dff4528c222bd901455f162e141d9b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 18 Sep 2013 21:27:31 +0530
Subject: [PATCH 0826/1154] Speed up the qhash implementation

---
 src/calibre/devices/kobo/driver.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index a49e6b16e0..f93cb18ff5 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -31,19 +31,19 @@ from calibre.utils.config_base import prefs
 EPUB_EXT = '.epub'
 
 
-# Implementation of QtQHash for strings. This doesn't seem to be in the Python implemention. 
-def qhash (inputstr):
-    instr = ""
-    if isinstance (inputstr, str):
-        instr = inputstr 
-    elif isinstance (inputstr, unicode):
-        instr = inputstr.encode ("utf8")
+# Implementation of QtQHash for strings. This doesn't seem to be in the Python implementation.
+def qhash(inputstr):
+    instr = b""
+    if isinstance(inputstr, bytes):
+        instr = inputstr
+    elif isinstance(inputstr, unicode):
+        instr = inputstr.encode("utf8")
     else:
         return -1
 
     h = 0x00000000
-    for i in range (0, len (instr)):
-        h = (h << 4) + ord(instr[i])
+    for x in bytearray(instr):
+        h = (h << 4) + x
         h ^= (h & 0xf0000000) >> 23
         h &= 0x0fffffff
 
@@ -1251,7 +1251,7 @@ class KOBOTOUCH(KOBO):
 
     max_supported_fwversion         = (2,9,1)
     min_fwversion_images_on_sdcard  = (2,4,1)
-    min_fwversion_images_tree       = (2,9,0) # Cover images stored in tree under .kobo-images
+    min_fwversion_images_tree       = (2,9,0)  # Cover images stored in tree under .kobo-images
 
     has_kepubs = True
 
@@ -1764,8 +1764,8 @@ class KOBOTOUCH(KOBO):
                 bookshelves = get_bookshelvesforbook(connection, row[3])
 
                 prefix = self._card_a_prefix if oncard == 'carda' else self._main_prefix
-                changed = update_booklist(prefix, path, row[0], row[1], mime, row[2], row[3], row[5], 
-                                          row[6], row[7], row[4], row[8], row[9], row[10], row[11], 
+                changed = update_booklist(prefix, path, row[0], row[1], mime, row[2], row[3], row[5],
+                                          row[6], row[7], row[4], row[8], row[9], row[10], row[11],
                                           row[12], row[13], row[14], bookshelves)
 
                 if changed:
@@ -2042,7 +2042,7 @@ class KOBOTOUCH(KOBO):
                 if os.path.exists(fpath):
                     debug_print("KoboTouch:delete_images - Image File Exists")
                     os.unlink(fpath)
-                
+
             try:
                 os.removedirs(os.path.dirname(path))
             except:

From f59d90e68eec8af183face23c404b473ac70f819 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 18 Sep 2013 21:36:10 +0530
Subject: [PATCH 0827/1154] Fix switching to an empty virtual library not
 blanking the book details panel

---
 src/calibre/gui2/library/views.py            | 2 ++
 src/calibre/gui2/search_restriction_mixin.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 034f543429..b59cb49a11 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -763,6 +763,8 @@ class BooksView(QTableView):  # {{{
         idx = self.currentIndex()
         if idx.isValid():
             self._model.current_changed(idx, idx)
+            return True
+        return False
 
     def scrollContentsBy(self, dx, dy):
         # Needed as Qt bug causes headerview to not always update when scrolling
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 2ab5959800..05cc266cef 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -587,7 +587,8 @@ class SearchRestrictionMixin(object):
         v = self.current_view()
         if not v.currentIndex().isValid():
             v.set_current_row()
-        v.refresh_book_details()
+        if not v.refresh_book_details():
+            self.book_details.reset_info()
 
     def set_number_of_books_shown(self):
         db = self.library_view.model().db

From 4e3505087939e82d1a494fc14c7740cf207eac37 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 08:49:49 +0530
Subject: [PATCH 0828/1154] ...

---
 src/calibre/devices/prst1/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py
index 0bf1cbede8..997e9ff24c 100644
--- a/src/calibre/devices/prst1/driver.py
+++ b/src/calibre/devices/prst1/driver.py
@@ -776,7 +776,7 @@ class PRST1(USBMS):
             return False
         if not book.lpath.lower().endswith('.epub'):
             return False
-        if book.pubdate.date() < date(2010, 10, 17):
+        if book.pubdate is None or book.pubdate.date() < date(2010, 10, 17):
             return False
         return True
 

From 5d09bc1f79bb3e199a91a82cc89fd53508994803 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 09:04:02 +0530
Subject: [PATCH 0829/1154] Fix regression that broke html metadata

HTML Input: Fix a regression that broke processing of HTML files
that contain meta tags with dc: namespaced attribute values.
---
 src/calibre/ebooks/metadata/html.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/html.py b/src/calibre/ebooks/metadata/html.py
index a233eee7da..28f5ad3a0f 100644
--- a/src/calibre/ebooks/metadata/html.py
+++ b/src/calibre/ebooks/metadata/html.py
@@ -69,7 +69,15 @@ def parse_meta_tags(src):
         '<meta\s+%s\s+%s' % (cpat, npat),
     ):
         for match in re.finditer(pat, src, flags=re.IGNORECASE):
-            field = rmap[match.group('name').lower()]
+            x = match.group('name').lower()
+            try:
+                field = rmap[x]
+            except KeyError:
+                try:
+                    field = rmap[x.replace(':', '.')]
+                except KeyError:
+                    continue
+
             if field not in ans:
                 ans[field] = replace_entities(match.group('content'))
             if len(ans) == len(META_NAMES):

From 8ce8d331b682a71eacc1b1ce6f49552cb3942264 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 09:44:00 +0530
Subject: [PATCH 0830/1154] pep8

---
 src/calibre/utils/fonts/sfnt/subset.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/calibre/utils/fonts/sfnt/subset.py b/src/calibre/utils/fonts/sfnt/subset.py
index bb8b73d013..ca9964aa5f 100644
--- a/src/calibre/utils/fonts/sfnt/subset.py
+++ b/src/calibre/utils/fonts/sfnt/subset.py
@@ -19,7 +19,7 @@ from calibre.utils.fonts.sfnt.errors import UnsupportedFont, NoGlyphs
 
 def resolve_glyphs(loca, glyf, character_map, extra_glyphs):
     unresolved_glyphs = set(character_map.itervalues()) | extra_glyphs
-    unresolved_glyphs.add(0) # We always want the .notdef glyph
+    unresolved_glyphs.add(0)  # We always want the .notdef glyph
     resolved_glyphs = {}
 
     while unresolved_glyphs:
@@ -286,7 +286,8 @@ def test_mem():
     for i in xrange(calls):
         subset(raw, (), (('a', 'z'),))
     del raw
-    for i in xrange(3): gc.collect()
+    for i in xrange(3):
+        gc.collect()
     print ('Leaked memory per call:', (memory() - start_mem)/calls*1024, 'KB')
 
 def test():
@@ -344,7 +345,7 @@ def all():
             print (name, path, err)
             print()
 
-    print ('Average reduction to: %.1f%%'%( sum(averages)/len(averages)))
+    print ('Average reduction to: %.1f%%'%(sum(averages)/len(averages)))
     print('Total:', total, 'Unsupported:', len(unsupported), 'Failed:',
             len(failed), 'Warnings:', len(warnings))
 

From 46ed78b8928d40bcd76d331a6cc82380749a2bc7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 10:35:45 +0530
Subject: [PATCH 0831/1154] ...

---
 src/calibre/utils/fonts/free_type.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/fonts/free_type.py b/src/calibre/utils/fonts/free_type.py
index 980bff0f7c..b5059ea19b 100644
--- a/src/calibre/utils/fonts/free_type.py
+++ b/src/calibre/utils/fonts/free_type.py
@@ -17,7 +17,7 @@ class ThreadingViolation(Exception):
 
     def __init__(self):
         Exception.__init__(self,
-                'You cannot use the MTP driver from a thread other than the '
+                'You cannot use the freetype plugin from a thread other than the '
                 ' thread in which startup() was called')
 
 def same_thread(func):

From 1109b373a120726af7f07008ed8e8e0da110ff56 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 19 Sep 2013 07:54:44 +0200
Subject: [PATCH 0832/1154] Fix formatter function "count" to return zero for
 an empty list

---
 src/calibre/utils/formatter_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index 8fcc35e3bb..b8ff7b0387 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -589,7 +589,7 @@ class BuiltinCount(BuiltinFormatterFunction):
             'uses an ampersand. Examples: {tags:count(,)}, {authors:count(&)}')
 
     def evaluate(self, formatter, kwargs, mi, locals, val, sep):
-        return unicode(len(val.split(sep)))
+        return unicode(len([v for v in val.split(sep) if v]))
 
 class BuiltinListitem(BuiltinFormatterFunction):
     name = 'list_item'

From b075feb3d76b64dc1fba93f1aa4d750e335a14ea Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 19 Sep 2013 08:04:49 +0200
Subject: [PATCH 0833/1154] Make an uncomposed icon rule use all the icons from
 previous composed icon rules. Lets you express things like "compose icon a if
 XXX, compose icon b if YYY, icon c if ZZZ, icon d if WWW". This will result
 in categories icons a and b if their conditions match, then appended with one
 of: c if its condition matches, d if its condition matches, or nothing.

---
 src/calibre/gui2/library/models.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 36bfc97c24..182fd6866d 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -94,11 +94,9 @@ class ColumnIcon(object):  # {{{
                 if not rule_icons:
                     continue
                 icon_list = [ic.strip() for ic in rule_icons.split(':')]
+                icons.extend(icon_list)
                 if icon_list and not kind.endswith('_composed'):
-                    icons = icon_list
                     break
-                else:
-                    icons.extend(icon_list)
 
             if icons:
                 icon_string = ':'.join(icons)

From 85d09338d7de45e7055bc60d5299b05247aa7ec9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 12:03:12 +0530
Subject: [PATCH 0834/1154] Fix cmap table generation not handling contiguous
 indices

Also fix tab indentation in code imported from fonttools.
---
 src/calibre/utils/fonts/sfnt/cmap.py | 214 +++++++++++++--------------
 1 file changed, 105 insertions(+), 109 deletions(-)

diff --git a/src/calibre/utils/fonts/sfnt/cmap.py b/src/calibre/utils/fonts/sfnt/cmap.py
index 15ad1d1466..76854863ef 100644
--- a/src/calibre/utils/fonts/sfnt/cmap.py
+++ b/src/calibre/utils/fonts/sfnt/cmap.py
@@ -17,85 +17,85 @@ from calibre.utils.fonts.utils import read_bmp_prefix
 from calibre.utils.fonts.sfnt import UnknownTable, max_power_of_two
 from calibre.utils.fonts.sfnt.errors import UnsupportedFont
 
-def split_range(start_code, end_code, cmap): # {{{
-	# Try to split a range of character codes into subranges with consecutive
-	# glyph IDs in such a way that the cmap4 subtable can be stored "most"
-	# efficiently.
-	if start_code == end_code:
-		return [], [end_code]
+def split_range(start_code, end_code, cmap):  # {{{
+    # Try to split a range of character codes into subranges with consecutive
+    # glyph IDs in such a way that the cmap4 subtable can be stored "most"
+    # efficiently.
+    if start_code == end_code:
+        return [], [end_code]
 
-	last_id = cmap[start_code]
-	last_code = start_code
-	in_order = None
-	ordered_begin = None
-	sub_ranges = []
+    last_id = cmap[start_code]
+    last_code = start_code
+    in_order = None
+    ordered_begin = None
+    sub_ranges = []
 
-	# Gather subranges in which the glyph IDs are consecutive.
-	for code in range(start_code + 1, end_code + 1):
-		glyph_id = cmap[code]
+    # Gather subranges in which the glyph IDs are consecutive.
+    for code in range(start_code + 1, end_code + 1):
+        glyph_id = cmap[code]
 
-		if glyph_id - 1 == last_id:
-			if in_order is None or not in_order:
-				in_order = 1
-				ordered_begin = last_code
-		else:
-			if in_order:
-				in_order = 0
-				sub_ranges.append((ordered_begin, last_code))
-				ordered_begin = None
+        if glyph_id - 1 == last_id:
+            if in_order is None or not in_order:
+                in_order = 1
+                ordered_begin = last_code
+        else:
+            if in_order:
+                in_order = 0
+                sub_ranges.append((ordered_begin, last_code))
+                ordered_begin = None
 
-		last_id = glyph_id
-		last_code = code
+        last_id = glyph_id
+        last_code = code
 
-	if in_order:
-		sub_ranges.append((ordered_begin, last_code))
-	assert last_code == end_code
+    if in_order:
+        sub_ranges.append((ordered_begin, last_code))
+    assert last_code == end_code
 
-	# Now filter out those new subranges that would only make the data bigger.
-	# A new segment cost 8 bytes, not using a new segment costs 2 bytes per
-	# character.
-	new_ranges = []
-	for b, e in sub_ranges:
-		if b == start_code and e == end_code:
-			break  # the whole range, we're fine
-		if b == start_code or e == end_code:
-			threshold = 4  # split costs one more segment
-		else:
-			threshold = 8  # split costs two more segments
-		if (e - b + 1) > threshold:
-			new_ranges.append((b, e))
-	sub_ranges = new_ranges
+    # Now filter out those new subranges that would only make the data bigger.
+    # A new segment cost 8 bytes, not using a new segment costs 2 bytes per
+    # character.
+    new_ranges = []
+    for b, e in sub_ranges:
+        if b == start_code and e == end_code:
+            break  # the whole range, we're fine
+        if b == start_code or e == end_code:
+            threshold = 4  # split costs one more segment
+        else:
+            threshold = 8  # split costs two more segments
+        if (e - b + 1) > threshold:
+            new_ranges.append((b, e))
+    sub_ranges = new_ranges
 
-	if not sub_ranges:
-		return [], [end_code]
+    if not sub_ranges:
+        return [], [end_code]
 
-	if sub_ranges[0][0] != start_code:
-		sub_ranges.insert(0, (start_code, sub_ranges[0][0] - 1))
-	if sub_ranges[-1][1] != end_code:
-		sub_ranges.append((sub_ranges[-1][1] + 1, end_code))
+    if sub_ranges[0][0] != start_code:
+        sub_ranges.insert(0, (start_code, sub_ranges[0][0] - 1))
+    if sub_ranges[-1][1] != end_code:
+        sub_ranges.append((sub_ranges[-1][1] + 1, end_code))
 
-	# Fill the "holes" in the segments list -- those are the segments in which
-	# the glyph IDs are _not_ consecutive.
-	i = 1
-	while i < len(sub_ranges):
-		if sub_ranges[i-1][1] + 1 != sub_ranges[i][0]:
-			sub_ranges.insert(i, (sub_ranges[i-1][1] + 1, sub_ranges[i][0] - 1))
-			i = i + 1
-		i = i + 1
+    # Fill the "holes" in the segments list -- those are the segments in which
+    # the glyph IDs are _not_ consecutive.
+    i = 1
+    while i < len(sub_ranges):
+        if sub_ranges[i-1][1] + 1 != sub_ranges[i][0]:
+            sub_ranges.insert(i, (sub_ranges[i-1][1] + 1, sub_ranges[i][0] - 1))
+            i = i + 1
+        i = i + 1
 
-	# Transform the ranges into start_code/end_code lists.
-	start = []
-	end = []
-	for b, e in sub_ranges:
-		start.append(b)
-		end.append(e)
-	start.pop(0)
+    # Transform the ranges into start_code/end_code lists.
+    start = []
+    end = []
+    for b, e in sub_ranges:
+        start.append(b)
+        end.append(e)
+    start.pop(0)
 
-	assert len(start) + 1 == len(end)
-	return start, end
+    assert len(start) + 1 == len(end)
+    return start, end
 # }}}
 
-def set_id_delta(id_delta): # {{{
+def set_id_delta(id_delta):  # {{{
     # The lowest gid in glyphIndexArray, after subtracting id_delta, must be 1.
     # id_delta is a short, and must be between -32K and 32K
     # startCode can be between 0 and 64K-1, and the first glyph index can be between 1 and 64K-1
@@ -237,57 +237,53 @@ class CmapTable(UnknownTable):
             start_code = [last_code]
 
             for code in codes[1:]:
-				if code == last_code + 1:
-					last_code = code
-					continue
-				start, end = split_range(start_code[-1], last_code, cmap)
-				start_code.extend(start)
-				end_code.extend(end)
-				start_code.append(code)
-				last_code = code
-			end_code.append(last_code)
-			start_code.append(0xffff)
-			end_code.append(0xffff)
+                if code == last_code + 1:
+                    last_code = code
+                    continue
+                start, end = split_range(start_code[-1], last_code, cmap)
+                start_code.extend(start)
+                end_code.extend(end)
+                start_code.append(code)
+                last_code = code
+            end_code.append(last_code)
+            start_code.append(0xffff)
+            end_code.append(0xffff)
 
-		id_delta = []
-		id_range_offset = []
-		glyph_index_array = []
-		for i in xrange(len(end_code)-1):  # skip the closing codes (0xffff)
-			indices = []
-			for char_code in xrange(start_code[i], end_code[i] + 1):
-				indices.append(cmap[char_code])
-			if  (indices == xrange(indices[0], indices[0] + len(indices))):
-				id_delta_temp = set_id_delta(indices[0] - start_code[i])
-				id_delta.append(id_delta_temp)
-				id_range_offset.append(0)
-			else:
-				id_delta.append(0)
-				id_range_offset.append(2 * (len(end_code) +
-                    len(glyph_index_array) - i))
-				glyph_index_array.extend(indices)
-		id_delta.append(1)  # 0xffff + 1 == 0. So this end code maps to .notdef
-		id_range_offset.append(0)
+        id_delta = []
+        id_range_offset = []
+        glyph_index_array = []
+        for i in xrange(len(end_code)-1):  # skip the closing codes (0xffff)
+            indices = list(cmap[char_code] for char_code in xrange(start_code[i], end_code[i] + 1))
+            if indices == list(xrange(indices[0], indices[0] + len(indices))):
+                # indices is a contiguous list
+                id_delta_temp = set_id_delta(indices[0] - start_code[i])
+                id_delta.append(id_delta_temp)
+                id_range_offset.append(0)
+            else:
+                id_delta.append(0)
+                id_range_offset.append(2 * (len(end_code) + len(glyph_index_array) - i))
+                glyph_index_array.extend(indices)
+        id_delta.append(1)  # 0xffff + 1 == 0. So this end code maps to .notdef
+        id_range_offset.append(0)
 
-		seg_count = len(end_code)
-		max_exponent = max_power_of_two(seg_count)
-		search_range = 2 * (2 ** max_exponent)
-		entry_selector = max_exponent
-		range_shift = 2 * seg_count - search_range
+        seg_count = len(end_code)
+        max_exponent = max_power_of_two(seg_count)
+        search_range = 2 * (2 ** max_exponent)
+        entry_selector = max_exponent
+        range_shift = 2 * seg_count - search_range
 
         char_code_array = end_code + [0] + start_code
-		char_code_array = pack(b'>%dH'%len(char_code_array), *char_code_array)
-		id_delta_array = pack(b'>%dh'%len(id_delta), *id_delta)
+        char_code_array = pack(b'>%dH'%len(char_code_array), *char_code_array)
+        id_delta_array = pack(b'>%dh'%len(id_delta), *id_delta)
         rest_array = id_range_offset + glyph_index_array
         rest_array = pack(b'>%dH'%len(rest_array), *rest_array)
-		data = char_code_array + id_delta_array + rest_array
+        data = char_code_array + id_delta_array + rest_array
 
-		length = calcsize(fmt) + len(data)
-		header = pack(fmt, 4, length, 0,
-				2*seg_count, search_range, entry_selector, range_shift)
-		self.bmp_table = header + data
+        length = calcsize(fmt) + len(data)
+        header = pack(fmt, 4, length, 0, 2*seg_count, search_range, entry_selector, range_shift)
+        self.bmp_table = header + data
 
         fmt = b'>4HL'
         offset = calcsize(fmt)
-        self.raw = pack(fmt, self.version, self.num_tables, 3, 1, offset) + \
-                self.bmp_table
+        self.raw = pack(fmt, self.version, self.num_tables, 3, 1, offset) + self.bmp_table
 

From 2bd084ba23778b17175bc00d0d653528f1c7ae69 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 12:34:59 +0530
Subject: [PATCH 0835/1154] pep8

---
 src/calibre/utils/fonts/utils.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/calibre/utils/fonts/utils.py b/src/calibre/utils/fonts/utils.py
index 087c7c1da4..ec88dacae3 100644
--- a/src/calibre/utils/fonts/utils.py
+++ b/src/calibre/utils/fonts/utils.py
@@ -25,7 +25,7 @@ def is_truetype_font(raw):
 
 def get_tables(raw):
     num_tables = struct.unpack_from(b'>H', raw, 4)[0]
-    offset = 4*3 # start of the table record entries
+    offset = 4*3  # start of the table record entries
     for i in xrange(num_tables):
         table_tag, table_checksum, table_offset, table_length = struct.unpack_from(
                     b'>4s3L', raw, offset)
@@ -104,12 +104,14 @@ def decode_name_record(recs):
     Get the English names of this font. See
     http://www.microsoft.com/typography/otspec/name.htm for details.
     '''
-    if not recs: return None
+    if not recs:
+        return None
     unicode_names = {}
     windows_names = {}
     mac_names = {}
     for platform_id, encoding_id, language_id, src in recs:
-        if language_id > 0x8000: continue
+        if language_id > 0x8000:
+            continue
         if platform_id == 0:
             if encoding_id < 4:
                 try:
@@ -124,14 +126,16 @@ def decode_name_record(recs):
         elif platform_id == 2:
             codec = {0:'ascii', 1:'utf-16-be', 2:'iso-8859-1'}.get(encoding_id,
                     None)
-            if codec is None: continue
+            if codec is None:
+                continue
             try:
                 unicode_names[language_id] = src.decode(codec)
             except ValueError:
                 continue
         elif platform_id == 3:
             codec = {1:16, 10:32}.get(encoding_id, None)
-            if codec is None: continue
+            if codec is None:
+                continue
             try:
                 windows_names[language_id] = src.decode('utf-%d-be'%codec)
             except ValueError:

From ba8f9d10cad234a6ffb9b0181ce801df36509802 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 12:41:30 +0530
Subject: [PATCH 0836/1154] Conversion: Fix font subsetting not working for CJK
 fonts

---
 src/calibre/utils/fonts/sfnt/cmap.py | 4 ++--
 src/calibre/utils/fonts/utils.py     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/utils/fonts/sfnt/cmap.py b/src/calibre/utils/fonts/sfnt/cmap.py
index 76854863ef..94c13e0f68 100644
--- a/src/calibre/utils/fonts/sfnt/cmap.py
+++ b/src/calibre/utils/fonts/sfnt/cmap.py
@@ -141,7 +141,7 @@ class BMPTable(object):
                             glyph_id = self.glyph_id_map[idx]
                             if glyph_id != 0:
                                 glyph_id += self.id_delta[i]
-                        yield glyph_id % 0x1000
+                        yield glyph_id % 0x10000
                         break
             if not found:
                 yield 0
@@ -159,7 +159,7 @@ class BMPTable(object):
                     glyph_id = self.glyph_id_map[idx]
                     if glyph_id != 0:
                         glyph_id += self.id_delta[i]
-                glyph_id %= 0x1000
+                glyph_id %= 0x10000
                 if glyph_id in glyph_ids and code not in ans:
                     ans[code] = glyph_id
         return ans
diff --git a/src/calibre/utils/fonts/utils.py b/src/calibre/utils/fonts/utils.py
index ec88dacae3..7678503e7f 100644
--- a/src/calibre/utils/fonts/utils.py
+++ b/src/calibre/utils/fonts/utils.py
@@ -350,7 +350,7 @@ def get_bmp_glyph_ids(table, bmp, codes):
                         glyph_id = glyph_id_map[idx]
                         if glyph_id != 0:
                             glyph_id += id_delta[i]
-                    yield glyph_id % 0x1000
+                    yield glyph_id % 0x10000
                     break
         if not found:
             yield 0

From 2734241db949cbfc87e5803a1c4644fd9d2bd9e7 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 19 Sep 2013 13:11:05 +0200
Subject: [PATCH 0837/1154] Calibre-side code for caching metadata, to avoid
 needing to resend it from the device on each connect. The CC side code will
 go into beta test next week.

---
 .../devices/smart_device_app/driver.py        | 87 +++++++++++++++++--
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 035c613387..3b56e394a8 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -7,7 +7,7 @@ Created on 29 Jun 2012
 
 @author: charles
 '''
-import socket, select, json, os, traceback, time, sys, random
+import socket, select, json, os, traceback, time, sys, random, cPickle
 import posixpath
 import hashlib, threading
 import Queue
@@ -34,7 +34,8 @@ from calibre.library import current_library_name
 from calibre.library.server import server_config as content_server_config
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.ipc import eintr_retry_call
-from calibre.utils.config_base import tweaks
+from calibre.utils.config_base import config_dir, tweaks
+from calibre.utils.date import parse_date
 from calibre.utils.filenames import ascii_filename as sanitize, shorten_components_to
 from calibre.utils.mdns import (publish as publish_zeroconf, unpublish as
         unpublish_zeroconf, get_all_ips)
@@ -108,7 +109,7 @@ class ConnectionListener(Thread):
                         try:
                             packet = self.driver.broadcast_socket.recvfrom(100)
                             remote = packet[1]
-                            content_server_port = b'';
+                            content_server_port = b''
                             try :
                                 content_server_port = \
                                     str(content_server_config().parse().port)
@@ -680,6 +681,18 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         else:
             return None
 
+    def _metadata_in_cache(self, uuid, ext, lastmod):
+        key = uuid+ext
+        if isinstance(lastmod, unicode):
+            lastmod = parse_date(lastmod)
+#         if key in self.known_uuids:
+#             self._debug(key, lastmod, self.known_uuids[key].last_modified)
+#         else:
+#             self._debug(key, 'not in known uuids')
+        if key in self.known_uuids and self.known_uuids[key].last_modified == lastmod:
+            return self.known_uuids[key].deepcopy()
+        return None
+
     def _metadata_already_on_device(self, book):
         v = self.known_metadata.get(book.lpath, None)
         if v is not None:
@@ -701,6 +714,32 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         except:
             return None
 
+    def _read_metadata_cache(self):
+        cache_file_name = os.path.join(config_dir,
+                           'device_drivers_' + self.__class__.__name__ +
+                                '_metadata_cache.pickle')
+        if os.path.exists(cache_file_name):
+            with open(cache_file_name, mode='rb') as fd:
+                json_metadata = cPickle.load(fd)
+            for uuid,json_book in json_metadata.iteritems():
+                book = self.json_codec.raw_to_book(json_book, SDBook, self.PREFIX)
+                self.known_uuids[uuid] = book
+                lpath = book.get('lpath')
+                if lpath in self.known_metadata:
+                    self.known_uuids.pop(uuid, None)
+                else:
+                    self.known_metadata[lpath] = book
+
+    def _write_metadata_cache(self):
+        cache_file_name = os.path.join(config_dir,
+                           'device_drivers_' + self.__class__.__name__ +
+                                '_metadata_cache.pickle')
+        json_metadata = {}
+        for uuid,book in self.known_uuids.iteritems():
+            json_metadata[uuid] = self.json_codec.encode_book_metadata(book)
+        with open(cache_file_name, mode='wb') as fd:
+            cPickle.dump(json_metadata, fd)
+
     def _set_known_metadata(self, book, remove=False):
         lpath = book.lpath
         ext = os.path.splitext(lpath)[1]
@@ -721,6 +760,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             except:
                 pass
             self.device_socket = None
+            self._write_metadata_cache()
         self.is_connected = False
 
     def _attach_to_port(self, sock, port):
@@ -868,6 +908,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             self._debug('Device can receive book binary', self.client_can_stream_metadata)
             self.client_can_delete_multiple = result.get('canDeleteMultipleBooks', False)
             self._debug('Device can delete multiple books', self.client_can_delete_multiple)
+            self.client_can_use_metadata_cache = result.get('canUseCachedMetadata', False)
+            self._debug('Device can use cached metadata', self.client_can_use_metadata_cache)
 
             self.client_device_kind = result.get('deviceKind', '')
             self._debug('Client device kind', self.client_device_kind)
@@ -875,6 +917,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             self.client_device_name = result.get('deviceName', self.client_device_kind)
             self._debug('Client device name', self.client_device_name)
 
+            self.client_app_name = result.get('appName', "")
+            self._debug('Client app name', self.client_app_name)
+
             self.max_book_packet_len = result.get('maxBookContentPacketLen',
                                                   self.BASE_PACKET_LEN)
             self._debug('max_book_packet_len', self.max_book_packet_len)
@@ -933,8 +978,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             except:
                 pass
 
-            self.known_metadata = {}
-            self.known_uuids = {}
             return True
         except socket.timeout:
             self._close_device_socket()
@@ -1019,13 +1062,41 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         self._debug(oncard)
         if oncard is not None:
             return CollectionsBookList(None, None, None)
-        opcode, result = self._call_client('GET_BOOK_COUNT', {'canStream':True,
-                                                              'canScan':True})
+        opcode, result = self._call_client('GET_BOOK_COUNT',
+                            {'canStream':True,
+                             'canScan':True,
+                             'willUseCachedMetadata': self.client_can_use_metadata_cache})
         bl = CollectionsBookList(None, self.PREFIX, self.settings)
         if opcode == 'OK':
             count = result['count']
             will_stream = 'willStream' in result
             will_scan = 'willScan' in result
+            will_use_cache = self.client_can_use_metadata_cache
+
+            if will_use_cache:
+                books_on_device = {}
+                self._debug('caching. count=', count)
+                for i in range(0, count):
+                    opcode, result = self._receive_from_client(print_debug_info=False)
+                    books_on_device[result.get('uuid')] = result
+
+                books_to_send = []
+                for u,v in books_on_device.iteritems():
+                    book = self._metadata_in_cache(u, v['extension'], v['last_modified'])
+                    if book:
+                        bl.add_book(book, replace_metadata=True)
+                    else:
+                        books_to_send.append(v['priKey'])
+
+                count = len(books_to_send)
+                self._debug('caching. Need count from device', count)
+
+                self._call_client('NOOP', {'count': count},
+                                  print_debug_info=False, wait_for_response=False)
+                for priKey in books_to_send:
+                    self._call_client('NOOP', {'priKey':priKey},
+                                  print_debug_info=False, wait_for_response=False)
+
             for i in range(0, count):
                 if (i % 100) == 0:
                     self._debug('getting book metadata. Done', i, 'of', count)
@@ -1397,6 +1468,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         self.connection_queue = Queue.Queue(1)
         self.connection_listener = ConnectionListener(self)
         self.connection_listener.start()
+
+        self._read_metadata_cache()
         return message
 
     @synchronous('sync_lock')

From c480169ec507fcda265be8a141475200bc1eafb0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 19 Sep 2013 19:17:59 +0530
Subject: [PATCH 0838/1154] Use the cache dir for device metadata cache

---
 src/calibre/devices/smart_device_app/driver.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 994c4e80fd..442427e575 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -18,7 +18,7 @@ from errno import EAGAIN, EINTR
 from threading import Thread
 
 from calibre import prints
-from calibre.constants import numeric_version, DEBUG
+from calibre.constants import numeric_version, DEBUG, cache_dir
 from calibre.devices.errors import (OpenFailed, ControlError, TimeoutError,
                                     InitialConnectionError, PacketError)
 from calibre.devices.interface import DevicePlugin
@@ -34,7 +34,7 @@ from calibre.library import current_library_name
 from calibre.library.server import server_config as content_server_config
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.ipc import eintr_retry_call
-from calibre.utils.config_base import config_dir, tweaks
+from calibre.utils.config_base import tweaks
 from calibre.utils.date import parse_date
 from calibre.utils.filenames import ascii_filename as sanitize, shorten_components_to
 from calibre.utils.mdns import (publish as publish_zeroconf, unpublish as
@@ -715,7 +715,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             return None
 
     def _read_metadata_cache(self):
-        cache_file_name = os.path.join(config_dir,
+        cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +
                                 '_metadata_cache.pickle')
         if os.path.exists(cache_file_name):
@@ -731,7 +731,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                     self.known_metadata[lpath] = book
 
     def _write_metadata_cache(self):
-        cache_file_name = os.path.join(config_dir,
+        cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +
                                 '_metadata_cache.pickle')
         json_metadata = {}

From d99c4fea8c3c37731d3c78ca8824b667473fef2e Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Thu, 19 Sep 2013 16:46:32 +0200
Subject: [PATCH 0839/1154] Add in the stuff to age the smart device book
 cache, to avoid requiring conversion later.

---
 .../devices/smart_device_app/driver.py        | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 442427e575..84cf7ed6f0 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -9,6 +9,7 @@ Created on 29 Jun 2012
 '''
 import socket, select, json, os, traceback, time, sys, random, cPickle
 import posixpath
+from collections import defaultdict
 import hashlib, threading
 import Queue
 
@@ -35,7 +36,7 @@ from calibre.library.server import server_config as content_server_config
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.ipc import eintr_retry_call
 from calibre.utils.config_base import tweaks
-from calibre.utils.date import parse_date
+from calibre.utils.date import parse_date, now, isoformat
 from calibre.utils.filenames import ascii_filename as sanitize, shorten_components_to
 from calibre.utils.mdns import (publish as publish_zeroconf, unpublish as
         unpublish_zeroconf, get_all_ips)
@@ -370,7 +371,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
 
     # copied from USBMS. Perhaps this could be a classmethod in usbms?
     def _update_driveinfo_record(self, dinfo, prefix, location_code, name=None):
-        from calibre.utils.date import isoformat, now
         import uuid
         if not isinstance(dinfo, dict):
             dinfo = {}
@@ -689,8 +689,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
 #             self._debug(key, lastmod, self.known_uuids[key].last_modified)
 #         else:
 #             self._debug(key, 'not in known uuids')
-        if key in self.known_uuids and self.known_uuids[key].last_modified == lastmod:
-            return self.known_uuids[key].deepcopy()
+        if key in self.known_uuids and self.known_uuids[key]['book'].last_modified == lastmod:
+            self.known_uuids[key]['last_used'] = now()
+            return self.known_uuids[key]['book'].deepcopy()
         return None
 
     def _metadata_already_on_device(self, book):
@@ -710,7 +711,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
 
     def _uuid_already_on_device(self, uuid, ext):
         try:
-            return self.known_uuids.get(uuid + ext, None)
+            return self.known_uuids[uuid + ext]['book']
         except:
             return None
 
@@ -722,8 +723,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             with open(cache_file_name, mode='rb') as fd:
                 json_metadata = cPickle.load(fd)
             for uuid,json_book in json_metadata.iteritems():
-                book = self.json_codec.raw_to_book(json_book, SDBook, self.PREFIX)
-                self.known_uuids[uuid] = book
+                book = self.json_codec.raw_to_book(json_book['book'], SDBook, self.PREFIX)
+                self.known_uuids[uuid]['book'] = book
+                self.known_uuids[uuid]['last_used'] = json_book['last_used']
                 lpath = book.get('lpath')
                 if lpath in self.known_metadata:
                     self.known_uuids.pop(uuid, None)
@@ -734,9 +736,10 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +
                                 '_metadata_cache.pickle')
-        json_metadata = {}
+        json_metadata = defaultdict(dict)
         for uuid,book in self.known_uuids.iteritems():
-            json_metadata[uuid] = self.json_codec.encode_book_metadata(book)
+            json_metadata[uuid]['book'] = self.json_codec.encode_book_metadata(book['book'])
+            json_metadata[uuid]['last_used'] = book['last_used']
         with open(cache_file_name, mode='wb') as fd:
             cPickle.dump(json_metadata, fd, -1)
 
@@ -744,14 +747,18 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         lpath = book.lpath
         ext = os.path.splitext(lpath)[1]
         uuid = book.get('uuid', None)
+        key = None
+        if uuid and ext:
+            key = uuid + ext
         if remove:
             self.known_metadata.pop(lpath, None)
-            if uuid and ext:
-                self.known_uuids.pop(uuid+ext, None)
+            if key:
+                self.known_uuids.pop(key, None)
         else:
             new_book = self.known_metadata[lpath] = book.deepcopy()
-            if uuid and ext:
-                self.known_uuids[uuid+ext] = new_book
+            if key:
+                self.known_uuids[key]['book'] = new_book
+                self.known_uuids[key]['last_used'] = now()
 
     def _close_device_socket(self):
         if self.device_socket is not None:
@@ -1359,7 +1366,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         self.device_socket = None
         self.json_codec = JsonCodec()
         self.known_metadata = {}
-        self.known_uuids = {}
+        self.known_uuids = defaultdict(dict)
         self.debug_time = time.time()
         self.debug_start_time = time.time()
         self.max_book_packet_len = 0

From d8fef25259a1365c3bf454247731dadfccdf58b1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Sep 2013 08:59:23 +0530
Subject: [PATCH 0840/1154] version 1.4

---
 Changelog.yaml           | 65 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 336746bc42..0f86ac4453 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,71 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.4.0
+  date: 2013-09-20
+
+  new features:
+    - title: "Column icons: Allow the use of multiple icons with column icon rules."
+      description: "You can now have column icon rules display multiple icons in a single column, side by side. There are two ways to do this, either specify multiple icons when creating the rule, or create multiple rules that match the same book and specify the icon type to be 'composed' for every rule. See Preferences->Look & Feel->Column icons for details."
+
+    - title: "Kobo driver: Add support for new cover handling in Kobo Aura with updated firmware"
+
+    - title: "Driver for Icarus Essence"
+      tickets: [1226304] 
+
+    - title: "Show a warning when attempting to copy books between libraries that do no have the same set of custom columns."
+      tickets: [1225484]
+
+    - title: "EPUB/AZW3 Output: Use shorthand forms for margin, padding and border CSS properties, where possible"
+
+    - title: "Allow colons in identifier values, needed for using URIs as identifiers"
+      tickets: [1224885]
+
+    - title: "Comments editor: Allow treating arbitrary URLs as images"
+
+    - title: "Show full path of library under mouse in status bar when switching/renaming/deleting libraries via the calibre library button."
+      tickets: [1224925]
+
+    - title: "DOCX Input: Add support for embedded EMF images that are just wrappers around an actual raster image."
+      tickets: [1224849]
+ 
+  bug fixes:
+    - title: "Conversion: Fix font subsetting not working for large fonts with more than 4000 glyphs, such as CJK fonts"
+
+    - title: "HTML Input: Fix a regression that broke processing of HTML files that contain meta tags with dc: namespaced attribute values."
+
+    - title: "Fix switching to an empty virtual library not blanking the book details panel"
+
+    - title: "Keep position when deleting tags in the tag editor"
+      tickets: [1226093]
+
+    - title: "Book details panel: Render custom comments fields the same as the builtin comments field. In particular this fixes problems caused by wide text and images in custom comments fields."
+      tickets: [1226350]
+
+    - title: "Metadata jackets: Do not error out when using a custom template with some custom fields that are not present."
+      tickets: [1225357]
+
+    - title: "AZW3 Output: Dont choke on invalid (undecodable) links in the input document"
+
+    - title: "Cover grid: Respect the double click on library view tweak"
+
+    - title: "Fix covers set by drag and drop or pasting in the edit metadata dialog showing compression artifacts due to aggressive jpeg compression"
+
+    - title: "Conversion: Fix a bug that could cause incorrect border values to be used when cascading, shorthand border CSS is present."
+
+    - title: "Fix regression in 1.3 that caused the book list to not track the current book when using Next/Previous in the edit metadata dialog."
+
+  improved recipes:
+    - Liberation
+    - Politika
+
+  new recipes:
+    - title: Sage News 
+      author: Brian Hahn
+
+    - title: Il Cambiamento 
+      author: ghib9
+
 - version: 1.3.0
   date: 2013-09-13
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index f15d4ffe18..e01584c386 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 3, 0)
+numeric_version = (1, 4, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From ab2b4d4abc6accd6057cf76f14c13ccdecb90636 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Sep 2013 11:37:47 +0530
Subject: [PATCH 0841/1154] When ejecting a device from the OS fails, do not
 think that the device is still connected when performing various GUI actions,
 such as deleting books.

---
 src/calibre/gui2/actions/delete.py | 9 ++++-----
 src/calibre/gui2/device.py         | 4 ++++
 src/calibre/gui2/tools.py          | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py
index 178d94a477..ab5e52d69c 100644
--- a/src/calibre/gui2/actions/delete.py
+++ b/src/calibre/gui2/actions/delete.py
@@ -19,7 +19,7 @@ from calibre.utils.recycle_bin import can_recycle
 
 single_shot = partial(QTimer.singleShot, 10)
 
-class MultiDeleter(QObject): # {{{
+class MultiDeleter(QObject):  # {{{
 
     def __init__(self, gui, ids, callback):
         from calibre.gui2.dialogs.progress import ProgressDialog
@@ -256,7 +256,7 @@ class DeleteAction(InterfaceAction):
             self.gui.tags_view.recount()
 
     def remove_matching_books_from_device(self, *args):
-        if not self.gui.device_manager.is_device_connected:
+        if not self.gui.device_manager.is_device_present:
             d = error_dialog(self.gui, _('Cannot delete books'),
                              _('No device is connected'))
             d.exec_()
@@ -264,7 +264,7 @@ class DeleteAction(InterfaceAction):
         ids = self._get_selected_ids()
         if not ids:
             #_get_selected_ids shows a dialog box if nothing is selected, so we
-            #do not need to show one here
+            # do not need to show one here
             return
         to_delete = {}
         some_to_delete = False
@@ -305,7 +305,6 @@ class DeleteAction(InterfaceAction):
         self.gui.library_view.model().current_changed(self.gui.library_view.currentIndex(),
                 self.gui.library_view.currentIndex())
 
-
     def library_ids_deleted(self, ids_deleted, current_row=None):
         view = self.gui.library_view
         for v in (self.gui.memory_view, self.gui.card_a_view, self.gui.card_b_view):
@@ -332,7 +331,7 @@ class DeleteAction(InterfaceAction):
     def do_library_delete(self, to_delete_ids):
         view = self.gui.current_view()
         # Ask the user if they want to delete the book from the library or device if it is in both.
-        if self.gui.device_manager.is_device_connected:
+        if self.gui.device_manager.is_device_present:
             on_device = False
             on_device_ids = self._get_selected_ids()
             for id in on_device_ids:
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index d97d44381e..ef7e3665de 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -166,6 +166,10 @@ class DeviceManager(Thread): # {{{
     def is_device_connected(self):
         return self.connected_device is not None
 
+    @property
+    def is_device_present(self):
+        return self.connected_device is not None and self.connected_device not in self.ejected_devices
+
     @property
     def device(self):
         return self.connected_device
diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py
index 25a925ffbb..021891b7ac 100644
--- a/src/calibre/gui2/tools.py
+++ b/src/calibre/gui2/tools.py
@@ -318,7 +318,7 @@ def generate_catalog(parent, dbspec, ids, device_manager, db):  # {{{
     # Profile the connected device
     # Parallel initialization in calibre.library.cli:command_catalog()
     connected_device = {
-                         'is_device_connected': device_manager.is_device_connected,
+                         'is_device_connected': device_manager.is_device_present,
                          'kind': device_manager.connected_device_kind,
                          'name': None,
                          'save_template': None,
@@ -326,7 +326,7 @@ def generate_catalog(parent, dbspec, ids, device_manager, db):  # {{{
                          'storage': None
                        }
 
-    if device_manager.is_device_connected:
+    if device_manager.is_device_present:
         device = device_manager.device
         connected_device['name'] = device.get_gui_name()
         try:

From 7105cc905bdb17534bca43609d45aefaa61f70b3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Sep 2013 11:37:54 +0530
Subject: [PATCH 0842/1154] ...

---
 Changelog.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 0f86ac4453..345ce8762f 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -32,7 +32,7 @@
     - title: "Driver for Icarus Essence"
       tickets: [1226304] 
 
-    - title: "Show a warning when attempting to copy books between libraries that do no have the same set of custom columns."
+    - title: "Show a warning when attempting to copy books between libraries that do not have the same set of custom columns."
       tickets: [1225484]
 
     - title: "EPUB/AZW3 Output: Use shorthand forms for margin, padding and border CSS properties, where possible"

From b728d6c40a2ab3090cd079eef49b7a9a5792c61a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Sep 2013 21:09:46 +0530
Subject: [PATCH 0843/1154] Add instructions to remove saved conv settings in
 bulk

---
 manual/conversion.rst | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/manual/conversion.rst b/manual/conversion.rst
index 2387fe915a..46f8bcd3a0 100644
--- a/manual/conversion.rst
+++ b/manual/conversion.rst
@@ -537,25 +537,38 @@ Set the :guilabel:`Level 1 TOC` setting to ``//h:h2``. Then, for chapter two, |a
 How options are set/saved for Conversion
 -------------------------------------------
 
-There are two places where conversion options can be set in |app|. The first is in Preferences->Conversion. These
-settings are the defaults for the conversion options. Whenever you try to convert a new book, the settings set here
-will be used by default.
+There are two places where conversion options can be set in |app|. The first is
+in Preferences->Conversion. These settings are the defaults for the conversion
+options. Whenever you try to convert a new book, the settings set here will be
+used by default.
 
-You can also change settings in the conversion dialog for each book conversion. When you convert a book, |app| remembers the
-settings you used for that book, so that if you convert it again, the saved settings for the individual book will take
-precedence over the defaults set in Preferences. You can restore the individual settings to defaults by using the Restore to defaults
-button in the individual book conversion dialog.
+You can also change settings in the conversion dialog for each book conversion.
+When you convert a book, |app| remembers the settings you used for that book,
+so that if you convert it again, the saved settings for the individual book
+will take precedence over the defaults set in Preferences. You can restore the
+individual settings to defaults by using the Restore to defaults button in the
+individual book conversion dialog. You can remove the saved settings for a
+group of books by selecting all the books and then clicking the edit metadata
+button to bring up the bulk metadata edit dialog, near the bottom of the dialog
+is an option to remove stored conversion settings.
 
-When you Bulk Convert a set of books, settings are taken in the following order:
+When you Bulk Convert a set of books, settings are taken in the following order (last one wins):
+
+    * From the defaults set in Preferences->Conversion 
+
+    * From the saved conversion settings for each book being converted (if
+      any). This can be turned off by the option in the top left corner of the
+      Bulk Conversion dialog.  
 
-    * From the defaults set in Preferences->Conversion
-    * From the saved conversion settings for each book being converted (if any). This can be turned off by the option in the top left corner of the Bulk Conversion dialog.
     * From the settings set in the Bulk conversion dialog
 
-Note that the final settings for each book in a Bulk Conversion will be saved and re-used if the book is converted again. Since the
-highest priority in Bulk Conversion is given to the settings in the Bulk Conversion dialog, these will override any book specific
-settings. So you should only bulk convert books together that need similar settings. The exceptions are metadata and input format specific 
-settings. Since the Bulk Conversion dialog does not have settings for these two categories, they will be taken from book specific
+Note that the final settings for each book in a Bulk Conversion will be saved
+and re-used if the book is converted again. Since the highest priority in Bulk
+Conversion is given to the settings in the Bulk Conversion dialog, these will
+override any book specific settings. So you should only bulk convert books
+together that need similar settings. The exceptions are metadata and input
+format specific settings. Since the Bulk Conversion dialog does not have
+settings for these two categories, they will be taken from book specific
 settings (if any) or the defaults. 
 
 .. note::

From b839a2b1036eed447c167df3f0722f8179310bca Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 20 Sep 2013 18:37:42 +0200
Subject: [PATCH 0844/1154] Fix longstanding bug in metadata deepcopy.

---
 src/calibre/ebooks/metadata/book/base.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index ab0b9f649a..f5c5d9adaa 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -185,10 +185,11 @@ class Metadata(object):
         return key in object.__getattribute__(self, '_data')
 
     def deepcopy(self):
-        ''' Do not use this method unless you know what you are doing, if you want to create a simple clone of
-        this object, use :meth:`deepcopy_metadata` instead. '''
+        ''' Do not use this method unless you know what you are doing, if you
+        want to create a simple clone of this object, use :meth:`deepcopy_metadata`
+        instead. '''
         m = Metadata(None)
-        m.__dict__ = copy.deepcopy(self.__dict__)
+        object.__setattr__(m, '__dict__', copy.deepcopy(self.__dict__))
         object.__setattr__(m, '_data', copy.deepcopy(object.__getattribute__(self, '_data')))
         return m
 

From 1a2371ffe36d9db8c4d46f1ffa79c412ce7dce80 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 20 Sep 2013 19:05:59 +0200
Subject: [PATCH 0845/1154] Works, and made it substantially faster too.

---
 src/calibre/ebooks/metadata/book/base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index f5c5d9adaa..5c4526a7ab 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -190,7 +190,6 @@ class Metadata(object):
         instead. '''
         m = Metadata(None)
         object.__setattr__(m, '__dict__', copy.deepcopy(self.__dict__))
-        object.__setattr__(m, '_data', copy.deepcopy(object.__getattribute__(self, '_data')))
         return m
 
     def deepcopy_metadata(self):

From 3d3cb1fdb9d2e516cc6e9208ae2a65293f27b8fc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 21 Sep 2013 07:52:27 +0530
Subject: [PATCH 0846/1154] ...

---
 setup/file_hosting_servers.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index 907e88553f..e7c5f8d216 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -40,6 +40,8 @@ Copy over /etc/nginx/sites-available/default from another file server. When
 copying, remember to use cat instead of cp to preserve hardlinks (the file is a
 hardlink to /etc/nginx/sites-enabled/default)
 
+Also copy over /etc/nginx/mime.types
+
 rsync /srv from another file server
 
 service nginx start

From ae1d2874d87f91237febed395a14833bdbc6d66b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 21 Sep 2013 08:15:07 +0530
Subject: [PATCH 0847/1154] Handle yet another amazon website change

---
 src/calibre/ebooks/metadata/sources/amazon.py | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 44241f5c10..4c8990ff66 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -748,6 +748,16 @@ class Amazon(Source):
             mi.tags = list(map(fixcase, mi.tags))
         mi.isbn = check_isbn(mi.isbn)
 
+    def get_website_domain(self, domain):
+        udomain = domain
+        if domain == 'uk':
+            udomain = 'co.uk'
+        elif domain == 'jp':
+            udomain = 'co.jp'
+        elif domain == 'br':
+            udomain = 'com.br'
+        return udomain
+
     def create_query(self, log, title=None, authors=None, identifiers={},  # {{{
             domain=None):
         from urllib import urlencode
@@ -803,14 +813,7 @@ class Amazon(Source):
         encoded_q = dict([(x.encode(encode_to, 'ignore'), y.encode(encode_to,
             'ignore')) for x, y in
             q.iteritems()])
-        udomain = domain
-        if domain == 'uk':
-            udomain = 'co.uk'
-        elif domain == 'jp':
-            udomain = 'co.jp'
-        elif domain == 'br':
-            udomain = 'com.br'
-        url = 'http://www.amazon.%s/s/?'%udomain + urlencode(encoded_q)
+        url = 'http://www.amazon.%s/s/?'%self.get_website_domain(domain) + urlencode(encoded_q)
         return url, domain
 
     # }}}
@@ -828,7 +831,7 @@ class Amazon(Source):
         return url
     # }}}
 
-    def parse_results_page(self, root):  # {{{
+    def parse_results_page(self, root, domain):  # {{{
         from lxml.html import tostring
 
         matches = []
@@ -851,7 +854,10 @@ class Amazon(Source):
             for a in links:
                 title = tostring(a, method='text', encoding=unicode)
                 if title_ok(title):
-                    matches.append(a.get('href'))
+                    url = a.get('href')
+                    if url.startswith('/'):
+                        url = 'http://www.amazon.%s%s' % (self.get_website_domain(domain), url)
+                    matches.append(url)
                 break
 
         if not matches:
@@ -862,7 +868,10 @@ class Amazon(Source):
                 for a in td.xpath(r'descendant::td[@class="dataColumn"]/descendant::a[@href]/span[@class="srTitle"]/..'):
                     title = tostring(a, method='text', encoding=unicode)
                     if title_ok(title):
-                        matches.append(a.get('href'))
+                        url = a.get('href')
+                        if url.startswith('/'):
+                            url = 'http://www.amazon.%s%s' % (self.get_website_domain(domain), url)
+                        matches.append(url)
                     break
 
         # Keep only the top 5 matches as the matches are sorted by relevance by
@@ -938,7 +947,7 @@ class Amazon(Source):
                     found = False
 
         if found:
-            matches = self.parse_results_page(root)
+            matches = self.parse_results_page(root, domain)
 
         if abort.is_set():
             return

From 8b820767d08c8be0b8161b2542506f6472277b4a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 21 Sep 2013 11:21:47 +0530
Subject: [PATCH 0848/1154] Windows: Improved device ejection code

Eject individual drives before trying to eject the device. Hopefully,
this fixes incomplete ejection with the Nook devices.
---
 setup/installer/windows/eject.c     | 423 ++++++++++++++++++++++++++++
 setup/installer/windows/freeze.py   |  35 ++-
 src/calibre/devices/usbms/device.py |   7 +-
 3 files changed, 457 insertions(+), 8 deletions(-)
 create mode 100644 setup/installer/windows/eject.c

diff --git a/setup/installer/windows/eject.c b/setup/installer/windows/eject.c
new file mode 100644
index 0000000000..dcff769ad3
--- /dev/null
+++ b/setup/installer/windows/eject.c
@@ -0,0 +1,423 @@
+/*
+ * eject.c
+ * Copyright (C) 2013 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the GPL3 license.
+ */
+
+#include "Windows.h"
+#include <stdio.h>
+#include <wchar.h>
+#include <winioctl.h>
+#include <setupapi.h>
+#include <devguid.h>
+#include <cfgmgr32.h>
+
+#define BUFSIZE 4096
+#define LOCK_TIMEOUT        10000       // 10 Seconds
+#define LOCK_RETRIES        20
+
+#define BOOL2STR(x) ((x) ? L"True" : L"False")
+
+// Error handling {{{
+
+static void show_error(LPCWSTR msg) {
+    MessageBeep(MB_ICONERROR);
+    MessageBoxW(NULL, msg, L"Error", MB_OK|MB_ICONERROR);
+}
+
+static void show_detailed_error(LPCWSTR preamble, LPCWSTR msg, int code) {
+    LPWSTR buf;
+    buf = (LPWSTR)LocalAlloc(LMEM_ZEROINIT, sizeof(WCHAR)*
+            (wcslen(msg) + wcslen(preamble) + 80));
+
+    _snwprintf_s(buf, 
+        LocalSize(buf) / sizeof(WCHAR), _TRUNCATE,
+        L"%s\r\n  %s (Error Code: %d)\r\n",
+        preamble, msg, code);
+
+    show_error(buf);
+    LocalFree(buf);
+}
+
+static void print_detailed_error(LPCWSTR preamble, LPCWSTR msg, int code) {
+    fwprintf_s(stderr, L"%s\r\n %s (Error Code: %d)\r\n", preamble, msg, code);
+    fflush(stderr);
+}
+
+static void show_last_error_crt(LPCWSTR preamble) {
+    WCHAR buf[BUFSIZE];
+    int err = 0;
+
+    _get_errno(&err);
+    _wcserror_s(buf, BUFSIZE, err);
+    show_detailed_error(preamble, buf, err);
+}
+
+static void show_last_error(LPCWSTR preamble) {
+    WCHAR *msg = NULL;
+    DWORD dw = GetLastError(); 
+
+    FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+        FORMAT_MESSAGE_FROM_SYSTEM |
+        FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL,
+        dw,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        (LPWSTR)&msg,
+        0, NULL );
+
+    show_detailed_error(preamble, msg, (int)dw);
+}
+
+static void print_last_error(LPCWSTR preamble) {
+    WCHAR *msg = NULL;
+    DWORD dw = GetLastError(); 
+
+    FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+        FORMAT_MESSAGE_FROM_SYSTEM |
+        FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL,
+        dw,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        (LPWSTR)&msg,
+        0, NULL );
+
+    print_detailed_error(preamble, msg, (int)dw);
+}
+
+// }}}
+ 
+static void print_help() {
+    fwprintf_s(stderr, L"Usage: calibre-eject.exe drive-letter1 [drive-letter2 drive-letter3 ...]");
+}
+
+static LPWSTR root_path = L"X:\\", device_path = L"X:", volume_access_path = L"\\\\.\\X:";
+static wchar_t dos_device_name[MAX_PATH];
+static UINT drive_type = 0;
+static long device_number = -1;
+static DEVINST dev_inst = 0, dev_inst_parent = 0;
+
+// Unmount and eject volumes (drives) {{{
+static HANDLE open_volume(wchar_t drive_letter) {
+    DWORD access_flags;
+
+    switch(drive_type) {
+        case DRIVE_REMOVABLE:
+            access_flags = GENERIC_READ | GENERIC_WRITE;
+            break;
+        case DRIVE_CDROM:
+            access_flags = GENERIC_READ;
+            break;
+        default:
+            fwprintf_s(stderr, L"Cannot eject %c: Drive type is incorrect.\r\n", drive_letter);
+            fflush(stderr);
+            return INVALID_HANDLE_VALUE;
+    }
+
+    return CreateFileW(volume_access_path, access_flags,
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
+                        NULL, OPEN_EXISTING, 0, NULL);
+}
+
+static BOOL lock_volume(HANDLE volume) {
+    DWORD bytes_returned;
+    DWORD sleep_amount = LOCK_TIMEOUT / LOCK_RETRIES;
+    int try_count;
+
+    // Do this in a loop until a timeout period has expired
+    for (try_count = 0; try_count < LOCK_RETRIES; try_count++) {
+        if (DeviceIoControl(volume,
+                            FSCTL_LOCK_VOLUME,
+                            NULL, 0,
+                            NULL, 0,
+                            &bytes_returned,
+                            NULL))
+            return TRUE;
+
+        Sleep(sleep_amount);
+    }
+
+    return FALSE;
+}
+
+static BOOL dismount_volume(HANDLE volume) {
+    DWORD bytes_returned;
+
+    return DeviceIoControl( volume,
+                            FSCTL_DISMOUNT_VOLUME,
+                            NULL, 0,
+                            NULL, 0,
+                            &bytes_returned,
+                            NULL);
+}
+
+static BOOL disable_prevent_removal_of_volume(HANDLE volume) {
+    DWORD bytes_returned;
+    PREVENT_MEDIA_REMOVAL PMRBuffer;
+
+    PMRBuffer.PreventMediaRemoval = FALSE;
+
+    return DeviceIoControl( volume,
+                            IOCTL_STORAGE_MEDIA_REMOVAL,
+                            &PMRBuffer, sizeof(PREVENT_MEDIA_REMOVAL),
+                            NULL, 0,
+                            &bytes_returned,
+                            NULL);
+}
+
+static BOOL auto_eject_volume(HANDLE volume) {
+    DWORD bytes_returned;
+
+    return DeviceIoControl( volume,
+                            IOCTL_STORAGE_EJECT_MEDIA,
+                            NULL, 0,
+                            NULL, 0,
+                            &bytes_returned,
+                            NULL);
+}
+
+static BOOL unmount_drive(wchar_t drive_letter, BOOL *remove_safely, BOOL *auto_eject) {
+    // Unmount the drive identified by drive_letter. Code adapted from:
+    // http://support.microsoft.com/kb/165721
+    HANDLE volume;
+    *remove_safely = FALSE; *auto_eject = FALSE;
+
+    volume = open_volume(drive_letter);
+    if (volume == INVALID_HANDLE_VALUE) return FALSE;
+
+    // Lock and dismount the volume.
+    if (lock_volume(volume) && dismount_volume(volume)) {
+        *remove_safely = TRUE;
+
+        // Set prevent removal to false and eject the volume.
+        if (disable_prevent_removal_of_volume(volume) && auto_eject_volume(volume))
+            *auto_eject = TRUE;
+    }
+    CloseHandle(volume);
+    return TRUE;
+
+}
+// }}}
+
+// Eject USB device {{{
+static void get_device_number(wchar_t drive_letter) {
+    HANDLE volume;
+    DWORD bytes_returned = 0;
+    STORAGE_DEVICE_NUMBER sdn;
+
+    volume = CreateFileW(volume_access_path, 0,
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
+                        NULL, OPEN_EXISTING, 0, NULL);
+    if (volume == INVALID_HANDLE_VALUE) {
+        print_last_error(L"Failed to open volume while getting device number");
+        return;
+    }
+
+    if (DeviceIoControl(volume,
+                        IOCTL_STORAGE_GET_DEVICE_NUMBER,
+                        NULL, 0, &sdn, sizeof(sdn),
+                        &bytes_returned, NULL)) 
+        device_number = sdn.DeviceNumber;
+    CloseHandle(volume);
+}
+
+static DEVINST get_dev_inst_by_device_number(long device_number, UINT drive_type, LPWSTR dos_device_name) {
+    GUID *guid;
+    HDEVINFO dev_info;
+    DWORD index, bytes_returned;
+    BOOL bRet, is_floppy;
+    BYTE Buf[1024];
+    PSP_DEVICE_INTERFACE_DETAIL_DATA pspdidd;
+    long res;
+    HANDLE drive;
+    STORAGE_DEVICE_NUMBER sdn;
+    SP_DEVICE_INTERFACE_DATA spdid;
+    SP_DEVINFO_DATA spdd;
+    DWORD size;
+
+    is_floppy = (wcsstr(dos_device_name, L"\\Floppy") != NULL); // is there a better way?
+
+    switch (drive_type) {
+        case DRIVE_REMOVABLE:
+            guid = ( (is_floppy) ? (GUID*)&GUID_DEVINTERFACE_FLOPPY : (GUID*)&GUID_DEVINTERFACE_DISK );
+            break;
+        case DRIVE_FIXED:
+            guid = (GUID*)&GUID_DEVINTERFACE_DISK;
+            break;
+        case DRIVE_CDROM:
+            guid = (GUID*)&GUID_DEVINTERFACE_CDROM;
+            break;
+        default:
+            fwprintf_s(stderr, L"Invalid drive type at line: %d\r\n", __LINE__);
+            fflush(stderr);
+            return 0;
+    }
+
+    // Get device interface info set handle
+    // for all devices attached to system
+    dev_info = SetupDiGetClassDevs(guid, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+
+    if (dev_info == INVALID_HANDLE_VALUE)  {
+        fwprintf_s(stderr, L"Failed to setup class devs at line: %d\r\n", __LINE__);
+        fflush(stderr);
+        return 0;
+    }
+
+    // Retrieve a context structure for a device interface
+    // of a device information set.
+    index = 0;
+    bRet = FALSE;
+
+    pspdidd =  (PSP_DEVICE_INTERFACE_DETAIL_DATA)Buf;
+    spdid.cbSize = sizeof(spdid);
+
+    while ( TRUE )  {
+        bRet = SetupDiEnumDeviceInterfaces(dev_info, NULL,
+            guid, index, &spdid);
+        if ( !bRet )  break;
+
+        size = 0;
+        SetupDiGetDeviceInterfaceDetail(dev_info,
+        &spdid, NULL, 0, &size, NULL);
+
+        if ( size!=0 && size<=sizeof(Buf) ) {
+        pspdidd->cbSize = sizeof(*pspdidd); // 5 Bytes!
+
+        ZeroMemory((PVOID)&spdd, sizeof(spdd));
+        spdd.cbSize = sizeof(spdd);
+
+        res = SetupDiGetDeviceInterfaceDetail(dev_info, &spdid, pspdidd, size, &size, &spdd);
+        if ( res ) {
+            drive = CreateFile(pspdidd->DevicePath,0,
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
+                        NULL, OPEN_EXISTING, 0, NULL);
+            if ( drive != INVALID_HANDLE_VALUE ) {
+            bytes_returned = 0;
+            res = DeviceIoControl(drive,
+                            IOCTL_STORAGE_GET_DEVICE_NUMBER,
+                            NULL, 0, &sdn, sizeof(sdn),
+                            &bytes_returned, NULL);
+            if ( res ) {
+                if ( device_number == (long)sdn.DeviceNumber ) {
+                CloseHandle(drive);
+                SetupDiDestroyDeviceInfoList(dev_info);
+                return spdd.DevInst;
+                }
+            }
+            CloseHandle(drive);
+            }
+        }
+        }
+        index++;
+    }
+
+    SetupDiDestroyDeviceInfoList(dev_info);
+    fwprintf_s(stderr, L"Invalid device number at line: %d\r\n", __LINE__);
+    fflush(stderr);
+
+    return 0;
+}
+
+
+static void get_parent_device(wchar_t drive_letter) {
+    get_device_number(drive_letter);
+    if (device_number == -1) return;
+    if (QueryDosDeviceW(device_path, dos_device_name, MAX_PATH) == 0) {
+        print_last_error(L"Failed to query DOS device name");
+        return;
+    }
+
+    dev_inst = get_dev_inst_by_device_number(device_number,
+                  drive_type, dos_device_name);
+    if (dev_inst == 0) {
+        fwprintf_s(stderr, L"Failed to get device by device number");
+        fflush(stderr);
+        return;
+    }
+    if (CM_Get_Parent(&dev_inst_parent, dev_inst, 0) != CR_SUCCESS) {
+        fwprintf_s(stderr, L"Failed to get device parent from CM");
+        fflush(stderr);
+        return;
+    }
+}
+
+static int eject_device() {
+    int tries;
+    CONFIGRET res;
+    PNP_VETO_TYPE VetoType;
+    WCHAR VetoNameW[MAX_PATH];
+    BOOL success;
+
+    for ( tries = 0; tries < 3; tries++ ) {
+        VetoNameW[0] = 0;
+
+        res = CM_Request_Device_EjectW(dev_inst_parent,
+                &VetoType, VetoNameW, MAX_PATH, 0);
+
+        success = (res==CR_SUCCESS &&
+                            VetoType==PNP_VetoTypeUnknown);
+        if ( success )  {
+            break;
+        }
+
+        Sleep(500); // required to give the next tries a chance!
+    }
+    if (!success) {
+        fwprintf_s(stderr, L"CM_Request_Device_Eject failed after three tries\r\n");
+        fflush(stderr);
+    }
+        
+    return (success) ? 0 : 1;
+}
+
+// }}}
+
+int wmain(int argc, wchar_t *argv[ ]) {
+    int i = 0;
+    wchar_t drive_letter;
+    BOOL remove_safely, auto_eject;
+
+    // Validate command line arguments
+    if (argc < 2) { print_help(); return 1; }
+    for (i = 1; i < argc; i++) {
+        if (wcsnlen_s(argv[i], 2) != 1) { print_help(); return 1; }
+    }
+
+    // Unmount all mounted volumes and eject volume media
+    for (i = 1; i < argc; i++) {
+        drive_letter = *argv[i];
+        root_path[0] = drive_letter;
+        device_path[0] = drive_letter;
+        volume_access_path[4] = drive_letter;
+        drive_type = GetDriveTypeW(root_path);
+        if (i == 1 && device_number == -1) {
+            get_parent_device(drive_letter);
+        }
+        if (device_number != -1) {
+            unmount_drive(drive_letter, &remove_safely, &auto_eject);
+            fwprintf_s(stdout, L"Unmounting: %c: Remove safely: %s Media Ejected: %s\r\n",
+                    drive_letter, BOOL2STR(remove_safely), BOOL2STR(auto_eject));
+            fflush(stdout);
+        }
+    }
+
+    // Eject the parent USB device
+    if (device_number == -1) {
+        fwprintf_s(stderr, L"Cannot eject, failed to get device number\r\n");
+        fflush(stderr);
+        return 1;
+    }
+
+    if (dev_inst_parent == 0) {
+        fwprintf_s(stderr, L"Cannot eject, failed to get device parent\r\n");
+        fflush(stderr);
+        return 1;
+    }
+
+    return eject_device();
+}
+
+
diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
index 194d298279..f25a21cd71 100644
--- a/setup/installer/windows/freeze.py
+++ b/setup/installer/windows/freeze.py
@@ -42,6 +42,7 @@ DESCRIPTIONS = {
         'calibre-parallel': 'calibre worker process',
         'calibre-smtp' : 'Command line interface for sending books via email',
         'calibre-recycle' : 'Helper program for deleting to recycle bin',
+        'calibre-eject' : 'Helper program for ejecting connected reader devices',
 }
 
 def walk(dir):
@@ -82,6 +83,7 @@ class Win32Freeze(Command, WixMixIn):
 
         self.initbase()
         self.build_launchers()
+        self.build_eject()
         self.build_recycle()
         self.add_plugins()
         self.freeze()
@@ -388,17 +390,21 @@ class Win32Freeze(Command, WixMixIn):
             os.remove(y)
 
     def run_builder(self, cmd, show_output=False):
-        p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE)
-        if p.wait() != 0:
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        buf = []
+        while p.poll() is None:
+            x = p.stdout.read() + p.stderr.read()
+            if x:
+                buf.append(x)
+        if p.returncode != 0:
             self.info('Failed to run builder:')
             self.info(*cmd)
-            self.info(p.stdout.read())
-            self.info(p.stderr.read())
+            self.info(''.join(buf))
+            self.info('')
+            sys.stdout.flush()
             sys.exit(1)
         if show_output:
-            self.info(p.stdout.read())
-            self.info(p.stderr.read())
+            self.info(''.join(buf) + '\n')
 
     def build_portable_installer(self):
         zf = self.a(self.j('dist', 'calibre-portable-%s.zip.lz'%VERSION))
@@ -554,6 +560,21 @@ class Win32Freeze(Command, WixMixIn):
                 '/OUT:'+exe] + [self.embed_resources(exe), obj, 'Shell32.lib']
         self.run_builder(cmd)
 
+    def build_eject(self):
+        self.info('Building calibre-eject.exe')
+        base = self.j(self.src_root, 'setup', 'installer', 'windows')
+        src = self.j(base, 'eject.c')
+        obj = self.j(self.obj_dir, self.b(src)+'.obj')
+        cflags  = '/c /EHsc /MD /W3 /Ox /nologo /D_UNICODE'.split()
+        if self.newer(obj, src):
+            cmd = [msvc.cc] + cflags + ['/Fo'+obj, '/Tc'+src]
+            self.run_builder(cmd, show_output=True)
+        exe = self.j(self.base, 'calibre-eject.exe')
+        cmd = [msvc.linker] + ['/MACHINE:'+machine,
+                '/SUBSYSTEM:CONSOLE', '/RELEASE',
+                '/OUT:'+exe] + [self.embed_resources(exe), obj, 'setupapi.lib']
+        self.run_builder(cmd)
+
     def build_launchers(self, debug=False):
         if not os.path.exists(self.obj_dir):
             os.makedirs(self.obj_dir)
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index ce04621a56..d349ce46d8 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -908,7 +908,12 @@ class Device(DeviceConfig, DevicePlugin):
                     except:
                         pass
 
-        t = Thread(target=do_it, args=[drives])
+        def do_it2(drives):
+            import win32process
+            EJECT = os.path.join(os.path.dirname(sys.executable), 'calibre-eject.exe')
+            subprocess.Popen([EJECT] + drives, creationflags=win32process.CREATE_NO_WINDOW).wait()
+
+        t = Thread(target=do_it2, args=[drives])
         t.daemon = True
         t.start()
         self.__save_win_eject_thread = t

From 3db2d844cb6d945ec0a17bb037c05b7f5ad515d7 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 21 Sep 2013 09:16:34 +0200
Subject: [PATCH 0849/1154] When editing custom comments from the spreadsheet,
 add the column name to the title bar

---
 src/calibre/gui2/dialogs/comments_dialog.py | 5 ++++-
 src/calibre/gui2/library/delegates.py       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/dialogs/comments_dialog.py b/src/calibre/gui2/dialogs/comments_dialog.py
index 51b29fa989..2734a1bd21 100644
--- a/src/calibre/gui2/dialogs/comments_dialog.py
+++ b/src/calibre/gui2/dialogs/comments_dialog.py
@@ -9,7 +9,7 @@ from calibre.library.comments import comments_to_html
 
 class CommentsDialog(QDialog, Ui_CommentsDialog):
 
-    def __init__(self, parent, text):
+    def __init__(self, parent, text, column_name=None):
         QDialog.__init__(self, parent)
         Ui_CommentsDialog.__init__(self)
         self.setupUi(self)
@@ -24,3 +24,6 @@ class CommentsDialog(QDialog, Ui_CommentsDialog):
         self.buttonBox.button(QDialogButtonBox.Ok).setText(_('&OK'))
         self.buttonBox.button(QDialogButtonBox.Cancel).setText(_('&Cancel'))
 
+        if column_name:
+            self.setWindowTitle(_('Edit "{0}"').format(column_name))
+
diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index e14e79fb3e..6895f34667 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -398,7 +398,7 @@ class CcCommentsDelegate(QStyledItemDelegate):  # {{{
         m = index.model()
         col = m.column_map[index.column()]
         text = m.db.data[index.row()][m.custom_columns[col]['rec_index']]
-        editor = CommentsDialog(parent, text)
+        editor = CommentsDialog(parent, text, column_name=m.custom_columns[col]['name'])
         d = editor.exec_()
         if d:
             m.setData(index, QVariant(editor.textbox.html), Qt.EditRole)

From 2bd608cbef74489bd46d5f53811d16b610870828 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 21 Sep 2013 16:09:51 +0200
Subject: [PATCH 0850/1154] Add ability to get more fields to
 ajax.ajax_books_in. The extra fields are returned in a separate dictionary
 named "additional_fields" to avoid any name collisions with other items in
 the dictionary.

---
 src/calibre/library/server/ajax.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/server/ajax.py b/src/calibre/library/server/ajax.py
index eac53b91bc..e15b97a26a 100644
--- a/src/calibre/library/server/ajax.py
+++ b/src/calibre/library/server/ajax.py
@@ -508,7 +508,7 @@ class AjaxServer(object):
     # Books in the specified category {{{
     @Endpoint()
     def ajax_books_in(self, category, item, sort='title', num=25, offset=0,
-            sort_order='asc'):
+            sort_order='asc', get_additional_fields=''):
         '''
         Return the books (as list of ids) present in the specified category.
         '''
@@ -559,13 +559,28 @@ class AjaxServer(object):
                 only_ids=ids)
         total_num = len(ids)
         ids = ids[offset:offset+num]
-        return {
+
+        result = {
                 'total_num': total_num, 'sort_order':sort_order,
                 'offset':offset, 'num':len(ids), 'sort':sort,
                 'base_url':absurl(self.opts.url_prefix, '/ajax/books_in/%s/%s'%(category, item)),
                 'book_ids':ids
         }
 
+        if get_additional_fields:
+            additional_fields = {}
+            for field in get_additional_fields.split(','):
+                field = field.strip()
+                if field:
+                    flist = []
+                    for id_ in ids:
+                        flist.append(self.db.new_api.field_for(field, id_,
+                                                               default_value=None))
+                    additional_fields[field] = flist
+            if additional_fields:
+                result['additional_fields'] = additional_fields
+        return result
+
     # }}}
 
     # Search {{{

From 43908fd1cf9956109522e977ea4de04a3bb2120e Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Sat, 21 Sep 2013 08:55:54 -0700
Subject: [PATCH 0851/1154] Fixed three typos referencing a renamed method
 self.afc_error

---
 src/calibre/devices/idevice/libimobiledevice.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py
index 4a2b26239b..213d7f9699 100644
--- a/src/calibre/devices/idevice/libimobiledevice.py
+++ b/src/calibre/devices/idevice/libimobiledevice.py
@@ -587,7 +587,7 @@ class libiMobileDevice():
                                          str(from_name),
                                          str(to_name))
         if error:
-            self._log(" ERROR: %s" % self.afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
 
     def remove(self, path):
         '''
@@ -601,7 +601,7 @@ class libiMobileDevice():
         error = self.lib.afc_remove_path(byref(self.afc), str(path))
 
         if error:
-            self._log(" ERROR: %s" % self.afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
 
     def stat(self, path):
         '''
@@ -650,7 +650,7 @@ class libiMobileDevice():
 
         error = self.lib.afc_client_free(byref(self.afc)) & 0xFFFF
         if error:
-            self._log(" ERROR: %s" % self.afc_error(error))
+            self._log(" ERROR: %s" % self._afc_error(error))
 
     def _afc_client_new(self):
         '''

From 4881e93d2d9265b86cfa1d570d7d2e766374c820 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 21 Sep 2013 19:10:27 +0200
Subject: [PATCH 0852/1154] Fix not actually setting the compression level

---
 src/calibre/devices/smart_device_app/driver.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 84cf7ed6f0..91cf27eca7 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -1381,6 +1381,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             cq = int(self.settings().extra_customization[self.OPT_COMPRESSION_QUALITY])
             if cq < 50 or cq > 99:
                 compression_quality_ok = False
+            else:
+                self.THUMBNAIL_COMPRESSION_QUALITY = cq
         except:
             compression_quality_ok = False
         if not compression_quality_ok:

From fc09a577419f5469d5a83db3a062d9f8c6dbc571 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 21 Sep 2013 19:33:32 +0200
Subject: [PATCH 0853/1154] Ensure that icons being composed are scaled to a
 128x128 box. This handles both down- and up-scaling.

---
 src/calibre/gui2/library/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 182fd6866d..1345ae24cd 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -111,6 +111,8 @@ class ColumnIcon(object):  # {{{
                     d = os.path.join(config_dir, 'cc_icons', icon)
                     if (os.path.exists(d)):
                         bm = QPixmap(d)
+                        bm = bm.scaled(128, 128, aspectRatioMode= Qt.KeepAspectRatio,
+                                       transformMode=Qt.SmoothTransformation)
                         icon_bitmaps.append(bm)
                         total_width += bm.width()
                 if len(icon_bitmaps) > 1:

From 87a8f703beeab44a2084eda7440d56eef78d00eb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 08:55:46 +0530
Subject: [PATCH 0854/1154] DOCX Input: Handle DOCX files with missing
 referenced styles

Fixes #1228669 [.docx conversion fails w/ attribute error](https://bugs.launchpad.net/calibre/+bug/1228669)
---
 src/calibre/ebooks/docx/styles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/docx/styles.py b/src/calibre/ebooks/docx/styles.py
index 142cb9e89d..03bbc1d7d3 100644
--- a/src/calibre/ebooks/docx/styles.py
+++ b/src/calibre/ebooks/docx/styles.py
@@ -301,7 +301,7 @@ class Styles(object):
             if ts is not None:
                 parent_styles.append(ts)
             if direct_formatting.linked_style is not None:
-                ls = self.get(direct_formatting.linked_style).character_style
+                ls = getattr(self.get(direct_formatting.linked_style), 'character_style', None)
                 if ls is not None:
                     parent_styles.append(ls)
             elif default_char is not None and default_char.character_style is not None:

From 7a39bc636879599663196d94a7e8c427dd6e7f9c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 09:54:23 +0530
Subject: [PATCH 0855/1154] pep8 and add tags_test

---
 src/calibre/ebooks/metadata/sources/test.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/test.py b/src/calibre/ebooks/metadata/sources/test.py
index 52a4082b31..ae54b07238 100644
--- a/src/calibre/ebooks/metadata/sources/test.py
+++ b/src/calibre/ebooks/metadata/sources/test.py
@@ -67,6 +67,18 @@ def authors_test(authors):
 
     return test
 
+def tags_test(tags):
+    tags = set([x.lower() for x in tags])
+
+    def test(mi):
+        t = set([x.lower() for x in mi.tags])
+        if t == tags:
+            return True
+        prints('Tags test failed. Expected: \'%s\' found \'%s\''%(tags, t))
+        return False
+
+    return test
+
 def series_test(series, series_index):
     series = series.lower()
 
@@ -75,10 +87,10 @@ def series_test(series, series_index):
         if (ms == series) and (series_index == mi.series_index):
             return True
         if mi.series:
-            prints('Series test failed. Expected: \'%s [%d]\' found \'%s[%d]\''% \
+            prints('Series test failed. Expected: \'%s [%d]\' found \'%s[%d]\''%
                         (series, series_index, ms, mi.series_index))
         else:
-            prints('Series test failed. Expected: \'%s [%d]\' found no series'% \
+            prints('Series test failed. Expected: \'%s [%d]\' found no series'%
                         (series, series_index))
         return False
 
@@ -111,7 +123,7 @@ def init_test(tdir_name):
     abort = Event()
     return tdir, lf, log, abort
 
-def test_identify(tests): # {{{
+def test_identify(tests):  # {{{
     '''
     :param tests: List of 2-tuples. Each two tuple is of the form (args,
                   test_funcs). args is a dict of keyword arguments to pass to
@@ -178,7 +190,7 @@ def test_identify(tests): # {{{
 # }}}
 
 def test_identify_plugin(name, tests, modify_plugin=lambda plugin:None,
-        fail_missing_meta=True): # {{{
+        fail_missing_meta=True):  # {{{
     '''
     :param name: Plugin name
     :param tests: List of 2-tuples. Each two tuple is of the form (args,

From d0f179da8233fe7e61c1132f7fea31253c3105e2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 10:01:22 +0530
Subject: [PATCH 0856/1154] Amazon metadata download: Get tags from amazon best
 seller rank

---
 src/calibre/ebooks/metadata/sources/amazon.py | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 4c8990ff66..8027b5367e 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -162,18 +162,6 @@ class Worker(Thread):  # Get details {{{
             '''
         self.language_names = {'Language', 'Sprache', 'Lingua', 'Idioma', 'Langue', '言語'}
 
-        self.tags_xpath = '''
-            descendant::h2[
-                text() = "Look for Similar Items by Category" or
-                text() = "Ähnliche Artikel finden" or
-                text() = "Buscar productos similares por categoría" or
-                text() = "Ricerca articoli simili per categoria" or
-                text() = "Rechercher des articles similaires par rubrique" or
-                text() = "Procure por itens similares por categoria" or
-                text() = "関連商品を探す"
-            ]/../descendant::ul/li
-        '''
-
         self.ratings_pat = re.compile(
             r'([0-9.]+) ?(out of|von|su|étoiles sur|つ星のうち|de un máximo de|de) ([\d\.]+)( (stars|Sternen|stelle|estrellas|estrelas)){0,1}')
 
@@ -521,8 +509,15 @@ class Worker(Thread):  # Get details {{{
         exclude_tokens = {'kindle', 'a-z'}
         exclude = {'special features', 'by authors', 'authors & illustrators', 'books', 'new; used & rental textbooks'}
         seen = set()
-        for li in root.xpath(self.tags_xpath):
-            for i, a in enumerate(li.iterdescendants('a')):
+        tags = root.xpath('''
+            //div[@class="kindleAuthorRank"]/div[@class="browseNodeRanks"]/div[@class="nodeRank"]
+            ''')
+        if not tags:
+            tags = root.xpath('''
+                //li[@id="SalesRank"]/descendant::span[@class="zg_hrsr_ladder"]
+                ''')
+        for container in tags:
+            for i, a in enumerate(container.iterdescendants('a')):
                 if i > 0:
                     # we ignore the first category since it is almost always too broad
                     raw = (a.text or '').strip().replace(',', ';')
@@ -1078,10 +1073,10 @@ if __name__ == '__main__':  # tests {{{
                     authors_test(['F. Scott Fitzgerald'])]
             ),
 
-            (  # A newer book
-                {'identifiers':{'isbn': '9780316044981'}},
-                [title_test('The Heroes', exact=True),
-                    authors_test(['Joe Abercrombie'])]
+            (  # A newer book with tags via amazon best seller rank
+                {'identifiers':{'isbn': '0385346824'}},
+                [title_test('Ex-Communication: A Novel', exact=True),
+                    authors_test(['Peter Clines']), ]
 
             ),
 

From 42d8cbc63190d705d698ef337389c5c6ea96aeab Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 11:09:32 +0530
Subject: [PATCH 0857/1154] Update GoComics

---
 recipes/go_comics.recipe | 139 +++++++++++++++------------------------
 1 file changed, 54 insertions(+), 85 deletions(-)

diff --git a/recipes/go_comics.recipe b/recipes/go_comics.recipe
index c3d44cb77a..69f39b8a91 100644
--- a/recipes/go_comics.recipe
+++ b/recipes/go_comics.recipe
@@ -4,44 +4,29 @@ __copyright__ = 'Copyright 2010 Starson17'
 www.gocomics.com
 '''
 from calibre.web.feeds.news import BasicNewsRecipe
-import re
 
 class GoComics(BasicNewsRecipe):
     title               = 'Go Comics'
     __author__          = 'Starson17'
     __version__         = '1.06'
     __date__            = '07 June 2011'
-    description         = u'200+ Comics - Customize for more days/comics: Defaults to 7 days, 25 comics - 20 general, 5 editorial.'
+    description         = u'200+ Comics - Customize for more days/comics: Defaults to 1 day, 25 comics - 20 general, 5 editorial.'
     category            = 'news, comics'
     language            = 'en'
-    use_embedded_content= False
     no_stylesheets      = True
     remove_javascript   = True
     remove_attributes = ['style']
 
-    ####### USER PREFERENCES - COMICS, IMAGE SIZE AND NUMBER OF COMICS TO RETRIEVE ########
+    # USER PREFERENCES - COMICS AND NUMBER OF COMICS TO RETRIEVE ########
     # num_comics_to_get - I've tried up to 99 on Calvin&Hobbes
     num_comics_to_get = 1
-    # comic_size 300 is small, 600 is medium, 900 is large, 1500 is extra-large
-    comic_size = 900
     # CHOOSE COMIC STRIPS BELOW - REMOVE COMMENT '# ' FROM IN FRONT OF DESIRED STRIPS
     # Please do not overload their servers by selecting all comics and 1000 strips from each!
 
-    conversion_options = {'linearize_tables'  : True
-                        , 'comment'           : description
-                        , 'tags'              : category
-                        , 'language'          : language
-                        }
-
-    keep_only_tags     = [dict(name='div', attrs={'class':['feature','banner']}),
-                          ]
-
-    remove_tags = [dict(name='a', attrs={'class':['beginning','prev','cal','next','newest']}),
-                   dict(name='div', attrs={'class':['tag-wrapper']}),
-                   dict(name='a', attrs={'href':re.compile(r'.*mutable_[0-9]+', re.IGNORECASE)}),
-                   dict(name='img', attrs={'src':re.compile(r'.*mutable_[0-9]+', re.IGNORECASE)}),
-                   dict(name='ul', attrs={'class':['share-nav','feature-nav']}),
-                   ]
+    keep_only_tags     = [
+        dict(name='h1'),
+        dict(name='div', id=lambda x: x and x.startswith('mutable_')),
+    ]
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
@@ -50,7 +35,7 @@ class GoComics(BasicNewsRecipe):
 
     def parse_index(self):
         feeds = []
-        for title, url in [
+        for i, (title, url) in enumerate([  # {{{
                        #(u"2 Cows and a Chicken", u"http://www.gocomics.com/2cowsandachicken"),
                        #(u"9 Chickweed Lane", u"http://www.gocomics.com/9chickweedlane"),
                        #(u"Adam At Home", u"http://www.gocomics.com/adamathome"),
@@ -271,7 +256,7 @@ class GoComics(BasicNewsRecipe):
                        (u"Strange Brew", u"http://www.gocomics.com/strangebrew"),
                        (u"The Argyle Sweater", u"http://www.gocomics.com/theargylesweater"),
                        #
-                       ######## EDITORIAL CARTOONS #####################
+                       # EDITORIAL CARTOONS #####################
                        #(u"Adam Zyglis", u"http://www.gocomics.com/adamzyglis"),
                        #(u"Andy Singer", u"http://www.gocomics.com/andysinger"),
                        #(u"Ben Sargent",u"http://www.gocomics.com/bensargent"),
@@ -363,81 +348,65 @@ class GoComics(BasicNewsRecipe):
                        #(u"Walt Handelsman",u"http://www.gocomics.com/walthandelsman"),
                        #(u"Wayne Stayskal",u"http://www.gocomics.com/waynestayskal"),
                        #(u"Wit of the World",u"http://www.gocomics.com/witoftheworld"),
-                             ]:
-            print 'Working on: ', title
+                             ]):  # }}}
+            self.log('Working on: ', title, url)
             articles = self.make_links(url)
             if articles:
                 feeds.append((title, articles))
+            if self.test and i > 0:
+                break
         return feeds
 
     def make_links(self, url):
         title = 'Temp'
         current_articles = []
-        pages = range(1, self.num_comics_to_get+1)
-        for page in pages:
+        if self.test:
+            self.num_comics_to_get = 2
+        num = self.num_comics_to_get
+        while num > 0:
+            num -= 1
             page_soup = self.index_to_soup(url)
-            if page_soup:
-                try:
-                    strip_title = page_soup.find(name='div', attrs={'class':'top'}).h1.a.string
-                except:
-                    strip_title = 'Error - no Title found'
-                try:
-                    date_title = page_soup.find('ul', attrs={'class': 'feature-nav'}).li.string
-                    if not date_title:
-                        date_title = page_soup.find('ul', attrs={'class': 'feature-nav'}).li.string
-                except:
-                    date_title = 'Error - no Date found'
-                title = strip_title + ' - ' + date_title
-                for i in range(2):
-                    try:
-                        strip_url_date = page_soup.find(name='div', attrs={'class':'top'}).h1.a['href']
-                        break  # success - this is normal exit
-                    except:
-                        strip_url_date = None
-                        continue  # try to get strip_url_date again
-                for i in range(2):
-                    try:
-                        prev_strip_url_date = page_soup.find('a', attrs={'class': 'prev'})['href']
-                        break  # success - this is normal exit
-                    except:
-                        prev_strip_url_date = None
-                        continue  # try to get prev_strip_url_date again
-                if strip_url_date:
-                    page_url = 'http://www.gocomics.com' + strip_url_date
-                else:
-                    continue
-                if prev_strip_url_date:
-                    prev_page_url = 'http://www.gocomics.com' + prev_strip_url_date
-                else:
-                    continue
+            if not page_soup:
+                break
+            content = page_soup.find(id='content')
+            if content is None:
+                break
+            feature = content.find(name='div', attrs={'class':'feature'})
+            feature_nav = content.find(name='ul', attrs={'class':'feature-nav'})
+            if feature is None or feature_nav is None:
+                break
+            try:
+                a = feature.find('h1').find('a', href=True)
+            except:
+                self.log.exception('Failed to find current page link')
+                break
+            page_url = a['href']
+            if page_url.startswith('/'):
+                page_url = 'http://www.gocomics.com' + page_url
+            try:
+                strip_title = self.tag_to_string(feature.find('h1').find('a', href=True))
+            except:
+                strip_title = 'Error - no Title found'
+            try:
+                date_title = self.tag_to_string(feature_nav.find('li'))
+            except:
+                date_title = 'Error - no Date found'
+            title = strip_title + ' - ' + date_title
             current_articles.append({'title': title, 'url': page_url, 'description':'', 'date':''})
-            url = prev_page_url
+            a = feature_nav.find('a', href=True, attrs={'class':'prev'})
+            if a is None:
+                break
+            url = a['href']
+            if url.startswith('/'):
+                url = 'http://www.gocomics.com' + url
         current_articles.reverse()
         return current_articles
 
     def preprocess_html(self, soup):
-        if soup.title:
-            title_string = soup.title.string.strip()
-            _cd = title_string.split(',',1)[1]
-            comic_date = ' '.join(_cd.split(' ', 4)[0:-1])
-        if soup.h1.span:
-            artist = soup.h1.span.string
-            soup.h1.span.string.replaceWith(comic_date + artist)
-        feature_item = soup.find('p',attrs={'class':'feature_item'})
-        if feature_item.a:
-            a_tag = feature_item.a
-            a_href = a_tag["href"]
-            img_tag = a_tag.img
-            img_tag["src"] = a_href
-            img_tag["width"] = self.comic_size
-            img_tag["height"] = None
-        return self.adeify_images(soup)
+        headings = soup.findAll('h1')
+        for h1 in headings[1:]:
+            h1.extract()
+        self.adeify_images(soup)
+        return soup
 
-    extra_css = '''
-                    h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
-                    h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
-                    img {max-width:100%; min-width:100%;}
-                    p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
-                    body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
-    '''
 

From 50beda31ae41eacbecdecc5464eddae134c45ad8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 12:09:24 +0530
Subject: [PATCH 0858/1154] Remove the SONY PRS 500 fonts

Remove the bundled SONY PRS500 fonts since they were used only for LRF
conversion, and LRF is now deprecated. The fonts will be substituted with
Liberation fonts instead.
---
 resources/fonts/prs500/tt0003m_.ttf      | Bin 71756 -> 0 bytes
 resources/fonts/prs500/tt0011m_.ttf      | Bin 93944 -> 0 bytes
 resources/fonts/prs500/tt0419m_.ttf      | Bin 99808 -> 0 bytes
 src/calibre/ebooks/lrf/fonts.py          |  35 +++++++++++
 src/calibre/ebooks/lrf/fonts/__init__.py |  71 -----------------------
 5 files changed, 35 insertions(+), 71 deletions(-)
 delete mode 100644 resources/fonts/prs500/tt0003m_.ttf
 delete mode 100644 resources/fonts/prs500/tt0011m_.ttf
 delete mode 100644 resources/fonts/prs500/tt0419m_.ttf
 create mode 100644 src/calibre/ebooks/lrf/fonts.py
 delete mode 100644 src/calibre/ebooks/lrf/fonts/__init__.py

diff --git a/resources/fonts/prs500/tt0003m_.ttf b/resources/fonts/prs500/tt0003m_.ttf
deleted file mode 100644
index a83d81d2cb91e6074dd215393be6109d7d912952..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71756
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
F{5Ma4BBTHS

diff --git a/resources/fonts/prs500/tt0011m_.ttf b/resources/fonts/prs500/tt0011m_.ttf
deleted file mode 100644
index e1b4563473d589398abad1874e7b12e962e83cff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 93944
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

diff --git a/resources/fonts/prs500/tt0419m_.ttf b/resources/fonts/prs500/tt0419m_.ttf
deleted file mode 100644
index 8d9968e736b86139639f3d25f675a3d6538f5419..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 99808
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

diff --git a/src/calibre/ebooks/lrf/fonts.py b/src/calibre/ebooks/lrf/fonts.py
new file mode 100644
index 0000000000..6729dfb5b2
--- /dev/null
+++ b/src/calibre/ebooks/lrf/fonts.py
@@ -0,0 +1,35 @@
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+try:
+    from PIL import ImageFont
+    ImageFont
+except ImportError:
+    import ImageFont
+
+'''
+Default fonts used in the PRS500
+'''
+
+
+LIBERATION_FONT_MAP = {
+            'Swis721 BT Roman'     : 'LiberationSans-Regular',
+            'Dutch801 Rm BT Roman' : 'LiberationSerif-Regular',
+            'Courier10 BT Roman'   : 'LiberationMono-Regular',
+            }
+
+FONT_FILE_MAP = {}
+
+
+def get_font(name, size, encoding='unic'):
+    '''
+    Get an ImageFont object by name.
+    @param size: Font height in pixels. To convert from pts:
+                 sz in pixels = (dpi/72) * size in pts
+    @param encoding: Font encoding to use. E.g. 'unic', 'symbol', 'ADOB', 'ADBE', 'aprm'
+    @param manager: A dict that will store the PersistentTemporary
+    '''
+    if name in LIBERATION_FONT_MAP:
+        return ImageFont.truetype(P('fonts/liberation/%s.ttf' % LIBERATION_FONT_MAP[name]), size, encoding=encoding)
+    elif name in FONT_FILE_MAP:
+        return ImageFont.truetype(FONT_FILE_MAP[name], size, encoding=encoding)
diff --git a/src/calibre/ebooks/lrf/fonts/__init__.py b/src/calibre/ebooks/lrf/fonts/__init__.py
deleted file mode 100644
index 3f169360cb..0000000000
--- a/src/calibre/ebooks/lrf/fonts/__init__.py
+++ /dev/null
@@ -1,71 +0,0 @@
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-import os
-
-try:
-    from PIL import ImageFont
-    ImageFont
-except ImportError:
-    import ImageFont
-
-'''
-Default fonts used in the PRS500
-'''
-
-SYSTEM_FONT_PATH = '/usr/share/fonts/truetype/ttf-liberation/'
-
-FONT_MAP = {
-            'Swis721 BT Roman'     : 'tt0003m_',
-            'Dutch801 Rm BT Roman' : 'tt0011m_',
-            'Courier10 BT Roman'   : 'tt0419m_',
-            }
-
-LIBERATION_FONT_MAP = {
-            'Swis721 BT Roman'     : 'LiberationSans-Regular',
-            'Dutch801 Rm BT Roman' : 'LiberationSerif-Regular',
-            'Courier10 BT Roman'   : 'LiberationMono-Regular',
-            }
-
-FONT_FILE_MAP = {}
-
-SYSTEM_FONT_MAP = {}
-for key, val in LIBERATION_FONT_MAP.items():
-    SYSTEM_FONT_MAP[key] = SYSTEM_FONT_PATH + val + '.ttf'
-
-def get_font_path(name):
-    if FONT_FILE_MAP.has_key(name) and os.access(FONT_FILE_MAP[name], os.R_OK):
-        return FONT_FILE_MAP[name]
-    # translate font into file name
-    for m, s in ((FONT_MAP, 'prs500'), (LIBERATION_FONT_MAP, 'liberation')):
-        fname = m[name]+'.ttf'
-
-        # first, check configuration in /etc/
-        etc_file = os.path.join(os.path.sep, 'etc', 'calibre', 'fonts', fname)
-        if os.access(etc_file, os.R_OK):
-            return etc_file
-
-        # then, try calibre shipped ones
-        f = P('fonts/%s/%s'%(s,fname))
-        if os.path.exists(f):
-            return f
-
-    # finally, try system default ones
-    if SYSTEM_FONT_MAP.has_key(name) and os.access(SYSTEM_FONT_MAP[name], os.R_OK):
-        return SYSTEM_FONT_MAP[name]
-
-    # not found
-    raise SystemError('font %s (in file %s) not installed' % (name, fname))
-
-def get_font(name, size, encoding='unic'):
-    '''
-    Get an ImageFont object by name.
-    @param size: Font height in pixels. To convert from pts:
-                 sz in pixels = (dpi/72) * size in pts
-    @param encoding: Font encoding to use. E.g. 'unic', 'symbol', 'ADOB', 'ADBE', 'aprm'
-    @param manager: A dict that will store the PersistentTemporary
-    '''
-    if name in FONT_MAP.keys():
-        path = get_font_path(name)
-        return ImageFont.truetype(path, size, encoding=encoding)
-    elif name in FONT_FILE_MAP.keys():
-        return ImageFont.truetype(FONT_FILE_MAP[name], size, encoding=encoding)

From 3e522c4e1513bbf1530eb67d7ed22a3517efab1d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 17:24:07 +0530
Subject: [PATCH 0859/1154] newdb: Handle databases with invalid ratings link
 tables

Fixes #1228517 [crashes on change library](https://bugs.launchpad.net/calibre/+bug/1228517)
---
 src/calibre/db/fields.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index fbed097143..1294fc198c 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -452,8 +452,11 @@ class ManyToOneField(Field):
 
     @property
     def book_value_map(self):
-        return {book_id:self.table.id_map[item_id] for book_id, item_id in
+        try:
+            return {book_id:self.table.id_map[item_id] for book_id, item_id in
                 self.table.book_col_map.iteritems()}
+        except KeyError:
+            raise InvalidLinkTable(self.name)
 
 class ManyToManyField(Field):
 
@@ -514,8 +517,11 @@ class ManyToManyField(Field):
 
     @property
     def book_value_map(self):
-        return {book_id:tuple(self.table.id_map[item_id] for item_id in item_ids)
+        try:
+            return {book_id:tuple(self.table.id_map[item_id] for item_id in item_ids)
                 for book_id, item_ids in self.table.book_col_map.iteritems()}
+        except KeyError:
+            raise InvalidLinkTable(self.name)
 
 class IdentifiersField(ManyToManyField):
 

From 4a82c5f5ac76efe94954bb8e055cc851dc2a54a5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 18:21:36 +0530
Subject: [PATCH 0860/1154] Driver for Woxter Scriba

Fixes #1228690 [Woxter scriba 175 drivers](https://bugs.launchpad.net/calibre/+bug/1228690)
---
 src/calibre/customize/builtins.py |  4 ++--
 src/calibre/devices/misc.py       | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 24c3a688b2..97f2135744 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -670,7 +670,7 @@ from calibre.devices.teclast.driver import (TECLAST_K3, NEWSMY, IPAPYRUS,
 from calibre.devices.sne.driver import SNE
 from calibre.devices.misc import (PALMPRE, AVANT, SWEEX, PDNOVEL,
         GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, LUMIREAD, ALURATEK_COLOR,
-        TREKSTOR, EEEREADER, NEXTBOOK, ADAM, MOOVYBOOK, COBY, EX124G, WAYTEQ)
+        TREKSTOR, EEEREADER, NEXTBOOK, ADAM, MOOVYBOOK, COBY, EX124G, WAYTEQ, WOXTER)
 from calibre.devices.folder_device.driver import FOLDER_DEVICE_FOR_CONFIG
 from calibre.devices.kobo.driver import KOBO, KOBOTOUCH
 from calibre.devices.bambook.driver import BAMBOOK
@@ -744,7 +744,7 @@ plugins += [
     EEEREADER,
     NEXTBOOK,
     ADAM,
-    MOOVYBOOK, COBY, EX124G, WAYTEQ,
+    MOOVYBOOK, COBY, EX124G, WAYTEQ, WOXTER,
     ITUNES,
     BOEYE_BEX,
     BOEYE_BDX,
diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index 3338a98eac..f6d10ef1cf 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -482,3 +482,26 @@ class WAYTEQ(USBMS):
         return names
 
 
+class WOXTER(USBMS):
+
+    name           = 'Woxter Scriba device interface'
+    gui_name       = 'Woxter Scriba'
+    description    = _('Communicate with the Woxter Scriba reader')
+    author         = 'Kovid Goyal'
+    supported_platforms = ['windows', 'osx', 'linux']
+
+    # Ordered list of supported formats
+    FORMATS     = ['epub', 'mobi', 'fb2', 'txt', 'pdf', 'html', 'rtf', 'djvu', 'doc']
+
+    VENDOR_ID   = [0x2207]
+    PRODUCT_ID  = [0x2818]
+    BCD         = [0x0100]
+
+    EBOOK_DIR_MAIN = 'Books'
+    SCAN_FROM_ROOT = True
+    SUPPORTS_SUB_DIRS = True
+
+    VENDOR_NAME = ['ROCKCHIP']
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['EREADER']
+
+

From 2c46d54c479e95e00c85fb3f99f235a6efe004a1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 22 Sep 2013 21:02:49 +0530
Subject: [PATCH 0861/1154] Conversion: Handle the style attribute on the
 <html> tag

---
 src/calibre/ebooks/oeb/transforms/flatcss.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index eadcdff4d0..9c8442d391 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -227,6 +227,10 @@ class CSSFlattener(object):
         for item in self.oeb.spine:
             html = item.data
             body = html.find(XHTML('body'))
+            if 'style' in html.attrib:
+                b = body.attrib.get('style', '')
+                body.set('style',  html.get('style') + ';' + b)
+                del html.attrib['style']
             bs = body.get('style', '').split(';')
             bs.append('margin-top: 0pt')
             bs.append('margin-bottom: 0pt')

From a4f6d6d19e41e0f1291599d8830b23a4c80ff6c2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 23 Sep 2013 10:34:09 +0530
Subject: [PATCH 0862/1154] DOCX Input: Convert tabs to non-breaking spaces

DOCX Input: Convert tabs in the docx file into non-breaking spaces in
the output document. Note that custom tab stops are not supported.
Fixes #1228893 [Converting .docx file fails to preserve para first line indent](https://bugs.launchpad.net/calibre/+bug/1228893)
---
 src/calibre/ebooks/docx/names.py    |  1 +
 src/calibre/ebooks/docx/settings.py | 20 ++++++++++++++++++++
 src/calibre/ebooks/docx/styles.py   |  2 ++
 src/calibre/ebooks/docx/to_html.py  | 19 +++++++++++++++++--
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/calibre/ebooks/docx/settings.py

diff --git a/src/calibre/ebooks/docx/names.py b/src/calibre/ebooks/docx/names.py
index ed9b9ea51f..9e2275b422 100644
--- a/src/calibre/ebooks/docx/names.py
+++ b/src/calibre/ebooks/docx/names.py
@@ -23,6 +23,7 @@ LINKS     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships
 FOOTNOTES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes'
 ENDNOTES  = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes'
 THEMES    = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme'
+SETTINGS  = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings'
 
 namespaces = {
     'mo': 'http://schemas.microsoft.com/office/mac/office/2008/main',
diff --git a/src/calibre/ebooks/docx/settings.py b/src/calibre/ebooks/docx/settings.py
new file mode 100644
index 0000000000..193c5bd3cb
--- /dev/null
+++ b/src/calibre/ebooks/docx/settings.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from calibre.ebooks.docx.names import XPath, get
+
+class Settings(object):
+
+    def __init__(self, root):
+        self.default_tab_stop = 720 / 20
+        for dts in XPath('//w:defaultTabStop[@w:val]')(root):
+            try:
+                self.default_tab_stop = int(get(dts, 'w:val')) / 20
+            except (ValueError, TypeError, AttributeError):
+                pass
+
diff --git a/src/calibre/ebooks/docx/styles.py b/src/calibre/ebooks/docx/styles.py
index 03bbc1d7d3..daca733330 100644
--- a/src/calibre/ebooks/docx/styles.py
+++ b/src/calibre/ebooks/docx/styles.py
@@ -458,6 +458,8 @@ class Styles(object):
 
             dl.notes dd:last-of-type { page-break-after: avoid }
 
+            span.tab { white-space: pre }
+
             ''') % (self.body_font_family, self.body_font_size, self.body_color)
         if ef:
             prefix = ef + '\n' + prefix
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index b878714a76..e983e541e9 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import sys, os, re
+import sys, os, re, math
 from collections import OrderedDict, defaultdict
 
 from lxml import html
@@ -16,7 +16,7 @@ from lxml.html.builder import (
 from calibre.ebooks.docx.container import DOCX, fromstring
 from calibre.ebooks.docx.names import (
     XPath, is_tag, XML, STYLES, NUMBERING, FONTS, get, generate_anchor,
-    descendants, FOOTNOTES, ENDNOTES, children, THEMES)
+    descendants, FOOTNOTES, ENDNOTES, children, THEMES, SETTINGS)
 from calibre.ebooks.docx.styles import Styles, inherit, PageProperties
 from calibre.ebooks.docx.numbering import Numbering
 from calibre.ebooks.docx.fonts import Fonts
@@ -27,6 +27,7 @@ from calibre.ebooks.docx.cleanup import cleanup_markup
 from calibre.ebooks.docx.theme import Theme
 from calibre.ebooks.docx.toc import create_toc
 from calibre.ebooks.docx.fields import Fields
+from calibre.ebooks.docx.settings import Settings
 from calibre.ebooks.metadata.opf2 import OPFCreator
 from calibre.utils.localization import canonicalize_lang, lang_as_iso639_1
 
@@ -227,6 +228,7 @@ class Convert(object):
 
         nname = get_name(NUMBERING, 'numbering.xml')
         sname = get_name(STYLES, 'styles.xml')
+        sename = get_name(SETTINGS, 'settings.xml')
         fname = get_name(FONTS, 'fontTable.xml')
         tname = get_name(THEMES, 'theme1.xml')
         foname = get_name(FOOTNOTES, 'footnotes.xml')
@@ -237,6 +239,14 @@ class Convert(object):
 
         foraw = enraw = None
         forel, enrel = ({}, {}), ({}, {})
+        if sename is not None:
+            try:
+                seraw = self.docx.read(sename)
+            except KeyError:
+                self.log.warn('Settings %s do not exist' % sename)
+            else:
+                self.settings = Settings(fromstring(seraw))
+
         if foname is not None:
             try:
                 foraw = self.docx.read(foname)
@@ -538,6 +548,11 @@ class Convert(object):
                     l.set('class', 'noteref')
                     text.add_elem(l)
                     ans.append(text.elem)
+            elif is_tag(child, 'w:tab'):
+                spaces = int(math.ceil((self.settings.default_tab_stop / 36) * 6))
+                text.add_elem(SPAN(NBSP * spaces))
+                ans.append(text.elem)
+                ans[-1].set('class', 'tab')
         if text.buf:
             setattr(text.elem, text.attr, ''.join(text.buf))
 

From 178364aa4ea75a6c43d3db8b819d7dbaec81659b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 23 Sep 2013 12:18:58 +0530
Subject: [PATCH 0863/1154] ...

---
 src/calibre/gui2/metadata/basic_widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index 801907b7cd..299984c5e4 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -861,7 +861,7 @@ class FormatsManager(QWidget):
             if fmt.path is None:
                 stream = db.format(id_, ext, as_file=True, index_is_id=True)
             else:
-                stream = open(fmt.path, 'r+b')
+                stream = open(fmt.path, 'rb')
             try:
                 with stream:
                     mi = get_metadata(stream, ext)

From de4cddf85374ddfd90170e30eaa946c76bb5d3d1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 23 Sep 2013 13:13:18 +0530
Subject: [PATCH 0864/1154] DOCX Input: Convert tabs for indentation into
 indentation

DOCX Input: Detect if tabs are used for paragraph indentation and
convert those into proper indentation.
---
 src/calibre/ebooks/docx/to_html.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index e983e541e9..fa414b9503 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -132,6 +132,28 @@ class Convert(object):
                         dl[-1].append(p)
                         paras.append(wp)
                 self.styles.apply_contextual_spacing(paras)
+
+        for p, wp in self.object_map.iteritems():
+            if len(p) > 0 and not p.text and len(p[0]) > 0 and not p[0].text and p[0][0].get('class', None) == 'tab':
+                # Paragraph uses tabs for indentation, convert to text-indent
+                parent = p[0]
+                tabs = []
+                for child in parent:
+                    if child.get('class', None) == 'tab':
+                        tabs.append(child)
+                        if child.tail:
+                            break
+                    else:
+                        break
+                indent = len(tabs) * self.settings.default_tab_stop
+                style = self.styles.resolve(wp)
+                if style.text_indent is inherit or (hasattr(style.text_indent, 'endswith') and style.text_indent.endswith('pt')):
+                    if style.text_indent is not inherit:
+                        indent = float(style.text_indent[:-2]) + indent
+                    style.text_indent = '%.3gpt' % indent
+                    parent.text = tabs[-1].tail or ''
+                    map(parent.remove, tabs)
+
         self.images.rid_map = orig_rid_map
 
         self.resolve_links(relationships_by_id)

From 589ef0a5fe7dc2403a88dd560d0ae442173fde5b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 23 Sep 2013 15:21:32 +0530
Subject: [PATCH 0865/1154] Revert "Amazon metadata download: Get tags from
 amazon best seller rank"

This reverts commit d0f179da8233fe7e61c1132f7fea31253c3105e2.

There are still many pages where the look for similar items is available
---
 src/calibre/ebooks/metadata/sources/amazon.py | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 8027b5367e..4c8990ff66 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -162,6 +162,18 @@ class Worker(Thread):  # Get details {{{
             '''
         self.language_names = {'Language', 'Sprache', 'Lingua', 'Idioma', 'Langue', '言語'}
 
+        self.tags_xpath = '''
+            descendant::h2[
+                text() = "Look for Similar Items by Category" or
+                text() = "Ähnliche Artikel finden" or
+                text() = "Buscar productos similares por categoría" or
+                text() = "Ricerca articoli simili per categoria" or
+                text() = "Rechercher des articles similaires par rubrique" or
+                text() = "Procure por itens similares por categoria" or
+                text() = "関連商品を探す"
+            ]/../descendant::ul/li
+        '''
+
         self.ratings_pat = re.compile(
             r'([0-9.]+) ?(out of|von|su|étoiles sur|つ星のうち|de un máximo de|de) ([\d\.]+)( (stars|Sternen|stelle|estrellas|estrelas)){0,1}')
 
@@ -509,15 +521,8 @@ class Worker(Thread):  # Get details {{{
         exclude_tokens = {'kindle', 'a-z'}
         exclude = {'special features', 'by authors', 'authors & illustrators', 'books', 'new; used & rental textbooks'}
         seen = set()
-        tags = root.xpath('''
-            //div[@class="kindleAuthorRank"]/div[@class="browseNodeRanks"]/div[@class="nodeRank"]
-            ''')
-        if not tags:
-            tags = root.xpath('''
-                //li[@id="SalesRank"]/descendant::span[@class="zg_hrsr_ladder"]
-                ''')
-        for container in tags:
-            for i, a in enumerate(container.iterdescendants('a')):
+        for li in root.xpath(self.tags_xpath):
+            for i, a in enumerate(li.iterdescendants('a')):
                 if i > 0:
                     # we ignore the first category since it is almost always too broad
                     raw = (a.text or '').strip().replace(',', ';')
@@ -1073,10 +1078,10 @@ if __name__ == '__main__':  # tests {{{
                     authors_test(['F. Scott Fitzgerald'])]
             ),
 
-            (  # A newer book with tags via amazon best seller rank
-                {'identifiers':{'isbn': '0385346824'}},
-                [title_test('Ex-Communication: A Novel', exact=True),
-                    authors_test(['Peter Clines']), ]
+            (  # A newer book
+                {'identifiers':{'isbn': '9780316044981'}},
+                [title_test('The Heroes', exact=True),
+                    authors_test(['Joe Abercrombie'])]
 
             ),
 

From b1c98a4dfd645530cdd2d5a3ad5dedbbc40b8330 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Mon, 23 Sep 2013 13:15:28 +0100
Subject: [PATCH 0866/1154] Fixed a minor issue.

"A single regular expression cat match a number of different strings"

Becomes :

"A single regular expression __can__ match a number of different strings"
---
 manual/regexp.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manual/regexp.rst b/manual/regexp.rst
index 7c879fa2e2..be2faf25b3 100644
--- a/manual/regexp.rst
+++ b/manual/regexp.rst
@@ -1,4 +1,3 @@
-
 .. include:: global.rst
 
 .. _regexptutorial:
@@ -26,7 +25,7 @@ There are a few places |app| uses regular expressions. There's the Search & Repl
 What on earth *is* a regular expression?
 ------------------------------------------------
 
-A regular expression is a way to describe sets of strings. A single regular expression cat *match* a number of different strings. This is what makes regular expression so powerful -- they are a concise way of describing a potentially large number of variations.
+A regular expression is a way to describe sets of strings. A single regular expression can *match* a number of different strings. This is what makes regular expression so powerful -- they are a concise way of describing a potentially large number of variations.
 
 .. note:: I'm using string here in the sense it is used in programming languages: a string of one or more characters, characters including actual characters, numbers, punctuation and so-called whitespace (linebreaks, tabulators etc.). Please note that generally, uppercase and lowercase characters are not considered the same, thus "a" being a different character from "A" and so forth. In |app|, regular expressions are case insensitive in the search bar, but not in the conversion options. There's a way to make every regular expression case insensitive, but we'll discuss that later. It gets complicated because regular expressions allow for variations in the strings it matches, so one expression can match multiple strings, which is why people bother using them at all. More on that in a bit.
 

From f34cb774be7251f979204afc21adfd3ac8b4221c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 23 Sep 2013 22:19:39 +0530
Subject: [PATCH 0867/1154] Update El Universal (VE)

Fixes #1229156 [Updated recipe for El Universal Venezuela](https://bugs.launchpad.net/calibre/+bug/1229156)
---
 recipes/eluniversal_ve.recipe | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/recipes/eluniversal_ve.recipe b/recipes/eluniversal_ve.recipe
index 8118ded19d..024d2805b3 100644
--- a/recipes/eluniversal_ve.recipe
+++ b/recipes/eluniversal_ve.recipe
@@ -1,27 +1,28 @@
 __license__   = 'GPL v3'
-__copyright__ = '2010-2011, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2010-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
 www.eluniversal.com
 '''
 
-from calibre import strftime
 from calibre.web.feeds.recipes import BasicNewsRecipe
 
 class ElUniversal(BasicNewsRecipe):
     title                  = 'El Universal'
     __author__             = 'Darko Miletic'
-    description            = 'Noticias de Venezuela'
+    description            = 'Noticias de Venezuela y el mundo. Avances informativos de ultimo minuto. Incluye secciones de politica, deportes, economia y mas.'
     oldest_article         = 2
     max_articles_per_feed  = 100
     no_stylesheets         = True
     use_embedded_content   = False
-    remove_empty_feeds     = True    
+    remove_empty_feeds     = True
     encoding               = 'cp1252'
     publisher              = 'El Universal'
     category               = 'news, Caracas, Venezuela, world'
     language               = 'es_VE'
-    publication_type       = 'newspaper'    
-    cover_url              = strftime('http://static.eluniversal.com/%Y/%m/%d/portada.jpg')
+    publication_type       = 'newspaper'
+    masthead_url           = 'http://cdn.eluniversal.com/images/eu4/back/logo-eluniversal.gif'
+    #cover_url              = strftime('http://cdn.eluniversal.com/%Y/%m/%d/portada.jpg')
+    cover_url              = 'http://images.eluniversal.com//pdf/primeraPlana.pdf'
     extra_css              = """
                                 .txt60{font-family: Tahoma,Geneva,sans-serif; font-size: small}
                                 .txt29{font-family: Tahoma,Geneva,sans-serif; font-size: small; color: gray}
@@ -30,10 +31,10 @@ class ElUniversal(BasicNewsRecipe):
                                 body{font-family: Verdana,Arial,Helvetica,sans-serif}
                              """
     conversion_options = {
-                             'comments'        : description
-                            ,'tags'            : category
-                            ,'language'        : language
-                            ,'publisher'       : publisher
+                             'comments'  : description
+                            ,'tags'      : category
+                            ,'language'  : language
+                            ,'publisher' : publisher
                          }
 
     remove_tags_before=dict(attrs={'class':'header-print MB10'})

From c5f14dc276c060d693f69d6729a091f7104c45a7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 23 Sep 2013 22:20:12 +0530
Subject: [PATCH 0868/1154] Fix #1229157 [Remove recipe for El Guardian -
 Argentina](https://bugs.launchpad.net/calibre/+bug/1229157)

---
 recipes/elguardian.recipe | 93 ---------------------------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 recipes/elguardian.recipe

diff --git a/recipes/elguardian.recipe b/recipes/elguardian.recipe
deleted file mode 100644
index f5d035dd21..0000000000
--- a/recipes/elguardian.recipe
+++ /dev/null
@@ -1,93 +0,0 @@
-__license__   = 'GPL v3'
-__copyright__ = '2013, Darko Miletic <darko.miletic at gmail.com>'
-'''
-elguardian.com.ar
-'''
-
-import re
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class ElGuardian(BasicNewsRecipe):
-    title                 = 'El Guardian'
-    __author__            = 'Darko Miletic'
-    description           = "Semanario con todas las tendencias de un pais"
-    publisher             = 'Editorial Apache SA'
-    category              = 'news,politics,Argentina'
-    oldest_article        = 8
-    max_articles_per_feed = 200
-    no_stylesheets        = True
-    encoding              = 'utf8'
-    use_embedded_content  = False
-    language              = 'es_AR'
-    remove_empty_feeds    = True
-    publication_type      = 'magazine'
-    issn                  = '1666-7476'
-    masthead_url          = 'http://elguardian.com.ar/application/templates/frontend/images/home/logo.png'
-    extra_css             = """
-                               body{font-family: Arial,sans-serif}
-                               img{margin-bottom: 0.4em; display:block}
-                            """
-
-    conversion_options = {
-                          'comment'   : description
-                        , 'tags'      : category
-                        , 'publisher' : publisher
-                        , 'language'  : language
-                        , 'series'    : title
-                        , 'isbn'      : issn
-                        }
-
-    keep_only_tags    = [dict(attrs={'class':['fotos', 'header_nota', 'nota']})]
-    remove_tags       = [dict(name=['meta','link','iframe','embed','object'])]
-    remove_attributes = ['lang']
-
-    feeds = [
-              (u'El Pais'       , u'http://elguardian.com.ar/RSS/el-pais.xml'       )
-             ,(u'Columnistas'   , u'http://elguardian.com.ar/RSS/columnistas.xml'   )
-             ,(u'Personajes'    , u'http://elguardian.com.ar/RSS/personajes.xml'    )
-             ,(u'Tinta roja'    , u'http://elguardian.com.ar/RSS/tinta-roja.xml'    )
-             ,(u'Yo fui'        , u'http://elguardian.com.ar/RSS/yo-fui.xml'        )
-             ,(u'Ciencia'       , u'http://elguardian.com.ar/RSS/ciencia.xml'       )
-             ,(u'Cronicas'      , u'http://elguardian.com.ar/RSS/cronicas.xml'      )
-             ,(u'Culturas'      , u'http://elguardian.com.ar/RSS/culturas.xml'      )
-             ,(u'DxT'           , u'http://elguardian.com.ar/RSS/dxt.xml'           )
-             ,(u'Fierros'       , u'http://elguardian.com.ar/RSS/fierros.xml'       )
-             ,(u'Frente fashion', u'http://elguardian.com.ar/RSS/frente-fashion.xml')
-             ,(u'Pan y vino'    , u'http://elguardian.com.ar/RSS/pan-y-vino.xml'    )
-             ,(u'Turismo'       , u'http://elguardian.com.ar/RSS/turismo.xml'       )
-            ]
-
-    def get_cover_url(self):
-        soup = self.index_to_soup('http://elguardian.com.ar/')
-        udata = soup.find('div', attrs={'class':'datosNumero'})
-        if udata:
-           sdata = udata.find('div')
-           if sdata:
-               stra = re.findall(r'\d+', self.tag_to_string(sdata))
-               self.conversion_options.update({'series_index':int(stra[1])})
-        unumero = soup.find('div', attrs={'class':'ultimoNumero'})
-        if unumero:
-           img = unumero.find('img', src=True)
-           if img:
-              return img['src']
-        return None
-
-    def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        for item in soup.findAll('a'):
-            limg = item.find('img')
-            if item.string is not None:
-               str = item.string
-               item.replaceWith(str)
-            else:
-               if limg:
-                  item.name = 'div'
-                  item.attrs = []
-               else:
-                   str = self.tag_to_string(item)
-                   item.replaceWith(str)
-        for item in soup.findAll('img'):
-            if not item.has_key('alt'):
-               item['alt'] = 'image'
-        return soup

From e143dc6642881edfc2866a87fd7a10e5d1deb787 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 24 Sep 2013 09:29:24 +0530
Subject: [PATCH 0869/1154] Content server: Sort virtual libraries by name

Fixes #1229459 [No sorted names of virtual libs. in browser](https://bugs.launchpad.net/calibre/+bug/1229459)
---
 src/calibre/library/server/browse.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 6496ac09b9..c52d0e301b 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -489,7 +489,7 @@ class BrowseServer(object):
 
         # Now do the category items
         vls = self.db.prefs.get('virtual_libraries', {})
-        categories['virt_libs'] = [Tag(k) for k, v in vls.iteritems()]
+        categories['virt_libs'] = sorted([Tag(k) for k, v in vls.iteritems()], key=lambda x:x.name)
         items = categories[category]
 
         sort = self.browse_sort_categories(items, sort)

From 4518d78b2f825ab999dd1544508df64b069f4230 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 24 Sep 2013 10:41:46 +0530
Subject: [PATCH 0870/1154] ...

---
 src/calibre/library/server/browse.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index c52d0e301b..383d53f849 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -489,7 +489,7 @@ class BrowseServer(object):
 
         # Now do the category items
         vls = self.db.prefs.get('virtual_libraries', {})
-        categories['virt_libs'] = sorted([Tag(k) for k, v in vls.iteritems()], key=lambda x:x.name)
+        categories['virt_libs'] = sorted([Tag(k) for k, v in vls.iteritems()], key=lambda x:sort_key(x.name))
         items = categories[category]
 
         sort = self.browse_sort_categories(items, sort)

From dc18dbd5b0d1aad09dfdf80abfaf4cc0ec72be81 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 24 Sep 2013 18:37:14 +0530
Subject: [PATCH 0871/1154] ...

---
 src/calibre/ebooks/docx/settings.py | 4 +++-
 src/calibre/ebooks/docx/to_html.py  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/docx/settings.py b/src/calibre/ebooks/docx/settings.py
index 193c5bd3cb..be85fb9f5e 100644
--- a/src/calibre/ebooks/docx/settings.py
+++ b/src/calibre/ebooks/docx/settings.py
@@ -10,8 +10,10 @@ from calibre.ebooks.docx.names import XPath, get
 
 class Settings(object):
 
-    def __init__(self, root):
+    def __init__(self):
         self.default_tab_stop = 720 / 20
+
+    def __call__(self, root):
         for dts in XPath('//w:defaultTabStop[@w:val]')(root):
             try:
                 self.default_tab_stop = int(get(dts, 'w:val')) / 20
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index fa414b9503..c6b2e230d4 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -55,6 +55,7 @@ class Convert(object):
         self.mi = self.docx.metadata
         self.body = BODY()
         self.theme = Theme()
+        self.settings = Settings()
         self.tables = Tables()
         self.fields = Fields()
         self.styles = Styles(self.tables)
@@ -267,7 +268,7 @@ class Convert(object):
             except KeyError:
                 self.log.warn('Settings %s do not exist' % sename)
             else:
-                self.settings = Settings(fromstring(seraw))
+                self.settings(fromstring(seraw))
 
         if foname is not None:
             try:

From b2dc29019a7c0b89a81e9cd5d404b6fd2de917e6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 24 Sep 2013 22:13:46 +0530
Subject: [PATCH 0872/1154] Update Slate

---
 recipes/slate.recipe | 79 +++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 49 deletions(-)

diff --git a/recipes/slate.recipe b/recipes/slate.recipe
index 28d35a415e..49565d6a50 100644
--- a/recipes/slate.recipe
+++ b/recipes/slate.recipe
@@ -7,31 +7,28 @@ __license__   = 'GPL v3'
 calibre recipe for slate.com
 '''
 
-import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
 
 class Slate(BasicNewsRecipe):
+    title = 'Slate'
     description             = 'A general-interest publication offering analysis and commentary about politics, news and culture.'
     __author__              = 'Kovid Goyal'
     timefmt                 = ''
     no_stylesheets          = True
     language = 'en'
-    title = 'Slate'
-    INDEX = 'http://slate.com'
     encoding = 'utf-8'
-    preprocess_regexps = [
-            (re.compile(r'<!--.*?-->', re.DOTALL), lambda x: ''),
-            (re.compile(r'^.*?<html', re.DOTALL), lambda x:'<html'),
-            (re.compile(r'<meta[^>]+?/>', re.DOTALL), lambda x:''),
-            ]
-    remove_tags = [
-            {'name':['link', 'script']},
-            {'class':['share-box-flank', 'sl-crumbs', 'sl-tbar',
-                'sl-chunky-tbar']},
-            ]
-    remove_tags_after = [{'class':'sl-art-creds-cntr'}]
-    keep_only_tags = {'class':'sl-body-wrapper'}
+    masthead_url = 'http://img.slate.com/images/redesign2008/slate_logo.gif'
     remove_attributes = ['style']
+    INDEX = 'http://slate.com'
+
+    keep_only_tags = [
+        dict(name='header', attrs={'class':'article-header'}),
+        dict(name='section', attrs={'class':'content'}),
+    ]
+    remove_tags = [
+        dict(id='header_social'),
+        dict(attrs={'class':['prop-name', 'prop-desc', 'authorbox']}),
+    ]
 
     def print_version(self, url):
         return url.replace('.html', '.single.html')
@@ -49,48 +46,32 @@ class Slate(BasicNewsRecipe):
                 ('Double X', '/articles/double_x.html'),
                 ):
             url = self.INDEX + url
-            self.log('Found section:', sectitle)
+            self.log('\nFound section:', sectitle)
             articles = self.slate_section_articles(self.index_to_soup(url))
             if articles:
                 ans.append((sectitle, articles))
+            if self.test and len(ans) > 1:
+                break
         return ans
 
     def slate_section_articles(self, soup):
-        cont = soup.find('div', id='most_read')
-        seen = set()
         ans = []
-        for h4 in cont.findAll('h4'):
-            a = h4.find('a', href=True)
-            if a is None: continue
+        main = soup.find('article', attrs={'class':'main'})
+        for a in main.findAll('a', attrs={'class':'primary'}):
             url = a['href']
-            if url.startswith('/'):
-                url = self.INDEX + url
-            if url in seen: continue
-            seen.add(url)
-            title = self.tag_to_string(a)
-            parent = h4.parent
-            h3 = parent.find('h3')
+            if url.endswith('/'):
+                continue
+            p = a.parent
+            title = p.find(attrs={'class':'hed'})
+            if title is None:
+                continue
+            title = self.tag_to_string(title)
+            span = p.find(attrs={'class':'byline'})
             desc = ''
-            if h3 is not None:
-                desc = self.tag_to_string(h3)
-            a = parent.find('a', rel='author')
-            if a is not None:
-                a = self.tag_to_string(a)
-            art = {'title':title, 'description':desc, 'date':'', 'url':url}
-            if a:
-                art['author'] = a
-            self.log('\tFound article:', title, ' by ', a)
-            ans.append(art)
+            if span is not None:
+                desc = self.tag_to_string(span)
+            self.log('\t' + title)
+            self.log('\t\t' + url)
+            ans.append({'title':title, 'description':desc, 'date':'', 'url':url})
         return ans
 
-    def get_masthead_url(self):
-        masthead = 'http://img.slate.com/images/redesign2008/slate_logo.gif'
-        br = BasicNewsRecipe.get_browser(self)
-        try:
-            br.open(masthead)
-        except:
-            self.log("\nMasthead unavailable")
-            masthead = None
-        return masthead
-
-

From 90f095a8a5b4b5b8b78c76e080069e6d193893f9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 07:22:19 +0530
Subject: [PATCH 0873/1154] ...

---
 recipes/science_aas.recipe | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/science_aas.recipe b/recipes/science_aas.recipe
index f2810fdeaa..b0c82cf060 100644
--- a/recipes/science_aas.recipe
+++ b/recipes/science_aas.recipe
@@ -21,7 +21,7 @@ class ScienceAAS(BasicNewsRecipe):
     delay                  = 1
     timefmt                = ' [%A, %d %B, %Y]'
     needs_subscription     = True
-    LOGIN = 'http://www.sciencemag.org/cgi/login?uri=%2Findex.dtl'
+    LOGIN = 'http://www.sciencemag.org/cgi/login'
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
@@ -29,10 +29,10 @@ class ScienceAAS(BasicNewsRecipe):
             br.open(self.LOGIN)
             br.select_form(nr=0)
             br['username'] = self.username
-            br['code'    ] = self.password
+            br['code'] = self.password
             br.submit()
         return br
 
-    keep_only_tags = [ dict(name='div', attrs={'id':'content-block'}) ]
+    keep_only_tags = [dict(name='div', attrs={'id':'content-block'})]
 
     feeds       = [(u"Science: Current Issue", u'http://www.sciencemag.org/rss/current.xml')]

From cc3466eee1f213a3761ac49da726520f55e18f94 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Tue, 24 Sep 2013 22:02:47 -0400
Subject: [PATCH 0874/1154] Update markdown to 2.3.1.

---
 src/calibre/ebooks/markdown/__init__.py       | 443 +++++++++++++
 src/calibre/ebooks/markdown/__main__.py       |  87 +++
 src/calibre/ebooks/markdown/__version__.py    |  28 +
 src/calibre/ebooks/markdown/blockparser.py    |  24 +-
 .../ebooks/markdown/blockprocessors.py        | 312 ++++++---
 src/calibre/ebooks/markdown/commandline.py    |  96 ---
 src/calibre/ebooks/markdown/etree_loader.py   |  35 -
 .../ebooks/markdown/extensions/__init__.py    |  53 ++
 .../ebooks/markdown/extensions/abbr.py        |  24 +-
 .../ebooks/markdown/extensions/admonition.py  | 118 ++++
 .../ebooks/markdown/extensions/attr_list.py   | 140 ++++
 .../ebooks/markdown/extensions/codehilite.py  | 226 ++++---
 .../ebooks/markdown/extensions/def_list.py    |  43 +-
 .../ebooks/markdown/extensions/extra.py       |  15 +-
 .../ebooks/markdown/extensions/fenced_code.py | 123 ++--
 .../ebooks/markdown/extensions/footnotes.py   | 183 +++---
 .../ebooks/markdown/extensions/headerid.py    | 211 +++---
 .../ebooks/markdown/extensions/meta.py        |  36 +-
 .../ebooks/markdown/extensions/nl2br.py       |  38 ++
 src/calibre/ebooks/markdown/extensions/rss.py | 114 ----
 .../ebooks/markdown/extensions/sane_lists.py  |  51 ++
 .../markdown/extensions/smart_strong.py       |  42 ++
 .../ebooks/markdown/extensions/tables.py      |  25 +-
 src/calibre/ebooks/markdown/extensions/toc.py | 235 ++++---
 .../ebooks/markdown/extensions/wikilinks.py   |  74 +--
 src/calibre/ebooks/markdown/inlinepatterns.py | 276 +++++---
 src/calibre/ebooks/markdown/markdown.py       | 612 ------------------
 src/calibre/ebooks/markdown/odict.py          | 120 ++--
 src/calibre/ebooks/markdown/postprocessors.py |  53 +-
 src/calibre/ebooks/markdown/preprocessors.py  | 248 ++++---
 .../markdown/{html4.py => serializers.py}     | 143 ++--
 src/calibre/ebooks/markdown/treeprocessors.py | 119 ++--
 src/calibre/ebooks/markdown/util.py           | 136 ++++
 src/calibre/ebooks/txt/processor.py           |   4 +-
 34 files changed, 2671 insertions(+), 1816 deletions(-)
 create mode 100644 src/calibre/ebooks/markdown/__main__.py
 create mode 100644 src/calibre/ebooks/markdown/__version__.py
 delete mode 100644 src/calibre/ebooks/markdown/commandline.py
 delete mode 100644 src/calibre/ebooks/markdown/etree_loader.py
 create mode 100644 src/calibre/ebooks/markdown/extensions/admonition.py
 create mode 100644 src/calibre/ebooks/markdown/extensions/attr_list.py
 create mode 100644 src/calibre/ebooks/markdown/extensions/nl2br.py
 delete mode 100644 src/calibre/ebooks/markdown/extensions/rss.py
 create mode 100644 src/calibre/ebooks/markdown/extensions/sane_lists.py
 create mode 100644 src/calibre/ebooks/markdown/extensions/smart_strong.py
 delete mode 100644 src/calibre/ebooks/markdown/markdown.py
 rename src/calibre/ebooks/markdown/{html4.py => serializers.py} (71%)
 create mode 100644 src/calibre/ebooks/markdown/util.py

diff --git a/src/calibre/ebooks/markdown/__init__.py b/src/calibre/ebooks/markdown/__init__.py
index e69de29bb2..ca99c59b7b 100644
--- a/src/calibre/ebooks/markdown/__init__.py
+++ b/src/calibre/ebooks/markdown/__init__.py
@@ -0,0 +1,443 @@
+"""
+Python Markdown
+===============
+
+Python Markdown converts Markdown to HTML and can be used as a library or
+called from the command line.
+
+## Basic usage as a module:
+
+    import markdown
+    html = markdown.markdown(your_text_string)
+
+See <http://packages.python.org/Markdown/> for more
+information and instructions on how to extend the functionality of
+Python Markdown.  Read that before you try modifying this file.
+
+## Authors and License
+
+Started by [Manfred Stienstra](http://www.dwerg.net/).  Continued and
+maintained  by [Yuri Takhteyev](http://www.freewisdom.org), [Waylan
+Limberg](http://achinghead.com/) and [Artem Yunusov](http://blog.splyer.com).
+
+Contact: markdown@freewisdom.org
+
+Copyright 2007-2013 The Python Markdown Project (v. 1.7 and later)
+Copyright 200? Django Software Foundation (OrderedDict implementation)
+Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
+Copyright 2004 Manfred Stienstra (the original version)
+
+License: BSD (see LICENSE for details).
+"""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from .__version__ import version, version_info
+import re
+import codecs
+import sys
+import logging
+from . import util
+from .preprocessors import build_preprocessors
+from .blockprocessors import build_block_parser
+from .treeprocessors import build_treeprocessors
+from .inlinepatterns import build_inlinepatterns
+from .postprocessors import build_postprocessors
+from .extensions import Extension
+from .serializers import to_html_string, to_xhtml_string
+
+__all__ = ['Markdown', 'markdown', 'markdownFromFile']
+
+logger = logging.getLogger('MARKDOWN')
+
+
+class Markdown(object):
+    """Convert Markdown to HTML."""
+
+    doc_tag = "div"     # Element used to wrap document - later removed
+
+    option_defaults = {
+        'html_replacement_text' : '[HTML_REMOVED]',
+        'tab_length'            : 4,
+        'enable_attributes'     : True,
+        'smart_emphasis'        : True,
+        'lazy_ol'               : True,
+    }
+
+    output_formats = {
+        'html'  : to_html_string,
+        'html4' : to_html_string,
+        'html5' : to_html_string,
+        'xhtml' : to_xhtml_string,
+        'xhtml1': to_xhtml_string,
+        'xhtml5': to_xhtml_string,
+    }
+
+    ESCAPED_CHARS = ['\\', '`', '*', '_', '{', '}', '[', ']',
+                    '(', ')', '>', '#', '+', '-', '.', '!']
+
+    def __init__(self, *args, **kwargs):
+        """
+        Creates a new Markdown instance.
+
+        Keyword arguments:
+
+        * extensions: A list of extensions.
+           If they are of type string, the module mdx_name.py will be loaded.
+           If they are a subclass of markdown.Extension, they will be used
+           as-is.
+        * extension_configs: Configuration settingis for extensions.
+        * output_format: Format of output. Supported formats are:
+            * "xhtml1": Outputs XHTML 1.x. Default.
+            * "xhtml5": Outputs XHTML style tags of HTML 5
+            * "xhtml": Outputs latest supported version of XHTML (currently XHTML 1.1).
+            * "html4": Outputs HTML 4
+            * "html5": Outputs HTML style tags of HTML 5
+            * "html": Outputs latest supported version of HTML (currently HTML 4).
+            Note that it is suggested that the more specific formats ("xhtml1"
+            and "html4") be used as "xhtml" or "html" may change in the future
+            if it makes sense at that time.
+        * safe_mode: Disallow raw html. One of "remove", "replace" or "escape".
+        * html_replacement_text: Text used when safe_mode is set to "replace".
+        * tab_length: Length of tabs in the source. Default: 4
+        * enable_attributes: Enable the conversion of attributes. Default: True
+        * smart_emphasis: Treat `_connected_words_` intelegently Default: True
+        * lazy_ol: Ignore number of first item of ordered lists. Default: True
+
+        """
+
+        # For backward compatibility, loop through old positional args
+        pos = ['extensions', 'extension_configs', 'safe_mode', 'output_format']
+        c = 0
+        for arg in args:
+            if pos[c] not in kwargs:
+                kwargs[pos[c]] = arg
+            c += 1
+            if c == len(pos):
+                # ignore any additional args
+                break
+
+        # Loop through kwargs and assign defaults
+        for option, default in self.option_defaults.items():
+            setattr(self, option, kwargs.get(option, default))
+
+        self.safeMode = kwargs.get('safe_mode', False)
+        if self.safeMode and 'enable_attributes' not in kwargs:
+            # Disable attributes in safeMode when not explicitly set
+            self.enable_attributes = False
+
+        self.registeredExtensions = []
+        self.docType = ""
+        self.stripTopLevelTags = True
+
+        self.build_parser()
+
+        self.references = {}
+        self.htmlStash = util.HtmlStash()
+        self.set_output_format(kwargs.get('output_format', 'xhtml1'))
+        self.registerExtensions(extensions=kwargs.get('extensions', []),
+                                configs=kwargs.get('extension_configs', {}))
+        self.reset()
+
+    def build_parser(self):
+        """ Build the parser from the various parts. """
+        self.preprocessors = build_preprocessors(self)
+        self.parser = build_block_parser(self)
+        self.inlinePatterns = build_inlinepatterns(self)
+        self.treeprocessors = build_treeprocessors(self)
+        self.postprocessors = build_postprocessors(self)
+        return self
+
+    def registerExtensions(self, extensions, configs):
+        """
+        Register extensions with this instance of Markdown.
+
+        Keyword arguments:
+
+        * extensions: A list of extensions, which can either
+           be strings or objects.  See the docstring on Markdown.
+        * configs: A dictionary mapping module names to config options.
+
+        """
+        for ext in extensions:
+            if isinstance(ext, util.string_type):
+                ext = self.build_extension(ext, configs.get(ext, []))
+            if isinstance(ext, Extension):
+                ext.extendMarkdown(self, globals())
+            elif ext is not None:
+                raise TypeError(
+                    'Extension "%s.%s" must be of type: "markdown.Extension"'
+                    % (ext.__class__.__module__, ext.__class__.__name__))
+
+        return self
+
+    def build_extension(self, ext_name, configs = []):
+        """Build extension by name, then return the module.
+
+        The extension name may contain arguments as part of the string in the
+        following format: "extname(key1=value1,key2=value2)"
+
+        """
+
+        # Parse extensions config params (ignore the order)
+        configs = dict(configs)
+        pos = ext_name.find("(") # find the first "("
+        if pos > 0:
+            ext_args = ext_name[pos+1:-1]
+            ext_name = ext_name[:pos]
+            pairs = [x.split("=") for x in ext_args.split(",")]
+            configs.update([(x.strip(), y.strip()) for (x, y) in pairs])
+
+        # Setup the module name
+        module_name = ext_name
+        if '.' not in ext_name:
+            module_name = '.'.join(['calibre.ebooks.markdown.extensions', ext_name])
+
+        # Try loading the extension first from one place, then another
+        try: # New style (markdown.extensons.<extension>)
+            module = __import__(module_name, {}, {}, [module_name.rpartition('.')[0]])
+        except ImportError:
+            module_name_old_style = '_'.join(['mdx', ext_name])
+            try: # Old style (mdx_<extension>)
+                module = __import__(module_name_old_style)
+            except ImportError as e:
+                message = "Failed loading extension '%s' from '%s' or '%s'" \
+                    % (ext_name, module_name, module_name_old_style)
+                e.args = (message,) + e.args[1:]
+                raise
+
+        # If the module is loaded successfully, we expect it to define a
+        # function called makeExtension()
+        try:
+            return module.makeExtension(configs.items())
+        except AttributeError as e:
+            message = e.args[0]
+            message = "Failed to initiate extension " \
+                      "'%s': %s" % (ext_name, message)
+            e.args = (message,) + e.args[1:]
+            raise
+
+    def registerExtension(self, extension):
+        """ This gets called by the extension """
+        self.registeredExtensions.append(extension)
+        return self
+
+    def reset(self):
+        """
+        Resets all state variables so that we can start with a new text.
+        """
+        self.htmlStash.reset()
+        self.references.clear()
+
+        for extension in self.registeredExtensions:
+            if hasattr(extension, 'reset'):
+                extension.reset()
+
+        return self
+
+    def set_output_format(self, format):
+        """ Set the output format for the class instance. """
+        self.output_format = format.lower()
+        try:
+            self.serializer = self.output_formats[self.output_format]
+        except KeyError as e:
+            valid_formats = list(self.output_formats.keys())
+            valid_formats.sort()
+            message = 'Invalid Output Format: "%s". Use one of %s.' \
+                       % (self.output_format, 
+                          '"' + '", "'.join(valid_formats) + '"')
+            e.args = (message,) + e.args[1:]
+            raise
+        return self
+
+    def convert(self, source):
+        """
+        Convert markdown to serialized XHTML or HTML.
+
+        Keyword arguments:
+
+        * source: Source text as a Unicode string.
+
+        Markdown processing takes place in five steps:
+
+        1. A bunch of "preprocessors" munge the input text.
+        2. BlockParser() parses the high-level structural elements of the
+           pre-processed text into an ElementTree.
+        3. A bunch of "treeprocessors" are run against the ElementTree. One
+           such treeprocessor runs InlinePatterns against the ElementTree,
+           detecting inline markup.
+        4. Some post-processors are run against the text after the ElementTree
+           has been serialized into text.
+        5. The output is written to a string.
+
+        """
+
+        # Fixup the source text
+        if not source.strip():
+            return ''  # a blank unicode string
+
+        try:
+            source = util.text_type(source)
+        except UnicodeDecodeError as e:
+            # Customise error message while maintaining original trackback
+            e.reason += '. -- Note: Markdown only accepts unicode input!'
+            raise
+
+        # Split into lines and run the line preprocessors.
+        self.lines = source.split("\n")
+        for prep in self.preprocessors.values():
+            self.lines = prep.run(self.lines)
+
+        # Parse the high-level elements.
+        root = self.parser.parseDocument(self.lines).getroot()
+
+        # Run the tree-processors
+        for treeprocessor in self.treeprocessors.values():
+            newRoot = treeprocessor.run(root)
+            if newRoot:
+                root = newRoot
+
+        # Serialize _properly_.  Strip top-level tags.
+        output = self.serializer(root)
+        if self.stripTopLevelTags:
+            try:
+                start = output.index('<%s>'%self.doc_tag)+len(self.doc_tag)+2
+                end = output.rindex('</%s>'%self.doc_tag)
+                output = output[start:end].strip()
+            except ValueError:
+                if output.strip().endswith('<%s />'%self.doc_tag):
+                    # We have an empty document
+                    output = ''
+                else:
+                    # We have a serious problem
+                    raise ValueError('Markdown failed to strip top-level tags. Document=%r' % output.strip())
+
+        # Run the text post-processors
+        for pp in self.postprocessors.values():
+            output = pp.run(output)
+
+        return output.strip()
+
+    def convertFile(self, input=None, output=None, encoding=None):
+        """Converts a markdown file and returns the HTML as a unicode string.
+
+        Decodes the file using the provided encoding (defaults to utf-8),
+        passes the file content to markdown, and outputs the html to either
+        the provided stream or the file with provided name, using the same
+        encoding as the source file. The 'xmlcharrefreplace' error handler is
+        used when encoding the output.
+
+        **Note:** This is the only place that decoding and encoding of unicode
+        takes place in Python-Markdown.  (All other code is unicode-in /
+        unicode-out.)
+
+        Keyword arguments:
+
+        * input: File object or path. Reads from stdin if `None`.
+        * output: File object or path. Writes to stdout if `None`.
+        * encoding: Encoding of input and output files. Defaults to utf-8.
+
+        """
+
+        encoding = encoding or "utf-8"
+
+        # Read the source
+        if input:
+            if isinstance(input, util.string_type):
+                input_file = codecs.open(input, mode="r", encoding=encoding)
+            else:
+                input_file = codecs.getreader(encoding)(input)
+            text = input_file.read()
+            input_file.close()
+        else:
+            text = sys.stdin.read()
+            if not isinstance(text, util.text_type):
+                text = text.decode(encoding)
+
+        text = text.lstrip('\ufeff') # remove the byte-order mark
+
+        # Convert
+        html = self.convert(text)
+
+        # Write to file or stdout
+        if output:
+            if isinstance(output, util.string_type):
+                output_file = codecs.open(output, "w",
+                                          encoding=encoding,
+                                          errors="xmlcharrefreplace")
+                output_file.write(html)
+                output_file.close()
+            else:
+                writer = codecs.getwriter(encoding)
+                output_file = writer(output, errors="xmlcharrefreplace")
+                output_file.write(html)
+                # Don't close here. User may want to write more.
+        else:
+            # Encode manually and write bytes to stdout. 
+            html = html.encode(encoding, "xmlcharrefreplace")
+            try:
+                # Write bytes directly to buffer (Python 3).
+                sys.stdout.buffer.write(html)
+            except AttributeError:
+                # Probably Python 2, which works with bytes by default.
+                sys.stdout.write(html)
+
+        return self
+
+
+"""
+EXPORTED FUNCTIONS
+=============================================================================
+
+Those are the two functions we really mean to export: markdown() and
+markdownFromFile().
+"""
+
+def markdown(text, *args, **kwargs):
+    """Convert a markdown string to HTML and return HTML as a unicode string.
+
+    This is a shortcut function for `Markdown` class to cover the most
+    basic use case.  It initializes an instance of Markdown, loads the
+    necessary extensions and runs the parser on the given text.
+
+    Keyword arguments:
+
+    * text: Markdown formatted text as Unicode or ASCII string.
+    * Any arguments accepted by the Markdown class.
+
+    Returns: An HTML document as a string.
+
+    """
+    md = Markdown(*args, **kwargs)
+    return md.convert(text)
+
+
+def markdownFromFile(*args, **kwargs):
+    """Read markdown code from a file and write it to a file or a stream.
+
+    This is a shortcut function which initializes an instance of Markdown,
+    and calls the convertFile method rather than convert.
+
+    Keyword arguments:
+
+    * input: a file name or readable object.
+    * output: a file name or writable object.
+    * encoding: Encoding of input and output.
+    * Any arguments accepted by the Markdown class.
+
+    """
+    # For backward compatibility loop through positional args
+    pos = ['input', 'output', 'extensions', 'encoding']
+    c = 0
+    for arg in args:
+        if pos[c] not in kwargs:
+            kwargs[pos[c]] = arg
+        c += 1
+        if c == len(pos):
+            break
+
+    md = Markdown(**kwargs)
+    md.convertFile(kwargs.get('input', None),
+                   kwargs.get('output', None),
+                   kwargs.get('encoding', None))
+
diff --git a/src/calibre/ebooks/markdown/__main__.py b/src/calibre/ebooks/markdown/__main__.py
new file mode 100644
index 0000000000..8ee8c8222e
--- /dev/null
+++ b/src/calibre/ebooks/markdown/__main__.py
@@ -0,0 +1,87 @@
+"""
+COMMAND-LINE SPECIFIC STUFF
+=============================================================================
+
+"""
+
+import markdown
+import sys
+import optparse
+
+import logging
+from logging import DEBUG, INFO, CRITICAL
+
+logger =  logging.getLogger('MARKDOWN')
+
+def parse_options():
+    """
+    Define and parse `optparse` options for command-line usage.
+    """
+    usage = """%prog [options] [INPUTFILE]
+       (STDIN is assumed if no INPUTFILE is given)"""
+    desc = "A Python implementation of John Gruber's Markdown. " \
+           "http://packages.python.org/Markdown/"
+    ver = "%%prog %s" % markdown.version
+    
+    parser = optparse.OptionParser(usage=usage, description=desc, version=ver)
+    parser.add_option("-f", "--file", dest="filename", default=None,
+                      help="Write output to OUTPUT_FILE. Defaults to STDOUT.",
+                      metavar="OUTPUT_FILE")
+    parser.add_option("-e", "--encoding", dest="encoding",
+                      help="Encoding for input and output files.",)
+    parser.add_option("-q", "--quiet", default = CRITICAL,
+                      action="store_const", const=CRITICAL+10, dest="verbose",
+                      help="Suppress all warnings.")
+    parser.add_option("-v", "--verbose",
+                      action="store_const", const=INFO, dest="verbose",
+                      help="Print all warnings.")
+    parser.add_option("-s", "--safe", dest="safe", default=False,
+                      metavar="SAFE_MODE",
+                      help="'replace', 'remove' or 'escape' HTML tags in input")
+    parser.add_option("-o", "--output_format", dest="output_format", 
+                      default='xhtml1', metavar="OUTPUT_FORMAT",
+                      help="'xhtml1' (default), 'html4' or 'html5'.")
+    parser.add_option("--noisy",
+                      action="store_const", const=DEBUG, dest="verbose",
+                      help="Print debug messages.")
+    parser.add_option("-x", "--extension", action="append", dest="extensions",
+                      help = "Load extension EXTENSION.", metavar="EXTENSION")
+    parser.add_option("-n", "--no_lazy_ol", dest="lazy_ol", 
+                      action='store_false', default=True,
+                      help="Observe number of first item of ordered lists.")
+
+    (options, args) = parser.parse_args()
+
+    if len(args) == 0:
+        input_file = None
+    else:
+        input_file = args[0]
+
+    if not options.extensions:
+        options.extensions = []
+
+    return {'input': input_file,
+            'output': options.filename,
+            'safe_mode': options.safe,
+            'extensions': options.extensions,
+            'encoding': options.encoding,
+            'output_format': options.output_format,
+            'lazy_ol': options.lazy_ol}, options.verbose
+
+def run():
+    """Run Markdown from the command line."""
+
+    # Parse options and adjust logging level if necessary
+    options, logging_level = parse_options()
+    if not options: sys.exit(2)
+    logger.setLevel(logging_level)
+    logger.addHandler(logging.StreamHandler())
+
+    # Run
+    markdown.markdownFromFile(**options)
+
+if __name__ == '__main__':
+    # Support running module as a commandline command. 
+    # Python 2.5 & 2.6 do: `python -m markdown.__main__ [options] [args]`.
+    # Python 2.7 & 3.x do: `python -m markdown [options] [args]`.
+    run()
diff --git a/src/calibre/ebooks/markdown/__version__.py b/src/calibre/ebooks/markdown/__version__.py
new file mode 100644
index 0000000000..a13559c4e3
--- /dev/null
+++ b/src/calibre/ebooks/markdown/__version__.py
@@ -0,0 +1,28 @@
+#
+# markdown/__version__.py
+#
+# version_info should conform to PEP 386 
+# (major, minor, micro, alpha/beta/rc/final, #)
+# (1, 1, 2, 'alpha', 0) => "1.1.2.dev"
+# (1, 2, 0, 'beta', 2) => "1.2b2"
+version_info = (2, 3, 1, 'final', 0)
+
+def _get_version():
+    " Returns a PEP 386-compliant version number from version_info. "
+    assert len(version_info) == 5
+    assert version_info[3] in ('alpha', 'beta', 'rc', 'final')
+
+    parts = 2 if version_info[2] == 0 else 3
+    main = '.'.join(map(str, version_info[:parts]))
+
+    sub = ''
+    if version_info[3] == 'alpha' and version_info[4] == 0:
+        # TODO: maybe append some sort of git info here??
+        sub = '.dev'
+    elif version_info[3] != 'final':
+        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}
+        sub = mapping[version_info[3]] + str(version_info[4])
+
+    return str(main + sub)
+
+version = _get_version()
diff --git a/src/calibre/ebooks/markdown/blockparser.py b/src/calibre/ebooks/markdown/blockparser.py
index e18b338487..4504a16f51 100644
--- a/src/calibre/ebooks/markdown/blockparser.py
+++ b/src/calibre/ebooks/markdown/blockparser.py
@@ -1,5 +1,7 @@
-
-import markdown
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from . import util
+from . import odict
 
 class State(list):
     """ Track the current and nested state of the parser. 
@@ -41,9 +43,10 @@ class BlockParser:
     looping through them and creating an ElementTree object.
     """
 
-    def __init__(self):
-        self.blockprocessors = markdown.odict.OrderedDict()
+    def __init__(self, markdown):
+        self.blockprocessors = odict.OrderedDict()
         self.state = State()
+        self.markdown = markdown
 
     def parseDocument(self, lines):
         """ Parse a markdown document into an ElementTree. 
@@ -56,9 +59,9 @@ class BlockParser:
 
         """
         # Create a ElementTree from the lines
-        self.root = markdown.etree.Element(markdown.DOC_TAG)
+        self.root = util.etree.Element(self.markdown.doc_tag)
         self.parseChunk(self.root, '\n'.join(lines))
-        return markdown.etree.ElementTree(self.root)
+        return util.etree.ElementTree(self.root)
 
     def parseChunk(self, parent, text):
         """ Parse a chunk of markdown text and attach to given etree node. 
@@ -87,9 +90,10 @@ class BlockParser:
 
         """
         while blocks:
-           for processor in self.blockprocessors.values():
-               if processor.test(parent, blocks[0]):
-                   processor.run(parent, blocks)
-                   break
+            for processor in self.blockprocessors.values():
+                if processor.test(parent, blocks[0]):
+                    if processor.run(parent, blocks) is not False:
+                        # run returns True or None
+                        break
 
 
diff --git a/src/calibre/ebooks/markdown/blockprocessors.py b/src/calibre/ebooks/markdown/blockprocessors.py
index e42d0f55e6..61977b49a8 100644
--- a/src/calibre/ebooks/markdown/blockprocessors.py
+++ b/src/calibre/ebooks/markdown/blockprocessors.py
@@ -1,6 +1,6 @@
 """
 CORE MARKDOWN BLOCKPARSER
-=============================================================================
+===========================================================================
 
 This parser handles basic parsing of Markdown blocks.  It doesn't concern itself
 with inline elements such as **bold** or *italics*, but rather just catches
@@ -9,15 +9,38 @@ blocks, lists, quotes, etc.
 The BlockParser is made up of a bunch of BlockProssors, each handling a
 different type of block. Extensions may add/replace/remove BlockProcessors
 as they need to alter how markdown blocks are parsed.
-
 """
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+import logging
 import re
-import markdown
+from . import util
+from .blockparser import BlockParser
+
+logger =  logging.getLogger('MARKDOWN')
+
+
+def build_block_parser(md_instance, **kwargs):
+    """ Build the default block parser used by Markdown. """
+    parser = BlockParser(md_instance)
+    parser.blockprocessors['empty'] = EmptyBlockProcessor(parser)
+    parser.blockprocessors['indent'] = ListIndentProcessor(parser)
+    parser.blockprocessors['code'] = CodeBlockProcessor(parser)
+    parser.blockprocessors['hashheader'] = HashHeaderProcessor(parser)
+    parser.blockprocessors['setextheader'] = SetextHeaderProcessor(parser)
+    parser.blockprocessors['hr'] = HRProcessor(parser)
+    parser.blockprocessors['olist'] = OListProcessor(parser)
+    parser.blockprocessors['ulist'] = UListProcessor(parser)
+    parser.blockprocessors['quote'] = BlockQuoteProcessor(parser)
+    parser.blockprocessors['paragraph'] = ParagraphProcessor(parser)
+    return parser
+
 
 class BlockProcessor:
-    """ Base class for block processors.
-
+    """ Base class for block processors. 
+    
     Each subclass will provide the methods below to work with the source and
     tree. Each processor will need to define it's own ``test`` and ``run``
     methods. The ``test`` method should return True or False, to indicate
@@ -26,8 +49,9 @@ class BlockProcessor:
 
     """
 
-    def __init__(self, parser=None):
+    def __init__(self, parser):
         self.parser = parser
+        self.tab_length = parser.markdown.tab_length
 
     def lastChild(self, parent):
         """ Return the last child of an etree element. """
@@ -41,8 +65,8 @@ class BlockProcessor:
         newtext = []
         lines = text.split('\n')
         for line in lines:
-            if line.startswith(' '*markdown.TAB_LENGTH):
-                newtext.append(line[markdown.TAB_LENGTH:])
+            if line.startswith(' '*self.tab_length):
+                newtext.append(line[self.tab_length:])
             elif not line.strip():
                 newtext.append('')
             else:
@@ -53,37 +77,37 @@ class BlockProcessor:
         """ Remove a tab from front of lines but allowing dedented lines. """
         lines = text.split('\n')
         for i in range(len(lines)):
-            if lines[i].startswith(' '*markdown.TAB_LENGTH*level):
-                lines[i] = lines[i][markdown.TAB_LENGTH*level:]
+            if lines[i].startswith(' '*self.tab_length*level):
+                lines[i] = lines[i][self.tab_length*level:]
         return '\n'.join(lines)
 
     def test(self, parent, block):
-        """ Test for block type. Must be overridden by subclasses.
-
+        """ Test for block type. Must be overridden by subclasses. 
+        
         As the parser loops through processors, it will call the ``test`` method
         on each to determine if the given block of text is of that type. This
         method must return a boolean ``True`` or ``False``. The actual method of
-        testing is left to the needs of that particular block type. It could
+        testing is left to the needs of that particular block type. It could 
         be as simple as ``block.startswith(some_string)`` or a complex regular
         expression. As the block type may be different depending on the parent
-        of the block (i.e. inside a list), the parent etree element is also
+        of the block (i.e. inside a list), the parent etree element is also 
         provided and may be used as part of the test.
 
         Keywords:
-
+        
         * ``parent``: A etree element which will be the parent of the block.
-        * ``block``: A block of text from the source which has been split at
+        * ``block``: A block of text from the source which has been split at 
             blank lines.
         """
         pass
 
     def run(self, parent, blocks):
-        """ Run processor. Must be overridden by subclasses.
-
+        """ Run processor. Must be overridden by subclasses. 
+        
         When the parser determines the appropriate type of a block, the parser
         will call the corresponding processor's ``run`` method. This method
         should parse the individual lines of the block and append them to
-        the etree.
+        the etree. 
 
         Note that both the ``parent`` and ``etree`` keywords are pointers
         to instances of the objects which should be edited in place. Each
@@ -103,8 +127,8 @@ class BlockProcessor:
 
 
 class ListIndentProcessor(BlockProcessor):
-    """ Process children of list items.
-
+    """ Process children of list items. 
+    
     Example:
         * a list item
             process this part
@@ -113,12 +137,15 @@ class ListIndentProcessor(BlockProcessor):
 
     """
 
-    INDENT_RE = re.compile(r'^(([ ]{%s})+)'% markdown.TAB_LENGTH)
     ITEM_TYPES = ['li']
     LIST_TYPES = ['ul', 'ol']
 
+    def __init__(self, *args):
+        BlockProcessor.__init__(self, *args)
+        self.INDENT_RE = re.compile(r'^(([ ]{%s})+)'% self.tab_length)
+
     def test(self, parent, block):
-        return block.startswith(' '*markdown.TAB_LENGTH) and \
+        return block.startswith(' '*self.tab_length) and \
                 not self.parser.state.isstate('detabbed') and  \
                 (parent.tag in self.ITEM_TYPES or \
                     (len(parent) and parent[-1] and \
@@ -133,8 +160,16 @@ class ListIndentProcessor(BlockProcessor):
 
         self.parser.state.set('detabbed')
         if parent.tag in self.ITEM_TYPES:
-            # The parent is already a li. Just parse the child block.
-            self.parser.parseBlocks(parent, [block])
+            # It's possible that this parent has a 'ul' or 'ol' child list
+            # with a member.  If that is the case, then that should be the
+            # parent.  This is intended to catch the edge case of an indented 
+            # list whose first member was parsed previous to this point
+            # see OListProcessor
+            if len(parent) and parent[-1].tag in self.LIST_TYPES:
+                self.parser.parseBlocks(parent[-1], [block])
+            else:
+                # The parent is already a li. Just parse the child block.
+                self.parser.parseBlocks(parent, [block])
         elif sibling.tag in self.ITEM_TYPES:
             # The sibling is a li. Use it as parent.
             self.parser.parseBlocks(sibling, [block])
@@ -143,8 +178,12 @@ class ListIndentProcessor(BlockProcessor):
             # Assume the last child li is the parent of this block.
             if sibling[-1].text:
                 # If the parent li has text, that text needs to be moved to a p
-                block = '%s\n\n%s' % (sibling[-1].text, block)
+                # The p must be 'inserted' at beginning of list in the event
+                # that other children already exist i.e.; a nested sublist.
+                p = util.etree.Element('p')
+                p.text = sibling[-1].text
                 sibling[-1].text = ''
+                sibling[-1].insert(0, p)
             self.parser.parseChunk(sibling[-1], block)
         else:
             self.create_item(sibling, block)
@@ -152,15 +191,15 @@ class ListIndentProcessor(BlockProcessor):
 
     def create_item(self, parent, block):
         """ Create a new li and parse the block with it as the parent. """
-        li = markdown.etree.SubElement(parent, 'li')
+        li = util.etree.SubElement(parent, 'li')
         self.parser.parseBlocks(li, [block])
-
+ 
     def get_level(self, parent, block):
         """ Get level of indent based on list level. """
         # Get indent level
         m = self.INDENT_RE.match(block)
         if m:
-            indent_level = len(m.group(1))/markdown.TAB_LENGTH
+            indent_level = len(m.group(1))/self.tab_length
         else:
             indent_level = 0
         if self.parser.state.isstate('list'):
@@ -187,8 +226,8 @@ class CodeBlockProcessor(BlockProcessor):
     """ Process code blocks. """
 
     def test(self, parent, block):
-        return block.startswith(' '*markdown.TAB_LENGTH)
-
+        return block.startswith(' '*self.tab_length)
+    
     def run(self, parent, blocks):
         sibling = self.lastChild(parent)
         block = blocks.pop(0)
@@ -200,15 +239,15 @@ class CodeBlockProcessor(BlockProcessor):
             # linebreaks removed from the split into a list.
             code = sibling[0]
             block, theRest = self.detab(block)
-            code.text = markdown.AtomicString('%s\n%s\n' % (code.text, block.rstrip()))
+            code.text = util.AtomicString('%s\n%s\n' % (code.text, block.rstrip()))
         else:
             # This is a new codeblock. Create the elements and insert text.
-            pre = markdown.etree.SubElement(parent, 'pre')
-            code = markdown.etree.SubElement(pre, 'code')
+            pre = util.etree.SubElement(parent, 'pre')
+            code = util.etree.SubElement(pre, 'code')
             block, theRest = self.detab(block)
-            code.text = markdown.AtomicString('%s\n' % block.rstrip())
+            code.text = util.AtomicString('%s\n' % block.rstrip())
         if theRest:
-            # This block contained unindented line(s) after the first indented
+            # This block contained unindented line(s) after the first indented 
             # line. Insert these lines as the first block of the master blocks
             # list for future processing.
             blocks.insert(0, theRest)
@@ -229,7 +268,7 @@ class BlockQuoteProcessor(BlockProcessor):
             # Pass lines before blockquote in recursively for parsing forst.
             self.parser.parseBlocks(parent, [before])
             # Remove ``> `` from begining of each line.
-            block = '\n'.join([self.clean(line) for line in
+            block = '\n'.join([self.clean(line) for line in 
                             block[m.start():].split('\n')])
         sibling = self.lastChild(parent)
         if sibling and sibling.tag == "blockquote":
@@ -237,9 +276,12 @@ class BlockQuoteProcessor(BlockProcessor):
             quote = sibling
         else:
             # This is a new blockquote. Create a new parent element.
-            quote = markdown.etree.SubElement(parent, 'blockquote')
+            quote = util.etree.SubElement(parent, 'blockquote')
         # Recursively parse block with blockquote as parent.
+        # change parser state so blockquotes embedded in lists use p tags
+        self.parser.state.set('blockquote')
         self.parser.parseChunk(quote, block)
+        self.parser.state.reset()
 
     def clean(self, line):
         """ Remove ``>`` from beginning of a line. """
@@ -256,11 +298,18 @@ class OListProcessor(BlockProcessor):
 
     TAG = 'ol'
     # Detect an item (``1. item``). ``group(1)`` contains contents of item.
-    RE = re.compile(r'^[ ]{0,3}\d+\.[ ](.*)')
+    RE = re.compile(r'^[ ]{0,3}\d+\.[ ]+(.*)')
     # Detect items on secondary lines. they can be of either list type.
-    CHILD_RE = re.compile(r'^[ ]{0,3}((\d+\.)|[*+-])[ ](.*)')
+    CHILD_RE = re.compile(r'^[ ]{0,3}((\d+\.)|[*+-])[ ]+(.*)')
     # Detect indented (nested) items of either type
-    INDENT_RE = re.compile(r'^[ ]{4,7}((\d+\.)|[*+-])[ ].*')
+    INDENT_RE = re.compile(r'^[ ]{4,7}((\d+\.)|[*+-])[ ]+.*')
+    # The integer (python string) with which the lists starts (default=1)
+    # Eg: If list is intialized as)
+    #   3. Item
+    # The ol tag will get starts="3" attribute
+    STARTSWITH = '1'
+    # List of allowed sibling tags. 
+    SIBLING_TAGS = ['ol', 'ul']
 
     def test(self, parent, block):
         return bool(self.RE.match(block))
@@ -269,33 +318,58 @@ class OListProcessor(BlockProcessor):
         # Check fr multiple items in one block.
         items = self.get_items(blocks.pop(0))
         sibling = self.lastChild(parent)
-        if sibling and sibling.tag in ['ol', 'ul']:
+
+        if sibling and sibling.tag in self.SIBLING_TAGS:
             # Previous block was a list item, so set that as parent
             lst = sibling
-            # make sure previous item is in a p.
-            if len(lst) and lst[-1].text and not len(lst[-1]):
-                p = markdown.etree.SubElement(lst[-1], 'p')
+            # make sure previous item is in a p- if the item has text, then it
+            # it isn't in a p
+            if lst[-1].text: 
+                # since it's possible there are other children for this sibling,
+                # we can't just SubElement the p, we need to insert it as the 
+                # first item
+                p = util.etree.Element('p')
                 p.text = lst[-1].text
                 lst[-1].text = ''
+                lst[-1].insert(0, p)
+            # if the last item has a tail, then the tail needs to be put in a p
+            # likely only when a header is not followed by a blank line
+            lch = self.lastChild(lst[-1])
+            if lch is not None and lch.tail:
+                p = util.etree.SubElement(lst[-1], 'p')
+                p.text = lch.tail.lstrip()
+                lch.tail = ''
+
             # parse first block differently as it gets wrapped in a p.
-            li = markdown.etree.SubElement(lst, 'li')
+            li = util.etree.SubElement(lst, 'li')
             self.parser.state.set('looselist')
             firstitem = items.pop(0)
             self.parser.parseBlocks(li, [firstitem])
             self.parser.state.reset()
+        elif parent.tag in ['ol', 'ul']:
+            # this catches the edge case of a multi-item indented list whose 
+            # first item is in a blank parent-list item:
+            # * * subitem1
+            #     * subitem2
+            # see also ListIndentProcessor
+            lst = parent
         else:
             # This is a new list so create parent with appropriate tag.
-            lst = markdown.etree.SubElement(parent, self.TAG)
+            lst = util.etree.SubElement(parent, self.TAG)
+            # Check if a custom start integer is set
+            if not self.parser.markdown.lazy_ol and self.STARTSWITH !='1':
+                lst.attrib['start'] = self.STARTSWITH
+
         self.parser.state.set('list')
         # Loop through items in block, recursively parsing each with the
         # appropriate parent.
         for item in items:
-            if item.startswith(' '*markdown.TAB_LENGTH):
+            if item.startswith(' '*self.tab_length):
                 # Item is indented. Parse with last item as parent
                 self.parser.parseBlocks(lst[-1], [item])
             else:
                 # New item. Create li and parse with it as parent
-                li = markdown.etree.SubElement(lst, 'li')
+                li = util.etree.SubElement(lst, 'li')
                 self.parser.parseBlocks(li, [item])
         self.parser.state.reset()
 
@@ -305,11 +379,17 @@ class OListProcessor(BlockProcessor):
         for line in block.split('\n'):
             m = self.CHILD_RE.match(line)
             if m:
-                # This is a new item. Append
+                # This is a new list item
+                # Check first item for the start index
+                if not items and self.TAG=='ol':
+                    # Detect the integer value of first list item
+                    INTEGER_RE = re.compile('(\d+)')
+                    self.STARTSWITH = INTEGER_RE.match(m.group(1)).group()
+                # Append to the list
                 items.append(m.group(3))
             elif self.INDENT_RE.match(line):
                 # This is an indented (possibly nested) item.
-                if items[-1].startswith(' '*markdown.TAB_LENGTH):
+                if items[-1].startswith(' '*self.tab_length):
                     # Previous item was indented. Append to that item.
                     items[-1] = '%s\n%s' % (items[-1], line)
                 else:
@@ -324,7 +404,7 @@ class UListProcessor(OListProcessor):
     """ Process unordered list blocks. """
 
     TAG = 'ul'
-    RE = re.compile(r'^[ ]{0,3}[*+-][ ](.*)')
+    RE = re.compile(r'^[ ]{0,3}[*+-][ ]+(.*)')
 
 
 class HashHeaderProcessor(BlockProcessor):
@@ -348,21 +428,21 @@ class HashHeaderProcessor(BlockProcessor):
                 # recursively parse this lines as a block.
                 self.parser.parseBlocks(parent, [before])
             # Create header using named groups from RE
-            h = markdown.etree.SubElement(parent, 'h%d' % len(m.group('level')))
+            h = util.etree.SubElement(parent, 'h%d' % len(m.group('level')))
             h.text = m.group('header').strip()
             if after:
                 # Insert remaining lines as first block for future parsing.
                 blocks.insert(0, after)
         else:
             # This should never happen, but just in case...
-            print("We've got a problem header!")
+            logger.warn("We've got a problem header: %r" % block)
 
 
 class SetextHeaderProcessor(BlockProcessor):
     """ Process Setext-style Headers. """
 
     # Detect Setext-style header. Must be first 2 lines of block.
-    RE = re.compile(r'^.*?\n[=-]{3,}', re.MULTILINE)
+    RE = re.compile(r'^.*?\n[=-]+[ ]*(\n|$)', re.MULTILINE)
 
     def test(self, parent, block):
         return bool(self.RE.match(block))
@@ -374,7 +454,7 @@ class SetextHeaderProcessor(BlockProcessor):
             level = 1
         else:
             level = 2
-        h = markdown.etree.SubElement(parent, 'h%d' % level)
+        h = util.etree.SubElement(parent, 'h%d' % level)
         h.text = lines[0].strip()
         if len(lines) > 2:
             # Block contains additional lines. Add to  master blocks for later.
@@ -384,58 +464,60 @@ class SetextHeaderProcessor(BlockProcessor):
 class HRProcessor(BlockProcessor):
     """ Process Horizontal Rules. """
 
-    RE = r'[ ]{0,3}(?P<ch>[*_-])[ ]?((?P=ch)[ ]?){2,}[ ]*'
+    RE = r'^[ ]{0,3}((-+[ ]{0,2}){3,}|(_+[ ]{0,2}){3,}|(\*+[ ]{0,2}){3,})[ ]*'
     # Detect hr on any line of a block.
-    SEARCH_RE = re.compile(r'(^|\n)%s(\n|$)' % RE)
-    # Match a hr on a single line of text.
-    MATCH_RE = re.compile(r'^%s$' % RE)
+    SEARCH_RE = re.compile(RE, re.MULTILINE)
 
     def test(self, parent, block):
-        return bool(self.SEARCH_RE.search(block))
-
-    def run(self, parent, blocks):
-        lines = blocks.pop(0).split('\n')
-        prelines = []
-        # Check for lines in block before hr.
-        for line in lines:
-            m = self.MATCH_RE.match(line)
-            if m:
-                break
-            else:
-                prelines.append(line)
-        if len(prelines):
-            # Recursively parse lines before hr so they get parsed first.
-            self.parser.parseBlocks(parent, ['\n'.join(prelines)])
-        # create hr
-        markdown.etree.SubElement(parent, 'hr')
-        # check for lines in block after hr.
-        lines = lines[len(prelines)+1:]
-        if len(lines):
-            # Add lines after hr to master blocks for later parsing.
-            blocks.insert(0, '\n'.join(lines))
-
-
-class EmptyBlockProcessor(BlockProcessor):
-    """ Process blocks and start with an empty line. """
-
-    # Detect a block that only contains whitespace
-    # or only whitespace on the first line.
-    RE = re.compile(r'^\s*\n')
-
-    def test(self, parent, block):
-        return bool(self.RE.match(block))
+        m = self.SEARCH_RE.search(block)
+        # No atomic grouping in python so we simulate it here for performance.
+        # The regex only matches what would be in the atomic group - the HR.
+        # Then check if we are at end of block or if next char is a newline.
+        if m and (m.end() == len(block) or block[m.end()] == '\n'):
+            # Save match object on class instance so we can use it later.
+            self.match = m
+            return True
+        return False
 
     def run(self, parent, blocks):
         block = blocks.pop(0)
-        m = self.RE.match(block)
-        if m:
-            # Add remaining line to master blocks for later.
-            blocks.insert(0, block[m.end():])
-            sibling = self.lastChild(parent)
-            if sibling and sibling.tag == 'pre' and sibling[0] and \
-                    sibling[0].tag == 'code':
-                # Last block is a codeblock. Append to preserve whitespace.
-                sibling[0].text = markdown.AtomicString('%s/n/n/n' % sibling[0].text )
+        # Check for lines in block before hr.
+        prelines = block[:self.match.start()].rstrip('\n')
+        if prelines:
+            # Recursively parse lines before hr so they get parsed first.
+            self.parser.parseBlocks(parent, [prelines])
+        # create hr
+        util.etree.SubElement(parent, 'hr')
+        # check for lines in block after hr.
+        postlines = block[self.match.end():].lstrip('\n')
+        if postlines:
+            # Add lines after hr to master blocks for later parsing.
+            blocks.insert(0, postlines)
+
+
+
+class EmptyBlockProcessor(BlockProcessor):
+    """ Process blocks that are empty or start with an empty line. """
+
+    def test(self, parent, block):
+        return not block or block.startswith('\n')
+
+    def run(self, parent, blocks):
+        block = blocks.pop(0)
+        filler = '\n\n'
+        if block:
+            # Starts with empty line
+            # Only replace a single line.
+            filler = '\n'
+            # Save the rest for later.
+            theRest = block[1:]
+            if theRest:
+                # Add remaining lines to master blocks for later.
+                blocks.insert(0, theRest)
+        sibling = self.lastChild(parent)
+        if sibling and sibling.tag == 'pre' and len(sibling) and sibling[0].tag == 'code':
+            # Last block is a codeblock. Append to preserve whitespace.
+            sibling[0].text = util.AtomicString('%s%s' % (sibling[0].text, filler))
 
 
 class ParagraphProcessor(BlockProcessor):
@@ -449,12 +531,28 @@ class ParagraphProcessor(BlockProcessor):
         if block.strip():
             # Not a blank block. Add to parent, otherwise throw it away.
             if self.parser.state.isstate('list'):
-                # The parent is a tight-list. Append to parent.text
-                if parent.text:
-                    parent.text = '%s\n%s' % (parent.text, block)
+                # The parent is a tight-list.
+                #
+                # Check for any children. This will likely only happen in a 
+                # tight-list when a header isn't followed by a blank line.
+                # For example:
+                #
+                #     * # Header
+                #     Line 2 of list item - not part of header.
+                sibling = self.lastChild(parent)
+                if sibling is not None:
+                    # Insetrt after sibling.
+                    if sibling.tail:
+                        sibling.tail = '%s\n%s' % (sibling.tail, block)
+                    else:
+                        sibling.tail = '\n%s' % block
                 else:
-                    parent.text = block.lstrip()
+                    # Append to parent.text
+                    if parent.text:
+                        parent.text = '%s\n%s' % (parent.text, block)
+                    else:
+                        parent.text = block.lstrip()
             else:
                 # Create a regular paragraph
-                p = markdown.etree.SubElement(parent, 'p')
+                p = util.etree.SubElement(parent, 'p')
                 p.text = block.lstrip()
diff --git a/src/calibre/ebooks/markdown/commandline.py b/src/calibre/ebooks/markdown/commandline.py
deleted file mode 100644
index 9be4026444..0000000000
--- a/src/calibre/ebooks/markdown/commandline.py
+++ /dev/null
@@ -1,96 +0,0 @@
-"""
-COMMAND-LINE SPECIFIC STUFF
-=============================================================================
-
-The rest of the code is specifically for handling the case where Python
-Markdown is called from the command line.
-"""
-
-import markdown
-import sys
-import logging
-from logging import DEBUG, INFO, CRITICAL
-
-EXECUTABLE_NAME_FOR_USAGE = "python markdown.py"
-""" The name used in the usage statement displayed for python versions < 2.3.
-(With python 2.3 and higher the usage statement is generated by optparse
-and uses the actual name of the executable called.) """
-
-OPTPARSE_WARNING = """
-Python 2.3 or higher required for advanced command line options.
-For lower versions of Python use:
-
-      %s INPUT_FILE > OUTPUT_FILE
-
-""" % EXECUTABLE_NAME_FOR_USAGE
-
-def parse_options():
-    """
-    Define and parse `optparse` options for command-line usage.
-    """
-
-    try:
-        optparse = __import__("optparse")
-    except:
-        if len(sys.argv) == 2:
-            return {'input': sys.argv[1],
-                    'output': None,
-                    'safe': False,
-                    'extensions': [],
-                    'encoding': None }, CRITICAL
-        else:
-            print OPTPARSE_WARNING
-            return None, None
-
-    parser = optparse.OptionParser(usage="%prog INPUTFILE [options]")
-    parser.add_option("-f", "--file", dest="filename", default=sys.stdout,
-                      help="write output to OUTPUT_FILE",
-                      metavar="OUTPUT_FILE")
-    parser.add_option("-e", "--encoding", dest="encoding",
-                      help="encoding for input and output files",)
-    parser.add_option("-q", "--quiet", default = CRITICAL,
-                      action="store_const", const=CRITICAL+10, dest="verbose",
-                      help="suppress all messages")
-    parser.add_option("-v", "--verbose",
-                      action="store_const", const=INFO, dest="verbose",
-                      help="print info messages")
-    parser.add_option("-s", "--safe", dest="safe", default=False,
-                      metavar="SAFE_MODE",
-                      help="safe mode ('replace', 'remove' or 'escape'  user's HTML tag)")
-    parser.add_option("-o", "--output_format", dest="output_format",
-                      default='xhtml1', metavar="OUTPUT_FORMAT",
-                      help="Format of output. One of 'xhtml1' (default) or 'html4'.")
-    parser.add_option("--noisy",
-                      action="store_const", const=DEBUG, dest="verbose",
-                      help="print debug messages")
-    parser.add_option("-x", "--extension", action="append", dest="extensions",
-                      help = "load extension EXTENSION", metavar="EXTENSION")
-
-    (options, args) = parser.parse_args()
-
-    if not len(args) == 1:
-        parser.print_help()
-        return None, None
-    else:
-        input_file = args[0]
-
-    if not options.extensions:
-        options.extensions = []
-
-    return {'input': input_file,
-            'output': options.filename,
-            'safe_mode': options.safe,
-            'extensions': options.extensions,
-            'encoding': options.encoding,
-            'output_format': options.output_format}, options.verbose
-
-def run():
-    """Run Markdown from the command line."""
-
-    # Parse options and adjust logging level if necessary
-    options, logging_level = parse_options()
-    if not options: sys.exit(0)
-    if logging_level: logging.getLogger('MARKDOWN').setLevel(logging_level)
-
-    # Run
-    markdown.markdownFromFile(**options)
diff --git a/src/calibre/ebooks/markdown/etree_loader.py b/src/calibre/ebooks/markdown/etree_loader.py
deleted file mode 100644
index 2591328084..0000000000
--- a/src/calibre/ebooks/markdown/etree_loader.py
+++ /dev/null
@@ -1,35 +0,0 @@
-
-from markdown import message, CRITICAL
-import sys
-
-## Import
-def importETree():
-    """Import the best implementation of ElementTree, return a module object."""
-    etree_in_c = None
-    try: # Is it Python 2.5+ with C implemenation of ElementTree installed?
-        import xml.etree.cElementTree as etree_in_c
-        etree_in_c
-    except ImportError:
-        try: # Is it Python 2.5+ with Python implementation of ElementTree?
-            import xml.etree.ElementTree as etree
-            etree
-        except ImportError:
-            try: # An earlier version of Python with cElementTree installed?
-                import cElementTree as etree_in_c
-            except ImportError:
-                try: # An earlier version of Python with Python ElementTree?
-                    import elementtree.ElementTree as etree
-                except ImportError:
-                    message(CRITICAL, "Failed to import ElementTree")
-                    sys.exit(1)
-    if etree_in_c and etree_in_c.VERSION < "1.0":
-        message(CRITICAL, "For cElementTree version 1.0 or higher is required.")
-        sys.exit(1)
-    elif etree_in_c :
-        return etree_in_c
-    elif etree.VERSION < "1.1":
-        message(CRITICAL, "For ElementTree version 1.1 or higher is required")
-        sys.exit(1)
-    else :
-        return etree
-
diff --git a/src/calibre/ebooks/markdown/extensions/__init__.py b/src/calibre/ebooks/markdown/extensions/__init__.py
index e69de29bb2..184c4d1b1d 100644
--- a/src/calibre/ebooks/markdown/extensions/__init__.py
+++ b/src/calibre/ebooks/markdown/extensions/__init__.py
@@ -0,0 +1,53 @@
+"""
+Extensions
+-----------------------------------------------------------------------------
+"""
+
+from __future__ import unicode_literals
+
+class Extension(object):
+    """ Base class for extensions to subclass. """
+    def __init__(self, configs = {}):
+        """Create an instance of an Extention.
+
+        Keyword arguments:
+
+        * configs: A dict of configuration setting used by an Extension.
+        """
+        self.config = configs
+
+    def getConfig(self, key, default=''):
+        """ Return a setting for the given key or an empty string. """
+        if key in self.config:
+            return self.config[key][0]
+        else:
+            return default
+
+    def getConfigs(self):
+        """ Return all configs settings as a dict. """
+        return dict([(key, self.getConfig(key)) for key in self.config.keys()])
+
+    def getConfigInfo(self):
+        """ Return all config descriptions as a list of tuples. """
+        return [(key, self.config[key][1]) for key in self.config.keys()]
+
+    def setConfig(self, key, value):
+        """ Set a config setting for `key` with the given `value`. """
+        self.config[key][0] = value
+
+    def extendMarkdown(self, md, md_globals):
+        """
+        Add the various proccesors and patterns to the Markdown Instance.
+
+        This method must be overriden by every extension.
+
+        Keyword arguments:
+
+        * md: The Markdown instance.
+
+        * md_globals: Global variables in the markdown module namespace.
+
+        """
+        raise NotImplementedError('Extension "%s.%s" must define an "extendMarkdown"' \
+            'method.' % (self.__class__.__module__, self.__class__.__name__))
+
diff --git a/src/calibre/ebooks/markdown/extensions/abbr.py b/src/calibre/ebooks/markdown/extensions/abbr.py
index bcc727b47c..5e46f1dc38 100644
--- a/src/calibre/ebooks/markdown/extensions/abbr.py
+++ b/src/calibre/ebooks/markdown/extensions/abbr.py
@@ -13,8 +13,8 @@ Simple Usage:
     ... *[ABBR]: Abbreviation
     ... *[REF]: Abbreviation Reference
     ... """
-    >>> markdown.markdown(text, ['abbr'])
-    u'<p>Some text with an <abbr title="Abbreviation">ABBR</abbr> and a <abbr title="Abbreviation Reference">REF</abbr>. Ignore REFERENCE and ref.</p>'
+    >>> print markdown.markdown(text, ['abbr'])
+    <p>Some text with an <abbr title="Abbreviation">ABBR</abbr> and a <abbr title="Abbreviation Reference">REF</abbr>. Ignore REFERENCE and ref.</p>
 
 Copyright 2007-2008
 * [Waylan Limberg](http://achinghead.com/)
@@ -23,14 +23,18 @@ Copyright 2007-2008
 
 '''
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..preprocessors import Preprocessor
+from ..inlinepatterns import Pattern
+from ..util import etree
 import re
-import calibre.ebooks.markdown.markdown as markdown
-from calibre.ebooks.markdown.markdown import etree
 
 # Global Vars
 ABBR_REF_RE = re.compile(r'[*]\[(?P<abbr>[^\]]*)\][ ]?:\s*(?P<title>.*)')
 
-class AbbrExtension(markdown.Extension):
+class AbbrExtension(Extension):
     """ Abbreviation Extension for Python-Markdown. """
 
     def extendMarkdown(self, md, md_globals):
@@ -38,7 +42,7 @@ class AbbrExtension(markdown.Extension):
         md.preprocessors.add('abbr', AbbrPreprocessor(md), '<reference')
         
            
-class AbbrPreprocessor(markdown.preprocessors.Preprocessor):
+class AbbrPreprocessor(Preprocessor):
     """ Abbreviation Preprocessor - parse text for abbr references. """
 
     def run(self, lines):
@@ -75,11 +79,11 @@ class AbbrPreprocessor(markdown.preprocessors.Preprocessor):
         return r'(?P<abbr>\b%s\b)' % (r''.join(chars))
 
 
-class AbbrPattern(markdown.inlinepatterns.Pattern):
+class AbbrPattern(Pattern):
     """ Abbreviation inline pattern. """
 
     def __init__(self, pattern, title):
-        markdown.inlinepatterns.Pattern.__init__(self, pattern)
+        super(AbbrPattern, self).__init__(pattern)
         self.title = title
 
     def handleMatch(self, m):
@@ -90,7 +94,3 @@ class AbbrPattern(markdown.inlinepatterns.Pattern):
 
 def makeExtension(configs=None):
     return AbbrExtension(configs=configs)
-
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()
diff --git a/src/calibre/ebooks/markdown/extensions/admonition.py b/src/calibre/ebooks/markdown/extensions/admonition.py
new file mode 100644
index 0000000000..9a45b9249c
--- /dev/null
+++ b/src/calibre/ebooks/markdown/extensions/admonition.py
@@ -0,0 +1,118 @@
+"""
+Admonition extension for Python-Markdown
+========================================
+
+Adds rST-style admonitions. Inspired by [rST][] feature with the same name.
+
+The syntax is (followed by an indented block with the contents):
+    !!! [type] [optional explicit title]
+
+Where `type` is used as a CSS class name of the div. If not present, `title`
+defaults to the capitalized `type`, so "note" -> "Note".
+
+rST suggests the following `types`, but you're free to use whatever you want:
+    attention, caution, danger, error, hint, important, note, tip, warning
+
+
+A simple example:
+    !!! note
+        This is the first line inside the box.
+
+Outputs:
+    <div class="admonition note">
+    <p class="admonition-title">Note</p>
+    <p>This is the first line inside the box</p>
+    </div>
+
+You can also specify the title and CSS class of the admonition:
+    !!! custom "Did you know?"
+        Another line here.
+
+Outputs:
+    <div class="admonition custom">
+    <p class="admonition-title">Did you know?</p>
+    <p>Another line here.</p>
+    </div>
+
+[rST]: http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
+
+By [Tiago Serafim](http://www.tiagoserafim.com/).
+
+"""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..blockprocessors import BlockProcessor
+from ..util import etree
+import re
+
+
+class AdmonitionExtension(Extension):
+    """ Admonition extension for Python-Markdown. """
+
+    def extendMarkdown(self, md, md_globals):
+        """ Add Admonition to Markdown instance. """
+        md.registerExtension(self)
+
+        md.parser.blockprocessors.add('admonition',
+                                      AdmonitionProcessor(md.parser),
+                                      '_begin')
+
+
+class AdmonitionProcessor(BlockProcessor):
+
+    CLASSNAME = 'admonition'
+    CLASSNAME_TITLE = 'admonition-title'
+    RE = re.compile(r'(?:^|\n)!!!\ ?([\w\-]+)(?:\ "(.*?)")?')
+
+    def test(self, parent, block):
+        sibling = self.lastChild(parent)
+        return self.RE.search(block) or \
+            (block.startswith(' ' * self.tab_length) and sibling and \
+                sibling.get('class', '').find(self.CLASSNAME) != -1)
+
+    def run(self, parent, blocks):
+        sibling = self.lastChild(parent)
+        block = blocks.pop(0)
+        m = self.RE.search(block)
+
+        if m:
+            block = block[m.end() + 1:]  # removes the first line
+
+        block, theRest = self.detab(block)
+
+        if m:
+            klass, title = self.get_class_and_title(m)
+            div = etree.SubElement(parent, 'div')
+            div.set('class', '%s %s' % (self.CLASSNAME, klass))
+            if title:
+                p = etree.SubElement(div, 'p')
+                p.text = title
+                p.set('class', self.CLASSNAME_TITLE)
+        else:
+            div = sibling
+
+        self.parser.parseChunk(div, block)
+
+        if theRest:
+            # This block contained unindented line(s) after the first indented
+            # line. Insert these lines as the first block of the master blocks
+            # list for future processing.
+            blocks.insert(0, theRest)
+
+    def get_class_and_title(self, match):
+        klass, title = match.group(1).lower(), match.group(2)
+        if title is None:
+            # no title was provided, use the capitalized classname as title
+            # e.g.: `!!! note` will render `<p class="admonition-title">Note</p>`
+            title = klass.capitalize()
+        elif title == '':
+            # an explicit blank title should not be rendered
+            # e.g.: `!!! warning ""` will *not* render `p` with a title
+            title = None
+        return klass, title
+
+
+def makeExtension(configs={}):
+    return AdmonitionExtension(configs=configs)
diff --git a/src/calibre/ebooks/markdown/extensions/attr_list.py b/src/calibre/ebooks/markdown/extensions/attr_list.py
new file mode 100644
index 0000000000..c98aa850a6
--- /dev/null
+++ b/src/calibre/ebooks/markdown/extensions/attr_list.py
@@ -0,0 +1,140 @@
+"""
+Attribute List Extension for Python-Markdown
+============================================
+
+Adds attribute list syntax. Inspired by 
+[maruku](http://maruku.rubyforge.org/proposal.html#attribute_lists)'s
+feature of the same name.
+
+Copyright 2011 [Waylan Limberg](http://achinghead.com/).
+
+Contact: markdown@freewisdom.org
+
+License: BSD (see ../LICENSE.md for details) 
+
+Dependencies:
+* [Python 2.4+](http://python.org)
+* [Markdown 2.1+](http://packages.python.org/Markdown/)
+
+"""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..treeprocessors import Treeprocessor
+from ..util import isBlockLevel
+import re
+
+try:
+    Scanner = re.Scanner
+except AttributeError:
+    # must be on Python 2.4
+    from sre import Scanner
+
+def _handle_double_quote(s, t):
+    k, v = t.split('=')
+    return k, v.strip('"')
+
+def _handle_single_quote(s, t):
+    k, v = t.split('=')
+    return k, v.strip("'")
+
+def _handle_key_value(s, t): 
+    return t.split('=')
+
+def _handle_word(s, t):
+    if t.startswith('.'):
+        return '.', t[1:]
+    if t.startswith('#'):
+        return 'id', t[1:]
+    return t, t
+
+_scanner = Scanner([
+    (r'[^ ]+=".*?"', _handle_double_quote),
+    (r"[^ ]+='.*?'", _handle_single_quote),
+    (r'[^ ]+=[^ ]*', _handle_key_value),
+    (r'[^ ]+', _handle_word),
+    (r' ', None)
+])
+
+def get_attrs(str):
+    """ Parse attribute list and return a list of attribute tuples. """
+    return _scanner.scan(str)[0]
+
+def isheader(elem):
+    return elem.tag in ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']
+
+class AttrListTreeprocessor(Treeprocessor):
+    
+    BASE_RE = r'\{\:?([^\}]*)\}'
+    HEADER_RE = re.compile(r'[ ]*%s[ ]*$' % BASE_RE)
+    BLOCK_RE = re.compile(r'\n[ ]*%s[ ]*$' % BASE_RE)
+    INLINE_RE = re.compile(r'^%s' % BASE_RE)
+    NAME_RE = re.compile(r'[^A-Z_a-z\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u02ff\u0370-\u037d'
+                         r'\u037f-\u1fff\u200c-\u200d\u2070-\u218f\u2c00-\u2fef'
+                         r'\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd'
+                         r'\:\-\.0-9\u00b7\u0300-\u036f\u203f-\u2040]+')
+
+    def run(self, doc):
+        for elem in doc.getiterator():
+            if isBlockLevel(elem.tag):
+                # Block level: check for attrs on last line of text
+                RE = self.BLOCK_RE
+                if isheader(elem):
+                    # header: check for attrs at end of line
+                    RE = self.HEADER_RE
+                if len(elem) and elem[-1].tail:
+                    # has children. Get from tail of last child
+                    m = RE.search(elem[-1].tail)
+                    if m:
+                        self.assign_attrs(elem, m.group(1))
+                        elem[-1].tail = elem[-1].tail[:m.start()]
+                        if isheader(elem):
+                            # clean up trailing #s
+                            elem[-1].tail = elem[-1].tail.rstrip('#').rstrip()
+                elif elem.text:
+                    # no children. Get from text.
+                    m = RE.search(elem.text)
+                    if m:
+                        self.assign_attrs(elem, m.group(1))
+                        elem.text = elem.text[:m.start()]
+                        if isheader(elem):
+                            # clean up trailing #s
+                            elem.text = elem.text.rstrip('#').rstrip()
+            else:
+                # inline: check for attrs at start of tail
+                if elem.tail:
+                    m = self.INLINE_RE.match(elem.tail)
+                    if m:
+                        self.assign_attrs(elem, m.group(1))
+                        elem.tail = elem.tail[m.end():]
+
+    def assign_attrs(self, elem, attrs):
+        """ Assign attrs to element. """
+        for k, v in get_attrs(attrs):
+            if k == '.':
+                # add to class
+                cls = elem.get('class')
+                if cls:
+                    elem.set('class', '%s %s' % (cls, v))
+                else:
+                    elem.set('class', v)
+            else:
+                # assign attr k with v
+                elem.set(self.sanitize_name(k), v)
+
+    def sanitize_name(self, name):
+        """
+        Sanitize name as 'an XML Name, minus the ":"'.
+        See http://www.w3.org/TR/REC-xml-names/#NT-NCName
+        """
+        return self.NAME_RE.sub('_', name)
+
+
+class AttrListExtension(Extension):
+    def extendMarkdown(self, md, md_globals):
+        md.treeprocessors.add('attr_list', AttrListTreeprocessor(md), '>prettify')
+
+
+def makeExtension(configs={}):
+    return AttrListExtension(configs=configs)
diff --git a/src/calibre/ebooks/markdown/extensions/codehilite.py b/src/calibre/ebooks/markdown/extensions/codehilite.py
index 42649ec252..72b40fde78 100644
--- a/src/calibre/ebooks/markdown/extensions/codehilite.py
+++ b/src/calibre/ebooks/markdown/extensions/codehilite.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 """
 CodeHilite Extension for Python-Markdown
 ========================================
@@ -8,149 +6,144 @@ Adds code/syntax highlighting to standard Python-Markdown code blocks.
 
 Copyright 2006-2008 [Waylan Limberg](http://achinghead.com/).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/CodeHilite>
+Project website: <http://packages.python.org/Markdown/extensions/code_hilite.html>
 Contact: markdown@freewisdom.org
- 
-License: BSD (see ../docs/LICENSE for details)
-  
+
+License: BSD (see ../LICENSE.md for details)
+
 Dependencies:
 * [Python 2.3+](http://python.org/)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 * [Pygments](http://pygments.org/)
 
 """
 
-import calibre.ebooks.markdown.markdown as markdown
-
-# --------------- CONSTANTS YOU MIGHT WANT TO MODIFY -----------------
-
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..treeprocessors import Treeprocessor
+import warnings
 try:
-    TAB_LENGTH = markdown.TAB_LENGTH
-except AttributeError:
-    TAB_LENGTH = 4
-
+    from pygments import highlight
+    from pygments.lexers import get_lexer_by_name, guess_lexer, TextLexer
+    from pygments.formatters import HtmlFormatter
+    pygments = True
+except ImportError:
+    pygments = False
 
 # ------------------ The Main CodeHilite Class ----------------------
-class CodeHilite:
+class CodeHilite(object):
     """
     Determine language of source code, and pass it into the pygments hilighter.
 
     Basic Usage:
         >>> code = CodeHilite(src = 'some text')
         >>> html = code.hilite()
-    
+
     * src: Source string or any object with a .readline attribute.
-      
-    * linenos: (Boolen) Turn line numbering 'on' or 'off' (off by default).
+
+    * linenums: (Boolean) Set line numbering to 'on' (True), 'off' (False) or 'auto'(None). 
+    Set to 'auto' by default.
+
+    * guess_lang: (Boolean) Turn language auto-detection 'on' or 'off' (on by default).
 
     * css_class: Set class name of wrapper div ('codehilite' by default).
-      
+
     Low Level Usage:
         >>> code = CodeHilite()
         >>> code.src = 'some text' # String or anything with a .readline attr.
         >>> code.linenos = True  # True or False; Turns line numbering on or of.
         >>> html = code.hilite()
-    
+
     """
 
-    def __init__(self, src=None, linenos=False, css_class="codehilite"):
+    def __init__(self, src=None, linenums=None, guess_lang=True,
+                css_class="codehilite", lang=None, style='default',
+                noclasses=False, tab_length=4):
         self.src = src
-        self.lang = None
-        self.linenos = linenos
+        self.lang = lang
+        self.linenums = linenums
+        self.guess_lang = guess_lang
         self.css_class = css_class
+        self.style = style
+        self.noclasses = noclasses
+        self.tab_length = tab_length
 
     def hilite(self):
         """
-        Pass code to the [Pygments](http://pygments.pocoo.org/) highliter with 
-        optional line numbers. The output should then be styled with css to 
-        your liking. No styles are applied by default - only styling hooks 
-        (i.e.: <span class="k">). 
+        Pass code to the [Pygments](http://pygments.pocoo.org/) highliter with
+        optional line numbers. The output should then be styled with css to
+        your liking. No styles are applied by default - only styling hooks
+        (i.e.: <span class="k">).
 
         returns : A string of html.
-    
+
         """
 
         self.src = self.src.strip('\n')
-        
-        self._getLang()
 
-        try:
-            from pygments import highlight
-            from pygments.lexers import get_lexer_by_name, guess_lexer, \
-                                        TextLexer
-            from pygments.formatters import HtmlFormatter
-        except ImportError:
-            # just escape and pass through
-            txt = self._escape(self.src)
-            if self.linenos:
-                txt = self._number(txt)
-            else :
-                txt = '<div class="%s"><pre>%s</pre></div>\n'% \
-                        (self.css_class, txt)
-            return txt
-        else:
+        if self.lang is None:
+            self._getLang()
+
+        if pygments:
             try:
                 lexer = get_lexer_by_name(self.lang)
             except ValueError:
                 try:
-                    lexer = guess_lexer(self.src)
+                    if self.guess_lang:
+                        lexer = guess_lexer(self.src)
+                    else:
+                        lexer = TextLexer()
                 except ValueError:
                     lexer = TextLexer()
-            formatter = HtmlFormatter(linenos=self.linenos, 
-                                      cssclass=self.css_class)
+            formatter = HtmlFormatter(linenos=self.linenums,
+                                      cssclass=self.css_class,
+                                      style=self.style,
+                                      noclasses=self.noclasses)
             return highlight(self.src, lexer, formatter)
-
-    def _escape(self, txt):
-        """ basic html escaping """
-        txt = txt.replace('&', '&amp;')
-        txt = txt.replace('<', '&lt;')
-        txt = txt.replace('>', '&gt;')
-        txt = txt.replace('"', '&quot;')
-        return txt
-
-    def _number(self, txt):
-        """ Use <ol> for line numbering """
-        # Fix Whitespace
-        txt = txt.replace('\t', ' '*TAB_LENGTH)
-        txt = txt.replace(" "*4, "&nbsp; &nbsp; ")
-        txt = txt.replace(" "*3, "&nbsp; &nbsp;")
-        txt = txt.replace(" "*2, "&nbsp; ")        
-        
-        # Add line numbers
-        lines = txt.splitlines()
-        txt = '<div class="codehilite"><pre><ol>\n'
-        for line in lines:
-            txt += '\t<li>%s</li>\n'% line
-        txt += '</ol></pre></div>\n'
-        return txt
-
+        else:
+            # just escape and build markup usable by JS highlighting libs
+            txt = self.src.replace('&', '&amp;')
+            txt = txt.replace('<', '&lt;')
+            txt = txt.replace('>', '&gt;')
+            txt = txt.replace('"', '&quot;')
+            classes = []
+            if self.lang:
+                classes.append('language-%s' % self.lang)
+            if self.linenums:
+                classes.append('linenums')
+            class_str = ''
+            if classes:
+                class_str = ' class="%s"' % ' '.join(classes) 
+            return '<pre class="%s"><code%s>%s</code></pre>\n'% \
+                        (self.css_class, class_str, txt)
 
     def _getLang(self):
-        """ 
-        Determines language of a code block from shebang lines and whether said
+        """
+        Determines language of a code block from shebang line and whether said
         line should be removed or left in place. If the sheband line contains a
-        path (even a single /) then it is assumed to be a real shebang lines and
-        left alone. However, if no path is given (e.i.: #!python or :::python) 
+        path (even a single /) then it is assumed to be a real shebang line and
+        left alone. However, if no path is given (e.i.: #!python or :::python)
         then it is assumed to be a mock shebang for language identifitation of a
-        code fragment and removed from the code block prior to processing for 
-        code highlighting. When a mock shebang (e.i: #!python) is found, line 
-        numbering is turned on. When colons are found in place of a shebang 
-        (e.i.: :::python), line numbering is left in the current state - off 
+        code fragment and removed from the code block prior to processing for
+        code highlighting. When a mock shebang (e.i: #!python) is found, line
+        numbering is turned on. When colons are found in place of a shebang
+        (e.i.: :::python), line numbering is left in the current state - off
         by default.
-        
+
         """
 
         import re
-    
+
         #split text into lines
         lines = self.src.split("\n")
         #pull first line to examine
         fl = lines.pop(0)
-    
+
         c = re.compile(r'''
-            (?:(?:::+)|(?P<shebang>[#]!))	# Shebang or 2 or more colons.
-            (?P<path>(?:/\w+)*[/ ])?        # Zero or 1 path 
-            (?P<lang>[\w+-]*)               # The language 
+            (?:(?:^::+)|(?P<shebang>^[#]!))	# Shebang or 2 or more colons.
+            (?P<path>(?:/\w+)*[/ ])?        # Zero or 1 path
+            (?P<lang>[\w+-]*)               # The language
             ''',  re.VERBOSE)
         # search first line for shebang
         m = c.search(fl)
@@ -163,19 +156,19 @@ class CodeHilite:
             if m.group('path'):
                 # path exists - restore first line
                 lines.insert(0, fl)
-            if m.group('shebang'):
-                # shebang exists - use line numbers
-                self.linenos = True
+            if self.linenums is None and m.group('shebang'):
+                # Overridable and Shebang exists - use line numbers
+                self.linenums = True
         else:
             # No match
             lines.insert(0, fl)
-        
+
         self.src = "\n".join(lines).strip("\n")
 
 
 
 # ------------------ The Markdown Extension -------------------------------
-class HiliteTreeprocessor(markdown.treeprocessors.Treeprocessor):
+class HiliteTreeprocessor(Treeprocessor):
     """ Hilight source code in code blocks. """
 
     def run(self, root):
@@ -184,39 +177,62 @@ class HiliteTreeprocessor(markdown.treeprocessors.Treeprocessor):
         for block in blocks:
             children = block.getchildren()
             if len(children) == 1 and children[0].tag == 'code':
-                code = CodeHilite(children[0].text, 
-                            linenos=self.config['force_linenos'][0],
-                            css_class=self.config['css_class'][0])
-                placeholder = self.markdown.htmlStash.store(code.hilite(), 
+                code = CodeHilite(children[0].text,
+                            linenums=self.config['linenums'],
+                            guess_lang=self.config['guess_lang'],
+                            css_class=self.config['css_class'],
+                            style=self.config['pygments_style'],
+                            noclasses=self.config['noclasses'],
+                            tab_length=self.markdown.tab_length)
+                placeholder = self.markdown.htmlStash.store(code.hilite(),
                                                             safe=True)
                 # Clear codeblock in etree instance
                 block.clear()
-                # Change to p element which will later 
+                # Change to p element which will later
                 # be removed when inserting raw html
                 block.tag = 'p'
                 block.text = placeholder
 
 
-class CodeHiliteExtension(markdown.Extension):
+class CodeHiliteExtension(Extension):
     """ Add source code hilighting to markdown codeblocks. """
 
     def __init__(self, configs):
         # define default configs
         self.config = {
-            'force_linenos' : [False, "Force line numbers - Default: False"],
-            'css_class' : ["codehilite", 
+            'linenums': [None, "Use lines numbers. True=yes, False=no, None=auto"],
+            'force_linenos' : [False, "Depreciated! Use 'linenums' instead. Force line numbers - Default: False"],
+            'guess_lang' : [True, "Automatic language detection - Default: True"],
+            'css_class' : ["codehilite",
                            "Set class name for wrapper <div> - Default: codehilite"],
+            'pygments_style' : ['default', 'Pygments HTML Formatter Style (Colorscheme) - Default: default'],
+            'noclasses': [False, 'Use inline styles instead of CSS classes - Default false']
             }
-        
+
         # Override defaults with user settings
         for key, value in configs:
-            self.setConfig(key, value) 
+            # convert strings to booleans
+            if value == 'True': value = True
+            if value == 'False': value = False
+            if value == 'None': value = None
+
+            if key == 'force_linenos':
+                warnings.warn('The "force_linenos" config setting'
+                    ' to the CodeHilite extension is deprecrecated.'
+                    ' Use "linenums" instead.', PendingDeprecationWarning)
+                if value:
+                    # Carry 'force_linenos' over to new 'linenos'.
+                    self.setConfig('linenums', True)
+
+            self.setConfig(key, value)
 
     def extendMarkdown(self, md, md_globals):
         """ Add HilitePostprocessor to Markdown instance. """
         hiliter = HiliteTreeprocessor(md)
-        hiliter.config = self.config
-        md.treeprocessors.add("hilite", hiliter, "_begin") 
+        hiliter.config = self.getConfigs()
+        md.treeprocessors.add("hilite", hiliter, "<inline")
+
+        md.registerExtension(self)
 
 
 def makeExtension(configs={}):
diff --git a/src/calibre/ebooks/markdown/extensions/def_list.py b/src/calibre/ebooks/markdown/extensions/def_list.py
index b5419bdfd2..868465266c 100644
--- a/src/calibre/ebooks/markdown/extensions/def_list.py
+++ b/src/calibre/ebooks/markdown/extensions/def_list.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env Python
 """
 Definition List Extension for Python-Markdown
 =============================================
@@ -8,7 +7,7 @@ Added parsing of Definition Lists to Python-Markdown.
 A simple example:
 
     Apple
-    :   Pomaceous fruit of plants of the genus Malus in
+    :   Pomaceous fruit of plants of the genus Malus in 
         the family Rosaceae.
     :   An american computer company.
 
@@ -19,30 +18,44 @@ Copyright 2008 - [Waylan Limberg](http://achinghead.com)
 
 """
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..blockprocessors import BlockProcessor, ListIndentProcessor
+from ..util import etree
 import re
-import calibre.ebooks.markdown.markdown as markdown
-from calibre.ebooks.markdown.markdown import etree
 
 
-class DefListProcessor(markdown.blockprocessors.BlockProcessor):
+class DefListProcessor(BlockProcessor):
     """ Process Definition Lists. """
 
     RE = re.compile(r'(^|\n)[ ]{0,3}:[ ]{1,3}(.*?)(\n|$)')
+    NO_INDENT_RE = re.compile(r'^[ ]{0,3}[^ :]')
 
     def test(self, parent, block):
         return bool(self.RE.search(block))
 
     def run(self, parent, blocks):
-        block = blocks.pop(0)
-        m = self.RE.search(block)
-        terms = [l.strip() for l in block[:m.start()].split('\n') if l.strip()]
-        d, theRest = self.detab(block[m.end():])
+
+        raw_block = blocks.pop(0)
+        m = self.RE.search(raw_block)
+        terms = [l.strip() for l in raw_block[:m.start()].split('\n') if l.strip()]
+        block = raw_block[m.end():]
+        no_indent = self.NO_INDENT_RE.match(block)
+        if no_indent:
+            d, theRest = (block, None)
+        else:
+            d, theRest = self.detab(block)
         if d:
             d = '%s\n%s' % (m.group(2), d)
         else:
             d = m.group(2)
-        #import ipdb; ipdb.set_trace()
         sibling = self.lastChild(parent)
+        if not terms and sibling is None:
+            # This is not a definition item. Most likely a paragraph that 
+            # starts with a colon at the begining of a document or list.
+            blocks.insert(0, raw_block)
+            return False
         if not terms and sibling.tag == 'p':
             # The previous paragraph contains the terms
             state = 'looselist'
@@ -74,7 +87,7 @@ class DefListProcessor(markdown.blockprocessors.BlockProcessor):
         if theRest:
             blocks.insert(0, theRest)
 
-class DefListIndentProcessor(markdown.blockprocessors.ListIndentProcessor):
+class DefListIndentProcessor(ListIndentProcessor):
     """ Process indented children of definition list items. """
 
     ITEM_TYPES = ['dd']
@@ -82,12 +95,12 @@ class DefListIndentProcessor(markdown.blockprocessors.ListIndentProcessor):
 
     def create_item(self, parent, block):
         """ Create a new dd and parse the block with it as the parent. """
-        dd = markdown.etree.SubElement(parent, 'dd')
+        dd = etree.SubElement(parent, 'dd')
         self.parser.parseBlocks(dd, [block])
+ 
 
 
-
-class DefListExtension(markdown.Extension):
+class DefListExtension(Extension):
     """ Add definition lists to Markdown. """
 
     def extendMarkdown(self, md, md_globals):
@@ -95,7 +108,7 @@ class DefListExtension(markdown.Extension):
         md.parser.blockprocessors.add('defindent',
                                       DefListIndentProcessor(md.parser),
                                       '>indent')
-        md.parser.blockprocessors.add('deflist',
+        md.parser.blockprocessors.add('deflist', 
                                       DefListProcessor(md.parser),
                                       '>ulist')
 
diff --git a/src/calibre/ebooks/markdown/extensions/extra.py b/src/calibre/ebooks/markdown/extensions/extra.py
index 830c9455e1..e6a1e820ef 100644
--- a/src/calibre/ebooks/markdown/extensions/extra.py
+++ b/src/calibre/ebooks/markdown/extensions/extra.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 Python-Markdown Extra Extension
 ===============================
@@ -27,23 +26,29 @@ when you upgrade to any future version of Python-Markdown.
 
 """
 
-import calibre.ebooks.markdown.markdown as markdown
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
 
-extensions = ['fenced_code',
+extensions = ['smart_strong',
+              'fenced_code',
               'footnotes',
-              'headerid',
+              'attr_list',
               'def_list',
               'tables',
               'abbr',
               ]
               
 
-class ExtraExtension(markdown.Extension):
+class ExtraExtension(Extension):
     """ Add various extensions to Markdown class."""
 
     def extendMarkdown(self, md, md_globals):
         """ Register extension instances. """
         md.registerExtensions(extensions, self.config)
+        if not md.safeMode:
+            # Turn on processing of markdown text within raw html
+            md.preprocessors['html_block'].markdown_in_raw = True
 
 def makeExtension(configs={}):
     return ExtraExtension(configs=dict(configs))
diff --git a/src/calibre/ebooks/markdown/extensions/fenced_code.py b/src/calibre/ebooks/markdown/extensions/fenced_code.py
index 6e12c23319..ecdb20d439 100644
--- a/src/calibre/ebooks/markdown/extensions/fenced_code.py
+++ b/src/calibre/ebooks/markdown/extensions/fenced_code.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 """
 Fenced Code Extension for Python Markdown
 =========================================
@@ -9,83 +7,118 @@ This extension adds Fenced Code Blocks to Python-Markdown.
     >>> import markdown
     >>> text = '''
     ... A paragraph before a fenced code block:
-    ... 
+    ...
     ... ~~~
     ... Fenced code block
     ... ~~~
     ... '''
     >>> html = markdown.markdown(text, extensions=['fenced_code'])
-    >>> html
-    u'<p>A paragraph before a fenced code block:</p>\\n<pre><code>Fenced code block\\n</code></pre>'
+    >>> print html
+    <p>A paragraph before a fenced code block:</p>
+    <pre><code>Fenced code block
+    </code></pre>
 
 Works with safe_mode also (we check this because we are using the HtmlStash):
 
-    >>> markdown.markdown(text, extensions=['fenced_code'], safe_mode='replace')
-    u'<p>A paragraph before a fenced code block:</p>\\n<pre><code>Fenced code block\\n</code></pre>'
-    
+    >>> print markdown.markdown(text, extensions=['fenced_code'], safe_mode='replace')
+    <p>A paragraph before a fenced code block:</p>
+    <pre><code>Fenced code block
+    </code></pre>
+
 Include tilde's in a code block and wrap with blank lines:
 
     >>> text = '''
     ... ~~~~~~~~
-    ... 
+    ...
     ... ~~~~
-    ... 
     ... ~~~~~~~~'''
-    >>> markdown.markdown(text, extensions=['fenced_code'])
-    u'<pre><code>\\n~~~~\\n\\n</code></pre>'
+    >>> print markdown.markdown(text, extensions=['fenced_code'])
+    <pre><code>
+    ~~~~
+    </code></pre>
 
-Multiple blocks and language tags:
+Language tags:
 
     >>> text = '''
     ... ~~~~{.python}
-    ... block one
-    ... ~~~~
-    ... 
-    ... ~~~~.html
-    ... <p>block two</p>
+    ... # Some python code
     ... ~~~~'''
-    >>> markdown.markdown(text, extensions=['fenced_code'])
-    u'<pre><code class="python">block one\\n</code></pre>\\n\\n<pre><code class="html">&lt;p&gt;block two&lt;/p&gt;\\n</code></pre>'
+    >>> print markdown.markdown(text, extensions=['fenced_code'])
+    <pre><code class="python"># Some python code
+    </code></pre>
+
+Optionally backticks instead of tildes as per how github's code block markdown is identified:
+
+    >>> text = '''
+    ... `````
+    ... # Arbitrary code
+    ... ~~~~~ # these tildes will not close the block
+    ... `````'''
+    >>> print markdown.markdown(text, extensions=['fenced_code'])
+    <pre><code># Arbitrary code
+    ~~~~~ # these tildes will not close the block
+    </code></pre>
 
 Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/Fenced__Code__Blocks>
+Project website: <http://packages.python.org/Markdown/extensions/fenced_code_blocks.html>
 Contact: markdown@freewisdom.org
 
-License: BSD (see ../docs/LICENSE for details) 
+License: BSD (see ../docs/LICENSE for details)
 
 Dependencies:
-* [Python 2.3+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Python 2.4+](http://python.org)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
+* [Pygments (optional)](http://pygments.org)
 
 """
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..preprocessors import Preprocessor
+from .codehilite import CodeHilite, CodeHiliteExtension
 import re
-import calibre.ebooks.markdown.markdown as markdown
 
 # Global vars
 FENCED_BLOCK_RE = re.compile( \
-    r'(?P<fence>^~{3,})[ ]*(\{?\.(?P<lang>[a-zA-Z0-9_-]*)\}?)?[ ]*\n(?P<code>.*?)(?P=fence)[ ]*$', 
+    r'(?P<fence>^(?:~{3,}|`{3,}))[ ]*(\{?\.?(?P<lang>[a-zA-Z0-9_+-]*)\}?)?[ ]*\n(?P<code>.*?)(?<=\n)(?P=fence)[ ]*$',
     re.MULTILINE|re.DOTALL
     )
 CODE_WRAP = '<pre><code%s>%s</code></pre>'
 LANG_TAG = ' class="%s"'
 
-
-class FencedCodeExtension(markdown.Extension):
+class FencedCodeExtension(Extension):
 
     def extendMarkdown(self, md, md_globals):
         """ Add FencedBlockPreprocessor to the Markdown instance. """
+        md.registerExtension(self)
 
-        md.preprocessors.add('fenced_code_block', 
-                                 FencedBlockPreprocessor(md), 
-                                 "_begin")
+        md.preprocessors.add('fenced_code_block',
+                                 FencedBlockPreprocessor(md),
+                                 ">normalize_whitespace")
 
 
-class FencedBlockPreprocessor(markdown.preprocessors.Preprocessor):
-    
+class FencedBlockPreprocessor(Preprocessor):
+
+    def __init__(self, md):
+        super(FencedBlockPreprocessor, self).__init__(md)
+
+        self.checked_for_codehilite = False
+        self.codehilite_conf = {}
+
     def run(self, lines):
         """ Match and store Fenced Code Blocks in the HtmlStash. """
+
+        # Check for code hilite extension
+        if not self.checked_for_codehilite:
+            for ext in self.markdown.registeredExtensions:
+                if isinstance(ext, CodeHiliteExtension):
+                    self.codehilite_conf = ext.config
+                    break
+
+            self.checked_for_codehilite = True
+
         text = "\n".join(lines)
         while 1:
             m = FENCED_BLOCK_RE.search(text)
@@ -93,7 +126,22 @@ class FencedBlockPreprocessor(markdown.preprocessors.Preprocessor):
                 lang = ''
                 if m.group('lang'):
                     lang = LANG_TAG % m.group('lang')
-                code = CODE_WRAP % (lang, self._escape(m.group('code')))
+
+                # If config is not empty, then the codehighlite extension
+                # is enabled, so we call it to highlite the code
+                if self.codehilite_conf:
+                    highliter = CodeHilite(m.group('code'),
+                            linenums=self.codehilite_conf['linenums'][0],
+                            guess_lang=self.codehilite_conf['guess_lang'][0],
+                            css_class=self.codehilite_conf['css_class'][0],
+                            style=self.codehilite_conf['pygments_style'][0],
+                            lang=(m.group('lang') or None),
+                            noclasses=self.codehilite_conf['noclasses'][0])
+
+                    code = highliter.hilite()
+                else:
+                    code = CODE_WRAP % (lang, self._escape(m.group('code')))
+
                 placeholder = self.markdown.htmlStash.store(code, safe=True)
                 text = '%s\n%s\n%s'% (text[:m.start()], placeholder, text[m.end():])
             else:
@@ -110,9 +158,4 @@ class FencedBlockPreprocessor(markdown.preprocessors.Preprocessor):
 
 
 def makeExtension(configs=None):
-    return FencedCodeExtension()
-
-
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()
+    return FencedCodeExtension(configs=configs)
diff --git a/src/calibre/ebooks/markdown/extensions/footnotes.py b/src/calibre/ebooks/markdown/extensions/footnotes.py
index df137f5d53..65ed597a7b 100644
--- a/src/calibre/ebooks/markdown/extensions/footnotes.py
+++ b/src/calibre/ebooks/markdown/extensions/footnotes.py
@@ -23,33 +23,55 @@ Example:
 
 """
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..preprocessors import Preprocessor
+from ..inlinepatterns import Pattern
+from ..treeprocessors import Treeprocessor
+from ..postprocessors import Postprocessor
+from ..util import etree, text_type
+from ..odict import OrderedDict
 import re
-import calibre.ebooks.markdown.markdown as markdown
-from calibre.ebooks.markdown.markdown import etree
 
 FN_BACKLINK_TEXT = "zz1337820767766393qq"
 NBSP_PLACEHOLDER =  "qq3936677670287331zz"
-DEF_RE = re.compile(r'(\ ?\ ?\ ?)\[\^([^\]]*)\]:\s*(.*)')
+DEF_RE = re.compile(r'[ ]{0,3}\[\^([^\]]*)\]:\s*(.*)')
 TABBED_RE = re.compile(r'((\t)|(    ))(.*)')
 
-class FootnoteExtension(markdown.Extension):
+class FootnoteExtension(Extension):
     """ Footnote Extension. """
 
     def __init__ (self, configs):
         """ Setup configs. """
         self.config = {'PLACE_MARKER':
                        ["///Footnotes Go Here///",
-                        "The text string that marks where the footnotes go"]}
+                        "The text string that marks where the footnotes go"],
+                       'UNIQUE_IDS':
+                       [False,
+                        "Avoid name collisions across "
+                        "multiple calls to reset()."],
+                       "BACKLINK_TEXT":
+                       ["&#8617;",
+                        "The text string that links from the footnote to the reader's place."]
+                       }
 
         for key, value in configs:
             self.config[key][0] = value
 
+        # In multiple invocations, emit links that don't get tangled.
+        self.unique_prefix = 0
+
         self.reset()
 
     def extendMarkdown(self, md, md_globals):
         """ Add pieces to Markdown. """
         md.registerExtension(self)
         self.parser = md.parser
+        self.md = md
+        self.sep = ':'
+        if self.md.output_format in ['html5', 'xhtml5']:
+            self.sep = '-'
         # Insert a preprocessor before ReferencePreprocessor
         md.preprocessors.add("footnote", FootnotePreprocessor(self),
                              "<reference")
@@ -58,17 +80,18 @@ class FootnoteExtension(markdown.Extension):
         md.inlinePatterns.add("footnote", FootnotePattern(FOOTNOTE_RE, self),
                               "<reference")
         # Insert a tree-processor that would actually add the footnote div
-        # This must be before the inline treeprocessor so inline patterns
-        # run on the contents of the div.
+        # This must be before all other treeprocessors (i.e., inline and 
+        # codehilite) so they can run on the the contents of the div.
         md.treeprocessors.add("footnote", FootnoteTreeprocessor(self),
-                                 "<inline")
+                                 "_begin")
         # Insert a postprocessor after amp_substitute oricessor
         md.postprocessors.add("footnote", FootnotePostprocessor(self),
                                   ">amp_substitute")
 
     def reset(self):
-        """ Clear the footnotes on reset. """
-        self.footnotes = markdown.odict.OrderedDict()
+        """ Clear the footnotes on reset, and prepare for a distinct document. """
+        self.footnotes = OrderedDict()
+        self.unique_prefix += 1
 
     def findFootnotesPlaceholder(self, root):
         """ Return ElementTree Element that contains Footnote placeholder. """
@@ -76,13 +99,13 @@ class FootnoteExtension(markdown.Extension):
             for child in element:
                 if child.text:
                     if child.text.find(self.getConfig("PLACE_MARKER")) > -1:
-                        return child, True
+                        return child, element, True
                 if child.tail:
                     if child.tail.find(self.getConfig("PLACE_MARKER")) > -1:
-                        return (child, element), False
+                        return child, element, False
                 finder(child)
             return None
-
+                
         res = finder(root)
         return res
 
@@ -92,16 +115,22 @@ class FootnoteExtension(markdown.Extension):
 
     def makeFootnoteId(self, id):
         """ Return footnote link id. """
-        return 'fn:%s' % id
+        if self.getConfig("UNIQUE_IDS"):
+            return 'fn%s%d-%s' % (self.sep, self.unique_prefix, id)
+        else:
+            return 'fn%s%s' % (self.sep, id)
 
     def makeFootnoteRefId(self, id):
         """ Return footnote back-link id. """
-        return 'fnref:%s' % id
+        if self.getConfig("UNIQUE_IDS"):
+            return 'fnref%s%d-%s' % (self.sep, self.unique_prefix, id)
+        else:
+            return 'fnref%s%s' % (self.sep, id)
 
     def makeFootnotesDiv(self, root):
         """ Return div of footnotes as et Element. """
 
-        if not self.footnotes.keys():
+        if not list(self.footnotes.keys()):
             return None
 
         div = etree.Element("div")
@@ -115,7 +144,9 @@ class FootnoteExtension(markdown.Extension):
             self.parser.parseChunk(li, self.footnotes[id])
             backlink = etree.Element("a")
             backlink.set("href", "#" + self.makeFootnoteRefId(id))
-            backlink.set("rev", "footnote")
+            if self.md.output_format not in ['html5', 'xhtml5']:
+                backlink.set("rev", "footnote") # Invalid in HTML5
+            backlink.set("class", "footnote-backref")
             backlink.set("title", "Jump back to footnote %d in the text" % \
                             (self.footnotes.index(id)+1))
             backlink.text = FN_BACKLINK_TEXT
@@ -131,61 +162,39 @@ class FootnoteExtension(markdown.Extension):
         return div
 
 
-class FootnotePreprocessor(markdown.preprocessors.Preprocessor):
+class FootnotePreprocessor(Preprocessor):
     """ Find all footnote references and store for later use. """
 
     def __init__ (self, footnotes):
         self.footnotes = footnotes
 
     def run(self, lines):
-        lines = self._handleFootnoteDefinitions(lines)
-        text = "\n".join(lines)
-        return text.split("\n")
-
-    def _handleFootnoteDefinitions(self, lines):
         """
-        Recursively find all footnote definitions in lines.
+        Loop through lines and find, set, and remove footnote definitions.
 
         Keywords:
 
         * lines: A list of lines of text
 
-        Return: A list of lines with footnote definitions removed.
+        Return: A list of lines of text with footnote definitions removed.
 
         """
-        i, id, footnote = self._findFootnoteDefinition(lines)
-
-        if id :
-            plain = lines[:i]
-            detabbed, theRest = self.detectTabbed(lines[i+1:])
-            self.footnotes.setFootnote(id,
-                                       footnote + "\n"
-                                       + "\n".join(detabbed))
-            more_plain = self._handleFootnoteDefinitions(theRest)
-            return plain + [""] + more_plain
-        else :
-            return lines
-
-    def _findFootnoteDefinition(self, lines):
-        """
-        Find the parts of a footnote definition.
-
-        Keywords:
-
-        * lines: A list of lines of text.
-
-        Return: A three item tuple containing the index of the first line of a
-        footnote definition, the id of the definition and the body of the
-        definition.
-
-        """
-        counter = 0
-        for line in lines:
-            m = DEF_RE.match(line)
+        newlines = []
+        i = 0
+        while True:
+            m = DEF_RE.match(lines[i])
             if m:
-                return counter, m.group(2), m.group(3)
-            counter += 1
-        return counter, None, None
+                fn, _i = self.detectTabbed(lines[i+1:])
+                fn.insert(0, m.group(2))
+                i += _i-1 # skip past footnote
+                self.footnotes.setFootnote(m.group(1), "\n".join(fn))
+            else:
+                newlines.append(lines[i])
+            if len(lines) > i+1:
+                i += 1
+            else:
+                break
+        return newlines
 
     def detectTabbed(self, lines):
         """ Find indented text and remove indent before further proccesing.
@@ -194,11 +203,11 @@ class FootnotePreprocessor(markdown.preprocessors.Preprocessor):
 
         * lines: an array of strings
 
-        Returns: a list of post processed items and the unused
-        remainder of the original list
+        Returns: a list of post processed items and the index of last line.
 
         """
         items = []
+        blank_line = False # have we encountered a blank line yet?
         i = 0 # to keep track of where we are
 
         def detab(line):
@@ -208,15 +217,21 @@ class FootnotePreprocessor(markdown.preprocessors.Preprocessor):
 
         for line in lines:
             if line.strip(): # Non-blank line
-                line = detab(line)
-                if line:
+                detabbed_line = detab(line)
+                if detabbed_line:
+                    items.append(detabbed_line)
+                    i += 1
+                    continue
+                elif not blank_line and not DEF_RE.match(line):
+                    # not tabbed but still part of first par.
                     items.append(line)
                     i += 1
                     continue
                 else:
-                    return items, lines[i:]
+                    return items, i+1
 
             else: # Blank line: _maybe_ we are done.
+                blank_line = True
                 i += 1 # advance
 
                 # Find the next non-blank line
@@ -235,28 +250,33 @@ class FootnotePreprocessor(markdown.preprocessors.Preprocessor):
         else:
             i += 1
 
-        return items, lines[i:]
+        return items, i
 
 
-class FootnotePattern(markdown.inlinepatterns.Pattern):
+class FootnotePattern(Pattern):
     """ InlinePattern for footnote markers in a document's body text. """
 
     def __init__(self, pattern, footnotes):
-        markdown.inlinepatterns.Pattern.__init__(self, pattern)
+        super(FootnotePattern, self).__init__(pattern)
         self.footnotes = footnotes
 
     def handleMatch(self, m):
-        sup = etree.Element("sup")
-        a = etree.SubElement(sup, "a")
         id = m.group(2)
-        sup.set('id', self.footnotes.makeFootnoteRefId(id))
-        a.set('href', '#' + self.footnotes.makeFootnoteId(id))
-        a.set('rel', 'footnote')
-        a.text = str(self.footnotes.footnotes.index(id) + 1)
-        return sup
+        if id in self.footnotes.footnotes.keys():
+            sup = etree.Element("sup")
+            a = etree.SubElement(sup, "a")
+            sup.set('id', self.footnotes.makeFootnoteRefId(id))
+            a.set('href', '#' + self.footnotes.makeFootnoteId(id))
+            if self.footnotes.md.output_format not in ['html5', 'xhtml5']:
+                a.set('rel', 'footnote') # invalid in HTML5
+            a.set('class', 'footnote-ref')
+            a.text = text_type(self.footnotes.footnotes.index(id) + 1)
+            return sup
+        else:
+            return None
 
 
-class FootnoteTreeprocessor(markdown.treeprocessors.Treeprocessor):
+class FootnoteTreeprocessor(Treeprocessor):
     """ Build and append footnote div to end of document. """
 
     def __init__ (self, footnotes):
@@ -267,23 +287,24 @@ class FootnoteTreeprocessor(markdown.treeprocessors.Treeprocessor):
         if footnotesDiv:
             result = self.footnotes.findFootnotesPlaceholder(root)
             if result:
-                node, isText = result
+                child, parent, isText = result
+                ind = parent.getchildren().index(child)
                 if isText:
-                    node.text = None
-                    node.getchildren().insert(0, footnotesDiv)
+                    parent.remove(child)
+                    parent.insert(ind, footnotesDiv)
                 else:
-                    child, element = node
-                    ind = element.getchildren().find(child)
-                    element.getchildren().insert(ind + 1, footnotesDiv)
+                    parent.insert(ind + 1, footnotesDiv)
                     child.tail = None
             else:
                 root.append(footnotesDiv)
 
-class FootnotePostprocessor(markdown.postprocessors.Postprocessor):
+class FootnotePostprocessor(Postprocessor):
     """ Replace placeholders with html entities. """
+    def __init__(self, footnotes):
+        self.footnotes = footnotes
 
     def run(self, text):
-        text = text.replace(FN_BACKLINK_TEXT, "&#8617;")
+        text = text.replace(FN_BACKLINK_TEXT, self.footnotes.getConfig("BACKLINK_TEXT"))
         return text.replace(NBSP_PLACEHOLDER, "&#160;")
 
 def makeExtension(configs=[]):
diff --git a/src/calibre/ebooks/markdown/extensions/headerid.py b/src/calibre/ebooks/markdown/extensions/headerid.py
index 0ffd91ee93..7681b8d499 100644
--- a/src/calibre/ebooks/markdown/extensions/headerid.py
+++ b/src/calibre/ebooks/markdown/extensions/headerid.py
@@ -1,28 +1,28 @@
-#!/usr/bin/python
-
 """
 HeaderID Extension for Python-Markdown
 ======================================
 
-Adds ability to set HTML IDs for headers.
+Auto-generate id attributes for HTML headers.
 
 Basic usage:
 
     >>> import markdown
-    >>> text = "# Some Header # {#some_id}"
+    >>> text = "# Some Header #"
     >>> md = markdown.markdown(text, ['headerid'])
-    >>> md
-    u'<h1 id="some_id">Some Header</h1>'
+    >>> print md
+    <h1 id="some-header">Some Header</h1>
 
 All header IDs are unique:
 
     >>> text = '''
     ... #Header
-    ... #Another Header {#header}
-    ... #Third Header {#header}'''
+    ... #Header
+    ... #Header'''
     >>> md = markdown.markdown(text, ['headerid'])
-    >>> md
-    u'<h1 id="header">Header</h1>\\n<h1 id="header_1">Another Header</h1>\\n<h1 id="header_2">Third Header</h1>'
+    >>> print md
+    <h1 id="header">Header</h1>
+    <h1 id="header_1">Header</h1>
+    <h1 id="header_2">Header</h1>
 
 To fit within a html template's hierarchy, set the header base level:
 
@@ -30,17 +30,26 @@ To fit within a html template's hierarchy, set the header base level:
     ... #Some Header
     ... ## Next Level'''
     >>> md = markdown.markdown(text, ['headerid(level=3)'])
-    >>> md
-    u'<h3 id="some_header">Some Header</h3>\\n<h4 id="next_level">Next Level</h4>'
+    >>> print md
+    <h3 id="some-header">Some Header</h3>
+    <h4 id="next-level">Next Level</h4>
+
+Works with inline markup.
+
+    >>> text = '#Some *Header* with [markup](http://example.com).'
+    >>> md = markdown.markdown(text, ['headerid'])
+    >>> print md
+    <h1 id="some-header-with-markup">Some <em>Header</em> with <a href="http://example.com">markup</a>.</h1>
 
 Turn off auto generated IDs:
 
     >>> text = '''
     ... # Some Header
-    ... # Header with ID # { #foo }'''
+    ... # Another Header'''
     >>> md = markdown.markdown(text, ['headerid(forceid=False)'])
-    >>> md
-    u'<h1>Some Header</h1>\\n<h1 id="foo">Header with ID</h1>'
+    >>> print md
+    <h1>Some Header</h1>
+    <h1>Another Header</h1>
 
 Use with MetaData extension:
 
@@ -49,85 +58,101 @@ Use with MetaData extension:
     ...
     ... # A Header'''
     >>> md = markdown.markdown(text, ['headerid', 'meta'])
-    >>> md
-    u'<h2>A Header</h2>'
+    >>> print md
+    <h2>A Header</h2>
 
-Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
+Copyright 2007-2011 [Waylan Limberg](http://achinghead.com/).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/HeaderId>
+Project website: <http://packages.python.org/Markdown/extensions/header_id.html>
 Contact: markdown@freewisdom.org
 
-License: BSD (see ../docs/LICENSE for details)
+License: BSD (see ../docs/LICENSE for details) 
 
 Dependencies:
 * [Python 2.3+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 
 """
 
-import calibre.ebooks.markdown.markdown as markdown
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..treeprocessors import Treeprocessor
 import re
-from string import ascii_lowercase, digits, punctuation
+import logging
+import unicodedata
+
+logger = logging.getLogger('MARKDOWN')
 
-ID_CHARS = ascii_lowercase + digits + '-_'
 IDCOUNT_RE = re.compile(r'^(.*)_([0-9]+)$')
 
 
-class HeaderIdProcessor(markdown.blockprocessors.BlockProcessor):
-    """ Replacement BlockProcessor for Header IDs. """
+def slugify(value, separator):
+    """ Slugify a string, to make it URL friendly. """
+    value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
+    value = re.sub('[^\w\s-]', '', value.decode('ascii')).strip().lower()
+    return re.sub('[%s\s]+' % separator, separator, value)
 
-    # Detect a header at start of any line in block
-    RE = re.compile(r"""(^|\n)
-                        (?P<level>\#{1,6})  # group('level') = string of hashes
-                        (?P<header>.*?)     # group('header') = Header text
-                        \#*                 # optional closing hashes
-                        (?:[ \t]*\{[ \t]*\#(?P<id>[-_:a-zA-Z0-9]+)[ \t]*\})?
-                        (\n|$)              #  ^^ group('id') = id attribute
-                     """,
-                     re.VERBOSE)
 
-    IDs = []
-
-    def test(self, parent, block):
-        return bool(self.RE.search(block))
-
-    def run(self, parent, blocks):
-        block = blocks.pop(0)
-        m = self.RE.search(block)
+def unique(id, ids):
+    """ Ensure id is unique in set of ids. Append '_1', '_2'... if not """
+    while id in ids or not id:
+        m = IDCOUNT_RE.match(id)
         if m:
-            before = block[:m.start()] # All lines before header
-            after = block[m.end():]    # All lines after header
-            if before:
-                # As the header was not the first line of the block and the
-                # lines before the header must be parsed first,
-                # recursively parse this lines as a block.
-                self.parser.parseBlocks(parent, [before])
-            # Create header using named groups from RE
-            start_level, force_id = self._get_meta()
-            level = len(m.group('level')) + start_level
-            if level > 6:
-                level = 6
-            h = markdown.etree.SubElement(parent, 'h%d' % level)
-            h.text = m.group('header').strip()
-            if m.group('id'):
-                h.set('id', self._unique_id(m.group('id')))
-            elif force_id:
-                h.set('id', self._create_id(m.group('header').strip()))
-            if after:
-                # Insert remaining lines as first block for future parsing.
-                blocks.insert(0, after)
+            id = '%s_%d'% (m.group(1), int(m.group(2))+1)
         else:
-            # This should never happen, but just in case...
-            print ("We've got a problem header!")
+            id = '%s_%d'% (id, 1)
+    ids.add(id)
+    return id
+
+
+def itertext(elem):
+    """ Loop through all children and return text only. 
+    
+    Reimplements method of same name added to ElementTree in Python 2.7
+    
+    """
+    if elem.text:
+        yield elem.text
+    for e in elem:
+        for s in itertext(e):
+            yield s
+        if e.tail:
+            yield e.tail
+
+
+class HeaderIdTreeprocessor(Treeprocessor):
+    """ Assign IDs to headers. """
+
+    IDs = set()
+
+    def run(self, doc):
+        start_level, force_id = self._get_meta()
+        slugify = self.config['slugify']
+        sep = self.config['separator']
+        for elem in doc.getiterator():
+            if elem.tag in ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']:
+                if force_id:
+                    if "id" in elem.attrib:
+                        id = elem.get('id')
+                    else:
+                        id = slugify(''.join(itertext(elem)), sep)
+                    elem.set('id', unique(id, self.IDs))
+                if start_level:
+                    level = int(elem.tag[-1]) + start_level
+                    if level > 6:
+                        level = 6
+                    elem.tag = 'h%d' % level
+
 
     def _get_meta(self):
         """ Return meta data suported by this ext as a tuple """
-        level = int(self.config['level'][0]) - 1
-        force = self._str2bool(self.config['forceid'][0])
+        level = int(self.config['level']) - 1
+        force = self._str2bool(self.config['forceid'])
         if hasattr(self.md, 'Meta'):
-            if self.md.Meta.has_key('header_level'):
+            if 'header_level' in self.md.Meta:
                 level = int(self.md.Meta['header_level'][0]) - 1
-            if self.md.Meta.has_key('header_forceid'):
+            if 'header_forceid' in self.md.Meta: 
                 force = self._str2bool(self.md.Meta['header_forceid'][0])
         return level, force
 
@@ -140,34 +165,15 @@ class HeaderIdProcessor(markdown.blockprocessors.BlockProcessor):
             return True
         return default
 
-    def _unique_id(self, id):
-        """ Ensure ID is unique. Append '_1', '_2'... if not """
-        while id in self.IDs:
-            m = IDCOUNT_RE.match(id)
-            if m:
-                id = '%s_%d'% (m.group(1), int(m.group(2))+1)
-            else:
-                id = '%s_%d'% (id, 1)
-        self.IDs.append(id)
-        return id
 
-    def _create_id(self, header):
-        """ Return ID from Header text. """
-        h = ''
-        for c in header.lower().replace(' ', '_'):
-            if c in ID_CHARS:
-                h += c
-            elif c not in punctuation:
-                h += '+'
-        return self._unique_id(h)
-
-
-class HeaderIdExtension (markdown.Extension):
+class HeaderIdExtension(Extension):
     def __init__(self, configs):
         # set defaults
         self.config = {
                 'level' : ['1', 'Base level for headers.'],
-                'forceid' : ['True', 'Force all headers to have an id.']
+                'forceid' : ['True', 'Force all headers to have an id.'],
+                'separator' : ['-', 'Word separator.'],
+                'slugify' : [slugify, 'Callable to generate anchors'], 
             }
 
         for key, value in configs:
@@ -175,20 +181,19 @@ class HeaderIdExtension (markdown.Extension):
 
     def extendMarkdown(self, md, md_globals):
         md.registerExtension(self)
-        self.processor = HeaderIdProcessor(md.parser)
+        self.processor = HeaderIdTreeprocessor()
         self.processor.md = md
-        self.processor.config = self.config
-        # Replace existing hasheader in place.
-        md.parser.blockprocessors['hashheader'] = self.processor
+        self.processor.config = self.getConfigs()
+        if 'attr_list' in md.treeprocessors.keys():
+            # insert after attr_list treeprocessor
+            md.treeprocessors.add('headerid', self.processor, '>attr_list')
+        else:
+            # insert after 'prettify' treeprocessor.
+            md.treeprocessors.add('headerid', self.processor, '>prettify')
 
     def reset(self):
-        self.processor.IDs = []
+        self.processor.IDs = set()
 
 
 def makeExtension(configs=None):
     return HeaderIdExtension(configs=configs)
-
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()
-
diff --git a/src/calibre/ebooks/markdown/extensions/meta.py b/src/calibre/ebooks/markdown/extensions/meta.py
index b33eaa0f71..aaff4365a8 100644
--- a/src/calibre/ebooks/markdown/extensions/meta.py
+++ b/src/calibre/ebooks/markdown/extensions/meta.py
@@ -1,5 +1,3 @@
-#!usr/bin/python
-
 """
 Meta Data Extension for Python-Markdown
 =======================================
@@ -17,37 +15,41 @@ Basic Usage:
     ... The body. This is paragraph one.
     ... '''
     >>> md = markdown.Markdown(['meta'])
-    >>> md.convert(text)
-    u'<p>The body. This is paragraph one.</p>'
-    >>> md.Meta
+    >>> print md.convert(text)
+    <p>The body. This is paragraph one.</p>
+    >>> print md.Meta
     {u'blank_data': [u''], u'author': [u'Waylan Limberg', u'John Doe'], u'title': [u'A Test Doc.']}
 
 Make sure text without Meta Data still works (markdown < 1.6b returns a <p>).
 
     >>> text = '    Some Code - not extra lines of meta data.'
     >>> md = markdown.Markdown(['meta'])
-    >>> md.convert(text)
-    u'<pre><code>Some Code - not extra lines of meta data.\\n</code></pre>'
+    >>> print md.convert(text)
+    <pre><code>Some Code - not extra lines of meta data.
+    </code></pre>
     >>> md.Meta
     {}
 
 Copyright 2007-2008 [Waylan Limberg](http://achinghead.com).
 
-Project website: <http://www.freewisdom.org/project/python-markdown/Meta-Data>
+Project website: <http://packages.python.org/Markdown/meta_data.html>
 Contact: markdown@freewisdom.org
 
-License: BSD (see ../docs/LICENSE for details)
+License: BSD (see ../LICENSE.md for details)
 
 """
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..preprocessors import Preprocessor
 import re
-import calibre.ebooks.markdown.markdown as markdown
 
 # Global Vars
 META_RE = re.compile(r'^[ ]{0,3}(?P<key>[A-Za-z0-9_-]+):\s*(?P<value>.*)')
 META_MORE_RE = re.compile(r'^[ ]{4,}(?P<value>.*)')
 
-class MetaExtension (markdown.Extension):
+class MetaExtension (Extension):
     """ Meta-Data extension for Python-Markdown. """
 
     def extendMarkdown(self, md, md_globals):
@@ -56,7 +58,7 @@ class MetaExtension (markdown.Extension):
         md.preprocessors.add("meta", MetaPreprocessor(md), "_begin")
 
 
-class MetaPreprocessor(markdown.preprocessors.Preprocessor):
+class MetaPreprocessor(Preprocessor):
     """ Get Meta-Data. """
 
     def run(self, lines):
@@ -70,7 +72,11 @@ class MetaPreprocessor(markdown.preprocessors.Preprocessor):
             m1 = META_RE.match(line)
             if m1:
                 key = m1.group('key').lower().strip()
-                meta[key] = [m1.group('value').strip()]
+                value = m1.group('value').strip()
+                try:
+                    meta[key].append(value)
+                except KeyError:
+                    meta[key] = [value]
             else:
                 m2 = META_MORE_RE.match(line)
                 if m2 and key:
@@ -85,7 +91,3 @@ class MetaPreprocessor(markdown.preprocessors.Preprocessor):
 
 def makeExtension(configs={}):
     return MetaExtension(configs=configs)
-
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()
diff --git a/src/calibre/ebooks/markdown/extensions/nl2br.py b/src/calibre/ebooks/markdown/extensions/nl2br.py
new file mode 100644
index 0000000000..da4b339958
--- /dev/null
+++ b/src/calibre/ebooks/markdown/extensions/nl2br.py
@@ -0,0 +1,38 @@
+"""
+NL2BR Extension
+===============
+
+A Python-Markdown extension to treat newlines as hard breaks; like
+GitHub-flavored Markdown does.
+
+Usage:
+
+    >>> import markdown
+    >>> print markdown.markdown('line 1\\nline 2', extensions=['nl2br'])
+    <p>line 1<br />
+    line 2</p>
+
+Copyright 2011 [Brian Neal](http://deathofagremmie.com/)
+
+Dependencies:
+* [Python 2.4+](http://python.org)
+* [Markdown 2.1+](http://packages.python.org/Markdown/)
+
+"""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..inlinepatterns import SubstituteTagPattern
+
+BR_RE = r'\n'
+
+class Nl2BrExtension(Extension):
+
+    def extendMarkdown(self, md, md_globals):
+        br_tag = SubstituteTagPattern(BR_RE, 'br')
+        md.inlinePatterns.add('nl', br_tag, '_end')
+
+
+def makeExtension(configs=None):
+    return Nl2BrExtension(configs)
diff --git a/src/calibre/ebooks/markdown/extensions/rss.py b/src/calibre/ebooks/markdown/extensions/rss.py
deleted file mode 100644
index 466c502da0..0000000000
--- a/src/calibre/ebooks/markdown/extensions/rss.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import calibre.ebooks.markdown.markdown as markdown
-from calibre.ebooks.markdown.markdown import etree
-
-DEFAULT_URL = "http://www.freewisdom.org/projects/python-markdown/"
-DEFAULT_CREATOR = "Yuri Takhteyev"
-DEFAULT_TITLE = "Markdown in Python"
-GENERATOR = "http://www.freewisdom.org/projects/python-markdown/markdown2rss"
-
-month_map = { "Jan" : "01",
-              "Feb" : "02",
-              "March" : "03",
-              "April" : "04",
-              "May" : "05",
-              "June" : "06",
-              "July" : "07",
-              "August" : "08",
-              "September" : "09",
-              "October" : "10",
-              "November" : "11",
-              "December" : "12" }
-
-def get_time(heading):
-
-    heading = heading.split("-")[0]
-    heading = heading.strip().replace(",", " ").replace(".", " ")
-
-    month, date, year = heading.split()
-    month = month_map[month]
-
-    return rdftime(" ".join((month, date, year, "12:00:00 AM")))
-
-def rdftime(time):
-
-    time = time.replace(":", " ")
-    time = time.replace("/", " ")
-    time = time.split()
-    return "%s-%s-%sT%s:%s:%s-08:00" % (time[0], time[1], time[2],
-                                        time[3], time[4], time[5])
-
-
-def get_date(text):
-    return "date"
-
-class RssExtension (markdown.Extension):
-
-    def extendMarkdown(self, md, md_globals):
-
-        self.config = { 'URL' : [DEFAULT_URL, "Main URL"],
-                        'CREATOR' : [DEFAULT_CREATOR, "Feed creator's name"],
-                        'TITLE' : [DEFAULT_TITLE, "Feed title"] }
-
-        md.xml_mode = True
-        
-        # Insert a tree-processor that would actually add the title tag
-        treeprocessor = RssTreeProcessor(md)
-        treeprocessor.ext = self
-        md.treeprocessors['rss'] = treeprocessor
-        md.stripTopLevelTags = 0
-        md.docType = '<?xml version="1.0" encoding="utf-8"?>\n'
-
-class RssTreeProcessor(markdown.treeprocessors.Treeprocessor):
-
-    def run (self, root):
-
-        rss = etree.Element("rss")
-        rss.set("version", "2.0")
-
-        channel = etree.SubElement(rss, "channel")
-
-        for tag, text in (("title", self.ext.getConfig("TITLE")),
-                          ("link", self.ext.getConfig("URL")),
-                          ("description", None)):
-            
-            element = etree.SubElement(channel, tag)
-            element.text = text
-
-        for child in root:
-
-            if child.tag in ["h1", "h2", "h3", "h4", "h5"]:
-      
-                heading = child.text.strip()
-                item = etree.SubElement(channel, "item")
-                link = etree.SubElement(item, "link")
-                link.text = self.ext.getConfig("URL")
-                title = etree.SubElement(item, "title")
-                title.text = heading
-
-                guid = ''.join([x for x in heading if x.isalnum()])
-                guidElem = etree.SubElement(item, "guid")
-                guidElem.text = guid
-                guidElem.set("isPermaLink", "false")
-
-            elif child.tag in ["p"]:
-                try:
-                    description = etree.SubElement(item, "description")
-                except UnboundLocalError:
-                    # Item not defined - moving on
-                    pass
-                else:
-                    if len(child):
-                        content = "\n".join([etree.tostring(node)
-                                             for node in child])
-                    else:
-                        content = child.text
-                    pholder = self.markdown.htmlStash.store(
-                                                "<![CDATA[ %s]]>" % content)
-                    description.text = pholder
-    
-        return rss
-
-
-def makeExtension(configs):
-
-    return RssExtension(configs)
diff --git a/src/calibre/ebooks/markdown/extensions/sane_lists.py b/src/calibre/ebooks/markdown/extensions/sane_lists.py
new file mode 100644
index 0000000000..23e9a7f4a6
--- /dev/null
+++ b/src/calibre/ebooks/markdown/extensions/sane_lists.py
@@ -0,0 +1,51 @@
+"""
+Sane List Extension for Python-Markdown
+=======================================
+
+Modify the behavior of Lists in Python-Markdown t act in a sane manor.
+
+In standard Markdown sytex, the following would constitute a single 
+ordered list. However, with this extension, the output would include 
+two lists, the first an ordered list and the second and unordered list.
+
+    1. ordered
+    2. list
+
+    * unordered
+    * list
+
+Copyright 2011 - [Waylan Limberg](http://achinghead.com)
+
+"""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..blockprocessors import OListProcessor, UListProcessor
+import re
+
+
+class SaneOListProcessor(OListProcessor):
+    
+    CHILD_RE = re.compile(r'^[ ]{0,3}((\d+\.))[ ]+(.*)')
+    SIBLING_TAGS = ['ol']
+
+
+class SaneUListProcessor(UListProcessor):
+    
+    CHILD_RE = re.compile(r'^[ ]{0,3}(([*+-]))[ ]+(.*)')
+    SIBLING_TAGS = ['ul']
+
+
+class SaneListExtension(Extension):
+    """ Add sane lists to Markdown. """
+
+    def extendMarkdown(self, md, md_globals):
+        """ Override existing Processors. """
+        md.parser.blockprocessors['olist'] = SaneOListProcessor(md.parser)
+        md.parser.blockprocessors['ulist'] = SaneUListProcessor(md.parser)
+
+
+def makeExtension(configs={}):
+    return SaneListExtension(configs=configs)
+
diff --git a/src/calibre/ebooks/markdown/extensions/smart_strong.py b/src/calibre/ebooks/markdown/extensions/smart_strong.py
new file mode 100644
index 0000000000..4818cf9ea8
--- /dev/null
+++ b/src/calibre/ebooks/markdown/extensions/smart_strong.py
@@ -0,0 +1,42 @@
+'''
+Smart_Strong Extension for Python-Markdown
+==========================================
+
+This extention adds smarter handling of double underscores within words.
+
+Simple Usage:
+
+    >>> import markdown
+    >>> print markdown.markdown('Text with double__underscore__words.',
+    ...                   extensions=['smart_strong'])
+    <p>Text with double__underscore__words.</p>
+    >>> print markdown.markdown('__Strong__ still works.',
+    ...                   extensions=['smart_strong'])
+    <p><strong>Strong</strong> still works.</p>
+    >>> print markdown.markdown('__this__works__too__.',
+    ...                   extensions=['smart_strong'])
+    <p><strong>this__works__too</strong>.</p>
+
+Copyright 2011
+[Waylan Limberg](http://achinghead.com)
+
+'''
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..inlinepatterns import SimpleTagPattern
+
+SMART_STRONG_RE = r'(?<!\w)(_{2})(?!_)(.+?)(?<!_)\2(?!\w)'
+STRONG_RE = r'(\*{2})(.+?)\2'
+
+class SmartEmphasisExtension(Extension):
+    """ Add smart_emphasis extension to Markdown class."""
+
+    def extendMarkdown(self, md, md_globals):
+        """ Modify inline patterns. """
+        md.inlinePatterns['strong'] = SimpleTagPattern(STRONG_RE, 'strong')
+        md.inlinePatterns.add('strong2', SimpleTagPattern(SMART_STRONG_RE, 'strong'), '>emphasis2')
+
+def makeExtension(configs={}):
+    return SmartEmphasisExtension(configs=dict(configs))
diff --git a/src/calibre/ebooks/markdown/extensions/tables.py b/src/calibre/ebooks/markdown/extensions/tables.py
index f47ec1cc0e..ad52ec11c7 100644
--- a/src/calibre/ebooks/markdown/extensions/tables.py
+++ b/src/calibre/ebooks/markdown/extensions/tables.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env Python
 """
 Tables Extension for Python-Markdown
 ====================================
@@ -14,31 +13,35 @@ A simple example:
 
 Copyright 2009 - [Waylan Limberg](http://achinghead.com)
 """
-import calibre.ebooks.markdown.markdown as markdown
-from calibre.ebooks.markdown.markdown import etree
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..blockprocessors import BlockProcessor
+from ..util import etree
 
-class TableProcessor(markdown.blockprocessors.BlockProcessor):
+class TableProcessor(BlockProcessor):
     """ Process Tables. """
 
     def test(self, parent, block):
         rows = block.split('\n')
         return (len(rows) > 2 and '|' in rows[0] and 
                 '|' in rows[1] and '-' in rows[1] and 
-                rows[1][0] in ['|', ':', '-'])
+                rows[1].strip()[0] in ['|', ':', '-'])
 
     def run(self, parent, blocks):
         """ Parse a table block and build table. """
         block = blocks.pop(0).split('\n')
-        header = block[:2]
+        header = block[0].strip()
+        seperator = block[1].strip()
         rows = block[2:]
         # Get format type (bordered by pipes or not)
         border = False
-        if header[0].startswith('|'):
+        if header.startswith('|'):
             border = True
         # Get alignment of columns
         align = []
-        for c in self._split_row(header[1], border):
+        for c in self._split_row(seperator, border):
             if c.startswith(':') and c.endswith(':'):
                 align.append('center')
             elif c.startswith(':'):
@@ -50,10 +53,10 @@ class TableProcessor(markdown.blockprocessors.BlockProcessor):
         # Build table
         table = etree.SubElement(parent, 'table')
         thead = etree.SubElement(table, 'thead')
-        self._build_row(header[0], thead, align, border)
+        self._build_row(header, thead, align, border)
         tbody = etree.SubElement(table, 'tbody')
         for row in rows:
-            self._build_row(row, tbody, align, border)
+            self._build_row(row.strip(), tbody, align, border)
 
     def _build_row(self, row, parent, align, border):
         """ Given a row of text, build table cells. """
@@ -83,7 +86,7 @@ class TableProcessor(markdown.blockprocessors.BlockProcessor):
         return row.split('|')
 
 
-class TableExtension(markdown.Extension):
+class TableExtension(Extension):
     """ Add tables to Markdown. """
 
     def extendMarkdown(self, md, md_globals):
diff --git a/src/calibre/ebooks/markdown/extensions/toc.py b/src/calibre/ebooks/markdown/extensions/toc.py
index efa5516624..73b0844517 100644
--- a/src/calibre/ebooks/markdown/extensions/toc.py
+++ b/src/calibre/ebooks/markdown/extensions/toc.py
@@ -5,43 +5,141 @@ Table of Contents Extension for Python-Markdown
 (c) 2008 [Jack Miller](http://codezen.org)
 
 Dependencies:
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.1+](http://packages.python.org/Markdown/)
 
 """
-import calibre.ebooks.markdown.markdown as markdown
-from calibre.ebooks.markdown.markdown import etree
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..treeprocessors import Treeprocessor
+from ..util import etree
+from .headerid import slugify, unique, itertext
 import re
 
-class TocTreeprocessor(markdown.treeprocessors.Treeprocessor):
+
+def order_toc_list(toc_list):
+    """Given an unsorted list with errors and skips, return a nested one.
+    [{'level': 1}, {'level': 2}]
+    =>
+    [{'level': 1, 'children': [{'level': 2, 'children': []}]}]
+    
+    A wrong list is also converted:
+    [{'level': 2}, {'level': 1}]
+    =>
+    [{'level': 2, 'children': []}, {'level': 1, 'children': []}]
+    """
+    
+    def build_correct(remaining_list, prev_elements=[{'level': 1000}]):
+        
+        if not remaining_list:
+            return [], []
+        
+        current = remaining_list.pop(0)
+        if not 'children' in current.keys():
+            current['children'] = []
+        
+        if not prev_elements:
+            # This happens for instance with [8, 1, 1], ie. when some
+            # header level is outside a scope. We treat it as a
+            # top-level
+            next_elements, children = build_correct(remaining_list, [current])
+            current['children'].append(children)
+            return [current] + next_elements, []
+        
+        prev_element = prev_elements.pop()
+        children = []
+        next_elements = []
+        # Is current part of the child list or next list?
+        if current['level'] > prev_element['level']:
+            #print "%d is a child of %d" % (current['level'], prev_element['level'])
+            prev_elements.append(prev_element)
+            prev_elements.append(current)
+            prev_element['children'].append(current)
+            next_elements2, children2 = build_correct(remaining_list, prev_elements)
+            children += children2
+            next_elements += next_elements2
+        else:
+            #print "%d is ancestor of %d" % (current['level'], prev_element['level'])
+            if not prev_elements:
+                #print "No previous elements, so appending to the next set"
+                next_elements.append(current)
+                prev_elements = [current]
+                next_elements2, children2 = build_correct(remaining_list, prev_elements)
+                current['children'].extend(children2)
+            else:
+                #print "Previous elements, comparing to those first"
+                remaining_list.insert(0, current)
+                next_elements2, children2 = build_correct(remaining_list, prev_elements)
+                children.extend(children2)
+            next_elements += next_elements2
+        
+        return next_elements, children
+    
+    ordered_list, __ = build_correct(toc_list)
+    return ordered_list
+
+
+class TocTreeprocessor(Treeprocessor):
+    
     # Iterator wrapper to get parent and child all at once
     def iterparent(self, root):
         for parent in root.getiterator():
             for child in parent:
                 yield parent, child
-
-    def run(self, doc):
-        div = etree.Element("div")
-        div.attrib["class"] = "toc"
-        last_li = None
-
+    
+    def add_anchor(self, c, elem_id): #@ReservedAssignment
+        if self.use_anchors:
+            anchor = etree.Element("a")
+            anchor.text = c.text
+            anchor.attrib["href"] = "#" + elem_id
+            anchor.attrib["class"] = "toclink"
+            c.text = ""
+            for elem in c.getchildren():
+                anchor.append(elem)
+                c.remove(elem)
+            c.append(anchor)
+    
+    def build_toc_etree(self, div, toc_list):
         # Add title to the div
-        if self.config["title"][0]:
+        if self.config["title"]:
             header = etree.SubElement(div, "span")
             header.attrib["class"] = "toctitle"
-            header.text = self.config["title"][0]
+            header.text = self.config["title"]
 
-        level = 0
-        list_stack=[div]
+        def build_etree_ul(toc_list, parent):
+            ul = etree.SubElement(parent, "ul")
+            for item in toc_list:
+                # List item link, to be inserted into the toc div
+                li = etree.SubElement(ul, "li")
+                link = etree.SubElement(li, "a")
+                link.text = item.get('name', '')
+                link.attrib["href"] = '#' + item.get('id', '')
+                if item['children']:
+                    build_etree_ul(item['children'], li)
+            return ul
+        
+        return build_etree_ul(toc_list, div)
+        
+    def run(self, doc):
+
+        div = etree.Element("div")
+        div.attrib["class"] = "toc"
         header_rgx = re.compile("[Hh][123456]")
-
+        
+        self.use_anchors = self.config["anchorlink"] in [1, '1', True, 'True', 'true']
+        
         # Get a list of id attributes
-        used_ids = []
+        used_ids = set()
         for c in doc.getiterator():
             if "id" in c.attrib:
-                used_ids.append(c.attrib["id"])
+                used_ids.add(c.attrib["id"])
 
+        toc_list = []
+        marker_found = False
         for (p, c) in self.iterparent(doc):
-            if not c.text:
+            text = ''.join(itertext(c)).strip()
+            if not text:
                 continue
 
             # To keep the output from screwing up the
@@ -50,69 +148,54 @@ class TocTreeprocessor(markdown.treeprocessors.Treeprocessor):
             # We do not allow the marker inside a header as that
             # would causes an enless loop of placing a new TOC 
             # inside previously generated TOC.
-
-            if c.text.find(self.config["marker"][0]) > -1 and not header_rgx.match(c.tag):
+            if c.text and c.text.strip() == self.config["marker"] and \
+               not header_rgx.match(c.tag) and c.tag not in ['pre', 'code']:
                 for i in range(len(p)):
                     if p[i] == c:
                         p[i] = div
                         break
-                    
+                marker_found = True
+                            
             if header_rgx.match(c.tag):
-                tag_level = int(c.tag[-1])
                 
-                # Regardless of how many levels we jumped
-                # only one list should be created, since
-                # empty lists containing lists are illegal.
-    
-                if tag_level < level:
-                    list_stack.pop()
-                    level = tag_level
-
-                if tag_level > level:
-                    newlist = etree.Element("ul")
-                    if last_li:
-                        last_li.append(newlist)
-                    else:
-                        list_stack[-1].append(newlist)
-                    list_stack.append(newlist)
-                    level = tag_level
-
                 # Do not override pre-existing ids 
                 if not "id" in c.attrib:
-                    id = self.config["slugify"][0](c.text)
-                    if id in used_ids:
-                        ctr = 1
-                        while "%s_%d" % (id, ctr) in used_ids:
-                            ctr += 1
-                        id = "%s_%d" % (id, ctr)
-                    used_ids.append(id)
-                    c.attrib["id"] = id
+                    elem_id = unique(self.config["slugify"](text, '-'), used_ids)
+                    c.attrib["id"] = elem_id
                 else:
-                    id = c.attrib["id"]
+                    elem_id = c.attrib["id"]
 
-                # List item link, to be inserted into the toc div
-                last_li = etree.Element("li")
-                link = etree.SubElement(last_li, "a")
-                link.text = c.text
-                link.attrib["href"] = '#' + id
+                tag_level = int(c.tag[-1])
+                
+                toc_list.append({'level': tag_level,
+                    'id': elem_id,
+                    'name': text})
+                
+                self.add_anchor(c, elem_id)
+                
+        toc_list_nested = order_toc_list(toc_list)
+        self.build_toc_etree(div, toc_list_nested)
+        prettify = self.markdown.treeprocessors.get('prettify')
+        if prettify: prettify.run(div)
+        if not marker_found:
+            # serialize and attach to markdown instance.
+            toc = self.markdown.serializer(div)
+            for pp in self.markdown.postprocessors.values():
+                toc = pp.run(toc)
+            self.markdown.toc = toc
 
-                if int(self.config["anchorlink"][0]):
-                    anchor = etree.SubElement(c, "a")
-                    anchor.text = c.text
-                    anchor.attrib["href"] = "#" + id
-                    anchor.attrib["class"] = "toclink"
-                    c.text = ""
 
-                list_stack[-1].append(last_li)
-
-class TocExtension(markdown.Extension):
-    def __init__(self, configs):
+class TocExtension(Extension):
+    
+    TreeProcessorClass = TocTreeprocessor
+    
+    def __init__(self, configs=[]):
         self.config = { "marker" : ["[TOC]", 
                             "Text to find and replace with Table of Contents -"
                             "Defaults to \"[TOC]\""],
-                        "slugify" : [self.slugify,
+                        "slugify" : [slugify,
                             "Function to generate anchors based on header text-"
-                            "Defaults to a built in slugify function."],
+                            "Defaults to the headerid ext's slugify function."],
                         "title" : [None,
                             "Title to insert into TOC <div> - "
                             "Defaults to None"],
@@ -123,18 +206,16 @@ class TocExtension(markdown.Extension):
         for key, value in configs:
             self.setConfig(key, value)
 
-    # This is exactly the same as Django's slugify
-    def slugify(self, value):
-        """ Slugify a string, to make it URL friendly. """
-        import unicodedata
-        value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
-        value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
-        return re.sub('[-\s]+','-',value)
-
     def extendMarkdown(self, md, md_globals):
-        tocext = TocTreeprocessor(md)
-        tocext.config = self.config
-        md.treeprocessors.add("toc", tocext, "_begin")
-	
+        tocext = self.TreeProcessorClass(md)
+        tocext.config = self.getConfigs()
+        # Headerid ext is set to '>prettify'. With this set to '_end',
+        # it should always come after headerid ext (and honor ids assinged 
+        # by the header id extension) if both are used. Same goes for 
+        # attr_list extension. This must come last because we don't want
+        # to redefine ids after toc is created. But we do want toc prettified.
+        md.treeprocessors.add("toc", tocext, "_end")
+
+
 def makeExtension(configs={}):
     return TocExtension(configs=configs)
diff --git a/src/calibre/ebooks/markdown/extensions/wikilinks.py b/src/calibre/ebooks/markdown/extensions/wikilinks.py
index ddb7b5f0d6..877890b8ab 100644
--- a/src/calibre/ebooks/markdown/extensions/wikilinks.py
+++ b/src/calibre/ebooks/markdown/extensions/wikilinks.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 '''
 WikiLinks Extension for Python-Markdown
 ======================================
@@ -11,22 +9,22 @@ Basic usage:
     >>> import markdown
     >>> text = "Some text with a [[WikiLink]]."
     >>> html = markdown.markdown(text, ['wikilinks'])
-    >>> html
-    u'<p>Some text with a <a class="wikilink" href="/WikiLink/">WikiLink</a>.</p>'
+    >>> print html
+    <p>Some text with a <a class="wikilink" href="/WikiLink/">WikiLink</a>.</p>
 
 Whitespace behavior:
 
-    >>> markdown.markdown('[[ foo bar_baz ]]', ['wikilinks'])
-    u'<p><a class="wikilink" href="/foo_bar_baz/">foo bar_baz</a></p>'
-    >>> markdown.markdown('foo [[ ]] bar', ['wikilinks'])
-    u'<p>foo  bar</p>'
+    >>> print markdown.markdown('[[ foo bar_baz ]]', ['wikilinks'])
+    <p><a class="wikilink" href="/foo_bar_baz/">foo bar_baz</a></p>
+    >>> print markdown.markdown('foo [[ ]] bar', ['wikilinks'])
+    <p>foo  bar</p>
 
 To define custom settings the simple way:
 
-    >>> markdown.markdown(text, 
+    >>> print markdown.markdown(text, 
     ...     ['wikilinks(base_url=/wiki/,end_url=.html,html_class=foo)']
     ... )
-    u'<p>Some text with a <a class="foo" href="/wiki/WikiLink.html">WikiLink</a>.</p>'
+    <p>Some text with a <a class="foo" href="/wiki/WikiLink.html">WikiLink</a>.</p>
     
 Custom settings the complex way:
 
@@ -37,8 +35,8 @@ Custom settings the complex way:
     ...                                 ('end_url', '.html'),
     ...                                 ('html_class', '') ]},
     ...     safe_mode = True)
-    >>> md.convert(text)
-    u'<p>Some text with a <a href="http://example.com/WikiLink.html">WikiLink</a>.</p>'
+    >>> print md.convert(text)
+    <p>Some text with a <a href="http://example.com/WikiLink.html">WikiLink</a>.</p>
 
 Use MetaData with mdx_meta.py (Note the blank html_class in MetaData):
 
@@ -48,13 +46,13 @@ Use MetaData with mdx_meta.py (Note the blank html_class in MetaData):
     ...
     ... Some text with a [[WikiLink]]."""
     >>> md = markdown.Markdown(extensions=['meta', 'wikilinks'])
-    >>> md.convert(text)
-    u'<p>Some text with a <a href="http://example.com/WikiLink.html">WikiLink</a>.</p>'
+    >>> print md.convert(text)
+    <p>Some text with a <a href="http://example.com/WikiLink.html">WikiLink</a>.</p>
 
 MetaData should not carry over to next document:
 
-    >>> md.convert("No [[MetaData]] here.")
-    u'<p>No <a class="wikilink" href="/MetaData/">MetaData</a> here.</p>'
+    >>> print md.convert("No [[MetaData]] here.")
+    <p>No <a class="wikilink" href="/MetaData/">MetaData</a> here.</p>
 
 Define a custom URL builder:
 
@@ -62,8 +60,8 @@ Define a custom URL builder:
     ...     return '/bar/'
     >>> md = markdown.Markdown(extensions=['wikilinks'], 
     ...         extension_configs={'wikilinks' : [('build_url', my_url_builder)]})
-    >>> md.convert('[[foo]]')
-    u'<p><a class="wikilink" href="/bar/">foo</a></p>'
+    >>> print md.convert('[[foo]]')
+    <p><a class="wikilink" href="/bar/">foo</a></p>
 
 From the command line:
 
@@ -75,10 +73,14 @@ License: [BSD](http://www.opensource.org/licenses/bsd-license.php)
 
 Dependencies:
 * [Python 2.3+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+* [Markdown 2.0+](http://packages.python.org/Markdown/)
 '''
 
-import calibre.ebooks.markdown.markdown as markdown
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import Extension
+from ..inlinepatterns import Pattern
+from ..util import etree
 import re
 
 def build_url(label, base, end):
@@ -87,7 +89,7 @@ def build_url(label, base, end):
     return '%s%s%s'% (base, clean_label, end)
 
 
-class WikiLinkExtension(markdown.Extension):
+class WikiLinkExtension(Extension):
     def __init__(self, configs):
         # set extension defaults
         self.config = {
@@ -105,23 +107,23 @@ class WikiLinkExtension(markdown.Extension):
         self.md = md
     
         # append to end of inline patterns
-        WIKILINK_RE = r'\[\[([A-Za-z0-9_ -]+)\]\]'
-        wikilinkPattern = WikiLinks(WIKILINK_RE, self.config)
+        WIKILINK_RE = r'\[\[([\w0-9_ -]+)\]\]'
+        wikilinkPattern = WikiLinks(WIKILINK_RE, self.getConfigs())
         wikilinkPattern.md = md
         md.inlinePatterns.add('wikilink', wikilinkPattern, "<not_strong")
 
 
-class WikiLinks(markdown.inlinepatterns.Pattern):
+class WikiLinks(Pattern):
     def __init__(self, pattern, config):
-        markdown.inlinepatterns.Pattern.__init__(self, pattern)
+        super(WikiLinks, self).__init__(pattern)
         self.config = config
   
     def handleMatch(self, m):
         if m.group(2).strip():
             base_url, end_url, html_class = self._getMeta()
             label = m.group(2).strip()
-            url = self.config['build_url'][0](label, base_url, end_url)
-            a = markdown.etree.Element('a')
+            url = self.config['build_url'](label, base_url, end_url)
+            a = etree.Element('a')
             a.text = label 
             a.set('href', url)
             if html_class:
@@ -132,24 +134,18 @@ class WikiLinks(markdown.inlinepatterns.Pattern):
 
     def _getMeta(self):
         """ Return meta data or config data. """
-        base_url = self.config['base_url'][0]
-        end_url = self.config['end_url'][0]
-        html_class = self.config['html_class'][0]
+        base_url = self.config['base_url']
+        end_url = self.config['end_url']
+        html_class = self.config['html_class']
         if hasattr(self.md, 'Meta'):
-            if self.md.Meta.has_key('wiki_base_url'):
+            if 'wiki_base_url' in self.md.Meta:
                 base_url = self.md.Meta['wiki_base_url'][0]
-            if self.md.Meta.has_key('wiki_end_url'):
+            if 'wiki_end_url' in self.md.Meta:
                 end_url = self.md.Meta['wiki_end_url'][0]
-            if self.md.Meta.has_key('wiki_html_class'):
+            if 'wiki_html_class' in self.md.Meta:
                 html_class = self.md.Meta['wiki_html_class'][0]
         return base_url, end_url, html_class
     
 
 def makeExtension(configs=None) :
     return WikiLinkExtension(configs=configs)
-
-
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()
-
diff --git a/src/calibre/ebooks/markdown/inlinepatterns.py b/src/calibre/ebooks/markdown/inlinepatterns.py
index 217697ed8d..de957ef480 100644
--- a/src/calibre/ebooks/markdown/inlinepatterns.py
+++ b/src/calibre/ebooks/markdown/inlinepatterns.py
@@ -41,15 +41,48 @@ So, we apply the expressions in the following order:
 * finally we apply strong and emphasis
 """
 
-import markdown
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import util
+from . import odict
 import re
-from urlparse import urlparse, urlunparse
-import sys
-if sys.version >= "3.0":
-    from html import entities as htmlentitydefs
-    htmlentitydefs
-else:
-    import htmlentitydefs
+try:
+    from urllib.parse import urlparse, urlunparse
+except ImportError:
+    from urlparse import urlparse, urlunparse
+try:
+    from html import entities
+except ImportError:
+    import htmlentitydefs as entities
+
+
+def build_inlinepatterns(md_instance, **kwargs):
+    """ Build the default set of inline patterns for Markdown. """
+    inlinePatterns = odict.OrderedDict()
+    inlinePatterns["backtick"] = BacktickPattern(BACKTICK_RE)
+    inlinePatterns["escape"] = EscapePattern(ESCAPE_RE, md_instance)
+    inlinePatterns["reference"] = ReferencePattern(REFERENCE_RE, md_instance)
+    inlinePatterns["link"] = LinkPattern(LINK_RE, md_instance)
+    inlinePatterns["image_link"] = ImagePattern(IMAGE_LINK_RE, md_instance)
+    inlinePatterns["image_reference"] = \
+            ImageReferencePattern(IMAGE_REFERENCE_RE, md_instance)
+    inlinePatterns["short_reference"] = \
+            ReferencePattern(SHORT_REF_RE, md_instance)
+    inlinePatterns["autolink"] = AutolinkPattern(AUTOLINK_RE, md_instance)
+    inlinePatterns["automail"] = AutomailPattern(AUTOMAIL_RE, md_instance)
+    inlinePatterns["linebreak"] = SubstituteTagPattern(LINE_BREAK_RE, 'br')
+    if md_instance.safeMode != 'escape':
+        inlinePatterns["html"] = HtmlPattern(HTML_RE, md_instance)
+    inlinePatterns["entity"] = HtmlPattern(ENTITY_RE, md_instance)
+    inlinePatterns["not_strong"] = SimpleTextPattern(NOT_STRONG_RE)
+    inlinePatterns["strong_em"] = DoubleTagPattern(STRONG_EM_RE, 'strong,em')
+    inlinePatterns["strong"] = SimpleTagPattern(STRONG_RE, 'strong')
+    inlinePatterns["emphasis"] = SimpleTagPattern(EMPHASIS_RE, 'em')
+    if md_instance.smart_emphasis:
+        inlinePatterns["emphasis2"] = SimpleTagPattern(SMART_EMPHASIS_RE, 'em')
+    else:
+        inlinePatterns["emphasis2"] = SimpleTagPattern(EMPHASIS_2_RE, 'em')
+    return inlinePatterns
 
 """
 The actual regular expressions for patterns
@@ -65,31 +98,27 @@ NOIMG = r'(?<!\!)'
 
 BACKTICK_RE = r'(?<!\\)(`+)(.+?)(?<!`)\2(?!`)' # `e=f()` or ``e=f("`")``
 ESCAPE_RE = r'\\(.)'                             # \<
-EMPHASIS_RE = r'(\*)([^\*]*)\2'                    # *emphasis*
-STRONG_RE = r'(\*{2}|_{2})(.*?)\2'                      # **strong**
-STRONG_EM_RE = r'(\*{3}|_{3})(.*?)\2'            # ***strong***
-
-if markdown.SMART_EMPHASIS:
-    EMPHASIS_2_RE = r'(?<!\S)(_)(\S.*?)\2'        # _emphasis_
-else:
-    EMPHASIS_2_RE = r'(_)(.*?)\2'                 # _emphasis_
-
+EMPHASIS_RE = r'(\*)([^\*]+)\2'                    # *emphasis*
+STRONG_RE = r'(\*{2}|_{2})(.+?)\2'                      # **strong**
+STRONG_EM_RE = r'(\*{3}|_{3})(.+?)\2'            # ***strong***
+SMART_EMPHASIS_RE = r'(?<!\w)(_)(?!_)(.+?)(?<!_)\2(?!\w)'  # _smart_emphasis_
+EMPHASIS_2_RE = r'(_)(.+?)\2'                 # _emphasis_
 LINK_RE = NOIMG + BRK + \
-r'''\(\s*(<.*?>|((?:(?:\(.*?\))|[^\(\)]))*?)\s*((['"])(.*)\12)?\)'''
-# [text](url) or [text](<url>)
+r'''\(\s*(<.*?>|((?:(?:\(.*?\))|[^\(\)]))*?)\s*((['"])(.*?)\12\s*)?\)'''
+# [text](url) or [text](<url>) or [text](url "title")
 
 IMAGE_LINK_RE = r'\!' + BRK + r'\s*\((<.*?>|([^\)]*))\)'
 # ![alttxt](http://x.com/) or ![alttxt](<http://x.com/>)
-REFERENCE_RE = NOIMG + BRK+ r'\s*\[([^\]]*)\]'           # [Google][3]
-IMAGE_REFERENCE_RE = r'\!' + BRK + '\s*\[([^\]]*)\]' # ![alt text][2]
-NOT_STRONG_RE = r'( \* )'                        # stand-alone * or _
-AUTOLINK_RE = r'<((?:f|ht)tps?://[^>]*)>'        # <http://www.123.com>
+REFERENCE_RE = NOIMG + BRK+ r'\s?\[([^\]]*)\]'           # [Google][3]
+SHORT_REF_RE = NOIMG + r'\[([^\]]+)\]'                   # [Google]
+IMAGE_REFERENCE_RE = r'\!' + BRK + '\s?\[([^\]]*)\]' # ![alt text][2]
+NOT_STRONG_RE = r'((^| )(\*|_)( |$))'                        # stand-alone * or _
+AUTOLINK_RE = r'<((?:[Ff]|[Hh][Tt])[Tt][Pp][Ss]?://[^>]*)>' # <http://www.123.com>
 AUTOMAIL_RE = r'<([^> \!]*@[^> ]*)>'               # <me@example.com>
 
 HTML_RE = r'(\<([a-zA-Z/][^\>]*?|\!--.*?--)\>)'               # <...>
 ENTITY_RE = r'(&[\#a-zA-Z0-9]*;)'               # &amp;
 LINE_BREAK_RE = r'  \n'                     # two spaces at end of line
-LINE_BREAK_2_RE = r'  $'                    # two spaces at end of text
 
 
 def dequote(string):
@@ -114,10 +143,10 @@ The pattern classes
 -----------------------------------------------------------------------------
 """
 
-class Pattern:
+class Pattern(object):
     """Base class that inline patterns subclass. """
 
-    def __init__ (self, pattern, markdown_instance=None):
+    def __init__(self, pattern, markdown_instance=None):
         """
         Create an instant of an inline pattern.
 
@@ -127,14 +156,15 @@ class Pattern:
 
         """
         self.pattern = pattern
-        self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, re.DOTALL)
+        self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, 
+                                      re.DOTALL | re.UNICODE)
 
         # Api for Markdown to pass safe_mode into instance
         self.safe_mode = False
         if markdown_instance:
             self.markdown = markdown_instance
 
-    def getCompiledRegExp (self):
+    def getCompiledRegExp(self):
         """ Return a compiled regular expression. """
         return self.compiled_re
 
@@ -154,17 +184,57 @@ class Pattern:
         """ Return class name, to define pattern type """
         return self.__class__.__name__
 
-BasePattern = Pattern # for backward compatibility
+    def unescape(self, text):
+        """ Return unescaped text given text with an inline placeholder. """
+        try:
+            stash = self.markdown.treeprocessors['inline'].stashed_nodes
+        except KeyError:
+            return text
+        def itertext(el):
+            ' Reimplement Element.itertext for older python versions '
+            tag = el.tag
+            if not isinstance(tag, util.string_type) and tag is not None:
+                return
+            if el.text:
+                yield el.text
+            for e in el:
+                for s in itertext(e):
+                    yield s
+                if e.tail:
+                    yield e.tail
+        def get_stash(m):
+            id = m.group(1)
+            if id in stash:
+                value = stash.get(id)
+                if isinstance(value, util.string_type):
+                    return value
+                else:
+                    # An etree Element - return text content only
+                    return ''.join(itertext(value)) 
+        return util.INLINE_PLACEHOLDER_RE.sub(get_stash, text)
 
-class SimpleTextPattern (Pattern):
+
+class SimpleTextPattern(Pattern):
     """ Return a simple text of group(2) of a Pattern. """
     def handleMatch(self, m):
         text = m.group(2)
-        if text == markdown.INLINE_PLACEHOLDER_PREFIX:
+        if text == util.INLINE_PLACEHOLDER_PREFIX:
             return None
         return text
 
-class SimpleTagPattern (Pattern):
+
+class EscapePattern(Pattern):
+    """ Return an escaped character. """
+
+    def handleMatch(self, m):
+        char = m.group(2)
+        if char in self.markdown.ESCAPED_CHARS:
+            return '%s%s%s' % (util.STX, ord(char), util.ETX)
+        else:
+            return '\\%s' % char
+
+
+class SimpleTagPattern(Pattern):
     """
     Return element of type `tag` with a text attribute of group(3)
     of a Pattern.
@@ -175,30 +245,30 @@ class SimpleTagPattern (Pattern):
         self.tag = tag
 
     def handleMatch(self, m):
-        el = markdown.etree.Element(self.tag)
+        el = util.etree.Element(self.tag)
         el.text = m.group(3)
         return el
 
 
-class SubstituteTagPattern (SimpleTagPattern):
-    """ Return a eLement of type `tag` with no children. """
+class SubstituteTagPattern(SimpleTagPattern):
+    """ Return an element of type `tag` with no children. """
     def handleMatch (self, m):
-        return markdown.etree.Element(self.tag)
+        return util.etree.Element(self.tag)
 
 
-class BacktickPattern (Pattern):
+class BacktickPattern(Pattern):
     """ Return a `<code>` element containing the matching text. """
     def __init__ (self, pattern):
         Pattern.__init__(self, pattern)
         self.tag = "code"
 
     def handleMatch(self, m):
-        el = markdown.etree.Element(self.tag)
-        el.text = markdown.AtomicString(m.group(3).strip())
+        el = util.etree.Element(self.tag)
+        el.text = util.AtomicString(m.group(3).strip())
         return el
 
 
-class DoubleTagPattern (SimpleTagPattern):
+class DoubleTagPattern(SimpleTagPattern):
     """Return a ElementTree element nested in tag2 nested in tag1.
 
     Useful for strong emphasis etc.
@@ -206,37 +276,54 @@ class DoubleTagPattern (SimpleTagPattern):
     """
     def handleMatch(self, m):
         tag1, tag2 = self.tag.split(",")
-        el1 = markdown.etree.Element(tag1)
-        el2 = markdown.etree.SubElement(el1, tag2)
+        el1 = util.etree.Element(tag1)
+        el2 = util.etree.SubElement(el1, tag2)
         el2.text = m.group(3)
         return el1
 
 
-class HtmlPattern (Pattern):
+class HtmlPattern(Pattern):
     """ Store raw inline html and return a placeholder. """
     def handleMatch (self, m):
-        rawhtml = m.group(2)
+        rawhtml = self.unescape(m.group(2))
         place_holder = self.markdown.htmlStash.store(rawhtml)
         return place_holder
 
+    def unescape(self, text):
+        """ Return unescaped text given text with an inline placeholder. """
+        try:
+            stash = self.markdown.treeprocessors['inline'].stashed_nodes
+        except KeyError:
+            return text
+        def get_stash(m):
+            id = m.group(1)
+            value = stash.get(id)
+            if value is not None:
+                try:
+                    return self.markdown.serializer(value)
+                except:
+                    return '\%s' % value
+            
+        return util.INLINE_PLACEHOLDER_RE.sub(get_stash, text)
 
-class LinkPattern (Pattern):
+
+class LinkPattern(Pattern):
     """ Return a link element from the given match. """
     def handleMatch(self, m):
-        el = markdown.etree.Element("a")
+        el = util.etree.Element("a")
         el.text = m.group(2)
-        title = m.group(11)
+        title = m.group(13)
         href = m.group(9)
 
         if href:
             if href[0] == "<":
                 href = href[1:-1]
-            el.set("href", self.sanitize_url(href.strip()))
+            el.set("href", self.sanitize_url(self.unescape(href.strip())))
         else:
             el.set("href", "")
 
         if title:
-            title = dequote(title) #.replace('"', "&quot;")
+            title = dequote(self.unescape(title)) 
             el.set("title", title)
         return el
 
@@ -257,54 +344,75 @@ class LinkPattern (Pattern):
         `username:password@host:port`.
 
         """
+        url = url.replace(' ', '%20')
+        if not self.markdown.safeMode:
+            # Return immediately bipassing parsing.
+            return url
+        
+        try:
+            scheme, netloc, path, params, query, fragment = url = urlparse(url)
+        except ValueError:
+            # Bad url - so bad it couldn't be parsed.
+            return ''
+        
         locless_schemes = ['', 'mailto', 'news']
-        scheme, netloc, path, params, query, fragment = url = urlparse(url)
-        safe_url = False
-        if netloc != '' or scheme in locless_schemes:
-            safe_url = True
+        allowed_schemes = locless_schemes + ['http', 'https', 'ftp', 'ftps']
+        if scheme not in allowed_schemes:
+            # Not a known (allowed) scheme. Not safe.
+            return ''
+            
+        if netloc == '' and scheme not in locless_schemes:
+            # This should not happen. Treat as suspect.
+            return ''
 
         for part in url[2:]:
             if ":" in part:
-                safe_url = False
+                # A colon in "path", "parameters", "query" or "fragment" is suspect.
+                return ''
 
-        if self.markdown.safeMode and not safe_url:
-            return ''
-        else:
-            return urlunparse(url)
+        # Url passes all tests. Return url as-is.
+        return urlunparse(url)
 
 class ImagePattern(LinkPattern):
     """ Return a img element from the given match. """
     def handleMatch(self, m):
-        el = markdown.etree.Element("img")
+        el = util.etree.Element("img")
         src_parts = m.group(9).split()
         if src_parts:
             src = src_parts[0]
             if src[0] == "<" and src[-1] == ">":
                 src = src[1:-1]
-            el.set('src', self.sanitize_url(src))
+            el.set('src', self.sanitize_url(self.unescape(src)))
         else:
             el.set('src', "")
         if len(src_parts) > 1:
-            el.set('title', dequote(" ".join(src_parts[1:])))
+            el.set('title', dequote(self.unescape(" ".join(src_parts[1:]))))
 
-        if markdown.ENABLE_ATTRIBUTES:
+        if self.markdown.enable_attributes:
             truealt = handleAttributes(m.group(2), el)
         else:
             truealt = m.group(2)
 
-        el.set('alt', truealt)
+        el.set('alt', self.unescape(truealt))
         return el
 
 class ReferencePattern(LinkPattern):
     """ Match to a stored reference and return link element. """
+
+    NEWLINE_CLEANUP_RE = re.compile(r'[ ]?\n', re.MULTILINE)
+
     def handleMatch(self, m):
-        if m.group(9):
+        try:
             id = m.group(9).lower()
-        else:
-            # if we got something like "[Google][]"
+        except IndexError:
+            id = None
+        if not id:
+            # if we got something like "[Google][]" or "[Goggle]"
             # we'll use "google" as the id
             id = m.group(2).lower()
 
+        # Clean up linebreaks in id
+        id = self.NEWLINE_CLEANUP_RE.sub(' ', id)
         if not id in self.markdown.references: # ignore undefined refs
             return None
         href, title = self.markdown.references[id]
@@ -313,7 +421,7 @@ class ReferencePattern(LinkPattern):
         return self.makeTag(href, title, text)
 
     def makeTag(self, href, title, text):
-        el = markdown.etree.Element('a')
+        el = util.etree.Element('a')
 
         el.set('href', self.sanitize_url(href))
         if title:
@@ -323,48 +431,52 @@ class ReferencePattern(LinkPattern):
         return el
 
 
-class ImageReferencePattern (ReferencePattern):
+class ImageReferencePattern(ReferencePattern):
     """ Match to a stored reference and return img element. """
     def makeTag(self, href, title, text):
-        el = markdown.etree.Element("img")
+        el = util.etree.Element("img")
         el.set("src", self.sanitize_url(href))
         if title:
             el.set("title", title)
-        el.set("alt", text)
+
+        if self.markdown.enable_attributes:
+            text = handleAttributes(text, el)
+
+        el.set("alt", self.unescape(text))
         return el
 
 
-class AutolinkPattern (Pattern):
+class AutolinkPattern(Pattern):
     """ Return a link Element given an autolink (`<http://example/com>`). """
     def handleMatch(self, m):
-        el = markdown.etree.Element("a")
-        el.set('href', m.group(2))
-        el.text = markdown.AtomicString(m.group(2))
+        el = util.etree.Element("a")
+        el.set('href', self.unescape(m.group(2)))
+        el.text = util.AtomicString(m.group(2))
         return el
 
-class AutomailPattern (Pattern):
+class AutomailPattern(Pattern):
     """
     Return a mailto link Element given an automail link (`<foo@example.com>`).
     """
     def handleMatch(self, m):
-        el = markdown.etree.Element('a')
-        email = m.group(2)
+        el = util.etree.Element('a')
+        email = self.unescape(m.group(2))
         if email.startswith("mailto:"):
             email = email[len("mailto:"):]
 
         def codepoint2name(code):
             """Return entity definition by code, or the code if not defined."""
-            entity = htmlentitydefs.codepoint2name.get(code)
+            entity = entities.codepoint2name.get(code)
             if entity:
-                return "%s%s;" % (markdown.AMP_SUBSTITUTE, entity)
+                return "%s%s;" % (util.AMP_SUBSTITUTE, entity)
             else:
-                return "%s#%d;" % (markdown.AMP_SUBSTITUTE, code)
+                return "%s#%d;" % (util.AMP_SUBSTITUTE, code)
 
         letters = [codepoint2name(ord(letter)) for letter in email]
-        el.text = markdown.AtomicString(''.join(letters))
+        el.text = util.AtomicString(''.join(letters))
 
         mailto = "mailto:" + email
-        mailto = "".join([markdown.AMP_SUBSTITUTE + '#%d;' %
+        mailto = "".join([util.AMP_SUBSTITUTE + '#%d;' %
                           ord(letter) for letter in mailto])
         el.set('href', mailto)
         return el
diff --git a/src/calibre/ebooks/markdown/markdown.py b/src/calibre/ebooks/markdown/markdown.py
deleted file mode 100644
index 46ac21983c..0000000000
--- a/src/calibre/ebooks/markdown/markdown.py
+++ /dev/null
@@ -1,612 +0,0 @@
-"""
-Python Markdown
-===============
-
-Python Markdown converts Markdown to HTML and can be used as a library or
-called from the command line.
-
-## Basic usage as a module:
-
-    import markdown
-    md = Markdown()
-    html = md.convert(your_text_string)
-
-## Basic use from the command line:
-
-    python markdown.py source.txt > destination.html
-
-Run "python markdown.py --help" to see more options.
-
-## Extensions
-
-See <http://www.freewisdom.org/projects/python-markdown/> for more
-information and instructions on how to extend the functionality of
-Python Markdown.  Read that before you try modifying this file.
-
-## Authors and License
-
-Started by [Manfred Stienstra](http://www.dwerg.net/).  Continued and
-maintained  by [Yuri Takhteyev](http://www.freewisdom.org), [Waylan
-Limberg](http://achinghead.com/) and [Artem Yunusov](http://blog.splyer.com).
-
-Contact: markdown@freewisdom.org
-
-Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
-Copyright 200? Django Software Foundation (OrderedDict implementation)
-Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
-Copyright 2004 Manfred Stienstra (the original version)
-
-License: BSD (see docs/LICENSE for details).
-"""
-from calibre.ebooks.markdown.commandline import parse_options
-
-version = "2.0"
-version_info = (2,0,0, "Final")
-
-import re
-import codecs
-import sys
-import warnings
-import logging
-from logging import DEBUG, INFO, WARN, ERROR, CRITICAL
-
-
-"""
-CONSTANTS
-=============================================================================
-"""
-
-"""
-Constants you might want to modify
------------------------------------------------------------------------------
-"""
-
-# default logging level for command-line use
-COMMAND_LINE_LOGGING_LEVEL = CRITICAL
-TAB_LENGTH = 4               # expand tabs to this many spaces
-ENABLE_ATTRIBUTES = True     # @id = xyz -> <... id="xyz">
-#SMART_EMPHASIS = True        # this_or_that does not become this<i>or</i>that
-SMART_EMPHASIS = False      # this_or_that needs to have _ escaped as \_.
-DEFAULT_OUTPUT_FORMAT = 'xhtml1'     # xhtml or html4 output
-HTML_REMOVED_TEXT = "[HTML_REMOVED]" # text used instead of HTML in safe mode
-BLOCK_LEVEL_ELEMENTS = re.compile("p|div|h[1-6]|blockquote|pre|table|dl|ol|ul"
-                                  "|script|noscript|form|fieldset|iframe|math"
-                                  "|ins|del|hr|hr/|style|li|dt|dd|thead|tbody"
-                                  "|tr|th|td")
-DOC_TAG = "div"     # Element used to wrap document - later removed
-
-# Placeholders
-STX = u'\u0002'  # Use STX ("Start of text") for start-of-placeholder
-ETX = u'\u0003'  # Use ETX ("End of text") for end-of-placeholder
-INLINE_PLACEHOLDER_PREFIX = STX+"klzzwxh:"
-INLINE_PLACEHOLDER = INLINE_PLACEHOLDER_PREFIX + "%s" + ETX
-AMP_SUBSTITUTE = STX+"amp"+ETX
-
-
-"""
-Constants you probably do not need to change
------------------------------------------------------------------------------
-"""
-
-RTL_BIDI_RANGES = ( (u'\u0590', u'\u07FF'),
-                     # Hebrew (0590-05FF), Arabic (0600-06FF),
-                     # Syriac (0700-074F), Arabic supplement (0750-077F),
-                     # Thaana (0780-07BF), Nko (07C0-07FF).
-                    (u'\u2D30', u'\u2D7F'), # Tifinagh
-                    )
-
-
-"""
-AUXILIARY GLOBAL FUNCTIONS
-=============================================================================
-"""
-
-
-def message(level, text):
-    """ A wrapper method for logging debug messages. """
-    logger =  logging.getLogger('MARKDOWN')
-    if logger.handlers:
-        # The logger is configured
-        logger.log(level, text)
-        if level > WARN:
-            sys.exit(0)
-    elif level > WARN:
-        raise MarkdownException, text
-    else:
-        warnings.warn(text, MarkdownWarning)
-
-
-def isBlockLevel(tag):
-    """Check if the tag is a block level HTML tag."""
-    return BLOCK_LEVEL_ELEMENTS.match(tag)
-
-"""
-MISC AUXILIARY CLASSES
-=============================================================================
-"""
-
-class AtomicString(unicode):
-    """A string which should not be further processed."""
-    pass
-
-
-class MarkdownException(Exception):
-    """ A Markdown Exception. """
-    pass
-
-
-class MarkdownWarning(Warning):
-    """ A Markdown Warning. """
-    pass
-
-
-"""
-OVERALL DESIGN
-=============================================================================
-
-Markdown processing takes place in four steps:
-
-1. A bunch of "preprocessors" munge the input text.
-2. BlockParser() parses the high-level structural elements of the
-   pre-processed text into an ElementTree.
-3. A bunch of "treeprocessors" are run against the ElementTree. One such
-   treeprocessor runs InlinePatterns against the ElementTree, detecting inline
-   markup.
-4. Some post-processors are run against the text after the ElementTree has
-   been serialized into text.
-5. The output is written to a string.
-
-Those steps are put together by the Markdown() class.
-
-"""
-
-import preprocessors
-import blockprocessors
-import treeprocessors
-import inlinepatterns
-import postprocessors
-import blockparser
-import etree_loader
-import odict
-
-# Extensions should use "markdown.etree" instead of "etree" (or do `from
-# markdown import etree`).  Do not import it by yourself.
-
-etree = etree_loader.importETree()
-
-# Adds the ability to output html4
-import html4
-
-
-class Markdown:
-    """Convert Markdown to HTML."""
-
-    def __init__(self,
-                 extensions=[],
-                 extension_configs={},
-                 safe_mode = False, 
-                 output_format=DEFAULT_OUTPUT_FORMAT):
-        """
-        Creates a new Markdown instance.
-
-        Keyword arguments:
-
-        * extensions: A list of extensions.
-           If they are of type string, the module mdx_name.py will be loaded.
-           If they are a subclass of markdown.Extension, they will be used
-           as-is.
-        * extension-configs: Configuration setting for extensions.
-        * safe_mode: Disallow raw html. One of "remove", "replace" or "escape".
-        * output_format: Format of output. Supported formats are:
-            * "xhtml1": Outputs XHTML 1.x. Default.
-            * "xhtml": Outputs latest supported version of XHTML (currently XHTML 1.1).
-            * "html4": Outputs HTML 4
-            * "html": Outputs latest supported version of HTML (currently HTML 4).
-            Note that it is suggested that the more specific formats ("xhtml1" 
-            and "html4") be used as "xhtml" or "html" may change in the future
-            if it makes sense at that time. 
-
-        """
-        
-        self.safeMode = safe_mode
-        self.registeredExtensions = []
-        self.docType = ""
-        self.stripTopLevelTags = True
-
-        # Preprocessors
-        self.preprocessors = odict.OrderedDict()
-        self.preprocessors["html_block"] = \
-                preprocessors.HtmlBlockPreprocessor(self)
-        self.preprocessors["reference"] = \
-                preprocessors.ReferencePreprocessor(self)
-        # footnote preprocessor will be inserted with "<reference"
-
-        # Block processors - ran by the parser
-        self.parser = blockparser.BlockParser()
-        self.parser.blockprocessors['empty'] = \
-                blockprocessors.EmptyBlockProcessor(self.parser)
-        self.parser.blockprocessors['indent'] = \
-                blockprocessors.ListIndentProcessor(self.parser)
-        self.parser.blockprocessors['code'] = \
-                blockprocessors.CodeBlockProcessor(self.parser)
-        self.parser.blockprocessors['hashheader'] = \
-                blockprocessors.HashHeaderProcessor(self.parser)
-        self.parser.blockprocessors['setextheader'] = \
-                blockprocessors.SetextHeaderProcessor(self.parser)
-        self.parser.blockprocessors['hr'] = \
-                blockprocessors.HRProcessor(self.parser)
-        self.parser.blockprocessors['olist'] = \
-                blockprocessors.OListProcessor(self.parser)
-        self.parser.blockprocessors['ulist'] = \
-                blockprocessors.UListProcessor(self.parser)
-        self.parser.blockprocessors['quote'] = \
-                blockprocessors.BlockQuoteProcessor(self.parser)
-        self.parser.blockprocessors['paragraph'] = \
-                blockprocessors.ParagraphProcessor(self.parser)
-
-
-        #self.prePatterns = []
-
-        # Inline patterns - Run on the tree
-        self.inlinePatterns = odict.OrderedDict()
-        self.inlinePatterns["backtick"] = \
-                inlinepatterns.BacktickPattern(inlinepatterns.BACKTICK_RE)
-        self.inlinePatterns["escape"] = \
-                inlinepatterns.SimpleTextPattern(inlinepatterns.ESCAPE_RE)
-        self.inlinePatterns["reference"] = \
-            inlinepatterns.ReferencePattern(inlinepatterns.REFERENCE_RE, self)
-        self.inlinePatterns["link"] = \
-                inlinepatterns.LinkPattern(inlinepatterns.LINK_RE, self)
-        self.inlinePatterns["image_link"] = \
-                inlinepatterns.ImagePattern(inlinepatterns.IMAGE_LINK_RE, self)
-        self.inlinePatterns["image_reference"] = \
-            inlinepatterns.ImageReferencePattern(inlinepatterns.IMAGE_REFERENCE_RE, self)
-        self.inlinePatterns["autolink"] = \
-            inlinepatterns.AutolinkPattern(inlinepatterns.AUTOLINK_RE, self)
-        self.inlinePatterns["automail"] = \
-            inlinepatterns.AutomailPattern(inlinepatterns.AUTOMAIL_RE, self)
-        self.inlinePatterns["linebreak2"] = \
-            inlinepatterns.SubstituteTagPattern(inlinepatterns.LINE_BREAK_2_RE, 'br')
-        self.inlinePatterns["linebreak"] = \
-            inlinepatterns.SubstituteTagPattern(inlinepatterns.LINE_BREAK_RE, 'br')
-        self.inlinePatterns["html"] = \
-                inlinepatterns.HtmlPattern(inlinepatterns.HTML_RE, self)
-        self.inlinePatterns["entity"] = \
-                inlinepatterns.HtmlPattern(inlinepatterns.ENTITY_RE, self)
-        self.inlinePatterns["not_strong"] = \
-                inlinepatterns.SimpleTextPattern(inlinepatterns.NOT_STRONG_RE)
-        self.inlinePatterns["strong_em"] = \
-            inlinepatterns.DoubleTagPattern(inlinepatterns.STRONG_EM_RE, 'strong,em')
-        self.inlinePatterns["strong"] = \
-            inlinepatterns.SimpleTagPattern(inlinepatterns.STRONG_RE, 'strong')
-        self.inlinePatterns["emphasis"] = \
-            inlinepatterns.SimpleTagPattern(inlinepatterns.EMPHASIS_RE, 'em')
-        self.inlinePatterns["emphasis2"] = \
-            inlinepatterns.SimpleTagPattern(inlinepatterns.EMPHASIS_2_RE, 'em')
-        # The order of the handlers matters!!!
-
-
-        # Tree processors - run once we have a basic parse.
-        self.treeprocessors = odict.OrderedDict()
-        self.treeprocessors["inline"] = treeprocessors.InlineProcessor(self)
-        self.treeprocessors["prettify"] = \
-                treeprocessors.PrettifyTreeprocessor(self)
-
-        # Postprocessors - finishing touches.
-        self.postprocessors = odict.OrderedDict()
-        self.postprocessors["raw_html"] = \
-                postprocessors.RawHtmlPostprocessor(self)
-        self.postprocessors["amp_substitute"] = \
-                postprocessors.AndSubstitutePostprocessor()
-        # footnote postprocessor will be inserted with ">amp_substitute"
-
-        # Map format keys to serializers
-        self.output_formats = {
-            'html'  : html4.to_html_string, 
-            'html4' : html4.to_html_string,
-            'xhtml' : etree.tostring, 
-            'xhtml1': etree.tostring,
-        }
-
-        self.references = {}
-        self.htmlStash = preprocessors.HtmlStash()
-        self.registerExtensions(extensions = extensions,
-                                configs = extension_configs)
-        self.set_output_format(output_format)
-        self.reset()
-
-    def registerExtensions(self, extensions, configs):
-        """
-        Register extensions with this instance of Markdown.
-
-        Keyword aurguments:
-
-        * extensions: A list of extensions, which can either
-           be strings or objects.  See the docstring on Markdown.
-        * configs: A dictionary mapping module names to config options.
-
-        """
-        for ext in extensions:
-            if isinstance(ext, basestring):
-                ext = load_extension(ext, configs.get(ext, []))
-            try:
-                ext.extendMarkdown(self, globals())
-            except AttributeError:
-                message(ERROR, "Incorrect type! Extension '%s' is "
-                               "neither a string or an Extension." %(repr(ext)))
-            
-
-    def registerExtension(self, extension):
-        """ This gets called by the extension """
-        self.registeredExtensions.append(extension)
-
-    def reset(self):
-        """
-        Resets all state variables so that we can start with a new text.
-        """
-        self.htmlStash.reset()
-        self.references.clear()
-
-        for extension in self.registeredExtensions:
-            extension.reset()
-
-    def set_output_format(self, format):
-        """ Set the output format for the class instance. """
-        try:
-            self.serializer = self.output_formats[format.lower()]
-        except KeyError:
-            message(CRITICAL, 'Invalid Output Format: "%s". Use one of %s.' \
-                               % (format, self.output_formats.keys()))
-
-    def convert(self, source):
-        """
-        Convert markdown to serialized XHTML or HTML.
-
-        Keyword arguments:
-
-        * source: Source text as a Unicode string.
-
-        """
-
-        # Fixup the source text
-        if not source.strip():
-            return u""  # a blank unicode string
-        try:
-            source = unicode(source)
-        except UnicodeDecodeError:
-            message(CRITICAL, 'UnicodeDecodeError: Markdown only accepts unicode or ascii input.')
-            return u""
-
-        source = source.replace(STX, "").replace(ETX, "")
-        source = source.replace("\r\n", "\n").replace("\r", "\n") + "\n\n"
-        source = re.sub(r'\n\s+\n', '\n\n', source)
-        source = source.expandtabs(TAB_LENGTH)
-
-        # Split into lines and run the line preprocessors.
-        self.lines = source.split("\n")
-        for prep in self.preprocessors.values():
-            self.lines = prep.run(self.lines)
-
-        # Parse the high-level elements.
-        root = self.parser.parseDocument(self.lines).getroot()
-
-        # Run the tree-processors
-        for treeprocessor in self.treeprocessors.values():
-            newRoot = treeprocessor.run(root)
-            if newRoot:
-                root = newRoot
-
-        # Serialize _properly_.  Strip top-level tags.
-        output, length = codecs.utf_8_decode(self.serializer(root, encoding="utf8"))
-        if self.stripTopLevelTags:
-            start = output.index('<%s>'%DOC_TAG)+len(DOC_TAG)+2
-            end = output.rindex('</%s>'%DOC_TAG)
-            output = output[start:end].strip()
-
-        # Run the text post-processors
-        for pp in self.postprocessors.values():
-            output = pp.run(output)
-
-        return output.strip()
-
-    def convertFile(self, input=None, output=None, encoding=None):
-        """Converts a markdown file and returns the HTML as a unicode string.
-
-        Decodes the file using the provided encoding (defaults to utf-8),
-        passes the file content to markdown, and outputs the html to either
-        the provided stream or the file with provided name, using the same
-        encoding as the source file.
-
-        **Note:** This is the only place that decoding and encoding of unicode
-        takes place in Python-Markdown.  (All other code is unicode-in /
-        unicode-out.)
-
-        Keyword arguments:
-
-        * input: Name of source text file.
-        * output: Name of output file. Writes to stdout if `None`.
-        * encoding: Encoding of input and output files. Defaults to utf-8.
-
-        """
-
-        encoding = encoding or "utf-8"
-
-        # Read the source
-        input_file = codecs.open(input, mode="r", encoding=encoding)
-        text = input_file.read()
-        input_file.close()
-        text = text.lstrip(u'\ufeff') # remove the byte-order mark
-
-        # Convert
-        html = self.convert(text)
-
-        # Write to file or stdout
-        if isinstance(output, (str, unicode)):
-            output_file = codecs.open(output, "w", encoding=encoding)
-            output_file.write(html)
-            output_file.close()
-        else:
-            output.write(html.encode(encoding))
-
-
-"""
-Extensions
------------------------------------------------------------------------------
-"""
-
-class Extension:
-    """ Base class for extensions to subclass. """
-    def __init__(self, configs = {}):
-        """Create an instance of an Extention.
-
-        Keyword arguments:
-
-        * configs: A dict of configuration setting used by an Extension.
-        """
-        self.config = configs
-
-    def getConfig(self, key):
-        """ Return a setting for the given key or an empty string. """
-        if key in self.config:
-            return self.config[key][0]
-        else:
-            return ""
-
-    def getConfigInfo(self):
-        """ Return all config settings as a list of tuples. """
-        return [(key, self.config[key][1]) for key in self.config.keys()]
-
-    def setConfig(self, key, value):
-        """ Set a config setting for `key` with the given `value`. """
-        self.config[key][0] = value
-
-    def extendMarkdown(self, md, md_globals):
-        """
-        Add the various proccesors and patterns to the Markdown Instance.
-
-        This method must be overriden by every extension.
-
-        Keyword arguments:
-
-        * md: The Markdown instance.
-
-        * md_globals: Global variables in the markdown module namespace.
-
-        """
-        pass
-
-
-def load_extension(ext_name, configs = []):
-    """Load extension by name, then return the module.
-
-    The extension name may contain arguments as part of the string in the
-    following format: "extname(key1=value1,key2=value2)"
-
-    """
-
-    # Parse extensions config params (ignore the order)
-    configs = dict(configs)
-    pos = ext_name.find("(") # find the first "("
-    if pos > 0:
-        ext_args = ext_name[pos+1:-1]
-        ext_name = ext_name[:pos]
-        pairs = [x.split("=") for x in ext_args.split(",")]
-        configs.update([(x.strip(), y.strip()) for (x, y) in pairs])
-
-    # Setup the module names
-    ext_module = 'calibre.ebooks.markdown.extensions'
-    module_name_new_style = '.'.join([ext_module, ext_name])
-    module_name_old_style = '_'.join(['mdx', ext_name])
-
-    # Try loading the extention first from one place, then another
-    try: # New style (markdown.extensons.<extension>)
-        module = __import__(module_name_new_style, {}, {}, [ext_module])
-    except ImportError:
-        try: # Old style (mdx.<extension>)
-            module = __import__(module_name_old_style)
-        except ImportError:
-            message(WARN, "Failed loading extension '%s' from '%s' or '%s'"
-                % (ext_name, module_name_new_style, module_name_old_style))
-            # Return None so we don't try to initiate none-existant extension
-            return None
-
-    # If the module is loaded successfully, we expect it to define a
-    # function called makeExtension()
-    try:
-        return module.makeExtension(configs.items())
-    except AttributeError:
-        message(CRITICAL, "Failed to initiate extension '%s'" % ext_name)
-
-
-def load_extensions(ext_names):
-    """Loads multiple extensions"""
-    extensions = []
-    for ext_name in ext_names:
-        extension = load_extension(ext_name)
-        if extension:
-            extensions.append(extension)
-    return extensions
-
-
-"""
-EXPORTED FUNCTIONS
-=============================================================================
-
-Those are the two functions we really mean to export: markdown() and
-markdownFromFile().
-"""
-
-def markdown(text,
-             extensions = [],
-             safe_mode = False,
-             output_format = DEFAULT_OUTPUT_FORMAT):
-    """Convert a markdown string to HTML and return HTML as a unicode string.
-
-    This is a shortcut function for `Markdown` class to cover the most
-    basic use case.  It initializes an instance of Markdown, loads the
-    necessary extensions and runs the parser on the given text.
-
-    Keyword arguments:
-
-    * text: Markdown formatted text as Unicode or ASCII string.
-    * extensions: A list of extensions or extension names (may contain config args).
-    * safe_mode: Disallow raw html.  One of "remove", "replace" or "escape".
-    * output_format: Format of output. Supported formats are:
-        * "xhtml1": Outputs XHTML 1.x. Default.
-        * "xhtml": Outputs latest supported version of XHTML (currently XHTML 1.1).
-        * "html4": Outputs HTML 4
-        * "html": Outputs latest supported version of HTML (currently HTML 4).
-        Note that it is suggested that the more specific formats ("xhtml1" 
-        and "html4") be used as "xhtml" or "html" may change in the future
-        if it makes sense at that time. 
-
-    Returns: An HTML document as a string.
-
-    """
-    md = Markdown(extensions=load_extensions(extensions),
-                  safe_mode=safe_mode, 
-                  output_format=output_format)
-    return md.convert(text)
-
-
-def markdownFromFile(input = None,
-                     output = None,
-                     extensions = [],
-                     encoding = None,
-                     safe_mode = False,
-                     output_format = DEFAULT_OUTPUT_FORMAT):
-    """Read markdown code from a file and write it to a file or a stream."""
-    md = Markdown(extensions=load_extensions(extensions), 
-                  safe_mode=safe_mode,
-                  output_format=output_format)
-    md.convertFile(input, output, encoding)
-
-
-def main():
-    from commandline import run
-    run()
-
-
-if __name__ == '__main__':
-    sys.exit(main())
-    ''' Run Markdown from the command line. '''
diff --git a/src/calibre/ebooks/markdown/odict.py b/src/calibre/ebooks/markdown/odict.py
index 277cd4ebba..8089ece21a 100644
--- a/src/calibre/ebooks/markdown/odict.py
+++ b/src/calibre/ebooks/markdown/odict.py
@@ -1,7 +1,18 @@
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from . import util
+
+from copy import deepcopy
+
+def iteritems_compat(d):
+    """Return an iterator over the (key, value) pairs of a dictionary.
+    Copied from `six` module."""
+    return iter(getattr(d, _iteritems)())
+
 class OrderedDict(dict):
     """
     A dictionary that keeps its keys in the order in which they're inserted.
-
+    
     Copied from Django's SortedDict with some modifications.
 
     """
@@ -11,34 +22,44 @@ class OrderedDict(dict):
         return instance
 
     def __init__(self, data=None):
-        if data is None:
-            data = {}
-        super(OrderedDict, self).__init__(data)
-        if isinstance(data, dict):
-            self.keyOrder = data.keys()
+        if data is None or isinstance(data, dict):
+            data = data or []
+            super(OrderedDict, self).__init__(data)
+            self.keyOrder = list(data) if data else []
         else:
-            self.keyOrder = []
+            super(OrderedDict, self).__init__()
+            super_set = super(OrderedDict, self).__setitem__
             for key, value in data:
-                if key not in self.keyOrder:
+                # Take the ordering from first key
+                if key not in self:
                     self.keyOrder.append(key)
+                # But override with last value in data (dict() does this)
+                super_set(key, value)
 
     def __deepcopy__(self, memo):
-        from copy import deepcopy
         return self.__class__([(key, deepcopy(value, memo))
-                               for key, value in self.iteritems()])
+                               for key, value in self.items()])
+
+    def __copy__(self):
+        # The Python's default copy implementation will alter the state
+        # of self. The reason for this seems complex but is likely related to
+        # subclassing dict.
+        return self.copy()
 
     def __setitem__(self, key, value):
-        super(OrderedDict, self).__setitem__(key, value)
-        if key not in self.keyOrder:
+        if key not in self:
             self.keyOrder.append(key)
+        super(OrderedDict, self).__setitem__(key, value)
 
     def __delitem__(self, key):
         super(OrderedDict, self).__delitem__(key)
         self.keyOrder.remove(key)
 
     def __iter__(self):
-        for k in self.keyOrder:
-            yield k
+        return iter(self.keyOrder)
+
+    def __reversed__(self):
+        return reversed(self.keyOrder)
 
     def pop(self, k, *args):
         result = super(OrderedDict, self).pop(k, *args)
@@ -54,41 +75,51 @@ class OrderedDict(dict):
         self.keyOrder.remove(result[0])
         return result
 
-    def items(self):
-        return zip(self.keyOrder, self.values())
-
-    def iteritems(self):
+    def _iteritems(self):
         for key in self.keyOrder:
-            yield key, super(OrderedDict, self).__getitem__(key)
+            yield key, self[key]
 
-    def keys(self):
-        return self.keyOrder[:]
-
-    def iterkeys(self):
-        return iter(self.keyOrder)
-
-    def values(self):
-        return [super(OrderedDict, self).__getitem__(k) for k in self.keyOrder]
-
-    def itervalues(self):
+    def _iterkeys(self):
         for key in self.keyOrder:
-            yield super(OrderedDict, self).__getitem__(key)
+            yield key
+
+    def _itervalues(self):
+        for key in self.keyOrder:
+            yield self[key]
+
+    if util.PY3:
+        items = _iteritems
+        keys = _iterkeys
+        values = _itervalues
+    else:
+        iteritems = _iteritems
+        iterkeys = _iterkeys
+        itervalues = _itervalues
+
+        def items(self):
+            return [(k, self[k]) for k in self.keyOrder]
+
+        def keys(self):
+            return self.keyOrder[:]
+
+        def values(self):
+            return [self[k] for k in self.keyOrder]
 
     def update(self, dict_):
-        for k, v in dict_.items():
-            self.__setitem__(k, v)
+        for k, v in iteritems_compat(dict_):
+            self[k] = v
 
     def setdefault(self, key, default):
-        if key not in self.keyOrder:
+        if key not in self:
             self.keyOrder.append(key)
         return super(OrderedDict, self).setdefault(key, default)
 
     def value_for_index(self, index):
-        """Return the value of the item at the given zero-based index."""
+        """Returns the value of the item at the given zero-based index."""
         return self[self.keyOrder[index]]
 
     def insert(self, index, key, value):
-        """Insert the key, value pair before the item with the given index."""
+        """Inserts the key, value pair before the item with the given index."""
         if key in self.keyOrder:
             n = self.keyOrder.index(key)
             del self.keyOrder[n]
@@ -98,18 +129,16 @@ class OrderedDict(dict):
         super(OrderedDict, self).__setitem__(key, value)
 
     def copy(self):
-        """Return a copy of this object."""
+        """Returns a copy of this object."""
         # This way of initializing the copy means it works for subclasses, too.
-        obj = self.__class__(self)
-        obj.keyOrder = self.keyOrder[:]
-        return obj
+        return self.__class__(self)
 
     def __repr__(self):
         """
-        Replace the normal dict.__repr__ with a version that returns the keys
-        in their sorted order.
+        Replaces the normal dict.__repr__ with a version that returns the keys
+        in their Ordered order.
         """
-        return '{%s}' % ', '.join(['%r: %r' % (k, v) for k, v in self.items()])
+        return '{%s}' % ', '.join(['%r: %r' % (k, v) for k, v in iteritems_compat(self)])
 
     def clear(self):
         super(OrderedDict, self).clear()
@@ -117,7 +146,10 @@ class OrderedDict(dict):
 
     def index(self, key):
         """ Return the index of a given key. """
-        return self.keyOrder.index(key)
+        try:
+            return self.keyOrder.index(key)
+        except ValueError:
+            raise ValueError("Element '%s' was not found in OrderedDict" % key)
 
     def index_for_location(self, location):
         """ Return index or None for a given location. """
@@ -150,8 +182,8 @@ class OrderedDict(dict):
         """ Change location of an existing item. """
         n = self.keyOrder.index(key)
         del self.keyOrder[n]
-        i = self.index_for_location(location)
         try:
+            i = self.index_for_location(location)
             if i is not None:
                 self.keyOrder.insert(i, key)
             else:
diff --git a/src/calibre/ebooks/markdown/postprocessors.py b/src/calibre/ebooks/markdown/postprocessors.py
index 80227bb909..5f3f032c15 100644
--- a/src/calibre/ebooks/markdown/postprocessors.py
+++ b/src/calibre/ebooks/markdown/postprocessors.py
@@ -8,15 +8,23 @@ processing.
 
 """
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import util
+from . import odict
+import re
 
-import markdown
 
-class Processor:
-    def __init__(self, markdown_instance=None):
-        if markdown_instance:
-            self.markdown = markdown_instance
+def build_postprocessors(md_instance, **kwargs):
+    """ Build the default postprocessors for Markdown. """
+    postprocessors = odict.OrderedDict()
+    postprocessors["raw_html"] = RawHtmlPostprocessor(md_instance)
+    postprocessors["amp_substitute"] = AndSubstitutePostprocessor()
+    postprocessors["unescape"] = UnescapePostprocessor()
+    return postprocessors
 
-class Postprocessor(Processor):
+
+class Postprocessor(util.Processor):
     """
     Postprocessors are run after the ElementTree it converted back into text.
 
@@ -50,12 +58,12 @@ class RawHtmlPostprocessor(Postprocessor):
                 elif str(self.markdown.safeMode).lower() == 'remove':
                     html = ''
                 else:
-                    html = markdown.HTML_REMOVED_TEXT
-            if safe or not self.markdown.safeMode:
+                    html = self.markdown.html_replacement_text
+            if self.isblocklevel(html) and (safe or not self.markdown.safeMode):
                 text = text.replace("<p>%s</p>" % 
-                            (markdown.preprocessors.HTML_PLACEHOLDER % i),
+                            (self.markdown.htmlStash.get_placeholder(i)),
                             html + "\n")
-            text =  text.replace(markdown.preprocessors.HTML_PLACEHOLDER % i, 
+            text =  text.replace(self.markdown.htmlStash.get_placeholder(i), 
                                  html)
         return text
 
@@ -66,12 +74,31 @@ class RawHtmlPostprocessor(Postprocessor):
         html = html.replace('>', '&gt;')
         return html.replace('"', '&quot;')
 
+    def isblocklevel(self, html):
+        m = re.match(r'^\<\/?([^ >]+)', html)
+        if m:
+            if m.group(1)[0] in ('!', '?', '@', '%'):
+                # Comment, php etc...
+                return True
+            return util.isBlockLevel(m.group(1))
+        return False
+
 
 class AndSubstitutePostprocessor(Postprocessor):
     """ Restore valid entities """
-    def __init__(self):
-        pass
 
     def run(self, text):
-        text =  text.replace(markdown.AMP_SUBSTITUTE, "&")
+        text =  text.replace(util.AMP_SUBSTITUTE, "&")
         return text
+
+
+class UnescapePostprocessor(Postprocessor):
+    """ Restore escaped chars """
+
+    RE = re.compile('%s(\d+)%s' % (util.STX, util.ETX))
+
+    def unescape(self, m):
+        return util.int2str(int(m.group(1)))
+
+    def run(self, text):
+        return self.RE.sub(self.unescape, text)
diff --git a/src/calibre/ebooks/markdown/preprocessors.py b/src/calibre/ebooks/markdown/preprocessors.py
index 712a1e8755..72b2ed6f35 100644
--- a/src/calibre/ebooks/markdown/preprocessors.py
+++ b/src/calibre/ebooks/markdown/preprocessors.py
@@ -1,4 +1,3 @@
-
 """
 PRE-PROCESSORS
 =============================================================================
@@ -7,18 +6,24 @@ Preprocessors work on source text before we start doing anything too
 complicated. 
 """
 
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import util
+from . import odict
 import re
-import markdown
 
-HTML_PLACEHOLDER_PREFIX = markdown.STX+"wzxhzdk:"
-HTML_PLACEHOLDER = HTML_PLACEHOLDER_PREFIX + "%d" + markdown.ETX
 
-class Processor:
-    def __init__(self, markdown_instance=None):
-        if markdown_instance:
-            self.markdown = markdown_instance
+def build_preprocessors(md_instance, **kwargs):
+    """ Build the default set of preprocessors used by Markdown. """
+    preprocessors = odict.OrderedDict()
+    preprocessors['normalize_whitespace'] = NormalizeWhitespace(md_instance)
+    if md_instance.safeMode != 'escape':
+        preprocessors["html_block"] = HtmlBlockPreprocessor(md_instance)
+    preprocessors["reference"] = ReferencePreprocessor(md_instance)
+    return preprocessors
 
-class Preprocessor (Processor):
+
+class Preprocessor(util.Processor):
     """
     Preprocessors are run after the text is broken into lines.
 
@@ -38,66 +43,95 @@ class Preprocessor (Processor):
         """
         pass
 
-class HtmlStash:
-    """
-    This class is used for stashing HTML objects that we extract
-    in the beginning and replace with place-holders.
-    """
 
-    def __init__ (self):
-        """ Create a HtmlStash. """
-        self.html_counter = 0 # for counting inline html segments
-        self.rawHtmlBlocks=[]
+class NormalizeWhitespace(Preprocessor):
+    """ Normalize whitespace for consistant parsing. """
 
-    def store(self, html, safe=False):
-        """
-        Saves an HTML segment for later reinsertion.  Returns a
-        placeholder string that needs to be inserted into the
-        document.
-
-        Keyword arguments:
-
-        * html: an html segment
-        * safe: label an html segment as safe for safemode
-
-        Returns : a placeholder string
-
-        """
-        self.rawHtmlBlocks.append((html, safe))
-        placeholder = HTML_PLACEHOLDER % self.html_counter
-        self.html_counter += 1
-        return placeholder
-
-    def reset(self):
-        self.html_counter = 0
-        self.rawHtmlBlocks = []
+    def run(self, lines):
+        source = '\n'.join(lines)
+        source = source.replace(util.STX, "").replace(util.ETX, "")
+        source = source.replace("\r\n", "\n").replace("\r", "\n") + "\n\n"
+        source = source.expandtabs(self.markdown.tab_length)
+        source = re.sub(r'(?<=\n) +\n', '\n', source)
+        return source.split('\n')
 
 
 class HtmlBlockPreprocessor(Preprocessor):
     """Remove html blocks from the text and store them for later retrieval."""
 
     right_tag_patterns = ["</%s>", "%s>"]
+    attrs_pattern = r"""
+        \s+(?P<attr>[^>"'/= ]+)=(?P<q>['"])(?P<value>.*?)(?P=q)   # attr="value"
+        |                                                         # OR 
+        \s+(?P<attr1>[^>"'/= ]+)=(?P<value1>[^> ]+)               # attr=value
+        |                                                         # OR
+        \s+(?P<attr2>[^>"'/= ]+)                                  # attr
+        """
+    left_tag_pattern = r'^\<(?P<tag>[^> ]+)(?P<attrs>(%s)*)\s*\/?\>?' % attrs_pattern
+    attrs_re = re.compile(attrs_pattern, re.VERBOSE)
+    left_tag_re = re.compile(left_tag_pattern, re.VERBOSE)
+    markdown_in_raw = False
 
     def _get_left_tag(self, block):
-        return block[1:].replace(">", " ", 1).split()[0].lower()
+        m = self.left_tag_re.match(block)
+        if m:
+            tag = m.group('tag')
+            raw_attrs = m.group('attrs')
+            attrs = {}
+            if raw_attrs:
+                for ma in self.attrs_re.finditer(raw_attrs):
+                    if ma.group('attr'):
+                        if ma.group('value'):
+                            attrs[ma.group('attr').strip()] = ma.group('value')
+                        else:
+                            attrs[ma.group('attr').strip()] = ""
+                    elif ma.group('attr1'):
+                        if ma.group('value1'):
+                            attrs[ma.group('attr1').strip()] = ma.group('value1')
+                        else:
+                            attrs[ma.group('attr1').strip()] = ""
+                    elif ma.group('attr2'):
+                        attrs[ma.group('attr2').strip()] = ""
+            return tag, len(m.group(0)), attrs
+        else:
+            tag = block[1:].split(">", 1)[0].lower()
+            return tag, len(tag)+2, {}
 
-    def _get_right_tag(self, left_tag, block):
+    def _recursive_tagfind(self, ltag, rtag, start_index, block):
+        while 1:
+            i = block.find(rtag, start_index)
+            if i == -1:
+                return -1
+            j = block.find(ltag, start_index) 
+            # if no ltag, or rtag found before another ltag, return index
+            if (j > i or j == -1):
+                return i + len(rtag)
+            # another ltag found before rtag, use end of ltag as starting
+            # point and search again
+            j = block.find('>', j)
+            start_index = self._recursive_tagfind(ltag, rtag, j + 1, block)
+            if start_index == -1:
+                # HTML potentially malformed- ltag has no corresponding 
+                # rtag
+                return -1
+
+    def _get_right_tag(self, left_tag, left_index, block):
         for p in self.right_tag_patterns:
             tag = p % left_tag
-            i = block.rfind(tag)
+            i = self._recursive_tagfind("<%s" % left_tag, tag, left_index, block)
             if i > 2:
-                return tag.lstrip("<").rstrip(">"), i + len(p)-2 + len(left_tag)
-        return block.rstrip()[-len(left_tag)-2:-1].lower(), len(block)
-
+                return tag.lstrip("<").rstrip(">"), i
+        return block.rstrip()[-left_index:-1].lower(), len(block)
+    
     def _equal_tags(self, left_tag, right_tag):
-        if left_tag == 'div' or left_tag[0] in ['?', '@', '%']: # handle PHP, etc.
+        if left_tag[0] in ['?', '@', '%']: # handle PHP, etc.
             return True
         if ("/" + left_tag) == right_tag:
             return True
         if (right_tag == "--" and left_tag == "--"):
             return True
         elif left_tag == right_tag[1:] \
-            and right_tag[0] != "<":
+            and right_tag[0] == "/":
             return True
         else:
             return False
@@ -108,7 +142,7 @@ class HtmlBlockPreprocessor(Preprocessor):
     def run(self, lines):
         text = "\n".join(lines)
         new_blocks = []
-        text = text.split("\n\n")
+        text = text.rsplit("\n\n")
         items = []
         left_tag = ''
         right_tag = ''
@@ -124,15 +158,25 @@ class HtmlBlockPreprocessor(Preprocessor):
                 block = block[1:]
 
             if not in_tag:
-                if block.startswith("<"):
-                    left_tag = self._get_left_tag(block)
-                    right_tag, data_index = self._get_right_tag(left_tag, block)
+                if block.startswith("<") and len(block.strip()) > 1:
 
-                    if data_index < len(block):
+                    if block[1] == "!":
+                        # is a comment block
+                        left_tag, left_index, attrs  = "--", 2, {}
+                    else:
+                        left_tag, left_index, attrs = self._get_left_tag(block)
+                    right_tag, data_index = self._get_right_tag(left_tag, 
+                                                                left_index,
+                                                                block)
+                    # keep checking conditions below and maybe just append
+                    
+                    if data_index < len(block) \
+                        and (util.isBlockLevel(left_tag)
+                        or left_tag == '--'): 
                         text.insert(0, block[data_index:])
                         block = block[:data_index]
 
-                    if not (markdown.isBlockLevel(left_tag) \
+                    if not (util.isBlockLevel(left_tag) \
                         or block[1] in ["!", "?", "@", "%"]):
                         new_blocks.append(block)
                         continue
@@ -141,22 +185,27 @@ class HtmlBlockPreprocessor(Preprocessor):
                         new_blocks.append(block.strip())
                         continue
 
-                    if block[1] == "!":
-                        # is a comment block
-                        left_tag = "--"
-                        right_tag, data_index = self._get_right_tag(left_tag, block)
-                        # keep checking conditions below and maybe just append
-
                     if block.rstrip().endswith(">") \
                         and self._equal_tags(left_tag, right_tag):
-                        new_blocks.append(
-                            self.markdown.htmlStash.store(block.strip()))
+                        if self.markdown_in_raw and 'markdown' in attrs.keys():
+                            start = re.sub(r'\smarkdown(=[\'"]?[^> ]*[\'"]?)?', 
+                                           '', block[:left_index])
+                            end = block[-len(right_tag)-2:]
+                            block = block[left_index:-len(right_tag)-2]
+                            new_blocks.append(
+                                self.markdown.htmlStash.store(start))
+                            new_blocks.append(block)
+                            new_blocks.append(
+                                self.markdown.htmlStash.store(end))
+                        else:
+                            new_blocks.append(
+                                self.markdown.htmlStash.store(block.strip()))
                         continue
-                    else: #if not block[1] == "!":
+                    else: 
                         # if is block level tag and is not complete
 
-                        if markdown.isBlockLevel(left_tag) or left_tag == "--" \
-                        and not block.rstrip().endswith(">"):
+                        if util.isBlockLevel(left_tag) or left_tag == "--" \
+                            and not block.rstrip().endswith(">"):
                             items.append(block.strip())
                             in_tag = True
                         else:
@@ -168,19 +217,52 @@ class HtmlBlockPreprocessor(Preprocessor):
                 new_blocks.append(block)
 
             else:
-                items.append(block.strip())
+                items.append(block)
 
-                right_tag, data_index = self._get_right_tag(left_tag, block)
+                right_tag, data_index = self._get_right_tag(left_tag, 0, block)
 
                 if self._equal_tags(left_tag, right_tag):
                     # if find closing tag
+                    
+                    if data_index < len(block):
+                        # we have more text after right_tag
+                        items[-1] = block[:data_index]
+                        text.insert(0, block[data_index:])
+
                     in_tag = False
-                    new_blocks.append(
-                        self.markdown.htmlStash.store('\n\n'.join(items)))
+                    if self.markdown_in_raw and 'markdown' in attrs.keys():
+                        start = re.sub(r'\smarkdown(=[\'"]?[^> ]*[\'"]?)?', 
+                                       '', items[0][:left_index])
+                        items[0] = items[0][left_index:]
+                        end = items[-1][-len(right_tag)-2:]
+                        items[-1] = items[-1][:-len(right_tag)-2]
+                        new_blocks.append(
+                            self.markdown.htmlStash.store(start))
+                        new_blocks.extend(items)
+                        new_blocks.append(
+                            self.markdown.htmlStash.store(end))
+                    else:
+                        new_blocks.append(
+                            self.markdown.htmlStash.store('\n\n'.join(items)))
                     items = []
 
         if items:
-            new_blocks.append(self.markdown.htmlStash.store('\n\n'.join(items)))
+            if self.markdown_in_raw and 'markdown' in attrs.keys():
+                start = re.sub(r'\smarkdown(=[\'"]?[^> ]*[\'"]?)?', 
+                               '', items[0][:left_index])
+                items[0] = items[0][left_index:]
+                end = items[-1][-len(right_tag)-2:]
+                items[-1] = items[-1][:-len(right_tag)-2]
+                new_blocks.append(
+                    self.markdown.htmlStash.store(start))
+                new_blocks.extend(items)
+                if end.strip():
+                    new_blocks.append(
+                        self.markdown.htmlStash.store(end))
+            else:
+                new_blocks.append(
+                    self.markdown.htmlStash.store('\n\n'.join(items)))
+            #new_blocks.append(self.markdown.htmlStash.store('\n\n'.join(items)))
             new_blocks.append('\n')
 
         new_text = "\n\n".join(new_blocks)
@@ -190,24 +272,26 @@ class HtmlBlockPreprocessor(Preprocessor):
 class ReferencePreprocessor(Preprocessor):
     """ Remove reference definitions from text and store for later use. """
 
-    RE = re.compile(r'^(\ ?\ ?\ ?)\[([^\]]*)\]:\s*([^ ]*)(.*)$', re.DOTALL)
+    TITLE = r'[ ]*(\"(.*)\"|\'(.*)\'|\((.*)\))[ ]*'
+    RE = re.compile(r'^[ ]{0,3}\[([^\]]*)\]:\s*([^ ]*)[ ]*(%s)?$' % TITLE, re.DOTALL)
+    TITLE_RE = re.compile(r'^%s$' % TITLE)
 
     def run (self, lines):
         new_text = [];
-        for line in lines:
+        while lines:
+            line = lines.pop(0)
             m = self.RE.match(line)
             if m:
-                id = m.group(2).strip().lower()
-                t = m.group(4).strip()  # potential title
+                id = m.group(1).strip().lower()
+                link = m.group(2).lstrip('<').rstrip('>')
+                t = m.group(5) or m.group(6) or m.group(7)
                 if not t:
-                    self.markdown.references[id] = (m.group(3), t)
-                elif (len(t) >= 2
-                      and (t[0] == t[-1] == "\""
-                           or t[0] == t[-1] == "\'"
-                           or (t[0] == "(" and t[-1] == ")") ) ):
-                    self.markdown.references[id] = (m.group(3), t[1:-1])
-                else:
-                    new_text.append(line)
+                    # Check next line for title
+                    tm = self.TITLE_RE.match(lines[0])
+                    if tm:
+                        lines.pop(0)
+                        t = tm.group(2) or tm.group(3) or tm.group(4)
+                self.markdown.references[id] = (link, t)
             else:
                 new_text.append(line)
 
diff --git a/src/calibre/ebooks/markdown/html4.py b/src/calibre/ebooks/markdown/serializers.py
similarity index 71%
rename from src/calibre/ebooks/markdown/html4.py
rename to src/calibre/ebooks/markdown/serializers.py
index 08f241d57a..b19d61c93d 100644
--- a/src/calibre/ebooks/markdown/html4.py
+++ b/src/calibre/ebooks/markdown/serializers.py
@@ -1,6 +1,6 @@
-# markdown/html4.py
+# markdown/searializers.py
 #
-# Add html4 serialization to older versions of Elementree
+# Add x/html serialization to Elementree
 # Taken from ElementTree 1.3 preview with slight modifications
 #
 # Copyright (c) 1999-2007 by Fredrik Lundh.  All rights reserved.
@@ -37,12 +37,19 @@
 # --------------------------------------------------------------------
 
 
-import markdown
-ElementTree = markdown.etree.ElementTree
-QName = markdown.etree.QName
-Comment = markdown.etree.Comment
-PI = markdown.etree.PI
-ProcessingInstruction = markdown.etree.ProcessingInstruction
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from . import util
+ElementTree = util.etree.ElementTree
+QName = util.etree.QName
+if hasattr(util.etree, 'test_comment'):
+    Comment = util.etree.test_comment
+else:
+    Comment = util.etree.Comment
+PI = util.etree.PI
+ProcessingInstruction = util.etree.ProcessingInstruction
+
+__all__ = ['to_html_string', 'to_xhtml_string']
 
 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
               "img", "input", "isindex", "link", "meta" "param")
@@ -77,7 +84,7 @@ def _encode(text, encoding):
     except (TypeError, AttributeError):
         _raise_serialization_error(text)
 
-def _escape_cdata(text, encoding):
+def _escape_cdata(text):
     # escape character data
     try:
         # it's worth avoiding do-nothing calls for strings that are
@@ -89,12 +96,12 @@ def _escape_cdata(text, encoding):
             text = text.replace("<", "&lt;")
         if ">" in text:
             text = text.replace(">", "&gt;")
-        return text.encode(encoding, "xmlcharrefreplace")
+        return text
     except (TypeError, AttributeError):
         _raise_serialization_error(text)
 
 
-def _escape_attrib(text, encoding):
+def _escape_attrib(text):
     # escape attribute value
     try:
         if "&" in text:
@@ -107,38 +114,40 @@ def _escape_attrib(text, encoding):
             text = text.replace("\"", "&quot;")
         if "\n" in text:
             text = text.replace("\n", "&#10;")
-        return text.encode(encoding, "xmlcharrefreplace")
+        return text
     except (TypeError, AttributeError):
         _raise_serialization_error(text)
 
-def _escape_attrib_html(text, encoding):
+def _escape_attrib_html(text):
     # escape attribute value
     try:
         if "&" in text:
             text = text.replace("&", "&amp;")
+        if "<" in text:
+            text = text.replace("<", "&lt;")
         if ">" in text:
             text = text.replace(">", "&gt;")
         if "\"" in text:
             text = text.replace("\"", "&quot;")
-        return text.encode(encoding, "xmlcharrefreplace")
+        return text
     except (TypeError, AttributeError):
         _raise_serialization_error(text)
 
 
-def _serialize_html(write, elem, encoding, qnames, namespaces):
+def _serialize_html(write, elem, qnames, namespaces, format):
     tag = elem.tag
     text = elem.text
     if tag is Comment:
-        write("<!--%s-->" % _escape_cdata(text, encoding))
+        write("<!--%s-->" % _escape_cdata(text))
     elif tag is ProcessingInstruction:
-        write("<?%s?>" % _escape_cdata(text, encoding))
+        write("<?%s?>" % _escape_cdata(text))
     else:
         tag = qnames[tag]
         if tag is None:
             if text:
-                write(_escape_cdata(text, encoding))
+                write(_escape_cdata(text))
             for e in elem:
-                _serialize_html(write, e, encoding, qnames, None)
+                _serialize_html(write, e, qnames, None, format)
         else:
             write("<" + tag)
             items = elem.items()
@@ -150,54 +159,55 @@ def _serialize_html(write, elem, encoding, qnames, namespaces):
                     if isinstance(v, QName):
                         v = qnames[v.text]
                     else:
-                        v = _escape_attrib_html(v, encoding)
-                    # FIXME: handle boolean attributes
-                    write(" %s=\"%s\"" % (qnames[k], v))
+                        v = _escape_attrib_html(v)
+                    if qnames[k] == v and format == 'html':
+                        # handle boolean attributes
+                        write(" %s" % v)
+                    else:
+                        write(" %s=\"%s\"" % (qnames[k], v))
                 if namespaces:
                     items = namespaces.items()
                     items.sort(key=lambda x: x[1]) # sort on prefix
                     for v, k in items:
                         if k:
                             k = ":" + k
-                        write(" xmlns%s=\"%s\"" % (
-                            k.encode(encoding),
-                            _escape_attrib(v, encoding)
-                            ))
-            write(">")
-            tag = tag.lower()
-            if text:
-                if tag == "script" or tag == "style":
-                    write(_encode(text, encoding))
-                else:
-                    write(_escape_cdata(text, encoding))
-            for e in elem:
-                _serialize_html(write, e, encoding, qnames, None)
-            if tag not in HTML_EMPTY:
-                write("</" + tag + ">")
+                        write(" xmlns%s=\"%s\"" % (k, _escape_attrib(v)))
+            if format == "xhtml" and tag in HTML_EMPTY:
+                write(" />")
+            else:
+                write(">")
+                tag = tag.lower()
+                if text:
+                    if tag == "script" or tag == "style":
+                        write(text)
+                    else:
+                        write(_escape_cdata(text))
+                for e in elem:
+                    _serialize_html(write, e, qnames, None, format)
+                if tag not in HTML_EMPTY:
+                    write("</" + tag + ">")
     if elem.tail:
-        write(_escape_cdata(elem.tail, encoding))
+        write(_escape_cdata(elem.tail))
 
-def write_html(root, f,
-          # keyword arguments
-          encoding="us-ascii",
-          default_namespace=None):
+def _write_html(root,
+                encoding=None,
+                default_namespace=None,
+                format="html"):
     assert root is not None
-    if not hasattr(f, "write"):
-        f = open(f, "wb")
-    write = f.write
-    if not encoding:
-        encoding = "us-ascii"
-    qnames, namespaces = _namespaces(
-            root, encoding, default_namespace
-            )
-    _serialize_html(
-                write, root, encoding, qnames, namespaces
-                )
+    data = []
+    write = data.append
+    qnames, namespaces = _namespaces(root, default_namespace)
+    _serialize_html(write, root, qnames, namespaces, format)
+    if encoding is None:
+        return "".join(data)
+    else:
+        return _encode("".join(data))
+
 
 # --------------------------------------------------------------------
 # serialization support
 
-def _namespaces(elem, encoding, default_namespace=None):
+def _namespaces(elem, default_namespace=None):
     # identify namespaces used in this tree
 
     # maps qnames to *encoded* prefix:local names
@@ -208,9 +218,6 @@ def _namespaces(elem, encoding, default_namespace=None):
     if default_namespace:
         namespaces[default_namespace] = ""
 
-    def encode(text):
-        return text.encode(encoding)
-
     def add_qname(qname):
         # calculate serialized qname representation
         try:
@@ -224,17 +231,16 @@ def _namespaces(elem, encoding, default_namespace=None):
                     if prefix != "xml":
                         namespaces[uri] = prefix
                 if prefix:
-                    qnames[qname] = encode("%s:%s" % (prefix, tag))
+                    qnames[qname] = "%s:%s" % (prefix, tag)
                 else:
-                    qnames[qname] = encode(tag) # default element
+                    qnames[qname] = tag # default element
             else:
                 if default_namespace:
-                    # FIXME: can this be handled in XML 1.0?
                     raise ValueError(
                         "cannot use non-qualified names with "
                         "default_namespace option"
                         )
-                qnames[qname] = encode(qname)
+                qnames[qname] = qname
         except TypeError:
             _raise_serialization_error(qname)
 
@@ -247,7 +253,7 @@ def _namespaces(elem, encoding, default_namespace=None):
         tag = elem.tag
         if isinstance(tag, QName) and tag.text not in qnames:
             add_qname(tag.text)
-        elif isinstance(tag, basestring):
+        elif isinstance(tag, util.string_type):
             if tag not in qnames:
                 add_qname(tag)
         elif tag is not None and tag is not Comment and tag is not PI:
@@ -264,11 +270,8 @@ def _namespaces(elem, encoding, default_namespace=None):
             add_qname(text.text)
     return qnames, namespaces
 
-def to_html_string(element, encoding=None):
-    class dummy:
-        pass
-    data = []
-    file = dummy()
-    file.write = data.append
-    write_html(ElementTree(element).getroot(),file,encoding)
-    return "".join(data)
+def to_html_string(element):
+    return _write_html(ElementTree(element).getroot(), format="html")
+
+def to_xhtml_string(element):
+    return _write_html(ElementTree(element).getroot(), format="xhtml")
diff --git a/src/calibre/ebooks/markdown/treeprocessors.py b/src/calibre/ebooks/markdown/treeprocessors.py
index 0604b1970f..e6d3dc9381 100644
--- a/src/calibre/ebooks/markdown/treeprocessors.py
+++ b/src/calibre/ebooks/markdown/treeprocessors.py
@@ -1,16 +1,26 @@
-import markdown
-import re
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from . import util
+from . import odict
+from . import inlinepatterns
+
+
+def build_treeprocessors(md_instance, **kwargs):
+    """ Build the default treeprocessors for Markdown. """
+    treeprocessors = odict.OrderedDict()
+    treeprocessors["inline"] = InlineProcessor(md_instance)
+    treeprocessors["prettify"] = PrettifyTreeprocessor(md_instance)
+    return treeprocessors
+
 
 def isString(s):
     """ Check if it's string """
-    return isinstance(s, unicode) or isinstance(s, str)
+    if not isinstance(s, util.AtomicString):
+        return isinstance(s, util.string_type)
+    return False
 
-class Processor:
-    def __init__(self, markdown_instance=None):
-        if markdown_instance:
-            self.markdown = markdown_instance
 
-class Treeprocessor(Processor):
+class Treeprocessor(util.Processor):
     """
     Treeprocessors are run on the ElementTree object before serialization.
 
@@ -24,8 +34,8 @@ class Treeprocessor(Processor):
     def run(self, root):
         """
         Subclasses of Treeprocessor should implement a `run` method, which
-        takes a root ElementTree. This method can return another ElementTree
-        object, and the existing root ElementTree will be replaced, or it can
+        takes a root ElementTree. This method can return another ElementTree 
+        object, and the existing root ElementTree will be replaced, or it can 
         modify the current tree and return None.
         """
         pass
@@ -36,18 +46,18 @@ class InlineProcessor(Treeprocessor):
     A Treeprocessor that traverses a tree, applying inline patterns.
     """
 
-    def __init__ (self, md):
-        self.__placeholder_prefix = markdown.INLINE_PLACEHOLDER_PREFIX
-        self.__placeholder_suffix = markdown.ETX
+    def __init__(self, md):
+        self.__placeholder_prefix = util.INLINE_PLACEHOLDER_PREFIX
+        self.__placeholder_suffix = util.ETX
         self.__placeholder_length = 4 + len(self.__placeholder_prefix) \
                                       + len(self.__placeholder_suffix)
-        self.__placeholder_re = re.compile(markdown.INLINE_PLACEHOLDER % r'([0-9]{4})')
+        self.__placeholder_re = util.INLINE_PLACEHOLDER_RE
         self.markdown = md
 
     def __makePlaceholder(self, type):
         """ Generate a placeholder """
         id = "%04d" % len(self.stashed_nodes)
-        hash = markdown.INLINE_PLACEHOLDER % id
+        hash = util.INLINE_PLACEHOLDER % id
         return hash, id
 
     def __findPlaceholder(self, data, index):
@@ -60,8 +70,8 @@ class InlineProcessor(Treeprocessor):
         * index: index, from which we start search
 
         Returns: placeholder id and string index, after the found placeholder.
+        
         """
-
         m = self.__placeholder_re.search(data, index)
         if m:
             return m.group(1), m.end()
@@ -87,7 +97,7 @@ class InlineProcessor(Treeprocessor):
         Returns: String with placeholders.
 
         """
-        if not isinstance(data, markdown.AtomicString):
+        if not isinstance(data, util.AtomicString):
             startIndex = 0
             while patternIndex < len(self.markdown.inlinePatterns):
                 data, matched, startIndex = self.__applyPattern(
@@ -140,6 +150,7 @@ class InlineProcessor(Treeprocessor):
         * parent: Element, which contains processing inline data
 
         Returns: list with ElementTree elements with applied inline patterns.
+        
         """
         def linkText(text):
             if text:
@@ -153,7 +164,6 @@ class InlineProcessor(Treeprocessor):
                         parent.text += text
                     else:
                         parent.text = text
-
         result = []
         strartIndex = 0
         while data:
@@ -172,7 +182,7 @@ class InlineProcessor(Treeprocessor):
                         for child in [node] + node.getchildren():
                             if child.tail:
                                 if child.tail.strip():
-                                    self.__processElementText(node, child, False)
+                                    self.__processElementText(node, child,False)
                             if child.text:
                                 if child.text.strip():
                                     self.__processElementText(child, child)
@@ -190,6 +200,9 @@ class InlineProcessor(Treeprocessor):
                     strartIndex = end
             else:
                 text = data[strartIndex:]
+                if isinstance(data, util.AtomicString):
+                    # We don't want to loose the AtomicString
+                    text = util.AtomicString(text)
                 linkText(text)
                 data = ""
 
@@ -205,7 +218,7 @@ class InlineProcessor(Treeprocessor):
         * data: the text to be processed
         * pattern: the pattern to be checked
         * patternIndex: index of current pattern
-        * startIndex: string index, from which we starting search
+        * startIndex: string index, from which we start searching
 
         Returns: String with placeholders instead of ElementTree elements.
 
@@ -219,14 +232,14 @@ class InlineProcessor(Treeprocessor):
         node = pattern.handleMatch(match)
 
         if node is None:
-            return data, True, len(leftData) + match.span(len(match.groups()))[0]
+            return data, True, len(leftData)+match.span(len(match.groups()))[0]
 
         if not isString(node):
-            if not isinstance(node.text, markdown.AtomicString):
+            if not isinstance(node.text, util.AtomicString):
                 # We need to process current node too
                 for child in [node] + node.getchildren():
                     if not isString(node):
-                        if child.text:
+                        if child.text: 
                             child.text = self.__handleInline(child.text,
                                                             patternIndex + 1)
                         if child.tail:
@@ -244,14 +257,14 @@ class InlineProcessor(Treeprocessor):
 
         Iterate over ElementTree, find elements with inline tag, apply inline
         patterns and append newly created Elements to tree.  If you don't
-        want process your data with inline paterns, instead of normal string,
+        want to process your data with inline paterns, instead of normal string,
         use subclass AtomicString:
 
-            node.text = markdown.AtomicString("data won't be processed with inline patterns")
+            node.text = markdown.AtomicString("This will not be processed.")
 
         Arguments:
 
-        * markdownTree: ElementTree object, representing Markdown tree.
+        * tree: ElementTree object, representing Markdown tree.
 
         Returns: ElementTree object with applied inline patterns.
 
@@ -264,33 +277,46 @@ class InlineProcessor(Treeprocessor):
             currElement = stack.pop()
             insertQueue = []
             for child in currElement.getchildren():
-                if child.text and not isinstance(child.text, markdown.AtomicString):
+                if child.text and not isinstance(child.text, util.AtomicString):
                     text = child.text
                     child.text = None
                     lst = self.__processPlaceholders(self.__handleInline(
                                                     text), child)
                     stack += lst
                     insertQueue.append((child, lst))
-
+                if child.tail:
+                    tail = self.__handleInline(child.tail)
+                    dumby = util.etree.Element('d')
+                    tailResult = self.__processPlaceholders(tail, dumby)
+                    if dumby.text:
+                        child.tail = dumby.text
+                    else:
+                        child.tail = None
+                    pos = currElement.getchildren().index(child) + 1
+                    tailResult.reverse()
+                    for newChild in tailResult:
+                        currElement.insert(pos, newChild)
                 if child.getchildren():
                     stack.append(child)
 
             for element, lst in insertQueue:
-                if element.text:
-                    element.text = \
-                        markdown.inlinepatterns.handleAttributes(element.text,
-                                                                 element)
+                if self.markdown.enable_attributes:
+                    if element.text and isString(element.text):
+                        element.text = \
+                            inlinepatterns.handleAttributes(element.text, 
+                                                                    element)
                 i = 0
                 for newChild in lst:
-                    # Processing attributes
-                    if newChild.tail:
-                        newChild.tail = \
-                            markdown.inlinepatterns.handleAttributes(newChild.tail,
-                                                                     element)
-                    if newChild.text:
-                        newChild.text = \
-                            markdown.inlinepatterns.handleAttributes(newChild.text,
-                                                                     newChild)
+                    if self.markdown.enable_attributes:
+                        # Processing attributes
+                        if newChild.tail and isString(newChild.tail):
+                            newChild.tail = \
+                                inlinepatterns.handleAttributes(newChild.tail,
+                                                                    element)
+                        if newChild.text and isString(newChild.text):
+                            newChild.text = \
+                                inlinepatterns.handleAttributes(newChild.text,
+                                                                    newChild)
                     element.insert(i, newChild)
                     i += 1
         return tree
@@ -303,12 +329,12 @@ class PrettifyTreeprocessor(Treeprocessor):
         """ Recursively add linebreaks to ElementTree children. """
 
         i = "\n"
-        if markdown.isBlockLevel(elem.tag) and elem.tag not in ['code', 'pre']:
+        if util.isBlockLevel(elem.tag) and elem.tag not in ['code', 'pre']:
             if (not elem.text or not elem.text.strip()) \
-                    and len(elem) and markdown.isBlockLevel(elem[0].tag):
+                    and len(elem) and util.isBlockLevel(elem[0].tag):
                 elem.text = i
             for e in elem:
-                if markdown.isBlockLevel(e.tag):
+                if util.isBlockLevel(e.tag):
                     self._prettifyETree(e)
             if not elem.tail or not elem.tail.strip():
                 elem.tail = i
@@ -327,3 +353,8 @@ class PrettifyTreeprocessor(Treeprocessor):
                 br.tail = '\n'
             else:
                 br.tail = '\n%s' % br.tail
+        # Clean up extra empty lines at end of code blocks.
+        pres = root.getiterator('pre')
+        for pre in pres:
+            if len(pre) and pre[0].tag == 'code':
+                pre[0].text = pre[0].text.rstrip() + '\n'
diff --git a/src/calibre/ebooks/markdown/util.py b/src/calibre/ebooks/markdown/util.py
new file mode 100644
index 0000000000..1036197c47
--- /dev/null
+++ b/src/calibre/ebooks/markdown/util.py
@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+import re
+import sys
+
+
+"""
+Python 3 Stuff
+=============================================================================
+"""
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    string_type = str
+    text_type = str
+    int2str = chr
+else:
+    string_type = basestring
+    text_type = unicode
+    int2str = unichr
+
+
+"""
+Constants you might want to modify
+-----------------------------------------------------------------------------
+"""
+
+BLOCK_LEVEL_ELEMENTS = re.compile("^(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul"
+                                  "|script|noscript|form|fieldset|iframe|math"
+                                  "|hr|hr/|style|li|dt|dd|thead|tbody"
+                                  "|tr|th|td|section|footer|header|group|figure"
+                                  "|figcaption|aside|article|canvas|output"
+                                  "|progress|video)$", re.IGNORECASE)
+# Placeholders
+STX = '\u0002'  # Use STX ("Start of text") for start-of-placeholder
+ETX = '\u0003'  # Use ETX ("End of text") for end-of-placeholder
+INLINE_PLACEHOLDER_PREFIX = STX+"klzzwxh:"
+INLINE_PLACEHOLDER = INLINE_PLACEHOLDER_PREFIX + "%s" + ETX
+INLINE_PLACEHOLDER_RE = re.compile(INLINE_PLACEHOLDER % r'([0-9]{4})')
+AMP_SUBSTITUTE = STX+"amp"+ETX
+
+"""
+Constants you probably do not need to change
+-----------------------------------------------------------------------------
+"""
+
+RTL_BIDI_RANGES = ( ('\u0590', '\u07FF'),
+                     # Hebrew (0590-05FF), Arabic (0600-06FF),
+                     # Syriac (0700-074F), Arabic supplement (0750-077F),
+                     # Thaana (0780-07BF), Nko (07C0-07FF).
+                    ('\u2D30', '\u2D7F'), # Tifinagh
+                    )
+
+# Extensions should use "markdown.util.etree" instead of "etree" (or do `from
+# markdown.util import etree`).  Do not import it by yourself.
+
+try: # Is the C implemenation of ElementTree available?
+    import xml.etree.cElementTree as etree
+    from xml.etree.ElementTree import Comment
+    # Serializers (including ours) test with non-c Comment
+    etree.test_comment = Comment
+    if etree.VERSION < "1.0.5":
+        raise RuntimeError("cElementTree version 1.0.5 or higher is required.")
+except (ImportError, RuntimeError):
+    # Use the Python implementation of ElementTree?
+    import xml.etree.ElementTree as etree
+    if etree.VERSION < "1.1":
+        raise RuntimeError("ElementTree version 1.1 or higher is required")
+
+
+"""
+AUXILIARY GLOBAL FUNCTIONS
+=============================================================================
+"""
+
+
+def isBlockLevel(tag):
+    """Check if the tag is a block level HTML tag."""
+    if isinstance(tag, string_type):
+        return BLOCK_LEVEL_ELEMENTS.match(tag)
+    # Some ElementTree tags are not strings, so return False.
+    return False
+
+"""
+MISC AUXILIARY CLASSES
+=============================================================================
+"""
+
+class AtomicString(text_type):
+    """A string which should not be further processed."""
+    pass
+
+
+class Processor(object):
+    def __init__(self, markdown_instance=None):
+        if markdown_instance:
+            self.markdown = markdown_instance
+
+
+class HtmlStash(object):
+    """
+    This class is used for stashing HTML objects that we extract
+    in the beginning and replace with place-holders.
+    """
+
+    def __init__ (self):
+        """ Create a HtmlStash. """
+        self.html_counter = 0 # for counting inline html segments
+        self.rawHtmlBlocks=[]
+
+    def store(self, html, safe=False):
+        """
+        Saves an HTML segment for later reinsertion.  Returns a
+        placeholder string that needs to be inserted into the
+        document.
+
+        Keyword arguments:
+
+        * html: an html segment
+        * safe: label an html segment as safe for safemode
+
+        Returns : a placeholder string
+
+        """
+        self.rawHtmlBlocks.append((html, safe))
+        placeholder = self.get_placeholder(self.html_counter)
+        self.html_counter += 1
+        return placeholder
+
+    def reset(self):
+        self.html_counter = 0
+        self.rawHtmlBlocks = []
+
+    def get_placeholder(self, key):
+        return "%swzxhzdk:%d%s" % (STX, key, ETX)
+
diff --git a/src/calibre/ebooks/txt/processor.py b/src/calibre/ebooks/txt/processor.py
index 2420236114..8d6139e1cf 100644
--- a/src/calibre/ebooks/txt/processor.py
+++ b/src/calibre/ebooks/txt/processor.py
@@ -97,9 +97,9 @@ def convert_basic(txt, title='', epub_split_size_kb=0):
 
 def convert_markdown(txt, title='', extensions=('footnotes', 'tables', 'toc')):
     from calibre.ebooks.conversion.plugins.txt_input import MD_EXTENSIONS
-    from calibre.ebooks.markdown import markdown
+    from calibre.ebooks.markdown import Markdown
     extensions = [x.lower() for x in extensions if x.lower() in MD_EXTENSIONS]
-    md = markdown.Markdown(
+    md = Markdown(
           extensions,
           safe_mode=False)
     return HTML_TEMPLATE % (title, md.convert(txt))

From 0bcee3f721239ed084ceebe40891dbec9ef27fb8 Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Wed, 25 Sep 2013 11:22:05 +1000
Subject: [PATCH 0875/1154] Reading status wiped for older Kobo Touch firmware

Kobo driver: Fix reading status being cleared when connecting to a Kobo
with older firmware and metadata management set to automatic. Fixes #1230018 [Reading status wiped for older Kobo Firmware](https://bugs.launchpad.net/calibre/+bug/1230018)

When a Kobo Touch running a 1.9.x firmware was connected, the reading
status of all books was wiped out. This was to do with the way the
collections were managed. If a shelf/collection attribute was not
defined, the reading status was being cleared when it should not have
been.

Also skipping a loop over the books if shelf and series management is
not being done.
---
 src/calibre/devices/kobo/driver.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index f93cb18ff5..e8985b1ff9 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -792,6 +792,7 @@ class KOBO(USBMS):
             # debug_print('    Commit: Set FavouritesIndex')
 
     def update_device_database_collections(self, booklists, collections_attributes, oncard):
+        debug_print("Kobo:update_device_database_collections - oncard='%s'"%oncard)
         if self.modify_database_check("update_device_database_collections") == False:
             return
 
@@ -822,7 +823,7 @@ class KOBO(USBMS):
         collections_attributes = ['tags']
 
         collections = booklists.get_collections(collections_attributes)
-#        debug_print('Collections', collections)
+#        debug_print('Kobo:update_device_database_collections - Collections:', collections)
 
         # Create a connection to the sqlite database
         # Needs to be outside books collection as in the case of removing
@@ -2171,8 +2172,10 @@ class KOBOTOUCH(KOBO):
                 # Need to reset the collections outside the particular loops
                 # otherwise the last item will not be removed
                 if self.dbversion < 53:
+                    debug_print("KoboTouch:update_device_database_collections - calling reset_readstatus")
                     self.reset_readstatus(connection, oncard)
                 if self.dbversion >= 14:
+                    debug_print("KoboTouch:update_device_database_collections - calling reset_favouritesindex")
                     self.reset_favouritesindex(connection, oncard)
 
 #                debug_print("KoboTouch:update_device_database_collections - length collections=", len(collections))
@@ -2240,7 +2243,7 @@ class KOBOTOUCH(KOBO):
                                     debug_print('            category not added to book.device_collections', book.device_collections)
                     debug_print("KoboTouch:update_device_database_collections - end for category='%s'"%category)
 
-            else:  # No collections
+            elif bookshelf_attribute:  # No collections but have set the shelf option
                 # Since no collections exist the ReadStatus needs to be reset to 0 (Unread)
                 debug_print("No Collections - reseting ReadStatus")
                 if self.dbversion < 53:
@@ -2249,7 +2252,8 @@ class KOBOTOUCH(KOBO):
                     debug_print("No Collections - resetting FavouritesIndex")
                     self.reset_favouritesindex(connection, oncard)
 
-            if self.supports_bookshelves() or self.supports_series():
+            # Set the series info and cleanup the bookshelves only if the firmware supports them and the user has set the options.
+            if (self.supports_bookshelves() or self.supports_series()) and (bookshelf_attribute or update_series_details):
                 debug_print("KoboTouch:update_device_database_collections - managing bookshelves and series.")
 
                 self.series_set  = 0

From 83ee722a2ed81fd0190bf0a851526cc57438b1a1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 11:25:52 +0530
Subject: [PATCH 0876/1154] Fix breakage caused by update of markdown

---
 src/calibre/gui2/actions/polish.py | 2 +-
 src/calibre/linux.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/actions/polish.py b/src/calibre/gui2/actions/polish.py
index 5320eb6a68..9a4678fbea 100644
--- a/src/calibre/gui2/actions/polish.py
+++ b/src/calibre/gui2/actions/polish.py
@@ -334,7 +334,7 @@ class Report(QDialog):  # {{{
             self.show_next()
 
     def show_report(self, book_title, book_id, fmts, job, report):
-        from calibre.ebooks.markdown.markdown import markdown
+        from calibre.ebooks.markdown import markdown
         self.current_log = job.details
         self.setWindowTitle(_('Polishing of %s')%book_title)
         self.view.setText(markdown('# %s\n\n'%book_title + report,
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 913419bb8b..e37260ed37 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -20,7 +20,7 @@ entry_points = {
              'ebook-meta         = calibre.ebooks.metadata.cli:main',
              'ebook-convert      = calibre.ebooks.conversion.cli:main',
              'ebook-polish       = calibre.ebooks.oeb.polish.main:main',
-             'markdown-calibre   = calibre.ebooks.markdown.markdown:main',
+             'markdown-calibre   = calibre.ebooks.markdown.__main__:run',
              'web2disk           = calibre.web.fetch.simple:main',
              'calibre-server     = calibre.library.server.main:main',
              'lrf2lrs            = calibre.ebooks.lrf.lrfparser:main',

From 1121081ad07246adbdf18dcdc476f3b69e9ccf86 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 11:27:04 +0530
Subject: [PATCH 0877/1154] ...

---
 src/calibre/gui2/lrf_renderer/text.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/lrf_renderer/text.py b/src/calibre/gui2/lrf_renderer/text.py
index 0696cdd851..2724ca117b 100644
--- a/src/calibre/gui2/lrf_renderer/text.py
+++ b/src/calibre/gui2/lrf_renderer/text.py
@@ -6,7 +6,7 @@ from PyQt4.QtCore import Qt, QRectF, QString
 from PyQt4.QtGui import QFont, QColor, QPixmap, QGraphicsPixmapItem, \
                         QGraphicsItem, QFontMetrics, QPen, QBrush, QGraphicsRectItem
 
-from calibre.ebooks.lrf.fonts import FONT_MAP
+from calibre.ebooks.lrf.fonts import LIBERATION_FONT_MAP
 from calibre.ebooks.BeautifulSoup import Tag
 from calibre.ebooks.hyphenate import hyphenate_word
 
@@ -59,7 +59,7 @@ class FontLoader(object):
         self.face_map = font_map
 
     def font(self, text_style):
-        device_font = text_style.fontfacename in FONT_MAP
+        device_font = text_style.fontfacename in LIBERATION_FONT_MAP
         try:
             if device_font:
                 face = self.font_map[text_style.fontfacename]

From 0405027a3f8d6bdf116a95e549c927595ad19195 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 11:47:12 +0530
Subject: [PATCH 0878/1154] Fix over-wide buttons in preferences

---
 src/calibre/gui2/preferences/behavior.ui | 6 ++++++
 src/calibre/gui2/preferences/search.ui   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/calibre/gui2/preferences/behavior.ui b/src/calibre/gui2/preferences/behavior.ui
index 61620e4e21..cb7f716dad 100644
--- a/src/calibre/gui2/preferences/behavior.ui
+++ b/src/calibre/gui2/preferences/behavior.ui
@@ -279,6 +279,12 @@ If not checked, the values can be Yes or No.</string>
    </item>
    <item row="8" column="1">
     <widget class="QPushButton" name="reset_confirmation_button">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
       <string>Reset all disabled &amp;confirmation dialogs</string>
      </property>
diff --git a/src/calibre/gui2/preferences/search.ui b/src/calibre/gui2/preferences/search.ui
index 28735f09e0..9ab23e110d 100644
--- a/src/calibre/gui2/preferences/search.ui
+++ b/src/calibre/gui2/preferences/search.ui
@@ -200,6 +200,12 @@ to be shown as user categories</string>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="QPushButton" name="clear_history_button">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc.</string>
      </property>

From df7e9441b01b084ba05447f8a3355075a7cc4fa5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 12:15:21 +0530
Subject: [PATCH 0879/1154] Bulk metadata edit: Allow setting comments and
 cloning covers

Bulk metadata edit: Allow setting the comments for all selected books
and also allow cloning the covers. Cloning covers means that the cover
of the first selected book will be set for all other selected books.
Fixes #1230040 [Bulk edit covers and comments [Enhancement]](https://bugs.launchpad.net/calibre/+bug/1230040)
---
 src/calibre/gui2/dialogs/metadata_bulk.py |  32 +-
 src/calibre/gui2/dialogs/metadata_bulk.ui | 770 +++++++++++-----------
 2 files changed, 427 insertions(+), 375 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 0b01b5b2a7..1bdaacf7ab 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -56,7 +56,8 @@ def get_cover_data(stream, ext):  # {{{
 
 Settings = namedtuple('Settings', 'remove_all remove add au aus do_aus rating pub do_series do_autonumber do_remove_format '
                       'remove_format do_swap_ta do_remove_conv do_auto_author series do_series_restart series_start_value '
-                      'do_title_case cover_action clear_series pubdate adddate do_title_sort languages clear_languages restore_original')
+                      'do_title_case cover_action clear_series pubdate adddate do_title_sort languages clear_languages restore_original comments')
+null = object()
 
 class MyBlockingBusy(QDialog):  # {{{
 
@@ -215,6 +216,14 @@ class MyBlockingBusy(QDialog):  # {{{
                     im.trim(tweaks['cover_trim_fuzz_value'])
                     cdata = im.export('jpg')
                     cache.set_cover({book_id:cdata})
+        elif args.cover_action == 'clone':
+            cdata = None
+            for book_id in self.ids:
+                cdata = cache.cover(book_id)
+                if cdata:
+                    break
+            if cdata:
+                cache.set_cover({bid:cdata for bid in self.ids if bid != book_id})
 
         # Formats
         if args.do_remove_format:
@@ -262,6 +271,9 @@ class MyBlockingBusy(QDialog):  # {{{
                 elif tweaks['series_index_auto_increment'] != 'no_change':
                     cache.set_field('series_index', {bid:1.0 for bid in self.ids})
 
+        if args.comments is not null:
+            cache.set_field('comments', {bid:args.comments for bid in self.ids})
+
         if args.do_remove_conv:
             cache.delete_conversion_options(self.ids)
 
@@ -310,12 +322,16 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         self.refresh_book_list.setChecked(gprefs['refresh_book_list_on_bulk_edit'])
         self.refresh_book_list.toggled.connect(self.save_refresh_booklist)
         self.ids = [self.db.id(r) for r in rows]
+        self.first_title = self.db.title(self.ids[0], index_is_id=True)
+        self.cover_clone.setToolTip(unicode(self.cover_clone.toolTip()) + ' (%s)' % self.first_title)
         self.box_title.setText('<p>' +
                 _('Editing meta information for <b>%d books</b>') %
                 len(rows))
         self.write_series = False
         self.changed = False
         self.refresh_books = refresh_books
+        self.comments = null
+        self.comments_button.clicked.connect(self.set_comments)
 
         all_tags = self.db.all_tags()
         self.tags.update_items_cache(all_tags)
@@ -373,6 +389,16 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         self.authors.setFocus(Qt.OtherFocusReason)
         self.exec_()
 
+    def set_comments(self):
+        from calibre.gui2.dialogs.comments_dialog import CommentsDialog
+        d = CommentsDialog(self, '' if self.comments is null else (self.comments or ''), _('Comments'))
+        if d.exec_() == d.Accepted:
+            self.comments = d.textbox.html
+            b = self.comments_button
+            b.setStyleSheet('QPushButton { font-weight: bold }')
+            if unicode(b.text())[-1] != '*':
+                b.setText(unicode(b.text()) + ' *')
+
     def save_refresh_booklist(self, *args):
         gprefs['refresh_book_list_on_bulk_edit'] = bool(self.refresh_book_list.isChecked())
 
@@ -960,13 +986,15 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
             cover_action = 'fromfmt'
         elif self.cover_trim.isChecked():
             cover_action = 'trim'
+        elif self.cover_clone.isChecked():
+            cover_action = 'clone'
 
         args = Settings(remove_all, remove, add, au, aus, do_aus, rating, pub, do_series,
                 do_autonumber, do_remove_format, remove_format, do_swap_ta,
                 do_remove_conv, do_auto_author, series, do_series_restart,
                 series_start_value, do_title_case, cover_action, clear_series,
                 pubdate, adddate, do_title_sort, languages, clear_languages,
-                restore_original)
+                restore_original, self.comments)
 
         source = self.s_r_sf_itemdata(None)
         do_sr = source and self.s_r_obj
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index 741f8cae54..b6e86652e8 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -62,16 +62,230 @@
            <string>&amp;Basic metadata</string>
           </attribute>
           <layout class="QGridLayout" name="gridLayout">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_2">
+           <item row="7" column="1">
+            <widget class="EditWithComplete" name="series">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="toolTip">
+              <string>List of known series. You can add new series.</string>
+             </property>
+             <property name="whatsThis">
+              <string>List of known series. You can add new series.</string>
+             </property>
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+             <property name="insertPolicy">
+              <enum>QComboBox::InsertAlphabetically</enum>
+             </property>
+             <property name="sizeAdjustPolicy">
+              <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+             </property>
+             <property name="minimumContentsLength">
+              <number>40</number>
+             </property>
+            </widget>
+           </item>
+           <item row="7" column="2">
+            <widget class="QCheckBox" name="clear_series">
+             <property name="toolTip">
+              <string>If checked, the series will be cleared</string>
+             </property>
              <property name="text">
-              <string>&amp;Author(s): </string>
+              <string>&amp;Clear series</string>
+             </property>
+            </widget>
+           </item>
+           <item row="9" column="2">
+            <widget class="QCheckBox" name="apply_adddate">
+             <property name="text">
+              <string>&amp;Apply date</string>
+             </property>
+            </widget>
+           </item>
+           <item row="10" column="0">
+            <widget class="QLabel" name="label_9">
+             <property name="text">
+              <string>&amp;Published:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
              </property>
              <property name="buddy">
-              <cstring>authors</cstring>
+              <cstring>pubdate</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="10" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <item>
+              <widget class="QDateTimeEdit" name="pubdate">
+               <property name="displayFormat">
+                <string>MMM yyyy</string>
+               </property>
+               <property name="calendarPopup">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="clear_pubdate_button">
+               <property name="toolTip">
+                <string>Clear published date</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../../../../resources/images.qrc">
+                 <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="10" column="2">
+            <widget class="QCheckBox" name="apply_pubdate">
+             <property name="text">
+              <string>&amp;Apply date</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="2">
+            <widget class="QToolButton" name="tag_editor_button">
+             <property name="toolTip">
+              <string>Open Tag Editor</string>
+             </property>
+             <property name="text">
+              <string>Open Tag Editor</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../../../../resources/images.qrc">
+               <normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="0">
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>&amp;Remove tags:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+             <property name="buddy">
+              <cstring>remove_tags</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="1">
+            <widget class="EditWithComplete" name="remove_tags">
+             <property name="toolTip">
+              <string>Comma separated list of tags to remove from the books. </string>
+             </property>
+            </widget>
+           </item>
+           <item row="13" column="0">
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>15</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="12" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_7">
+             <item>
+              <widget class="QComboBox" name="remove_format">
+               <property name="maximumSize">
+                <size>
+                 <width>120</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="restore_original">
+               <property name="toolTip">
+                <string>When doing a same format to same format conversion,
+for e.g., EPUB to EPUB, calibre saves the original EPUB
+ as ORIGINAL_EPUB. This option tells calibre to restore
+ the EPUB from ORIGINAL_EPUB. Useful if you did a bulk
+ conversion of a large number of books and something went wrong.</string>
+               </property>
+               <property name="text">
+                <string>Restore pre conversion &amp;originals, if available</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="7" column="0">
+            <widget class="QLabel" name="label_7">
+             <property name="text">
+              <string>&amp;Series:</string>
+             </property>
+             <property name="textFormat">
+              <enum>Qt::PlainText</enum>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+             <property name="buddy">
+              <cstring>series</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="EditWithComplete" name="publisher">
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="0">
+            <widget class="QLabel" name="label_4">
+             <property name="text">
+              <string>Add ta&amp;gs: </string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+             <property name="buddy">
+              <cstring>tags</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="1">
+            <widget class="EditWithComplete" name="tags">
+             <property name="toolTip">
+              <string>Tags categorize the book. This is particularly useful while searching. &lt;br&gt;&lt;br&gt;They can be any words or phrases, separated by commas.</string>
              </property>
             </widget>
            </item>
@@ -100,6 +314,131 @@
              </item>
             </layout>
            </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string>&amp;Author(s): </string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+             <property name="buddy">
+              <cstring>authors</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="2">
+            <widget class="QCheckBox" name="remove_all_tags">
+             <property name="toolTip">
+              <string>Check this box to remove all tags from the books.</string>
+             </property>
+             <property name="text">
+              <string>Remove &amp;all</string>
+             </property>
+            </widget>
+           </item>
+           <item row="8" column="1">
+            <layout class="QHBoxLayout" name="HLayout_3">
+             <item>
+              <widget class="QCheckBox" name="autonumber_series">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="toolTip">
+                <string>If not checked, the series number for the books will be set to 1.
+If checked, selected books will be automatically numbered, in the order
+you selected them. So if you selected Book A and then Book B,
+Book A will have series number 1 and Book B series number 2.</string>
+               </property>
+               <property name="text">
+                <string>&amp;Automatically number books in this series</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="series_numbering_restarts">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="toolTip">
+                <string>Series will normally be renumbered from the highest number in the database
+for that series. Checking this box will tell calibre to start numbering
+from the value in the box</string>
+               </property>
+               <property name="text">
+                <string>&amp;Force numbers to start with:</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QSpinBox" name="series_start_number">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>99000000</number>
+               </property>
+               <property name="value">
+                <number>1</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="9" column="0">
+            <widget class="QLabel" name="label_10">
+             <property name="text">
+              <string>&amp;Date:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+             <property name="buddy">
+              <cstring>adddate</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="17" column="0">
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="9" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_5">
+             <item>
+              <widget class="QDateTimeEdit" name="adddate">
+               <property name="displayFormat">
+                <string>d MMM yyyy</string>
+               </property>
+               <property name="calendarPopup">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="clear_adddate_button">
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../../../../resources/images.qrc">
+                 <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
            <item row="2" column="0">
             <widget class="QLabel" name="label_8">
              <property name="text">
@@ -174,365 +513,6 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="1">
-            <widget class="EditWithComplete" name="publisher">
-             <property name="editable">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="0">
-            <widget class="QLabel" name="label_4">
-             <property name="text">
-              <string>Add ta&amp;gs: </string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="buddy">
-              <cstring>tags</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="1">
-            <widget class="EditWithComplete" name="tags">
-             <property name="toolTip">
-              <string>Tags categorize the book. This is particularly useful while searching. &lt;br&gt;&lt;br&gt;They can be any words or phrases, separated by commas.</string>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="2">
-            <widget class="QToolButton" name="tag_editor_button">
-             <property name="toolTip">
-              <string>Open Tag Editor</string>
-             </property>
-             <property name="text">
-              <string>Open Tag Editor</string>
-             </property>
-             <property name="icon">
-              <iconset resource="../../../../resources/images.qrc">
-               <normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
-             </property>
-            </widget>
-           </item>
-           <item row="6" column="0">
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>&amp;Remove tags:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="buddy">
-              <cstring>remove_tags</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="6" column="1">
-            <widget class="EditWithComplete" name="remove_tags">
-             <property name="toolTip">
-              <string>Comma separated list of tags to remove from the books. </string>
-             </property>
-            </widget>
-           </item>
-           <item row="6" column="2">
-            <widget class="QCheckBox" name="remove_all_tags">
-             <property name="toolTip">
-              <string>Check this box to remove all tags from the books.</string>
-             </property>
-             <property name="text">
-              <string>Remove &amp;all</string>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="0">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>&amp;Series:</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="buddy">
-              <cstring>series</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="1">
-            <widget class="EditWithComplete" name="series">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="toolTip">
-              <string>List of known series. You can add new series.</string>
-             </property>
-             <property name="whatsThis">
-              <string>List of known series. You can add new series.</string>
-             </property>
-             <property name="editable">
-              <bool>true</bool>
-             </property>
-             <property name="insertPolicy">
-              <enum>QComboBox::InsertAlphabetically</enum>
-             </property>
-             <property name="sizeAdjustPolicy">
-              <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
-             </property>
-             <property name="minimumContentsLength">
-              <number>40</number>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="2">
-            <widget class="QCheckBox" name="clear_series">
-             <property name="toolTip">
-              <string>If checked, the series will be cleared</string>
-             </property>
-             <property name="text">
-              <string>&amp;Clear series</string>
-             </property>
-            </widget>
-           </item>
-           <item row="8" column="1">
-            <layout class="QHBoxLayout" name="HLayout_3">
-             <item>
-              <widget class="QCheckBox" name="autonumber_series">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="toolTip">
-                <string>If not checked, the series number for the books will be set to 1.
-If checked, selected books will be automatically numbered, in the order
-you selected them. So if you selected Book A and then Book B,
-Book A will have series number 1 and Book B series number 2.</string>
-               </property>
-               <property name="text">
-                <string>&amp;Automatically number books in this series</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="series_numbering_restarts">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="toolTip">
-                <string>Series will normally be renumbered from the highest number in the database
-for that series. Checking this box will tell calibre to start numbering
-from the value in the box</string>
-               </property>
-               <property name="text">
-                <string>&amp;Force numbers to start with:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="series_start_number">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="minimum">
-                <number>1</number>
-               </property>
-               <property name="maximum">
-                <number>99000000</number>
-               </property>
-               <property name="value">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="9" column="0">
-            <widget class="QLabel" name="label_10">
-             <property name="text">
-              <string>&amp;Date:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="buddy">
-              <cstring>adddate</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="1">
-            <layout class="QHBoxLayout" name="horizontalLayout_5">
-             <item>
-              <widget class="QDateTimeEdit" name="adddate">
-               <property name="displayFormat">
-                <string>d MMM yyyy</string>
-               </property>
-               <property name="calendarPopup">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QToolButton" name="clear_adddate_button">
-               <property name="text">
-                <string>...</string>
-               </property>
-               <property name="icon">
-                <iconset resource="../../../../resources/images.qrc">
-                 <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="9" column="2">
-            <widget class="QCheckBox" name="apply_adddate">
-             <property name="text">
-              <string>&amp;Apply date</string>
-             </property>
-            </widget>
-           </item>
-           <item row="10" column="0">
-            <widget class="QLabel" name="label_9">
-             <property name="text">
-              <string>&amp;Published:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="buddy">
-              <cstring>pubdate</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="10" column="1">
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <widget class="QDateTimeEdit" name="pubdate">
-               <property name="displayFormat">
-                <string>MMM yyyy</string>
-               </property>
-               <property name="calendarPopup">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QToolButton" name="clear_pubdate_button">
-               <property name="toolTip">
-                <string>Clear published date</string>
-               </property>
-               <property name="text">
-                <string>...</string>
-               </property>
-               <property name="icon">
-                <iconset resource="../../../../resources/images.qrc">
-                 <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="10" column="2">
-            <widget class="QCheckBox" name="apply_pubdate">
-             <property name="text">
-              <string>&amp;Apply date</string>
-             </property>
-            </widget>
-           </item>
-           <item row="11" column="0">
-            <widget class="QLabel" name="label_11">
-             <property name="text">
-              <string>&amp;Languages:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="buddy">
-              <cstring>languages</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="11" column="1">
-            <widget class="LanguagesEdit" name="languages"/>
-           </item>
-           <item row="11" column="2">
-            <widget class="QCheckBox" name="clear_languages">
-             <property name="text">
-              <string>Remove &amp;all</string>
-             </property>
-            </widget>
-           </item>
-           <item row="12" column="0">
-            <widget class="QLabel" name="label_5">
-             <property name="text">
-              <string>Remove &amp;format:</string>
-             </property>
-             <property name="buddy">
-              <cstring>remove_format</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="12" column="1">
-            <layout class="QHBoxLayout" name="horizontalLayout_7">
-             <item>
-              <widget class="QComboBox" name="remove_format">
-               <property name="maximumSize">
-                <size>
-                 <width>120</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="restore_original">
-               <property name="toolTip">
-                <string>When doing a same format to same format conversion,
-for e.g., EPUB to EPUB, calibre saves the original EPUB
- as ORIGINAL_EPUB. This option tells calibre to restore
- the EPUB from ORIGINAL_EPUB. Useful if you did a bulk
- conversion of a large number of books and something went wrong.</string>
-               </property>
-               <property name="text">
-                <string>Restore pre conversion &amp;originals, if available</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="13" column="0">
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>15</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
            <item row="14" column="0" colspan="2">
             <layout class="QHBoxLayout" name="horizontalLayout_3">
              <item>
@@ -622,21 +602,65 @@ Future conversion of these books will use the default settings.</string>
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QRadioButton" name="cover_clone">
+                <property name="toolTip">
+                 <string>Set the covers of all selected books to be the same
+as that of the first selected book.</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Clone covers</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>
-           <item row="16" column="0">
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
+           <item row="11" column="0">
+            <widget class="QLabel" name="label_11">
+             <property name="text">
+              <string>&amp;Languages:</string>
              </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
              </property>
-            </spacer>
+             <property name="buddy">
+              <cstring>languages</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="11" column="1">
+            <widget class="LanguagesEdit" name="languages"/>
+           </item>
+           <item row="11" column="2">
+            <widget class="QCheckBox" name="clear_languages">
+             <property name="text">
+              <string>Remove &amp;all</string>
+             </property>
+            </widget>
+           </item>
+           <item row="12" column="0">
+            <widget class="QLabel" name="label_5">
+             <property name="text">
+              <string>Remove &amp;format:</string>
+             </property>
+             <property name="buddy">
+              <cstring>remove_format</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="16" column="0" colspan="2">
+            <widget class="QPushButton" name="comments_button">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Set the co&amp;mments for all selected books</string>
+             </property>
+            </widget>
            </item>
           </layout>
          </widget>

From 52291ce019a036a1dbeac0131e44919c79d79832 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Wed, 25 Sep 2013 05:32:25 -0600
Subject: [PATCH 0880/1154] Correct handling of exclusions by tag when using
 non-english localization.

---
 src/calibre/library/catalogs/epub_mobi_builder.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py
index 50c29cdbab..e53ed85a3c 100644
--- a/src/calibre/library/catalogs/epub_mobi_builder.py
+++ b/src/calibre/library/catalogs/epub_mobi_builder.py
@@ -4447,21 +4447,21 @@ class CatalogBuilder(object):
         """
         excluded_tags = []
         for rule in self.opts.exclusion_rules:
-            if rule[1].lower() == 'tags':
+            if rule[1] == _('Tags'):
                 excluded_tags.extend(rule[2].split(','))
 
         # Remove dups
         excluded_tags = list(set(excluded_tags))
 
         # Report excluded books
-        if self.opts.verbose and excluded_tags:
+        if excluded_tags:
             self.opts.log.info(" Books excluded by tag:")
             data = self.db.get_data_as_dict(ids=self.opts.ids)
             for record in data:
                 matched = list(set(record['tags']) & set(excluded_tags))
                 if matched:
                     for rule in self.opts.exclusion_rules:
-                        if rule[1] == 'Tags' and rule[2] == str(matched[0]):
+                        if rule[1] == _('Tags') and rule[2] == str(matched[0]):
                             self.opts.log.info("  - '%s' by %s (Exclusion rule '%s')" %
                                 (record['title'], record['authors'][0], rule[0]))
 

From dc80d92b1d28ecea3455663bee3af0bf1c426a7d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 18:13:00 +0530
Subject: [PATCH 0881/1154] Exclude the markdown code from check

---
 setup/check.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup/check.py b/setup/check.py
index 5bf636467d..fd65105025 100644
--- a/setup/check.py
+++ b/setup/check.py
@@ -34,6 +34,8 @@ class Check(Command):
         for x in os.walk(self.j(self.SRC, 'calibre')):
             for f in x[-1]:
                 y = self.j(x[0], f)
+                if x[0].endswith('calibre/ebooks/markdown'):
+                    continue
                 mtime = os.stat(y).st_mtime
                 if cache.get(y, 0) == mtime:
                     continue

From 83d3ee3118802be7606a85affe4ebf1e4a0814d3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 22:11:58 +0530
Subject: [PATCH 0882/1154] Avoid hangs when downloading covers due to
 misbehaving plugins

---
 src/calibre/ebooks/metadata/sources/covers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/sources/covers.py b/src/calibre/ebooks/metadata/sources/covers.py
index bae9203f70..698abfbfce 100644
--- a/src/calibre/ebooks/metadata/sources/covers.py
+++ b/src/calibre/ebooks/metadata/sources/covers.py
@@ -100,7 +100,8 @@ def run_download(log, results, abort,
     wait_time = msprefs['wait_after_first_cover_result']
     found_results = {}
 
-    while True:
+    start_time = time.time()  # Use a global timeout to workaround misbehaving plugins that hang
+    while time.time() - start_time < 301:
         time.sleep(0.1)
         try:
             x = rq.get_nowait()

From 5b578f8ecd78bae05f303b65ea2a80daac66abdd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 22:21:29 +0530
Subject: [PATCH 0883/1154] Delay load utils.date to speed up worker startup

---
 src/calibre/devices/smart_device_app/driver.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 91cf27eca7..3be0878aa4 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -36,7 +36,6 @@ from calibre.library.server import server_config as content_server_config
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.ipc import eintr_retry_call
 from calibre.utils.config_base import tweaks
-from calibre.utils.date import parse_date, now, isoformat
 from calibre.utils.filenames import ascii_filename as sanitize, shorten_components_to
 from calibre.utils.mdns import (publish as publish_zeroconf, unpublish as
         unpublish_zeroconf, get_all_ips)
@@ -371,6 +370,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
 
     # copied from USBMS. Perhaps this could be a classmethod in usbms?
     def _update_driveinfo_record(self, dinfo, prefix, location_code, name=None):
+        from calibre.utils.date import isoformat, now
         import uuid
         if not isinstance(dinfo, dict):
             dinfo = {}
@@ -682,6 +682,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             return None
 
     def _metadata_in_cache(self, uuid, ext, lastmod):
+        from calibre.utils.date import parse_date, now
         key = uuid+ext
         if isinstance(lastmod, unicode):
             lastmod = parse_date(lastmod)
@@ -744,6 +745,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             cPickle.dump(json_metadata, fd, -1)
 
     def _set_known_metadata(self, book, remove=False):
+        from calibre.utils.date import now
         lpath = book.lpath
         ext = os.path.splitext(lpath)[1]
         uuid = book.get('uuid', None)

From f9a9f01dabab0dca64e41fe841ccdfc44d69ea63 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 25 Sep 2013 22:25:22 +0530
Subject: [PATCH 0884/1154] Another fix for markdown update breakage

---
 src/calibre/library/comments.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/calibre/library/comments.py b/src/calibre/library/comments.py
index 0f45a47032..5ff4977045 100644
--- a/src/calibre/library/comments.py
+++ b/src/calibre/library/comments.py
@@ -12,7 +12,7 @@ from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag, NavigableString, \
         CData, Comment, Declaration, ProcessingInstruction
 from calibre import prepare_string_for_xml
 from calibre.utils.html2text import html2text
-from calibre.ebooks.markdown import markdown
+from calibre.ebooks.markdown import Markdown
 
 # Hackish - ignoring sentences ending or beginning in numbers to avoid
 # confusion with decimal points.
@@ -69,7 +69,6 @@ def comments_to_html(comments):
             traceback.print_exc()
             return u'<p></p>'
 
-
     # Explode lost CRs to \n\n
     comments = lost_cr_exception_pat.sub(lambda m: m.group().replace('.',
         '.\r'), comments)
@@ -134,9 +133,8 @@ def comments_to_html(comments):
 
 def sanitize_comments_html(html):
     text = html2text(html)
-    md = markdown.Markdown(safe_mode=True)
+    md = Markdown(safe_mode='remove')
     cleansed = re.sub('\n+', '', md.convert(text))
-    cleansed = cleansed.replace(markdown.HTML_REMOVED_TEXT, '')
     return cleansed
 
 def test():

From 901fd220b3f9082e1c394e317a3e34228ff13820 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 26 Sep 2013 09:07:27 +0530
Subject: [PATCH 0885/1154] version 1.5

---
 Changelog.yaml           | 43 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 345ce8762f..36fc601b2b 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,49 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.5.0
+  date: 2013-09-26
+
+  new features:
+    - title: "Driver for Woxter Scriba"
+      tickets: [1228690]
+
+    - title: "Bulk metadata edit: Allow setting the comments for all selected books and also allow cloning the covers. Cloning covers means that the cover of the first selected book will be set for all other selected books."
+      tickets: [1230040]
+ 
+  bug fixes:
+    - title: "Windows: Improved device ejection code. Eject individual drives before trying to eject the device. This fixes incomplete ejection with the Nook devices."
+
+    - title: "Catalogs: fix exclude tags rules not working in non-English locales when creating catalogs in EPUB/MOBI formats."
+      tickets: [1228949]
+
+    - title: "Kobo driver: Fix reading status being cleared when connecting to a Kobo with older firmware and metadata management set to automatic."
+      tickets: [1230018]
+
+    - title: "Content server: Sort virtual libraries by name"
+      tickets: [1229459]
+
+    - title: "DOCX Input: Convert tabs in the docx file into non-breaking spaces in the output document. Note that custom tab stops are not supported."
+      tickets: [1228893]
+
+    - title: "Conversion: Handle the style attribute on the <html> tag"
+
+    - title: "Handle databases with invalid ratings link tables"
+      tickets: [1228517]
+
+    - title: "DOCX Input: Handle DOCX files with missing referenced styles"
+      tickets: [1228669]
+
+    - title: "Update amazon metadata download plugin for changes to the Amazon website"
+
+  improved recipes:
+    - Slate
+    - El Universal (VE)
+    - GoComics
+
+  new recipes:
+    - title: 
+
 - version: 1.4.0
   date: 2013-09-20
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index e01584c386..14384a4b9a 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 4, 0)
+numeric_version = (1, 5, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From f7a247233678a9ef0b8d1da1163c91327b453f0b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 26 Sep 2013 18:31:54 +0530
Subject: [PATCH 0886/1154] Fix #1231419 [error in manual page for "Integrating
 the calibre content server into other
 servers"](https://bugs.launchpad.net/calibre/+bug/1231419)

---
 manual/server.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manual/server.rst b/manual/server.rst
index 20d4434a28..b5aa203ea8 100644
--- a/manual/server.rst
+++ b/manual/server.rst
@@ -104,7 +104,7 @@ Save this adapter as :file:`calibre-wsgi-adpater.py` somewhere your server will
 
 Let's suppose that we want to use WSGI in Apache. First enable WSGI in Apache by adding the following to :file:`httpd.conf`::
 
-    LoadModule proxy_module modules/mod_wsgi.so
+    LoadModule wsgi_module modules/mod_wsgi.so
 
 The exact technique for enabling the wsgi module will vary depending on your Apache installation. Once you have the proxy modules enabled, add the following rules to httpd.conf (or if you are using virtual hosts to the conf file for the virtual host in question::
 

From 8920cf6caed6de9fe99d18b01901602ff3406619 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 27 Sep 2013 08:38:29 +0530
Subject: [PATCH 0887/1154] Driver for Sunstech reader

Fixes #1231590 [cannot connect my sunstech e-reader](https://bugs.launchpad.net/calibre/+bug/1231590)
---
 src/calibre/devices/teclast/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/teclast/driver.py b/src/calibre/devices/teclast/driver.py
index 9e42b3dbde..22fafcdb10 100644
--- a/src/calibre/devices/teclast/driver.py
+++ b/src/calibre/devices/teclast/driver.py
@@ -20,9 +20,9 @@ class TECLAST_K3(USBMS):
     BCD         = [0x0000, 0x0100]
 
     VENDOR_NAME      = ['TECLAST', 'IMAGIN', 'RK28XX', 'PER3274B', 'BEBOOK',
-                        'RK2728', 'MR700']
+                        'RK2728', 'MR700', 'CYBER']
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['DIGITAL_PLAYER', 'TL-K5',
-            'EREADER', 'USB-MSC', 'PER3274B', 'BEBOOK', 'USER']
+            'EREADER', 'USB-MSC', 'PER3274B', 'BEBOOK', 'USER', 'BOOK']
 
     MAIN_MEMORY_VOLUME_LABEL  = 'K3 Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'K3 Storage Card'

From ee8c9d5c919e7e41d122109990c7461b32d28b42 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 27 Sep 2013 17:05:33 +0200
Subject: [PATCH 0888/1154] Add a tweak to change the image compression quality
 used by the content server when it makes thumbnails.

---
 resources/default_tweaks.py           |  7 +++++++
 src/calibre/library/server/content.py | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index 51bb84883b..2cf8a4296b 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -550,3 +550,10 @@ highlight_virtual_library = 'yellow'
 # all available output formats to be present.
 restrict_output_formats = None
 
+#: Set the thumbnail image quality used by the content server
+# The quality of a thumbnail is largely controlled by the compression quality
+# used when creating it. Set this to a larger number to improve the quality.
+# Note that the thumbnails get much larger with larger compression quality
+# numbers.
+# The value can be between 50 and 99
+content_server_thumbnail_compression_quality = 70
\ No newline at end of file
diff --git a/src/calibre/library/server/content.py b/src/calibre/library/server/content.py
index cdc569f8b7..0c0405aa50 100644
--- a/src/calibre/library/server/content.py
+++ b/src/calibre/library/server/content.py
@@ -18,6 +18,7 @@ from calibre.utils.magick.draw import (save_cover_data_to, Image,
         thumbnail as generate_thumbnail)
 from calibre.utils.filenames import ascii_filename
 from calibre.ebooks.metadata.opf2 import metadata_to_opf
+from calibre.utils.config import tweaks
 
 plugboard_content_server_value = 'content_server'
 plugboard_content_server_formats = ['epub', 'mobi', 'azw3']
@@ -175,8 +176,13 @@ class ContentServer(object):
             cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
 
             if thumbnail:
-                return generate_thumbnail(cover,
-                        width=thumb_width, height=thumb_height)[-1]
+                quality = tweaks['content_server_thumbnail_compression_quality']
+                if quality < 50:
+                    quality = 50
+                elif quality > 99:
+                    quality = 99
+                return generate_thumbnail(cover, width=thumb_width,
+                        height=thumb_height, compression_quality=quality)[-1]
 
             img = Image()
             img.load(cover)

From 974efed829a7e6a14f1150e5be0c9fd38f9648f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Sun, 29 Sep 2013 14:59:39 +0200
Subject: [PATCH 0889/1154] Remove Bookoteka store, as they don't sell ebooks
 any more

---
 src/calibre/customize/builtins.py             | 11 ---
 .../gui2/store/stores/bookoteka_plugin.py     | 76 -------------------
 2 files changed, 87 deletions(-)
 delete mode 100644 src/calibre/gui2/store/stores/bookoteka_plugin.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 97f2135744..98888ff818 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1342,16 +1342,6 @@ class StoreBiblioStore(StoreBase):
     headquarters = 'BG'
     formats = ['EPUB, PDF']
 
-class StoreBookotekaStore(StoreBase):
-    name = 'Bookoteka'
-    author = u'Tomasz Długosz'
-    description = u'E-booki w Bookotece dostępne są w formacie EPUB oraz PDF. Publikacje sprzedawane w Bookotece są objęte prawami autorskimi. Zobowiązaliśmy się chronić te prawa, ale bez ograniczania dostępu do książki użytkownikowi, który nabył ją w legalny sposób. Dlatego też Bookoteka stosuje tak zwany „watermarking transakcyjny” czyli swego rodzaju znaki wodne.'  # noqa
-    actual_plugin = 'calibre.gui2.store.stores.bookoteka_plugin:BookotekaStore'
-
-    drm_free_only = True
-    headquarters = 'PL'
-    formats = ['EPUB', 'PDF']
-
 class StoreCdpStore(StoreBase):
     name = 'Cdp.pl'
     author = u'Tomasz Długosz'
@@ -1718,7 +1708,6 @@ plugins += [
     StoreBNStore,
     StoreBeamEBooksDEStore,
     StoreBiblioStore,
-    StoreBookotekaStore,
     StoreChitankaStore,
     StoreCdpStore,
     StoreDieselEbooksStore,
diff --git a/src/calibre/gui2/store/stores/bookoteka_plugin.py b/src/calibre/gui2/store/stores/bookoteka_plugin.py
deleted file mode 100644
index 7c3b2e8242..0000000000
--- a/src/calibre/gui2/store/stores/bookoteka_plugin.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 1 # Needed for dynamic plugin loading
-
-__license__ = 'GPL 3'
-__copyright__ = '2011, Tomasz Długosz <tomek3d@gmail.com>'
-__docformat__ = 'restructuredtext en'
-
-import urllib
-from contextlib import closing
-
-from lxml import html
-
-from PyQt4.Qt import QUrl
-
-from calibre import browser, url_slash_cleaner
-from calibre.gui2 import open_url
-from calibre.gui2.store import StorePlugin
-from calibre.gui2.store.basic_config import BasicStoreConfig
-from calibre.gui2.store.search_result import SearchResult
-from calibre.gui2.store.web_store_dialog import WebStoreDialog
-
-class BookotekaStore(BasicStoreConfig, StorePlugin):
-
-    def open(self, parent=None, detail_item=None, external=False):
-
-        url = 'http://bookoteka.pl/ebooki'
-        detail_url = None
-
-        if detail_item:
-            detail_url = detail_item
-
-        if external or self.config.get('open_external', False):
-            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))
-        else:
-            d = WebStoreDialog(self.gui, url, parent, detail_url)
-            d.setWindowTitle(self.name)
-            d.set_tags(self.config.get('tags', ''))
-            d.exec_()
-
-    def search(self, query, max_results=10, timeout=60):
-        url = 'http://bookoteka.pl/list?search=' + urllib.quote_plus(query) + '&cat=1&hp=1&type=1'
-
-        br = browser()
-
-        counter = max_results
-        with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())
-            for data in doc.xpath('//li[@class="EBOOK"]'):
-                if counter <= 0:
-                    break
-
-                id = ''.join(data.xpath('.//a[@class="item_link"]/@href'))
-                if not id:
-                    continue
-
-                cover_url = ''.join(data.xpath('.//a[@class="item_link"]/img/@src'))
-                title = ''.join(data.xpath('.//div[@class="shelf_title"]/a/text()'))
-                author = ''.join(data.xpath('.//div[@class="shelf_authors"][1]/text()'))
-                price = ''.join(data.xpath('.//span[@class="EBOOK"]/text()'))
-                price = price.replace('.', ',')
-                formats = ', '.join(data.xpath('.//a[@class="fancybox protected"]/text()'))
-
-                counter -= 1
-
-                s = SearchResult()
-                s.cover_url = 'http://bookoteka.pl' + cover_url
-                s.title = title.strip()
-                s.author = author.strip()
-                s.price = price
-                s.detail_item = 'http://bookoteka.pl' + id.strip()
-                s.drm = SearchResult.DRM_UNLOCKED
-                s.formats = formats.strip()
-
-                yield s

From e1d99a09aba143adf4f4475bdf7288ffc82ea069 Mon Sep 17 00:00:00 2001
From: Carlos Alves <carlosalves90@gmail.com>
Date: Sun, 29 Sep 2013 13:45:11 -0300
Subject: [PATCH 0890/1154] Add some recipes of Uruguay.

Add 10minutos.recipe (News of Salto)
Add diario_el_pueblo.recipe (News of Salto)
Add diario_salto.recipe (News of Salto)
Add unoticias.recipe (News of Montevideo)
---
 recipes/10minutos.recipe        | 50 +++++++++++++++++++++++++++++
 recipes/diario_el_pueblo.recipe | 51 ++++++++++++++++++++++++++++++
 recipes/diario_salto.recipe     | 50 +++++++++++++++++++++++++++++
 recipes/unoticias.recipe        | 56 +++++++++++++++++++++++++++++++++
 4 files changed, 207 insertions(+)
 create mode 100644 recipes/10minutos.recipe
 create mode 100644 recipes/diario_el_pueblo.recipe
 create mode 100644 recipes/diario_salto.recipe
 create mode 100644 recipes/unoticias.recipe

diff --git a/recipes/10minutos.recipe b/recipes/10minutos.recipe
new file mode 100644
index 0000000000..4c2f8a7ec7
--- /dev/null
+++ b/recipes/10minutos.recipe
@@ -0,0 +1,50 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__author__ = '2013, Carlos Alves <carlosalves90@gmail.com>'
+'''
+10minutos.com.uy
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class General(BasicNewsRecipe):
+    title                 = '10minutos'
+    __author__            = 'Carlos Alves'
+    description           = 'Noticias de Salto - Uruguay'
+    tags = 'news, sports'
+    language       = 'es_UY'
+    timefmt        = '[%a, %d %b, %Y]'
+    use_embedded_content  = False
+    recursion             = 5
+    encoding = 'utf8'
+    remove_javascript = True
+    no_stylesheets = True
+
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    keep_only_tags = [dict(name='div', attrs={'class':'post-content'})]
+
+    remove_tags = [
+             dict(name='div', attrs={'class':['hr', 'titlebar', 'navigation']}),
+             dict(name='p', attrs={'class':'post-meta'}),
+             dict(name=['object','link'])
+                  ]
+
+    extra_css = '''
+                h1{font-family:Geneva, Arial, Helvetica, sans-serif;color:#154B7A;}
+                h3{font-size: 14px;color:#999999; font-family:Geneva, Arial, Helvetica, sans-serif;font-weight: bold;}
+                h2{color:#666666; font-family:Geneva, Arial, Helvetica, sans-serif;font-size:small;}
+                p {font-family:Arial,Helvetica,sans-serif;}
+                '''
+    feeds = [
+           (u'Articulos', u'http://10minutos.com.uy/feed/')
+        ]
+
+    def get_cover_url(self):
+        return 'http://10minutos.com.uy/a/img/logo.png'
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup
diff --git a/recipes/diario_el_pueblo.recipe b/recipes/diario_el_pueblo.recipe
new file mode 100644
index 0000000000..4cfab9eb32
--- /dev/null
+++ b/recipes/diario_el_pueblo.recipe
@@ -0,0 +1,51 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__author__ = '2013, Carlos Alves <carlosalves90@gmail.com>'
+'''
+diarioelpueblo.com.uy
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class General(BasicNewsRecipe):
+    title                 = 'Diario El Pueblo'
+    __author__            = 'Carlos Alves'
+    description           = 'Noticias de Salto - Uruguay'
+    tags = 'news, sports'
+    language       = 'es_UY'
+    timefmt        = '[%a, %d %b, %Y]'
+    use_embedded_content  = False
+    recursion             = 5
+    encoding = 'utf8'
+    remove_javascript = True
+    no_stylesheets = True
+
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    keep_only_tags = [dict(name='div', attrs={'class':'post-alt blog'})]
+
+    remove_tags = [
+             dict(name='div', attrs={'class':['hr', 'titlebar', 'volver-arriba-right','navigation']}),
+             dict(name='div', attrs={'id':'comment','id':'suckerfish','id':'crp_related'}),
+             dict(name='h3', attrs={'class':['post_date']}),
+             dict(name=['object','link'])
+                  ]
+
+    extra_css = '''
+                h1{font-family:Geneva, Arial, Helvetica, sans-serif;color:#154B7A;}
+                h3{font-size: 14px;color:#999999; font-family:Geneva, Arial, Helvetica, sans-serif;font-weight: bold;}
+                h2{color:#666666; font-family:Geneva, Arial, Helvetica, sans-serif;font-size:small;}
+                p {font-family:Arial,Helvetica,sans-serif;}
+                '''
+    feeds = [
+           (u'Articulos', u'http://www.diarioelpueblo.com.uy/feed')
+        ]
+
+    def get_cover_url(self):
+        return 'http://www.diarioelpueblo.com.uy/wp-content/uploads/2013/06/Cabezal_Web1.jpg'
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup
diff --git a/recipes/diario_salto.recipe b/recipes/diario_salto.recipe
new file mode 100644
index 0000000000..799233db4d
--- /dev/null
+++ b/recipes/diario_salto.recipe
@@ -0,0 +1,50 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__author__ = '2013, Carlos Alves <carlosalves90@gmail.com>'
+'''
+diarisalto.com.uy
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class General(BasicNewsRecipe):
+    title                 = 'Diario Salto'
+    __author__            = 'Carlos Alves'
+    description           = 'Noticias de Salto - Uruguay'
+    tags = 'news, sports'
+    language       = 'es_UY'
+    timefmt        = '[%a, %d %b, %Y]'
+    use_embedded_content  = False
+    recursion             = 5
+    encoding = 'utf8'
+    remove_javascript = True
+    no_stylesheets = True
+
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    keep_only_tags = [dict(name='div', attrs={'class':'post'})]
+
+    remove_tags = [
+             dict(name='div', attrs={'class':['hr', 'titlebar', 'navigation']}),
+             dict(name='div', attrs={'id':'comment'}),
+             dict(name=['object','link'])
+                  ]
+
+    extra_css = '''
+                h1{font-family:Geneva, Arial, Helvetica, sans-serif;color:#154B7A;}
+                h3{font-size: 14px;color:#999999; font-family:Geneva, Arial, Helvetica, sans-serif;font-weight: bold;}
+                h2{color:#666666; font-family:Geneva, Arial, Helvetica, sans-serif;font-size:small;}
+                p {font-family:Arial,Helvetica,sans-serif;}
+                '''
+    feeds = [
+           (u'Articulos', u'http://www.diariosalto.com.uy/feed/atom')
+        ]
+
+    def get_cover_url(self):
+        return 'http://diariosalto.com.uy/demo/wp-content/uploads/2011/12/diario-salto_logo-final-b-b.png'
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup
diff --git a/recipes/unoticias.recipe b/recipes/unoticias.recipe
new file mode 100644
index 0000000000..f7d1c7693c
--- /dev/null
+++ b/recipes/unoticias.recipe
@@ -0,0 +1,56 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__author__ = '2013, Carlos Alves <carlosalves90@gmail.com>'
+'''
+unoticias.com.uy
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class General(BasicNewsRecipe):
+    title                 = 'UNoticias'
+    __author__            = 'Carlos Alves'
+    description           = 'Noticias Uruguay'
+    tags = 'news, sports, politics'
+    language       = 'es_UY'
+    timefmt        = '[%a, %d %b, %Y]'
+    use_embedded_content  = False
+    recursion             = 5
+    encoding = 'ISO-8859-1'
+    remove_javascript = True
+    no_stylesheets = True
+
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    keep_only_tags = [
+             dict(name='h1', attrs={'class':'nombre'}),
+             dict(name='h2', attrs={'class':'copete t20'}),
+             dict(name='div', attrs={'class':'desc'})
+             ]
+
+    remove_tags = [
+             dict(name='div', attrs={'class':['br', 'hr', 'titlebar', 'navigation']}),
+             dict(name='div', attrs={'id':'comment'}),
+             dict(name=['object','link'])
+                  ]
+
+    extra_css = '''
+                h1{font-family:Geneva, Arial, Helvetica, sans-serif;color:#154B7A;}
+                h3{font-size: 14px;color:#999999; font-family:Geneva, Arial, Helvetica, sans-serif;font-weight: bold;}
+                h2{color:#666666; font-family:Geneva, Arial, Helvetica, sans-serif;font-size:small;}
+                p {font-family:Arial,Helvetica,sans-serif;}
+                '''
+    feeds = [
+           (u'Nacionales', u'http://www.unoticias.com.uy/RSS/nacionales.xml'),
+           (u'Deportes', u'http://www.unoticias.com.uy/RSS/deportes.xml'),
+           (u'Sociedad', u'http://www.unoticias.com.uy/RSS/Sociedad.xml')
+        ]
+
+    def get_cover_url(self):
+        return 'http://www.unoticias.com.uy/artworks/logos/logo_small.gif'
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup

From a342162cffd5b78368d06807a7703e4f99755bbc Mon Sep 17 00:00:00 2001
From: Carlos Alves <carlosalves90@gmail.com>
Date: Sun, 29 Sep 2013 17:34:45 -0300
Subject: [PATCH 0891/1154] Add padreydecano.recipe, update el_observador...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add padreydecano.recipe (C.A. Peñarol related news)
Update el_observador.recipe it was broken for a long time.
---
 recipes/el_observador.recipe | 38 +++++++++++++--------------
 recipes/padreydecano.recipe  | 50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 19 deletions(-)
 create mode 100644 recipes/padreydecano.recipe

diff --git a/recipes/el_observador.recipe b/recipes/el_observador.recipe
index 994963671e..c82a1b7380 100644
--- a/recipes/el_observador.recipe
+++ b/recipes/el_observador.recipe
@@ -1,18 +1,23 @@
 #!/usr/bin/env  python
+##
+## Last Edited:  2013-09-29 Carlos Alves <carlosalves90@gmail.com>
+##
 
 __license__   = 'GPL v3'
 __author__ = '2010, Yuri Alvarez<me at yurialvarez.com>'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+
 '''
-observa.com.uy
+elobservador.com.uy
 '''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
-class ObservaDigital(BasicNewsRecipe):
-    title                 = 'Observa Digital'
-    __author__            = 'yrvn'
-    description           = 'Noticias de Uruguay'
+class Noticias(BasicNewsRecipe):
+    title                 = 'El Observador'
+    __author__ = 'yrvn'
+    description           = 'Noticias desde Uruguay'
+    tags = 'news, sports, entretainment'
     language       = 'es_UY'
     timefmt        = '[%a, %d %b, %Y]'
     use_embedded_content  = False
@@ -23,13 +28,18 @@ class ObservaDigital(BasicNewsRecipe):
 
     oldest_article        = 2
     max_articles_per_feed = 100
-    keep_only_tags = [dict(id=['contenido'])]
+    keep_only_tags = [
+             dict(name='div', attrs={'class':'story collapsed'})
+             ]
     remove_tags = [
-                     dict(name='div', attrs={'id':'contenedorVinculadas'}),
-             dict(name='p', attrs={'id':'nota_firma'}),
+             dict(name='div', attrs={'class':['fecha', 'copyright', 'story_right']}),
+             dict(name='div', attrs={'class':['photo', 'social']}),
+             dict(name='div', attrs={'id':'widget'}),
              dict(name=['object','link'])
                   ]
 
+    remove_attributes = ['width','height', 'style', 'font', 'color']
+
     extra_css = '''
                 h1{font-family:Geneva, Arial, Helvetica, sans-serif;color:#154B7A;}
                 h3{font-size: 14px;color:#999999; font-family:Geneva, Arial, Helvetica, sans-serif;font-weight: bold;}
@@ -37,19 +47,9 @@ class ObservaDigital(BasicNewsRecipe):
                 p {font-family:Arial,Helvetica,sans-serif;}
                 '''
     feeds = [
-               (u'Actualidad', u'http://www.observa.com.uy/RSS/actualidad.xml'),
-           (u'Deportes', u'http://www.observa.com.uy/RSS/deportes.xml'),
-           (u'Vida', u'http://www.observa.com.uy/RSS/vida.xml'),
-           (u'Ciencia y Tecnologia', u'http://www.observa.com.uy/RSS/ciencia.xml')
+           (u'Portada', u'http://elobservador.com.uy/rss/portada/'),
         ]
 
-    def get_cover_url(self):
-        index = 'http://www.observa.com.uy/'
-        soup = self.index_to_soup(index)
-        for image in soup.findAll('img',alt=True):
-           if image['alt'].startswith('Tapa El Observador'):
-              return image['src'].rstrip('b.jpg') + '.jpg'
-        return None
 
     def preprocess_html(self, soup):
         for item in soup.findAll(style=True):
diff --git a/recipes/padreydecano.recipe b/recipes/padreydecano.recipe
new file mode 100644
index 0000000000..3e1cbf24f2
--- /dev/null
+++ b/recipes/padreydecano.recipe
@@ -0,0 +1,50 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__author__ = '2013, Carlos Alves <carlosalves90@gmail.com>'
+'''
+padreydecano.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class General(BasicNewsRecipe):
+    title                 = 'Padre y Decano'
+    __author__            = 'Carlos Alves'
+    description           = 'El sitio del pueblo'
+    tags = 'soccer, futbol, Peñarol'
+    language       = 'es_UY'
+    timefmt        = '[%a, %d %b, %Y]'
+    use_embedded_content  = False
+    recursion             = 5
+    encoding = None
+    remove_javascript = True
+    no_stylesheets = True
+
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    keep_only_tags = [
+             dict(name='h1', attrs={'class':'entry-title'}),
+             dict(name='div', attrs={'class':'entry-content clearfix'})
+             ]
+
+    remove_tags = [
+             dict(name='div', attrs={'class':['br', 'hr', 'titlebar', 'navigation']}),
+             dict(name='dl', attrs={'class':'gallery-item'}),
+             dict(name=['object','link'])
+                  ]
+
+    extra_css = '''
+                h1{font-family:Geneva, Arial, Helvetica, sans-serif;color:#154B7A;}
+                h3{font-size: 14px;color:#999999; font-family:Geneva, Arial, Helvetica, sans-serif;font-weight: bold;}
+                h2{color:#666666; font-family:Geneva, Arial, Helvetica, sans-serif;font-size:small;}
+                p {font-family:Arial,Helvetica,sans-serif;}
+                '''
+    feeds = [
+           (u'Padre y Decano | Club Atlético Peñarol', u'http://www.padreydecano.com/cms/feed/')
+        ]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup

From e34d7bdee724b12c33aae76f7ee9626766e6bbb0 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 1 Oct 2013 19:17:25 +0200
Subject: [PATCH 0892/1154] Use much less memory when reading and writing cache

---
 .../devices/smart_device_app/driver.py        | 90 ++++++++++++++-----
 1 file changed, 70 insertions(+), 20 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 3be0878aa4..270353ffac 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -36,6 +36,7 @@ from calibre.library.server import server_config as content_server_config
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.ipc import eintr_retry_call
 from calibre.utils.config_base import tweaks
+from calibre.utils.config import to_json, from_json
 from calibre.utils.filenames import ascii_filename as sanitize, shorten_components_to
 from calibre.utils.mdns import (publish as publish_zeroconf, unpublish as
         unpublish_zeroconf, get_all_ips)
@@ -717,32 +718,75 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             return None
 
     def _read_metadata_cache(self):
+#         cache_file_name = os.path.join(cache_dir(),
+#                            'device_drivers_' + self.__class__.__name__ +
+#                                 '_metadata_cache.pickle')
+#         if os.path.exists(cache_file_name):
+#             with open(cache_file_name, mode='rb') as fd:
+#                 json_metadata = cPickle.load(fd)
+#             for uuid,json_book in json_metadata.iteritems():
+#                 book = self.json_codec.raw_to_book(json_book['book'], SDBook, self.PREFIX)
+#                 self.known_uuids[uuid]['book'] = book
+#                 self.known_uuids[uuid]['last_used'] = json_book['last_used']
+#                 lpath = book.get('lpath')
+#                 if lpath in self.known_metadata:
+#                     self.known_uuids.pop(uuid, None)
+#                 else:
+#                     self.known_metadata[lpath] = book
+
         cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +
-                                '_metadata_cache.pickle')
-        if os.path.exists(cache_file_name):
-            with open(cache_file_name, mode='rb') as fd:
-                json_metadata = cPickle.load(fd)
-            for uuid,json_book in json_metadata.iteritems():
-                book = self.json_codec.raw_to_book(json_book['book'], SDBook, self.PREFIX)
-                self.known_uuids[uuid]['book'] = book
-                self.known_uuids[uuid]['last_used'] = json_book['last_used']
-                lpath = book.get('lpath')
-                if lpath in self.known_metadata:
-                    self.known_uuids.pop(uuid, None)
-                else:
-                    self.known_metadata[lpath] = book
+                                '_metadata_cache.json')
+        self.known_uuids = defaultdict(dict)
+        self.known_metadata = {}
+        with open(cache_file_name, mode='rb') as fd:
+            while True:
+                try:
+                    rec_len = fd.readline()
+                    if len(rec_len) != 8:
+                        break
+                    raw = fd.read(int(rec_len))
+                    book = json.loads(raw.decode('utf-8'), object_hook=from_json)
+                    uuid = book.keys()[0]
+                    metadata = self.json_codec.raw_to_book(book[uuid]['book'],
+                                                        SDBook, self.PREFIX)
+                    book[uuid]['book'] = metadata
+                    self.known_uuids.update(book)
+
+                    lpath = metadata.get('lpath')
+                    if lpath in self.known_metadata:
+                        self.known_uuids.pop(uuid, None)
+                    else:
+                        self.known_metadata[lpath] = metadata
+                except:
+                    traceback.print_exc()
 
     def _write_metadata_cache(self):
+#         cache_file_name = os.path.join(cache_dir(),
+#                            'device_drivers_' + self.__class__.__name__ +
+#                                 '_metadata_cache.pickle')
+#         json_metadata = defaultdict(dict)
+#         for uuid,book in self.known_uuids.iteritems():
+#             json_metadata[uuid]['book'] = self.json_codec.encode_book_metadata(book['book'])
+#             json_metadata[uuid]['last_used'] = book['last_used']
+#         with open(cache_file_name, mode='wb') as fd:
+#             cPickle.dump(json_metadata, fd, -1)
+
         cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +
-                                '_metadata_cache.pickle')
-        json_metadata = defaultdict(dict)
-        for uuid,book in self.known_uuids.iteritems():
-            json_metadata[uuid]['book'] = self.json_codec.encode_book_metadata(book['book'])
-            json_metadata[uuid]['last_used'] = book['last_used']
+                                '_metadata_cache.json')
         with open(cache_file_name, mode='wb') as fd:
-            cPickle.dump(json_metadata, fd, -1)
+            try:
+                for uuid,book in self.known_uuids.iteritems():
+                    json_metadata = defaultdict(dict)
+                    json_metadata[uuid]['book'] = self.json_codec.encode_book_metadata(book['book'])
+                    json_metadata[uuid]['last_used'] = book['last_used']
+                    result = json.dumps(json_metadata, indent=2, default=to_json)
+                    fd.write("%0.7d\n"%(len(result)+1))
+                    fd.write(result)
+                    fd.write('\n')
+            except:
+                traceback.print_exc()
 
     def _set_known_metadata(self, book, remove=False):
         from calibre.utils.date import now
@@ -757,7 +801,13 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             if key:
                 self.known_uuids.pop(key, None)
         else:
-            new_book = self.known_metadata[lpath] = book.deepcopy()
+            # Check if we have another UUID with the same lpath. If so, remove it
+            existing_uuid = self.known_metadata.get(lpath, {}).get('uuid', None)
+            if existing_uuid:
+                self.known_uuids.pop(existing_uuid + ext, None)
+
+            new_book = book.deepcopy()
+            self.known_metadata[lpath] = new_book
             if key:
                 self.known_uuids[key]['book'] = new_book
                 self.known_uuids[key]['last_used'] = now()

From e161df6fff64ec742bdf6f75533984f5aaf45eba Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 1 Oct 2013 19:27:08 +0200
Subject: [PATCH 0893/1154] More cache work -- remove some code, get rid of old
 file.

---
 .../devices/smart_device_app/driver.py        | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 270353ffac..0fd8fd23b1 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -687,10 +687,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         key = uuid+ext
         if isinstance(lastmod, unicode):
             lastmod = parse_date(lastmod)
-#         if key in self.known_uuids:
-#             self._debug(key, lastmod, self.known_uuids[key].last_modified)
-#         else:
-#             self._debug(key, 'not in known uuids')
         if key in self.known_uuids and self.known_uuids[key]['book'].last_modified == lastmod:
             self.known_uuids[key]['last_used'] = now()
             return self.known_uuids[key]['book'].deepcopy()
@@ -718,21 +714,14 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             return None
 
     def _read_metadata_cache(self):
-#         cache_file_name = os.path.join(cache_dir(),
-#                            'device_drivers_' + self.__class__.__name__ +
-#                                 '_metadata_cache.pickle')
-#         if os.path.exists(cache_file_name):
-#             with open(cache_file_name, mode='rb') as fd:
-#                 json_metadata = cPickle.load(fd)
-#             for uuid,json_book in json_metadata.iteritems():
-#                 book = self.json_codec.raw_to_book(json_book['book'], SDBook, self.PREFIX)
-#                 self.known_uuids[uuid]['book'] = book
-#                 self.known_uuids[uuid]['last_used'] = json_book['last_used']
-#                 lpath = book.get('lpath')
-#                 if lpath in self.known_metadata:
-#                     self.known_uuids.pop(uuid, None)
-#                 else:
-#                     self.known_metadata[lpath] = book
+        try:
+            old_cache_file_name = os.path.join(cache_dir(),
+                           'device_drivers_' + self.__class__.__name__ +
+                                '_metadata_cache.pickle')
+            if os.path.exists(old_cache_file_name):
+                os.remove(old_cache_file_name)
+        except:
+            pass
 
         cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +

From e96c33b0590452d7a281991105c827b3ae971d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Sun, 29 Sep 2013 21:54:46 +0200
Subject: [PATCH 0894/1154] ebookpoint plugin: exclude audiobooks from list of
 items

---
 src/calibre/gui2/store/stores/ebookpoint_plugin.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/store/stores/ebookpoint_plugin.py b/src/calibre/gui2/store/stores/ebookpoint_plugin.py
index 427cde6217..312f4baca8 100644
--- a/src/calibre/gui2/store/stores/ebookpoint_plugin.py
+++ b/src/calibre/gui2/store/stores/ebookpoint_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2013, Tomasz Długosz <tomek3d@gmail.com>'
@@ -60,13 +60,15 @@ class EbookpointStore(BasicStoreConfig, StorePlugin):
                 if not id:
                     continue
 
+                formats = ', '.join(data.xpath('.//div[@class="ikony"]/span/text()'))
+                if formats == 'MP3':
+                    continue
                 cover_url = ''.join(data.xpath('.//a[@class="cover"]/img/@src'))
                 title = ''.join(data.xpath('.//h3/a/@title'))
                 title = re.sub('eBook.', '', title)
                 author = ''.join(data.xpath('.//p[@class="author"]//text()'))
                 price = ''.join(data.xpath('.//p[@class="price"]/ins/text()'))
 
-                formats = ', '.join(data.xpath('.//div[@class="ikony"]/span/text()'))
 
                 counter -= 1
 

From 563be2632200f94cebc95462c1bad4df38e073d5 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Wed, 2 Oct 2013 10:49:30 +0200
Subject: [PATCH 0895/1154] Make metadata cache reading slightly more robust

---
 src/calibre/devices/smart_device_app/driver.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 0fd8fd23b1..a0cc3086a8 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -729,8 +729,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         self.known_uuids = defaultdict(dict)
         self.known_metadata = {}
         with open(cache_file_name, mode='rb') as fd:
-            while True:
-                try:
+            try:
+                while True:
                     rec_len = fd.readline()
                     if len(rec_len) != 8:
                         break
@@ -747,20 +747,10 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                         self.known_uuids.pop(uuid, None)
                     else:
                         self.known_metadata[lpath] = metadata
-                except:
-                    traceback.print_exc()
+            except:
+                traceback.print_exc()
 
     def _write_metadata_cache(self):
-#         cache_file_name = os.path.join(cache_dir(),
-#                            'device_drivers_' + self.__class__.__name__ +
-#                                 '_metadata_cache.pickle')
-#         json_metadata = defaultdict(dict)
-#         for uuid,book in self.known_uuids.iteritems():
-#             json_metadata[uuid]['book'] = self.json_codec.encode_book_metadata(book['book'])
-#             json_metadata[uuid]['last_used'] = book['last_used']
-#         with open(cache_file_name, mode='wb') as fd:
-#             cPickle.dump(json_metadata, fd, -1)
-
         cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +
                                 '_metadata_cache.json')

From d868b2d54154d9d101659ad6b6044efee1b5c692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 2 Oct 2013 19:58:11 +0200
Subject: [PATCH 0896/1154] remove 'The H' recipe

Unfortunatelly they're not publishing any more:
http://www.h-online.com/open/news/item/The-H-is-closing-down-1920027.html
---
 recipes/the_h.recipe | 39 ---------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 recipes/the_h.recipe

diff --git a/recipes/the_h.recipe b/recipes/the_h.recipe
deleted file mode 100644
index 28a1571dc5..0000000000
--- a/recipes/the_h.recipe
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2010, Hiroshi Miura <miurahr@linux.com>'
-'''
-www.h-online.com
-'''
-
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class TheHeiseOnline(BasicNewsRecipe):
-    title          = u'The H'
-    __author__     = 'Hiroshi Miura'
-    oldest_article = 3
-    description    = 'In association with Heise Online'
-    publisher      = 'Heise Media UK Ltd.'
-    category       = 'news, technology, security, OSS, internet'
-    max_articles_per_feed = 100
-    language       = 'en'
-    encoding       = 'utf-8'
-    conversion_options = {
-                      'comment'  : description
-                     ,'tags'     : category
-                     ,'publisher': publisher
-                     ,'language' : language
-                     }
-    feeds          = [
-                      (u'The H News Feed', u'http://www.h-online.com/news/atom.xml')
-                     ]
-    cover_url = 'http://www.h-online.com/icons/logo_theH.gif'
-
-    remove_tags = [
-                        dict(id="logo"),
-                        dict(id="footer")
-                        ]
-
-    def print_version(self, url):
-        return url + '?view=print'
-

From e9f5f8ea2ac5cc9a23513ac632d262bae56ba1c0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Oct 2013 07:23:01 +0530
Subject: [PATCH 0897/1154] Fix virtual libraries template function

The virtual libraries template function was overriding the cache used
for format_metadata in the ProxyMetadata object.
---
 src/calibre/db/lazy.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 73260c8ae7..8935110b65 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -234,11 +234,11 @@ def composite_getter(mi, field, metadata, book_id, cache, formatter, template_ca
 
 def virtual_libraries_getter(dbref, book_id, cache):
     try:
-        return cache[field]
+        return cache['virtual_libraries']
     except KeyError:
         db = dbref()
         vls = db.virtual_libraries_for_books((book_id,))[book_id]
-        ret = cache[field] = ', '.join(vls)
+        ret = cache['virtual_libraries'] = ', '.join(vls)
         return ret
 
 getters = {

From ea9a2dfd8ff44285e867018b470276846f2f2b37 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Oct 2013 09:20:03 +0530
Subject: [PATCH 0898/1154] Update Neu Osnabrucker Zeitung

---
 recipes/neu_osnabrucker_zeitung.recipe | 139 ++++++++++++++++++-------
 1 file changed, 99 insertions(+), 40 deletions(-)

diff --git a/recipes/neu_osnabrucker_zeitung.recipe b/recipes/neu_osnabrucker_zeitung.recipe
index dc6a36237e..011d97f801 100644
--- a/recipes/neu_osnabrucker_zeitung.recipe
+++ b/recipes/neu_osnabrucker_zeitung.recipe
@@ -1,49 +1,108 @@
 # vim:fileencoding=utf-8
-
 from calibre.web.feeds.news import BasicNewsRecipe
 
-class AdvancedUserRecipe1344926684(BasicNewsRecipe):
-    title          = u'Neue Osnabrücker Zeitung'
-    __author__ = 'Krittika Goyal'
-    oldest_article = 7
-    max_articles_per_feed = 100
-    # auto_cleanup = True
-    no_stylesheets         = True
-    use_embedded_content   = False
-    language               = 'de'
+class AdvancedUserRecipe1380105782(BasicNewsRecipe):
+    title                  = u'Neue Osnabrücker Zeitung'
+    __author__             = 'vo_he'
+    description            = 'Online auch ohne IPhone'
+    encoding               = 'utf-8'
+    language = 'de'
     remove_javascript      = True
+    no_stylesheets         = True
+
+    oldest_article = 2
+    max_articles_per_feed = 100
+    cover_url              = 'http://www.noz.de/bundles/nozplatform/images/logos/osnabruecker-zeitung.png'
+
+    remove_tags_before =dict(id='feedContent')
+    remove_tags_before =dict(id='headline')
+
+    remove_tags_after =dict(id='article-authorbox')
+    remove_tags_after =dict(id='footer-start')
+    remove_tags_after =dict(name='div', attrs={'class':'morelinks'})
 
-    keep_only_tags = [
-        dict(name='div', attrs={'class':'article'}),
-        dict(name='span', attrs={'id':'articletext'})
-        ]
     remove_tags = [
-        dict(name='div', attrs={'id':'retresco-title'}),
-        dict(name='div', attrs={'class':'retresco-item s1 relative'}),
-        dict(name='a', attrs={'class':'medium2 largeSpaceTop icon'}),
-        dict(name='div', attrs={'class':'articleFunctions inlineTeaserRight'}),
-        dict(name='div', attrs={'class':'imageContainer '}),
-        dict(name='div', attrs={'class':'imageContainer centerContainer'}),
-        dict(name='div', attrs={'class':'grid singleCol articleTeaser'}),
-        dict(name='h3', attrs={'class':'teaserRow'}),
-        dict(name='div', attrs={'class':'related-comments'}),
-        dict(name='a', attrs={'class':' icon'}),
-        dict(name='a', attrs={'class':'right small'}),
-        dict(name='span', attrs={'class':'small block spaceBottom rectangleAd'}),
+        dict(name='div', attrs={'id':'ui-datepicker-div'}),
+        dict(name='div', attrs={'class':'nav-second'}),
+        dict(name='div', attrs={'class':'nav-first'}),
+        dict(name='div', attrs={'class':'icon-print'}),
+        dict(name='div', attrs={'class':'social-button'}),
+        dict(name='div', attrs={'class':'social-media-bar'}),
+        dict(name='div', attrs={'class':'pull-right'}),
+        dict(name='div', attrs={'class':'btn btn-primary flat-button'}),
+        dict(name='div', attrs={'class':'carousel-wrapper'}),
+        dict(name='a', attrs={'class':'right-content merchandising hidden-tablet'}),
+        dict(name='div', attrs={'class':'border-circle pull-left'}),
+        dict(name='div', attrs={'class':'row show-grid general-infoimageContainer '}),
+        dict(name='div', attrs={'class':'location-list'}),
+        dict(name='div', attrs={'class':'block'}),
         dict(name='div', attrs={'class':'furtherGalleries largeSpaceTop'})
         ]
 
-    feeds          = [(u'Lokales', u'http://www.noz.de/rss/Lokales'),
-(u'Vermischtes', u'http://www.noz.de/rss/Vermischtes'),
-(u'Politik', u'http://www.noz.de/rss/Politik'),
-(u'Wirtschaft', u'http://www.noz.de/rss/Wirtschaft'),
-(u'Kultur', u'http://www.noz.de/rss/Kultur'),
-(u'Medien', u'http://www.noz.de/rss/Medien'),
-(u'Wissenschaft', u'http://www.noz.de/rss/wissenschaft'),
-(u'Sport', u'http://www.noz.de/rss/Sport'),
-(u'Computer', u'http://www.noz.de/rss/Computer'),
-(u'Musik', u'http://www.noz.de/rss/Musik'),
-(u'Szene', u'http://www.noz.de/rss/Szene'),
-(u'Niedersachsen', u'http://www.noz.de/rss/Niedersachsen'),
-(u'Kino', u'http://www.noz.de/rss/Kino')]
-
+    feeds          = [(u'Melle Mitte', u'http://www.noz.de/rss/ressort/Melle%20Mitte'),
+                        (u'Melle Nord', u'http://www.noz.de/rss/ressort/Melle%20Nord'),
+                        (u'Melle Sued', u'http://www.noz.de/rss/ressort/Melle%20S%C3%BCd'),
+                        (u'Nordrhein Westfalen', u'http://www.noz.de/rss/ressort/Nordrhein-Westfalen'),
+                        (u'Niedersachsen', u'http://www.noz.de/rss/ressort/Niedersachsen'),
+                        (u'Vermischtes', u'http://www.noz.de/rss/ressort/Vermischtes'),
+                        (u'GutzuWissen', u'http://www.noz.de/rss/ressort/Gut%20zu%20Wissen'),
+                        (u'Sport', u'http://www.noz.de/rss/ressort/Sport'),
+                        (u'Kultur', u'http://www.noz.de/rss/ressort/Kultur'),
+                        (u'Medien', u'http://www.noz.de/rss/ressort/Medien'),
+                        (u'Belm', u'http://www.noz.de/rss/ressort/Belm'),
+                        (u'Bissendorf', u' [url]http://www.noz.de/rss/ressort/Bissendorf[/url]'),
+                        (u'Osnabrueck', u'http://www.noz.de/rss/ressort/Osnabr%C3%BCck'),
+                        (u'Bad Essen', u'http://www.noz.de/rss/ressort/Bad%20Essen'),
+                        (u'Politik', u'http://www.noz.de/rss/ressort/Politik'),
+                        (u'Wirtschaft', u'http://www.noz.de/rss/ressort/Wirtschaft'),
+#(u'Fussball', u'http:/www.noz.de/rss/ressort/Fußball'),
+#(u'VfL Osnabrueck', u'http://www.noz.de/rss/ressort/VfL%20Osnabr%C3%BCck'),
+#(u'SF Lotte', u'http://www.noz.de/rss/ressort/SF%20Lotte'),
+#(u'SV Meppen', u'http://www.noz.de/rss/ressort/SV%20Meppen'),
+#(u'Artland Dragons', u'http://www.noz.de/rss/ressort/Artland%20Dragons'),
+#(u'Panthers', u'http://www.noz.de/rss/ressort/Panthers'),
+(u'OS-Sport', u'http://www.noz.de/rss/ressort/OS-Sport'),
+#(u'Emsland Sport', u'http://www.noz.de/rss/ressort/EL-Sport'),
+#(u'Lingen', u'http://www.noz.de/rss/ressort/Lingen'),
+#(u'Lohne', u'http://www.noz.de/rss/ressort/Lohne'),
+#(u'Emsbueren', u'http://www.noz.de/rss/ressort/Emsb%C3%BCren'),
+#(u'Salzbergen', u'http://www.noz.de/rss/ressort/Salzbergen'),
+#(u'Spelle', u'http://www.noz.de/rss/ressort/Spelle'),
+#(u'Freren', u'http://www.noz.de/rss/ressort/Freren'),
+#(u'Lengerich', u'http://www.noz.de/rss/ressort/Lengerich'),
+#(u'Bad Iburg', u'http://www.noz.de/rss/ressort/Bad%20Iburg'),
+#(u'Bad Laer', u'http://www.noz.de/rss/ressort/Bad%20Laer'),
+#(u'Bad Rothenfelde', u'http://www.noz.de/rss/ressort/Bad%20Rothenfelde'),
+#(u'GMHütte', u'http://www.noz.de/rss/ressort/Georgsmarienh%C3%BCtte'),
+#(u'Glandorf', u'http://www.noz.de/rss/ressort/Glandorf'),
+#(u'Hagen', u'http://www.noz.de/rss/ressort/Hagen'),
+#(u'Hasbergen', u'http://www.noz.de/rss/ressort/Hasbergen'),
+#(u'Hilter', u'http://www.noz.de/rss/ressort/Hilter'),
+#(u'Lotte', u'http://www.noz.de/rss/ressort/Lotte'),
+#(u'Wallenhorst', u'http://www.noz.de/rss/ressort/Wallenhorst'),
+#(u'Westerkappeln', u'http://www.noz.de/rss/ressort/Westerkappeln'),
+#(u'Artland', u'http://www.noz.de/rss/ressort/Artland'),
+#(u'Bersenbrück', u'http://www.noz.de/rss/ressort/Bersenbr%C3%BCck'),
+#(u'Fürstenau', u'http://www.noz.de/rss/ressort/F%C3%BCrstenau'),
+#(u'Neuenkirchen', u'http://www.noz.de/rss/ressort/Neuenkirchen'),
+#(u'Lokalsport', u'http://www.noz.de/rss/ressort/Lokalsport%20Nordkreis'),
+#(u'Bramsche', u'http://www.noz.de/rss/ressort/Bramsche'),
+#(u'Bramsche Ortsteile', u'http://www.noz.de/rss/ressort/Bramscher%20Ortsteile'),
+#(u'Neuenkirchen Vörden', u'http://www.noz.de/rss/ressort/Neuenkirchen-V%C3%B6rden'),
+#(u'Papenburg', u'http://www.noz.de/rss/ressort/Papenburg'),
+#(u'Dörpen', u'http://www.noz.de/rss/ressort/D%C3%B6rpen'),
+#(u'Rhede', u'http://www.noz.de/rss/ressort/Rhede'),
+#(u'Lathen', u'http://www.noz.de/rss/ressort/Lathen'),
+#(u'Sögel', u'http://www.noz.de/rss/ressort/S%C3%B6gel'),
+#(u'Nordhümmling', u'http://www.noz.de/rss/ressort/Nordh%C3%BCmmling'),
+#(u'Werlte', u'http://www.noz.de/rss/ressort/Werlte'),
+#(u'Westoverledingen', u'http://www.noz.de/rss/ressort/Westoverledingen'),
+#(u'Geeste', u'http://www.noz.de/rss/ressort/Geeste'),
+#(u'Haren', u'http://www.noz.de/rss/ressort/Haren'),
+#(u'Haselünne', u'http://www.noz.de/rss/ressort/Hasel%C3%BCnne'),
+#(u'Herzlake', u'http://www.noz.de/rss/ressort/Herzlake'),
+#(u'Meppen', u'http://www.noz.de/rss/ressort/Meppen'),
+#(u'Twist', u'http://www.noz.de/rss/ressort/Twist'),
+#(u'Bohmte', u'http://www.noz.de/rss/ressort/Bohmte'),
+#(u'Ostercappeln', u'http://www.noz.de/rss/ressort/Ostercappeln')
+]

From fd77ad2c925de73b25971a99ddf6348b7a53db0e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Oct 2013 09:28:55 +0530
Subject: [PATCH 0899/1154] Update AM 730 and Ming Pao (HK)

---
 recipes/am730.recipe    | 79 +++++++++++++++--------------------------
 recipes/ming_pao.recipe |  7 ++--
 2 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/recipes/am730.recipe b/recipes/am730.recipe
index 0fac4bea51..925a244362 100644
--- a/recipes/am730.recipe
+++ b/recipes/am730.recipe
@@ -3,10 +3,10 @@ from __future__ import unicode_literals
 __license__   = 'GPL v3'
 __copyright__ = '2013, Eddie Lau'
 __Date__ = ''
-__HiResImg__ = True
 
 '''
 Change Log:
+2013/09/28 -- update due to website redesign, add cover
 2013/03/30 -- first version
 '''
 
@@ -32,18 +32,17 @@ class AppleDaily(BasicNewsRecipe):
     encoding = 'utf-8'
     auto_cleanup = False
     remove_javascript = True
-    use_embedded_content   = False
+    use_embedded_content = False
     no_stylesheets = True
     description = 'http://www.am730.com.hk'
     category    = 'Chinese, News, Hong Kong'
     masthead_url = 'http://www.am730.com.hk/images/logo.jpg'
-
-    extra_css = 'img {display: block; margin-left: auto; margin-right: auto; margin-top: 10px; margin-bottom: 10px; max-height:90%;} div[id=articleHeader] {font-size:200%; text-align:left; font-weight:bold;} photocaption {font-size:50%; margin-left:auto; margin-right:auto;}'
-    keep_only_tags = [dict(name='div', attrs={'id':'articleHeader'}),
-                      dict(name='div', attrs={'class':'thecontent wordsnap'}),
-                      dict(name='a', attrs={'class':'lightboximg'})]
-    remove_tags = [dict(name='img', attrs={'src':'/images/am730_article_logo.jpg'}),
-                   dict(name='img', attrs={'src':'/images/am_endmark.gif'})]
+    extra_css = 'img {display: block; margin-left: auto; margin-right: auto; margin-top: 20px; margin-bottom: 20px; max-height:70%;} div[id=articleHeader] {font-size:200%; text-align:left; font-weight:bold;} li {font-size:50%; margin-left:auto; margin-right:auto;}'
+    keep_only_tags = [dict(name='h2', attrs={'class':'printTopic'}),
+                      dict(name='div', attrs={'id':'article_content'}),
+                      dict(name='div', attrs={'id':'slider'})]
+    remove_tags = [dict(name='img', attrs={'src':'images/am730_article_logo.jpg'}),
+                   dict(name='img', attrs={'src':'images/am_endmark.gif'})]
 
     def get_dtlocal(self):
         dt_utc = datetime.datetime.utcnow()
@@ -84,6 +83,16 @@ class AppleDaily(BasicNewsRecipe):
     def get_weekday(self):
         return self.get_dtlocal().weekday()
 
+    def get_cover_url(self):
+        soup = self.index_to_soup('http://www.am730.com.hk')
+        cover = 'http://www.am730.com.hk/' + soup.find(attrs={'id':'mini_news_img'}).find('img').get('src', False)
+        br = BasicNewsRecipe.get_browser(self)
+        try:
+            br.open(cover)
+        except:
+            cover = None
+        return cover
+        
     def populate_article_metadata(self, article, soup, first):
         if first and hasattr(self, 'add_toc_thumbnail'):
             picdiv = soup.find('img')
@@ -93,48 +102,17 @@ class AppleDaily(BasicNewsRecipe):
     def parse_index(self):
         feeds = []
         soup = self.index_to_soup('http://www.am730.com.hk/')
-        ul = soup.find(attrs={'class':'nav-section'})
-        sectionList = []
-        for li in ul.findAll('li'):
-            a = 'http://www.am730.com.hk/' + li.find('a', href=True).get('href', False)
-            title = li.find('a').get('title', False).strip()
-            sectionList.append((title, a))
-        for title, url in sectionList:
-            articles = self.parse_section(url)
-            if articles:
-                feeds.append((title, articles))
+        optgroups = soup.findAll('optgroup')
+        for optgroup in optgroups:
+            sectitle = optgroup.get('label')
+            articles = []
+            for option in optgroup.findAll('option'):
+                articlelink = "http://www.am730.com.hk/" + option.get('value')
+                title = option.string
+                articles.append({'title': title, 'url': articlelink})
+            feeds.append((sectitle, articles))
         return feeds
-
-    def parse_section(self, url):
-        soup = self.index_to_soup(url)
-        items = soup.findAll(attrs={'style':'padding-bottom: 15px;'})
-        current_articles = []
-        for item in items:
-            a = item.find(attrs={'class':'t6 f14'}).find('a', href=True)
-            articlelink = 'http://www.am730.com.hk/' + a.get('href', True)
-            title = self.tag_to_string(a)
-            description = self.tag_to_string(item.find(attrs={'class':'t3 f14'}))
-            current_articles.append({'title': title, 'url': articlelink, 'description': description})
-        return current_articles
-
-    def preprocess_html(self, soup):
-        multia = soup.findAll('a')
-        for a in multia:
-            if not (a == None):
-                image = a.find('img')
-                if not (image == None):
-                    if __HiResImg__:
-                        image['src'] = image.get('src').replace('/thumbs/', '/')
-                    caption = image.get('alt')
-                    tag = Tag(soup, "photo", [])
-                    tag2 = Tag(soup, "photocaption", [])
-                    tag.insert(0, image)
-                    if not caption == None:
-                        tag2.insert(0, caption)
-                        tag.insert(1, tag2)
-                    a.replaceWith(tag)
-        return soup
-
+        
     def create_opf(self, feeds, dir=None):
         if dir is None:
             dir = self.output_dir
@@ -288,3 +266,4 @@ class AppleDaily(BasicNewsRecipe):
         with nested(open(opf_path, 'wb'), open(ncx_path, 'wb')) as (opf_file, ncx_file):
             opf.render(opf_file, ncx_file)
 
+
diff --git a/recipes/ming_pao.recipe b/recipes/ming_pao.recipe
index a655d598e4..dffbe27f89 100644
--- a/recipes/ming_pao.recipe
+++ b/recipes/ming_pao.recipe
@@ -1,5 +1,5 @@
 __license__   = 'GPL v3'
-__copyright__ = '2010-2011, Eddie Lau'
+__copyright__ = '2010-2013, Eddie Lau'
 
 # Region - Hong Kong, Vancouver, Toronto
 __Region__ = 'Hong Kong'
@@ -32,6 +32,7 @@ __Date__ = ''
 
 '''
 Change Log:
+2013/09/28: allow thumbnails even with hi-res images
 2012/04/24: improved parsing of news.mingpao.com content
 2011/12/18: update the overridden create_odf(.) routine with the one from Calibre version 0.8.31. Move __UseChineseTitle__ usage away
             from create_odf(.). Optional support of text_summary and thumbnail images in Kindle's article view. Start new day
@@ -846,8 +847,7 @@ class MPRecipe(BasicNewsRecipe):
         return soup
 
     def populate_article_metadata(self, article, soup, first):
-        # thumbnails shouldn't be available if using hi-res images
-        if __IncludeThumbnails__ and __HiResImg__ == False and first and hasattr(self, 'add_toc_thumbnail'):
+        if __IncludeThumbnails__ and first and hasattr(self, 'add_toc_thumbnail'):
             img = soup.find('img')
             if img is not None:
                 self.add_toc_thumbnail(article, img['src'])
@@ -1071,3 +1071,4 @@ class MPRecipe(BasicNewsRecipe):
 
 
 
+

From 5ca115eab0e3d895ef2e6e8e4586c276909226f7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Oct 2013 10:08:37 +0530
Subject: [PATCH 0900/1154] calibredb: Allow setting fo title sort field

Fixes #1233711 [CalibreDB: title_sort is not a known field](https://bugs.launchpad.net/calibre/+bug/1233711)
---
 src/calibre/library/cli.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 89989102e2..f0760e7439 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -629,9 +629,12 @@ def command_set_metadata(args, dbpath):
 
     if opts.field:
         fields = {k:v for k, v in fields()}
+        fields['title_sort'] = fields['sort']
         vals = {}
         for x in opts.field:
             field, val = x.partition(':')[::2]
+            if field == 'sort':
+                field = 'title_sort'
             if field not in fields:
                 print >>sys.stderr, _('%s is not a known field'%field)
                 return 1

From 9dd410ed70fddda4d2871217ec3dfc681703feee Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Oct 2013 10:28:06 +0530
Subject: [PATCH 0901/1154] DOCX Input: Handle numbering without character
 styles

DOCX Input: Fix erorr when converting docx files that have numbering
defined with no associated character style. Fixes #1232100 [Private bug](https://bugs.launchpad.net/calibre/+bug/1232100)
---
 src/calibre/ebooks/docx/numbering.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/docx/numbering.py b/src/calibre/ebooks/docx/numbering.py
index 602689a8cd..740674d0dd 100644
--- a/src/calibre/ebooks/docx/numbering.py
+++ b/src/calibre/ebooks/docx/numbering.py
@@ -90,7 +90,7 @@ class Level(object):
                 self.is_numbered = False
                 cs = self.character_style
                 if lt in {'\uf0a7', 'o'} or (
-                    cs.font_family is not inherit and cs.font_family.lower() in {'wingdings', 'symbol'}):
+                    cs is not None and cs.font_family is not inherit and cs.font_family.lower() in {'wingdings', 'symbol'}):
                     self.fmt = {'\uf0a7':'square', 'o':'circle'}.get(lt, 'disc')
                 else:
                     self.bullet_template = lt

From d4d98e3f2a5a02995c040dc466cbfb4efd62fe71 Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Thu, 3 Oct 2013 15:20:32 +1000
Subject: [PATCH 0902/1154] Display version on Kobo unsupported firmware
 message

When calibre shows the message that says the Kobo device is not
supported, the firmware version and database version on the device is
not displayed. Adding this to make support a little easier.
---
 src/calibre/devices/kobo/driver.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index e8985b1ff9..1f41e583bb 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -63,7 +63,7 @@ class KOBO(USBMS):
     gui_name = 'Kobo Reader'
     description = _('Communicate with the Kobo Reader')
     author = 'Timothy Legge and David Forrester'
-    version = (2, 1, 3)
+    version = (2, 1, 4)
 
     dbversion = 0
     fwversion = 0
@@ -661,6 +661,8 @@ class KOBO(USBMS):
                     ' "Attempt to support newer firmware" option.'
                     ' Doing so may require you to perform a factory reset of'
                     ' your Kobo.'
+                    '\nDevice database version: %s.' 
+                    '\nDevice firmware version: %s' % (self.dbversion, self.fwversion)
                      ),
                      UserFeedback.WARN)
 
@@ -2834,6 +2836,8 @@ class KOBOTOUCH(KOBO):
                     ' "Attempt to support newer firmware" option.'
                     ' Doing so may require you to perform a factory reset of'
                     ' your Kobo.'
+                    '\nDevice database version: %s.' 
+                    '\nDevice firmware version: %s' % (self.dbversion, self.fwversion)
                      ),
                      UserFeedback.WARN)
 

From d445cb3b6b74ff1c2afed6b4bb8e91bdf6bd2260 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Oct 2013 11:19:33 +0530
Subject: [PATCH 0903/1154] ...

---
 src/calibre/devices/kobo/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 1f41e583bb..1410145811 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -661,7 +661,7 @@ class KOBO(USBMS):
                     ' "Attempt to support newer firmware" option.'
                     ' Doing so may require you to perform a factory reset of'
                     ' your Kobo.'
-                    '\nDevice database version: %s.' 
+                    '\nDevice database version: %s.'
                     '\nDevice firmware version: %s' % (self.dbversion, self.fwversion)
                      ),
                      UserFeedback.WARN)
@@ -2836,7 +2836,7 @@ class KOBOTOUCH(KOBO):
                     ' "Attempt to support newer firmware" option.'
                     ' Doing so may require you to perform a factory reset of'
                     ' your Kobo.'
-                    '\nDevice database version: %s.' 
+                    '\nDevice database version: %s.'
                     '\nDevice firmware version: %s' % (self.dbversion, self.fwversion)
                      ),
                      UserFeedback.WARN)

From c0c64d041919bb0884c445de5bdc323f3580b6c3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 3 Oct 2013 11:25:11 +0530
Subject: [PATCH 0904/1154] ...

---
 src/calibre/devices/kobo/driver.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 1410145811..11981cbcd6 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -660,11 +660,10 @@ class KOBO(USBMS):
                     ' selecting "Configure this device" and then the '
                     ' "Attempt to support newer firmware" option.'
                     ' Doing so may require you to perform a factory reset of'
-                    ' your Kobo.'
+                    ' your Kobo.') + ((
                     '\nDevice database version: %s.'
-                    '\nDevice firmware version: %s' % (self.dbversion, self.fwversion)
-                     ),
-                     UserFeedback.WARN)
+                    '\nDevice firmware version: %s') % (self.dbversion, self.fwversion))
+                    , UserFeedback.WARN)
 
                 return False
             else:

From 6b74d5078e656e041d89927b19e2bc6ec4f39454 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 08:33:03 +0530
Subject: [PATCH 0905/1154] Update Carta Capital

Fixes #1235052 [News "Carta Capital" is not working](https://bugs.launchpad.net/calibre/+bug/1235052)
---
 recipes/carta_capital.recipe | 42 ++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/recipes/carta_capital.recipe b/recipes/carta_capital.recipe
index 8bd21046b1..ba13856e16 100644
--- a/recipes/carta_capital.recipe
+++ b/recipes/carta_capital.recipe
@@ -1,23 +1,29 @@
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
 from calibre.web.feeds.news import BasicNewsRecipe
 
-class AdvancedUserRecipe1312361378(BasicNewsRecipe):
-    title          = u'Carta capital'
-    __author__ = 'Pablo Aldama'
+class AdvancedUserRecipe1380852962(BasicNewsRecipe):
+    title          = u'Carta Capital'
+    __author__ = 'Erico Lisboa'
     language = 'pt_BR'
-    oldest_article = 9
+    oldest_article = 15
     max_articles_per_feed = 100
+    auto_cleanup = True
+    use_embedded_content = False
 
-    feeds          = [(u'Politica', u'http://www.cartacapital.com.br/category/politica/feed')
-                      ,(u'Economia', u'http://www.cartacapital.com.br/category/economia/feed')
-                      ,(u'Cultura', u'http://www.cartacapital.com.br/category/cultura/feed')
-                      ,(u'Internacional', u'http://www.cartacapital.com.br/category/internacional/feed')
-                      ,(u'Saude', u'http://www.cartacapital.com.br/category/saude/feed')
-                      ,(u'Sociedade', u'http://www.cartacapital.com.br/category/sociedade/feed')
-                      ,(u'Tecnologia', u'http://www.cartacapital.com.br/category/tecnologia/feed')
-                      ,(u'Carta na escola', u'http://www.cartacapital.com.br/category/carta-na-escola/feed')
-                      ,(u'Carta fundamental', u'http://www.cartacapital.com.br/category/carta-fundamental/feed')
-                      ,(u'Carta verde', u'http://www.cartacapital.com.br/category/carta-verde/feed')
-
-]
-    def print_version(self, url):
-        return url + '/print'
+    feeds          = [(u'Pol\xedtica',
+u'http://www.cartacapital.com.br/politica/politica/rss'), (u'Economia',
+u'http://www.cartacapital.com.br/economia/economia/atom.xml'),
+(u'Sociedade',
+u'http://www.cartacapital.com.br/sociedade/sociedade/atom.xml'),
+(u'Internacional',
+u'http://www.cartacapital.com.br/internacional/internacional/atom.xml'),
+(u'Tecnologia',
+u'http://www.cartacapital.com.br/tecnologia/tecnologia/atom.xml'),
+(u'Cultura',
+u'http://www.cartacapital.com.br/cultura/cultura/atom.xml'),
+(u'Sa\xfade', u'http://www.cartacapital.com.br/saude/saude/atom.xml'),
+(u'Educa\xe7\xe3o',
+u'http://www.cartacapital.com.br/educacao/educacao/atom.xml')]

From 038a9d99dc4020781c1779ce2903c84c59a734e0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 08:52:54 +0530
Subject: [PATCH 0906/1154] HTML Input: Handle the poster attribute of the
 <video> tag

HTML Input: Images linked by the poster attribute of the <video> tag are now
recognized and processed.
---
 src/calibre/ebooks/oeb/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 29fc27ee3f..009902138f 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -107,8 +107,7 @@ def iterlinks(root, find_links_in_css=True):
     :param root: A valid lxml.etree element.
     '''
     assert etree.iselement(root)
-    link_attrs = set(html.defs.link_attrs)
-    link_attrs.add(XLINK('href'))
+    link_attrs = set(html.defs.link_attrs) | {XLINK('href'), 'poster'}
 
     for el in root.iter():
         attribs = el.attrib

From f4f66cf42dadfdde8d9f94280c3f0dc0e7c6dd5b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 10:29:36 +0530
Subject: [PATCH 0907/1154] Add an option to not condense CSS

Conversion: Add an option to not condense CSS rules for margin, padding,
border, etc. Option is under the Look & Feel section of the conversion
dialog. Fixes #1233220 [Feature request: allow margin-top, margin-left, etc. when converting, instead of shortcut margin property](https://bugs.launchpad.net/calibre/+bug/1233220)
---
 src/calibre/ebooks/conversion/cli.py          |  2 +-
 .../ebooks/conversion/plugins/oeb_output.py   |  2 +-
 src/calibre/ebooks/conversion/plumber.py      |  8 +++++
 src/calibre/ebooks/mobi/writer8/main.py       |  2 +-
 src/calibre/gui2/convert/look_and_feel.py     |  2 +-
 src/calibre/gui2/convert/look_and_feel.ui     | 35 +++++++++++--------
 6 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 45b7841347..5fbd0c6acf 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -141,7 +141,7 @@ def add_pipeline_options(parser, plumber):
                       'subset_embedded_fonts', 'embed_all_fonts',
                       'line_height', 'minimum_line_height',
                       'linearize_tables',
-                      'extra_css', 'filter_css',
+                      'extra_css', 'filter_css', 'expand_css',
                       'smarten_punctuation', 'unsmarten_punctuation',
                       'margin_top', 'margin_left', 'margin_right',
                       'margin_bottom', 'change_justification',
diff --git a/src/calibre/ebooks/conversion/plugins/oeb_output.py b/src/calibre/ebooks/conversion/plugins/oeb_output.py
index d63be32fd9..114bcadfc1 100644
--- a/src/calibre/ebooks/conversion/plugins/oeb_output.py
+++ b/src/calibre/ebooks/conversion/plugins/oeb_output.py
@@ -54,7 +54,7 @@ class OEBOutput(OutputFormatPlugin):
                         f.write(raw)
 
             for item in oeb_book.manifest:
-                if item.media_type in OEB_STYLES and hasattr(item.data, 'cssText'):
+                if not self.opts.expand_css and item.media_type in OEB_STYLES and hasattr(item.data, 'cssText'):
                     condense_sheet(item.data)
                 path = os.path.abspath(unquote(item.href))
                 dir = os.path.dirname(path)
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 73e76b72d0..6edef139e7 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -363,6 +363,14 @@ OptionRecommendation(name='filter_css',
                 'font-family,color,margin-left,margin-right')
         ),
 
+OptionRecommendation(name='expand_css',
+            recommended_value=False, level=OptionRecommendation.LOW,
+            help=_(
+                'By default, calibre will use the shorthand form for various'
+                ' css properties such as margin, padding, border, etc. This'
+                ' option will cause it to use the full expanded form instead.')
+        ),
+
 OptionRecommendation(name='page_breaks_before',
             recommended_value="//*[name()='h1' or name()='h2']",
             level=OptionRecommendation.LOW,
diff --git a/src/calibre/ebooks/mobi/writer8/main.py b/src/calibre/ebooks/mobi/writer8/main.py
index 00550d78d4..f0cbcf5c86 100644
--- a/src/calibre/ebooks/mobi/writer8/main.py
+++ b/src/calibre/ebooks/mobi/writer8/main.py
@@ -151,7 +151,7 @@ class KF8Writer(object):
 
         for item in self.oeb.manifest:
             if item.media_type in OEB_STYLES:
-                if hasattr(item.data, 'cssText'):
+                if not self.opts.expand_css and hasattr(item.data, 'cssText'):
                     condense_sheet(self.data(item))
                 data = self.data(item).cssText
                 sheets[item.href] = len(self.flows)
diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py
index ba101a8c0a..1682323fc1 100644
--- a/src/calibre/gui2/convert/look_and_feel.py
+++ b/src/calibre/gui2/convert/look_and_feel.py
@@ -38,7 +38,7 @@ class LookAndFeelWidget(Widget, Ui_Form):
                     'remove_paragraph_spacing',
                     'remove_paragraph_spacing_indent_size',
                     'insert_blank_line_size',
-                    'input_encoding', 'filter_css',
+                    'input_encoding', 'filter_css', 'expand_css',
                     'asciiize', 'keep_ligatures',
                     'linearize_tables']
                 )
diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui
index e9d9caeed7..d22fc658b4 100644
--- a/src/calibre/gui2/convert/look_and_feel.ui
+++ b/src/calibre/gui2/convert/look_and_feel.ui
@@ -21,13 +21,6 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="3">
-    <widget class="QCheckBox" name="opt_linearize_tables">
-     <property name="text">
-      <string>&amp;Linearize tables</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_18">
      <property name="text">
@@ -125,13 +118,6 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="1" colspan="4">
-    <widget class="QCheckBox" name="opt_asciiize">
-     <property name="text">
-      <string>&amp;Transliterate unicode characters to ASCII</string>
-     </property>
-    </widget>
-   </item>
    <item row="12" column="0">
     <widget class="QCheckBox" name="opt_unsmarten_punctuation">
      <property name="text">
@@ -422,6 +408,27 @@
      </property>
     </widget>
    </item>
+   <item row="11" column="1" colspan="2">
+    <widget class="QCheckBox" name="opt_asciiize">
+     <property name="text">
+      <string>&amp;Transliterate unicode characters to ASCII</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="3" colspan="2">
+    <widget class="QCheckBox" name="opt_expand_css">
+     <property name="text">
+      <string>E&amp;xpand CSS</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="3" colspan="2">
+    <widget class="QCheckBox" name="opt_linearize_tables">
+     <property name="text">
+      <string>&amp;Linearize tables</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

From 002886b0baa6b7b05ea8dbc8a4199da86dd2856d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 15:15:56 +0530
Subject: [PATCH 0908/1154] DOCX Input: Handle hyperlinks in footnotes and
 endnotes

Fixes #1232790 [Private bug](https://bugs.launchpad.net/calibre/+bug/1232790)
---
 src/calibre/ebooks/docx/to_html.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index c6b2e230d4..cb33b255ca 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -93,10 +93,12 @@ class Convert(object):
         self.framed_map = {}
         self.anchor_map = {}
         self.link_map = defaultdict(list)
+        self.link_source_map = {}
         paras = []
 
         self.log.debug('Converting Word markup to HTML')
         self.read_page_properties(doc)
+        self.current_rels = relationships_by_id
         for wp, page_properties in self.page_map.iteritems():
             self.current_page = page_properties
             if wp.tag.endswith('}p'):
@@ -123,7 +125,7 @@ class Convert(object):
                 dl[-1][0].tail = ']'
                 dl.append(DD())
                 paras = []
-                self.images.rid_map = note.rels[0]
+                self.images.rid_map = self.current_rels = note.rels[0]
                 for wp in note:
                     if wp.tag.endswith('}tbl'):
                         self.tables.register(wp, self.styles)
@@ -157,7 +159,7 @@ class Convert(object):
 
         self.images.rid_map = orig_rid_map
 
-        self.resolve_links(relationships_by_id)
+        self.resolve_links()
 
         self.styles.cascade(self.layers)
 
@@ -378,6 +380,7 @@ class Convert(object):
                     try:
                         hl = hl_xpath(x)[0]
                         self.link_map[hl].append(span)
+                        self.link_source_map[hl] = self.current_rels
                         x.set('is-link', '1')
                     except IndexError:
                         current_hyperlink = None
@@ -455,9 +458,10 @@ class Convert(object):
             wrapper.append(elem)
         return wrapper
 
-    def resolve_links(self, relationships_by_id):
+    def resolve_links(self):
         self.resolved_link_map = {}
         for hyperlink, spans in self.link_map.iteritems():
+            relationships_by_id = self.link_source_map[hyperlink]
             span = spans[0]
             if len(spans) > 1:
                 span = self.wrap_elems(spans, SPAN())

From 9a9daa7908bdd80186c6cb7d6f4e110e955df279 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 15:43:09 +0530
Subject: [PATCH 0909/1154] Update Focus (PL)

---
 recipes/focus_pl.recipe | 116 ++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 75 deletions(-)

diff --git a/recipes/focus_pl.recipe b/recipes/focus_pl.recipe
index bac16ebbd5..55cabc7941 100644
--- a/recipes/focus_pl.recipe
+++ b/recipes/focus_pl.recipe
@@ -1,85 +1,51 @@
-#!/usr/bin/env python
-__license__ = 'GPL v3'
+from calibre.web.feeds.recipes import BasicNewsRecipe
 
-import re
-from calibre.web.feeds.news import BasicNewsRecipe
 
-class FocusRecipe(BasicNewsRecipe):
+class NYTimes(BasicNewsRecipe):
 
-    __author__ = u'Artur Stachecki <artur.stachecki@gmail.com>'
+    title = 'Focus'
+    __author__ = 'Krittika Goyal'
     language = 'pl'
-    version = 1
-
-    title = u'Focus'
-    publisher = u'Gruner + Jahr Polska'
-    category = u'News'
-    description = u'Focus.pl - pierwszy w Polsce portal społecznościowy dla miłośników nauki. Tematyka: nauka, historia, cywilizacja, technika, przyroda, sport, gadżety'
-    category = 'magazine'
-    cover_url = ''
-    remove_empty_feeds = True
-    no_stylesheets = True
-    oldest_article = 7
-    max_articles_per_feed = 100000
-    recursions = 0
+    description = 'Polish scientific monthly magazine'
+    timefmt = ' [%d %b, %Y]'
+    needs_subscription = False
 
     no_stylesheets = True
-    remove_javascript = True
-    encoding = 'utf-8'
-    # Seems to work best, but YMMV
-    simultaneous_downloads = 5
-
-    r = re.compile('.*(?P<url>http:\/\/(www.focus.pl)|(rss.feedsportal.com\/c)\/.*\.html?).*')
-    keep_only_tags = []
-    keep_only_tags.append(dict(name='div', attrs={'id': 'cll'}))
-
-    remove_tags = []
-    remove_tags.append(dict(name='div', attrs={'class': 'ulm noprint'}))
-    remove_tags.append(dict(name='div', attrs={'class': 'txb'}))
-    remove_tags.append(dict(name='div', attrs={'class': 'h2'}))
-    remove_tags.append(dict(name='ul', attrs={'class': 'txu'}))
-    remove_tags.append(dict(name='div', attrs={'class': 'ulc'}))
-
-    extra_css = '''
-                    body {font-family: verdana, arial, helvetica, geneva, sans-serif ;}
-                    h1{text-align: left;}
-                    h2{font-size: medium; font-weight: bold;}
-                    p.lead {font-weight: bold; text-align: left;}
-                    .authordate {font-size: small; color: #696969;}
-                    .fot{font-size: x-small; color: #666666;}
-                    '''
-
-    feeds = [
-        ('Nauka', 'http://www.focus.pl/nauka/rss/'),
-        ('Historia', 'http://www.focus.pl/historia/rss/'),
-        ('Cywilizacja', 'http://www.focus.pl/cywilizacja/rss/'),
-        ('Sport', 'http://www.focus.pl/sport/rss/'),
-        ('Technika', 'http://www.focus.pl/technika/rss/'),
-        ('Przyroda', 'http://www.focus.pl/przyroda/rss/'),
-        ('Technologie', 'http://www.focus.pl/gadzety/rss/')
+    keep_only_tags = dict(name='article', attrs={'class': 'content'})
+    remove_tags_after = dict(name='div', attrs={'class': 'inner_article'})
+    remove_tags = [
+        dict(name='div', attrs={'class': ['social_btns']}),
     ]
 
-    def skip_ad_pages(self, soup):
-        if ('advertisement' in soup.find('title').string.lower()):
-            href = soup.find('a').get('href')
-            return self.index_to_soup(href, raw=True)
-        else:
-            return None
+    # TO GET ARTICLE TOC
+    def nejm_get_index(self):
+            return self.index_to_soup('http://www.focus.pl/')
 
-    def get_cover_url(self):
-        soup = self.index_to_soup('http://www.focus.pl/magazyn/')
-        tag = soup.find(name='div', attrs={'class': 'clr fl'})
-        if tag:
-            self.cover_url = 'http://www.focus.pl/' + tag.a['href']
-            return getattr(self, 'cover_url', self.cover_url)
+    # To parse artice toc
+    def parse_index(self):
+            soup = self.nejm_get_index()
 
-    def print_version(self, url):
-        if url.count('focus.pl.feedsportal.com'):
-            u = url.find('focus0Bpl')
-            u = 'http://www.focus.pl/' + url[u + 11:]
-            u = u.replace('0C', '/')
-            u = u.replace('A', '')
-            u = u.replace('0E', '-')
-            u = u.replace('/nc/1//story01.htm', '/do-druku/1')
-        else:
-            u = url.replace('/nc/1', '/do-druku/1')
-        return u
+            toc = soup.find('div', id='wrapper')
+
+            articles = []
+            feeds = []
+            section_title = 'Focus Articles'
+            for x in toc.findAll(True):
+                if x.name == 'h1':
+                    # Article found
+                    a = x.find('a')
+                    if a is None:
+                        continue
+                    title = self.tag_to_string(a)
+                    url = a.get('href', False)
+                    if not url or not title:
+                        continue
+                    # if url.startswith('story'):
+                    url = 'http://www.focus.pl' + url
+                    self.log('\t\tFound article:', title)
+                    self.log('\t\t\t', url)
+                    articles.append({'title': title, 'url': url,
+                                     'description': '', 'date': ''})
+            feeds.append((section_title, articles))
+
+            return feeds

From 49686b709316277277d98199ba8bfb1bdb848b5c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 18:01:08 +0530
Subject: [PATCH 0910/1154] Indicate marked books in the main book list as well

Books marked with the Temp Marker plugin will now have an icon next to
their row number to indicate they have been marked in the main book
list.
---
 src/calibre/db/view.py                      | 12 +++++++++++-
 src/calibre/gui2/library/alternate_views.py |  2 +-
 src/calibre/gui2/library/models.py          |  6 +++++-
 src/calibre/gui2/library/views.py           | 21 ++++++++++++++++++++-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 80453e6878..74242fcf66 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -77,6 +77,7 @@ class View(object):
     def __init__(self, cache):
         self.cache = cache
         self.marked_ids = {}
+        self.marked_listeners = {}
         self.search_restriction_book_count = 0
         self.search_restriction = self.base_restriction = ''
         self.search_restriction_name = self.base_restriction_name = ''
@@ -127,6 +128,9 @@ class View(object):
         self.full_map_is_sorted = True
         self.sort_history = [('id', True)]
 
+    def add_marked_listener(self, func):
+        self.marked_listeners[id(func)] = weakref.ref(func)
+
     def add_to_sort_history(self, items):
         self.sort_history = uniq((list(items) + list(self.sort_history)),
                                  operator.itemgetter(0))[:tweaks['maximum_resort_levels']]
@@ -370,7 +374,13 @@ class View(object):
                 id_dict.itervalues())))
         # This invalidates all searches in the cache even though the cache may
         # be shared by multiple views. This is not ideal, but...
-        self.cache.clear_search_caches(old_marked_ids | set(self.marked_ids))
+        cmids = set(self.marked_ids)
+        self.cache.clear_search_caches(old_marked_ids | cmids)
+        if old_marked_ids != cmids:
+            for funcref in self.marked_listeners.itervalues():
+                func = funcref()
+                if func is not None:
+                    func(old_marked_ids, cmids)
 
     def refresh(self, field=None, ascending=True, clear_caches=True, do_search=True):
         self._map = tuple(sorted(self.cache.all_book_ids()))
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 87c6c30fa2..c4a0b79c3a 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -422,7 +422,7 @@ class CoverDelegate(QStyledItemDelegate):
                 try:
                     p = self.marked_emblem
                 except AttributeError:
-                    p = self.marked_emblem = QPixmap(I('rating.png')).scaled(48, 48, transformMode=Qt.SmoothTransformation)
+                    p = self.marked_emblem = m.marked_icon.pixmap(48, 48)
                 drect = QRect(orect)
                 drect.setLeft(drect.left() + right_adjust)
                 drect.setRight(drect.left() + p.width())
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 1345ae24cd..811c186c20 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -111,7 +111,7 @@ class ColumnIcon(object):  # {{{
                     d = os.path.join(config_dir, 'cc_icons', icon)
                     if (os.path.exists(d)):
                         bm = QPixmap(d)
-                        bm = bm.scaled(128, 128, aspectRatioMode= Qt.KeepAspectRatio,
+                        bm = bm.scaled(128, 128, aspectRatioMode=Qt.KeepAspectRatio,
                                        transformMode=Qt.SmoothTransformation)
                         icon_bitmaps.append(bm)
                         total_width += bm.width()
@@ -193,6 +193,8 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.bool_yes_icon = QIcon(I('ok.png'))
         self.bool_no_icon = QIcon(I('list_remove.png'))
         self.bool_blank_icon = QIcon(I('blank.png'))
+        self.marked_icon = QIcon(I('rating.png'))
+        self.row_decoration = NONE
         self.device_connected = False
         self.ids_to_highlight = []
         self.ids_to_highlight_set = set()
@@ -921,6 +923,8 @@ class BooksModel(QAbstractTableModel):  # {{{
 
         if role == Qt.DisplayRole:  # orientation is vertical
             return QVariant(section+1)
+        if role == Qt.DecorationRole:
+            return self.marked_icon if self.db.data.get_marked(self.db.data.index_to_id(section)) else self.row_decoration
         return NONE
 
     def flags(self, index):
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index b59cb49a11..a006f9bd33 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -22,7 +22,7 @@ from calibre.gui2.library.delegates import (RatingDelegate, PubDateDelegate,
 from calibre.gui2.library.models import BooksModel, DeviceBooksModel
 from calibre.gui2.library.alternate_views import AlternateViews, setup_dnd_interface
 from calibre.utils.config import tweaks, prefs
-from calibre.gui2 import error_dialog, gprefs
+from calibre.gui2 import error_dialog, gprefs, FunctionDispatcher
 from calibre.gui2.library import DEFAULT_SORT
 from calibre.constants import filesystem_encoding
 from calibre import force_unicode
@@ -63,6 +63,11 @@ class HeaderView(QHeaderView):  # {{{
                     opt.state |= QStyle.State_MouseOver
         sm = self.selectionModel()
         if opt.orientation == Qt.Vertical:
+            try:
+                opt.icon = model.headerData(logical_index, opt.orientation, Qt.DecorationRole)
+                opt.iconAlignment = Qt.AlignVCenter
+            except TypeError:
+                pass
             if sm.isRowSelected(logical_index, QModelIndex()):
                 opt.state |= QStyle.State_Sunken
 
@@ -214,6 +219,7 @@ class BooksView(QTableView):  # {{{
         self.setSortingEnabled(True)
         self.selectionModel().currentRowChanged.connect(self._model.current_changed)
         self.preserve_state = partial(PreserveViewState, self)
+        self.marked_changed_listener = FunctionDispatcher(self.marked_changed)
 
         # {{{ Column Header setup
         self.can_add_columns = True
@@ -229,6 +235,7 @@ class BooksView(QTableView):  # {{{
         self.column_header.customContextMenuRequested.connect(self.show_column_header_context_menu)
         self.column_header.sectionResized.connect(self.column_resized, Qt.QueuedConnection)
         self.row_header = HeaderView(Qt.Vertical, self)
+        self.row_header.setResizeMode(self.row_header.Fixed)
         self.setVerticalHeader(self.row_header)
         # }}}
 
@@ -682,7 +689,19 @@ class BooksView(QTableView):  # {{{
         self.publisher_delegate.set_auto_complete_function(db.all_publishers)
         self.alternate_views.set_database(db, stage=1)
 
+    def marked_changed(self, old_marked, current_marked):
+        if bool(old_marked) == bool(current_marked):
+            changed = old_marked | current_marked
+            sections = tuple(map(self.model().db.data.id_to_index, changed))
+            self.row_header.headerDataChanged(Qt.Vertical, min(sections), max(sections))
+        else:
+            # Marked items have either appeared or all been removed
+            self.model().row_decoration = self.model().bool_blank_icon if current_marked else None
+            self.row_header.headerDataChanged(Qt.Vertical, 0, self.row_header.count()-1)
+            self.row_header.geometriesChanged.emit()
+
     def database_changed(self, db):
+        db.data.add_marked_listener(self.marked_changed_listener)
         for i in range(self.model().columnCount(None)):
             if self.itemDelegateForColumn(i) in (self.rating_delegate,
                     self.timestamp_delegate, self.pubdate_delegate,

From 4f87c0d39ef86e0a53cc8a054809d6ee4bcd85f0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 18:10:17 +0530
Subject: [PATCH 0911/1154] Refactor row_decoration management

---
 src/calibre/gui2/library/models.py | 3 +++
 src/calibre/gui2/library/views.py  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 811c186c20..fca3ee9d52 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -212,6 +212,9 @@ class BooksModel(QAbstractTableModel):  # {{{
     def set_row_height(self, height):
         self.row_height = height
 
+    def set_row_decoration(self, current_marked):
+        self.row_decoration = self.bool_blank_icon if current_marked else None
+
     def change_alignment(self, colname, alignment):
         if colname in self.column_map and alignment in ('left', 'right', 'center'):
             old = self.alignment_map.get(colname, 'left')
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index a006f9bd33..803b8130a9 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -696,7 +696,7 @@ class BooksView(QTableView):  # {{{
             self.row_header.headerDataChanged(Qt.Vertical, min(sections), max(sections))
         else:
             # Marked items have either appeared or all been removed
-            self.model().row_decoration = self.model().bool_blank_icon if current_marked else None
+            self.model().set_row_decoration(current_marked)
             self.row_header.headerDataChanged(Qt.Vertical, 0, self.row_header.count()-1)
             self.row_header.geometriesChanged.emit()
 

From 1999622f4408f6013d3a6b22fffc9b4552e2ff4a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 20:44:42 +0530
Subject: [PATCH 0912/1154] DOCX Input: Avoid using the value attribute for
 simple numbered lists

---
 src/calibre/ebooks/docx/numbering.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/docx/numbering.py b/src/calibre/ebooks/docx/numbering.py
index 740674d0dd..df500ee65c 100644
--- a/src/calibre/ebooks/docx/numbering.py
+++ b/src/calibre/ebooks/docx/numbering.py
@@ -298,7 +298,7 @@ class Numbering(object):
                 for attr in ('list-lvl', 'list-id', 'list-template'):
                     child.attrib.pop(attr, None)
                 val = int(child.get('value'))
-                if last_val == val - 1 or wrap.tag == 'ul':
+                if last_val == val - 1 or wrap.tag == 'ul' or (last_val is None and val == 1):
                     child.attrib.pop('value')
                 last_val = val
             current_run[-1].tail = '\n'

From f320957438c88fd28a475745a20d647c717586f5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Oct 2013 22:45:35 +0530
Subject: [PATCH 0913/1154] Make a special icon for the marked emblem

---
 imgsrc/marked.svg                  | 124 +++++++++++++++++++++++++++++
 resources/images/marked.png        | Bin 0 -> 3219 bytes
 src/calibre/gui2/library/models.py |   2 +-
 3 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 imgsrc/marked.svg
 create mode 100644 resources/images/marked.png

diff --git a/imgsrc/marked.svg b/imgsrc/marked.svg
new file mode 100644
index 0000000000..f552455f76
--- /dev/null
+++ b/imgsrc/marked.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="marked.svg"
+   inkscape:export-filename="/home/kovid/work/calibre/resources/images/marked.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <title
+     id="title3847">Pushpin Icon</title>
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3782">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3784" />
+      <stop
+         style="stop-color:#c3c3c0;stop-opacity:1;"
+         offset="1"
+         id="stop3786" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3782"
+       id="linearGradient3813"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-18.805519,996.21376)"
+       x1="58"
+       y1="91"
+       x2="73"
+       y2="91" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="30.580486"
+     inkscape:cy="63.624717"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="false"
+     inkscape:object-paths="true"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       type="xygrid"
+       id="grid2985" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Pushpin Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Kovid Goyal</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:#f39509;fill-opacity:1;stroke:#7a6822;stroke-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 1.9128912,974.70018 49.4974748,-49.49747 -7.071068,21.2132 31.819805,17.67767 24.433067,-3.85121 -63.639613,63.63963 3.851207,-24.43308 -17.677669,-31.81981 z"
+       id="path3088"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:url(#linearGradient3813);fill-opacity:1;stroke:none"
+       d="M 63.925974,996.92087 120,1042.5389 74.532576,986.31427"
+       id="path3097"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/resources/images/marked.png b/resources/images/marked.png
new file mode 100644
index 0000000000000000000000000000000000000000..5440881801df0e253f18593282b7e78c362c3cf1
GIT binary patch
literal 3219
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
FV1j3V*gpUO

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index fca3ee9d52..5e2ca4d0d0 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -193,7 +193,7 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.bool_yes_icon = QIcon(I('ok.png'))
         self.bool_no_icon = QIcon(I('list_remove.png'))
         self.bool_blank_icon = QIcon(I('blank.png'))
-        self.marked_icon = QIcon(I('rating.png'))
+        self.marked_icon = QIcon(I('marked.png'))
         self.row_decoration = NONE
         self.device_connected = False
         self.ids_to_highlight = []

From ea87178c1da1b5f0464b255f7f5da9db815b54be Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 09:02:38 +0530
Subject: [PATCH 0914/1154] Add some 3D effects to the marked icon

---
 imgsrc/marked.svg           |  42 ++++++++++++++++++++++++++++++++++--
 resources/images/marked.png | Bin 3219 -> 5851 bytes
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/imgsrc/marked.svg b/imgsrc/marked.svg
index f552455f76..c812038668 100644
--- a/imgsrc/marked.svg
+++ b/imgsrc/marked.svg
@@ -2,7 +2,6 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -45,6 +44,45 @@
        y1="91"
        x2="73"
        y2="91" />
+    <filter
+       id="filter3014"
+       inkscape:label="Ridged border"
+       inkscape:menu="Bevels"
+       inkscape:menu-tooltip="Ridged border with inner bevel"
+       color-interpolation-filters="sRGB">
+      <feMorphology
+         id="feMorphology3016"
+         radius="4.3"
+         in="SourceAlpha"
+         result="result91" />
+      <feComposite
+         id="feComposite3018"
+         in2="result91"
+         operator="out"
+         in="SourceGraphic" />
+      <feGaussianBlur
+         id="feGaussianBlur3020"
+         result="result0"
+         stdDeviation="1.2" />
+      <feDiffuseLighting
+         id="feDiffuseLighting3022"
+         diffuseConstant="1"
+         result="result92">
+        <feDistantLight
+           id="feDistantLight3024"
+           elevation="66"
+           azimuth="225" />
+      </feDiffuseLighting>
+      <feBlend
+         id="feBlend3026"
+         in2="SourceGraphic"
+         mode="multiply"
+         result="result93" />
+      <feComposite
+         id="feComposite3028"
+         in2="SourceAlpha"
+         operator="in" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -105,7 +143,7 @@
      id="layer1"
      transform="translate(0,-924.36218)">
     <path
-       style="fill:#f39509;fill-opacity:1;stroke:#7a6822;stroke-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+       style="fill:#f39509;fill-opacity:1;stroke:#7a6822;stroke-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter3014)"
        d="m 1.9128912,974.70018 49.4974748,-49.49747 -7.071068,21.2132 31.819805,17.67767 24.433067,-3.85121 -63.639613,63.63963 3.851207,-24.43308 -17.677669,-31.81981 z"
        id="path3088"
        inkscape:connector-curvature="0"
diff --git a/resources/images/marked.png b/resources/images/marked.png
index 5440881801df0e253f18593282b7e78c362c3cf1..724197bdf36007b3925e87e377a032944814bca1 100644
GIT binary patch
delta 5794
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

delta 3141
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


From 60c78bef61c5b7fd010494cab523cf663700ead5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 11:02:37 +0530
Subject: [PATCH 0915/1154] Temporary marking of books in the library

This allows you to select books from your calibre library manually and
mark them. This "mark" will remain until you restart calibre, or clear
the marks. You can easily work with only the marked subset of books.
To use this feature, go to Preferences->Toolbars and add the "Mark
Books" tool to the main toolbar.
---
 src/calibre/customize/builtins.py      |   8 +-
 src/calibre/db/view.py                 |   6 ++
 src/calibre/gui2/actions/mark_books.py | 131 +++++++++++++++++++++++++
 3 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 src/calibre/gui2/actions/mark_books.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 98888ff818..77f6393573 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -923,6 +923,11 @@ class ActionSortBy(InterfaceActionBase):
     actual_plugin = 'calibre.gui2.actions.sort:SortByAction'
     description = _('Sort the list of books')
 
+class ActionMarkBooks(InterfaceActionBase):
+    name = 'Mark Books'
+    actual_plugin = 'calibre.gui2.actions.mark_books:MarkBooksAction'
+    description = _('Temporarily mark books')
+
 class ActionStore(InterfaceActionBase):
     name = 'Store'
     author = 'John Schember'
@@ -953,7 +958,8 @@ plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionSendToDevice, ActionHelp, ActionPreferences, ActionSimilarBooks,
         ActionAddToLibrary, ActionEditCollections, ActionMatchBooks, ActionChooseLibrary,
         ActionCopyToLibrary, ActionTweakEpub, ActionNextMatch, ActionStore,
-        ActionPluginUpdater, ActionPickRandom, ActionEditToC, ActionSortBy]
+        ActionPluginUpdater, ActionPickRandom, ActionEditToC, ActionSortBy,
+        ActionMarkBooks]
 
 # }}}
 
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 74242fcf66..76690f440b 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -382,6 +382,12 @@ class View(object):
                 if func is not None:
                     func(old_marked_ids, cmids)
 
+    def toggle_marked_ids(self, book_ids):
+        book_ids = set(book_ids)
+        mids = set(self.marked_ids)
+        common = mids.intersection(book_ids)
+        self.set_marked_ids((mids | book_ids) - common)
+
     def refresh(self, field=None, ascending=True, clear_caches=True, do_search=True):
         self._map = tuple(sorted(self.cache.all_book_ids()))
         self._map_filtered = tuple(self._map)
diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py
new file mode 100644
index 0000000000..8711a55ef0
--- /dev/null
+++ b/src/calibre/gui2/actions/mark_books.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from functools import partial
+
+from PyQt4.Qt import QTimer, QApplication, Qt
+
+from calibre.gui2 import error_dialog
+from calibre.gui2.actions import InterfaceAction
+
+class MarkBooksAction(InterfaceAction):
+
+    name = 'Mark Books'
+    action_spec = (_('Mark Books'), 'marked.png', _('Temporarily mark books'), 'Ctrl+M')
+    action_type = 'current'
+    action_add_menu = True
+    dont_add_to = frozenset([
+        'toolbar-device', 'context-menu-device', 'menubar-device', 'context-menu-cover-browser'])
+    action_menu_clone_qaction = _('Toggle mark for selected books')
+
+    accepts_drops = True
+
+    def accept_enter_event(self, event, mime_data):
+        if mime_data.hasFormat("application/calibre+from_library"):
+            return True
+        return False
+
+    def accept_drag_move_event(self, event, mime_data):
+        if mime_data.hasFormat("application/calibre+from_library"):
+            return True
+        return False
+
+    def drop_event(self, event, mime_data):
+        mime = 'application/calibre+from_library'
+        if mime_data.hasFormat(mime):
+            self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split()))
+            QTimer.singleShot(1, self.do_drop)
+            return True
+        return False
+
+    def do_drop(self):
+        book_ids = self.dropped_ids
+        del self.dropped_ids
+        if book_ids:
+            self.toggle_ids(book_ids)
+
+    def genesis(self):
+        self.qaction.triggered.connect(self.toolbar_triggered)
+        self.menu = m = self.qaction.menu()
+        m.aboutToShow.connect(self.about_to_show_menu)
+        ma = partial(self.create_menu_action, m)
+        self.show_marked_action = a = ma('show-marked', _('Show marked books'), icon='search.png', shortcut='Shift+Ctrl+M')
+        a.triggered.connect(self.show_marked)
+        self.clear_marked_action = a = ma('clear-all-marked', _('Clear all marked books'), icon='clear_left.png')
+        a.triggered.connect(self.clear_all_marked)
+        m.addSeparator()
+        self.mark_author_action = a = ma('mark-author', _('Mark all books by selected author(s)'), icon='plus.png')
+        a.triggered.connect(partial(self.mark_field, 'authors', True))
+        self.mark_series_action = a = ma('mark-series', _('Mark all books in the selected series'), icon='plus.png')
+        a.triggered.connect(partial(self.mark_field, 'series', True))
+        m.addSeparator()
+        self.unmark_author_action = a = ma('unmark-author', _('Clear all books by selected author(s)'), icon='minus.png')
+        a.triggered.connect(partial(self.mark_field, 'authors', False))
+        self.unmark_series_action = a = ma('unmark-series', _('Clear all books in the selected series'), icon='minus.png')
+        a.triggered.connect(partial(self.mark_field, 'series', False))
+
+    def about_to_show_menu(self):
+        db = self.gui.current_db
+        num = len(db.data.marked_ids)
+        text = ngettext('Show marked book', 'Show marked books (%d)' % num, num)
+        self.show_marked_action.setText(text)
+
+    def location_selected(self, loc):
+        enabled = loc == 'library'
+        self.qaction.setEnabled(enabled)
+
+    def toolbar_triggered(self):
+        mods = QApplication.keyboardModifiers()
+        if mods & Qt.ControlModifier or mods & Qt.ShiftModifier:
+            self.show_marked()
+        else:
+            self.toggle_selected()
+
+    def toggle_selected(self):
+        book_ids = self._get_selected_ids()
+        if book_ids:
+            self.toggle_ids(book_ids)
+
+    def _get_selected_ids(self):
+        rows = self.gui.library_view.selectionModel().selectedRows()
+        if not rows or len(rows) == 0:
+            d = error_dialog(self.gui, _('Cannot mark'), _('No books selected'))
+            d.exec_()
+            return set([])
+        return set(map(self.gui.library_view.model().id, rows))
+
+    def toggle_ids(self, book_ids):
+        self.gui.current_db.data.toggle_marked_ids(book_ids)
+
+    def show_marked(self):
+        self.gui.search.set_search_string('marked:true')
+
+    def clear_all_marked(self):
+        self.gui.current_db.data.set_marked_ids(())
+        if unicode(self.gui.search.text()).startswith('marked:'):
+            self.gui.search.set_search_string('')
+
+    def mark_field(self, field, add):
+        book_ids = self._get_selected_ids()
+        if not book_ids:
+            return
+        db = self.gui.current_db
+        items = set()
+        for book_id in book_ids:
+            items |= set(db.new_api.field_ids_for(field, book_id))
+        book_ids = set()
+        for item_id in items:
+            book_ids |= db.new_api.books_for_field(field, item_id)
+        mids = db.data.marked_ids.copy()
+        for book_id in book_ids:
+            if add:
+                mids[book_id] = True
+            else:
+                mids.pop(book_id, None)
+        db.data.set_marked_ids(mids)
+

From 7e84ed6ed5d5c85f7436e8cb079a13006a6e2d68 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 12:40:11 +0530
Subject: [PATCH 0916/1154] E-book viewer: Use font size setting for dictionary
 view as well

E-book viewer: Use the default font size setting for the dictionary view as well. Fixes #1232025 [[Enhancement] Make font size of Dictionary, dependent of viewer font size](https://bugs.launchpad.net/calibre/+bug/1232025)
---
 src/calibre/gui2/viewer/main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 8681a0fe21..e9ffb19828 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -487,6 +487,11 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
                 at_start=True)
 
     def lookup(self, word):
+        from calibre.gui2.viewer.documentview import config
+        opts = config().parse()
+        settings = self.dictionary_view.page().settings()
+        settings.setFontSize(settings.DefaultFontSize, opts.default_font_size)
+        settings.setFontSize(settings.DefaultFixedFontSize, opts.mono_font_size)
         self.dictionary_view.setHtml('<html><body><p>'+
             _('Connecting to dict.org to lookup: <b>%s</b>&hellip;')%word +
             '</p></body></html>')

From d1fb70cf32e500d1e3fe7c5315647bee80086d34 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 12:50:34 +0530
Subject: [PATCH 0917/1154] E-book viewer: Fix regression that broke
 import/export of bookmarks

Fixes #1231980 [Calibre ePub Viewer: Importing bookmarks does not work](https://bugs.launchpad.net/calibre/+bug/1231980)
---
 src/calibre/gui2/viewer/bookmarkmanager.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/viewer/bookmarkmanager.py b/src/calibre/gui2/viewer/bookmarkmanager.py
index acd00c3a6f..3acba11392 100644
--- a/src/calibre/gui2/viewer/bookmarkmanager.py
+++ b/src/calibre/gui2/viewer/bookmarkmanager.py
@@ -100,7 +100,7 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
             bad = False
             try:
                 for bm in imported:
-                    if len(bm) != 2:
+                    if 'title' not in bm:
                         bad = True
                         break
             except:
@@ -109,9 +109,9 @@ class BookmarkManager(QDialog, Ui_BookmarkManager):
             if not bad:
                 bookmarks = self.get_bookmarks()
                 for bm in imported:
-                    if bm not in bookmarks and bm['title'] != 'calibre_current_page_bookmark':
+                    if bm not in bookmarks:
                         bookmarks.append(bm)
-                self.set_bookmarks(bookmarks)
+                self.set_bookmarks([bm for bm in bookmarks if bm['title'] != 'calibre_current_page_bookmark'])
 
 if __name__ == '__main__':
     from PyQt4.Qt import QApplication

From 8deade288fea87a4bd60cf45282e655629d7835c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 13:38:35 +0530
Subject: [PATCH 0918/1154] Fix #1007468 [Untranslated cli
 strings](https://bugs.launchpad.net/calibre/+bug/1007468)

---
 src/calibre/utils/config.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index b002a019ae..3d0738f46c 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -8,8 +8,7 @@ Manage application-wide preferences.
 '''
 import os, cPickle, base64, datetime, json, plistlib
 from copy import deepcopy
-from optparse import OptionParser as _OptionParser, OptionGroup
-from optparse import IndentedHelpFormatter
+import optparse
 
 from calibre.constants import (config_dir, CONFIG_DIR_MODE, __appname__,
         get_version, __author__)
@@ -18,6 +17,10 @@ from calibre.utils.config_base import (make_config_dir, Option, OptionValues,
         OptionSet, ConfigInterface, Config, prefs, StringConfig, ConfigProxy,
         read_raw_tweaks, read_tweaks, write_tweaks, tweaks, plugin_dir)
 
+# optparse uses gettext.gettext instead of _ from builtins, so we
+# monkey patch it.
+optparse._ = _
+
 if False:
     # Make pyflakes happy
     Config, ConfigProxy, Option, OptionValues, StringConfig
@@ -27,7 +30,7 @@ if False:
 def check_config_write_access():
     return os.access(config_dir, os.W_OK) and os.access(config_dir, os.X_OK)
 
-class CustomHelpFormatter(IndentedHelpFormatter):
+class CustomHelpFormatter(optparse.IndentedHelpFormatter):
 
     def format_usage(self, usage):
         from calibre.utils.terminal import colored
@@ -72,7 +75,7 @@ class CustomHelpFormatter(IndentedHelpFormatter):
         return "".join(result)+'\n'
 
 
-class OptionParser(_OptionParser):
+class OptionParser(optparse.OptionParser):
 
     def __init__(self,
                  usage='%prog [options] filename',
@@ -91,7 +94,7 @@ class OptionParser(_OptionParser):
                  '''enclose the arguments in quotation marks.''')+'\n'
         if version is None:
             version = '%%prog (%s %s)'%(__appname__, get_version())
-        _OptionParser.__init__(self, usage=usage, version=version, epilog=epilog,
+        optparse.OptionParser.__init__(self, usage=usage, version=version, epilog=epilog,
                                formatter=CustomHelpFormatter(),
                                conflict_handler=conflict_handler, **kwds)
         self.gui_mode = gui_mode
@@ -104,22 +107,22 @@ class OptionParser(_OptionParser):
     def print_usage(self, file=None):
         from calibre.utils.terminal import ANSIStream
         s = ANSIStream(file)
-        _OptionParser.print_usage(self, file=s)
+        optparse.OptionParser.print_usage(self, file=s)
 
     def print_help(self, file=None):
         from calibre.utils.terminal import ANSIStream
         s = ANSIStream(file)
-        _OptionParser.print_help(self, file=s)
+        optparse.OptionParser.print_help(self, file=s)
 
     def print_version(self, file=None):
         from calibre.utils.terminal import ANSIStream
         s = ANSIStream(file)
-        _OptionParser.print_version(self, file=s)
+        optparse.OptionParser.print_version(self, file=s)
 
     def error(self, msg):
         if self.gui_mode:
             raise Exception(msg)
-        _OptionParser.error(self, msg)
+        optparse.OptionParser.error(self, msg)
 
     def merge(self, parser):
         '''
@@ -182,8 +185,8 @@ class OptionParser(_OptionParser):
 
     def add_option_group(self, *args, **kwargs):
         if isinstance(args[0], type(u'')):
-            args = [OptionGroup(self, *args, **kwargs)] + list(args[1:])
-        return _OptionParser.add_option_group(self, *args, **kwargs)
+            args = [optparse.OptionGroup(self, *args, **kwargs)] + list(args[1:])
+        return optparse.OptionParser.add_option_group(self, *args, **kwargs)
 
 class DynamicConfig(dict):
     '''

From b498743bc16a32fc433538fa0cbf0d7bf56cd618 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 13:45:42 +0530
Subject: [PATCH 0919/1154] Make the group title for ebook-convert translatable

---
 src/calibre/ebooks/conversion/cli.py | 45 +++++++++++++---------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 5fbd0c6acf..3d079b9181 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -9,6 +9,7 @@ Command line interface to conversion sub-system
 
 import sys, os
 from optparse import OptionGroup, Option
+from collections import OrderedDict
 
 from calibre.utils.config import OptionParser
 from calibre.utils.logging import Log
@@ -126,14 +127,14 @@ def add_input_output_options(parser, plumber):
         parser.add_option_group(oo)
 
 def add_pipeline_options(parser, plumber):
-    groups = {
-              '' : ('',
+    groups = OrderedDict((
+              ('' , ('',
                     [
                      'input_profile',
                      'output_profile',
                      ]
-                    ),
-              'LOOK AND FEEL' : (
+                    )),
+              (_('LOOK AND FEEL') , (
                   _('Options to control the look and feel of the output'),
                   [
                       'base_font_size', 'disable_font_rescaling',
@@ -150,17 +151,17 @@ def add_pipeline_options(parser, plumber):
                       'remove_paragraph_spacing_indent_size',
                       'asciiize', 'keep_ligatures',
                   ]
-                  ),
+                  )),
 
-              'HEURISTIC PROCESSING' : (
+              (_('HEURISTIC PROCESSING') , (
                   _('Modify the document text and structure using common'
                      ' patterns. Disabled by default. Use %(en)s to enable. '
                      ' Individual actions can be disabled with the %(dis)s options.')
                   % dict(en='--enable-heuristics', dis='--disable-*'),
                   ['enable_heuristics'] + HEURISTIC_OPTIONS
-                  ),
+                  )),
 
-              'SEARCH AND REPLACE' : (
+              (_('SEARCH AND REPLACE') , (
                  _('Modify the document text and structure using user defined patterns.'),
                  [
                      'sr1_search', 'sr1_replace',
@@ -168,9 +169,9 @@ def add_pipeline_options(parser, plumber):
                      'sr3_search', 'sr3_replace',
                      'search_replace',
                  ]
-              ),
+              )),
 
-              'STRUCTURE DETECTION' : (
+              (_('STRUCTURE DETECTION') , (
                   _('Control auto-detection of document structure.'),
                   [
                       'chapter', 'chapter_mark',
@@ -178,9 +179,9 @@ def add_pipeline_options(parser, plumber):
                       'insert_metadata', 'page_breaks_before',
                       'remove_fake_margins', 'start_reading_at',
                   ]
-                  ),
+                  )),
 
-              'TABLE OF CONTENTS' : (
+              (_('TABLE OF CONTENTS') , (
                   _('Control the automatic generation of a Table of Contents. By '
                   'default, if the source file has a Table of Contents, it will '
                   'be used in preference to the automatically generated one.'),
@@ -189,26 +190,20 @@ def add_pipeline_options(parser, plumber):
                     'toc_threshold', 'max_toc_links', 'no_chapters_in_toc',
                     'use_auto_toc', 'toc_filter', 'duplicate_links_in_toc',
                   ]
-                  ),
+                  )),
 
-              'METADATA' : (_('Options to set metadata in the output'),
+              (_('METADATA') , (_('Options to set metadata in the output'),
                             plumber.metadata_option_names + ['read_metadata_from_opf'],
-                            ),
-              'DEBUG': (_('Options to help with debugging the conversion'),
+                            )),
+              (_('DEBUG'), (_('Options to help with debugging the conversion'),
                         [
                          'verbose',
                          'debug_pipeline',
-                         ]),
+                         ])),
 
+              ))
 
-              }
-
-    group_order = ['', 'LOOK AND FEEL', 'HEURISTIC PROCESSING',
-            'SEARCH AND REPLACE', 'STRUCTURE DETECTION',
-            'TABLE OF CONTENTS', 'METADATA', 'DEBUG']
-
-    for group in group_order:
-        desc, options = groups[group]
+    for group, (desc, options) in groups.iteritems():
         if group:
             group = OptionGroup(parser, group, desc)
             parser.add_option_group(group)

From f55b13aeb08e07614961ef25c4f8386f74f46c7f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 13:48:46 +0530
Subject: [PATCH 0920/1154] Fix translatable string in kobo driver

---
 src/calibre/devices/kobo/driver.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 11981cbcd6..2c1c063817 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -2834,10 +2834,10 @@ class KOBOTOUCH(KOBO):
                     ' selecting "Configure this device" and then the '
                     ' "Attempt to support newer firmware" option.'
                     ' Doing so may require you to perform a factory reset of'
-                    ' your Kobo.'
+                    ' your Kobo.') + (
                     '\nDevice database version: %s.'
-                    '\nDevice firmware version: %s' % (self.dbversion, self.fwversion)
-                     ),
+                    '\nDevice firmware version: %s'
+                     ) % (self.dbversion, self.fwversion),
                      UserFeedback.WARN)
 
                 return False

From 441dca72de84f7951ecb1621146590cbbcd2937e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Oct 2013 15:37:24 +0530
Subject: [PATCH 0921/1154] E-book viewer: Make all keyboard shortcuts
 configurable

Fixes #1232019 [[Enhancement] Allow shortcut for Font Increase/Decrease in Viewer](https://bugs.launchpad.net/calibre/+bug/1232019)
---
 src/calibre/gui2/viewer/documentview.py |  9 +--
 src/calibre/gui2/viewer/keys.py         | 34 ++++++++++++
 src/calibre/gui2/viewer/main.py         | 73 ++++++++++++++-----------
 src/calibre/gui2/viewer/main.ui         |  6 --
 4 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py
index 17ad36f908..71f72768e1 100644
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@@ -498,12 +498,10 @@ class DocumentView(QWebView):  # {{{
                 d.OpenImageInNewWindow, d.OpenLink, d.Reload, d.InspectElement]))
 
         self.search_online_action = QAction(QIcon(I('search.png')), '', self)
-        self.search_online_action.setShortcut(Qt.CTRL+Qt.Key_E)
         self.search_online_action.triggered.connect(self.search_online)
         self.addAction(self.search_online_action)
         self.dictionary_action = QAction(QIcon(I('dictionary.png')),
                 _('&Lookup in dictionary'), self)
-        self.dictionary_action.setShortcut(Qt.CTRL+Qt.Key_L)
         self.dictionary_action.triggered.connect(self.lookup)
         self.addAction(self.dictionary_action)
         self.image_popup = ImagePopup(self)
@@ -514,7 +512,6 @@ class DocumentView(QWebView):  # {{{
         self.view_table_action.triggered.connect(self.popup_table)
         self.search_action = QAction(QIcon(I('dictionary.png')),
                 _('&Search for next occurrence'), self)
-        self.search_action.setShortcut(Qt.CTRL+Qt.Key_S)
         self.search_action.triggered.connect(self.search_next)
         self.addAction(self.search_action)
 
@@ -652,9 +649,9 @@ class DocumentView(QWebView):  # {{{
         text = self._selectedText()
         if text and img.isNull():
             self.search_online_action.setText(text)
-            menu.addAction(self.search_online_action)
-            menu.addAction(self.dictionary_action)
-            menu.addAction(self.search_action)
+            for x, sc in (('search_online', 'Search online'), ('dictionary', 'Lookup word'), ('search', 'Next occurrence')):
+                ac = getattr(self, '%s_action' % x)
+                menu.addAction(ac.icon(), '%s [%s]' % (unicode(ac.text()), ','.join(self.shortcuts.get_shortcuts(sc))), ac.trigger)
 
         if not text and img.isNull():
             menu.addSeparator()
diff --git a/src/calibre/gui2/viewer/keys.py b/src/calibre/gui2/viewer/keys.py
index b3489facb4..0d3b8d8ac0 100644
--- a/src/calibre/gui2/viewer/keys.py
+++ b/src/calibre/gui2/viewer/keys.py
@@ -6,6 +6,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+from calibre.constants import isosx
 
 SHORTCUTS = {
         'Next Page' : (['PgDown', 'Space'],
@@ -50,4 +51,37 @@ SHORTCUTS = {
         'Forward': (['Alt+Right'],
             _('Forward')),
 
+        'Quit': (['Ctrl+Q', 'Ctrl+W', 'Alt+F4'],
+            _('Quit')),
+
+        'Focus Search': (['/', 'Ctrl+F'],
+            _('Start search')),
+
+        'Show metadata': (['Ctrl+I'],
+            _('Show metadata')),
+
+        'Font larger': (['Ctrl+='],
+            _('Font size larger')),
+
+        'Font smaller': (['Ctrl+-'],
+            _('Font size smaller')),
+
+        'Fullscreen': ((['Ctrl+Meta+F'] if isosx else ['Ctrl+Shift+F', 'F11']),
+            _('Fullscreen')),
+
+        'Find next': (['F3'],
+            _('Find next')),
+
+        'Find previous': (['Shift+F3'],
+            _('Find previous')),
+
+        'Search online': (['Ctrl+E'],
+            _('Search online for word')),
+
+        'Lookup word': (['Ctrl+L'],
+            _('Lookup word in dictionary')),
+
+        'Next occurrence': (['Ctrl+S'],
+            _('Go to next occurrence of selected word')),
+
 }
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index e9ffb19828..ccb504b374 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -8,7 +8,7 @@ from threading import Thread
 from PyQt4.Qt import (QApplication, Qt, QIcon, QTimer, QByteArray, QSize,
         QTime, QDoubleSpinBox, QLabel, QTextBrowser, QPropertyAnimation,
         QPainter, QBrush, QColor, pyqtSignal, QUrl, QRegExpValidator, QRegExp,
-        QLineEdit, QToolButton, QMenu, QInputDialog, QAction, QKeySequence,
+        QLineEdit, QToolButton, QMenu, QInputDialog, QAction,
         QModelIndex)
 
 from calibre.gui2.viewer.main_ui import Ui_EbookViewer
@@ -234,18 +234,9 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.view_resized_timer.timeout.connect(self.viewport_resize_finished)
         self.view_resized_timer.setSingleShot(True)
         self.resize_in_progress = False
-        qs = [Qt.CTRL+Qt.Key_Q,Qt.CTRL+Qt.Key_W]
-        self.action_quit.setShortcuts(qs)
         self.action_quit.triggered.connect(self.quit)
-        self.action_focus_search = QAction(self)
-        self.addAction(self.action_focus_search)
-        self.action_focus_search.setShortcuts([Qt.Key_Slash,
-            QKeySequence(QKeySequence.Find)])
-        self.action_focus_search.triggered.connect(lambda x:
-                self.search.setFocus(Qt.OtherFocusReason))
         self.action_copy.setDisabled(True)
         self.action_metadata.setCheckable(True)
-        self.action_metadata.setShortcut(Qt.CTRL+Qt.Key_I)
         self.action_table_of_contents.setCheckable(True)
         self.toc.setMinimumWidth(80)
         self.action_reference_mode.setCheckable(True)
@@ -255,18 +246,14 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.action_copy.triggered[bool].connect(self.copy)
         self.action_font_size_larger.triggered.connect(self.font_size_larger)
         self.action_font_size_smaller.triggered.connect(self.font_size_smaller)
-        self.action_font_size_larger.setShortcut(Qt.CTRL+Qt.Key_Equal)
-        self.action_font_size_smaller.setShortcut(Qt.CTRL+Qt.Key_Minus)
         self.action_open_ebook.triggered[bool].connect(self.open_ebook)
         self.action_next_page.triggered.connect(self.view.next_page)
         self.action_previous_page.triggered.connect(self.view.previous_page)
         self.action_find_next.triggered.connect(self.find_next)
         self.action_find_previous.triggered.connect(self.find_previous)
         self.action_full_screen.triggered[bool].connect(self.toggle_fullscreen)
-        self.action_full_screen.setShortcuts([Qt.Key_F11, Qt.CTRL+Qt.SHIFT+Qt.Key_F])
-        self.action_full_screen.setToolTip(_('Toggle full screen (%s)') %
-                _(' or ').join([unicode(x.toString(x.NativeText)) for x in
-                    self.action_full_screen.shortcuts()]))
+        self.action_full_screen.setToolTip(_('Toggle full screen [%s]') %
+                _(' or ').join([x for x in self.view.shortcuts.get_shortcuts('Fullscreen')]))
         self.action_back.triggered[bool].connect(self.back)
         self.action_forward.triggered[bool].connect(self.forward)
         self.action_preferences.triggered.connect(self.do_config)
@@ -348,11 +335,6 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.pos_label.setFocusPolicy(Qt.NoFocus)
         self.clock_timer = QTimer(self)
         self.clock_timer.timeout.connect(self.update_clock)
-        self.esc_full_screen_action = a = QAction(self)
-        self.addAction(a)
-        a.setShortcut(Qt.Key_Escape)
-        a.setEnabled(False)
-        a.triggered.connect(self.action_full_screen.trigger)
 
         self.print_menu = QMenu()
         self.print_menu.addAction(QIcon(I('print-preview.png')), _('Print Preview'))
@@ -360,9 +342,6 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.tool_bar.widgetForAction(self.action_print).setPopupMode(QToolButton.MenuButtonPopup)
         self.action_print.triggered.connect(self.print_book)
         self.print_menu.actions()[0].triggered.connect(self.print_preview)
-        ca = self.view.copy_action
-        ca.setShortcut(QKeySequence.Copy)
-        self.addAction(ca)
         self.open_history_menu = QMenu()
         self.clear_recent_history_action = QAction(
                 _('Clear list of recently opened books'), self)
@@ -518,7 +497,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         p = Printing(self.iterator, self)
         p.start_preview()
 
-    def toggle_fullscreen(self, x):
+    def toggle_fullscreen(self):
         if self.isFullScreen():
             self.showNormal()
         else:
@@ -544,7 +523,6 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
 
     def show_full_screen_label(self):
         f = self.full_screen_label
-        self.esc_full_screen_action.setEnabled(True)
         height = 200
         width = int(0.7*self.view.width())
         f.resize(width, height)
@@ -609,7 +587,6 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.clock_timer.stop()
         self.vertical_scrollbar.setVisible(True)
         self.window_mode_changed = 'normal'
-        self.esc_full_screen_action.setEnabled(False)
         self.settings_changed()
         self.full_screen_label.setVisible(False)
         if hasattr(self, '_original_frame_margins'):
@@ -732,11 +709,11 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
 
     def magnification_changed(self, val):
         tt = '%(action)s [%(sc)s]\n'+_('Current magnification: %(mag).1f')
-        sc = unicode(self.action_font_size_larger.shortcut().toString())
+        sc = _(' or ').join(self.view.shortcuts.get_shortcuts('Font larger'))
         self.action_font_size_larger.setToolTip(
                 tt %dict(action=unicode(self.action_font_size_larger.text()),
                          mag=val, sc=sc))
-        sc = unicode(self.action_font_size_smaller.shortcut().toString())
+        sc = _(' or ').join(self.view.shortcuts.get_shortcuts('Font smaller'))
         self.action_font_size_smaller.setToolTip(
                 tt %dict(action=unicode(self.action_font_size_smaller.text()),
                          mag=val, sc=sc))
@@ -1121,10 +1098,40 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
             self.load_path(self.iterator.spine[self.current_index-1], pos=1.0)
 
     def keyPressEvent(self, event):
-        MainWindow.keyPressEvent(self, event)
-        if not event.isAccepted():
-            if not self.view.handle_key_press(event):
-                event.ignore()
+        if event.key() == Qt.Key_Escape:
+            if self.metadata.isVisible():
+                self.metadata.setVisible(False)
+                event.accept()
+                return
+            if self.isFullScreen():
+                self.toggle_fullscreen()
+                event.accept()
+                return
+        try:
+            key = self.view.shortcuts.get_match(event)
+        except AttributeError:
+            return MainWindow.keyPressEvent(self, event)
+        action = {
+            'Quit':self.action_quit,
+            'Show metadata':self.action_metadata,
+            'Copy':self.view.copy_action,
+            'Font larger': self.action_font_size_larger,
+            'Font smaller': self.action_font_size_smaller,
+            'Fullscreen': self.action_full_screen,
+            'Find next': self.action_find_next,
+            'Find previous': self.action_find_previous,
+            'Search online': self.view.search_online_action,
+            'Lookup word': self.view.dictionary_action,
+            'Next occurrence': self.view.search_action,
+        }.get(key, None)
+        if action is not None:
+            event.accept()
+            action.trigger()
+            return
+        if key == 'Focus Search':
+            self.search.setFocus(Qt.OtherFocusReason)
+        if not self.view.handle_key_press(event):
+            event.ignore()
 
     def __enter__(self):
         return self
diff --git a/src/calibre/gui2/viewer/main.ui b/src/calibre/gui2/viewer/main.ui
index d6eb7e2fd9..2b5bb0cd79 100644
--- a/src/calibre/gui2/viewer/main.ui
+++ b/src/calibre/gui2/viewer/main.ui
@@ -248,9 +248,6 @@
    <property name="toolTip">
     <string>Find next occurrence</string>
    </property>
-   <property name="shortcut">
-    <string>F3</string>
-   </property>
   </action>
   <action name="action_copy">
    <property name="icon">
@@ -317,9 +314,6 @@
    <property name="toolTip">
     <string>Find previous occurrence</string>
    </property>
-   <property name="shortcut">
-    <string>Shift+F3</string>
-   </property>
   </action>
   <action name="action_toggle_paged_mode">
    <property name="checkable">

From bb61a6c87d460a66fc78297df815928137884a38 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 5 Oct 2013 12:13:21 +0200
Subject: [PATCH 0922/1154] Send the first few NOOPs more quickly. Apparently
 one can get lost, leaving the user looking at a "wait" dialog for 10 seconds.

---
 src/calibre/devices/smart_device_app/driver.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 9492a68187..fc10dd323b 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -845,8 +845,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             self.is_connected = False
         if self.is_connected:
             self.noop_counter += 1
-            if only_presence and (
-                    self.noop_counter % self.SEND_NOOP_EVERY_NTH_PROBE) != 1:
+            if (only_presence and
+                    self.noop_counter > self.SEND_NOOP_EVERY_NTH_PROBE and
+                    (self.noop_counter % self.SEND_NOOP_EVERY_NTH_PROBE) != 1):
                 try:
                     ans = select.select((self.device_socket,), (), (), 0)
                     if len(ans[0]) == 0:

From 54e872676f2f8134f43730ccdb8ad306014c563a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Sat, 5 Oct 2013 23:47:54 +0200
Subject: [PATCH 0923/1154] plugin for amazon.ca Kindle Store

---
 src/calibre/customize/builtins.py             |  10 ++
 .../gui2/store/stores/amazon_ca_plugin.py     | 152 ++++++++++++++++++
 2 files changed, 162 insertions(+)
 create mode 100644 src/calibre/gui2/store/stores/amazon_ca_plugin.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 77f6393573..c7e66c9637 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1251,6 +1251,15 @@ class StoreSonyAUStore(StoreSonyStore):
     actual_plugin = 'calibre.gui2.store.stores.sony_au_plugin:SonyStore'
     headquarters = 'AU'
 
+class StoreAmazonCAKindleStore(StoreBase):
+    name = 'Amazon CA Kindle'
+    author = 'Tomasz Długosz'
+    description = u'Kindle books from Amazon.'
+    actual_plugin = 'calibre.gui2.store.stores.amazon_ca_plugin:AmazonCAKindleStore'
+
+    headquarters = 'CA'
+    formats = ['KINDLE']
+    # affiliate = True
 
 class StoreAmazonDEKindleStore(StoreBase):
     name = 'Amazon DE Kindle'
@@ -1705,6 +1714,7 @@ plugins += [
     StoreAllegroStore,
     StoreArchiveOrgStore,
     StoreAmazonKindleStore,
+    StoreAmazonCAKindleStore,
     StoreAmazonDEKindleStore,
     StoreAmazonESKindleStore,
     StoreAmazonFRKindleStore,
diff --git a/src/calibre/gui2/store/stores/amazon_ca_plugin.py b/src/calibre/gui2/store/stores/amazon_ca_plugin.py
new file mode 100644
index 0000000000..adac8461d3
--- /dev/null
+++ b/src/calibre/gui2/store/stores/amazon_ca_plugin.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+store_version = 1 # Needed for dynamic plugin loading
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+import random
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.search_result import SearchResult
+
+class AmazonCAKindleStore(StorePlugin):
+    '''
+    For comments on the implementation, please see amazon_plugin.py
+    '''
+
+    search_url = 'http://www.amazon.ca/s/url=search-alias%3Ddigital-text&field-keywords='
+    details_url = 'http://amazon.ca/dp/'
+    drm_search_text = u'Simultaneous Device Usage'
+    drm_free_text = u'Unlimited'
+
+    def open(self, parent=None, detail_item=None, external=False):
+        #aff_id = {'tag': ''}
+        # Use Kovid's affiliate id 30% of the time.
+        #if random.randint(1, 10) in (1, 2, 3):
+        #    aff_id['tag'] = 'calibrebs-20'
+        # store_link = 'http://www.amazon.ca/Kindle-eBooks/b/?ie=UTF&node=1286228011&ref_=%(tag)s&ref=%(tag)s&tag=%(tag)s&linkCode=ur2&camp=1789&creative=390957' % aff_id
+        store_link = 'http://www.amazon.ca/ebooks-kindle/b/ref=sa_menu_kbo?ie=UTF8&node=2980423011'
+        if detail_item:
+            # aff_id['asin'] = detail_item
+            # store_link = 'http://www.amazon.ca/dp/%(asin)s/?tag=%(tag)s' % aff_id
+            store_link = 'http://www.amazon.ca/dp/' + detail_item + '/'
+        open_url(QUrl(store_link))
+
+    def search(self, query, max_results=10, timeout=60):
+        url = self.search_url + query.encode('ascii', 'backslashreplace').replace('%', '%25').replace('\\x', '%').replace(' ', '+')
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+
+            if doc.xpath('//div[@id = "atfResults" and contains(@class, "grid")]'):
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "ilresults")]'):
+                data_xpath = '//li[(@class="ilo")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './div[@class = "ilf"]/a/img[contains(@class, "ilo")]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                # Results can be in a grid (table) or a column
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL") or contains(@class, "rsltGridList")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            elif doc.xpath('//div[@id = "atfResults" and contains(@class, "list")]'):
+                data_xpath = '//div[contains(@class, "prod")]'
+                format_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and not(contains(@class, "bld"))]/text()')
+                asin_xpath = '@name'
+                cover_xpath = './/img[@class="productImage"]/@src'
+                title_xpath = './/h3[@class="newaps"]/a//text()'
+                author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]//text()'
+                price_xpath = (
+                        './/ul[contains(@class, "rsltL")]'
+                        '//span[contains(@class, "lrg") and contains(@class, "bld")]/text()')
+            else:
+                return
+
+            for data in doc.xpath(data_xpath):
+                if counter <= 0:
+                    break
+
+                # Even though we are searching digital-text only Amazon will still
+                # put in results for non Kindle books (author pages). Se we need
+                # to explicitly check if the item is a Kindle book and ignore it
+                # if it isn't.
+                format = ''.join(data.xpath(format_xpath))
+                if 'kindle' not in format.lower():
+                    continue
+
+                # We must have an asin otherwise we can't easily reference the
+                # book later.
+                asin = data.xpath(asin_xpath)
+                if asin:
+                    asin = asin[0]
+                else:
+                    continue
+
+                cover_url = ''.join(data.xpath(cover_xpath))
+
+                title = ''.join(data.xpath(title_xpath))
+                author = ''.join(data.xpath(author_xpath))
+                try:
+                    author = author.split('by ', 1)[1].split(" (")[0]
+                except:
+                    pass
+
+                price = ''.join(data.xpath(price_xpath))
+
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = cover_url.strip()
+                s.title = title.strip()
+                s.author = author.strip()
+                s.price = price.strip()
+                s.detail_item = asin.strip()
+                s.formats = 'Kindle'
+
+                yield s
+
+    def get_details(self, search_result, timeout):
+        url = self.details_url
+
+        br = browser()
+        with closing(br.open(url + search_result.detail_item, timeout=timeout)) as nf:
+            idata = html.fromstring(nf.read())
+            if idata.xpath('boolean(//div[@class="content"]//li/b[contains(text(), "' +
+                           self.drm_search_text + '")])'):
+                if idata.xpath('boolean(//div[@class="content"]//li[contains(., "' +
+                               self.drm_free_text + '") and contains(b, "' +
+                               self.drm_search_text + '")])'):
+                    search_result.drm = SearchResult.DRM_UNLOCKED
+                else:
+                    search_result.drm = SearchResult.DRM_UNKNOWN
+            else:
+                search_result.drm = SearchResult.DRM_LOCKED
+        return True

From a117d4c0b6cf1ef49bf9c509b50d2d38df97fa77 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 6 Oct 2013 08:36:46 +0530
Subject: [PATCH 0924/1154] HTMLZ Output: Fix long title causing error on
 windows

HTMLZ Output: Fix long titles causing error when converting on windows.
Fixes #1235815 [Long titles with possible invalid chars cause errors during convert](https://bugs.launchpad.net/calibre/+bug/1235815)
---
 src/calibre/ebooks/conversion/plugins/htmlz_output.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/conversion/plugins/htmlz_output.py b/src/calibre/ebooks/conversion/plugins/htmlz_output.py
index 3fee896bf0..8a28694672 100644
--- a/src/calibre/ebooks/conversion/plugins/htmlz_output.py
+++ b/src/calibre/ebooks/conversion/plugins/htmlz_output.py
@@ -67,7 +67,8 @@ class HTMLZOutput(OutputFormatPlugin):
 
             fname = u'index'
             if opts.htmlz_title_filename:
-                fname = ascii_filename(unicode(oeb_book.metadata.title[0]))
+                from calibre.utils.filenames import shorten_components_to
+                fname = shorten_components_to(100, (ascii_filename(unicode(oeb_book.metadata.title[0])),))[0]
             with open(os.path.join(tdir, fname+u'.html'), 'wb') as tf:
                 tf.write(html)
 

From 788d2ab6ea2d98a67f2a3508472a23975ebb0a0b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 6 Oct 2013 11:03:25 +0530
Subject: [PATCH 0925/1154] Fast hardlink based cloning of book containers

---
 src/calibre/ebooks/oeb/polish/container.py | 101 ++++++++++++++++++---
 src/calibre/utils/filenames.py             |  15 +++
 2 files changed, 104 insertions(+), 12 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 6fb8fcb4dd..1cadc86eed 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, logging, sys, hashlib, uuid, re
+import os, logging, sys, hashlib, uuid, re, shutil, copy
 from collections import defaultdict
 from io import BytesIO
 from urllib import unquote as urlunquote, quote as urlquote
@@ -30,6 +30,7 @@ from calibre.ebooks.oeb.base import (
 from calibre.ebooks.oeb.polish.errors import InvalidBook, DRMError
 from calibre.ebooks.oeb.parse_utils import NotHTML, parse_html, RECOVER_PARSER
 from calibre.ptempfile import PersistentTemporaryDirectory, PersistentTemporaryFile
+from calibre.utils.filenames import nlinks_file, hardlink_file
 from calibre.utils.ipc.simple_worker import fork_job, WorkerError
 from calibre.utils.logging import default_log
 from calibre.utils.zipfile import ZipFile
@@ -47,6 +48,29 @@ class CSSPreProcessor(cssp):
     def __call__(self, data):
         return self.MS_PAT.sub(self.ms_sub, data)
 
+def clone_dir(src, dest):
+    ' Clone a directory using hard links for the files, dest must already exist '
+    for x in os.listdir(src):
+        dpath = os.path.join(dest, x)
+        spath = os.path.join(src, x)
+        if os.path.isdir(spath):
+            os.mkdir(dpath)
+            clone_dir(spath, dpath)
+        else:
+            try:
+                hardlink_file(spath, dpath)
+            except:
+                shutil.copy2(spath, dpath)
+
+def clone_container(container, dest_dir):
+    ' Efficiently clone a container using hard links '
+    dest_dir = os.path.abspath(os.path.realpath(dest_dir))
+    clone_data = container.clone_data(dest_dir)
+    cls = type(container)
+    if cls is Container:
+        return cls(None, None, container.log, clone_data=clone_data)
+    return cls(None, container.log, clone_data=clone_data)
+
 class Container(object):
 
     '''
@@ -67,8 +91,8 @@ class Container(object):
 
     book_type = 'oeb'
 
-    def __init__(self, rootpath, opfpath, log):
-        self.root = os.path.abspath(rootpath)
+    def __init__(self, rootpath, opfpath, log, clone_data=None):
+        self.root = clone_data['root'] if clone_data is not None else os.path.abspath(rootpath)
         self.log = log
         self.html_preprocessor = HTMLPreProcessor()
         self.css_preprocessor = CSSPreProcessor()
@@ -79,6 +103,12 @@ class Container(object):
         self.dirtied = set()
         self.encoding_map = {}
         self.pretty_print = set()
+        self.cloned = False
+
+        if clone_data is not None:
+            self.cloned = True
+            self.name_path_map = clone_data['name_path_map']
+            return
 
         # Map of relative paths with '/' separators from root of unzipped ePub
         # to absolute paths on filesystem with os-specific separators
@@ -436,7 +466,11 @@ class Container(object):
         self.dirtied.discard(name)
         if not keep_parsed:
             self.parsed_cache.pop(name)
-        with open(self.name_path_map[name], 'wb') as f:
+        dest = self.name_path_map[name]
+        if self.cloned and nlinks_file(dest) > 1:
+            # Decouple this file from its links
+            os.unlink(dest)
+        with open(dest, 'wb') as f:
             f.write(data)
 
     def open(self, name, mode='rb'):
@@ -451,11 +485,29 @@ class Container(object):
         base = os.path.dirname(path)
         if not os.path.exists(base):
             os.makedirs(base)
+        else:
+            if self.cloned and mode not in {'r', 'rb'} and os.path.exists(path) and nlinks_file(path) > 1:
+                # Decouple this file from its links
+                temp = path + 'xxx'
+                shutil.copyfile(path, temp)
+                os.unlink(path)
+                os.rename(temp, path)
         return open(path, mode)
 
-    def commit(self, outpath=None):
+    def commit(self, outpath=None, keep_parsed=False):
         for name in tuple(self.dirtied):
-            self.commit_item(name)
+            self.commit_item(name, keep_parsed=keep_parsed)
+
+    def clone_data(self, dest_dir):
+        self.commit(keep_parsed=True)
+        self.cloned = True
+        clone_dir(self.root, dest_dir)
+        return {
+            'root': dest_dir,
+            'name_path_map': {
+                name:os.path.join(dest_dir, os.path.relpath(path, self.root))
+                for name, path in self.name_path_map.iteritems()}
+        }
 
     def compare_to(self, other):
         if set(self.name_path_map) != set(other.name_path_map):
@@ -487,7 +539,13 @@ class EpubContainer(Container):
             'rights.xml': False,
     }
 
-    def __init__(self, pathtoepub, log):
+    def __init__(self, pathtoepub, log, clone_data=None):
+        if clone_data is not None:
+            super(EpubContainer, self).__init__(None, None, log, clone_data=clone_data)
+            for x in ('pathtoepub', 'container', 'obfuscated_fonts'):
+                setattr(self, x, clone_data[x])
+            return
+
         self.pathtoepub = pathtoepub
         tdir = self.root = os.path.abspath(os.path.realpath(PersistentTemporaryDirectory('_epub_container')))
         with open(self.pathtoepub, 'rb') as stream:
@@ -527,6 +585,13 @@ class EpubContainer(Container):
         if 'META-INF/encryption.xml' in self.name_path_map:
             self.process_encryption()
 
+    def clone_data(self, dest_dir):
+        ans = super(EpubContainer, self).clone_data(dest_dir)
+        ans['pathtoepub'] = self.pathtoepub
+        ans['obfuscated_fonts'] = self.obfuscated_fonts.copy()
+        ans['container'] = copy.deepcopy(self.container)
+        return ans
+
     def process_encryption(self):
         fonts = {}
         enc = self.parsed('META-INF/encryption.xml')
@@ -578,8 +643,8 @@ class EpubContainer(Container):
             decrypt_font(tkey, path, alg)
             self.obfuscated_fonts[font] = (alg, tkey)
 
-    def commit(self, outpath=None):
-        super(EpubContainer, self).commit()
+    def commit(self, outpath=None, keep_parsed=False):
+        super(EpubContainer, self).commit(keep_parsed=keep_parsed)
         for name in self.obfuscated_fonts:
             if name not in self.name_path_map:
                 continue
@@ -620,7 +685,13 @@ class AZW3Container(Container):
 
     book_type = 'azw3'
 
-    def __init__(self, pathtoazw3, log):
+    def __init__(self, pathtoazw3, log, clone_data=None):
+        if clone_data is not None:
+            super(AZW3Container, self).__init__(None, None, log, clone_data=clone_data)
+            for x in ('pathtoazw3', 'obfuscated_fonts'):
+                setattr(self, x, clone_data[x])
+            return
+
         self.pathtoazw3 = pathtoazw3
         tdir = self.root = os.path.abspath(os.path.realpath(PersistentTemporaryDirectory('_azw3_container')))
         with open(pathtoazw3, 'rb') as stream:
@@ -659,8 +730,14 @@ class AZW3Container(Container):
         super(AZW3Container, self).__init__(tdir, opf_path, log)
         self.obfuscated_fonts = {x.replace(os.sep, '/') for x in obfuscated_fonts}
 
-    def commit(self, outpath=None):
-        super(AZW3Container, self).commit()
+    def clone_data(self, dest_dir):
+        ans = super(AZW3Container, self).clone_data(dest_dir)
+        ans['pathtoazw3'] = self.pathtoazw3
+        ans['obfuscated_fonts'] = self.obfuscated_fonts.copy()
+        return ans
+
+    def commit(self, outpath=None, keep_parsed=False):
+        super(AZW3Container, self).commit(keep_parsed=keep_parsed)
         if outpath is None:
             outpath = self.pathtoazw3
         from calibre.ebooks.conversion.plumber import Plumber, create_oebbook
diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index a701c44947..02040fe0cc 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -295,6 +295,15 @@ def windows_hardlink(src, dest):
         msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest)
         raise Exception(msg % ('hardlink size: %d not the same as source size' % sz))
 
+def windows_nlinks(path):
+    import win32file
+    dwFlagsAndAttributes = win32file.FILE_FLAG_BACKUP_SEMANTICS if os.path.isdir(path) else 0
+    handle = win32file.CreateFile(path, win32file.GENERIC_READ, win32file.FILE_SHARE_READ, None, win32file.OPEN_EXISTING, dwFlagsAndAttributes, None)
+    try:
+        return win32file.GetFileInformationByHandle(handle)[7]
+    finally:
+        handle.Close()
+
 class WindowsAtomicFolderMove(object):
 
     '''
@@ -400,6 +409,12 @@ def hardlink_file(src, dest):
         return
     os.link(src, dest)
 
+def nlinks_file(path):
+    ' Return number of hardlinks to the file '
+    if iswindows:
+        return windows_nlinks(path)
+    return os.stat(path).st_nlink
+
 def atomic_rename(oldpath, newpath):
     '''Replace the file newpath with the file oldpath. Can fail if the files
     are on different volumes. If succeeds, guaranteed to be atomic. newpath may

From e58244f87d232ac0860c24573be00f7afeb2f016 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 6 Oct 2013 13:03:06 +0530
Subject: [PATCH 0926/1154] Refactor for test run re-use

---
 src/calibre/db/tests/main.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 85b5cf473f..7a41161572 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -61,11 +61,7 @@ class TestResult(unittest.TextTestResult):
 def find_tests():
     return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')
 
-if __name__ == '__main__':
-    from calibre.utils.config_base import reset_tweaks_to_default
-    from calibre.ebooks.metadata.book.base import reset_field_metadata
-    reset_tweaks_to_default()
-    reset_field_metadata()
+def run_tests(find_tests=find_tests):
     parser = argparse.ArgumentParser()
     parser.add_argument('name', nargs='?', default=None,
                         help='The name of the test to run, for e.g. writing.WritingTest.many_many_basic or .many_many_basic for a shortcut')
@@ -95,3 +91,10 @@ if __name__ == '__main__':
     r.resultclass = TestResult
     r(verbosity=4).run(tests)
 
+if __name__ == '__main__':
+    from calibre.utils.config_base import reset_tweaks_to_default
+    from calibre.ebooks.metadata.book.base import reset_field_metadata
+    reset_tweaks_to_default()
+    reset_field_metadata()
+    run_tests()
+

From 439451a8edcc4565c98e749a454ba84c2fd122c5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 6 Oct 2013 13:39:35 +0530
Subject: [PATCH 0927/1154] Remove incorrect sRGB profile

---
 resources/images/marked.png | Bin 5851 -> 5902 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/images/marked.png b/resources/images/marked.png
index 724197bdf36007b3925e87e377a032944814bca1..010783d41ccd59e3b33b82bc9a613f1ad71a860a 100644
GIT binary patch
delta 5789
zcmV;O7Gmk!EsidbB}!*OO+f$vv5yP<VFdsH03c&XQcVB=dL{q>fP?@5`Tzg`fam}K
zbua(`>R<o>I+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)kuev477<BAK~#9!?OlCz
z6y>@9y*o3zJG1%VE0h2h<a0woOQ4`uB-DDLR4w%=)oMNGdd1fE%Jo(cwpV+F<7tuF
zDwcY=NR@lk*4m&A*y5$F1^aQlrPUU}U_ywj1Ont^v)SEwXLe`iy??wrWC=;gCYznv
zWPj&y*zDPzdH4B${pNX|_j$hvV+_Lx9sripjmRf>oNhq2&|dq?70vbgXF1)De8aF1
zK>XOA6&-)v@cr^xRUbIrmV86r3&1$OcSYp&FV}PwU-i1vZOKREwE&E!H&;aW+*;Eb
z(S4oD{A#D$laI(-0T{>kuAslVxu!Fw`A#Lu8>&{V`G?bgZOTXFr2vfMdsk?CZ>`aF
z-PaUm2nQAvp8f$M?*w3zZzgqLYmA{e!k~|u{|l$vm9HTAR0lAQ?_ELv_tqMix-Y6R
z)SYJdFkaSh*MFUu>2%xj6?x+UZ1Rbv`!oY+ivw+OhUD1Fg8Lr?@<IUV<R=UurZKd~
z8KN2>j$c?D5Wpbd`Vi2ae41ovj|0bB8JhKR4fkwoD!BhalR*L$f1&R`Sh!XI7m%L>
zbb}#b0C63NCjfE6qJjVh30H=Ip2$y_ocyQ;oCq^C>*J1nbz9R6r`wwE5S?y7cXW^W
zx&b5%29p7X1!zXf{f{lU|7^fj0_aY@mSoTjz)Fqqn--wzJP(k{7Zr*>S%7OoKzH)h
z1VcOl7$)E$fXBm$fB&ex;Qq4-S9pN#<i~a1$B*g^i~)+5Kmw378MFigD=WDFY{78>
z^hACK1=?Z^F&$96fGlwjU@;(R0lxA=@h4kwGz9cU{+UjOvz@$M6Gst@FCma6Aglt%
zV&jk9^21QU{bvb|)d6}UKdb_$BMc|Q3=s-Q0#G7z^8FHlf8qs3Pp>LG{aJ(~0_c<c
z4u%M2kOZKtn4nbVLJ&Mazzd9uA6Ru@_m<B)ZMflroQHtE$UhZf=%fr@fuMX8!Hn@-
z007_>2>>8M8R9y?$`<|JSNXt$bFRGc?@k*rpOI4m^oM*&AQ)c^OddlpzL>x(0!b4P
z2p|dshRKk$e}IGmBu&D|lp9|3&%gKK8JATxIc>~*M9u_|3HcLB3C08n0zUp-HNlHO
z9s-C0AbJ2o_<IQhNWw?O;2lp1^X_|m_UzeFr;VCV$cX?lC4aO+;FCDfCIey`5Y-qA
z3-F3Sz)Rql_-lX{ixMVaN@LE7bMIY$CUEuks;Vl(e`(|91BP4xnUX(BA@GU3-%r5%
z{%Qi~P<iaP7$?5S2Ne0Z5JZ9BD`|3%U=~d~;+=p0x?t6sUpZ}Hw_`{JFj(>dfPoWB
z6Wj}^3I4Z-@B&dFB?Q}JSgcD3R@uUR()@=WthnO(cbzu0TQOt;$Oic~EXL!#Erhtv
zpeDKNe-{Nnk$@sUuM_wro-mrMD^X-qSH2XeT>J3!x!0U<+Td=(kO&}~<lA5XSZYW(
zX#nvA<0FGfE)Gcm6dzFRBT#&RSGXWi)I789c*<Y-mB(kySlsEf;oX9)3t%Y7w_&%`
zvbYcuDIvslK52x36K{tF*?VE4Xo#a*q<QzQe?Jpg@@yed%(4K6lKgboEjBGqte(1;
zn&7Vqcqj;@JVGyt;s@d<?|*2{vNgM%Cc#N$O#rzfKOJ^huoFKm3B+_B8j>b2ANQ3g
zCQZN^w{X8y`M`t0#jD<NnhYn96#+OwemZO+*omT=$`903ejs>wq8RY;;!;nEBBreT
ze`#Ruzdt-}!KXiRnv`5(&;safNY@_N8EW#=G1x@WfKT(xynVB8!JQkON)(%#n&ioo
zC(~TrZ%_j0YdrsCxQqO<5@13Jukd+?h<qEpC5o!fLxi0u+Cu0lQ8cB|EuMK_+t8w1
zvu%hHMQ`l%-)9)D^+B_vu0m_655~^ae+4N`h(*^veM2tCH3lqzp62jHD9{q+D|RC)
zPrSyL5KJfmiv65?LWYj~bfgO*Ie<hlX#j>YwN9+O|Did{zPf85ZRqGYK1yf}RhXSe
zgDg@Xw89NRtE0YxMUPJdvjoQYN~drf=pYjt$l@oKRekQJoDOOYNB}*}-i_+Ke_Y!d
z1v)i8o<FXLpsbk3T@T^z*>=;pLT`y8O>pnvA%N`dDlPYzD3&ewgST?s1G5+1__v;H
zs5Kw?cp}mmv?BFEv*T!xh3hJ;NJ9{`<zqmX=t)ZXJXhfl%;^Y2tNF18alv<%-E{li
zIUmu?SODD@ZD>g@0Gi;$(*!qae~C;`A_G3LE6y4gC&M;GE<Ayaz7j>dq9{vT1l<!w
z!vsu=FyFKrUk*&a?sY*6%|fIx$RbCBtfOHzOsb@NHv9M4rnT?Q^Aqlc+F}f+IvCom
z@eNq8ZrR;;-{;71c18l|ZMl|lZhW5qNJ-?zlu|C$v;fWEp9gr%l>{!7e_W%lMA2fr
zU9$K5{J?IfhX9g5Ab5Ds0yy8RSr%Y128(r(Z;Qc7-IFGO))+%`2SdA6*5JKt?XtV?
zTj$tZhJFj6H}cKY54ZpKczBZKm&iFIB@Bj64G72i=ZjNMnJDDe3)tvyq9}X$lytAi
z2^T%Q%>v<{vAvp+DlQooe>*pC!6y><y<I&G!{j2fpZu^@*5JF`S@MB?P7Cj8xt4A)
z7$!Hsxq7?F)h~Jo6fZ-OpBqB(5C|SlzN!O^@!o;G;3L-}u<z&b0Nxa_lE5dQ@|DN@
zH);l-g61KdL=Wlm2I+Z4(&V;a;2xt?=Asc(p2D=auv$|Ia=SUMf5HDr=g9~9A%LE;
zeVXKi^X1z7@3_ui8x|myUUF#6q^jys+M(qo>cLMdsd(xW?au*mi9r+yybi8UK2Hd#
z*+yQGyZ%^82sFW<8~h2jSeN$zy5c$mC%VW7j8^zmwi20N%P><hKb}thzqx{Z;35LB
zH)MjT`>4Uk<6~N?f83hrD!Zx)z?3H*LRsZ6q)Cgb@3?ne9RM8o?Tc@yf4b*@=m8N0
zK9fh)`I0YH=XrwYamEXz!_Ls{r(E=K&m~I?s!kA3@I<$#*iHaQB0;I2&te`E;5`XX
zD)ChlKzp3W{IFH#nkWC<Z|^M!NZ*YsrZcp~_z#It?j~sxe=z-%-eY6uS4)%TSKoE-
zBXvDp=O54C^pf|~8@DT7{uH&x8QS99kfQ^@sFb^OA|dPz3|)CmdVKFL00JI56dzFP
z=l^@slD@bOG=(jE*uv0axFhCwM~?z9n%-PNe|2+>rt3aCZnZ{vU*9I(Q@-#QYrgUA
z`itG5_MJa}f82QE^L2`#`$d62`7Nny$r3QOh$n=C!(N~#*g`nhjkApgE&#y;_(h)Z
zdd03TE-&x^O<{&(XDzfC&S(3*;Q|2|$M>#?{QB0KXk7C(g}LkM6eb@`j-FpFOjuCe
zAJV(y{a3!RksN*gTZ)&v#c-T=g-i<=r2wM?sqq1~e<>h^?vDro4-;Oot8kR=8Po)D
zGR$zS#lqR7d&vj72_SxK&x(%SU#@A5=)Pt)^<X%#pgK9avii<7-^`fwbTl;lr9|EN
z#Ri#$%e(?NP)m%Vlk&uHY!N|`gWbZ63`SB3t;9tu<T3d`ngGro+_gM*;PDNerC085
zQ5IHTe|P<tk7n~mM}Ga-*R6NI_l)A@PgF$Zp&(%bB{DEJ!0YjD^#Z`~BOgfX1sFvW
zYp1Pw`--8u(V4)KXU8a0*CzGjvwdQ!$l?Q%D(@E3)L@L{QZFzZ$p>=0G^}>t_8YA~
zuHB{hILV!qhXR@aO8h(&_$BANg%=oUn350Ve|UB9oMmfvv$BQz69zY&?8Ui}LYm~|
zSi@x}{tRdG0SA_cOO+2im^2A9Q_H;UK^G&n0aU{1>Uuei;Z8o_fB=GvSG|KND}S0u
z&9m`Kyo4%vy1alrs^}y}0{MVL8$>7z*8WElKFuD7FY*y6QfeJwY9OY2-948WDdYnV
ze+gjv+-pvFX5H~r!sLJZQZsf%4<9v)>&|(BkwiY=;2uH#%C9_bh@)GQCa<Ige7sx8
zz>Tb>X7c7z10#)mz(E1bn6bE1n)mfb6DfD^lXybt6?h1U<=6|1MDhWLcMCrgxO%%;
zH0=X>xwqouo`4`#97?3-5e{)XMk@J$f5QT(s;V-)mw$7e?FGC-*QO6iGnESrakp?J
zlMlGyynx_m{^fP6Y~en;IAnVP58*R*hq5>{(#Z#0AOHZ6=09|<I3%Tc0mB@+;!q~!
zhy8Oy!P|C3XUtnP?3R<eLI4$4T>mbcy7Hy&#UW7`n&MC<<hP1*LZh!-=hZZAe?DW$
zS8Ho)y-wRJn{b5y03cAg_TeOaw0m*LJ|iGo#i2~dKjWDd^31)*OEs-rRVgUdt~zt(
z)Q_FERW{)o0ZgBJ%?UAhesQQMwVp6r#i2~dZ)Vd&u}f}~DAmd-rJ$68i-4~A{qKKw
zuhaI*7F;6$01)Qg_qZXBIcsn3f1r5zh+#I0Lz$3&!nibaqWE)CJg!c($xj!7rfE;V
z`R1EToVHgs;3@&ko;^D%&gI1+mc`;wCggvV_;~2Bd6lTDbRs8Q#f2hJC0$o{{^1Y5
zxx{Ik4Hm8v007Ln{^9Lr(X=D>{=n(QA-)EIWmFu>g#1Q2DfGv-Pl%MNf0Mcq-h&9}
z_*hK;<=bz+Ejw+q!N7F_0APCO-@h(l@Ok-mamaVBIMn}cVJ74^#L7c^8YhdYs!mG9
zdh|mC3)<UTwmWUG!9ZBQe!bIexB%m(E~r0U``c>}KY6LWxYFJv(lGhzW3Nd1TuYD%
z`E`-;p`X83Dp-t7?tYC6f3Ms9O>$W%bSyS==Ipnfw%b79N&x^sl#D&3*S~s?-~r(q
zHW0*hzC_DI2xKoGKKArTQvb<65*{1c`W6JsvL=&Wu65yi=fBAqxi%E~@c(AcoOR4;
zyJZU33Si8{*{54RdT$y!>MoZA?((BL5Yqt=0!8Y1zoAUayX$v$e?&~voSpvt?&yaI
zJdEM`Q0VB+nKOf7r)`%B+?WHLga7hxK5TjX6aa+Oh7x?O9)n@A3s>w6ptc`Z)f*|L
z?{w?yU(ogIM@}$09#8JtzrVW3X}e_tR|{aqWs95SxpzHjuh{jFu8pIuZtM?qV23f*
zlt?6&P)dI`coC?de`sxGFTh>1+WUm71pol@w54xK!uj!@Wr=+I`;0NF>-z1K(uXLe
z)*wB>7ptqQzvHys`U}Soj=UJ8XeelUdS5a|ki8*YUDv<w_xle4co{(HAey~?=gwCS
z-hA_y2DH6gF5!9sAbKo#?#ajbeSdqEZZ^mBHBEcN@AoePf3O?CYzzzpz>C$@)mPkd
z%PqA|o3JmqUI11{eMNfgx7Xm?>+`*0_9t^_npRH;Sq$K309FpL>BWqprlzK5(W+Ie
zI-Is+Z*YAMfN*^f;DsO~mHc@KAbI$t5uY?PGkF+ekw_$R1Euuwf#w97MrTH&k(W1Y
z*x*__yV?V^f3&m|G4<3XjCAeu5AaH0zz4_@8Pd%e7-JTIZ<m&q9t7|_fPvKgS4^8W
zbt8a>oVI6AaIG={z#HXHzr7usVKN9Fz8}vhrE6OjU})#?MIw=(Q%bL<l%5!1?_k}F
zFaFQ1PTR95xY`4dXnl~7t_>X-_*Aj7VtznWE+=qye{^)bTU=bc5WuSdt{%W8o_pbi
z7wYc3^G;VCb?a&mV0Ij<u+I)OExx(r*Z{%UB64o?#$3+cjYgwqPoF;h8C6xE9e^iL
zG)?{GjvYJ7oVIH^T<rm@a2@vmj1K^n_!-8R@Z>LjH?CYx-DZp>0erQ*y!;;ko(3Rg
z@bxJGf2#NI-~U;+99ZRQ4`7AsD*#TkR|Lic2ul2%d@Fq`HV5YIH#awLrIcQ$s<b6T
zPq4JU{)4BSwyg~}3qWL@AI<<c;XV;4^7DSbY1x}FGBi54XrsBg`7KS;KBcPkV1^?2
z*X`T?`!1&q47gYT(NphD2Qwr)(UVfAh8q?`e^g^Q(Qe_`S?5>moH}(Xr0e=ss!FRf
z5rL}Gtv~t6)*;)JtG{rq0L;h-6@;9B!idR$s0N(sU^w2&T(bk`$&)A5#>U3gs!AWB
zl(K$`z#ETiuRZ_#k0(0WcGn7kwI2%-bnVD(yZtkr3?H?*hx~LjHa31&Rp}QfrO|$h
zf1o@XO}@5e%NCzgZFX%hz=|BLuwN%Fp77cG7Q5xJg`UvZ*!cRCDO0WhunWM9etc!I
zEX!K~IFb{%*8_y>f&j1n(bO3`_I~?rCErFU6snCzV~Z$Nf74G-@XtT`(dPS{Xsc@l
zV0APE?G-_-_5n*SJ8YpZghHY4`|lrFe@Q8QvOgkFRrSfun>SbGx}B~R0Bx(Egk-cN
zX)u1$#<{~5@`HREj4|`@;rAcVH1$qOsdf<&h?=HWKl98Fr{uDYt`tC`tubg>K!oxt
zU%QKAet&T2Q0<G9YD+1lr!FFbaj}?Q^X#+FD!FQ#E0aK@t*$~h7*0p{xq9Bqf9}g$
z@@*VGeE7heIdc{gg4Y1_)&Kt_V{Oj^$jRuTD?NbTb|e^9fmUlmgS=o}-ji>mwzjr8
z9F9~`s_p386U4u?Y177U<)Tfl6o7iRz9Ni?4MOE3%Wik*M9rbX(W6K8zy9^FcWD~E
zpHgb}CW3f8{@qQRzW2GIZjUPke-Kx7iBvt|$XU9%!hr*Sds@@t%PFPpy@<dQkE=i1
zxN+mGp=?J^&kN`$JoN|PE}wPzl_#BUNG`Bw(V}TSpKq6<$a7^`hN8%j<@5d>5d`Uq
zM<0E(b13fbMh{?(6!HP!z<~pe;c)m$N@-0mo}j`slP_V2RvWp|1B^%ze?rKTC7)g|
z%gT3TSti{*fubmnZP@VGe`fu@1p&AVOP5}Kli#nrAj@)~n+TZSuiX6DV~@R-&HEJu
z;6f~2x^$l3@7pEI@}=EG5GyM3U-{^x-#whId$}<O81Z=Pt+x)DX5>?ps{6X-1V!<<
zwrj(N4P&x(uYv$vir@Y2e=lu`gz-<5YFpAppsI9QEEaub_3G6^HttgpfQzwj-#%mS
z-o0xn)$UeRnn>G+;ImVvT=M;F+@p{K<O!B9Uw)M=`(ITQc|uxF@RcW?_~A=~xo$xK
zd4y}Py>?P@aZ!z;$O}^f&;kMfl1-bQ{M$gUSr9;;VcD`}{?gKtf1fCdd^;C`zeyB*
z3pa1xd}bimD+nM@v1-+g4=ReXNtR`gEX#jNCe6=m+qNy4>2(T8V4k9;X7>-`ar${m
zX$PhBYDp5e4CFcm50K}$;f5P#78eJ0%d#Bw`~6>g=9#VAGWmW%0K)()SFS86EiL(}
zqR7h?#lLLJmaTv8fA4n-Az&C_&z?P<!C=J~DAj(Ts@l%AYu8Th?{^CxV3^^y+iv@k
zqWHgVSy;Yf#}4gcpD%cTVTPAqe)$zu)$SJr@<@L^U+@6K6suRSE-NlBp7Pvt&-Ga(
zDhOa0gAhX4MF=hkV1%QP1B`GK1Tex;5WomWK>#Bh1p$n37Ze0A!ch>w2uDExBOLz^
b`YI)PRhXX?k%=IYNJI$$NkvXXu0mjfD&Z-D

delta 5757
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


From a5a253e9aed8bdbfb2635003247a139428128001 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 6 Oct 2013 22:09:56 +0530
Subject: [PATCH 0928/1154] Add test framework for book container

Also add test for container cloning
---
 src/calibre/ebooks/oeb/polish/container.py    | 66 ++++++++++-------
 .../ebooks/oeb/polish/tests/__init__.py       | 10 +++
 src/calibre/ebooks/oeb/polish/tests/base.py   | 74 +++++++++++++++++++
 .../ebooks/oeb/polish/tests/container.py      | 59 +++++++++++++++
 .../ebooks/oeb/polish/tests/index.html        | 64 ++++++++++++++++
 src/calibre/ebooks/oeb/polish/tests/main.py   | 24 ++++++
 .../ebooks/oeb/polish/tests/simple.html       | 64 ++++++++++++++++
 7 files changed, 336 insertions(+), 25 deletions(-)
 create mode 100644 src/calibre/ebooks/oeb/polish/tests/__init__.py
 create mode 100644 src/calibre/ebooks/oeb/polish/tests/base.py
 create mode 100644 src/calibre/ebooks/oeb/polish/tests/container.py
 create mode 100644 src/calibre/ebooks/oeb/polish/tests/index.html
 create mode 100644 src/calibre/ebooks/oeb/polish/tests/main.py
 create mode 100644 src/calibre/ebooks/oeb/polish/tests/simple.html

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 1cadc86eed..b1cdcac955 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -71,7 +71,7 @@ def clone_container(container, dest_dir):
         return cls(None, None, container.log, clone_data=clone_data)
     return cls(None, container.log, clone_data=clone_data)
 
-class Container(object):
+class Container(object):  # {{{
 
     '''
     A container represents an Open EBook as a directory full of files and an
@@ -107,7 +107,9 @@ class Container(object):
 
         if clone_data is not None:
             self.cloned = True
-            self.name_path_map = clone_data['name_path_map']
+            for x in ('name_path_map', 'opf_name', 'mime_map', 'pretty_print', 'encoding_map'):
+                setattr(self, x, clone_data[x])
+            self.opf_dir = os.path.dirname(self.name_path_map[self.opf_name])
             return
 
         # Map of relative paths with '/' separators from root of unzipped ePub
@@ -135,6 +137,21 @@ class Container(object):
             if name in self.mime_map:
                 self.mime_map[name] = item.get('media-type')
 
+    def clone_data(self, dest_dir):
+        Container.commit(self, keep_parsed=True)
+        self.cloned = True
+        clone_dir(self.root, dest_dir)
+        return {
+            'root': dest_dir,
+            'opf_name': self.opf_name,
+            'mime_map': self.mime_map.copy(),
+            'pretty_print': set(self.pretty_print),
+            'encoding_map': self.encoding_map.copy(),
+            'name_path_map': {
+                name:os.path.join(dest_dir, os.path.relpath(path, self.root))
+                for name, path in self.name_path_map.iteritems()}
+        }
+
     def abspath_to_name(self, fullpath):
         return self.relpath(os.path.abspath(fullpath)).replace(os.sep, '/')
 
@@ -292,21 +309,26 @@ class Container(object):
             for item in self.opf_xpath('//opf:guide/opf:reference[@href and @type]')}
 
     @property
-    def spine_items(self):
+    def spine_names(self):
         manifest_id_map = self.manifest_id_map
 
-        linear, non_linear = [], []
+        non_linear = []
         for item in self.opf_xpath('//opf:spine/opf:itemref[@idref]'):
             idref = item.get('idref')
             name = manifest_id_map.get(idref, None)
             path = self.name_path_map.get(name, None)
             if path:
                 if item.get('linear', 'yes') == 'yes':
-                    yield path
+                    yield name
                 else:
-                    non_linear.append(path)
-        for path in non_linear:
-            yield path
+                    non_linear.append(name)
+        for name in non_linear:
+            yield name
+
+    @property
+    def spine_items(self):
+        for name in self.spine_names:
+            yield self.name_path_map[name]
 
     def remove_item(self, name):
         '''
@@ -498,17 +520,6 @@ class Container(object):
         for name in tuple(self.dirtied):
             self.commit_item(name, keep_parsed=keep_parsed)
 
-    def clone_data(self, dest_dir):
-        self.commit(keep_parsed=True)
-        self.cloned = True
-        clone_dir(self.root, dest_dir)
-        return {
-            'root': dest_dir,
-            'name_path_map': {
-                name:os.path.join(dest_dir, os.path.relpath(path, self.root))
-                for name, path in self.name_path_map.iteritems()}
-        }
-
     def compare_to(self, other):
         if set(self.name_path_map) != set(other.name_path_map):
             return 'Set of files is not the same'
@@ -519,6 +530,7 @@ class Container(object):
                 if f1.read() != f2.read():
                     mismatches.append('The file %s is not the same'%name)
         return '\n'.join(mismatches)
+# }}}
 
 # EPUB {{{
 class InvalidEpub(InvalidBook):
@@ -539,7 +551,7 @@ class EpubContainer(Container):
             'rights.xml': False,
     }
 
-    def __init__(self, pathtoepub, log, clone_data=None):
+    def __init__(self, pathtoepub, log, clone_data=None, tdir=None):
         if clone_data is not None:
             super(EpubContainer, self).__init__(None, None, log, clone_data=clone_data)
             for x in ('pathtoepub', 'container', 'obfuscated_fonts'):
@@ -547,7 +559,9 @@ class EpubContainer(Container):
             return
 
         self.pathtoepub = pathtoepub
-        tdir = self.root = os.path.abspath(os.path.realpath(PersistentTemporaryDirectory('_epub_container')))
+        if tdir is None:
+            tdir = os.path.abspath(os.path.realpath(PersistentTemporaryDirectory('_epub_container')))
+        self.root = tdir
         with open(self.pathtoepub, 'rb') as stream:
             try:
                 zf = ZipFile(stream)
@@ -685,7 +699,7 @@ class AZW3Container(Container):
 
     book_type = 'azw3'
 
-    def __init__(self, pathtoazw3, log, clone_data=None):
+    def __init__(self, pathtoazw3, log, clone_data=None, tdir=None):
         if clone_data is not None:
             super(AZW3Container, self).__init__(None, None, log, clone_data=clone_data)
             for x in ('pathtoazw3', 'obfuscated_fonts'):
@@ -693,7 +707,9 @@ class AZW3Container(Container):
             return
 
         self.pathtoazw3 = pathtoazw3
-        tdir = self.root = os.path.abspath(os.path.realpath(PersistentTemporaryDirectory('_azw3_container')))
+        if tdir is None:
+            tdir = os.path.abspath(os.path.realpath(PersistentTemporaryDirectory('_azw3_container')))
+        self.root = tdir
         with open(pathtoazw3, 'rb') as stream:
             raw = stream.read(3)
             if raw == b'TPZ':
@@ -752,11 +768,11 @@ class AZW3Container(Container):
         outp.convert(oeb, outpath, inp, plumber.opts, default_log)
 # }}}
 
-def get_container(path, log=None):
+def get_container(path, log=None, tdir=None):
     if log is None:
         log = default_log
     ebook = (AZW3Container if path.rpartition('.')[-1].lower() in {'azw3', 'mobi'}
-            else EpubContainer)(path, log)
+            else EpubContainer)(path, log, tdir=tdir)
     return ebook
 
 def test_roundtrip():
diff --git a/src/calibre/ebooks/oeb/polish/tests/__init__.py b/src/calibre/ebooks/oeb/polish/tests/__init__.py
new file mode 100644
index 0000000000..2dfbaa2fb8
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/tests/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/base.py b/src/calibre/ebooks/oeb/polish/tests/base.py
new file mode 100644
index 0000000000..7dc4601539
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/tests/base.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os, unittest, shutil
+
+from calibre.ptempfile import PersistentTemporaryDirectory
+from calibre.utils.logging import DevNull
+import calibre.ebooks.oeb.polish.container as pc
+
+def get_cache():
+    from calibre.constants import cache_dir
+    cache = os.path.join(cache_dir(), 'polish-test')
+    if not os.path.exists(cache):
+        os.mkdir(cache)
+    return cache
+
+def needs_recompile(obj, srcs):
+    if isinstance(srcs, type('')):
+        srcs = [srcs]
+    try:
+        obj_mtime = os.stat(obj).st_mtime
+    except OSError:
+        return True
+    for src in srcs:
+        if os.stat(src).st_mtime > obj_mtime:
+            return True
+    return False
+
+def build_book(src, dest, args=()):
+    from calibre.ebooks.conversion.cli import main
+    main(['ebook-convert', src, dest] + list(args))
+
+def get_simple_book(fmt='epub'):
+    cache = get_cache()
+    ans = os.path.join(cache, 'simple.'+fmt)
+    src = os.path.join(os.path.dirname(__file__), 'simple.html')
+    if needs_recompile(ans, src):
+        x = src.replace('simple.html', 'index.html')
+        raw = open(src, 'rb').read().decode('utf-8')
+        raw = raw.replace('LMONOI', P('fonts/liberation/LiberationMono-Italic.ttf'))
+        raw = raw.replace('LMONO', P('fonts/liberation/LiberationMono-Regular.ttf'))
+        raw = raw.replace('IMAGE1', I('marked.png'))
+        try:
+            with open(x, 'wb') as f:
+                f.write(raw.encode('utf-8'))
+            build_book(x, ans, args=['--level1-toc=//h:h2', '--language=en', '--authors=Kovid Goyal',
+                                        '--cover=' + I('lt.png')])
+        finally:
+            try:
+                os.remove('index.html')
+            except:
+                pass
+    return ans
+
+devnull = DevNull()
+
+class BaseTest(unittest.TestCase):
+
+    longMessage = True
+    maxDiff = None
+
+    def setUp(self):
+        pc.default_log = devnull
+        self.tdir = PersistentTemporaryDirectory(suffix='-polish-test')
+
+    def tearDown(self):
+        shutil.rmtree(self.tdir, ignore_errors=True)
+        del self.tdir
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py
new file mode 100644
index 0000000000..6dedaff365
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/tests/container.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os
+
+from calibre.ebooks.oeb.polish.tests.base import BaseTest, get_simple_book
+
+from calibre.ebooks.oeb.polish.container import get_container, clone_container
+from calibre.utils.filenames import nlinks_file
+
+class ContainerTests(BaseTest):
+
+    def test_clone(self):
+        ' Test cloning of containers '
+        for fmt in ('epub', 'azw3'):
+            base = os.path.join(self.tdir, fmt + '-')
+            book = get_simple_book(fmt)
+            tdir = base + 'first'
+            os.mkdir(tdir)
+            c1 = get_container(book, tdir=tdir)
+            tdir = base + 'second'
+            os.mkdir(tdir)
+            c2 = clone_container(c1, tdir)
+
+            for c in (c1, c2):
+                for name, path in c.name_path_map.iteritems():
+                    self.assertEqual(2, nlinks_file(path), 'The file %s is not linked' % name)
+
+            for name in c1.name_path_map:
+                self.assertIn(name, c2.name_path_map)
+                self.assertEqual(c1.open(name).read(), c2.open(name).read(), 'The file %s differs' % name)
+
+            spine_names = tuple(c1.spine_names)
+            text = spine_names[0]
+            root = c2.parsed(text)
+            root.xpath('//*[local-name()="body"]')[0].set('id', 'changed id for test')
+            c2.dirty(text)
+            c2.commit_item(text)
+            for c in (c1, c2):
+                self.assertEqual(1, nlinks_file(c.name_path_map[text]))
+            self.assertNotEqual(c1.open(text).read(), c2.open(text).read())
+
+            name = spine_names[1]
+            with c1.open(name, mode='r+b') as f:
+                f.seek(0, 2)
+                f.write(b'    ')
+            for c in (c1, c2):
+                self.assertEqual(1, nlinks_file(c.name_path_map[name]))
+            self.assertNotEqual(c1.open(name).read(), c2.open(name).read())
+
+            x = base + 'out.' + fmt
+            for c in (c1, c2):
+                c.commit(outpath=x)
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/index.html b/src/calibre/ebooks/oeb/polish/tests/index.html
new file mode 100644
index 0000000000..6d9ad92835
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/tests/index.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>A simple test page</title>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+        <style type="text/css">
+@font-face {
+    font-family: "Liberation Mono";
+    src: url(/home/kovid/work/calibre/resources/fonts/liberation/LiberationMono-Regular.ttf);
+}
+
+@font-face {
+    font-family: "Liberation Mono";
+    src: url(/home/kovid/work/calibre/resources/fonts/liberation/LiberationMono-Italic.ttf);
+    font-style: italic;
+}
+
+h1 {
+    color: DarkCyan;
+    text-align: center;
+}
+
+p { font-family: "Liberation Mono"; }
+        </style>
+	</head>
+	<body>
+    <h2>A simple test page</h2>
+<!--lorem-->
+<p>To pursue pleasure rationally encounter consequences that are extremely
+painful.</p>
+
+<p>Nor again is there anyone who loves or pursues or desires to obtain pain of
+itself, because it is pain, but because occasionally circumstances occur in
+which toil and pain can procure him some great pleasure. To take a trivial
+example, which of us ever undertakes laborious physical exercise, except to
+obtain some advantage from it? But who has any right to find fault with a man
+who chooses to enjoy a pleasure that has no <em>annoying</em> consequences, or one who
+avoids a pain that produces no resultant pleasure?</p>
+
+<div style="text-align:center"><img alt="test" src="/home/kovid/work/calibre/resources/images/marked.png"></div>
+
+<p>On the other hand.</p>
+
+<!--/lorem-->
+
+<h2>Another test page</h2>
+
+<!--lorem-->
+<p>The great explorer of the truth, the master-builder of human happiness. No
+one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but
+because those who do not know how to pursue pleasure rationally encounter
+consequences that are extremely painful.</p>
+
+<p>Nor again is there anyone who loves or pursues or desires to obtain pain of
+itself, because it is pain, but because occasionally circumstances occur in
+which toil and pain can procure him some great pleasure. To take a trivial
+example, which of us ever undertakes laborious physical exercise, except to
+obtain some advantage from it? But who has any right.</p>
+<!--/lorem-->
+
+
+	</body>
+</html>
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/main.py b/src/calibre/ebooks/oeb/polish/tests/main.py
new file mode 100644
index 0000000000..6c347b2419
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/tests/main.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+try:
+    import init_calibre  # noqa
+except ImportError:
+    pass
+
+import os, unittest
+
+def find_tests():
+    return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')
+
+if __name__ == '__main__':
+    from calibre.db.tests.main import run_tests
+    run_tests(find_tests=find_tests)
+
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/simple.html b/src/calibre/ebooks/oeb/polish/tests/simple.html
new file mode 100644
index 0000000000..ce23f8591c
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/tests/simple.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>A simple test page</title>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+        <style type="text/css">
+@font-face {
+    font-family: "Liberation Mono";
+    src: url(LMONO);
+}
+
+@font-face {
+    font-family: "Liberation Mono";
+    src: url(LMONOI);
+    font-style: italic;
+}
+
+h1 {
+    color: DarkCyan;
+    text-align: center;
+}
+
+p { font-family: "Liberation Mono"; }
+        </style>
+	</head>
+	<body>
+    <h2>A simple test page</h2>
+<!--lorem-->
+<p>To pursue pleasure rationally encounter consequences that are extremely
+painful.</p>
+
+<p>Nor again is there anyone who loves or pursues or desires to obtain pain of
+itself, because it is pain, but because occasionally circumstances occur in
+which toil and pain can procure him some great pleasure. To take a trivial
+example, which of us ever undertakes laborious physical exercise, except to
+obtain some advantage from it? But who has any right to find fault with a man
+who chooses to enjoy a pleasure that has no <em>annoying</em> consequences, or one who
+avoids a pain that produces no resultant pleasure?</p>
+
+<div style="text-align:center"><img alt="test" src="IMAGE1"></div>
+
+<p>On the other hand.</p>
+
+<!--/lorem-->
+
+<h2>Another test page</h2>
+
+<!--lorem-->
+<p>The great explorer of the truth, the master-builder of human happiness. No
+one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but
+because those who do not know how to pursue pleasure rationally encounter
+consequences that are extremely painful.</p>
+
+<p>Nor again is there anyone who loves or pursues or desires to obtain pain of
+itself, because it is pain, but because occasionally circumstances occur in
+which toil and pain can procure him some great pleasure. To take a trivial
+example, which of us ever undertakes laborious physical exercise, except to
+obtain some advantage from it? But who has any right.</p>
+<!--/lorem-->
+
+
+	</body>
+</html>
+

From 76404be21203691a34f033ebf94499c17e6791cb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 7 Oct 2013 09:01:11 +0530
Subject: [PATCH 0929/1154] ...

---
 recipes/slate.recipe | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/slate.recipe b/recipes/slate.recipe
index 49565d6a50..152c2fa89b 100644
--- a/recipes/slate.recipe
+++ b/recipes/slate.recipe
@@ -20,6 +20,7 @@ class Slate(BasicNewsRecipe):
     masthead_url = 'http://img.slate.com/images/redesign2008/slate_logo.gif'
     remove_attributes = ['style']
     INDEX = 'http://slate.com'
+    compress_news_images = True
 
     keep_only_tags = [
         dict(name='header', attrs={'class':'article-header'}),

From 214e252f98ad57e9ead46e2b9ab6389d80c0b182 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 7 Oct 2013 11:44:28 +0530
Subject: [PATCH 0930/1154] Fix locking error for searches + composite columns

Fix a locking error when composite columns containing formats are used
and formats are added/deleted. The error would only be triggered if a search
was previously done that looked at the formats column. Also speed up
searching a little by avoiding a full get_metadata when searching
composite columns. Fixes #1233330 [Custom column Formats error](https://bugs.launchpad.net/calibre/+bug/1233330)
---
 src/calibre/db/cache.py         | 17 +++++++++++++----
 src/calibre/db/locking.py       |  5 ++++-
 src/calibre/db/search.py        |  2 +-
 src/calibre/db/tests/reading.py | 11 +++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index d12bf6a573..80361393c5 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -18,7 +18,7 @@ from calibre.constants import iswindows, preferred_encoding
 from calibre.customize.ui import run_plugins_on_import, run_plugins_on_postimport
 from calibre.db import SPOOL_SIZE, _get_next_series_num_for_list
 from calibre.db.categories import get_categories
-from calibre.db.locking import create_locks
+from calibre.db.locking import create_locks, DowngradeLockError
 from calibre.db.errors import NoSuchFormat
 from calibre.db.fields import create_field, IDENTITY, InvalidLinkTable
 from calibre.db.search import Search
@@ -51,10 +51,19 @@ def write_api(f):
 
 def wrap_simple(lock, func):
     @wraps(func)
-    def ans(*args, **kwargs):
-        with lock:
+    def call_func_with_lock(*args, **kwargs):
+        try:
+            with lock:
+                return func(*args, **kwargs)
+        except DowngradeLockError:
+            # We already have an exclusive lock, no need to acquire a shared
+            # lock. This can happen when updating the search cache in the
+            # presence of composite columns. Updating the search cache holds an
+            # exclusive lock, but searching a composite column involves
+            # reading field values via ProxyMetadata which tries to get a
+            # shared lock.
             return func(*args, **kwargs)
-    return ans
+    return call_func_with_lock
 
 def run_import_plugins(path_or_stream, fmt):
     fmt = fmt.lower()
diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index 9245ecae84..df27bbbb25 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -17,6 +17,9 @@ class LockingError(RuntimeError):
         RuntimeError.__init__(self, msg)
         self.locking_debug_msg = extra
 
+class DowngradeLockError(LockingError):
+    pass
+
 def create_locks():
     '''
     Return a pair of locks: (read_lock, write_lock)
@@ -150,7 +153,7 @@ class SHLock(object):  # {{{
         #  to the shared queue and it will give us the lock eventually.
         if self.is_exclusive or self._exclusive_queue:
             if self._exclusive_owner is me:
-                raise LockingError("can't downgrade SHLock object")
+                raise DowngradeLockError("can't downgrade SHLock object")
             if not blocking:
                 return False
             waiter = self._take_waiter()
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index b5f2f3ed49..231be16f68 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -464,7 +464,7 @@ class Parser(SearchQueryParser):  # {{{
         return self.all_book_ids
 
     def field_iter(self, name, candidates):
-        get_metadata = partial(self.dbcache._get_metadata, get_user_categories=False)
+        get_metadata = self.dbcache._get_proxy_metadata
         try:
             field = self.dbcache.fields[name]
         except KeyError:
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 84e254e398..34706a6597 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -583,6 +583,8 @@ class ReadingTest(BaseTest):
                                    display={'composite_template': '{pubdate:format_date(d-M-yy)}', 'composite_sort':'date'})
         cache.create_custom_column('bool', 'CC6', 'composite', False, display={'composite_template': '{#yesno}', 'composite_sort':'bool'})
         cache.create_custom_column('ccm', 'CC7', 'composite', True, display={'composite_template': '{#tags}'})
+        cache.create_custom_column('ccp', 'CC8', 'composite', True, display={'composite_template': '{publisher}'})
+        cache.create_custom_column('ccf', 'CC9', 'composite', True, display={'composite_template': "{:'approximate_formats()'}"})
 
         cache = self.init_cache()
         # Test searching
@@ -607,5 +609,14 @@ class ReadingTest(BaseTest):
         # Test is_multiple sorting
         cache.set_field('#tags', {1:'b, a, c', 2:'a, b, c', 3:'a, c, b'})
         self.assertEqual([1, 2, 3], cache.multisort([('#ccm', True)]))
+
+        # Test that lock downgrading during update of search cache works
+        self.assertEqual(cache.search('#ccp:One'), {2})
+        cache.set_field('publisher', {2:'One', 1:'One'})
+        self.assertEqual(cache.search('#ccp:One'), {1, 2})
+
+        self.assertEqual(cache.search('#ccf:FMT1'), {1, 2})
+        cache.remove_formats({1:('FMT1',)})
+        self.assertEqual('FMT2', cache.field_for('#ccf', 1))
     # }}}
 

From 980ecc2e1228a18eb5a6d2ab91f094ee6069724a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 7 Oct 2013 12:38:44 +0530
Subject: [PATCH 0931/1154] pep8

---
 src/calibre/ebooks/metadata/sources/identify.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/identify.py b/src/calibre/ebooks/metadata/sources/identify.py
index 71055ff099..b1c5385e03 100644
--- a/src/calibre/ebooks/metadata/sources/identify.py
+++ b/src/calibre/ebooks/metadata/sources/identify.py
@@ -78,7 +78,6 @@ class xISBN(Thread):
             self.tb = traceback.format_exception()
 
 
-
 class ISBNMerge(object):
 
     def __init__(self, log):
@@ -361,7 +360,7 @@ def merge_identify_results(result_map, log):
 
 # }}}
 
-def identify(log, abort, # {{{
+def identify(log, abort,  # {{{
         title=None, authors=None, identifiers={}, timeout=30):
     if title == _('Unknown'):
         title = None
@@ -492,7 +491,6 @@ def identify(log, abort, # {{{
     log('We have %d merged results, merging took: %.2f seconds' %
             (len(results), time.time() - start_time))
 
-
     max_tags = msprefs['max_tags']
     for r in results:
         r.tags = r.tags[:max_tags]
@@ -514,7 +512,7 @@ def identify(log, abort, # {{{
     return results
 # }}}
 
-def urls_from_identifiers(identifiers): # {{{
+def urls_from_identifiers(identifiers):  # {{{
     identifiers = dict([(k.lower(), v) for k, v in identifiers.iteritems()])
     ans = []
     for plugin in all_metadata_plugins():
@@ -550,7 +548,7 @@ def urls_from_identifiers(identifiers): # {{{
     return ans
 # }}}
 
-if __name__ == '__main__': # tests {{{
+if __name__ == '__main__':  # tests {{{
     # To run these test use: calibre-debug -e
     # src/calibre/ebooks/metadata/sources/identify.py
     from calibre.ebooks.metadata.sources.test import (test_identify,
@@ -563,7 +561,7 @@ if __name__ == '__main__': # tests {{{
             ),
 
 
-            ( # An e-book ISBN not on Amazon, one of the authors is
+            (  # An e-book ISBN not on Amazon, one of the authors is
               # unknown to Amazon
                 {'identifiers':{'isbn': '9780307459671'},
                     'title':'Invisible Gorilla', 'authors':['Christopher Chabris']},
@@ -580,7 +578,7 @@ if __name__ == '__main__': # tests {{{
 
             ),
 
-            ( # Sophisticated comment formatting
+            (  # Sophisticated comment formatting
                 {'identifiers':{'isbn': '9781416580829'}},
                 [title_test('Angels & Demons',
                     exact=True), authors_test(['Dan Brown'])]
@@ -594,7 +592,7 @@ if __name__ == '__main__': # tests {{{
             ),
 
         ]
-    #test_identify(tests[1:2])
+    # test_identify(tests[1:2])
     test_identify(tests)
 # }}}
 

From 254b00c8645599dbfff71a157804eb286e4c8d68 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 7 Oct 2013 12:51:35 +0530
Subject: [PATCH 0932/1154] ALlow using both uri: and url: identifiers to
 create two different links instead of just one in the Book details panel

---
 src/calibre/ebooks/metadata/sources/identify.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/identify.py b/src/calibre/ebooks/metadata/sources/identify.py
index b1c5385e03..96f214ca95 100644
--- a/src/calibre/ebooks/metadata/sources/identify.py
+++ b/src/calibre/ebooks/metadata/sources/identify.py
@@ -537,14 +537,13 @@ def urls_from_identifiers(identifiers):  # {{{
     if oclc:
         ans.append(('OCLC', 'oclc', oclc,
             'http://www.worldcat.org/oclc/'+oclc))
-    url = identifiers.get('uri', None)
-    if url is None:
-        url = identifiers.get('url', None)
-    if url and url.startswith('http'):
-        url = url[:8].replace('|', ':') + url[8:].replace('|', ',')
-        parts = urlparse(url)
-        name = parts.netloc
-        ans.append((name, 'url', url, url))
+    for x in ('uri', 'url'):
+        url = identifiers.get(x, None)
+        if url and url.startswith('http'):
+            url = url[:8].replace('|', ':') + url[8:].replace('|', ',')
+            parts = urlparse(url)
+            name = parts.netloc
+            ans.append((name, x, url, url))
     return ans
 # }}}
 

From 5083f9f13cabb5f92f35ef4a918a9d7450cf3766 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 7 Oct 2013 16:34:47 +0530
Subject: [PATCH 0933/1154] New icon for Tweak Book

---
 imgsrc/tweak.svg                       | 7412 ++++++++++++++++++++++++
 resources/images/tweak.png             |  Bin 0 -> 127067 bytes
 src/calibre/gui2/actions/tweak_epub.py |    5 +-
 3 files changed, 7415 insertions(+), 2 deletions(-)
 create mode 100644 imgsrc/tweak.svg
 create mode 100644 resources/images/tweak.png

diff --git a/imgsrc/tweak.svg b/imgsrc/tweak.svg
new file mode 100644
index 0000000000..4dc8c97145
--- /dev/null
+++ b/imgsrc/tweak.svg
@@ -0,0 +1,7412 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg1307"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tweak.svg"
+   inkscape:export-filename="/home/kovid/work/calibre/resources/images/tweak.png"
+   inkscape:export-xdpi="360"
+   inkscape:export-ydpi="360">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     id="namedview1071"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="64"
+     inkscape:cy="20.610169"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1309">
+    <linearGradient
+       id="linearGradient3578">
+      <stop
+         id="stop3580"
+         style="stop-color:#a2a2a2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3582"
+         style="stop-color:#e0e0e0;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3536">
+      <stop
+         id="stop3538"
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3540"
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3513">
+      <stop
+         id="stop3515"
+         style="stop-color:#f9f9f9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3517"
+         style="stop-color:#d1d1d1;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6184">
+      <stop
+         id="stop6186"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6188"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2648">
+      <stop
+         id="stop2650"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2652"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient34264">
+      <stop
+         id="stop34266"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop34268"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient26369">
+      <stop
+         id="stop26371"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop26373"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25485">
+      <stop
+         id="stop25487"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop25489"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23722">
+      <stop
+         id="stop23724"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop23726"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22831">
+      <stop
+         id="stop22833"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop22835"
+         style="stop-color:#888a85;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17579">
+      <stop
+         id="stop17581"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop17583"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15825">
+      <stop
+         id="stop15827"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop15829"
+         style="stop-color:#555753;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13184">
+      <stop
+         id="stop13186"
+         style="stop-color:#000000;stop-opacity:0.66666669"
+         offset="0" />
+      <stop
+         id="stop13188"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11428">
+      <stop
+         id="stop11430"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop11432"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10539">
+      <stop
+         id="stop10541"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10543"
+         style="stop-color:#888a85;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6818">
+      <stop
+         id="stop6820"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6822"
+         style="stop-color:#3e3e3e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5928">
+      <stop
+         id="stop5930"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5932"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4174">
+      <stop
+         id="stop4176"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4178"
+         style="stop-color:#3e3e3e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3168">
+      <stop
+         id="stop3170"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3172"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2948">
+      <stop
+         id="stop2950"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2956"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0.14835165" />
+      <stop
+         id="stop2960"
+         style="stop-color:#000000;stop-opacity:0.39607844"
+         offset="0.42443547" />
+      <stop
+         id="stop2958"
+         style="stop-color:#000000;stop-opacity:0.79061371"
+         offset="0.57417583" />
+      <stop
+         id="stop2962"
+         style="stop-color:#000000;stop-opacity:0.09386282"
+         offset="0.78708792" />
+      <stop
+         id="stop2952"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2938">
+      <stop
+         id="stop2940"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2942"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2926">
+      <stop
+         id="stop2928"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2934"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31868133" />
+      <stop
+         id="stop2930"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2916">
+      <stop
+         id="stop2918"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2920"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2890">
+      <stop
+         id="stop2892"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2894"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2878">
+      <stop
+         id="stop2880"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2882"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2854">
+      <stop
+         id="stop2856"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2858"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2830">
+      <stop
+         id="stop2832"
+         style="stop-color:#111111;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2838"
+         style="stop-color:#6e6e70;stop-opacity:1"
+         offset="0.14285715" />
+      <stop
+         id="stop2864"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0.5714286" />
+      <stop
+         id="stop2834"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2803">
+      <stop
+         id="stop2809"
+         style="stop-color:#e2dcdc;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2811"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.39074388" />
+      <stop
+         id="stop2813"
+         style="stop-color:#dfd9df;stop-opacity:1"
+         offset="0.82692307" />
+      <stop
+         id="stop2815"
+         style="stop-color:#c3c3c3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2370">
+      <stop
+         id="stop2378"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2374"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2352">
+      <stop
+         id="stop2354"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2356"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2334">
+      <stop
+         id="stop2336"
+         style="stop-color:#323232;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2346"
+         style="stop-color:#dfe1e1;stop-opacity:1"
+         offset="0.07692308" />
+      <stop
+         id="stop2342"
+         style="stop-color:#e2dcdc;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2348"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.78201604" />
+      <stop
+         id="stop2344"
+         style="stop-color:#dfd9df;stop-opacity:1"
+         offset="0.9005897" />
+      <stop
+         id="stop2338"
+         style="stop-color:#3a3a3a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2322">
+      <stop
+         id="stop2324"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2326"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2310">
+      <stop
+         id="stop2312"
+         style="stop-color:#020202;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2314"
+         style="stop-color:#020202;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2270">
+      <stop
+         id="stop2272"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2286"
+         style="stop-color:#141414;stop-opacity:1"
+         offset="0.11893105" />
+      <stop
+         id="stop2282"
+         style="stop-color:#282828;stop-opacity:1"
+         offset="0.17597927" />
+      <stop
+         id="stop2284"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="0.50941366" />
+      <stop
+         id="stop2280"
+         style="stop-color:#303030;stop-opacity:1"
+         offset="0.84284806" />
+      <stop
+         id="stop2288"
+         style="stop-color:#141414;stop-opacity:1"
+         offset="0.88084084" />
+      <stop
+         id="stop2274"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-70.588905"
+       y1="67.754272"
+       x2="-59.581383"
+       y2="67.754272"
+       id="linearGradient3034"
+       xlink:href="#linearGradient2334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="34.91254"
+       y1="94.734375"
+       x2="55.089256"
+       y2="94.734375"
+       id="linearGradient3036"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.24057"
+       y1="61.083416"
+       x2="45.24057"
+       y2="62.415165"
+       id="linearGradient3038"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.615768"
+       y1="128.00496"
+       x2="45.615768"
+       y2="125.89983"
+       id="linearGradient3040"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="37.235054"
+       y1="75.415688"
+       x2="38.61475"
+       y2="75.479614"
+       id="linearGradient3042"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="36.909187"
+       y1="75.415688"
+       x2="38.451817"
+       y2="75.479614"
+       id="linearGradient3044"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,-20.17672,17)" />
+    <linearGradient
+       x1="-74.01326"
+       y1="49.46249"
+       x2="-58.206917"
+       y2="65.268829"
+       id="linearGradient3046"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="77.09996"
+       x2="-66.905724"
+       y2="75.717079"
+       id="linearGradient3048"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="78.000954"
+       x2="-66.905724"
+       y2="77.232819"
+       id="linearGradient3050"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-131)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3052"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3054"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3056"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3058"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3060"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3062"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3064"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3066"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3068"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3070"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3072"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3074"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3076"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3078"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3080"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3082"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3084"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3086"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3088"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3090"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3092"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3094"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3096"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3098"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3100"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3102"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3104"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3106"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3108"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3110"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3112"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3114"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient3116"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <linearGradient
+       x1="62.987843"
+       y1="46.469597"
+       x2="118.02947"
+       y2="62.350033"
+       id="linearGradient3118"
+       xlink:href="#linearGradient2803"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="92.496124"
+       cy="43.249184"
+       r="16.633095"
+       fx="92.496124"
+       fy="43.249184"
+       id="radialGradient3120"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="92.990265"
+       cy="42.850105"
+       r="16.633095"
+       fx="92.990265"
+       fy="42.850105"
+       id="radialGradient3122"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="93.747849"
+       cy="43.102612"
+       r="16.633095"
+       fx="93.747849"
+       fy="43.102612"
+       id="radialGradient3124"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="94.932045"
+       cy="43.032188"
+       r="16.633095"
+       fx="94.932045"
+       fy="43.032188"
+       id="radialGradient3126"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="94.435982"
+       cy="42.709927"
+       r="16.633095"
+       fx="94.435982"
+       fy="42.709927"
+       id="radialGradient3128"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.300662,-0.01882999,0.02005934,1.33551,-123.153,-7.387795)" />
+    <linearGradient
+       x1="106.03028"
+       y1="59.273457"
+       x2="108.78728"
+       y2="55.574818"
+       id="linearGradient3130"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="103.66061"
+       y1="55.344017"
+       x2="107.04121"
+       y2="51.711597"
+       id="linearGradient3132"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="61.870293"
+       y1="33.318996"
+       x2="61.870293"
+       y2="40.550549"
+       id="linearGradient3134"
+       xlink:href="#linearGradient2938"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="46.855392"
+       y1="40.660038"
+       x2="75.465431"
+       y2="41.511894"
+       id="linearGradient3136"
+       xlink:href="#linearGradient2948"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="58.079144"
+       cy="51.897194"
+       r="15.014902"
+       fx="60.050133"
+       fy="51.985794"
+       id="radialGradient3138"
+       xlink:href="#linearGradient2916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.617226,0.606572,-0.146664,0.632822,-86.90283,-16.60576)" />
+    <radialGradient
+       cx="59.887943"
+       cy="-16.594898"
+       r="15.014902"
+       fx="59.887943"
+       fy="-16.594898"
+       id="radialGradient3140"
+       xlink:href="#linearGradient2926"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.225599,0.203775,-0.07627682,0.833117,-74.62907,17.88836)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="47.794022"
+       cy="43.680889"
+       r="0.046902865"
+       fx="47.817745"
+       fy="43.681263"
+       id="radialGradient3142"
+       xlink:href="#linearGradient2878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,140,0,-6071.644)" />
+    <radialGradient
+       cx="47.794022"
+       cy="43.680889"
+       r="0.046902865"
+       fx="47.831978"
+       fy="43.680515"
+       id="radialGradient3144"
+       xlink:href="#linearGradient2890"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,140,0,-6071.644)" />
+    <linearGradient
+       x1="35.537346"
+       y1="23.461704"
+       x2="9.0165615"
+       y2="49.982487"
+       id="linearGradient3174"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986971,0,0,0.986971,0.00404783,1.858743)" />
+    <linearGradient
+       x1="56.906048"
+       y1="14.887002"
+       x2="5.8861146"
+       y2="54.610104"
+       id="linearGradient3180"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986971,0,0,0.986971,0.00404783,1.858743)" />
+    <linearGradient
+       x1="27.370962"
+       y1="12.437087"
+       x2="9.0165615"
+       y2="49.982487"
+       id="linearGradient3182"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986971,0,0,0.986971,0.00404783,1.858743)" />
+    <linearGradient
+       x1="-70.588905"
+       y1="67.754272"
+       x2="-59.581383"
+       y2="67.754272"
+       id="linearGradient1664"
+       xlink:href="#linearGradient2334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="34.91254"
+       y1="94.734375"
+       x2="55.089256"
+       y2="94.734375"
+       id="linearGradient1666"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.24057"
+       y1="61.083416"
+       x2="45.24057"
+       y2="62.415165"
+       id="linearGradient1668"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.615768"
+       y1="128.00496"
+       x2="45.615768"
+       y2="125.89983"
+       id="linearGradient1670"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="37.235054"
+       y1="75.415688"
+       x2="38.61475"
+       y2="75.479614"
+       id="linearGradient1672"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="36.909187"
+       y1="75.415688"
+       x2="38.451817"
+       y2="75.479614"
+       id="linearGradient1674"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,-20.17672,17)" />
+    <linearGradient
+       x1="-74.01326"
+       y1="49.46249"
+       x2="-58.206917"
+       y2="65.268829"
+       id="linearGradient1676"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="77.09996"
+       x2="-66.905724"
+       y2="75.717079"
+       id="linearGradient1678"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="78.000954"
+       x2="-66.905724"
+       y2="77.232819"
+       id="linearGradient1680"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-131)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1682"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1684"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1686"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1688"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1690"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1692"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1694"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1696"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1698"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1700"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1702"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1704"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1706"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1708"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1710"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1712"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1714"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1716"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1718"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1720"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1722"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1724"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1726"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1728"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1730"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1732"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1734"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1736"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1738"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1740"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1742"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1744"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1746"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <linearGradient
+       x1="62.987843"
+       y1="46.469597"
+       x2="118.02947"
+       y2="62.350033"
+       id="linearGradient1748"
+       xlink:href="#linearGradient2803"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="92.496124"
+       cy="43.249184"
+       r="16.633095"
+       fx="92.496124"
+       fy="43.249184"
+       id="radialGradient1750"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="92.990265"
+       cy="42.850105"
+       r="16.633095"
+       fx="92.990265"
+       fy="42.850105"
+       id="radialGradient1752"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="93.747849"
+       cy="43.102612"
+       r="16.633095"
+       fx="93.747849"
+       fy="43.102612"
+       id="radialGradient1754"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="94.932045"
+       cy="43.032188"
+       r="16.633095"
+       fx="94.932045"
+       fy="43.032188"
+       id="radialGradient1756"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="94.435982"
+       cy="42.709927"
+       r="16.633095"
+       fx="94.435982"
+       fy="42.709927"
+       id="radialGradient1758"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.300662,-0.01882999,0.02005934,1.33551,-123.153,-7.387795)" />
+    <linearGradient
+       x1="106.03028"
+       y1="59.273457"
+       x2="108.78728"
+       y2="55.574818"
+       id="linearGradient1760"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="103.66061"
+       y1="55.344017"
+       x2="107.04121"
+       y2="51.711597"
+       id="linearGradient1762"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="61.870293"
+       y1="33.318996"
+       x2="61.870293"
+       y2="40.550549"
+       id="linearGradient1764"
+       xlink:href="#linearGradient2938"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="46.855392"
+       y1="40.660038"
+       x2="75.465431"
+       y2="41.511894"
+       id="linearGradient1766"
+       xlink:href="#linearGradient2948"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="58.079144"
+       cy="51.897194"
+       r="15.014902"
+       fx="60.050133"
+       fy="51.985794"
+       id="radialGradient1768"
+       xlink:href="#linearGradient2916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.617226,0.606572,-0.146664,0.632822,-86.90283,-16.60576)" />
+    <radialGradient
+       cx="59.887943"
+       cy="-16.594898"
+       r="15.014902"
+       fx="59.887943"
+       fy="-16.594898"
+       id="radialGradient1770"
+       xlink:href="#linearGradient2926"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.225599,0.203775,-0.07627682,0.833117,-74.62907,17.88836)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="47.794022"
+       cy="43.680889"
+       r="0.046902865"
+       fx="47.817745"
+       fy="43.681263"
+       id="radialGradient1772"
+       xlink:href="#linearGradient2878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,140,0,-6071.644)" />
+    <radialGradient
+       cx="47.794022"
+       cy="43.680889"
+       r="0.046902865"
+       fx="47.831978"
+       fy="43.680515"
+       id="radialGradient1774"
+       xlink:href="#linearGradient2890"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,140,0,-6071.644)" />
+    <linearGradient
+       x1="35.537346"
+       y1="23.461704"
+       x2="9.0165615"
+       y2="49.982487"
+       id="linearGradient1776"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986971,0,0,0.986971,0.00404783,1.858743)" />
+    <linearGradient
+       x1="27.370962"
+       y1="12.437087"
+       x2="9.0165615"
+       y2="49.982487"
+       id="linearGradient1778"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986971,0,0,0.986971,0.00404783,1.858743)" />
+    <linearGradient
+       x1="56.906048"
+       y1="14.887002"
+       x2="5.8861146"
+       y2="54.610104"
+       id="linearGradient1780"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986971,0,0,0.986971,0.00404783,1.858743)" />
+    <linearGradient
+       x1="56.906048"
+       y1="14.887002"
+       x2="5.8861146"
+       y2="54.610104"
+       id="linearGradient1783"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.789223,0,0,0.789223,-18.91589,-19.59139)" />
+    <linearGradient
+       x1="27.370962"
+       y1="12.437087"
+       x2="9.0165615"
+       y2="49.982487"
+       id="linearGradient1786"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.789223,0,0,0.789223,-18.91589,-19.59139)" />
+    <linearGradient
+       x1="35.537346"
+       y1="23.461704"
+       x2="9.0165615"
+       y2="49.982487"
+       id="linearGradient1789"
+       xlink:href="#linearGradient3168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.789223,0,0,0.789223,-18.91589,-19.59139)" />
+    <linearGradient
+       x1="-70.588905"
+       y1="67.754272"
+       x2="-59.581383"
+       y2="67.754272"
+       id="linearGradient1860"
+       xlink:href="#linearGradient2334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="34.91254"
+       y1="94.734375"
+       x2="55.089256"
+       y2="94.734375"
+       id="linearGradient1862"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.24057"
+       y1="61.083416"
+       x2="45.24057"
+       y2="62.415165"
+       id="linearGradient1864"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.615768"
+       y1="128.00496"
+       x2="45.615768"
+       y2="125.89983"
+       id="linearGradient1866"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="37.235054"
+       y1="75.415688"
+       x2="38.61475"
+       y2="75.479614"
+       id="linearGradient1868"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="36.909187"
+       y1="75.415688"
+       x2="38.451817"
+       y2="75.479614"
+       id="linearGradient1870"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,-20.17672,17)" />
+    <linearGradient
+       x1="-74.01326"
+       y1="49.46249"
+       x2="-58.206917"
+       y2="65.268829"
+       id="linearGradient1872"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="77.09996"
+       x2="-66.905724"
+       y2="75.717079"
+       id="linearGradient1874"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="78.000954"
+       x2="-66.905724"
+       y2="77.232819"
+       id="linearGradient1876"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-131)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1878"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1880"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1882"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1884"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1886"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1888"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1890"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1892"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1894"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1896"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1898"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1900"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1902"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1904"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1906"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1908"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1910"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1912"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1914"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1916"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1918"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1920"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1922"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1924"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1926"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1928"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1930"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1932"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1934"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1936"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1938"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1940"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient1942"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <linearGradient
+       x1="62.987843"
+       y1="46.469597"
+       x2="118.02947"
+       y2="62.350033"
+       id="linearGradient1944"
+       xlink:href="#linearGradient2803"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="92.496124"
+       cy="43.249184"
+       r="16.633095"
+       fx="92.496124"
+       fy="43.249184"
+       id="radialGradient1946"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="92.990265"
+       cy="42.850105"
+       r="16.633095"
+       fx="92.990265"
+       fy="42.850105"
+       id="radialGradient1948"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="93.747849"
+       cy="43.102612"
+       r="16.633095"
+       fx="93.747849"
+       fy="43.102612"
+       id="radialGradient1950"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="94.932045"
+       cy="43.032188"
+       r="16.633095"
+       fx="94.932045"
+       fy="43.032188"
+       id="radialGradient1952"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.675817,0.229166,-0.267617,1.957047,-51.37697,-57.4844)" />
+    <radialGradient
+       cx="94.435982"
+       cy="42.709927"
+       r="16.633095"
+       fx="94.435982"
+       fy="42.709927"
+       id="radialGradient1954"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.300662,-0.01882999,0.02005934,1.33551,-123.153,-7.387795)" />
+    <linearGradient
+       x1="106.03028"
+       y1="59.273457"
+       x2="108.78728"
+       y2="55.574818"
+       id="linearGradient1956"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="103.66061"
+       y1="55.344017"
+       x2="107.04121"
+       y2="51.711597"
+       id="linearGradient1958"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="61.870293"
+       y1="33.318996"
+       x2="61.870293"
+       y2="40.550549"
+       id="linearGradient1960"
+       xlink:href="#linearGradient2938"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="46.855392"
+       y1="40.660038"
+       x2="75.465431"
+       y2="41.511894"
+       id="linearGradient1962"
+       xlink:href="#linearGradient2948"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="58.079144"
+       cy="51.897194"
+       r="15.014902"
+       fx="60.050133"
+       fy="51.985794"
+       id="radialGradient1964"
+       xlink:href="#linearGradient2916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.617226,0.606572,-0.146664,0.632822,-86.90283,-16.60576)" />
+    <radialGradient
+       cx="59.887943"
+       cy="-16.594898"
+       r="15.014902"
+       fx="59.887943"
+       fy="-16.594898"
+       id="radialGradient1966"
+       xlink:href="#linearGradient2926"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.225599,0.203775,-0.07627682,0.833117,-74.62907,17.88836)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="47.794022"
+       cy="43.680889"
+       r="0.046902865"
+       fx="47.817745"
+       fy="43.681263"
+       id="radialGradient1968"
+       xlink:href="#linearGradient2878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,140,0,-6071.644)" />
+    <radialGradient
+       cx="47.794022"
+       cy="43.680889"
+       r="0.046902865"
+       fx="47.831978"
+       fy="43.680515"
+       id="radialGradient1970"
+       xlink:href="#linearGradient2890"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,140,0,-6071.644)" />
+    <radialGradient
+       cx="59.887943"
+       cy="-16.594898"
+       r="15.014902"
+       fx="59.887943"
+       fy="-16.594898"
+       id="radialGradient1976"
+       xlink:href="#linearGradient2926"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.940074,-1.588391,-0.604405,0.714441,79.25473,53.42941)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="58.079144"
+       cy="51.897194"
+       r="15.014902"
+       fx="60.050133"
+       fy="51.985794"
+       id="radialGradient1979"
+       xlink:href="#linearGradient2916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.574493,-1.579616,-0.388241,0.612382,117.5678,105.9122)" />
+    <linearGradient
+       x1="46.855392"
+       y1="40.660038"
+       x2="75.465431"
+       y2="41.511894"
+       id="linearGradient1982"
+       xlink:href="#linearGradient2948"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,36.35388,50.6852)" />
+    <linearGradient
+       x1="61.870293"
+       y1="33.318996"
+       x2="61.870293"
+       y2="40.550549"
+       id="linearGradient1988"
+       xlink:href="#linearGradient2938"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,30.08343,56.26406)" />
+    <linearGradient
+       x1="103.66061"
+       y1="55.344017"
+       x2="107.04121"
+       y2="51.711597"
+       id="linearGradient1993"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,-13.80973,-1.407777)" />
+    <linearGradient
+       x1="106.03028"
+       y1="59.273457"
+       x2="108.78728"
+       y2="55.574818"
+       id="linearGradient1996"
+       xlink:href="#linearGradient2854"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,-2.715852,0.03924997)" />
+    <radialGradient
+       cx="94.435982"
+       cy="42.709927"
+       r="16.633095"
+       fx="94.435982"
+       fy="42.709927"
+       id="radialGradient1999"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.822248,-1.822246,-1.082544,1.033448,89.30972,89.05773)" />
+    <radialGradient
+       cx="94.932045"
+       cy="43.032188"
+       r="16.633095"
+       fx="94.932045"
+       fy="43.032188"
+       id="radialGradient2002"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5213,-1.136522,-1.349162,1.747747,103.9957,-7.081684)" />
+    <radialGradient
+       cx="93.747849"
+       cy="43.102612"
+       r="16.633095"
+       fx="93.747849"
+       fy="43.102612"
+       id="radialGradient2005"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5213,-1.136522,-1.349162,1.747747,74.57286,13.29483)" />
+    <radialGradient
+       cx="92.990265"
+       cy="42.850105"
+       r="16.633095"
+       fx="92.990265"
+       fy="42.850105"
+       id="radialGradient2008"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5213,-1.136522,-1.349162,1.747747,88.56079,1.035505)" />
+    <radialGradient
+       cx="92.496124"
+       cy="43.249184"
+       r="16.633095"
+       fx="92.496124"
+       fy="43.249184"
+       id="radialGradient2011"
+       xlink:href="#linearGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5213,-1.136522,-1.349162,1.747747,86.14908,8.095624)" />
+    <linearGradient
+       x1="62.987843"
+       y1="46.469597"
+       x2="118.02947"
+       y2="62.350033"
+       id="linearGradient2018"
+       xlink:href="#linearGradient2803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,-22.97423,25.6034)" />
+    <linearGradient
+       x1="-70.588905"
+       y1="67.754272"
+       x2="-59.581383"
+       y2="67.754272"
+       id="linearGradient2178"
+       xlink:href="#linearGradient2334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="34.91254"
+       y1="94.734375"
+       x2="55.089256"
+       y2="94.734375"
+       id="linearGradient2180"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.24057"
+       y1="61.083416"
+       x2="45.24057"
+       y2="62.415165"
+       id="linearGradient2182"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="45.615768"
+       y1="128.00496"
+       x2="45.615768"
+       y2="125.89983"
+       id="linearGradient2184"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="37.235054"
+       y1="75.415688"
+       x2="38.61475"
+       y2="75.479614"
+       id="linearGradient2186"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-110.0893,17)" />
+    <linearGradient
+       x1="36.909187"
+       y1="75.415688"
+       x2="38.451817"
+       y2="75.479614"
+       id="linearGradient2188"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,-20.17672,17)" />
+    <linearGradient
+       x1="-74.01326"
+       y1="49.46249"
+       x2="-58.206917"
+       y2="65.268829"
+       id="linearGradient2190"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="77.09996"
+       x2="-66.905724"
+       y2="75.717079"
+       id="linearGradient2192"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-66.905724"
+       y1="78.000954"
+       x2="-66.905724"
+       y2="77.232819"
+       id="linearGradient2194"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-131)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2196"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2198"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2200"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2202"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2204"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2206"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2208"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2210"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2212"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2214"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2218"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2220"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2222"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2224"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2226"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2228"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2230"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2232"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2234"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2236"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2238"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2240"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2242"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2244"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2246"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2248"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2250"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2252"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2254"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2256"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2258"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2260"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <linearGradient
+       x1="-66.905724"
+       y1="78.000954"
+       x2="-66.905724"
+       y2="77.232819"
+       id="linearGradient2296"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.120247,0,0,1.120247,123.6118,-119.9966)" />
+    <linearGradient
+       x1="-66.905724"
+       y1="77.09996"
+       x2="-66.905724"
+       y2="75.717079"
+       id="linearGradient2299"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.120246,0,0,1.120246,118.5217,-17.87025)" />
+    <linearGradient
+       x1="-74.01326"
+       y1="49.46249"
+       x2="-58.206917"
+       y2="65.268829"
+       id="linearGradient2302"
+       xlink:href="#linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.120247,0,0,1.120247,132.086,-29.06635)" />
+    <linearGradient
+       x1="36.909187"
+       y1="75.415688"
+       x2="38.451817"
+       y2="75.479614"
+       id="linearGradient2305"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79859,0.785623,-0.79859,0.785623,-69.21454,-66.44414)" />
+    <linearGradient
+       x1="37.235054"
+       y1="75.415688"
+       x2="38.61475"
+       y2="75.479614"
+       id="linearGradient2308"
+       xlink:href="#linearGradient2322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,6.511022,10.33247)" />
+    <linearGradient
+       x1="45.615768"
+       y1="128.00496"
+       x2="45.615768"
+       y2="125.89983"
+       id="linearGradient2311"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,2.588745,4.193251)" />
+    <linearGradient
+       x1="45.24057"
+       y1="61.083416"
+       x2="45.24057"
+       y2="62.415165"
+       id="linearGradient2314"
+       xlink:href="#linearGradient2310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,2.588745,4.193251)" />
+    <linearGradient
+       x1="34.91254"
+       y1="94.734375"
+       x2="55.089256"
+       y2="94.734375"
+       id="linearGradient2317"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.79859,-0.785623,-0.79859,0.785623,-17.36371,-13.31556)" />
+    <linearGradient
+       x1="-70.588905"
+       y1="67.754272"
+       x2="-59.581383"
+       y2="67.754272"
+       id="linearGradient2320"
+       xlink:href="#linearGradient2334"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.120248,0,0,1.120248,115.37,-23.77326)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2322"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2324"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2326"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2328"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2330"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2332"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2334"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2336"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2338"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2340"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2342"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2344"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2346"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2348"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2350"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2352"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2354"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2356"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2358"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2360"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2362"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2364"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2366"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2368"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2370"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2372"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2374"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2376"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2378"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2380"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2382"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2384"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="-67.615143"
+       cy="84.213043"
+       r="1.4498374"
+       fx="-67.047073"
+       fy="83.803413"
+       id="radialGradient2386"
+       xlink:href="#linearGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.636364,0,30.62293)" />
+    <radialGradient
+       cx="173.35292"
+       cy="29.473955"
+       r="7.125"
+       fx="173.35292"
+       fy="29.473955"
+       id="radialGradient4180"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.093182,0.03710751,-0.03342812,4.588167,-714.9349,-106.8524)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient5934"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.931884,0,2.144242)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient5938"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.931884,105.2193,7.709746)" />
+    <radialGradient
+       cx="150.17821"
+       cy="56.316689"
+       r="4.6959705"
+       fx="150.17821"
+       fy="56.316689"
+       id="radialGradient6824"
+       xlink:href="#linearGradient6818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.899763,-0.133352,0.10295,6.09874,-1034.66,-286.0457)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient7704"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.931884,0,2.144242)" />
+    <radialGradient
+       cx="173.35292"
+       cy="29.473955"
+       r="7.125"
+       fx="173.35292"
+       fy="29.473955"
+       id="radialGradient7706"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.093182,0.03710751,-0.03342812,4.588167,-714.9349,-106.8524)" />
+    <radialGradient
+       cx="150.17821"
+       cy="56.316689"
+       r="4.6959705"
+       fx="150.17821"
+       fy="56.316689"
+       id="radialGradient7708"
+       xlink:href="#linearGradient6818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.899763,-0.133352,0.10295,6.09874,-1034.66,-286.0457)" />
+    <radialGradient
+       cx="150.17821"
+       cy="56.316689"
+       r="4.6959705"
+       fx="150.17821"
+       fy="56.316689"
+       id="radialGradient7711"
+       xlink:href="#linearGradient6818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.899763,-0.133352,0.10295,6.09874,-1031.154,-297.761)" />
+    <radialGradient
+       cx="173.35292"
+       cy="29.473955"
+       r="7.125"
+       fx="173.35292"
+       fy="29.473955"
+       id="radialGradient7714"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.093182,0.03710751,-0.03342812,4.588167,-711.6483,-118.8231)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient7717"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.931884,3.581214,-10.16833)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient8763"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.931884,3.581214,-10.16833)" />
+    <radialGradient
+       cx="173.35292"
+       cy="29.473955"
+       r="7.125"
+       fx="173.35292"
+       fy="29.473955"
+       id="radialGradient8765"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.093182,0.03710751,-0.03342812,4.588167,-711.6483,-118.8231)" />
+    <radialGradient
+       cx="150.17821"
+       cy="56.316689"
+       r="4.6959705"
+       fx="150.17821"
+       fy="56.316689"
+       id="radialGradient8767"
+       xlink:href="#linearGradient6818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.899763,-0.133352,0.10295,6.09874,-1031.154,-297.761)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient9655"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.931884,3.581214,-10.16833)" />
+    <radialGradient
+       cx="173.35292"
+       cy="29.473955"
+       r="7.125"
+       fx="173.35292"
+       fy="29.473955"
+       id="radialGradient9657"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.093182,0.03710751,-0.03342812,4.588167,-711.6483,-118.8231)" />
+    <radialGradient
+       cx="150.17821"
+       cy="56.316689"
+       r="4.6959705"
+       fx="150.17821"
+       fy="56.316689"
+       id="radialGradient9659"
+       xlink:href="#linearGradient6818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.899763,-0.133352,0.10295,6.09874,-1031.154,-297.761)" />
+    <radialGradient
+       cx="222.09877"
+       cy="1.2351388"
+       r="16.390625"
+       fx="222.09877"
+       fy="1.2351388"
+       id="radialGradient10545"
+       xlink:href="#linearGradient10539"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3781044,-0.3075006,1.0402511,6.8677766,-436.02391,108.90546)" />
+    <radialGradient
+       cx="47.794022"
+       cy="43.680889"
+       r="0.046902865"
+       fx="47.831978"
+       fy="43.680515"
+       id="radialGradient10549"
+       xlink:href="#linearGradient2890"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.173821,-47.9025,5.721087,-227.0754,-210.4152,12251.98)" />
+    <radialGradient
+       cx="94.138443"
+       cy="38.927982"
+       r="6.8733773"
+       fx="94.138443"
+       fy="38.927982"
+       id="radialGradient12309"
+       xlink:href="#linearGradient11428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.581247,0.00581712,-0.07455762,9.383173,36.03053,-309.6658)" />
+    <linearGradient
+       x1="79.735275"
+       y1="48.538784"
+       x2="95"
+       y2="48.538784"
+       id="linearGradient13190"
+       xlink:href="#linearGradient13184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.737301,-6.658052e-7,1.272726e-7,1.016243,23.72264,1.031887)" />
+    <radialGradient
+       cx="94.138443"
+       cy="38.927982"
+       r="6.8733773"
+       fx="94.138443"
+       fy="38.927982"
+       id="radialGradient14940"
+       xlink:href="#linearGradient11428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.566041,0.00497624,-0.07260836,8.025401,38.46269,-251.3652)" />
+    <linearGradient
+       x1="79.735275"
+       y1="48.538784"
+       x2="95"
+       y2="48.538784"
+       id="linearGradient14942"
+       xlink:href="#linearGradient13184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.718011,5.475357e-7,-1.861064e-8,0.869189,26.47674,14.37374)" />
+    <radialGradient
+       cx="94.138443"
+       cy="38.927982"
+       r="6.8733773"
+       fx="94.138443"
+       fy="38.927982"
+       id="radialGradient14946"
+       xlink:href="#linearGradient11428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.602777,0.00495854,-0.07732142,7.998709,33.70512,-255.1298)" />
+    <linearGradient
+       x1="79.735275"
+       y1="48.538784"
+       x2="95"
+       y2="48.538784"
+       id="linearGradient14948"
+       xlink:href="#linearGradient13184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.764612,-9.213433e-7,-8.915483e-8,0.866298,20.94123,9.725384)" />
+    <radialGradient
+       cx="77.371063"
+       cy="64.803642"
+       r="4.1422901"
+       fx="77.371063"
+       fy="64.803642"
+       id="radialGradient15831"
+       xlink:href="#linearGradient15825"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71884,0.05195072,0.124003,10.14631,11.77238,-600.3243)" />
+    <radialGradient
+       cx="64.035408"
+       cy="72.25351"
+       r="8.0720015"
+       fx="64.035408"
+       fy="72.25351"
+       id="radialGradient19335"
+       xlink:href="#linearGradient17579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.35411,-4.17141,5.032558,-1.51988,-331.3648,448.8406)" />
+    <radialGradient
+       cx="78.344902"
+       cy="47.896503"
+       r="59.069851"
+       fx="78.344902"
+       fy="47.896503"
+       id="radialGradient22837"
+       xlink:href="#linearGradient22831"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0280267,-0.1270725,0.1309176,0.9349125,-10.479426,16.042145)" />
+    <linearGradient
+       x1="105.58075"
+       y1="11.270861"
+       x2="120.06922"
+       y2="11.270861"
+       id="linearGradient23728"
+       xlink:href="#linearGradient23722"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0692341,-0.1321662,0.1338966,0.9561867,-15.573128,15.396338)" />
+    <radialGradient
+       cx="223.56834"
+       cy="0.89173615"
+       r="16.390625"
+       fx="223.56834"
+       fy="0.89173615"
+       id="radialGradient24609"
+       xlink:href="#linearGradient10539"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.315085,-0.01392699,0.07510166,7.192445,-292.2322,-2.7905)" />
+    <radialGradient
+       cx="302.08856"
+       cy="-10.284327"
+       r="59.073311"
+       fx="302.08856"
+       fy="-10.284327"
+       id="radialGradient25491"
+       xlink:href="#linearGradient25485"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2857021,-0.09693699,0.3403616,0.8738542,19.958746,76.364594)" />
+    <linearGradient
+       x1="114.74419"
+       y1="51.131916"
+       x2="141.67282"
+       y2="13.184787"
+       id="linearGradient26375"
+       xlink:href="#linearGradient26369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0280267,-0.1270725,0.1338966,0.9561867,-10.625435,14.784763)" />
+    <radialGradient
+       cx="302.08856"
+       cy="-10.284327"
+       r="59.073311"
+       fx="302.08856"
+       fy="-10.284327"
+       id="radialGradient27252"
+       xlink:href="#linearGradient25485"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2857021,-0.09693699,0.3403616,0.8738542,20.206674,76.333938)" />
+    <radialGradient
+       cx="224.46358"
+       cy="-4.2258649"
+       r="16.390625"
+       fx="224.46358"
+       fy="-4.2258649"
+       id="radialGradient27256"
+       xlink:href="#linearGradient10539"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3781044,-0.3075006,1.0402511,6.8677766,-437.14482,108.10564)" />
+    <radialGradient
+       cx="19.006332"
+       cy="99.120926"
+       r="4.6031747"
+       fx="19.006332"
+       fy="99.120926"
+       id="radialGradient34270"
+       xlink:href="#linearGradient34264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.412255,-10.60951,-60.48313)" />
+    <radialGradient
+       cx="19.006332"
+       cy="99.120926"
+       r="4.6031747"
+       fx="19.006332"
+       fy="99.120926"
+       id="radialGradient34276"
+       xlink:href="#linearGradient34264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0334476,0.07897266,-0.1160692,-1.3576785,44.296126,247.80777)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient34286"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.931884,3.581214,-10.16833)" />
+    <radialGradient
+       cx="173.35292"
+       cy="29.473955"
+       r="7.125"
+       fx="173.35292"
+       fy="29.473955"
+       id="radialGradient34288"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.093182,0.03710751,-0.03342812,4.588167,-711.6483,-118.8231)" />
+    <radialGradient
+       cx="150.17821"
+       cy="56.316689"
+       r="4.6959705"
+       fx="150.17821"
+       fy="56.316689"
+       id="radialGradient34290"
+       xlink:href="#linearGradient6818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.899763,-0.133352,0.10295,6.09874,-1031.154,-297.761)" />
+    <radialGradient
+       cx="150.17821"
+       cy="56.316689"
+       r="4.6959705"
+       fx="150.17821"
+       fy="56.316689"
+       id="radialGradient34293"
+       xlink:href="#linearGradient6818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.403726,0.332339,-0.273065,5.985581,-954.1066,-351.1562)" />
+    <radialGradient
+       cx="173.35292"
+       cy="29.473955"
+       r="7.125"
+       fx="173.35292"
+       fy="29.473955"
+       id="radialGradient34296"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.765918,0.334945,-0.309234,4.496536,-664.8065,-156.7887)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient34299"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.936186,0.05862005,-0.05645099,0.913671,-2.35175,-7.555558)" />
+    <radialGradient
+       cx="174.07651"
+       cy="28.159636"
+       r="7.125"
+       fx="174.07651"
+       fy="28.159636"
+       id="radialGradient34303"
+       xlink:href="#linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9443389,-0.2853475,0.2841705,4.3388229,-752.28517,-40.172841)" />
+    <radialGradient
+       cx="154.17799"
+       cy="33.309246"
+       r="11.547417"
+       fx="154.17799"
+       fy="33.309246"
+       id="radialGradient34310"
+       xlink:href="#linearGradient5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.936186,0.05862005,-0.05645099,0.913671,-3.359552,-9.002585)" />
+    <radialGradient
+       cx="19.006332"
+       cy="99.120926"
+       r="4.6031747"
+       fx="19.006332"
+       fy="99.120926"
+       id="radialGradient1771"
+       xlink:href="#linearGradient34264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.412255,-1.403157,-41.48484)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient2654"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.902419,0,5.424548)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient2670"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.902419,0,5.424548)" />
+    <radialGradient
+       cx="19.006332"
+       cy="99.120926"
+       r="4.6031747"
+       fx="19.006332"
+       fy="99.120926"
+       id="radialGradient2672"
+       xlink:href="#linearGradient34264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.412255,-10.60951,-60.48313)" />
+    <radialGradient
+       cx="19.006332"
+       cy="99.120926"
+       r="4.6031747"
+       fx="19.006332"
+       fy="99.120926"
+       id="radialGradient2674"
+       xlink:href="#linearGradient34264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.412255,-10.60951,-60.48313)" />
+    <radialGradient
+       cx="19.006332"
+       cy="99.120926"
+       r="4.6031747"
+       fx="19.006332"
+       fy="99.120926"
+       id="radialGradient2681"
+       xlink:href="#linearGradient34264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.412255,13.98352,-38.48484)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient4432"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.902419,0,5.424548)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient4435"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.902419,11.7966,24.7511)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient6190"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.329001,0,-32.60378)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient7278"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.902419,11.7966,24.7511)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient7280"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.329001,0,-32.60378)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient7282"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.329001,0,-32.60378)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient7285"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.329001,0,-32.60378)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient7288"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.329001,0,-32.60378)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient7292"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.902419,11.7966,24.7511)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient8638"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.902419,11.7966,24.7511)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient8640"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.329001,0,-32.60378)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient8642"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.329001,0,-32.60378)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient8645"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0280267,-0.1270725,0.1779489,1.2707731,-14.990972,-16.390537)" />
+    <radialGradient
+       cx="18.988297"
+       cy="99.099472"
+       r="4.9090157"
+       fx="18.988297"
+       fy="99.099472"
+       id="radialGradient8648"
+       xlink:href="#linearGradient6184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0280267,-0.1270725,0.1779489,1.2707731,-14.990972,-16.390537)" />
+    <radialGradient
+       cx="22.596113"
+       cy="66.948593"
+       r="33.8983"
+       fx="22.596113"
+       fy="66.948593"
+       id="radialGradient8652"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0280267,-0.1270725,0.1208309,0.8628811,4.8158744,36.952411)" />
+    <linearGradient
+       id="linearGradient12948">
+      <stop
+         id="stop12950"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop12952"
+         style="stop-color:#c0c0c0;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3273">
+      <stop
+         id="stop3275"
+         style="stop-color:#ffffff;stop-opacity:0.55035973"
+         offset="0" />
+      <stop
+         id="stop3277"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1563">
+      <stop
+         id="stop1565"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1567"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3638">
+      <stop
+         id="stop3640"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3661"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.06868132" />
+      <stop
+         id="stop3659"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3642"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3290">
+      <stop
+         id="stop3292"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3294"
+         style="stop-color:#ffb66d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3236">
+      <stop
+         id="stop3238"
+         style="stop-color:#727272;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3240"
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3737">
+      <feGaussianBlur
+         id="feGaussianBlur3739"
+         stdDeviation="0.30086486" />
+    </filter>
+    <radialGradient
+       cx="27.96059"
+       cy="118.94362"
+       r="54.613575"
+       fx="27.96059"
+       fy="118.94362"
+       id="radialGradient3758"
+       xlink:href="#linearGradient11428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.218502,-0.0681785,0.7665978,2.4568331,-46.677697,-138.76422)" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3985">
+      <feGaussianBlur
+         id="feGaussianBlur3987"
+         stdDeviation="0.18706947" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3989">
+      <feGaussianBlur
+         id="feGaussianBlur3991"
+         stdDeviation="0.086425096" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3995">
+      <feGaussianBlur
+         id="feGaussianBlur3997"
+         stdDeviation="0.17395735" />
+    </filter>
+    <radialGradient
+       cx="62.261757"
+       cy="77.167572"
+       r="33.8983"
+       fx="56.312855"
+       fy="65.784782"
+       id="radialGradient4005"
+       xlink:href="#linearGradient2648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4649621,1.0036473,-0.2853745,0.1958414,69.723794,-13.486394)" />
+    <linearGradient
+       id="linearGradient5242">
+      <stop
+         id="stop5244"
+         style="stop-color:#180f00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5246"
+         style="stop-color:#613e00;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4281">
+      <stop
+         id="stop4283"
+         style="stop-color:#8f6b32;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4285"
+         style="stop-color:#debc85;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="68.615196"
+       y1="63.116199"
+       x2="71.614998"
+       y2="73.115997"
+       id="XMLID_103_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2217"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2219"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="74.096703"
+       y1="58.3008"
+       x2="77.096703"
+       y2="67.301399"
+       id="XMLID_104_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2224"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2226"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="80.380898"
+       y1="53.248501"
+       x2="84.380402"
+       y2="63.247398"
+       id="XMLID_105_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2231"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2233"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="89.170898"
+       y1="49.848598"
+       x2="90.735397"
+       y2="61.924801"
+       id="XMLID_106_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2238"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2240"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="96.897499"
+       y1="47.836899"
+       x2="98.8974"
+       y2="58.836399"
+       id="XMLID_107_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2245"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2247"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="81.426804"
+       y1="64.792"
+       x2="82.7584"
+       y2="71.450104"
+       id="XMLID_111_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.894,0.4481,0.4481,0.894,102.4965,-24.3783)">
+      <stop
+         id="stop2273"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2275"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="54.888699"
+       y1="61.901901"
+       x2="55.888599"
+       y2="70.901299"
+       id="XMLID_112_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2280-1"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2282-5"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="83.063499"
+       y1="44.913101"
+       x2="84.395103"
+       y2="51.571201"
+       id="XMLID_113_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.5962,0.8028,0.8028,0.5962,60.4483,-34.8312)">
+      <stop
+         id="stop2287"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2289"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="83.387703"
+       y1="36.474602"
+       x2="84.719597"
+       y2="43.1339"
+       id="XMLID_114_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4243,0.9055,0.9055,0.4243,41.46,-36.3299)">
+      <stop
+         id="stop2294"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2296"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="84.011703"
+       y1="28.52"
+       x2="85.343597"
+       y2="35.179298"
+       id="XMLID_115_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.2556,0.9668,0.9668,0.2556,25.5372,-35.9141)">
+      <stop
+         id="stop2301"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2303"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="84.338898"
+       y1="20.001499"
+       x2="85.6707"
+       y2="26.660801"
+       id="XMLID_116_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0825,0.9966,0.9966,0.0825,10.3161,-34.5121)">
+      <stop
+         id="stop2308"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2310"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="66.530296"
+       y1="106.6494"
+       x2="67.862396"
+       y2="113.3099"
+       id="XMLID_119_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2329"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2331"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="72.530296"
+       y1="110.6504"
+       x2="73.862099"
+       y2="117.3097"
+       id="XMLID_120_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,134,0)">
+      <stop
+         id="stop2336-8"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2338-7"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="66.530296"
+       y1="98.649399"
+       x2="67.862396"
+       y2="105.3099"
+       id="XMLID_121_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2343"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2345"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="72.529297"
+       y1="102.6484"
+       x2="73.8619"
+       y2="109.3113"
+       id="XMLID_122_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,134,0)">
+      <stop
+         id="stop2350"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2352"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="66.529297"
+       y1="114.6494"
+       x2="67.861397"
+       y2="121.3099"
+       id="XMLID_123_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2357"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2359"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="66.530296"
+       y1="82.649399"
+       x2="67.862396"
+       y2="89.309898"
+       id="XMLID_125_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2371"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2373"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="72.529297"
+       y1="86.649399"
+       x2="73.861397"
+       y2="93.309898"
+       id="XMLID_126_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,134,0)">
+      <stop
+         id="stop2378-5"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2380"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="66.529297"
+       y1="74.648399"
+       x2="67.861603"
+       y2="81.310097"
+       id="XMLID_127_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2385"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2387"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="72.529297"
+       y1="78.650398"
+       x2="73.861198"
+       y2="85.3097"
+       id="XMLID_128_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,134,0)">
+      <stop
+         id="stop2392"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2394"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="66.530296"
+       y1="90.649399"
+       x2="67.862396"
+       y2="97.309898"
+       id="XMLID_129_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2399"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2401"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="72.530296"
+       y1="94.651398"
+       x2="73.862099"
+       y2="101.3107"
+       id="XMLID_130_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,134,0)">
+      <stop
+         id="stop2406"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2408"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="70.199203"
+       y1="57.9995"
+       x2="70.199203"
+       y2="119.0002"
+       id="XMLID_131_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2413"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2415"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="75.594704"
+       y1="58"
+       x2="75.594704"
+       y2="119.0007"
+       id="XMLID_132_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2420"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2422"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="82.472702"
+       y1="58"
+       x2="82.472702"
+       y2="118.9961"
+       id="XMLID_133_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2427"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2429"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="89.806602"
+       y1="57.9995"
+       x2="89.806602"
+       y2="118.9998"
+       id="XMLID_134_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2434"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2436"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="97.772499"
+       y1="57.9995"
+       x2="97.772499"
+       y2="119"
+       id="XMLID_135_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2441"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2443"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="59.366699"
+       y1="57.9995"
+       x2="59.366699"
+       y2="119.0002"
+       id="XMLID_139_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2469"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2471"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="55.313"
+       y1="57.9995"
+       x2="55.313"
+       y2="119.0003"
+       id="XMLID_140_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2476"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2478"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="48.586399"
+       y1="57.9995"
+       x2="48.586399"
+       y2="118.9997"
+       id="XMLID_141_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2483"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2485"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="41.034698"
+       y1="58"
+       x2="41.034698"
+       y2="119.0007"
+       id="XMLID_142_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2490"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2492"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="33.788601"
+       y1="57.9995"
+       x2="33.788601"
+       y2="119.0001"
+       id="XMLID_143_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2497"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2499"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="25.5942"
+       y1="58"
+       x2="25.5942"
+       y2="119.0007"
+       id="XMLID_144_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2504"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2506"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="67"
+       y1="58.0005"
+       x2="67"
+       y2="119.0009"
+       id="XMLID_147_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2525"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2527"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="60.9995"
+       y1="58.0005"
+       x2="60.9995"
+       y2="119.0009"
+       id="XMLID_148_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2532"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2534"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="60.3325"
+       y1="67.612297"
+       x2="68.414902"
+       y2="103.9829"
+       id="XMLID_159_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2560"
+         style="stop-color:#515151;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2562"
+         style="stop-color:#343633;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#555753" />
+    </linearGradient>
+    <linearGradient
+       x1="56.890598"
+       y1="67.885696"
+       x2="68.891098"
+       y2="82.886398"
+       id="XMLID_160_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2567"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2569"
+         style="stop-color:#373836;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#555753" />
+    </linearGradient>
+    <linearGradient
+       x1="62.050301"
+       y1="69.625"
+       x2="67.049797"
+       y2="83.623703"
+       id="XMLID_161_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2574"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2576"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.1332" />
+      <stop
+         id="stop2578"
+         style="stop-color:#ecedec;stop-opacity:1"
+         offset="0.28760001" />
+      <stop
+         id="stop2580"
+         style="stop-color:#d5d6d5;stop-opacity:1"
+         offset="0.45249999" />
+      <stop
+         id="stop2582"
+         style="stop-color:#b5b6b4;stop-opacity:1"
+         offset="0.62489998" />
+      <stop
+         id="stop2584"
+         style="stop-color:#8c8d8a;stop-opacity:1"
+         offset="0.80320001" />
+      <stop
+         id="stop2586"
+         style="stop-color:#5a5c58;stop-opacity:1"
+         offset="0.98379999" />
+      <stop
+         id="stop2588"
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="0.6765"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#555753" />
+    </linearGradient>
+    <linearGradient
+       x1="63.542"
+       y1="74.091797"
+       x2="64.542198"
+       y2="79.093002"
+       id="XMLID_162_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2593"
+         style="stop-color:#a9ada4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2595"
+         style="stop-color:#3f403d;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#BABDB6" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#BABDB6" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#555753" />
+    </linearGradient>
+    <linearGradient
+       x1="61.315899"
+       y1="83.098602"
+       x2="68.3162"
+       y2="101.0992"
+       id="XMLID_163_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop4411"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.0056" />
+      <stop
+         id="stop4413"
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="0.13519999" />
+      <stop
+         id="stop2604"
+         style="stop-color:#cacac9;stop-opacity:1"
+         offset="0.384" />
+      <stop
+         id="stop4416"
+         style="stop-color:#8c8d8b;stop-opacity:1"
+         offset="0.72329998" />
+      <stop
+         id="stop4418"
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0056"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="0.5618"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#555753" />
+    </linearGradient>
+    <linearGradient
+       x1="61.706501"
+       y1="77.532204"
+       x2="67.761597"
+       y2="107.8077"
+       id="XMLID_164_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2613"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2615"
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#EEEEEC" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#BABDB6" />
+    </linearGradient>
+    <linearGradient
+       x1="62"
+       y1="76"
+       x2="66"
+       y2="76"
+       id="XMLID_165_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2620"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2622"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0.93260002" />
+      <stop
+         id="stop2624"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="0.9326"
+         style="stop-color:#D3D7CF" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#D3D7CF" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#888A85" />
+    </linearGradient>
+    <linearGradient
+       x1="63.105999"
+       y1="71.976601"
+       x2="65.105904"
+       y2="80.976501"
+       id="XMLID_166_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2629"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.0506" />
+      <stop
+         id="stop2631"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1" />
+      <a:midPointStop
+         offset="0.0506"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#D3D7CF" />
+    </linearGradient>
+    <linearGradient
+       x1="63.109283"
+       y1="123.58058"
+       x2="42.708179"
+       y2="36.313725"
+       id="linearGradient3174-5"
+       xlink:href="#linearGradient2257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.002688,0,0,1.002688,-28.61954,-155.7416)" />
+    <foreignObject
+       id="foreignObject3305"
+       height="1"
+       width="1"
+       y="0"
+       x="0"
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/">
+      <i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" />
+    </foreignObject>
+    <radialGradient
+       cx="51.9995"
+       cy="-9"
+       r="111.0006"
+       id="radialGradient4442"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.73145,-130.4544)">
+      <stop
+         id="stop3312"
+         style="stop-color:#80b3ff;stop-opacity:1"
+         offset="0.15000001" />
+      <stop
+         id="stop3314"
+         style="stop-color:#69a1f0;stop-opacity:1"
+         offset="0.31600001" />
+      <stop
+         id="stop3316"
+         style="stop-color:#4888da;stop-opacity:1"
+         offset="0.60290003" />
+      <stop
+         id="stop3318"
+         style="stop-color:#3378cc;stop-opacity:1"
+         offset="0.84119999" />
+      <stop
+         id="stop3320"
+         style="stop-color:#2c72c7;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="63.9995"
+       y1="25.1577"
+       x2="63.9995"
+       y2="157.6319"
+       id="XMLID_7_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.73145,-130.4544)">
+      <stop
+         id="stop3374"
+         style="stop-color:#bfd9ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3376"
+         style="stop-color:#80b3ff;stop-opacity:1"
+         offset="0.2189" />
+      <stop
+         id="stop3378"
+         style="stop-color:#6ea5f3;stop-opacity:1"
+         offset="0.2933" />
+      <stop
+         id="stop3380"
+         style="stop-color:#3e80d3;stop-opacity:1"
+         offset="0.44260001" />
+      <stop
+         id="stop3382"
+         style="stop-color:#2c72c7;stop-opacity:1"
+         offset="0.4941" />
+      <stop
+         id="stop3384"
+         style="stop-color:#00438a;stop-opacity:1"
+         offset="0.69999999" />
+    </linearGradient>
+    <linearGradient
+       x1="-37.875"
+       y1="48.787102"
+       x2="230.237"
+       y2="48.787102"
+       id="XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.73145,-130.4544)">
+      <stop
+         id="stop3389"
+         style="stop-color:#2c72c7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3391"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.29589999" />
+      <stop
+         id="stop3393"
+         style="stop-color:#2c72c7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="51.9995"
+       cy="-9"
+       r="111.0006"
+       id="radialGradient3616"
+       xlink:href="#XMLID_5_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.73145,-130.4544)" />
+    <linearGradient
+       x1="63.9995"
+       y1="25.1577"
+       x2="63.9995"
+       y2="157.6319"
+       id="linearGradient3618"
+       xlink:href="#XMLID_7_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.73145,-130.4544)" />
+    <linearGradient
+       x1="-37.875"
+       y1="48.787102"
+       x2="230.237"
+       y2="48.787102"
+       id="linearGradient3620"
+       xlink:href="#XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.73145,-130.4544)" />
+    <linearGradient
+       id="linearGradient2403">
+      <stop
+         id="stop2405"
+         style="stop-color:#28691f;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2407"
+         style="stop-color:#42ad33;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2389">
+      <stop
+         id="stop2391"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2393"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0.4375" />
+      <stop
+         id="stop2395"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0.56588125" />
+      <stop
+         id="stop2423"
+         style="stop-color:#000000;stop-opacity:0.24705882"
+         offset="0.76237977" />
+      <stop
+         id="stop2421"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         offset="0.77884614" />
+      <stop
+         id="stop2397"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.875" />
+      <stop
+         id="stop2411"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         offset="0.875" />
+      <stop
+         id="stop3938"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2362">
+      <stop
+         id="stop2364"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2366"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2321">
+      <stop
+         id="stop2323"
+         style="stop-color:#c3c3c3;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2325"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2287">
+      <stop
+         id="stop2299"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2307"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0.4375" />
+      <stop
+         id="stop2309"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0.58240438" />
+      <stop
+         id="stop2419"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         offset="0.76442307" />
+      <stop
+         id="stop3918"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.875" />
+      <stop
+         id="stop3920"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         offset="0.91826922" />
+      <stop
+         id="stop2417"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0.96048182" />
+      <stop
+         id="stop2291"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4492">
+      <stop
+         id="stop4494"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4496"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4498">
+      <stop
+         id="stop4500"
+         style="stop-color:#2d2d2d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4502"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop1492"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4505">
+      <stop
+         id="stop4507"
+         style="stop-color:#ffffff;stop-opacity:0.68345326"
+         offset="0" />
+      <stop
+         id="stop4509"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4511">
+      <stop
+         id="stop4513"
+         style="stop-color:#ffffff;stop-opacity:0.55035973"
+         offset="0" />
+      <stop
+         id="stop4515"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4517">
+      <stop
+         id="stop4519"
+         style="stop-color:#ffffff;stop-opacity:0.55035973"
+         offset="0" />
+      <stop
+         id="stop4521"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4523">
+      <stop
+         id="stop4525"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4527"
+         style="stop-color:#131313;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4535">
+      <stop
+         id="stop4537"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4539"
+         style="stop-color:#aeaeae;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4547">
+      <stop
+         id="stop4549"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4551"
+         style="stop-color:#252525;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3876">
+      <stop
+         id="stop3878"
+         style="stop-color:#b4942a;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3880"
+         style="stop-color:#e4dcc9;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="63.912209"
+       cy="115.70919"
+       r="63.912209"
+       fx="63.912209"
+       fy="115.7093"
+       id="radialGradient1527"
+       xlink:href="#linearGradient3291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" />
+    <radialGradient
+       cx="42.617531"
+       cy="120.64188"
+       r="3.406888"
+       fx="42.617531"
+       fy="120.64188"
+       id="radialGradient1405"
+       xlink:href="#linearGradient2257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.519831,0.09412826,-0.895354,13.78472,115.1882,-1545.166)" />
+    <radialGradient
+       cx="95.505852"
+       cy="59.591507"
+       r="47.746403"
+       fx="95.505852"
+       fy="59.591507"
+       id="radialGradient1407"
+       xlink:href="#linearGradient3311"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0622884,-1.47547e-4,0.00188971,0.798624,69.12243,5.487066)" />
+    <radialGradient
+       cx="49.009884"
+       cy="8.4953117"
+       r="3.9750404"
+       fx="47.370888"
+       fy="6.7701697"
+       id="radialGradient1409"
+       xlink:href="#linearGradient3225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.297066,0.00301262,-0.00113473,0.488669,7.096503,-13.69501)" />
+    <linearGradient
+       x1="48.914677"
+       y1="2.9719031"
+       x2="48.913002"
+       y2="2.5548496"
+       id="linearGradient1411"
+       xlink:href="#linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.29707,0,0,1.29707,7.064707,-20.57911)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1413"
+       xlink:href="#linearGradient3207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.29707,0,0,0.1578,7.064707,-17.56653)" />
+    <linearGradient
+       x1="48.498562"
+       y1="0.81150496"
+       x2="48.732723"
+       y2="2.3657269"
+       id="linearGradient1415"
+       xlink:href="#linearGradient3235"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.297066,0.00301262,-0.00301262,1.297066,7.112448,-20.56258)" />
+    <linearGradient
+       x1="46.051746"
+       y1="3.0999987"
+       x2="46.051746"
+       y2="2.395859"
+       id="linearGradient1417"
+       xlink:href="#linearGradient3251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.28993,0,0,1.29707,7.402337,-20.57911)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1419"
+       xlink:href="#linearGradient3273-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.860164,0,0,0.1578,24.75801,-17.56653)" />
+    <linearGradient
+       x1="46.051746"
+       y1="3.0999987"
+       x2="46.051746"
+       y2="2.395859"
+       id="linearGradient1421"
+       xlink:href="#linearGradient3251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.279856,0,0,1.29707,-133.3868,-20.57911)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1423"
+       xlink:href="#linearGradient3259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.853446,0,0,0.1578,-116.1668,-17.56653)" />
+    <radialGradient
+       cx="34.677639"
+       cy="7.4622769"
+       r="47.595196"
+       fx="34.677639"
+       fy="7.4622769"
+       id="radialGradient1425"
+       xlink:href="#linearGradient3303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.02608014,0,7.26766)" />
+    <radialGradient
+       cx="34.677639"
+       cy="7.4622769"
+       r="47.595196"
+       fx="34.677639"
+       fy="7.4622769"
+       id="radialGradient1427"
+       xlink:href="#linearGradient3325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.511766,-0.00686574,4.187271e-5,-0.00911064,87.10184,7.76835)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1433"
+       xlink:href="#linearGradient3259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.853446,0,0,0.1578,-115.9141,-7.300115)" />
+    <linearGradient
+       x1="46.051746"
+       y1="3.0999987"
+       x2="46.051746"
+       y2="2.395859"
+       id="linearGradient1436"
+       xlink:href="#linearGradient3251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.279856,0,0,1.29707,-133.1341,-10.31269)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1439"
+       xlink:href="#linearGradient3273-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.860164,0,0,0.1578,24.50481,-7.300115)" />
+    <linearGradient
+       x1="46.051746"
+       y1="3.0999987"
+       x2="46.051746"
+       y2="2.395859"
+       id="linearGradient1442"
+       xlink:href="#linearGradient3251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.28993,0,0,1.29707,7.14915,-10.31269)" />
+    <linearGradient
+       x1="48.498562"
+       y1="0.81150496"
+       x2="48.732723"
+       y2="2.3657269"
+       id="linearGradient1445"
+       xlink:href="#linearGradient3235"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.297068,-0.00188004,0.00188004,1.297068,6.796523,-10.3225)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1448"
+       xlink:href="#linearGradient3207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.29707,0,0,0.1578,6.81152,-7.300115)" />
+    <linearGradient
+       x1="48.914677"
+       y1="2.9719031"
+       x2="48.913002"
+       y2="2.5548496"
+       id="linearGradient1451"
+       xlink:href="#linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.29707,0,0,1.29707,6.81152,-10.31269)" />
+    <radialGradient
+       cx="49.009884"
+       cy="8.4953117"
+       r="3.9750404"
+       fx="47.370888"
+       fy="6.7701697"
+       id="radialGradient1455"
+       xlink:href="#linearGradient3225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.297068,-0.00188004,7.085819e-4,0.48867,6.806484,-3.45491)" />
+    <radialGradient
+       cx="95.505852"
+       cy="59.591507"
+       r="47.746403"
+       fx="95.505852"
+       fy="59.591507"
+       id="radialGradient1462"
+       xlink:href="#linearGradient3311"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06228741,-3.825032e-4,0.00490218,0.798611,68.90433,5.49306)" />
+    <radialGradient
+       cx="42.617531"
+       cy="120.64188"
+       r="3.406888"
+       fx="42.617531"
+       fy="120.64188"
+       id="radialGradient1466"
+       xlink:href="#linearGradient2257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.520175,0.08839467,-0.843351,13.788,109.1206,-1545.323)" />
+    <radialGradient
+       cx="34.677639"
+       cy="7.4622769"
+       r="47.595196"
+       fx="34.677639"
+       fy="7.4622769"
+       id="radialGradient1470"
+       xlink:href="#linearGradient3325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.511766,-0.00686574,4.187271e-5,-0.00911064,87.10184,7.76835)" />
+    <linearGradient
+       x1="74.332748"
+       y1="17.912012"
+       x2="54.983063"
+       y2="90.126022"
+       id="linearGradient2368"
+       xlink:href="#linearGradient2362"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.180422,0,0,1.180422,-10.39088,-10.58642)" />
+    <linearGradient
+       id="linearGradient7281">
+      <stop
+         id="stop7283"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop7285"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="97.124756"
+       y1="99.590462"
+       x2="33.355057"
+       y2="22.203432"
+       id="linearGradient4030"
+       xlink:href="#linearGradient2403"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.065955,0,0,1.065955,-4.218613,-1.697485)" />
+    <linearGradient
+       x1="74.514832"
+       y1="17.232468"
+       x2="52.587749"
+       y2="99.06546"
+       id="linearGradient4032"
+       xlink:href="#linearGradient2362"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.258277,0,0,1.258277,-15.29483,-12.98214)" />
+    <radialGradient
+       cx="64.37719"
+       cy="123.41074"
+       r="64.122231"
+       fx="31.487459"
+       fy="123.41074"
+       id="radialGradient2351"
+       xlink:href="#linearGradient2345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.08747514,0,112.6154)" />
+    <linearGradient
+       x1="-39.098888"
+       y1="103.68449"
+       x2="-44.159863"
+       y2="97.761848"
+       id="linearGradient1468"
+       xlink:href="#linearGradient3149"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="-24.85253"
+       cy="99.774971"
+       r="46"
+       fx="-24.85253"
+       fy="99.774971"
+       id="radialGradient4136"
+       xlink:href="#linearGradient3139"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.778981,-0.705005,0.742951,0.820909,-84.56197,13.42081)" />
+    <radialGradient
+       cx="-25"
+       cy="106.49996"
+       r="45"
+       fx="-25"
+       fy="106.49996"
+       id="radialGradient1464"
+       xlink:href="#linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.888472,-0.05288986,0.05892076,3.079452,42.93675,-212.2837)" />
+    <linearGradient
+       x1="-39.098888"
+       y1="103.68449"
+       x2="-44.159863"
+       y2="97.761848"
+       id="linearGradient1462"
+       xlink:href="#linearGradient3149"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="-24.85253"
+       cy="99.774971"
+       r="46"
+       fx="-24.85253"
+       fy="99.774971"
+       id="radialGradient1460"
+       xlink:href="#linearGradient3139"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.778981,-0.705005,0.742951,0.820909,-84.56197,13.42081)" />
+    <radialGradient
+       cx="-25"
+       cy="106.49996"
+       r="45"
+       fx="-25"
+       fy="106.49996"
+       id="radialGradient1458"
+       xlink:href="#linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.888472,-0.05288986,0.05892076,3.079452,42.93675,-212.2837)" />
+    <linearGradient
+       id="linearGradient3075">
+      <stop
+         id="stop3077"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3093"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.42597079" />
+      <stop
+         id="stop3085"
+         style="stop-color:#f1f1f1;stop-opacity:1"
+         offset="0.5892781" />
+      <stop
+         id="stop3087"
+         style="stop-color:#eaeaea;stop-opacity:1"
+         offset="0.80219781" />
+      <stop
+         id="stop3079"
+         style="stop-color:#dfdfdf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4610">
+      <stop
+         id="stop3141"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3162"
+         style="stop-color:#000000;stop-opacity:0.68235296"
+         offset="0.40659341" />
+      <stop
+         id="stop3164"
+         style="stop-color:#000000;stop-opacity:0.48736462"
+         offset="0.45329672" />
+      <stop
+         id="stop3158"
+         style="stop-color:#000000;stop-opacity:0.36101082"
+         offset="0.5" />
+      <stop
+         id="stop3160"
+         style="stop-color:#000000;stop-opacity:0.15162455"
+         offset="0.70604396" />
+      <stop
+         id="stop3143"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3149">
+      <stop
+         id="stop3151"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3153"
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2345">
+      <stop
+         id="stop2347"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2349"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="74.0625"
+       y1="85.125"
+       x2="108.0625"
+       y2="126.0625"
+       id="linearGradient3142"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.32864,15.14423)" />
+    <linearGradient
+       x1="39.8125"
+       y1="79.125"
+       x2="45.3125"
+       y2="138.875"
+       id="linearGradient3139"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.460421,14.24993)" />
+    <linearGradient
+       x1="34.5625"
+       y1="99.375"
+       x2="44.0625"
+       y2="125.125"
+       id="linearGradient3136-6"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.592202,13.35563)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="36.3125"
+       y2="128.3125"
+       id="linearGradient3133"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.236393,15.77024)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="72.327019"
+       y2="133.3125"
+       id="linearGradient3130-8"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.763517,12.19304)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="72.327019"
+       y2="133.3125"
+       id="linearGradient3127"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.104612,16.66454)" />
+    <linearGradient
+       x1="53.777279"
+       y1="53.014202"
+       x2="34.243549"
+       y2="148.6344"
+       id="linearGradient3124"
+       xlink:href="#linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,-22.16131,-210.4306)" />
+    <linearGradient
+       x1="53.777279"
+       y1="53.014202"
+       x2="34.243549"
+       y2="148.6344"
+       id="linearGradient3121"
+       xlink:href="#linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,-22.16131,-210.4306)" />
+    <radialGradient
+       cx="63.912209"
+       cy="115.70919"
+       r="63.912209"
+       fx="33.029083"
+       fy="128.57854"
+       id="radialGradient2211"
+       xlink:href="#linearGradient3291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" />
+    <linearGradient
+       id="linearGradient2598">
+      <stop
+         id="stop2600"
+         style="stop-color:#252525;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2606"
+         style="stop-color:#252525;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2608"
+         style="stop-color:#252525;stop-opacity:1"
+         offset="0.75" />
+      <stop
+         id="stop2602"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3325">
+      <stop
+         id="stop3327"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3329"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3311">
+      <stop
+         id="stop3313"
+         style="stop-color:#2d2d2d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3319"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3315"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3303">
+      <stop
+         id="stop3305"
+         style="stop-color:#ffffff;stop-opacity:0.68345326"
+         offset="0" />
+      <stop
+         id="stop3307"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3291">
+      <stop
+         id="stop3293"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3295"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3273-9">
+      <stop
+         id="stop3275-5"
+         style="stop-color:#ffffff;stop-opacity:0.55035973"
+         offset="0" />
+      <stop
+         id="stop3277-4"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3259">
+      <stop
+         id="stop3261"
+         style="stop-color:#ffffff;stop-opacity:0.55035973"
+         offset="0" />
+      <stop
+         id="stop3263"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3251">
+      <stop
+         id="stop3253"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3255"
+         style="stop-color:#131313;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3235">
+      <stop
+         id="stop3237"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3239"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3225">
+      <stop
+         id="stop3227"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3229"
+         style="stop-color:#aeaeae;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3217">
+      <stop
+         id="stop3219"
+         style="stop-color:#252525;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3221"
+         style="stop-color:#252525;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3207">
+      <stop
+         id="stop3209"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3211"
+         style="stop-color:#252525;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2257">
+      <stop
+         id="stop2259"
+         style="stop-color:#b4942a;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2261"
+         style="stop-color:#e4dcc9;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="34.677639"
+       cy="7.4622769"
+       r="47.595196"
+       fx="34.677639"
+       fy="7.4622769"
+       id="radialGradient1539"
+       xlink:href="#linearGradient3303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.02608014,0,7.26766)" />
+    <radialGradient
+       cx="34.677639"
+       cy="7.4622769"
+       r="47.595196"
+       fx="34.677639"
+       fy="7.4622769"
+       id="radialGradient1541"
+       xlink:href="#linearGradient3325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5103,0.00264127,-1.167078e-4,-0.00911022,87.0522,7.438666)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1547"
+       xlink:href="#linearGradient3259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.853446,0,0,0.1578,-62.04115,15.05256)" />
+    <linearGradient
+       x1="46.051746"
+       y1="3.0999987"
+       x2="46.051746"
+       y2="2.395859"
+       id="linearGradient1550"
+       xlink:href="#linearGradient3251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(53.87194,19.35268)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1553"
+       xlink:href="#linearGradient3273-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.860164,0,0,0.1578,-29.37149,15.05256)" />
+    <linearGradient
+       x1="46.051746"
+       y1="3.0999987"
+       x2="46.051746"
+       y2="2.395859"
+       id="linearGradient1556"
+       xlink:href="#linearGradient3251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.28993,0,0,1.29707,-46.7271,12.03998)" />
+    <linearGradient
+       x1="48.498562"
+       y1="0.81150496"
+       x2="48.732723"
+       y2="2.3657269"
+       id="linearGradient1559"
+       xlink:href="#linearGradient3235"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.297068,-0.00188004,0.00188004,1.297068,-47.04731,12.10823)" />
+    <radialGradient
+       cx="49.011971"
+       cy="2.6743078"
+       r="1.7246193"
+       fx="49.011971"
+       fy="2.6743078"
+       id="radialGradient1562"
+       xlink:href="#linearGradient3207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.29707,0,0,0.1578,-47.06473,15.05256)" />
+    <linearGradient
+       x1="48.914677"
+       y1="2.9719031"
+       x2="48.913002"
+       y2="2.5548496"
+       id="linearGradient1565"
+       xlink:href="#linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.29707,0,0,1.29707,-47.06473,12.03998)" />
+    <radialGradient
+       cx="49.009884"
+       cy="8.4953117"
+       r="3.9750404"
+       fx="47.370888"
+       fy="6.7701697"
+       id="radialGradient1569"
+       xlink:href="#linearGradient3225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.297068,-0.00188004,7.085819e-4,0.48867,-47.03734,18.97582)" />
+    <radialGradient
+       cx="95.505852"
+       cy="59.591507"
+       r="47.746403"
+       fx="95.505852"
+       fy="59.591507"
+       id="radialGradient1576"
+       xlink:href="#linearGradient3311"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06228741,-3.825032e-4,0.00490218,0.798611,15.0605,-17.07621)" />
+    <radialGradient
+       cx="42.617531"
+       cy="120.64188"
+       r="3.406888"
+       fx="42.617531"
+       fy="120.64188"
+       id="radialGradient1580"
+       xlink:href="#linearGradient2257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.520175,0.08839467,-0.843351,13.788,55.27677,-1567.892)" />
+    <linearGradient
+       x1="52.984856"
+       y1="68.390213"
+       x2="113.21912"
+       y2="49.390213"
+       id="linearGradient2919"
+       xlink:href="#linearGradient2913"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.32864,15.14423)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="72.327019"
+       y2="133.3125"
+       id="linearGradient5503"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1.7)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="72.327019"
+       y2="133.3125"
+       id="linearGradient5499"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-3.3)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="36.3125"
+       y2="128.3125"
+       id="linearGradient5495"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.7)" />
+    <linearGradient
+       x1="34.5625"
+       y1="99.375"
+       x2="44.0625"
+       y2="125.125"
+       id="linearGradient5491"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-2)" />
+    <linearGradient
+       x1="39.8125"
+       y1="79.125"
+       x2="45.3125"
+       y2="138.875"
+       id="linearGradient5487"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       x1="74.0625"
+       y1="85.125"
+       x2="108.0625"
+       y2="126.0625"
+       id="linearGradient5483"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="51.9995"
+       cy="-9"
+       r="111.0006"
+       id="XMLID_5_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop4094"
+         style="stop-color:#80b3ff;stop-opacity:1"
+         offset="0.15000001" />
+      <stop
+         id="stop4096"
+         style="stop-color:#69a1f0;stop-opacity:1"
+         offset="0.31600001" />
+      <stop
+         id="stop4098"
+         style="stop-color:#4888da;stop-opacity:1"
+         offset="0.60290003" />
+      <stop
+         id="stop4100"
+         style="stop-color:#3378cc;stop-opacity:1"
+         offset="0.84119999" />
+      <stop
+         id="stop4102"
+         style="stop-color:#2c72c7;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="92.956825"
+       y1="-8.9549065"
+       x2="59.82354"
+       y2="206.72591"
+       id="linearGradient5127"
+       xlink:href="#XMLID_5_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.863129,-0.127189,0.127189,0.863129,-5.028673,16.14959)" />
+    <linearGradient
+       x1="53.777279"
+       y1="53.014202"
+       x2="34.243549"
+       y2="148.6344"
+       id="linearGradient4080"
+       xlink:href="#linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(29.25574,0.251683)" />
+    <linearGradient
+       x1="53.777279"
+       y1="53.014202"
+       x2="34.243549"
+       y2="148.6344"
+       id="linearGradient4078"
+       xlink:href="#linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(29.25574,0.251683)" />
+    <linearGradient
+       x1="36.10664"
+       y1="42.068642"
+       x2="38.780388"
+       y2="40.875401"
+       id="linearGradient4075"
+       xlink:href="#linearGradient3742"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="4.5181999"
+       y1="41.236893"
+       x2="18.826626"
+       y2="38.015541"
+       id="linearGradient4071"
+       xlink:href="#linearGradient3814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="32.438522"
+       y1="40"
+       x2="33.050251"
+       y2="42.76342"
+       id="linearGradient4068"
+       xlink:href="#linearGradient3695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient4064"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.906001,4.549312)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient4061"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.906001,4.549312)" />
+    <linearGradient
+       x1="11.967802"
+       y1="50.304192"
+       x2="15.346087"
+       y2="57.638905"
+       id="linearGradient4057"
+       xlink:href="#linearGradient3756"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="15.6875"
+       y1="48.890625"
+       x2="16.25"
+       y2="54.984375"
+       id="linearGradient4054"
+       xlink:href="#linearGradient3783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="15.6875"
+       y1="48.890625"
+       x2="16.753466"
+       y2="55.4375"
+       id="linearGradient4051"
+       xlink:href="#linearGradient3783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="5.323966"
+       y1="55.630238"
+       x2="16.25"
+       y2="54.984375"
+       id="linearGradient4048"
+       xlink:href="#linearGradient3783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="6.28125"
+       y1="35.763672"
+       x2="14.3125"
+       y2="35.763672"
+       id="linearGradient4045"
+       xlink:href="#linearGradient3804"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="20.606983"
+       y1="54.213417"
+       x2="14.043751"
+       y2="16.4375"
+       id="linearGradient4042"
+       xlink:href="#linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient4037"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient4034"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient4031"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <radialGradient
+       cx="-36.857941"
+       cy="75.225319"
+       r="0.9722718"
+       fx="-36.857941"
+       fy="75.225319"
+       id="radialGradient4027"
+       xlink:href="#linearGradient3853"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.817786,-0.235747,26.77623,94.95694,-1932.687,-7041.733)" />
+    <linearGradient
+       x1="28.138407"
+       y1="5.6195269"
+       x2="29.138409"
+       y2="16.588285"
+       id="linearGradient4020"
+       xlink:href="#linearGradient3771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,0.869215,-20.07375)" />
+    <linearGradient
+       x1="28.138407"
+       y1="5.6195269"
+       x2="29.138409"
+       y2="16.588285"
+       id="linearGradient4017"
+       xlink:href="#linearGradient3771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,0.869215,-20.07375)" />
+    <linearGradient
+       x1="28.138407"
+       y1="5.6195269"
+       x2="29.138409"
+       y2="16.588285"
+       id="linearGradient4014"
+       xlink:href="#linearGradient3771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,0.776179,-20.42097)" />
+    <linearGradient
+       id="linearGradient3695">
+      <stop
+         id="stop3697"
+         style="stop-color:#626262;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3699"
+         style="stop-color:#efefef;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3710">
+      <stop
+         id="stop3712"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3714"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3742">
+      <stop
+         id="stop3744"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3746"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3756">
+      <stop
+         id="stop3758"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3760"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3771">
+      <stop
+         id="stop3773"
+         style="stop-color:#f7fafe;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3775"
+         style="stop-color:#f7fafe;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3783">
+      <stop
+         id="stop3785"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3787"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3804">
+      <stop
+         id="stop3806"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3808"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3814">
+      <stop
+         id="stop3816"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3824"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.18531764" />
+      <stop
+         id="stop3822"
+         style="stop-color:#ffffff;stop-opacity:0.33574006"
+         offset="0.28106508" />
+      <stop
+         id="stop3829"
+         style="stop-color:#ffffff;stop-opacity:0.1696751"
+         offset="0.45126861" />
+      <stop
+         id="stop3831"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.47940481" />
+      <stop
+         id="stop3833"
+         style="stop-color:#ffffff;stop-opacity:0.3068592"
+         offset="0.65610015" />
+      <stop
+         id="stop3818"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         id="stop3839"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3849"
+         style="stop-color:#000000;stop-opacity:0.59927797"
+         offset="0.25" />
+      <stop
+         id="stop3847"
+         style="stop-color:#000000;stop-opacity:0.27797833"
+         offset="0.5" />
+      <stop
+         id="stop3841"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3853">
+      <stop
+         id="stop3855"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3857"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3880">
+      <stop
+         id="stop3882"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3884"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5477">
+      <stop
+         id="stop5479"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5481"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2913">
+      <stop
+         id="stop2915"
+         style="stop-color:#a4c0e4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2917"
+         style="stop-color:#a4c0e4;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2971">
+      <stop
+         id="stop2973"
+         style="stop-color:#debc85;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2975"
+         style="stop-color:#debc85;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3866">
+      <stop
+         id="stop3868"
+         style="stop-color:#b67e28;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3870"
+         style="stop-color:#543a12;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="63.109283"
+       y1="123.58058"
+       x2="42.708179"
+       y2="36.313725"
+       id="linearGradient5445"
+       xlink:href="#linearGradient6332"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.002688,0,0,1.002688,-149.546,-140.4106)" />
+    <linearGradient
+       id="linearGradient6332">
+      <stop
+         id="stop6334"
+         style="stop-color:#8f6b32;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6336"
+         style="stop-color:#debc85;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5176">
+      <stop
+         id="stop5178"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5180"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2856">
+      <stop
+         id="stop2858-5"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2864-9"
+         style="stop-color:#000000;stop-opacity:0.23843417"
+         offset="0.66371679" />
+      <stop
+         id="stop2860"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2599">
+      <stop
+         id="stop2601"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2603"
+         style="stop-color:#000000;stop-opacity:0.23843417"
+         offset="0.66371679" />
+      <stop
+         id="stop2605"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2846">
+      <stop
+         id="stop2848"
+         style="stop-color:#8bb4e6;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3041"
+         style="stop-color:#89b2e2;stop-opacity:1"
+         offset="0.57999998" />
+      <stop
+         id="stop2850"
+         style="stop-color:#c5daf3;stop-opacity:0.59493673"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2895">
+      <stop
+         id="stop2897"
+         style="stop-color:#abc7e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3338"
+         style="stop-color:#c9dce8;stop-opacity:0.42352942"
+         offset="0.27083334" />
+      <stop
+         id="stop2899"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3350">
+      <stop
+         id="stop3352"
+         style="stop-color:#a3a5a8;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3354"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="36.10664"
+       y1="42.068642"
+       x2="38.780388"
+       y2="40.875401"
+       id="linearGradient5464"
+       xlink:href="#linearGradient3742"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="4.5181999"
+       y1="41.236893"
+       x2="18.826626"
+       y2="38.015541"
+       id="linearGradient5466"
+       xlink:href="#linearGradient3814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="32.438522"
+       y1="40"
+       x2="33.050251"
+       y2="42.76342"
+       id="linearGradient5468"
+       xlink:href="#linearGradient3695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient5470"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.906001,4.549312)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient5472"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.906001,4.549312)" />
+    <linearGradient
+       x1="74.0625"
+       y1="85.125"
+       x2="108.0625"
+       y2="126.0625"
+       id="linearGradient5474"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.32864,15.14423)" />
+    <linearGradient
+       x1="39.8125"
+       y1="79.125"
+       x2="45.3125"
+       y2="138.875"
+       id="linearGradient5476"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.460421,14.24993)" />
+    <linearGradient
+       x1="34.5625"
+       y1="99.375"
+       x2="44.0625"
+       y2="125.125"
+       id="linearGradient5478"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.592202,13.35563)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="36.3125"
+       y2="128.3125"
+       id="linearGradient5480"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.236393,15.77024)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="72.327019"
+       y2="133.3125"
+       id="linearGradient5482"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.763517,12.19304)" />
+    <linearGradient
+       x1="82.3125"
+       y1="61.875"
+       x2="72.327019"
+       y2="133.3125"
+       id="linearGradient5484"
+       xlink:href="#linearGradient5477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.894299,-0.131781,0.131781,0.894299,-7.104612,16.66454)" />
+    <linearGradient
+       x1="11.967802"
+       y1="50.304192"
+       x2="15.346087"
+       y2="57.638905"
+       id="linearGradient5486"
+       xlink:href="#linearGradient3756"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="15.6875"
+       y1="48.890625"
+       x2="16.25"
+       y2="54.984375"
+       id="linearGradient5488"
+       xlink:href="#linearGradient3783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="15.6875"
+       y1="48.890625"
+       x2="16.753466"
+       y2="55.4375"
+       id="linearGradient5490"
+       xlink:href="#linearGradient3783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="5.323966"
+       y1="55.630238"
+       x2="16.25"
+       y2="54.984375"
+       id="linearGradient5492"
+       xlink:href="#linearGradient3783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="6.28125"
+       y1="35.763672"
+       x2="14.3125"
+       y2="35.763672"
+       id="linearGradient5494"
+       xlink:href="#linearGradient3804"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="20.606983"
+       y1="54.213417"
+       x2="14.043751"
+       y2="16.4375"
+       id="linearGradient5496"
+       xlink:href="#linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,1.008769,-19.55292)" />
+    <linearGradient
+       x1="65.152779"
+       y1="84.233597"
+       x2="60.748249"
+       y2="7.3806944"
+       id="linearGradient5498"
+       xlink:href="#linearGradient4281"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient5500"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <radialGradient
+       cx="-36.857941"
+       cy="75.225319"
+       r="0.9722718"
+       fx="-36.857941"
+       fy="75.225319"
+       id="radialGradient5502"
+       xlink:href="#linearGradient3853"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.817786,-0.235747,26.77623,94.95694,-1932.687,-7041.733)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient5504"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="4.9107008"
+       y1="44.649334"
+       x2="58.884792"
+       y2="36.866131"
+       id="linearGradient5506"
+       xlink:href="#linearGradient3710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.568107,-0.173376,0.173376,2.568107,4.336024,-3.091734)" />
+    <linearGradient
+       x1="53.777279"
+       y1="53.014202"
+       x2="34.243549"
+       y2="148.6344"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,-22.16131,-210.4306)" />
+    <linearGradient
+       x1="53.777279"
+       y1="53.014202"
+       x2="34.243549"
+       y2="148.6344"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,-22.16131,-210.4306)" />
+    <linearGradient
+       x1="28.138407"
+       y1="5.6195269"
+       x2="29.138409"
+       y2="16.588285"
+       id="linearGradient5512"
+       xlink:href="#linearGradient3771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,0.869215,-20.07375)" />
+    <linearGradient
+       x1="28.138407"
+       y1="5.6195269"
+       x2="29.138409"
+       y2="16.588285"
+       id="linearGradient5514"
+       xlink:href="#linearGradient3771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,0.869215,-20.07375)" />
+    <linearGradient
+       x1="28.138407"
+       y1="5.6195269"
+       x2="29.138409"
+       y2="16.588285"
+       id="linearGradient5516"
+       xlink:href="#linearGradient3771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.438565,-0.164632,0.164632,2.438565,0.776179,-20.42097)" />
+    <linearGradient
+       x1="57.495758"
+       y1="109.4044"
+       x2="92.984146"
+       y2="27.73357"
+       id="linearGradient5518"
+       xlink:href="#linearGradient2971"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata1312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       d="m -228.9185,-67.271774 0,-2.794709 0,2.794709 z"
+       id="path2276"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+    <path
+       d="m 65.6909,-129.46266 0,-2.79471 0,2.79471 z"
+       id="path2191"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+    <path
+       d="m -52.477129,-94.134134 c -5.3396,0 -9.65625,4.316653 -9.65625,9.65625 l 0,8.375 -48.250001,0 c -5.3396,0 -9.65625,4.285407 -9.65625,9.625 l 0,40.750008 c 0,5.33959 4.31665,9.625 9.65625,9.625 l 57.906251,0 37.562499,0 1.0625,0 c 5.3396,0 9.625,-4.2854 9.625,-9.625 l 0,-58.750008 c 0,-5.339595 -4.28541,-9.65625 -9.625,-9.65625 l -38.624999,0 z"
+       id="path2860"
+       style="opacity:0.06147539;fill:none;stroke:none" />
+    <path
+       d="m -91.3174,-199.09776 0,-2.79471 0,2.79471 z"
+       id="path2985"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+    <path
+       d="m -210.8196,-285.72801 0,-2.79471 0,2.79471 z"
+       id="path3206"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+    <g
+       transform="translate(-27.868,-141.1464)"
+       id="layer4"
+       style="display:inline" />
+    <g
+       transform="translate(-27.868,-141.1464)"
+       id="layer5"
+       style="display:inline" />
+    <path
+       d="m 35.7718,-219.97274 0,-2.79471 0,2.79471 z"
+       id="path3946"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+    <path
+       d="m -56.852646,-146.07906 0,-1.52674 0,1.52674 z"
+       id="path1561"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+    <rect
+       width="1"
+       height="0"
+       x="-114.33738"
+       y="-202.67905"
+       id="rect1327"
+       style="opacity:0.57786889;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <rect
+       width="1"
+       height="0"
+       x="-149.4642"
+       y="-230.20667"
+       id="rect2482"
+       style="opacity:0.57786889;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       d="m -308.40162,-303.42273 0,-2.79471 0,2.79471 z"
+       id="path2494"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+    <g
+       transform="matrix(-0.782995,0,0,0.650879,-2631.26,383.0949)"
+       id="g4640"
+       style="opacity:0.40163933" />
+    <g
+       transform="matrix(-0.782995,0,0,0.650879,-2631.26,383.0949)"
+       id="g4646"
+       style="opacity:0.40163933" />
+    <g
+       transform="matrix(1,0,0,0.650879,569.7028,390.4227)"
+       id="g4730"
+       style="opacity:0.40163933" />
+    <g
+       transform="matrix(1,0,0,0.650879,569.7028,390.4227)"
+       id="g4748"
+       style="opacity:0.40163933" />
+    <g
+       transform="translate(9.0637657,0.81067799)"
+       id="g3144">
+      <path
+         d="M 83.629939,3.0290594 21.008091,19.59542 c -0.03634,0.0098 -0.07127,0.02416 -0.103923,0.04287 l -0.86938,0.458812 -0.748136,-0.02755 c -0.03665,-0.0085 -0.07425,-0.01222 -0.111863,-0.01107 l -6.508967,1.648109 c -1.447809,0.381927 -2.352854,1.878293 -2.017308,3.328697 0.0063,0.02744 0.0047,0.05351 0.01192,0.08092 l 0.515523,7.612847 c 0.0014,0.02728 0.0054,0.05438 0.01193,0.08092 L 33.96305,118.3575 c 0.01,0.008 0.0203,0.0158 0.03095,0.023 0.384723,1.12612 1.057717,2.08701 1.912761,2.69446 0.847447,0.60204 1.886273,0.84784 2.913337,0.50767 l 0.02697,-0.004 71.976522,-19.86594 c 1.97664,-0.52143 3.10531,-2.54855 2.58661,-4.51492 -0.001,-0.009 -0.002,-0.01803 -0.004,-0.02697 l -1.40313,-4.285276 c 0.73991,-0.89511 1.10323,-2.073337 0.78368,-3.284702 -0.001,-0.009 -0.002,-0.01804 -0.004,-0.02698 L 88.094888,5.6505742 c -0.0023,-0.00878 -0.0016,-0.018222 -0.004,-0.026975 -0.529929,-1.9520977 -2.5043,-3.1106952 -4.460949,-2.5945398 z"
+         id="path5301"
+         style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 84.372929,4.1299189 -56.91783,15.1822161 -5.680755,1.470948 -0.946322,0.497708 -0.88698,-0.03465 -6.508967,1.648107 c -1.244428,0.328277 -2.000612,1.620063 -1.672337,2.864487 l 0.527451,7.693764 22.77516,85.547531 c 0.716418,2.09701 2.526908,3.53026 4.315897,2.91907 l 72.003494,-19.86993 c 1.74579,-0.46053 2.73709,-2.254923 2.27653,-4.000743 l -1.45391,-4.443134 c 0.78455,-0.800107 1.13931,-1.983159 0.83051,-3.15381 L 88.319735,6.4144062 C 87.859215,4.6686023 86.118738,3.669382 84.372929,4.1299189 z"
+         id="path5441"
+         style="opacity:0.05;fill:none;stroke:#000000;stroke-width:6.10714769;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:4" />
+      <path
+         d="m 84.856475,4.2012341 -56.941097,15.0954149 -5.680755,1.470948 -0.946322,0.497708 -0.886981,-0.03465 -5.911587,1.587639 c -1.244428,0.328275 -2.000612,1.620062 -1.672339,2.864485 l 0.442556,7.678717 22.542953,84.880204 c 0.716421,2.09703 2.52691,3.53028 4.315888,2.91908 l 13.278011,-3.77547 0.02697,-0.004 58.229528,-16.09932 c 1.7458,-0.46053 2.73709,-2.254932 2.27654,-4.000742 l -1.73419,-3.700304 c 0.78455,-0.800125 1.13931,-1.983159 0.83051,-3.153818 L 88.803273,6.4857242 C 88.342752,4.7399199 86.602284,3.7406976 84.856475,4.2012341 z"
+         id="path5469"
+         style="opacity:0.3;fill:none;stroke:#000000;stroke-width:0.87244964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:4" />
+      <path
+         d="M 83.962168,4.3330182 27.021079,19.42843 l -5.680755,1.470949 -0.946322,0.497707 -0.886981,-0.03465 -6.508966,1.648108 c -1.244427,0.328276 -2.000611,1.620061 -1.672338,2.864487 l 0.527456,7.693764 22.775156,85.547535 c 0.716418,2.097 2.526908,3.53025 4.315896,2.91906 l 72.003495,-19.86992 c 1.74579,-0.46053 2.73708,-2.254923 2.27653,-4.000743 l -1.45391,-4.443139 c 0.78456,-0.800107 1.13931,-1.983158 0.83051,-3.153809 L 87.908975,6.6175062 C 87.448454,4.8717016 85.707977,3.8724813 83.962168,4.3330182 z"
+         id="path5439"
+         style="opacity:0.1;fill:none;stroke:#000000;stroke-width:4.36224794;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:4" />
+      <path
+         d="m 83.938909,4.246214 -57.812128,15.313998 -5.680756,1.470949 -0.946322,0.497707 -0.886981,-0.03465 -6.508966,1.648108 c -1.244427,0.328276 -2.000611,1.620062 -1.672337,2.864486 l 0.527451,7.693764 22.775159,85.547534 c 0.716418,2.097 2.526909,3.53025 4.315897,2.91906 l 13.278002,-3.77548 0.02697,-0.004 58.698532,-16.09046 c 1.74579,-0.46053 2.73708,-2.25492 2.27652,-4.000743 l -1.45392,-4.443129 c 0.78455,-0.800115 1.13932,-1.983167 0.83051,-3.153817 L 87.885715,6.5307022 C 87.425195,4.7848976 85.684718,3.7856776 83.938909,4.246214 z"
+         id="path5437"
+         style="opacity:0.2;fill:none;stroke:#000000;stroke-width:2.61734867;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:4" />
+      <path
+         d="m 27.687372,26.00772 24.107347,91.38604 58.746891,-16.1021 c 1.74581,-0.46053 2.73038,-2.26365 2.26984,-4.00946 L 86.871137,9.9407822 C 86.410588,8.1949782 84.685262,7.1899042 82.939436,7.6504452 L 27.687372,26.00772 z"
+         id="path2792"
+         style="fill:#382509;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 109.10991,99.57961 c 3.03559,-1.02373 1.44372,-5.530998 1.62732,-8.536735 l -7.35421,0.838519 5.72689,7.698216 z"
+         id="path3740"
+         style="fill:url(#linearGradient5464);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="m 26.799156,18.507463 -5.877241,1.504755 -0.936409,0.513831 -0.902276,-0.04307 -6.512921,1.667508 c -1.244425,0.328275 -1.989891,1.608803 -1.661616,2.853228 l 0.520127,7.704319 22.784372,85.522976 c 0.716424,2.09703 2.528539,3.55192 4.317526,2.94072 l 13.307853,-3.79522 -0.189963,-7.83471 c 0.756046,-0.54583 1.133555,-1.51972 0.880752,-2.47803 L 29.572128,20.174496 c -0.328273,-1.244423 -1.528549,-1.995307 -2.772972,-1.667033 z"
+         id="rect2790"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 27.338463,18.936135 -5.866833,1.544364 -0.959797,0.524111 -0.924752,-0.09067 -6.471329,1.661725 c -1.244423,0.328278 -2.048194,1.627578 -1.719918,2.872003 l 0.519613,7.69672 21.952206,83.185022 c -0.178493,-1.32211 1.709725,-4.94764 3.231802,-5.42376 l 14.806628,-4.06171 C 42.43799,78.605372 35.221547,48.879823 27.338463,18.936135 z"
+         id="path3812"
+         style="fill:url(#linearGradient5466);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 108.8249,94.01568 0.39244,5.52927 -70.608693,19.49404 c -2.767133,0.94536 -3.783942,-4.95378 -0.590455,-5.77815 L 108.8249,94.01568 z"
+         id="path2797"
+         style="fill:url(#linearGradient5468);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="m 51.828769,117.31525 58.669801,-15.98317 c 1.6652,-0.4393 2.63772,-2.11735 2.32428,-3.78478 -0.0798,1.36222 -0.98854,2.61557 -2.37848,2.98223 l -58.80684,16.04282 0.191239,0.7429 z"
+         id="path3724"
+         style="fill:#000000;fill-opacity:0.47560975;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 51.717216,116.71839 110.3916,100.5924 c 1.66523,-0.4393 2.63774,-2.11734 2.32431,-3.78478 -0.0798,1.36223 -0.98854,2.61559 -2.37847,2.98224 l -58.921489,16.17231 0.301265,0.75622 z"
+         id="path3726"
+         style="opacity:0.49180328;fill:url(#linearGradient5470);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 51.652809,116.60874 110.3916,100.5924 c 1.66523,-0.4393 2.63774,-2.11734 2.32431,-3.78478 -0.0798,1.36223 -0.95467,3.11717 -2.34462,3.48383 l -58.879252,15.81461 0.160771,0.50268 z"
+         id="path3728"
+         style="opacity:0.34426228;fill:url(#linearGradient5472);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 35.708261,117.30644 C 37.496859,117.04288 109.03634,97.216211 109.03634,97.216211"
+         id="path5475"
+         style="opacity:0.397541;fill:none;stroke:url(#linearGradient5474);stroke-width:0.09039563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 35.954236,116.23534 C 37.742834,115.97178 109.01148,96.225393 109.01148,96.225393"
+         id="path5485"
+         style="opacity:0.397541;fill:none;stroke:url(#linearGradient5476);stroke-width:0.09039563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 36.201455,115.44671 C 37.990053,115.18315 108.8797,95.331094 108.8797,95.331094"
+         id="path5489"
+         style="opacity:0.397541;fill:none;stroke:url(#linearGradient5478);stroke-width:0.09039563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 36.481291,118.16785 C 38.269889,117.90429 109.10378,98.221971 109.10378,98.221971"
+         id="path5493"
+         style="opacity:0.397541;fill:none;stroke:url(#linearGradient5480);stroke-width:0.09039563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 36.467964,114.51495 C 38.256562,114.25138 108.57666,94.644775 108.57666,94.644775"
+         id="path5497"
+         style="opacity:0.397541;fill:none;stroke:url(#linearGradient5482);stroke-width:0.09039563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 37.257086,119.04802 C 39.045684,118.78445 109.23556,99.11627 109.23556,99.11627"
+         id="path5501"
+         style="opacity:0.397541;fill:none;stroke:url(#linearGradient5484);stroke-width:0.09039563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 51.828769,117.31525 58.669801,-15.98317 c 1.6652,-0.4393 2.63772,-2.11735 2.32428,-3.78478 0.017,1.89986 -0.99888,3.05969 -2.38881,3.42634 l -58.642011,15.98733 0.03674,0.35428 z"
+         id="path3732"
+         style="opacity:0.68999999;fill:#000000;fill-opacity:0.47560975;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 108.8249,94.01568 0.39244,5.52927 -70.608693,19.49404 c -2.767133,0.94536 -3.783942,-4.95378 -0.590455,-5.77815 L 108.8249,94.01568 z"
+         id="path3754"
+         style="fill:url(#linearGradient5486);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="m 35.152271,115.4006 c -0.01946,-0.65441 0.926701,-2.24008 1.288411,-2.46012 4.864484,-1.27254 9.728965,-2.5451 14.593447,-3.81766 -0.07309,-0.32678 -0.146193,-0.65357 -0.219291,-0.98037 -4.938972,1.3031 -9.877944,2.60621 -14.816918,3.9093 -0.593484,0.10883 -0.904923,2.39093 -0.845649,3.34885 z"
+         id="path3781"
+         style="opacity:0.42213117;fill:url(#linearGradient5488);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="m 35.152271,115.4006 c -0.01946,-0.65441 1.318104,-2.45596 1.67982,-2.67599 4.864481,-1.27256 9.035731,-2.39005 13.900213,-3.6626 -0.0731,-0.32679 -0.174498,-0.43707 -0.247595,-0.76386 -4.938971,1.30309 -8.272229,2.32022 -13.620484,3.69975 -1.477901,0.38122 -1.771228,2.44478 -1.711954,3.4027 z"
+         id="path3791"
+         style="opacity:0.42213117;fill:url(#linearGradient5490);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="m 35.152271,115.4006 c 0.120882,-0.004 0.142642,-0.39303 0.239418,-0.67046 0.27979,-0.80209 0.84956,-1.88064 1.682883,-2.02191 4.864481,-1.27255 8.79325,-2.37367 13.657732,-3.64622 -0.0731,-0.32679 -0.199741,-0.244 -0.272836,-0.57078 -4.938974,1.30309 -8.613462,2.49377 -13.552434,3.79686 -1.010978,0.31033 -1.590164,1.4654 -1.751488,2.40111 -0.04685,0.27172 -0.07803,0.72006 -0.0033,0.7114 z"
+         id="path3793"
+         style="opacity:0.42213117;fill:url(#linearGradient5492);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="M 19.245572,20.958045 43.847053,111.52185 44.898492,111.22121 20.147415,20.99285 19.245572,20.95804 z"
+         id="path3799"
+         style="opacity:0.36885244;fill:url(#linearGradient5494);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 28.211592,22.39683 -5.866831,1.544364 -0.959799,0.524111 -0.92475,-0.09068 -6.471328,1.661726 c -1.244425,0.328278 -2.048196,1.627578 -1.71992,2.872003 l 0.519613,7.69672 21.079076,79.724336 c -0.178493,-1.32211 1.039798,-4.84828 3.231802,-5.42376 l 14.806628,-4.06171 C 42.43799,78.605372 36.094679,52.340518 28.211592,22.39683 z"
+         id="path3835"
+         style="fill:url(#linearGradient5496);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 26.593905,18.553435 51.274592,109.68944 109.91565,93.7085 c 1.74581,-0.460531 2.73036,-2.263662 2.26984,-4.009457 L 87.480274,5.7479772 C 87.019753,4.002171 85.2944,2.9971009 83.548591,3.4576391 L 26.593905,18.553435 z"
+         id="rect1887"
+         style="fill:url(#linearGradient5498);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 33.779029,45.042197 c 0.302302,1.247261 1.524645,5.703615 1.826742,6.950026 l -0.0019,0.0064 c 0.298072,-0.488782 3.813678,-6.254931 5.299325,-8.692312 -3.518784,0.852858 -5.60477,1.367604 -7.124208,1.735873 z"
+         id="path5281"
+         style="opacity:0.4;fill:#ffffff" />
+      <path
+         d="M 51.258814,109.67421 109.92859,93.691023 c 1.66523,-0.439285 2.63773,-2.117327 2.32429,-3.784761 -0.0798,1.362212 -0.98854,2.615581 -2.37848,2.982238 l -58.806825,16.04282 0.191239,0.74289 z"
+         id="path3703"
+         style="fill:#000000;fill-opacity:0.47560975;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 51.147261,109.07737 109.82165,92.951355 c 1.66523,-0.439303 2.63774,-2.117349 2.32429,-3.784776 -0.0797,1.362225 -0.98853,2.615578 -2.37847,2.982239 l -58.968819,15.754472 0.34861,1.17408 z"
+         id="path3718"
+         style="opacity:0.49180328;fill:url(#linearGradient5500);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 26.493213,17.505404 c -0.919306,0.259798 9.369211,41.617057 23.053954,92.431706 l 3.387521,-0.95733 C 39.236546,58.168919 27.412519,17.245602 26.493213,17.505404 z"
+         id="path3851"
+         style="fill:url(#radialGradient5502);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 50.880886,108.91952 109.82165,92.951355 c 1.66523,-0.439303 2.63774,-2.117349 2.32429,-3.784776 -0.0797,1.362225 -0.95467,3.117161 -2.3446,3.483814 l -59.081227,15.766437 0.160773,0.50269 z"
+         id="path3708"
+         style="opacity:0.34426228;fill:url(#linearGradient5504);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 51.235434,108.94521 109.82165,92.951355 c 1.66523,-0.439303 2.63774,-2.117349 2.32429,-3.784776 -0.0797,1.362225 -0.95627,2.794802 -2.3462,3.161465 l -58.772609,15.832666 0.208303,0.7845 z"
+         id="path3720"
+         style="opacity:0.34426228;fill:url(#linearGradient5506);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="M 51.258814,109.67421 109.92859,93.691023 c 1.66523,-0.439285 2.63773,-2.117327 2.32429,-3.784761 0.017,1.899863 -0.99884,3.059687 -2.38878,3.426333 l -58.642026,15.987345 0.03674,0.35427 z"
+         id="path3722"
+         style="fill:#000000;fill-opacity:0.47560975;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 85.115691,3.1512576 c -0.120699,0.0074 -0.253883,0.080761 -0.375881,0.1019289 1.360606,0.067455 2.5425,0.9243942 2.913162,2.3295592 L 112.33234,89.551999 c 0.46052,1.745809 -0.50658,3.595691 -2.25239,4.05624 L 52.199416,109.3815 52.209705,109.53391 110.842,93.556791 c 1.74581,-0.460548 2.71291,-2.310431 2.25239,-4.05624 L 88.415024,5.5312982 C 88.01206,4.0037134 86.621785,3.0589778 85.115691,3.1512576 z"
+         id="path3866"
+         style="opacity:0.46311472;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 85.120828,3.1605429 c -0.191542,0.011736 -0.410312,0.070575 -0.604497,0.1173632 1.243357,0.1702203 2.339152,1.035637 2.684547,2.3449934 L 111.88024,89.592123 c 0.46053,1.745834 -0.50658,3.595717 -2.25239,4.05624 l -57.504649,15.671327 0.09164,0.22347 58.632299,-15.977113 c 1.7458,-0.460523 2.71291,-2.310406 2.25238,-4.05624 L 88.42016,5.5405835 C 88.0172,4.013001 86.626922,3.0682632 85.120828,3.1605429 z"
+         id="path3870"
+         style="opacity:0.46311472;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 84.145813,3.3192197 c -0.215158,0.013183 -0.462471,0.064939 -0.680706,0.1225084 L 26.579226,18.546962 26.669814,19.038438 83.495981,3.8989582 c 1.745791,-0.4605346 3.524659,0.5879377 3.985188,2.333738 l -0.03603,-0.533434 C 87.042193,4.1716787 85.651914,3.2269396 84.145813,3.3192197 z"
+         id="path3769"
+         style="opacity:0.34836067;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 84.046577,3.1078873 c -0.215159,0.013184 -0.46249,0.064942 -0.680707,0.1225081 L 26.53135,18.246042 26.8563,19.722641 83.628091,4.1520049 C 85.3739,3.6914672 87.055366,4.4559796 87.515895,6.2017792 L 87.345898,5.4879312 C 86.942946,3.9603489 85.552669,3.0156097 84.046577,3.1078873 z"
+         id="path3779"
+         style="fill:url(#linearGradient5512);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 84.046577,3.1078873 c -0.215159,0.013184 -0.46249,0.064942 -0.680707,0.1225081 L 26.524396,18.284788 26.644853,18.793384 83.593526,3.796134 c 1.7458,-0.4605364 3.451105,0.7011684 3.911624,2.4469692 L 87.345898,5.4879312 C 86.942946,3.9603489 85.552669,3.0156097 84.046577,3.1078873 z"
+         id="path3764"
+         style="fill:url(#linearGradient5514);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 83.95354,2.7606712 c -0.215158,0.013184 -0.462489,0.064942 -0.680706,0.1225082 L 26.431359,17.937572 26.663712,18.91861 83.511236,3.6081911 c 1.745809,-0.4605378 3.440359,0.5418953 3.900879,2.2876961 L 87.252861,5.1407156 C 86.849911,3.613133 85.459632,2.6683937 83.95354,2.7606712 z"
+         id="path3888"
+         style="fill:url(#linearGradient5516);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         d="m 26.842514,18.976935 c 0.3023,1.247263 1.393755,5.750461 1.69585,6.996873 1.568616,-0.380189 20.759989,-5.031656 21.425592,-5.192979 0.298069,-0.488783 3.813677,-6.254933 5.299325,-8.692314 -3.518786,0.852858 -26.90133,6.520151 -28.420767,6.88842 z"
+         id="path4123"
+         style="opacity:0.4;fill:#ffffff" />
+      <path
+         d="m 30.428587,31.749785 c 0.302302,1.247261 1.524645,5.703613 1.826741,6.950027 1.568617,-0.38019 10.262771,-2.428134 10.928373,-2.589457 0.298069,-0.488781 3.813678,-6.254932 5.299326,-8.692312 -3.518786,0.852859 -16.535002,3.963472 -18.05444,4.331742 z"
+         id="path5279"
+         style="opacity:0.4;fill:#ffffff" />
+      <path
+         d="m 89.693303,24.515016 c -2.128296,3.421226 -4.239748,6.853406 -6.186362,10.382685 -5.212274,9.967978 -9.691666,20.288261 -12.815495,31.119052 -1.699312,5.899163 -3.150667,11.856652 -4.592427,17.815397 -3.335216,6.994524 -6.727403,13.96083 -10.186188,20.89683 -0.420097,0.85802 -0.830515,1.72518 -1.245501,2.59068 l 1.827034,-0.50168 c 0.50214,-1.1348 1.006206,-2.26777 1.512629,-3.39867 2.338053,-5.10178 4.69365,-10.19649 7.049193,-15.290367 -1.032046,4.239131 -2.088949,8.474787 -3.252681,12.683707 -0.35539,1.09872 -1.566555,3.55548 -2.086247,5.12922 l 2.642341,-0.71933 c 0.885547,-1.59117 1.091424,-3.46151 1.727233,-5.88618 1.19025,-5.675958 2.366138,-11.34719 3.644968,-16.99337 2.387975,-5.158785 4.775797,-10.316427 7.156432,-15.478636 5.177389,-11.407073 10.62923,-22.702111 17.917773,-32.879516 l -0.290832,-0.879502 c -7.740147,10.62856 -13.323616,22.546825 -18.787282,34.484922 -1.693599,3.655658 -3.397109,7.305933 -5.116856,10.948723 1.064503,-4.503251 2.210775,-8.988679 3.504282,-13.444433 3.237469,-10.950574 7.891048,-21.359531 13.309023,-31.383011 1.472007,-2.66427 3.070664,-5.252257 4.725213,-7.805223 l -0.45625,-1.391298 z m 6.940589,21.121417 c -0.431043,4.941661 -1.087641,9.861263 -2.08268,14.74597 -2.105207,11.432881 -4.249161,22.890798 -7.468439,34.073074 -0.433876,1.387193 -1.664455,3.602583 -1.873242,4.539123 l 1.394776,-0.38174 c 0.344802,-0.29593 0.758986,-0.67587 1.261246,-1.16071 l -1.156445,1.13402 0.692155,-0.18823 c 1.378713,-1.37693 1.435842,-2.74986 2.114411,-5.523287 2.509021,-10.986793 4.338312,-22.116059 6.152274,-33.234225 0.772417,-4.041728 1.258836,-8.11017 1.558836,-12.194153 l -0.592892,-1.809842 z"
+         id="path2012"
+         style="fill:url(#linearGradient5518);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    </g>
+    <g
+       transform="matrix(0.829412,0,0,0.8114557,1.3455427,23.440191)"
+       id="g3524">
+      <g
+         transform="matrix(0.9702732,-0.06291178,0.06900478,0.9451966,-53.4637,27.488536)"
+         id="g8758">
+        <path
+           d="m 181.67604,9.099418 -14.13212,5.699466 -8.155,-6.393046 c -1.0714,1.417425 -1.8863,21.693357 3.10193,21.520607 9.13195,-0.316254 15.80573,-9.325742 19.18519,-20.827027 z"
+           id="path3285"
+           style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient9655);stroke-width:1.64400005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 181.16095,9.7597789 -13.40625,5.4062501 -0.84375,9.4375 1.53125,4.15625 c 5.84622,-3.223357 10.19566,-10.413188 12.71875,-19.0000001 z"
+           id="path3293"
+           style="opacity:0.51376145;fill:url(#radialGradient9657);fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 159.31603,8.5972985 c -0.004,0.00554 -0.0271,0.02514 -0.0312,0.03125 -0.008,0.013357 -0.023,0.046897 -0.0312,0.0625 -1.03857,2.0973105 -1.73455,21.6068755 3.15625,21.4374995 1.08085,-0.03743 2.14566,-0.198035 3.15625,-0.46875 l 0.6875,-15.59375 -6.9375,-5.4687495 z"
+           id="path5936"
+           style="opacity:0.51376145;fill:url(#radialGradient9659);fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         d="m 96.407112,2.0934337 c -9.006677,1.10679 -15.853729,7.2281576 -16.414062,14.4622933 -0.0051,0.03257 -0.02046,0.102065 -0.02528,0.134682 0,0 -3.372795,20.719473 -7.366464,26.291206 -3.134494,4.373038 -63.0566574,58.537925 -65.879723,63.173695 -5.96259731,9.79119 5.156855,23.75388 16.953634,15.68182 7.777263,-5.32168 54.734833,-63.975733 61.077032,-68.077132 4.286904,-2.772282 26.554971,-7.518913 26.554971,-7.518913 1.29851,0.291691 -9.27869,-18.990813 -12.124836,-25.088868 4e-5,-4.141922 -0.009,-4.477931 0.37325,-8.254629 5.027286,-1.981773 14.280846,-5.5153873 14.280846,-5.5153873 -3.69826,-3.562812 -9.42386,-5.707913 -15.700166,-5.3793021 -0.04111,0.00215 -0.09195,0.0046 -0.13299,0.00696 -0.22868,0.013135 -1.05808,0.051617 -1.130654,0.059198 -0.06299,0.00658 -0.166822,0.00729 -0.232778,0.012188 -0.07118,0.00809 -0.161856,0.00347 -0.232776,0.012187 z M 16.792733,104.64842 c 3.652459,-0.19123 7.185809,3.35542 7.35492,7.56267 0.139905,3.48066 -3.3408,7.10973 -6.993246,7.30096 -3.652434,0.19123 -7.3745654,-3.4804 -7.6029684,-7.29645 -0.219475,-3.66701 2.6251024,-7.32549 7.2412944,-7.56718 z"
+         id="path2388"
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 96.920143,1.9928089 C 87.913471,3.0995969 81.066421,9.2209652 80.506086,16.4551 c -0.0051,0.03257 -0.02046,0.102066 -0.02528,0.134683 0,0 -3.372795,20.719472 -7.366464,26.291206 -3.134498,4.373038 -63.056651,58.537921 -65.8797225,63.173691 -5.9625973,9.79118 5.1568545,23.75387 16.9536345,15.68181 7.777255,-5.32167 54.734831,-63.97572 61.07703,-68.077119 4.286905,-2.772282 26.554966,-7.518911 26.554966,-7.518911 1.29851,0.29169 -9.27869,-18.990813 -12.124837,-25.088868 4e-5,-4.141922 -0.009,-4.477932 0.373247,-8.254629 5.02729,-1.981773 14.28085,-5.5153879 14.28085,-5.5153879 -3.69826,-3.5628105 -9.42386,-5.7079123 -15.700167,-5.3793014 -0.04111,0.00215 -0.09195,0.0046 -0.13299,0.00696 -0.22868,0.013135 -1.058079,0.051615 -1.130654,0.059197 -0.06299,0.00658 -0.166822,0.00729 -0.232777,0.012188 -0.07118,0.00809 -0.161856,0.00347 -0.232776,0.012188 z M 17.30577,104.5478 c 3.652452,-0.19123 7.185815,3.3554 7.35492,7.56265 0.139906,3.48066 -3.340799,7.10973 -6.993253,7.30097 -3.652427,0.19122 -7.374564,-3.4804 -7.60296,-7.29646 -0.2194764,-3.667 2.625107,-7.32547 7.241293,-7.56716 z"
+         id="path21956"
+         style="fill:url(#radialGradient22837);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 82.022813,17.158216 7.476733,16.244342 3.18391,-1.357171 5.282584,11.829504 -2.618444,1.242964 3.598414,4.701128 c 5.94399,-1.490277 12.35515,-4.03493 12.35515,-4.03493 0.005,5.49e-4 0.0281,-0.0016 0.0324,-0.0017 0.004,-6.32e-4 0.0288,-4.66e-4 0.0324,-0.0017 0.003,-0.0029 0.0283,-0.0289 0.0306,-0.03242 0.002,-0.0046 -0.003,-0.02554 -0.002,-0.03073 0.002,-0.01149 0.0283,-0.04947 0.0287,-0.06315 -0.0255,-1.778824 -9.5371,-19.209589 -12.20663,-24.951553 -0.003,-4.141547 0.0036,-4.474387 0.38103,-8.250493 4.99941,-1.978326 14.22909,-5.1079947 14.22909,-5.1079947 C 110.14548,3.7794616 102.58604,2.2249011 96.949357,3.270741 88.095754,4.9134527 82.839455,10.203925 82.022813,17.158216 z"
+         id="path9661"
+         style="fill:url(#radialGradient10545);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 95.37965,2.3079607 C 86.892997,3.7422551 80.538502,9.6902535 80.000071,16.641803 c -0.0051,0.03257 -0.01056,0.09088 -0.01539,0.123494 -1.1e-5,3e-6 -3.370986,20.720966 -7.364666,26.2927 -3.134487,4.373037 -63.0751704,58.530253 -65.8982471,63.166023 -5.96259731,9.79118 5.1719001,23.75744 16.9686721,15.68539 7.777263,-5.32168 54.750843,-63.972709 61.093043,-68.074108 4.286893,-2.77228 26.528407,-7.534856 26.528407,-7.534856 0.005,0.0011 0.0316,0.02537 0.0363,0.02591 0.004,-4.8e-5 0.0281,-0.0033 0.0321,-0.004 0.003,-0.0018 0.025,-0.03148 0.0279,-0.03385 0.002,-0.0041 0.0264,-0.02921 0.0279,-0.03385 0.001,-0.0052 -0.005,-0.02413 -0.004,-0.02988 0.002,-0.01889 -0.0113,-0.06589 -0.0126,-0.08964 -0.1795,-2.019876 -9.55658,-19.213077 -12.213732,-24.906183 3e-5,-4.141921 -0.0021,-4.477765 0.38017,-8.254463 5.027292,-1.98177 14.259032,-5.5318912 14.259032,-5.5318912 -3.69826,-3.5628119 -9.40943,-5.6852545 -15.685732,-5.3566443 -0.04111,0.00215 -0.09165,-0.016355 -0.13269,-0.013997 -0.22868,0.013135 -1.060197,0.071643 -1.132772,0.079224 -0.063,0.00658 -0.16311,-0.00698 -0.229065,-0.00208 -0.06229,0.00708 -0.159045,0.022733 -0.22488,0.027797 -0.351826,0.043235 -0.715165,0.072739 -1.060153,0.1310439 z m 1.356026,1.0483056 c 5.604764,-0.9619721 12.944854,0.2183998 16.568794,3.7275876 0,0 -9.16323,3.5416501 -14.16265,5.5199791 -0.37744,3.776106 -0.38317,4.112916 -0.38017,8.254463 2.64868,5.697105 12.01022,22.904231 12.18161,24.910153 3.9e-4,0.0074 0.004,0.02293 0.004,0.02988 -0.005,0.01133 -0.0183,0.05295 -0.0238,0.06373 2.4e-4,0.0028 0.004,0.02665 0.004,0.02988 -0.007,0.0073 -0.0267,0.03238 -0.0279,0.03385 -0.007,1.9e-4 -0.0301,0.0037 -0.0321,0.004 -0.003,2.43e-4 -0.0292,0.0038 -0.0321,0.004 0,0 -7.10909,1.217519 -13.05309,2.707798 L 96.000978,46.055871 99.49838,43.760695 93.103661,31.367651 88.691484,32.898992 81.562893,17.299771 c 0.816633,-6.95429 6.066367,-12.2391452 14.919961,-13.8818563 0.08807,-0.01634 0.163859,-0.046379 0.252822,-0.061648 z M 15.64722,104.84718 c 0.369716,-0.0691 0.764014,-0.0923 1.160711,-0.11307 3.652448,-0.19123 7.194398,3.33321 7.363513,7.54046 0.139907,3.48066 -3.363433,7.12037 -7.015889,7.31161 -3.652441,0.19123 -7.3628234,-3.48348 -7.5912294,-7.29954 -0.200604,-3.35187 2.1504664,-6.70476 6.0828944,-7.43946 z"
+         id="path23730"
+         style="fill:url(#radialGradient25491);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 95.627579,2.2773147 C 87.140931,3.7116079 80.786436,9.6596062 80.248005,16.611157 c -0.0051,0.03257 -0.01056,0.09088 -0.01539,0.123493 -1.1e-5,4e-6 -3.37099,20.720967 -7.36467,26.292701 C 69.733461,47.400388 9.7927726,101.5576 6.9696971,106.19338 1.0070949,115.98455 12.1416,129.9508 23.938372,121.87875 31.715635,116.55707 78.689216,57.906055 85.031418,53.804656 89.318313,51.032375 111.55982,46.2698 111.55982,46.2698 c 0.005,0.0011 0.0316,0.02537 0.0363,0.02591 0.004,-4.8e-5 0.0281,-0.0033 0.0321,-0.004 0.003,-0.0018 0.025,-0.03148 0.0279,-0.03385 0.002,-0.0041 0.0264,-0.02921 0.0279,-0.03385 10e-4,-0.0052 -0.005,-0.02413 -0.004,-0.02988 0.002,-0.01889 -0.0113,-0.06589 -0.0126,-0.08964 -0.1795,-2.019876 -9.55658,-19.213077 -12.21373,-24.906182 3e-5,-4.141921 -0.0021,-4.477766 0.38016,-8.254464 5.02729,-1.981771 14.25904,-5.5318912 14.25904,-5.5318912 -3.69826,-3.5628127 -9.40943,-5.6852552 -15.68573,-5.356645 -0.04112,0.00215 -0.09165,-0.016355 -0.13269,-0.013996 -0.22868,0.013134 -1.060198,0.071643 -1.132773,0.079223 -0.063,0.00658 -0.163111,-0.00698 -0.229065,-0.00208 -0.06229,0.00708 -0.159043,0.022734 -0.224881,0.027798 -0.351826,0.043235 -0.715163,0.072739 -1.060152,0.1310439 z m 1.356026,1.0483049 c 5.604765,-0.9619728 12.944855,0.2184005 16.568795,3.727589 0,0 -9.16324,3.5416504 -14.16266,5.5199774 -0.37743,3.776107 -0.38316,4.112917 -0.38016,8.254464 2.64867,5.697105 12.01022,22.904231 12.18161,24.910153 3.9e-4,0.0074 0.004,0.02293 0.004,0.02988 -0.005,0.01133 -0.0183,0.05295 -0.0237,0.06373 2.4e-4,0.0028 0.004,0.02666 0.004,0.02988 -0.007,0.0073 -0.0266,0.03238 -0.0279,0.03385 -0.007,1.91e-4 -0.0301,0.0037 -0.0321,0.004 -0.003,2.43e-4 -0.0292,0.0038 -0.0321,0.004 0,0 -7.10909,1.217519 -13.05309,2.707797 L 96.152029,45.33341 99.92966,43.238192 94.063095,31.014461 89.090472,32.145885 81.810827,17.269124 c 0.816634,-6.95429 6.066367,-12.2391454 14.919956,-13.8818553 0.08807,-0.016341 0.16386,-0.04638 0.252822,-0.061649 z M 15.895147,104.81653 c 0.369723,-0.0691 0.764013,-0.0923 1.160717,-0.11308 3.652444,-0.19122 7.194395,3.33322 7.363509,7.54046 0.139908,3.48066 -3.363432,7.12037 -7.015889,7.31161 -3.65244,0.19124 -7.362822,-3.48348 -7.5912284,-7.29953 -0.200602,-3.35187 2.1504634,-6.70475 6.0828914,-7.43946 z"
+         id="path27250"
+         style="fill:url(#radialGradient27252);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(1.0280267,-0.1270725,0.1338966,0.9561867,-10.625435,14.784763)"
+         id="g22839">
+        <rect
+           width="13.399776"
+           height="13.094864"
+           x="68.625313"
+           y="58"
+           transform="matrix(0.956291,-0.292417,0.309707,0.950832,0,0)"
+           id="rect10551"
+           style="fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient19335);stroke-width:1.54412687;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           width="7.7254124"
+           height="11.043238"
+           x="71.562981"
+           y="55.691086"
+           transform="matrix(0.967683,-0.25217,0.307423,0.951573,0,0)"
+           id="rect14950"
+           style="fill:url(#radialGradient15831);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <rect
+           width="11.254695"
+           height="1.2325668"
+           ry="0"
+           x="82.51152"
+           y="49.742821"
+           transform="matrix(0.98605,-0.16645,0.08671967,0.996233,0,0)"
+           id="rect10553"
+           style="fill:url(#radialGradient12309);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient13190);stroke-width:0.38432986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           width="10.960242"
+           height="1.0542099"
+           ry="0"
+           x="83.72757"
+           y="56.036003"
+           transform="matrix(0.989282,-0.14602,0.09906172,0.995081,0,0)"
+           id="rect14938"
+           style="fill:url(#radialGradient14940);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient14942);stroke-width:0.35075644;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           width="11.671585"
+           height="1.0507048"
+           ry="0"
+           x="81.907768"
+           y="51.249149"
+           transform="matrix(0.990631,-0.136567,0.105988,0.994367,0,0)"
+           id="rect14944"
+           style="fill:url(#radialGradient14946);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient14948);stroke-width:0.36135769;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <path
+         d="m 99.2677,12.983285 14.24754,-5.499896 0.64447,1.6900843 -14.93125,5.9161787 0.03924,-2.106367 z"
+         id="rect22846"
+         style="fill:url(#linearGradient23728);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3737)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 110.6256,44.083197 c 4.16016,-0.788867 10.66003,-9.472209 12.73946,-19.223901 0.0925,-0.433768 0.42564,3.057917 0.31495,3.522705 -2.1447,9.005862 -7.92928,15.152605 -12.2638,17.217183 -0.2564,0.122122 0.0298,1.726102 -0.79061,-1.515987 z"
+         id="rect25493"
+         style="fill:url(#linearGradient26375);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 82.637435,16.143859 6.549595,16.828136 4.024578,-0.757297 5.498222,11.568254 -3.265358,2.026717 2.380648,3.20948 c 5.94399,-1.490278 12.35515,-4.034931 12.35515,-4.034931 0.005,5.5e-4 0.0281,-0.0016 0.0324,-0.0017 0.004,-6.33e-4 0.0288,-4.67e-4 0.0324,-0.0017 0.003,-0.0029 0.0284,-0.0289 0.0306,-0.03242 0.002,-0.0046 -0.003,-0.02554 -0.002,-0.03073 0.002,-0.01149 0.0283,-0.04947 0.0287,-0.06314 -0.0255,-1.778825 -9.53709,-19.20959 -12.20662,-24.951553 -0.003,-4.141547 0.0036,-4.474388 0.38103,-8.250494 4.99941,-1.9783252 13.18461,-5.3923853 13.18461,-5.3923853 C 107.98012,2.6952353 101.65891,2.8086948 96.022224,3.8545354 87.168617,5.4972474 83.454078,9.1895676 82.637435,16.143859 z"
+         id="path27254"
+         style="fill:url(#radialGradient27256);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3985)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 7.3940916,105.13388 c 0,0 61.6058644,-57.798833 65.5952104,-62.509902 3.830719,-4.523743 7.179199,-25.083938 7.179199,-25.083938 0,0 2.099396,-1.422428 1.698281,-0.189078 -0.549591,1.689879 -5.892888,22.437267 -7.204412,24.451878 -2.987804,4.589519 -19.946203,19.731389 -19.946203,19.731389 l -41.434443,39.364041 -5.8876324,4.23561 z"
+         id="rect30766"
+         style="opacity:0.3853211;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.910823,120.66107 c 0,0 -4.758812,0.0749 -7.265533,-3.07512 -2.5067274,-3.15 -2.7163134,-7.96065 -2.7163134,-7.96065 l 0.550378,-0.82443 c 0,0 0.495154,4.82614 2.7533634,7.8753 2.301478,3.10756 7.238333,3.28453 7.161393,3.41309 l -0.483288,0.57181 z"
+         id="path34274"
+         style="opacity:0.89449541;fill:url(#radialGradient34276);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 109.06927,30.29602 c -0.0834,0.269367 0.2624,8.336725 0.31254,8.621859 0.1201,4.429678 1.17074,4.697551 1.28619,5.491562 0.8564,-0.325814 0.2753,0.08044 1.04576,-0.396065 -0.0737,-0.387297 -1.16364,-3.087824 -1.61383,-4.056245 0.0386,-2.203134 0.0457,-8.382588 0.0548,-8.968831 -0.41562,-0.278109 -0.57522,-0.389031 -1.08548,-0.69228 z"
+         id="path34280"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 122.85659,25.194942 -12.63467,5.953381 -0.16743,8.973375 1.77253,3.83214 c 5.45,-3.414502 9.17402,-10.483938 11.02957,-18.758896 z"
+         id="path34301"
+         style="opacity:0.51376145;fill:url(#radialGradient34303);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 95.627579,2.2773147 C 87.140931,3.7116079 80.786436,9.6596062 80.248005,16.611157 c -0.0051,0.03257 -0.01056,0.09088 -0.01539,0.123493 -1.1e-5,4e-6 -3.37099,20.720967 -7.36467,26.292701 C 69.733461,47.400388 9.7927726,101.5576 6.9696971,106.19338 1.0070949,115.98455 12.1416,129.9508 23.938372,121.87875 31.715635,116.55707 78.689216,57.906055 85.031418,53.804656 89.318313,51.032375 111.55982,46.2698 111.55982,46.2698 c 0.005,0.0011 0.0316,0.02537 0.0363,0.02591 0.004,-4.8e-5 0.0281,-0.0033 0.0321,-0.004 0.003,-0.0018 0.025,-0.03148 0.0279,-0.03385 0.002,-0.0041 0.0264,-0.02921 0.0279,-0.03385 10e-4,-0.0052 -0.005,-0.02413 -0.004,-0.02988 0.002,-0.01889 -0.0113,-0.06589 -0.0126,-0.08964 -0.1795,-2.019876 -9.55658,-19.213077 -12.21373,-24.906182 3e-5,-4.141921 -0.0021,-4.477766 0.38016,-8.254464 5.02729,-1.981771 14.25904,-5.5318912 14.25904,-5.5318912 -3.69826,-3.5628127 -9.40943,-5.6852552 -15.68573,-5.356645 -0.04112,0.00215 -0.09165,-0.016355 -0.13269,-0.013996 -0.22868,0.013134 -1.060198,0.071643 -1.132773,0.079223 -0.063,0.00658 -0.163111,-0.00698 -0.229065,-0.00208 -0.06229,0.00708 -0.159043,0.022734 -0.224881,0.027798 -0.351826,0.043235 -0.715163,0.072739 -1.060152,0.1310439 z m 1.356026,1.0483049 c 5.604765,-0.9619728 12.944855,0.2184005 16.568795,3.727589 0,0 -9.16324,3.5416504 -14.16266,5.5199774 -0.37743,3.776107 -0.38316,4.112917 -0.38016,8.254464 2.64867,5.697105 12.01022,22.904231 12.18161,24.910153 3.9e-4,0.0074 0.004,0.02293 0.004,0.02988 -0.005,0.01133 -0.0183,0.05295 -0.0237,0.06373 2.4e-4,0.0028 0.004,0.02666 0.004,0.02988 -0.007,0.0073 -0.0266,0.03238 -0.0279,0.03385 -0.007,1.91e-4 -0.0301,0.0037 -0.0321,0.004 -0.003,2.43e-4 -0.0292,0.0038 -0.0321,0.004 0,0 -7.10909,1.217519 -13.05309,2.707797 L 96.152029,45.33341 99.92966,43.238192 94.063095,31.014461 89.090472,32.145885 81.810827,17.269124 c 0.816634,-6.95429 6.066367,-12.2391454 14.919956,-13.8818553 0.08807,-0.016341 0.16386,-0.04638 0.252822,-0.061649 z M 15.895147,104.81653 c 0.369723,-0.0691 0.764013,-0.0923 1.160717,-0.11308 3.652444,-0.19122 7.194395,3.33322 7.363509,7.54046 0.139908,3.48066 -3.363432,7.12037 -7.015889,7.31161 -3.65244,0.19124 -7.362822,-3.48348 -7.5912284,-7.29953 -0.200602,-3.35187 2.1504634,-6.70475 6.0828914,-7.43946 z"
+         id="path3752"
+         style="fill:url(#radialGradient3758);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.232154,102.01072 c 5.542991,-1.30497 11.850216,4.9107 10.634504,10.77082 4.148589,-3.435 51.888934,-56.678298 52.878909,-59.240393 1.515966,-3.923382 -2.578082,-7.468416 -6.472096,-5.79737 -2.716058,1.165545 -57.402108,54.351883 -57.041317,54.266943 z"
+         id="path30758"
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.232154,102.01072 c 5.542991,-1.30497 11.850216,4.9107 10.634504,10.77082 4.148589,-3.435 51.888934,-56.678298 52.878909,-59.240393 1.515966,-3.923382 -2.578082,-7.468416 -6.472096,-5.79737 -2.716058,1.165545 -57.402108,54.351883 -57.041317,54.266943 z"
+         id="path7295"
+         style="opacity:0.8;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.232154,102.01072 c 5.542991,-1.30497 11.850216,4.9107 10.634504,10.77082 4.148589,-3.435 51.888934,-56.678298 52.878909,-59.240393 1.515966,-3.923382 -2.578082,-7.468416 -6.472096,-5.79737 -2.716058,1.165545 -57.402108,54.351883 -57.041317,54.266943 z"
+         id="path4003"
+         style="opacity:0.27722772;fill:url(#radialGradient4005);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.232154,102.01072 c 5.542991,-1.30497 11.850216,4.9107 10.634504,10.77082 4.148589,-3.435 51.888934,-56.678298 52.878909,-59.240393 1.515966,-3.923382 -2.578082,-7.468416 -6.472096,-5.79737 -2.716058,1.165545 -57.402108,54.351883 -57.041317,54.266943 z"
+         id="path1773"
+         style="opacity:0.5;fill:url(#radialGradient8652);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 73.187648,47.861864 c 0.304157,-0.187382 2.875741,-1.470035 5.250175,0.619594 2.026842,1.783732 1.75363,3.629711 1.188913,5.291315 -0.272716,0.80243 -22.190145,25.654653 -26.124661,30.176498 -1.934704,2.223509 -8.555253,9.46003 -14.629769,16.144579 -6.128605,6.74407 -11.883964,12.59402 -11.883964,12.59402 0,0 51.929323,-57.887948 52.242985,-59.467212 0.459811,-2.315109 -0.488446,-3.051963 -1.269992,-3.791501 -0.796519,-0.753703 -2.198023,-1.596044 -4.105583,-1.208905 -2.63055,0.533867 -56.501715,53.331948 -57.521095,53.719358 0,0 12.936333,-12.809079 26.5886,-25.982915 C 56.575524,62.78286 70.943728,49.244268 73.187648,47.861864 z"
+         id="path2271"
+         style="opacity:0.40366971;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.748453,101.47356 c 0,0 4.295757,-1.03111 7.966389,2.40881 4.014319,3.762 2.793249,8.2417 2.793249,8.2417 l -0.645563,0.77086 c 0,0 0.353049,-1.71439 -0.06429,-3.39624 -0.417342,-1.68186 -1.30398,-3.40987 -2.815054,-4.80097 -1.489067,-1.37084 -2.900596,-2.25341 -4.434227,-2.5817 -1.533631,-0.32828 -3.277011,-0.0915 -3.242053,-0.15744 l 0.441553,-0.48502 z"
+         id="path2660"
+         style="fill:url(#radialGradient8648);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.748453,101.47356 c 0,0 4.295757,-1.03111 7.966389,2.40881 4.014319,3.762 2.793249,8.2417 2.793249,8.2417 l -0.645563,0.77086 c 0,0 0.353049,-1.71439 -0.06429,-3.39624 -0.417342,-1.68186 -1.30398,-3.40987 -2.815054,-4.80097 -1.489067,-1.37084 -2.900596,-2.25341 -4.434227,-2.5817 -1.533631,-0.32828 -3.277011,-0.0915 -3.242053,-0.15744 l 0.441553,-0.48502 z"
+         id="path6192"
+         style="fill:url(#radialGradient8645);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 104.608,3.1939149 C 92.616145,2.2045921 83.866393,6.3602734 82.450397,15.463498 84.09662,8.5060072 91.399094,2.8573689 104.608,3.1939149 z"
+         id="path3939"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3989)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 104.608,3.1939149 C 92.465413,1.4810786 82.871562,5.8477846 82.450397,15.463498 84.759841,8.6265928 91.399094,3.1286865 104.608,3.1939149 z"
+         id="path3993"
+         style="opacity:0.77722772;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3995)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 99.8125,3.15625 c -4.781941,-0.02921 -8.938841,0.9715016 -11.9375,3 -2.554741,1.7282017 -4.286688,4.178924 -4.90625,7.3125 2.490754,-5.1802206 7.770488,-9.2919522 16.84375,-10.3125 z"
+         id="path4001"
+         style="opacity:0.77722772;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3995)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 75.434671,47.3125 c -0.705894,-0.02155 -1.426122,0.124179 -2.15625,0.4375 -2.716058,1.165544 -57.392041,54.33494 -57.03125,54.25 0.377005,-0.0888 0.743532,-0.1346 1.125,-0.15625 5.831453,-5.884125 53.363515,-52.002584 55.90625,-53.09375 3.117022,-1.337614 6.356572,0.665759 6.75,3.53125 0.257477,-2.663561 -1.943805,-4.887869 -4.59375,-4.96875 z m -48.4375,64.375 c -0.01923,0.36711 -0.04902,0.72749 -0.125,1.09375 0.02334,-0.0193 0.09892,-0.0713 0.125,-0.0937 5.49e-4,-0.0105 -5.05e-4,-0.0208 0,-0.0312 0.01565,-0.32513 0.02578,-0.64588 0,-0.96875 z"
+         id="path3741"
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       d="m 350.93426,86.549046 0,-2.794709 0,2.794709 z"
+       id="path2276-2"
+       style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>
diff --git a/resources/images/tweak.png b/resources/images/tweak.png
new file mode 100644
index 0000000000000000000000000000000000000000..14216beee1eec9b03af831a867e3ca0a13300a3d
GIT binary patch
literal 127067
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
Nb;Hb{O3x|g{{Ze8!L|SZ

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py
index 618df6a5fa..5e641a7cdd 100755
--- a/src/calibre/gui2/actions/tweak_epub.py
+++ b/src/calibre/gui2/actions/tweak_epub.py
@@ -22,6 +22,7 @@ class TweakBook(QDialog):
 
     def __init__(self, parent, book_id, fmts, db):
         QDialog.__init__(self, parent)
+        self.setWindowIcon(QIcon(I('tweak.png')))
         self.book_id, self.fmts, self.db_ref = book_id, fmts, weakref.ref(db)
         self._exploded = None
         self._cleanup_dirs = []
@@ -54,7 +55,7 @@ class TweakBook(QDialog):
         self.rebuild_button.setEnabled(False)
         self.explode_button.setEnabled(True)
 
-    def setup_ui(self): # {{{
+    def setup_ui(self):  # {{{
         self._g = g = QHBoxLayout(self)
         self.setLayout(g)
         self._l = l = QVBoxLayout()
@@ -285,7 +286,7 @@ class TweakBook(QDialog):
 class TweakEpubAction(InterfaceAction):
 
     name = 'Tweak ePub'
-    action_spec = (_('Tweak Book'), 'trim.png',
+    action_spec = (_('Tweak Book'), 'tweak.png',
             _('Make small changes to ePub, HTMLZ or AZW3 format books'),
             _('T'))
     dont_add_to = frozenset(['context-menu-device'])

From 2b7f9c4b3de7af44d2d10edeb935d3d36dd8b343 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 7 Oct 2013 15:51:28 +0200
Subject: [PATCH 0934/1154] Accept null last_modified dates from a smart
 device. Can happen when books are added from a scan and not matched.

---
 src/calibre/devices/smart_device_app/driver.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index fc10dd323b..4d7af0e8b0 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -682,6 +682,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             return None
 
     def _metadata_in_cache(self, uuid, ext, lastmod):
+        if lastmod == 'None':
+            return None
         from calibre.utils.date import parse_date, now
         key = uuid+ext
         if isinstance(lastmod, unicode):

From 47b438db2bb563a507840d39193a63b652adadbb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 8 Oct 2013 16:16:23 +0530
Subject: [PATCH 0935/1154] Fix docks not working in calibre style

---
 src/calibre/gui2/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 6116024938..569a531216 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -873,6 +873,11 @@ class Application(QApplication):
                 'MessageBoxWarning': u'dialog_warning.png',
                 'MessageBoxCritical': u'dialog_error.png',
                 'MessageBoxQuestion': u'dialog_question.png',
+                # These two are used to calculate the sizes for the doc widget
+                # title bar buttons, therefore, they have to exist. The actual
+                # icon is not used.
+                'TitleBarCloseButton': u'window-close.png',
+                'TitleBarNormalButton': u'window-close.png',
                 }.iteritems():
             if v not in pcache:
                 p = I(v)

From e34477da9357dddf53d6e76eecae9c46119c8039 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 8 Oct 2013 16:17:27 +0530
Subject: [PATCH 0936/1154] Get linear attrib for spine names as well

---
 src/calibre/ebooks/oeb/polish/container.py       | 6 +++---
 src/calibre/ebooks/oeb/polish/tests/container.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index b1cdcac955..4151773c10 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -319,15 +319,15 @@ class Container(object):  # {{{
             path = self.name_path_map.get(name, None)
             if path:
                 if item.get('linear', 'yes') == 'yes':
-                    yield name
+                    yield name, True
                 else:
                     non_linear.append(name)
         for name in non_linear:
-            yield name
+            yield name, False
 
     @property
     def spine_items(self):
-        for name in self.spine_names:
+        for name, linear in self.spine_names:
             yield self.name_path_map[name]
 
     def remove_item(self, name):
diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py
index 6dedaff365..e65f25fe6f 100644
--- a/src/calibre/ebooks/oeb/polish/tests/container.py
+++ b/src/calibre/ebooks/oeb/polish/tests/container.py
@@ -35,7 +35,7 @@ class ContainerTests(BaseTest):
                 self.assertIn(name, c2.name_path_map)
                 self.assertEqual(c1.open(name).read(), c2.open(name).read(), 'The file %s differs' % name)
 
-            spine_names = tuple(c1.spine_names)
+            spine_names = tuple(x[0] for x in c1.spine_names)
             text = spine_names[0]
             root = c2.parsed(text)
             root.xpath('//*[local-name()="body"]')[0].set('id', 'changed id for test')

From efb83eb6fcd1b175e70281fc0776ca2e53422ad0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 8 Oct 2013 21:51:16 +0530
Subject: [PATCH 0937/1154] Start work on new Tweak Book tool

---
 src/calibre/ebooks/oeb/polish/container.py |   6 +
 src/calibre/gui2/tweak_book/__init__.py    |  17 +++
 src/calibre/gui2/tweak_book/file_list.py   | 163 +++++++++++++++++++++
 src/calibre/gui2/tweak_book/job.py         |  84 +++++++++++
 src/calibre/gui2/tweak_book/main.py        |  48 ++++++
 src/calibre/gui2/tweak_book/ui.py          |  85 +++++++++++
 src/calibre/gui2/tweak_book/undo.py        |  23 +++
 7 files changed, 426 insertions(+)
 create mode 100644 src/calibre/gui2/tweak_book/__init__.py
 create mode 100644 src/calibre/gui2/tweak_book/file_list.py
 create mode 100644 src/calibre/gui2/tweak_book/job.py
 create mode 100644 src/calibre/gui2/tweak_book/main.py
 create mode 100644 src/calibre/gui2/tweak_book/ui.py
 create mode 100644 src/calibre/gui2/tweak_book/undo.py

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 4151773c10..de8afe124f 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -495,6 +495,12 @@ class Container(object):  # {{{
         with open(dest, 'wb') as f:
             f.write(data)
 
+    def filesize(self, name):
+        if name in self.dirtied:
+            self.commit_item(name)
+        path = self.name_to_abspath(name)
+        return os.path.getsize(path)
+
     def open(self, name, mode='rb'):
         ''' Open the file pointed to by name for direct read/write. Note that
         this will commit the file if it is dirtied and remove it from the parse
diff --git a/src/calibre/gui2/tweak_book/__init__.py b/src/calibre/gui2/tweak_book/__init__.py
new file mode 100644
index 0000000000..72e61e5ae1
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/__init__.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+_current_container = None
+
+def current_container():
+    return _current_container
+
+def set_current_container(container):
+    global _current_container
+    _current_container = container
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
new file mode 100644
index 0000000000..02fb7367e8
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from PyQt4.Qt import (
+    QWidget, QTreeWidget, QGridLayout, QSize, Qt, QTreeWidgetItem, QIcon,
+    QStyledItemDelegate, QStyle)
+
+from calibre import guess_type, human_readable
+from calibre.ebooks.oeb.base import OEB_STYLES
+from calibre.gui2.tweak_book import current_container
+
+ICON_SIZE = 24
+NAME_ROLE = Qt.UserRole
+
+class ItemDelegate(QStyledItemDelegate):
+
+    def sizeHint(self, option, index):
+        ans = QStyledItemDelegate.sizeHint(self, option, index)
+        top_level = not index.parent().isValid()
+        ans += QSize(0, 20 if top_level else 10)
+        return ans
+
+    def paint(self, painter, option, index):
+        top_level = not index.parent().isValid()
+        hover = option.state & QStyle.State_MouseOver
+        if hover:
+            if top_level:
+                suffix = '\xa0(%d)' % index.model().rowCount(index)
+            else:
+                suffix = '\xa0' + human_readable(current_container().filesize(unicode(index.data(NAME_ROLE).toString())))
+            br = painter.boundingRect(option.rect, Qt.AlignRight|Qt.AlignVCenter, suffix)
+        if top_level and index.row() > 0:
+            option.rect.adjust(0, 5, 0, 0)
+            painter.drawLine(option.rect.topLeft(), option.rect.topRight())
+            option.rect.adjust(0, 1, 0, 0)
+        if hover:
+            option.rect.adjust(0, 0, -br.width(), 0)
+        QStyledItemDelegate.paint(self, painter, option, index)
+        if hover:
+            option.rect.adjust(0, 0, br.width(), 0)
+            painter.drawText(option.rect, Qt.AlignRight|Qt.AlignVCenter, suffix)
+
+class FileList(QTreeWidget):
+
+    def __init__(self, parent=None):
+        QTreeWidget.__init__(self, parent)
+        self.delegate = ItemDelegate(self)
+        self.setTextElideMode(Qt.ElideMiddle)
+        self.setItemDelegate(self.delegate)
+        self.setIconSize(QSize(ICON_SIZE, ICON_SIZE))
+        self.header().close()
+        self.setDragEnabled(True)
+        self.setSelectionMode(self.ExtendedSelection)
+        self.viewport().setAcceptDrops(True)
+        self.setDropIndicatorShown(True)
+        self.setDragDropMode(self.InternalMove)
+        self.setAutoScroll(True)
+        self.setAutoScrollMargin(ICON_SIZE*2)
+        self.setDefaultDropAction(Qt.MoveAction)
+        self.setAutoExpandDelay(1000)
+        self.setAnimated(True)
+        self.setMouseTracking(True)
+        self.in_drop_event = False
+        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.customContextMenuRequested.connect(self.show_context_menu)
+        self.root = self.invisibleRootItem()
+
+    def build(self, container):
+        self.clear()
+        self.root = self.invisibleRootItem()
+        self.root.setFlags(Qt.ItemIsDragEnabled)
+        self.categories = {}
+        for category, text, icon in (
+            ('text', _('Text'), 'keyboard-prefs.png'),
+            ('styles', _('Styles'), 'lookfeel.png'),
+            ('images', _('Images'), 'view-image.png'),
+            ('fonts', _('Fonts'), 'font.png'),
+            ('misc', _('Miscellaneous'), 'mimetypes/dir.png'),
+        ):
+            self.categories[category] = i = QTreeWidgetItem(self.root, 0)
+            i.setText(0, text)
+            i.setIcon(0, QIcon(I(icon)))
+            f = i.font(0)
+            f.setBold(True)
+            i.setFont(0, f)
+            i.setData(0, NAME_ROLE, category)
+            flags = Qt.ItemIsEnabled
+            if category == 'text':
+                flags |= Qt.ItemIsDropEnabled
+            i.setFlags(flags)
+
+        processed, seen = set(), {}
+
+        def get_display_name(name, item):
+            parts = name.split('/')
+            text = parts[-1]
+            while text in seen and parts:
+                text = parts.pop() + '/' + text
+            seen[text] = item
+            return text
+
+        for name, linear in container.spine_names:
+            processed.add(name)
+            i = QTreeWidgetItem(self.categories['text'], 1)
+            prefix = '' if linear else '[nl] '
+            if not linear:
+                i.setIcon(self.non_linear_icon)
+            i.setText(0, prefix + get_display_name(name, i))
+            i.setStatusTip(0, _('Full path: ') + name)
+            i.setFlags(Qt.ItemIsEnabled | Qt.ItemIsDragEnabled | Qt.ItemIsSelectable)
+            i.setData(0, NAME_ROLE, name)
+
+        font_types = {guess_type('a.'+x)[0] for x in ('ttf', 'otf', 'woff')}
+
+        def get_category(mt):
+            category = 'misc'
+            if mt.startswith('image/'):
+                category = 'images'
+            elif mt in font_types:
+                category = 'fonts'
+            elif mt in OEB_STYLES:
+                category = 'styles'
+            return category
+
+        all_files = list(container.manifest_type_map.iteritems())
+        all_files.append((guess_type('a.opf')[0], [container.opf_name]))
+
+        for name in container.name_path_map:
+            if name in processed:
+                continue
+            processed.add(name)
+            imt = container.mime_map.get(name, guess_type(name)[0])
+            icat = get_category(imt)
+            i = QTreeWidgetItem(self.categories[icat], 1)
+            i.setText(0, get_display_name(name, i))
+            i.setStatusTip(0, _('Full path: ') + name)
+            i.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
+            i.setData(0, NAME_ROLE, name)
+
+        for c in self.categories.itervalues():
+            self.expandItem(c)
+
+    def show_context_menu(self, point):
+        pass
+
+class FileListWidget(QWidget):
+
+    def __init__(self, parent=None):
+        QWidget.__init__(self, parent)
+        self.setLayout(QGridLayout(self))
+        self.file_list = FileList(self)
+        self.layout().addWidget(self.file_list)
+        self.layout().setContentsMargins(0, 0, 0, 0)
+
+    def build(self, container):
+        self.file_list.build(container)
+
+
diff --git a/src/calibre/gui2/tweak_book/job.py b/src/calibre/gui2/tweak_book/job.py
new file mode 100644
index 0000000000..9024f67857
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/job.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import time
+from threading import Thread
+from functools import partial
+
+from PyQt4.Qt import (QWidget, QVBoxLayout, QLabel, Qt, QPainter, QBrush, QColor)
+
+from calibre.gui2 import Dispatcher
+from calibre.gui2.progress_indicator import ProgressIndicator
+
+class LongJob(Thread):
+
+    daemon = True
+
+    def __init__(self, name, user_text, callback, function, *args, **kwargs):
+        Thread.__init__(self, name=name)
+        self.user_text = user_text
+        self.function = function
+        self.args, self.kwargs = args, kwargs
+        self.result = self.traceback = None
+        self.time_taken = None
+        self.callback = callback
+
+    def run(self):
+        st = time.time()
+        try:
+            self.result = self.function(*self.args, **self.kwargs)
+        except:
+            import traceback
+            self.traceback = traceback.format_exc()
+        self.time_taken = time.time() - st
+        try:
+            self.callback(self)
+        finally:
+            pass
+
+class BlockingJob(QWidget):
+
+    def __init__(self, parent):
+        QWidget.__init__(self, parent)
+        l = QVBoxLayout()
+        self.setLayout(l)
+        l.addStretch(10)
+        self.pi = ProgressIndicator(self, 128)
+        l.addWidget(self.pi, alignment=Qt.AlignHCenter)
+        self.msg = QLabel('')
+        l.addSpacing(10)
+        l.addWidget(self.msg, alignment=Qt.AlignHCenter)
+        l.addStretch(10)
+        self.setVisible(False)
+
+    def start(self):
+        self.setGeometry(0, 0, self.parent().width(), self.parent().height())
+        self.setVisible(True)
+        self.raise_()
+        self.pi.startAnimation()
+
+    def stop(self):
+        self.pi.stopAnimation()
+        self.setVisible(False)
+
+    def job_done(self, callback, job):
+        del job.callback
+        self.stop()
+        callback(job)
+
+    def paintEvent(self, ev):
+        p = QPainter(self)
+        p.fillRect(ev.region().boundingRect(), QBrush(QColor(200, 200, 200, 160), Qt.SolidPattern))
+        p.end()
+        QWidget.paintEvent(self, ev)
+
+    def __call__(self, name, user_text, callback, function, *args, **kwargs):
+        self.msg.setText('<h2>%s</h2>' % user_text)
+        job = LongJob(name, user_text, Dispatcher(partial(self.job_done, callback)), function, *args, **kwargs)
+        job.start()
+        self.start()
diff --git a/src/calibre/gui2/tweak_book/main.py b/src/calibre/gui2/tweak_book/main.py
new file mode 100644
index 0000000000..57abb2b786
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/main.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import sys, os
+
+from PyQt4.Qt import QIcon
+
+from calibre.constants import islinux
+from calibre.gui2 import Application, ORG_NAME, APP_UID
+from calibre.ptempfile import reset_base_dir
+from calibre.utils.config import OptionParser
+from calibre.gui2.tweak_book.ui import Main
+
+def option_parser():
+    return OptionParser('''\
+%prog [opts] [path_to_ebook]
+
+Launch the calibre tweak book tool.
+''')
+
+def main(args=sys.argv):
+    # Ensure we can continue to function if GUI is closed
+    os.environ.pop('CALIBRE_WORKER_TEMP_DIR', None)
+    reset_base_dir()
+
+    parser = option_parser()
+    opts, args = parser.parse_args(args)
+    override = 'calibre-tweak-book' if islinux else None
+    app = Application(args, override_program_name=override)
+    app.load_builtin_fonts()
+    app.setWindowIcon(QIcon(I('tweak.png')))
+    Application.setOrganizationName(ORG_NAME)
+    Application.setApplicationName(APP_UID)
+    main = Main(opts)
+    sys.excepthook = main.unhandled_exception
+    main.show()
+    if len(args) > 1:
+        main.open_book(args[1])
+    app.exec_()
+
+if __name__ == '__main__':
+    main()
+
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
new file mode 100644
index 0000000000..1f6a2055a4
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import shutil, tempfile
+
+from PyQt4.Qt import QDockWidget, Qt, QLabel, QIcon
+
+from calibre.ebooks.oeb.polish.container import get_container
+from calibre.ebooks.oeb.polish.main import SUPPORTED
+from calibre.ptempfile import PersistentTemporaryDirectory
+from calibre.gui2 import error_dialog
+from calibre.gui2.main_window import MainWindow
+from calibre.gui2.tweak_book import set_current_container, current_container
+from calibre.gui2.tweak_book.file_list import FileListWidget
+from calibre.gui2.tweak_book.job import BlockingJob
+from calibre.gui2.tweak_book.undo import GlobalUndoHistory
+
+def load_book(path_to_ebook, base_tdir):
+    tdir = tempfile.mkdtemp(dir=base_tdir)
+    return get_container(path_to_ebook, tdir=tdir)
+
+class Main(MainWindow):
+
+    APP_NAME = _('Tweak Book')
+
+    def __init__(self, opts):
+        MainWindow.__init__(self, opts, disable_automatic_gc=True)
+        self.setWindowTitle(self.APP_NAME)
+        self.setWindowIcon(QIcon(I('tweak.png')))
+        self.opts = opts
+        self.tdir = None
+        self.path_to_ebook = None
+        self.container = None
+        self.global_undo = GlobalUndoHistory()
+        self.blocking_job = BlockingJob(self)
+
+        self.file_list_dock = d = QDockWidget(_('&Files Browser'), self)
+        d.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
+        self.file_list = FileListWidget(d)
+        d.setWidget(self.file_list)
+        self.addDockWidget(Qt.LeftDockWidgetArea, d)
+
+        self.status_bar = self.statusBar()
+        self.l = QLabel('Placeholder')
+
+        self.setCentralWidget(self.l)
+
+    def resizeEvent(self, ev):
+        self.blocking_job.resize(ev.size())
+        return super(Main, self).resizeEvent(ev)
+
+    def open_book(self, path):
+        ext = path.rpartition('.')[-1].upper()
+        if ext not in SUPPORTED:
+            return error_dialog(self, _('Unsupported format'),
+                _('Tweaking is only supported for books in the %s formats.'
+                  ' Convert your book to one of these formats first.') % _(' and ').join(sorted(SUPPORTED)),
+                show=True)
+
+        # TODO: Handle already open, dirtied book
+
+        if self.tdir:
+            shutil.rmtree(self.tdir, ignore_errors=True)
+        self.tdir = PersistentTemporaryDirectory()
+        self.blocking_job('open_book', _('Opening book, please wait...'), self.book_opened, load_book, path, self.tdir)
+
+    def book_opened(self, job):
+        if job.traceback is not None:
+            return error_dialog(self, _('Failed to open book'),
+                    _('Failed to open book, click Show details for more information.'),
+                                det_msg=job.traceback, show=True)
+        container = job.result
+        set_current_container(container)
+        self.current_metadata = container.mi
+        self.global_undo.open_book(container)
+        self.update_window_title()
+        self.file_list.build(container)
+
+    def update_window_title(self):
+        self.setWindowTitle(self.current_metadata.title + ' [%s] - %s' %(current_container().book_type.upper(), self.APP_NAME))
diff --git a/src/calibre/gui2/tweak_book/undo.py b/src/calibre/gui2/tweak_book/undo.py
new file mode 100644
index 0000000000..c221c0327c
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/undo.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+class State(object):
+
+    def __init__(self, container):
+        self.container = container
+        self.operation = None
+
+class GlobalUndoHistory(object):
+
+    def __init__(self):
+        self.states = []
+
+    def open_book(self, container):
+        self.states = [State(container)]
+

From 9e9abf640a59c22e955c04b13b2063dc31fbce71 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 8 Oct 2013 22:07:52 +0530
Subject: [PATCH 0938/1154] ...

---
 src/calibre/ebooks/oeb/polish/container.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index de8afe124f..2321a56463 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -497,7 +497,7 @@ class Container(object):  # {{{
 
     def filesize(self, name):
         if name in self.dirtied:
-            self.commit_item(name)
+            self.commit_item(name, keep_parsed=True)
         path = self.name_to_abspath(name)
         return os.path.getsize(path)
 

From c5278263e156a8e36470b270bb41ddbc9e20939d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 9 Oct 2013 00:30:58 +0200
Subject: [PATCH 0939/1154] wolnelektury plugin as it was dropped on
 eksiazki.org forum in April 2012

---
 src/calibre/customize/builtins.py             | 10 +++
 .../gui2/store/stores/wolnelektury_plugin.py  | 75 +++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 src/calibre/gui2/store/stores/wolnelektury_plugin.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index c44f15f416..e47f6271ab 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1692,6 +1692,15 @@ class StoreWHSmithUKStore(StoreBase):
     headquarters = 'UK'
     formats = ['EPUB', 'PDF']
 
+class StoreWolneLekturyStore(StoreBase):
+    name = 'Wolne Lektury'
+    author = u'Tomasz Długosz'
+    description = u'Wolne Lektury to biblioteka internetowa czynna 24 godziny na dobę, 365 dni w roku, której zasoby dostępne są całkowicie za darmo. Wszystkie dzieła są odpowiednio opracowane - opatrzone przypisami, motywami i udostępnione w kilku formatach - HTML, TXT, PDF, EPUB, MOBI, FB2.'
+    actual_plugin = 'calibre.gui2.store.stores.wolnelektury_plugin:WolneLekturyStore'
+
+    headquarters = 'PL'
+    formats = ['EPUB', 'MOBI', 'PDF', 'TXT', 'FB2']
+
 class StoreWoblinkStore(StoreBase):
     name = 'Woblink'
     author = u'Tomasz Długosz'
@@ -1759,6 +1768,7 @@ plugins += [
     StoreWaterstonesUKStore,
     StoreWeightlessBooksStore,
     StoreWHSmithUKStore,
+    StoreWolneLekturyStore,
     StoreWoblinkStore,
     XinXiiStore
 ]
diff --git a/src/calibre/gui2/store/stores/wolnelektury_plugin.py b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
new file mode 100644
index 0000000000..afed39784e
--- /dev/null
+++ b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2012, Tomasz Długosz <tomek3d@gmail.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+import urllib
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser, url_slash_cleaner
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.search_result import SearchResult
+from calibre.gui2.store.web_store_dialog import WebStoreDialog
+
+class WolneLekturyStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+
+        url = 'http://wolnelektury.pl'
+        detail_url = None
+
+        if detail_item:
+            detail_url = detail_item
+
+        if external or self.config.get('open_external', False):
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))
+        else:
+            d = WebStoreDialog(self.gui, url, parent, detail_url)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        url = 'http://wolnelektury.pl/szukaj?q=' + urllib.quote_plus(query.encode('utf-8'))
+
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+            for data in doc.xpath('//li[@class="Book-item"]'):
+                if counter <= 0:
+                    break
+
+                id = ''.join(data.xpath('.//div[@class="title"]/a/@href'))
+                if not id:
+                    continue
+
+                cover_url = ''.join(data.xpath('.//a[1]/img/@src'))
+                title = ''.join(data.xpath('.//div[@class="title"]/a[1]/text()'))
+                author = ', '.join(data.xpath('.//div[@class="mono author"]/a/text()'))
+                price = '0,00 zł'
+                formats = ', '.join(data.xpath('.//div[@class="book-box-formats mono"]/span/a/text()'))
+
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = 'http://wolnelektury.pl' + cover_url.strip()
+                s.title = title.strip()
+                s.author = author
+                s.price = price
+                s.detail_item = 'http://wolnelektury.pl' + id
+                s.formats = formats.upper().strip()
+                s.drm = SearchResult.DRM_UNLOCKED
+
+                yield s

From 073a00b431d72fbe6efdb168062bd41f580c0bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 9 Oct 2013 00:31:35 +0200
Subject: [PATCH 0940/1154] add store_version to wolnelektury plugin

---
 src/calibre/gui2/store/stores/wolnelektury_plugin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/store/stores/wolnelektury_plugin.py b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
index afed39784e..f3f7db5387 100644
--- a/src/calibre/gui2/store/stores/wolnelektury_plugin.py
+++ b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
+store_version = 1  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
-__copyright__ = '2012, Tomasz Długosz <tomek3d@gmail.com>'
+__copyright__ = '2012-2013, Tomasz Długosz <tomek3d@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
 import re

From b10dc544bd4c289ecbd81da30d92575db6234cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= <tomek3d@gmail.com>
Date: Wed, 9 Oct 2013 00:02:51 +0200
Subject: [PATCH 0941/1154] wolnelektury plugin: add download capability

---
 src/calibre/gui2/store/stores/wolnelektury_plugin.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/store/stores/wolnelektury_plugin.py b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
index f3f7db5387..09f63af508 100644
--- a/src/calibre/gui2/store/stores/wolnelektury_plugin.py
+++ b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
@@ -60,17 +60,20 @@ class WolneLekturyStore(BasicStoreConfig, StorePlugin):
                 title = ''.join(data.xpath('.//div[@class="title"]/a[1]/text()'))
                 author = ', '.join(data.xpath('.//div[@class="mono author"]/a/text()'))
                 price = '0,00 zł'
-                formats = ', '.join(data.xpath('.//div[@class="book-box-formats mono"]/span/a/text()'))
 
                 counter -= 1
 
                 s = SearchResult()
+                for link in data.xpath('.//div[@class="book-box-formats mono"]/span/a'):
+                    ext = ''.join(link.xpath('./text()'))
+                    href = 'http://wolnelektury.pl' + link.get('href')
+                    s.downloads[ext] = href
                 s.cover_url = 'http://wolnelektury.pl' + cover_url.strip()
                 s.title = title.strip()
                 s.author = author
                 s.price = price
                 s.detail_item = 'http://wolnelektury.pl' + id
-                s.formats = formats.upper().strip()
+                s.formats = ', '.join(s.downloads.keys())
                 s.drm = SearchResult.DRM_UNLOCKED
 
                 yield s

From f0d65fa0c2eeec1c1ac90f1a69a0d9b53c25bde2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Oct 2013 08:50:33 +0530
Subject: [PATCH 0942/1154] Grid View: Fix selectAll() behavior

Cover grid: Fix selecting all books with Ctrl+A causing subsequent
deselects to not fully work. Fixes #1236348 [Cover grid: Ctrl-A (Select ALL), deselect one, does not update status bar](https://bugs.launchpad.net/calibre/+bug/1236348)
---
 src/calibre/gui2/library/alternate_views.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index c4a0b79c3a..4f21c4868e 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -731,6 +731,16 @@ class GridView(QListView):
             sel.merge(QItemSelection(m.index(min(group), 0), m.index(max(group), 0)), sm.Select)
         sm.select(sel, sm.ClearAndSelect)
 
+    def selectAll(self):
+        # We re-implement this to ensure that only indexes from column 0 are
+        # selected. The base class implementation selects all columns. This
+        # causes problems with selection syncing, see
+        # https://bugs.launchpad.net/bugs/1236348
+        m = self.model()
+        sm = self.selectionModel()
+        sel = QItemSelection(m.index(0, 0), m.index(m.rowCount(QModelIndex())-1, 0))
+        sm.select(sel, sm.ClearAndSelect)
+
     def set_current_row(self, row):
         sm = self.selectionModel()
         sm.setCurrentIndex(self.model().index(row, 0), sm.NoUpdate)

From 5246859ad0277a7130d6dad11aa67ff0bc6e42b7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Oct 2013 09:28:23 +0530
Subject: [PATCH 0943/1154] EPUB Output: Do not strip <object> tags with type
 application/svg+xml

EPUB Output: Do not strip <object> tags with type application/svg+xml in
addition to those that use image/svg+xml. Fixes #1236845 [Conversion - Missing Images](https://bugs.launchpad.net/calibre/+bug/1236845)
---
 src/calibre/ebooks/conversion/plugins/epub_output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/conversion/plugins/epub_output.py b/src/calibre/ebooks/conversion/plugins/epub_output.py
index 5569be4304..57f06e17ba 100644
--- a/src/calibre/ebooks/conversion/plugins/epub_output.py
+++ b/src/calibre/ebooks/conversion/plugins/epub_output.py
@@ -410,7 +410,7 @@ class EPUBOutput(OutputFormatPlugin):
             for tag in XPath('//h:embed')(root):
                 tag.getparent().remove(tag)
             for tag in XPath('//h:object')(root):
-                if tag.get('type', '').lower().strip() in ('image/svg+xml',):
+                if tag.get('type', '').lower().strip() in {'image/svg+xml', 'application/svg+xml'}:
                     continue
                 tag.getparent().remove(tag)
 

From e1b25b6f529af478d8777bc7d804b318f6ce140b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Oct 2013 10:31:11 +0530
Subject: [PATCH 0944/1154] Update New York Review of Books

Fixes #1235790 [Private bug](https://bugs.launchpad.net/calibre/+bug/1235790)
---
 recipes/new_york_review_of_books.recipe       | 79 ++++++++++---------
 .../new_york_review_of_books_no_sub.recipe    | 57 +++++++------
 2 files changed, 76 insertions(+), 60 deletions(-)

diff --git a/recipes/new_york_review_of_books.recipe b/recipes/new_york_review_of_books.recipe
index 2da9536da3..09d178b3ba 100644
--- a/recipes/new_york_review_of_books.recipe
+++ b/recipes/new_york_review_of_books.recipe
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env  python
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
@@ -11,6 +10,9 @@ import re
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
+def find_header(tag):
+    return tag.name == 'header' and tag.parent['class'] == 'article'
+
 class NewYorkReviewOfBooks(BasicNewsRecipe):
 
     title = u'New York Review of Books'
@@ -23,65 +25,70 @@ class NewYorkReviewOfBooks(BasicNewsRecipe):
     no_javascript = True
     needs_subscription = True
 
-    keep_only_tags = [dict(id=['article-body','page-title'])]
-    remove_tags = [dict(attrs={'class':['article-tools', 'article-links',
-        'center advertisement']})]
+    keep_only_tags = [
+        dict(name='section', attrs={'class':'article_body'}),
+        dict(name=find_header),
+        dict(name='div', attrs={'class':'for-subscribers-only'}),
+    ]
 
     preprocess_regexps = [(re.compile(r'<head>.*?</head>', re.DOTALL), lambda
         m:'<head></head>')]
 
+    def print_version(self, url):
+        return url+'?pagination=false'
+
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
         br.open('http://www.nybooks.com/account/signin/')
-        br.select_form(nr = 1)
+        br.select_form(nr=2)
         br['username'] = self.username
         br['password'] = self.password
         br.submit()
         return br
 
-    def print_version(self, url):
-        return url+'?pagination=false'
+    def preprocess_html(self, soup):
+        header = soup.find('header')
+        body = soup.find('body')
+        body.insert(0, header)
+        header.find('div', attrs={'class':'details'}).extract()
+        for i in soup.findAll('input'):
+            i.extract()
+        return soup
 
     def parse_index(self):
         soup = self.index_to_soup('http://www.nybooks.com/current-issue')
 
         # Find cover
-        sidebar = soup.find(id='sidebar')
+        sidebar = soup.find('div', attrs={'class':'issue_cover'})
         if sidebar is not None:
-            a = sidebar.find('a', href=lambda x: x and 'view-photo' in x)
-            if a is not None:
-                psoup = self.index_to_soup('http://www.nybooks.com'+a['href'])
-                cover = psoup.find('img', src=True)
-                self.cover_url = cover['src']
-                self.log('Found cover at:', self.cover_url)
+            img = sidebar.find('img', src=True)
+            self.cover_url = 'http://www.nybooks.com' + img['src']
+            self.log('Found cover at:', self.cover_url)
 
         # Find date
-        div = soup.find(id='page-title')
+        div = soup.find('time', pubdate='pubdate')
         if div is not None:
-            h5 = div.find('h5')
-            if h5 is not None:
-                text = self.tag_to_string(h5)
-                date = text.partition(u'\u2022')[0].strip()
-                self.timefmt = u' [%s]'%date
-                self.log('Issue date:', date)
+            text = self.tag_to_string(div)
+            date = text.partition(u'\u2022')[0].strip()
+            self.timefmt = u' [%s]'%date
+            self.log('Issue date:', date)
 
         # Find TOC
-        tocs = soup.findAll('ul', attrs={'class':'issue-article-list'})
+        toc = soup.find('div', attrs={'class':'current_issue'}).find('div', attrs={'class':'articles_list'})
         articles = []
-        for toc in tocs:
-            for li in toc.findAll('li'):
-                h3 = li.find('h3')
-                title = self.tag_to_string(h3)
-                author = self.tag_to_string(li.find('h4'))
-                title = title + u' (%s)'%author
-                url = 'http://www.nybooks.com'+h3.find('a', href=True)['href']
-                desc = ''
-                for p in li.findAll('p'):
-                    desc += self.tag_to_string(p)
-                self.log('Found article:', title)
-                self.log('\t', url)
-                self.log('\t', desc)
-                articles.append({'title':title, 'url':url, 'date':'',
+        for div in toc.findAll('div', attrs={'class':'row'}):
+            h2 = div.find('h2')
+            title = self.tag_to_string(h2).strip()
+            author = self.tag_to_string(div.find('div', attrs={'class':'author'})).strip()
+            title = title + u' (%s)'%author
+            url = 'http://www.nybooks.com' + h2.find('a', href=True)['href']
+            desc = ''
+            for p in div.findAll('p', attrs={'class':lambda x: x and 'quiet' in x}):
+                desc += self.tag_to_string(p)
+            self.log('Found article:', title)
+            self.log('\t', url)
+            self.log('\t', desc)
+            articles.append({'title':title, 'url':url, 'date':'',
                 'description':desc})
 
         return [('Current Issue', articles)]
diff --git a/recipes/new_york_review_of_books_no_sub.recipe b/recipes/new_york_review_of_books_no_sub.recipe
index e462689403..90a4fd8544 100644
--- a/recipes/new_york_review_of_books_no_sub.recipe
+++ b/recipes/new_york_review_of_books_no_sub.recipe
@@ -10,6 +10,9 @@ import re
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
+def find_header(tag):
+    return tag.name == 'header' and tag.parent['class'] == 'article'
+
 class NewYorkReviewOfBooks(BasicNewsRecipe):
 
     title = u'New York Review of Books (no subscription)'
@@ -21,9 +24,11 @@ class NewYorkReviewOfBooks(BasicNewsRecipe):
     no_stylesheets = True
     no_javascript = True
 
-    keep_only_tags = [dict(id=['article-body', 'page-title'])]
-    remove_tags = [dict(attrs={'class':['article-tools', 'article-links',
-        'center advertisement']})]
+    keep_only_tags = [
+        dict(name='section', attrs={'class':'article_body'}),
+        dict(name=find_header),
+        dict(name='div', attrs={'class':'for-subscribers-only'}),
+    ]
 
     preprocess_regexps = [(re.compile(r'<head>.*?</head>', re.DOTALL), lambda
         m:'<head></head>')]
@@ -31,40 +36,44 @@ class NewYorkReviewOfBooks(BasicNewsRecipe):
     def print_version(self, url):
         return url+'?pagination=false'
 
+    def preprocess_html(self, soup):
+        header = soup.find('header')
+        body = soup.find('body')
+        body.insert(0, header)
+        header.find('div', attrs={'class':'details'}).extract()
+        for i in soup.findAll('input'):
+            i.extract()
+        return soup
+
     def parse_index(self):
         soup = self.index_to_soup('http://www.nybooks.com/current-issue')
 
         # Find cover
-        sidebar = soup.find(id='sidebar')
+        sidebar = soup.find('div', attrs={'class':'issue_cover'})
         if sidebar is not None:
-            a = sidebar.find('a', href=lambda x: x and 'view-photo' in x)
-            if a is not None:
-                psoup = self.index_to_soup('http://www.nybooks.com'+a['href'])
-                cover = psoup.find('img', src=True)
-                self.cover_url = cover['src']
-                self.log('Found cover at:', self.cover_url)
+            img = sidebar.find('img', src=True)
+            self.cover_url = 'http://www.nybooks.com' + img['src']
+            self.log('Found cover at:', self.cover_url)
 
         # Find date
-        div = soup.find(id='page-title')
+        div = soup.find('time', pubdate='pubdate')
         if div is not None:
-            h5 = div.find('h5')
-            if h5 is not None:
-                text = self.tag_to_string(h5)
-                date = text.partition(u'\u2022')[0].strip()
-                self.timefmt = u' [%s]'%date
-                self.log('Issue date:', date)
+            text = self.tag_to_string(div)
+            date = text.partition(u'\u2022')[0].strip()
+            self.timefmt = u' [%s]'%date
+            self.log('Issue date:', date)
 
         # Find TOC
-        toc = soup.find('ul', attrs={'class':'issue-article-list'})
+        toc = soup.find('div', attrs={'class':'current_issue'}).find('div', attrs={'class':'articles_list'})
         articles = []
-        for li in toc.findAll('li'):
-            h3 = li.find('h3')
-            title = self.tag_to_string(h3)
-            author = self.tag_to_string(li.find('h4'))
+        for div in toc.findAll('div', attrs={'class':'row'}):
+            h2 = div.find('h2')
+            title = self.tag_to_string(h2).strip()
+            author = self.tag_to_string(div.find('div', attrs={'class':'author'})).strip()
             title = title + u' (%s)'%author
-            url = 'http://www.nybooks.com'+h3.find('a', href=True)['href']
+            url = 'http://www.nybooks.com' + h2.find('a', href=True)['href']
             desc = ''
-            for p in li.findAll('p'):
+            for p in div.findAll('p', attrs={'class':lambda x: x and 'quiet' in x}):
                 desc += self.tag_to_string(p)
             self.log('Found article:', title)
             self.log('\t', url)

From f2d0a45b01934652c1af1972b5843a93a0747931 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Wed, 9 Oct 2013 09:50:26 +0200
Subject: [PATCH 0945/1154] Fix OPDS category links to composite columns

---
 src/calibre/library/server/opds.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
index 7dd07c064e..5e9ca44b33 100644
--- a/src/calibre/library/server/opds.py
+++ b/src/calibre/library/server/opds.py
@@ -539,9 +539,14 @@ class OPDSServer(object):
             try:
                 p = which.index(':')
                 category = which[p+1:]
+                which = which[:p]
+                # This line will toss an exception for composite columns
                 which = int(which[:p])
             except:
-                raise cherrypy.HTTPError(404, 'Tag %r not found'%which)
+                # Might be a composite column, where we have the lookup key
+                if not (category in self.db.field_metadata and
+                        self.db.field_metadata[category]['datatype'] == 'composite'):
+                    raise cherrypy.HTTPError(404, 'Tag %r not found'%which)
 
         categories = self.categories_cache(
                 self.get_opds_allowed_ids_for_version(version))

From 53450c325b5638d2709dff9ae2829a148a73a637 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Oct 2013 13:25:03 +0530
Subject: [PATCH 0946/1154] Special case category icons allowing use of icons
 with file entries

---
 src/calibre/gui2/tweak_book/file_list.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 02fb7367e8..6c5765e7b3 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -14,10 +14,17 @@ from calibre import guess_type, human_readable
 from calibre.ebooks.oeb.base import OEB_STYLES
 from calibre.gui2.tweak_book import current_container
 
-ICON_SIZE = 24
+TOP_ICON_SIZE = 24
 NAME_ROLE = Qt.UserRole
+NBSP = '\xa0'
 
-class ItemDelegate(QStyledItemDelegate):
+class ItemDelegate(QStyledItemDelegate):  # {{{
+
+    def initStyleOption(self, option, index):
+        QStyledItemDelegate.initStyleOption(self, option, index)
+        top_level = not index.parent().isValid()
+        if top_level:
+            option.decorationSize = QSize(TOP_ICON_SIZE, TOP_ICON_SIZE)
 
     def sizeHint(self, option, index):
         ans = QStyledItemDelegate.sizeHint(self, option, index)
@@ -30,9 +37,9 @@ class ItemDelegate(QStyledItemDelegate):
         hover = option.state & QStyle.State_MouseOver
         if hover:
             if top_level:
-                suffix = '\xa0(%d)' % index.model().rowCount(index)
+                suffix = '%s(%d)' % (NBSP, index.model().rowCount(index))
             else:
-                suffix = '\xa0' + human_readable(current_container().filesize(unicode(index.data(NAME_ROLE).toString())))
+                suffix = NBSP + human_readable(current_container().filesize(unicode(index.data(NAME_ROLE).toString())))
             br = painter.boundingRect(option.rect, Qt.AlignRight|Qt.AlignVCenter, suffix)
         if top_level and index.row() > 0:
             option.rect.adjust(0, 5, 0, 0)
@@ -44,6 +51,7 @@ class ItemDelegate(QStyledItemDelegate):
         if hover:
             option.rect.adjust(0, 0, br.width(), 0)
             painter.drawText(option.rect, Qt.AlignRight|Qt.AlignVCenter, suffix)
+# }}}
 
 class FileList(QTreeWidget):
 
@@ -52,7 +60,6 @@ class FileList(QTreeWidget):
         self.delegate = ItemDelegate(self)
         self.setTextElideMode(Qt.ElideMiddle)
         self.setItemDelegate(self.delegate)
-        self.setIconSize(QSize(ICON_SIZE, ICON_SIZE))
         self.header().close()
         self.setDragEnabled(True)
         self.setSelectionMode(self.ExtendedSelection)
@@ -60,7 +67,7 @@ class FileList(QTreeWidget):
         self.setDropIndicatorShown(True)
         self.setDragDropMode(self.InternalMove)
         self.setAutoScroll(True)
-        self.setAutoScrollMargin(ICON_SIZE*2)
+        self.setAutoScrollMargin(TOP_ICON_SIZE*2)
         self.setDefaultDropAction(Qt.MoveAction)
         self.setAutoExpandDelay(1000)
         self.setAnimated(True)

From a9a24f316a922476fe86c74454d50a8e40156801 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 09:52:11 +0530
Subject: [PATCH 0947/1154] Implement multiple emblems for the file browser

---
 src/calibre/ebooks/oeb/polish/cover.py   | 20 +++++-
 src/calibre/gui2/tweak_book/file_list.py | 79 +++++++++++++++++++-----
 2 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/cover.py b/src/calibre/ebooks/oeb/polish/cover.py
index 5cee827d72..3104cff38d 100644
--- a/src/calibre/ebooks/oeb/polish/cover.py
+++ b/src/calibre/ebooks/oeb/polish/cover.py
@@ -33,6 +33,21 @@ def set_azw3_cover(container, cover_path, report):
     container.dirty(container.opf_name)
     report('Cover updated' if found else 'Cover inserted')
 
+def get_azw3_raster_cover_name(container):
+    items = container.opf_xpath('//opf:guide/opf:reference[@href and contains(@type, "cover")]')
+    if items:
+        return container.href_to_name(items[0].get('href'))
+
+def get_raster_cover_name(container):
+    if container.book_type == 'azw3':
+        return get_azw3_raster_cover_name(container)
+    return find_cover_image(container, strict=True)
+
+def get_cover_page_name(container):
+    if container.book_type == 'azw3':
+        return
+    return find_cover_page(container)
+
 def set_cover(container, cover_path, report):
     if container.book_type == 'azw3':
         set_azw3_cover(container, cover_path, report)
@@ -52,7 +67,7 @@ COVER_TYPES = {
     'other.ms-coverimage', 'other.ms-thumbimage-standard',
     'other.ms-thumbimage', 'thumbimagestandard', 'cover'}
 
-def find_cover_image(container):
+def find_cover_image(container, strict=False):
     'Find a raster image marked as a cover in the OPF'
     manifest_id_map = container.manifest_id_map
     mm = container.mime_map
@@ -69,6 +84,9 @@ def find_cover_image(container):
         if ref_type.lower() == 'cover' and is_raster_image(mm.get(name, None)):
             return name
 
+    if strict:
+        return
+
     # Find the largest image from all possible guide cover items
     largest_cover = (None, 0)
     for ref_type, name in guide_type_map.iteritems():
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 6c5765e7b3..dc533307ff 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -8,10 +8,11 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from PyQt4.Qt import (
     QWidget, QTreeWidget, QGridLayout, QSize, Qt, QTreeWidgetItem, QIcon,
-    QStyledItemDelegate, QStyle)
+    QStyledItemDelegate, QStyle, QPixmap, QPainter)
 
 from calibre import guess_type, human_readable
 from calibre.ebooks.oeb.base import OEB_STYLES
+from calibre.ebooks.oeb.polish.cover import get_cover_page_name, get_raster_cover_name
 from calibre.gui2.tweak_book import current_container
 
 TOP_ICON_SIZE = 24
@@ -20,12 +21,6 @@ NBSP = '\xa0'
 
 class ItemDelegate(QStyledItemDelegate):  # {{{
 
-    def initStyleOption(self, option, index):
-        QStyledItemDelegate.initStyleOption(self, option, index)
-        top_level = not index.parent().isValid()
-        if top_level:
-            option.decorationSize = QSize(TOP_ICON_SIZE, TOP_ICON_SIZE)
-
     def sizeHint(self, option, index):
         ans = QStyledItemDelegate.sizeHint(self, option, index)
         top_level = not index.parent().isValid()
@@ -60,6 +55,7 @@ class FileList(QTreeWidget):
         self.delegate = ItemDelegate(self)
         self.setTextElideMode(Qt.ElideMiddle)
         self.setItemDelegate(self.delegate)
+        self.setIconSize(QSize(16, 16))
         self.header().close()
         self.setDragEnabled(True)
         self.setSelectionMode(self.ExtendedSelection)
@@ -76,22 +72,33 @@ class FileList(QTreeWidget):
         self.setContextMenuPolicy(Qt.CustomContextMenu)
         self.customContextMenuRequested.connect(self.show_context_menu)
         self.root = self.invisibleRootItem()
+        self.emblem_cache = {}
+        self.rendered_emblem_cache = {}
+        self.top_level_pixmap_cache = {
+            name : QPixmap(I(icon)).scaled(TOP_ICON_SIZE, TOP_ICON_SIZE, transformMode=Qt.SmoothTransformation)
+            for name, icon in {
+                'text':'keyboard-prefs.png',
+                'styles':'lookfeel.png',
+                'fonts':'font.png',
+                'misc':'mimetypes/dir.png',
+                'images':'view-image.png',
+            }.iteritems()}
 
     def build(self, container):
         self.clear()
         self.root = self.invisibleRootItem()
         self.root.setFlags(Qt.ItemIsDragEnabled)
         self.categories = {}
-        for category, text, icon in (
-            ('text', _('Text'), 'keyboard-prefs.png'),
-            ('styles', _('Styles'), 'lookfeel.png'),
-            ('images', _('Images'), 'view-image.png'),
-            ('fonts', _('Fonts'), 'font.png'),
-            ('misc', _('Miscellaneous'), 'mimetypes/dir.png'),
+        for category, text in (
+            ('text', _('Text')),
+            ('styles', _('Styles')),
+            ('images', _('Images')),
+            ('fonts', _('Fonts')),
+            ('misc', _('Miscellaneous')),
         ):
             self.categories[category] = i = QTreeWidgetItem(self.root, 0)
             i.setText(0, text)
-            i.setIcon(0, QIcon(I(icon)))
+            i.setData(0, Qt.DecorationRole, self.top_level_pixmap_cache[category])
             f = i.font(0)
             f.setBold(True)
             i.setFont(0, f)
@@ -111,16 +118,55 @@ class FileList(QTreeWidget):
             seen[text] = item
             return text
 
+        cover_page_name = get_cover_page_name(container)
+        cover_image_name = get_raster_cover_name(container)
+        manifested_names = set()
+        for names in container.manifest_type_map.itervalues():
+            manifested_names |= set(names)
+
+        def add_emblems(item, name, linear=True):
+            emblems = []
+            if name in {cover_page_name, cover_image_name}:
+                emblems.append('default_cover.png')
+            if name not in manifested_names and name not in {container.opf_name, 'META_INF/container.xml', 'META_INF/encryption.xml'}:
+                emblems.append('dialog_question.png')
+            if not linear:
+                emblems.append('arrow-down.png')
+            emblems = tuple(emblems)
+            if not emblems:
+                return
+            icon = self.rendered_emblem_cache.get(emblems, None)
+            if icon is None:
+                pixmaps = []
+                for emblem in emblems:
+                    pm = self.emblem_cache.get(emblem, None)
+                    if pm is None:
+                        pm = self.emblem_cache[emblem] = QPixmap(
+                            I(emblem)).scaled(self.iconSize(), transformMode=Qt.SmoothTransformation)
+                    pixmaps.append(pm)
+                num = len(pixmaps)
+                w, h = pixmaps[0].width(), pixmaps[0].height()
+                if num == 1:
+                    icon = self.rendered_emblem_cache[emblems] = QIcon(pixmaps[0])
+                else:
+                    canvas = QPixmap((num * w) + ((num-1)*2), h)
+                    canvas.fill(Qt.transparent)
+                    painter = QPainter(canvas)
+                    for i, pm in enumerate(pixmaps):
+                        painter.drawPixmap(i * (w + 2), 0, pm)
+                    painter.end()
+                    icon = self.rendered_emblem_cache[emblems] = canvas
+            item.setData(0, Qt.DecorationRole, icon)
+
         for name, linear in container.spine_names:
             processed.add(name)
             i = QTreeWidgetItem(self.categories['text'], 1)
             prefix = '' if linear else '[nl] '
-            if not linear:
-                i.setIcon(self.non_linear_icon)
             i.setText(0, prefix + get_display_name(name, i))
             i.setStatusTip(0, _('Full path: ') + name)
             i.setFlags(Qt.ItemIsEnabled | Qt.ItemIsDragEnabled | Qt.ItemIsSelectable)
             i.setData(0, NAME_ROLE, name)
+            add_emblems(i, name, linear=linear)
 
         font_types = {guess_type('a.'+x)[0] for x in ('ttf', 'otf', 'woff')}
 
@@ -148,6 +194,7 @@ class FileList(QTreeWidget):
             i.setStatusTip(0, _('Full path: ') + name)
             i.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
             i.setData(0, NAME_ROLE, name)
+            add_emblems(i, name)
 
         for c in self.categories.itervalues():
             self.expandItem(c)

From 050583ba9d28e69a8ae1a3378a7a20b9df1fa3f8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 10:02:00 +0530
Subject: [PATCH 0948/1154] ...

---
 src/calibre/gui2/tweak_book/file_list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index dc533307ff..f8acacbe85 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -128,7 +128,7 @@ class FileList(QTreeWidget):
             emblems = []
             if name in {cover_page_name, cover_image_name}:
                 emblems.append('default_cover.png')
-            if name not in manifested_names and name not in {container.opf_name, 'META_INF/container.xml', 'META_INF/encryption.xml'}:
+            if name not in manifested_names and name not in {container.opf_name, 'META-INF/container.xml', 'META-INF/encryption.xml'}:
                 emblems.append('dialog_question.png')
             if not linear:
                 emblems.append('arrow-down.png')

From a939e721d1e8145f98f95496fd6a361fb564e3f6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 14:36:01 +0530
Subject: [PATCH 0949/1154] pep8

---
 setup/resources.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/setup/resources.py b/setup/resources.py
index 6327faaf9b..051677ba17 100644
--- a/setup/resources.py
+++ b/setup/resources.py
@@ -18,12 +18,14 @@ def get_opts_from_parser(parser):
         for x in opt._short_opts:
             yield x
     for o in parser.option_list:
-        for x in do_opt(o): yield x
+        for x in do_opt(o):
+            yield x
     for g in parser.option_groups:
         for o in g.option_list:
-            for x in do_opt(o): yield x
+            for x in do_opt(o):
+                yield x
 
-class Coffee(Command): # {{{
+class Coffee(Command):  # {{{
 
     description = 'Compile coffeescript files into javascript'
     COFFEE_DIRS = ('ebooks/oeb/display', 'ebooks/oeb/polish')
@@ -112,7 +114,7 @@ class Coffee(Command): # {{{
             os.remove(x)
 # }}}
 
-class Kakasi(Command): # {{{
+class Kakasi(Command):  # {{{
 
     description = 'Compile resources for unihandecode'
 
@@ -155,29 +157,29 @@ class Kakasi(Command): # {{{
         dic = {}
         for line in open(src, "r"):
             line = line.decode("utf-8").strip()
-            if line.startswith(';;'): # skip comment
+            if line.startswith(';;'):  # skip comment
                 continue
             if re.match(r"^$",line):
                 continue
             pair = re.sub(r'\\u([0-9a-fA-F]{4})', lambda x:unichr(int(x.group(1),16)), line)
             dic[pair[0]] = pair[1]
-        cPickle.dump(dic, open(dst, 'wb'), protocol=-1) #pickle
+        cPickle.dump(dic, open(dst, 'wb'), protocol=-1)  # pickle
 
     def mkkanadict(self, src, dst):
         dic = {}
         for line in open(src, "r"):
             line = line.decode("utf-8").strip()
-            if line.startswith(';;'): # skip comment
+            if line.startswith(';;'):  # skip comment
                 continue
             if re.match(r"^$",line):
                 continue
             (alpha, kana) = line.split(' ')
             dic[kana] = alpha
-        cPickle.dump(dic, open(dst, 'wb'), protocol=-1) #pickle
+        cPickle.dump(dic, open(dst, 'wb'), protocol=-1)  # pickle
 
     def parsekdict(self, line):
         line = line.decode("utf-8").strip()
-        if line.startswith(';;'): # skip comment
+        if line.startswith(';;'):  # skip comment
             return
         (yomi, kanji) = line.split(' ')
         if ord(yomi[-1:]) <= ord('z'):
@@ -193,7 +195,7 @@ class Kakasi(Command): # {{{
             if kanji in self.records[key]:
                 rec = self.records[key][kanji]
                 rec.append((yomi,tail))
-                self.records[key].update( {kanji: rec} )
+                self.records[key].update({kanji: rec})
             else:
                 self.records[key][kanji]=[(yomi, tail)]
         else:
@@ -213,7 +215,7 @@ class Kakasi(Command): # {{{
             shutil.rmtree(kakasi)
 # }}}
 
-class Resources(Command): # {{{
+class Resources(Command):  # {{{
 
     description = 'Compile various needed calibre resources'
     sub_commands = ['kakasi', 'coffee']
@@ -255,7 +257,6 @@ class Resources(Command): # {{{
                     with open(n, 'rb') as f:
                         zf.writestr(os.path.basename(n), f.read())
 
-
         dest = self.j(self.RESOURCES, 'ebook-convert-complete.pickle')
         files = []
         for x in os.walk(self.j(self.SRC, 'calibre')):

From 7275d89cb5d278115c035b5805c341b5345c2066 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 15:22:45 +0530
Subject: [PATCH 0950/1154] Fix grid view not updated immediately when marked
 books changed

Also fix translations for show marked books menu item.
---
 src/calibre/gui2/actions/mark_books.py      |  2 +-
 src/calibre/gui2/library/alternate_views.py | 11 +++++++++++
 src/calibre/gui2/library/views.py           |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py
index 8711a55ef0..f6fcbbd58a 100644
--- a/src/calibre/gui2/actions/mark_books.py
+++ b/src/calibre/gui2/actions/mark_books.py
@@ -72,7 +72,7 @@ class MarkBooksAction(InterfaceAction):
     def about_to_show_menu(self):
         db = self.gui.current_db
         num = len(db.data.marked_ids)
-        text = ngettext('Show marked book', 'Show marked books (%d)' % num, num)
+        text = _('Show marked book') if num == 1 else (_('Show marked books') + (' (%d)' % num))
         self.show_marked_action.setText(text)
 
     def location_selected(self, loc):
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 4f21c4868e..68ebe74ba1 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -300,6 +300,10 @@ class AlternateViews(object):
             if self.current_book_state[0] is self.current_view:
                 self.current_view.restore_current_book_state(self.current_book_state[1])
             self.current_book_state = None
+
+    def marked_changed(self, old_marked, current_marked):
+        if self.current_view is not self.main_view:
+            self.current_view.marked_changed(old_marked, current_marked)
 # }}}
 
 # Rendering of covers {{{
@@ -818,4 +822,11 @@ class GridView(QListView):
         self.set_current_row(row)
         self.select_rows((row,))
         self.scrollTo(self.model().index(row, 0), self.PositionAtCenter)
+
+    def marked_changed(self, old_marked, current_marked):
+        changed = old_marked | current_marked
+        m = self.model()
+        for book_id in changed:
+            self.update(m.index(m.db.data.id_to_index(book_id), 0))
+
 # }}}
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 803b8130a9..ccf15a2be9 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -690,6 +690,7 @@ class BooksView(QTableView):  # {{{
         self.alternate_views.set_database(db, stage=1)
 
     def marked_changed(self, old_marked, current_marked):
+        self.alternate_views.marked_changed(old_marked, current_marked)
         if bool(old_marked) == bool(current_marked):
             changed = old_marked | current_marked
             sections = tuple(map(self.model().db.data.id_to_index, changed))

From bfe6099a3dc56adba7601a6174957359d9c8fbdb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 15:26:27 +0530
Subject: [PATCH 0951/1154] Update National Geographic Magazine

---
 recipes/national_geographic_mag.recipe | 89 +++++++++++++-------------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/recipes/national_geographic_mag.recipe b/recipes/national_geographic_mag.recipe
index f571d117be..8e7cc7709e 100644
--- a/recipes/national_geographic_mag.recipe
+++ b/recipes/national_geographic_mag.recipe
@@ -1,46 +1,49 @@
 from calibre.web.feeds.recipes import BasicNewsRecipe
 
-class NatGeoMag(BasicNewsRecipe):
-    title                  = 'National Geographic Mag'
-    __author__             = 'Terminal Veracity'
-    description            = 'The National Geographic Magazine'
-    publisher              = 'National Geographic'
-    oldest_article         = 31
-    max_articles_per_feed  = 50
-    category               = 'geography, magazine'
-    language               = 'en'
-    publication_type       = 'magazine'
-    cover_url              = 'http://www.yourlogoresources.com/wp-content/uploads/2011/09/national-geographic-logo.jpg'
-    use_embedded_content   = False
-    no_stylesheets         = True
-    remove_javascript      = True
-    recursions             = 1
-    remove_empty_feeds     = True
-    feeds                  = [('National Geographic Magazine', 'http://feeds.nationalgeographic.com/ng/NGM/NGM_Magazine')]
-    remove_tags            = [dict(name='div', attrs={'class':['nextpage_continue', 'subscribe']})]
-    keep_only_tags         = [dict(attrs={'class':'main_3narrow'})]
-    extra_css              = """
-                                h1 {font-size: large; font-weight: bold; margin: .5em 0; }
-                                h2 {font-size: large; font-weight: bold; margin: .5em 0; }
-                                h3 {font-size: medium; font-weight: bold; margin: 0 0; }
-                                .article_credits_author {font-size: small; font-style: italic; }
-                                .article_credits_photographer {font-size: small; font-style: italic; display: inline }
-                             """
+class NGM(BasicNewsRecipe):
 
-    def parse_feeds(self):
-        feeds = BasicNewsRecipe.parse_feeds(self)
-        for feed in feeds:
-            for article in feed.articles[:]:
-                if 'Flashback' in article.title:
-                    feed.articles.remove(article)
-                elif 'Desktop Wallpaper' in article.title:
-                    feed.articles.remove(article)
-                elif 'Visions of Earth' in article.title:
-                    feed.articles.remove(article)
-                elif 'Your Shot' in article.title:
-                    feed.articles.remove(article)
-                elif 'MyShot' in article.title:
-                    feed.articles.remove(article)
-                elif 'Field Test' in article.title:
-                    feed.articles.remove(article)
-        return feeds
+    title       = 'National Geographic Magazine'
+    __author__  = 'Krittika Goyal'
+    description = 'National Geographic Magazine'
+    timefmt = ' [%d %b, %Y]'
+
+    no_stylesheets = True
+    auto_cleanup = True
+    auto_cleanup_keep = '//div[@class="featurepic"]'
+
+    def nejm_get_index(self):
+        return self.index_to_soup('http://ngm.nationalgeographic.com/2013/10/table-of-contents')
+
+    # To parse artice toc
+    def parse_index(self):
+            soup = self.nejm_get_index()
+            tocfull = soup.find('div', attrs={'class':'coltoc'})
+
+            toc = tocfull.find('div', attrs={'class':'more_section'})
+
+            articles = []
+            feeds = []
+            section_title = 'Features'
+            for x in toc.findAll(True):
+                if x.name == 'a':
+                    # Article found
+                    title = self.tag_to_string(x)
+                    url = x.get('href', False)
+                    if not url or not title:
+                        continue
+                    url = 'http://ngm.nationalgeographic.com' + url
+                    self.log('\t\tFound article:', title)
+                    self.log('\t\t\t', url)
+                    articles.append({'title': title, 'url':url,
+                        'description':'', 'date':''})
+            feeds.append((section_title, articles))
+
+            art1 = tocfull.findAll('a')[1]
+            art1_title = self.tag_to_string(art1.find('div', attrs={'class': 'toched'}))
+            art1_url = art1.get('href', False)
+            art1_url = 'http://ngm.nationalgeographic.com' + art1_url
+            art1feed = {'title': art1_title, 'url':art1_url,
+                        'description':'', 'date':''}
+            feeds.append(('Cover Story', [art1feed]))
+
+            return feeds

From 8fabc3e0bf4d59c22ff01e42bb8c3e6a393c7625 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 15:55:01 +0530
Subject: [PATCH 0952/1154] Fix Ctrl/Shift+M shortcut not working

---
 src/calibre/gui2/actions/mark_books.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py
index f6fcbbd58a..8543df4461 100644
--- a/src/calibre/gui2/actions/mark_books.py
+++ b/src/calibre/gui2/actions/mark_books.py
@@ -50,7 +50,7 @@ class MarkBooksAction(InterfaceAction):
             self.toggle_ids(book_ids)
 
     def genesis(self):
-        self.qaction.triggered.connect(self.toolbar_triggered)
+        self.qaction.triggered.connect(self.toggle_selected)
         self.menu = m = self.qaction.menu()
         m.aboutToShow.connect(self.about_to_show_menu)
         ma = partial(self.create_menu_action, m)
@@ -69,6 +69,22 @@ class MarkBooksAction(InterfaceAction):
         self.unmark_series_action = a = ma('unmark-series', _('Clear all books in the selected series'), icon='minus.png')
         a.triggered.connect(partial(self.mark_field, 'series', False))
 
+    def gui_layout_complete(self):
+        for x in self.gui.bars_manager.main_bars + self.gui.bars_manager.child_bars:
+            try:
+                w = x.widgetForAction(self.qaction)
+                w.installEventFilter(self)
+            except:
+                continue
+
+    def eventFilter(self, obj, ev):
+        if ev.type() == ev.MouseButtonPress and ev.button() == Qt.LeftButton:
+            mods = QApplication.keyboardModifiers()
+            if mods & Qt.ControlModifier or mods & Qt.ShiftModifier:
+                self.show_marked()
+                return True
+        return False
+
     def about_to_show_menu(self):
         db = self.gui.current_db
         num = len(db.data.marked_ids)
@@ -79,13 +95,6 @@ class MarkBooksAction(InterfaceAction):
         enabled = loc == 'library'
         self.qaction.setEnabled(enabled)
 
-    def toolbar_triggered(self):
-        mods = QApplication.keyboardModifiers()
-        if mods & Qt.ControlModifier or mods & Qt.ShiftModifier:
-            self.show_marked()
-        else:
-            self.toggle_selected()
-
     def toggle_selected(self):
         book_ids = self._get_selected_ids()
         if book_ids:

From f27b03e9e4512ef254f01c008f9da9845f2c6b46 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 17:13:42 +0530
Subject: [PATCH 0953/1154] Refactor the file builder

---
 src/calibre/gui2/tweak_book/file_list.py | 110 +++++++++++++----------
 1 file changed, 63 insertions(+), 47 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index f8acacbe85..554a24173f 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -11,7 +11,7 @@ from PyQt4.Qt import (
     QStyledItemDelegate, QStyle, QPixmap, QPainter)
 
 from calibre import guess_type, human_readable
-from calibre.ebooks.oeb.base import OEB_STYLES
+from calibre.ebooks.oeb.base import OEB_STYLES, OEB_DOCS
 from calibre.ebooks.oeb.polish.cover import get_cover_page_name, get_raster_cover_name
 from calibre.gui2.tweak_book import current_container
 
@@ -108,15 +108,7 @@ class FileList(QTreeWidget):
                 flags |= Qt.ItemIsDropEnabled
             i.setFlags(flags)
 
-        processed, seen = set(), {}
-
-        def get_display_name(name, item):
-            parts = name.split('/')
-            text = parts[-1]
-            while text in seen and parts:
-                text = parts.pop() + '/' + text
-            seen[text] = item
-            return text
+        processed, seen = {}, {}
 
         cover_page_name = get_cover_page_name(container)
         cover_image_name = get_raster_cover_name(container)
@@ -124,14 +116,35 @@ class FileList(QTreeWidget):
         for names in container.manifest_type_map.itervalues():
             manifested_names |= set(names)
 
-        def add_emblems(item, name, linear=True):
-            emblems = []
-            if name in {cover_page_name, cover_image_name}:
-                emblems.append('default_cover.png')
-            if name not in manifested_names and name not in {container.opf_name, 'META-INF/container.xml', 'META-INF/encryption.xml'}:
-                emblems.append('dialog_question.png')
-            if not linear:
-                emblems.append('arrow-down.png')
+        font_types = {guess_type('a.'+x)[0] for x in ('ttf', 'otf', 'woff')}
+
+        def get_category(mt):
+            category = 'misc'
+            if mt.startswith('image/'):
+                category = 'images'
+            elif mt in font_types:
+                category = 'fonts'
+            elif mt in OEB_STYLES:
+                category = 'styles'
+            elif mt in OEB_DOCS:
+                category = 'text'
+            return category
+
+        def set_display_name(name, item):
+            if name in processed:
+                # We have an exact duplicate (can happen if there are
+                # duplicates in the spine)
+                item.setText(0, processed[name].text(0))
+                return
+
+            parts = name.split('/')
+            text = parts[-1]
+            while text in seen and parts:
+                text = parts.pop() + '/' + text
+            seen[text] = item
+            item.setText(0, text)
+
+        def render_emblems(item, emblems):
             emblems = tuple(emblems)
             if not emblems:
                 return
@@ -158,27 +171,38 @@ class FileList(QTreeWidget):
                     icon = self.rendered_emblem_cache[emblems] = canvas
             item.setData(0, Qt.DecorationRole, icon)
 
+        def create_item(name, linear=None):
+            imt = container.mime_map.get(name, guess_type(name)[0])
+            icat = get_category(imt)
+            category = 'text' if linear is not None else ({'text':'misc'}.get(icat, icat))
+            item = QTreeWidgetItem(self.categories['text' if linear is not None else category], 1)
+            flags = Qt.ItemIsEnabled | Qt.ItemIsSelectable
+            if category == 'text':
+                flags |= Qt.ItemIsDragEnabled
+            item.setFlags(flags)
+            item.setStatusTip(0, _('Full path: ') + name)
+            item.setData(0, NAME_ROLE, name)
+            set_display_name(name, item)
+            # TODO: Add appropriate tooltips based on the emblems
+            emblems = []
+            if name in {cover_page_name, cover_image_name}:
+                emblems.append('default_cover.png')
+            if name not in manifested_names and name not in {container.opf_name, 'META-INF/container.xml', 'META-INF/encryption.xml'}:
+                emblems.append('dialog_question.png')
+            if linear is False:
+                emblems.append('arrow-down.png')
+            if linear is None and icat == 'text':
+                # Text item outside spine
+                emblems.append('dialog_warning.png')
+            if category == 'text' and name in processed:
+                # Duplicate entry in spine
+                emblems.append('dialog_warning.png')
+
+            render_emblems(item, emblems)
+            return item
+
         for name, linear in container.spine_names:
-            processed.add(name)
-            i = QTreeWidgetItem(self.categories['text'], 1)
-            prefix = '' if linear else '[nl] '
-            i.setText(0, prefix + get_display_name(name, i))
-            i.setStatusTip(0, _('Full path: ') + name)
-            i.setFlags(Qt.ItemIsEnabled | Qt.ItemIsDragEnabled | Qt.ItemIsSelectable)
-            i.setData(0, NAME_ROLE, name)
-            add_emblems(i, name, linear=linear)
-
-        font_types = {guess_type('a.'+x)[0] for x in ('ttf', 'otf', 'woff')}
-
-        def get_category(mt):
-            category = 'misc'
-            if mt.startswith('image/'):
-                category = 'images'
-            elif mt in font_types:
-                category = 'fonts'
-            elif mt in OEB_STYLES:
-                category = 'styles'
-            return category
+            processed[name] = create_item(name, linear=linear)
 
         all_files = list(container.manifest_type_map.iteritems())
         all_files.append((guess_type('a.opf')[0], [container.opf_name]))
@@ -186,15 +210,7 @@ class FileList(QTreeWidget):
         for name in container.name_path_map:
             if name in processed:
                 continue
-            processed.add(name)
-            imt = container.mime_map.get(name, guess_type(name)[0])
-            icat = get_category(imt)
-            i = QTreeWidgetItem(self.categories[icat], 1)
-            i.setText(0, get_display_name(name, i))
-            i.setStatusTip(0, _('Full path: ') + name)
-            i.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
-            i.setData(0, NAME_ROLE, name)
-            add_emblems(i, name)
+            processed[name] = create_item(name)
 
         for c in self.categories.itervalues():
             self.expandItem(c)

From e7305f7004da658b446b274a9e463eee9a954ae2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 18:30:20 +0530
Subject: [PATCH 0954/1154] Book container: Remove references to toc and raster
 cover from opf when those files are deleted.

---
 src/calibre/ebooks/oeb/polish/container.py       | 11 +++++++++++
 src/calibre/ebooks/oeb/polish/tests/container.py | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 2321a56463..f8580235c2 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -345,12 +345,23 @@ class Container(object):  # {{{
                 self.remove_from_xml(elem)
                 self.dirty(self.opf_name)
         if removed:
+            for spine in self.opf_xpath('//opf:spine'):
+                tocref = spine.attrib.get('toc', None)
+                if tocref and tocref in removed:
+                    spine.attrib.pop('toc', None)
+                    self.dirty(self.opf_name)
+
             for item in self.opf_xpath('//opf:spine/opf:itemref[@idref]'):
                 idref = item.get('idref')
                 if idref in removed:
                     self.remove_from_xml(item)
                     self.dirty(self.opf_name)
 
+            for meta in self.opf_xpath('//opf:meta[@name="cover" and @content]'):
+                if meta.get('content') in removed:
+                    self.remove_from_xml(meta)
+                    self.dirty(self.opf_name)
+
         for item in self.opf_xpath('//opf:guide/opf:reference[@href]'):
             if self.href_to_name(item.get('href'), self.opf_name) == name:
                 self.remove_from_xml(item)
diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py
index e65f25fe6f..609766b6fd 100644
--- a/src/calibre/ebooks/oeb/polish/tests/container.py
+++ b/src/calibre/ebooks/oeb/polish/tests/container.py
@@ -57,3 +57,19 @@ class ContainerTests(BaseTest):
             for c in (c1, c2):
                 c.commit(outpath=x)
 
+    def test_file_removal(self):
+        ' Test removal of files from the container '
+        book = get_simple_book()
+        c = get_container(book, tdir=self.tdir)
+        files = ('toc.ncx', 'cover.png', 'titlepage.xhtml')
+        self.assertIn('titlepage.xhtml', {x[0] for x in c.spine_names})
+        self.assertTrue(c.opf_xpath('//opf:meta[@name="cover"]'))
+        for x in files:
+            c.remove_item(x)
+        self.assertIn(c.opf_name, c.dirtied)
+        self.assertNotIn('titlepage.xhtml', {x[0] for x in c.spine_names})
+        self.assertFalse(c.opf_xpath('//opf:meta[@name="cover"]'))
+        raw = c.serialize_item(c.opf_name).decode('utf-8')
+        for x in files:
+            self.assertNotIn(x, raw)
+

From 8938d4029850581fca2024435c33e8bc32dc5dba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 19:55:28 +0530
Subject: [PATCH 0955/1154] ...

---
 recipes/vfr_magazine.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/vfr_magazine.recipe b/recipes/vfr_magazine.recipe
index 788d91cab7..44d0662e7d 100644
--- a/recipes/vfr_magazine.recipe
+++ b/recipes/vfr_magazine.recipe
@@ -1,9 +1,9 @@
 from calibre.web.feeds.news import BasicNewsRecipe
 
 
-class HindustanTimes(BasicNewsRecipe):
+class VFR(BasicNewsRecipe):
     title = u'VFR Magazine'
-    language = 'fr'
+    language = 'it'
     __author__ = 'Krittika Goyal'
     oldest_article = 31  # days
     max_articles_per_feed = 25

From 8b607437c435b8fbc2e654191c7cc04eeba9fec3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 21:13:52 +0530
Subject: [PATCH 0956/1154] Start work on deleting files

---
 src/calibre/ebooks/oeb/polish/container.py | 70 +++++++++++++++++++---
 src/calibre/gui2/tweak_book/file_list.py   | 60 +++++++++++++++++--
 2 files changed, 117 insertions(+), 13 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index f8580235c2..66efb697c7 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -12,6 +12,7 @@ from collections import defaultdict
 from io import BytesIO
 from urllib import unquote as urlunquote, quote as urlquote
 from urlparse import urlparse
+from future_builtins import zip
 
 from lxml import etree
 
@@ -228,6 +229,14 @@ class Container(object):  # {{{
         data, self.used_encoding = xml_to_unicode(data)
         return fix_data(data)
 
+    @property
+    def names_that_need_not_be_manifested(self):
+        return {self.opf_name}
+
+    @property
+    def names_that_must_not_be_removed(self):
+        return {self.opf_name}
+
     def parse_xml(self, data):
         data, self.used_encoding = xml_to_unicode(
             data, strip_encoding_pats=True, assume_utf8=True, resolve_entities=True)
@@ -309,9 +318,8 @@ class Container(object):  # {{{
             for item in self.opf_xpath('//opf:guide/opf:reference[@href and @type]')}
 
     @property
-    def spine_names(self):
+    def spine_iter(self):
         manifest_id_map = self.manifest_id_map
-
         non_linear = []
         for item in self.opf_xpath('//opf:spine/opf:itemref[@idref]'):
             idref = item.get('idref')
@@ -319,17 +327,34 @@ class Container(object):  # {{{
             path = self.name_path_map.get(name, None)
             if path:
                 if item.get('linear', 'yes') == 'yes':
-                    yield name, True
+                    yield item, name, True
                 else:
-                    non_linear.append(name)
-        for name in non_linear:
-            yield name, False
+                    non_linear.append((item, name))
+        for item, name in non_linear:
+            yield item, name, False
+
+    @property
+    def spine_names(self):
+        for item, name, linear in self.spine_iter:
+            yield name, linear
 
     @property
     def spine_items(self):
         for name, linear in self.spine_names:
             yield self.name_path_map[name]
 
+    def remove_from_spine(self, spine_items, remove_if_no_longer_in_spine=True):
+        nixed = set()
+        for (name, remove), (item, xname, linear) in zip(spine_items, self.spine_iter):
+            if remove and name == xname:
+                self.remove_from_xml(item)
+                nixed.add(name)
+        if remove_if_no_longer_in_spine:
+            # Remove from the book if no longer in spine
+            nixed -= {name for name, linear in self.spine_names}
+            for name in nixed:
+                self.remove_item(name)
+
     def remove_item(self, name):
         '''
         Remove the item identified by name from this container. This removes all
@@ -623,6 +648,34 @@ class EpubContainer(Container):
         ans['container'] = copy.deepcopy(self.container)
         return ans
 
+    @property
+    def names_that_need_not_be_manifested(self):
+        return super(EpubContainer, self).names_that_need_not_be_manifested | {'META-INF/' + x for x in self.META_INF}
+
+    @property
+    def names_that_must_not_be_removed(self):
+        return super(EpubContainer, self).names_that_must_not_be_removed | {'META-INF/container.xml'}
+
+    def remove_item(self, name):
+        # Handle removal of obfuscated fonts
+        if name == 'META-INF/encryption.xml':
+            self.obfuscated_fonts.clear()
+        if name in self.obfuscated_fonts:
+            self.obfuscated_fonts.pop(name, None)
+            enc = self.parsed('META-INF/encryption.xml')
+            for em in enc.xpath('//*[local-name()="EncryptionMethod" and @Algorithm]'):
+                alg = em.get('Algorithm')
+                if alg not in {ADOBE_OBFUSCATION, IDPF_OBFUSCATION}:
+                    continue
+                try:
+                    cr = em.getparent().xpath('descendant::*[local-name()="CipherReference" and @URI]')[0]
+                except (IndexError, ValueError, KeyError):
+                    continue
+                if name == self.href_to_name(cr.get('URI')):
+                    self.remove_from_xml(em.getparent())
+                    self.dirty('META-INF/encryption.xml')
+        super(EpubContainer, self).remove_item(name)
+
     def process_encryption(self):
         fonts = {}
         enc = self.parsed('META-INF/encryption.xml')
@@ -630,7 +683,10 @@ class EpubContainer(Container):
             alg = em.get('Algorithm')
             if alg not in {ADOBE_OBFUSCATION, IDPF_OBFUSCATION}:
                 raise DRMError()
-            cr = em.getparent().xpath('descendant::*[local-name()="CipherReference" and @URI]')[0]
+            try:
+                cr = em.getparent().xpath('descendant::*[local-name()="CipherReference" and @URI]')[0]
+            except (IndexError, ValueError, KeyError):
+                continue
             name = self.href_to_name(cr.get('URI'))
             path = self.name_path_map.get(name, None)
             if path is not None:
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 554a24173f..9c210f8872 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -8,15 +8,18 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from PyQt4.Qt import (
     QWidget, QTreeWidget, QGridLayout, QSize, Qt, QTreeWidgetItem, QIcon,
-    QStyledItemDelegate, QStyle, QPixmap, QPainter)
+    QStyledItemDelegate, QStyle, QPixmap, QPainter, pyqtSignal)
 
-from calibre import guess_type, human_readable
+from calibre import human_readable
 from calibre.ebooks.oeb.base import OEB_STYLES, OEB_DOCS
+from calibre.ebooks.oeb.polish.container import guess_type
 from calibre.ebooks.oeb.polish.cover import get_cover_page_name, get_raster_cover_name
+from calibre.gui2 import error_dialog
 from calibre.gui2.tweak_book import current_container
 
 TOP_ICON_SIZE = 24
 NAME_ROLE = Qt.UserRole
+CATEGORY_ROLE = NAME_ROLE + 1
 NBSP = '\xa0'
 
 class ItemDelegate(QStyledItemDelegate):  # {{{
@@ -50,6 +53,8 @@ class ItemDelegate(QStyledItemDelegate):  # {{{
 
 class FileList(QTreeWidget):
 
+    delete_requested = pyqtSignal(object, object)
+
     def __init__(self, parent=None):
         QTreeWidget.__init__(self, parent)
         self.delegate = ItemDelegate(self)
@@ -116,7 +121,7 @@ class FileList(QTreeWidget):
         for names in container.manifest_type_map.itervalues():
             manifested_names |= set(names)
 
-        font_types = {guess_type('a.'+x)[0] for x in ('ttf', 'otf', 'woff')}
+        font_types = {guess_type('a.'+x) for x in ('ttf', 'otf', 'woff')}
 
         def get_category(mt):
             category = 'misc'
@@ -171,8 +176,10 @@ class FileList(QTreeWidget):
                     icon = self.rendered_emblem_cache[emblems] = canvas
             item.setData(0, Qt.DecorationRole, icon)
 
+        ok_to_be_unmanifested = container.names_that_need_not_be_manifested
+
         def create_item(name, linear=None):
-            imt = container.mime_map.get(name, guess_type(name)[0])
+            imt = container.mime_map.get(name, guess_type(name))
             icat = get_category(imt)
             category = 'text' if linear is not None else ({'text':'misc'}.get(icat, icat))
             item = QTreeWidgetItem(self.categories['text' if linear is not None else category], 1)
@@ -182,12 +189,13 @@ class FileList(QTreeWidget):
             item.setFlags(flags)
             item.setStatusTip(0, _('Full path: ') + name)
             item.setData(0, NAME_ROLE, name)
+            item.setData(0, CATEGORY_ROLE, category)
             set_display_name(name, item)
             # TODO: Add appropriate tooltips based on the emblems
             emblems = []
             if name in {cover_page_name, cover_image_name}:
                 emblems.append('default_cover.png')
-            if name not in manifested_names and name not in {container.opf_name, 'META-INF/container.xml', 'META-INF/encryption.xml'}:
+            if name not in manifested_names and name not in ok_to_be_unmanifested:
                 emblems.append('dialog_question.png')
             if linear is False:
                 emblems.append('arrow-down.png')
@@ -205,7 +213,7 @@ class FileList(QTreeWidget):
             processed[name] = create_item(name, linear=linear)
 
         all_files = list(container.manifest_type_map.iteritems())
-        all_files.append((guess_type('a.opf')[0], [container.opf_name]))
+        all_files.append((guess_type('a.opf'), [container.opf_name]))
 
         for name in container.name_path_map:
             if name in processed:
@@ -218,14 +226,54 @@ class FileList(QTreeWidget):
     def show_context_menu(self, point):
         pass
 
+    def keyPressEvent(self, ev):
+        if ev.key() in (Qt.Key_Delete, Qt.Key_Backspace):
+            ev.accept()
+            self.request_delete()
+        else:
+            return QTreeWidget.keyPressEvent(self, ev)
+
+    def request_delete(self):
+        names = {unicode(item.data(0, NAME_ROLE).toString()) for item in self.selectedItems()}
+        bad = names & current_container().names_that_must_not_be_removed
+        if bad:
+            return error_dialog(self, _('Cannot delete'),
+                         _('The file(s) %s cannot be deleted.') % ('<b>%s</b>' % ', '.join(bad)), show=True)
+
+        text = self.categories['text']
+        children = (text.child(i) for i in xrange(text.childCount()))
+        spine_removals = [(unicode(item.data(0, NAME_ROLE).toString()), item.isSelected()) for item in children]
+        other_removals = {unicode(item.data(0, NAME_ROLE).toString()) for item in self.selectedItems()
+                          if unicode(item.data(0, CATEGORY_ROLE).toString()) != 'text'}
+        self.delete_requested.emit(spine_removals, other_removals)
+
+    def delete_done(self, spine_removals, other_removals):
+        removals = []
+        for i, (name, remove) in enumerate(spine_removals):
+            if remove:
+                removals.append(self.categories['text'].child(i))
+        for category, parent in self.categories.iteritems():
+            if category != 'text':
+                for i in xrange(parent.childCount()):
+                    child = parent.child(i)
+                    if unicode(child.data(0, NAME_ROLE).toString()) in other_removals:
+                        removals.append(child)
+
+        for c in removals:
+            c.parent().removeChild(c.parent().indexOfChild(c))
+
 class FileListWidget(QWidget):
 
+    delete_requested = pyqtSignal(object, object)
+
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
         self.setLayout(QGridLayout(self))
         self.file_list = FileList(self)
         self.layout().addWidget(self.file_list)
         self.layout().setContentsMargins(0, 0, 0, 0)
+        for x in ('delete_requested',):
+            getattr(self.file_list, x).connect(getattr(self, x))
 
     def build(self, container):
         self.file_list.build(container)

From e165bd4fde53b5311ff46e38f8d2d4b36c3e4c98 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 21:28:21 +0530
Subject: [PATCH 0957/1154] ...

---
 recipes/am730.recipe                                 | 6 +++---
 src/calibre/gui2/store/stores/amazon_ca_plugin.py    | 5 ++---
 src/calibre/gui2/store/stores/wolnelektury_plugin.py | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/recipes/am730.recipe b/recipes/am730.recipe
index 925a244362..d491c49ef1 100644
--- a/recipes/am730.recipe
+++ b/recipes/am730.recipe
@@ -15,7 +15,7 @@ from calibre.utils.date import now as nowf
 import os, datetime, re
 from calibre.web.feeds.recipes import BasicNewsRecipe
 from contextlib import nested
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
 from calibre.ebooks.metadata.opf2 import OPFCreator
 from calibre.ebooks.metadata.toc import TOC
 from calibre.ebooks.metadata import MetaInformation
@@ -92,7 +92,7 @@ class AppleDaily(BasicNewsRecipe):
         except:
             cover = None
         return cover
-        
+
     def populate_article_metadata(self, article, soup, first):
         if first and hasattr(self, 'add_toc_thumbnail'):
             picdiv = soup.find('img')
@@ -112,7 +112,7 @@ class AppleDaily(BasicNewsRecipe):
                 articles.append({'title': title, 'url': articlelink})
             feeds.append((sectitle, articles))
         return feeds
-        
+
     def create_opf(self, feeds, dir=None):
         if dir is None:
             dir = self.output_dir
diff --git a/src/calibre/gui2/store/stores/amazon_ca_plugin.py b/src/calibre/gui2/store/stores/amazon_ca_plugin.py
index adac8461d3..e0ab82cf2e 100644
--- a/src/calibre/gui2/store/stores/amazon_ca_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_ca_plugin.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 1 # Needed for dynamic plugin loading
+store_version = 1  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
-import random
 from contextlib import closing
 
 from lxml import html
@@ -32,7 +31,7 @@ class AmazonCAKindleStore(StorePlugin):
     def open(self, parent=None, detail_item=None, external=False):
         #aff_id = {'tag': ''}
         # Use Kovid's affiliate id 30% of the time.
-        #if random.randint(1, 10) in (1, 2, 3):
+        # if random.randint(1, 10) in (1, 2, 3):
         #    aff_id['tag'] = 'calibrebs-20'
         # store_link = 'http://www.amazon.ca/Kindle-eBooks/b/?ie=UTF&node=1286228011&ref_=%(tag)s&ref=%(tag)s&tag=%(tag)s&linkCode=ur2&camp=1789&creative=390957' % aff_id
         store_link = 'http://www.amazon.ca/ebooks-kindle/b/ref=sa_menu_kbo?ie=UTF8&node=2980423011'
diff --git a/src/calibre/gui2/store/stores/wolnelektury_plugin.py b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
index 09f63af508..b8564eb61f 100644
--- a/src/calibre/gui2/store/stores/wolnelektury_plugin.py
+++ b/src/calibre/gui2/store/stores/wolnelektury_plugin.py
@@ -7,7 +7,6 @@ __license__ = 'GPL 3'
 __copyright__ = '2012-2013, Tomasz Długosz <tomek3d@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
-import re
 import urllib
 from contextlib import closing
 

From 61f530601909e6bfbc313665dbaf67ea85c5e757 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Oct 2013 22:03:09 +0530
Subject: [PATCH 0958/1154] Amazon metadata download: Fix parsing of some dates
 on amazon.de

Fixes #1238125 [Download Covers: Error parsing publish date for url](https://bugs.launchpad.net/calibre/+bug/1238125)
---
 src/calibre/ebooks/metadata/sources/amazon.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 4c8990ff66..aa083011fe 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -46,14 +46,14 @@ class Worker(Thread):  # Get details {{{
 
         months = {
                 'de': {
-            1: ['jän'],
+            1: ['jän', 'januar'],
             2: ['februar'],
             3: ['märz'],
             5: ['mai'],
             6: ['juni'],
             7: ['juli'],
-            10: ['okt'],
-            12: ['dez']
+            10: ['okt', 'oktober'],
+            12: ['dez', 'dezember']
             },
                 'it': {
             1: ['enn'],

From 91e93871b131d4278e76ad4a5f403bcb86a2745f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 11 Oct 2013 09:48:58 +0530
Subject: [PATCH 0959/1154] EPUB Metadata: Implement updating identifiers

EPUB Metadata: Implementing updating identifiers in the epub file from
calibre when polishing or exporting the epub

ebook-meta: Add an --identifier option to set identifiers.
---
 src/calibre/customize/builtins.py   |  4 ++--
 src/calibre/customize/ui.py         | 14 ++++++++++++++
 src/calibre/ebooks/metadata/cli.py  | 19 ++++++++++++++++---
 src/calibre/ebooks/metadata/epub.py | 12 +++++++++---
 src/calibre/ebooks/metadata/opf2.py | 27 +++++++++++++++++++++++++++
 5 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index e47f6271ab..cc539f10b3 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -435,7 +435,7 @@ class EPUBMetadataWriter(MetadataWriterPlugin):
 
     def set_metadata(self, stream, mi, type):
         from calibre.ebooks.metadata.epub import set_metadata
-        set_metadata(stream, mi, apply_null=self.apply_null)
+        set_metadata(stream, mi, apply_null=self.apply_null, force_identifiers=self.force_identifiers)
 
 class FB2MetadataWriter(MetadataWriterPlugin):
 
@@ -1695,7 +1695,7 @@ class StoreWHSmithUKStore(StoreBase):
 class StoreWolneLekturyStore(StoreBase):
     name = 'Wolne Lektury'
     author = u'Tomasz Długosz'
-    description = u'Wolne Lektury to biblioteka internetowa czynna 24 godziny na dobę, 365 dni w roku, której zasoby dostępne są całkowicie za darmo. Wszystkie dzieła są odpowiednio opracowane - opatrzone przypisami, motywami i udostępnione w kilku formatach - HTML, TXT, PDF, EPUB, MOBI, FB2.'
+    description = u'Wolne Lektury to biblioteka internetowa czynna 24 godziny na dobę, 365 dni w roku, której zasoby dostępne są całkowicie za darmo. Wszystkie dzieła są odpowiednio opracowane - opatrzone przypisami, motywami i udostępnione w kilku formatach - HTML, TXT, PDF, EPUB, MOBI, FB2.'  # noqa
     actual_plugin = 'calibre.gui2.store.stores.wolnelektury_plugin:WolneLekturyStore'
 
     headquarters = 'PL'
diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py
index f6f4df4a78..6f86101d14 100644
--- a/src/calibre/customize/ui.py
+++ b/src/calibre/customize/ui.py
@@ -319,6 +319,19 @@ class ApplyNullMetadata(object):
 
 apply_null_metadata = ApplyNullMetadata()
 
+class ForceIdentifiers(object):
+
+    def __init__(self):
+        self.force_identifiers = False
+
+    def __enter__(self):
+        self.force_identifiers = True
+
+    def __exit__(self, *args):
+        self.force_identifiers = False
+
+force_identifiers = ForceIdentifiers()
+
 def get_file_type_metadata(stream, ftype):
     mi = MetaInformation(None, None)
 
@@ -346,6 +359,7 @@ def set_file_type_metadata(stream, mi, ftype):
                 with plugin:
                     try:
                         plugin.apply_null = apply_null_metadata.apply_null
+                        plugin.force_identifiers = force_identifiers.force_identifiers
                         plugin.set_metadata(stream, mi, ftype.lower().strip())
                         break
                     except:
diff --git a/src/calibre/ebooks/metadata/cli.py b/src/calibre/ebooks/metadata/cli.py
index 7a7a7203e9..8b1d9f7d9c 100644
--- a/src/calibre/ebooks/metadata/cli.py
+++ b/src/calibre/ebooks/metadata/cli.py
@@ -9,7 +9,7 @@ ebook-meta
 import sys, os
 
 from calibre.utils.config import StringConfig
-from calibre.customize.ui import metadata_readers, metadata_writers
+from calibre.customize.ui import metadata_readers, metadata_writers, force_identifiers
 from calibre.ebooks.metadata.meta import get_metadata, set_metadata
 from calibre.ebooks.metadata import string_to_authors, authors_to_sort_string, \
                     title_sort, MetaInformation
@@ -63,6 +63,11 @@ def config():
               help=_('Set the rating. Should be a number between 1 and 5.'))
     c.add_opt('isbn', ['--isbn'],
               help=_('Set the ISBN of the book.'))
+    c.add_opt('identifiers', ['--identifier'], action='append',
+              help=_('Set the identifiers for the book, can be specified multiple times.'
+                     ' For example: --identifier uri:http://acme.com --identifier isbn:12345'
+                     ' To remove an identifier, specify no value, --identifier isbn:'
+                     ' Note that for EPUB files, an identifier marked as the package identifier cannot be removed.'))
     c.add_opt('tags', ['--tags'],
               help=_('Set the tags for the book. Should be a comma separated list.'))
     c.add_opt('book_producer', ['-k', '--book-producer'],
@@ -114,7 +119,7 @@ def do_set_metadata(opts, mi, stream, stream_type):
     for pref in config().option_set.preferences:
         if pref.name in ('to_opf', 'from_opf', 'authors', 'title_sort',
                          'author_sort', 'get_cover', 'cover', 'tags',
-                         'lrf_bookid'):
+                         'lrf_bookid', 'identifiers'):
             continue
         val = getattr(opts, pref.name, None)
         if val is not None:
@@ -136,12 +141,20 @@ def do_set_metadata(opts, mi, stream, stream_type):
         mi.series_index = float(opts.series_index.strip())
     if getattr(opts, 'pubdate', None) is not None:
         mi.pubdate = parse_date(opts.pubdate, assume_utc=False, as_utc=False)
+    if getattr(opts, 'identifiers', None):
+        val = {k.strip():v.strip() for k, v in (x.partition(':')[0::2] for x in opts.identifiers)}
+        if val:
+            orig = mi.get_identifiers()
+            orig.update(val)
+            val = {k:v for k, v in orig.iteritems() if k and v}
+            mi.set_identifiers(val)
 
     if getattr(opts, 'cover', None) is not None:
         ext = os.path.splitext(opts.cover)[1].replace('.', '').upper()
         mi.cover_data = (ext, open(opts.cover, 'rb').read())
 
-    set_metadata(stream, mi, stream_type)
+    with force_identifiers:
+        set_metadata(stream, mi, stream_type)
 
 
 def main(args=sys.argv):
diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py
index f5a22ec2e0..e0a8d8d567 100644
--- a/src/calibre/ebooks/metadata/epub.py
+++ b/src/calibre/ebooks/metadata/epub.py
@@ -250,7 +250,7 @@ def _write_new_cover(new_cdata, cpath):
     save_cover_data_to(new_cdata, new_cover.name)
     return new_cover
 
-def update_metadata(opf, mi, apply_null=False, update_timestamp=False):
+def update_metadata(opf, mi, apply_null=False, update_timestamp=False, force_identifiers=False):
     for x in ('guide', 'toc', 'manifest', 'spine'):
         setattr(mi, x, None)
     if mi.languages:
@@ -274,10 +274,16 @@ def update_metadata(opf, mi, apply_null=False, update_timestamp=False):
             opf.isbn = None
         if not getattr(mi, 'comments', None):
             opf.comments = None
+    if apply_null or force_identifiers:
+        opf.set_identifiers(mi.get_identifiers())
+    else:
+        orig = opf.get_identifiers()
+        orig.update(mi.get_identifiers())
+        opf.set_identifiers({k:v for k, v in orig.iteritems() if k and v})
     if update_timestamp and mi.timestamp is not None:
         opf.timestamp = mi.timestamp
 
-def set_metadata(stream, mi, apply_null=False, update_timestamp=False):
+def set_metadata(stream, mi, apply_null=False, update_timestamp=False, force_identifiers=False):
     stream.seek(0)
     reader = get_zip_reader(stream, root=os.getcwdu())
     raster_cover = reader.opf.raster_cover
@@ -308,7 +314,7 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False):
             traceback.print_exc()
 
     update_metadata(reader.opf, mi, apply_null=apply_null,
-                    update_timestamp=update_timestamp)
+                    update_timestamp=update_timestamp, force_identifiers=force_identifiers)
 
     newopf = StringIO(reader.opf.render())
     if isinstance(reader.archive, LocalZipFile):
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index d0e04b72a3..c603fcd41f 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -959,6 +959,33 @@ class OPF(object):  # {{{
                         identifiers['isbn'] = val
         return identifiers
 
+    def set_identifiers(self, identifiers):
+        identifiers = identifiers.copy()
+        uuid_id = None
+        for attr in self.root.attrib:
+            if attr.endswith('unique-identifier'):
+                uuid_id = self.root.attrib[attr]
+                break
+
+        for x in self.XPath(
+            'descendant::*[local-name() = "identifier"]')(
+                    self.metadata):
+            xid = x.get('id', None)
+            is_package_identifier = uuid_id is not None and uuid_id == xid
+            typ = {val for attr, val in x.attrib.iteritems() if attr.endswith('scheme')}
+            if is_package_identifier:
+                typ = tuple(typ)
+                if typ and typ[0].lower() in identifiers:
+                    self.set_text(x, identifiers.pop(typ[0].lower()))
+                continue
+            if typ and not (typ & {'calibre', 'uuid'}):
+                x.getparent().remove(x)
+
+        for typ, val in identifiers.iteritems():
+            attrib = {'{%s}scheme'%self.NAMESPACES['opf']: typ.upper()}
+            self.set_text(self.create_metadata_element(
+                'identifier', attrib=attrib), unicode(val))
+
     @dynamic_property
     def application_id(self):
 

From 39199af52c997febdde478032a8e79d798feb1e2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 11 Oct 2013 10:04:59 +0530
Subject: [PATCH 0960/1154] version 1.6

---
 Changelog.yaml           | 75 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 36fc601b2b..a34d993259 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,81 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.6.0
+  date: 2013-10-07
+
+  new features:
+    - title: "Temporary marking of books in the library"
+      description: "This allows you to select books from your calibre library manually and mark them. This 'mark' will remain until you restart calibre, or clear the marks. You can easily work with only the marked subset of books by right clicking the Mark Books button. To use this feature, go to Preferences->Toolbars and add the 'Mark Books' tool to the main toolbar."
+      type: major
+
+    - title: "Get Books: Add Wolne Lektury and Amazon (Canada) ebook stores"
+
+    - title: "DOCX Input: Handle hyperlinks in footnotes and endnotes"
+      tickets: [1232790]
+
+    - title: "Driver for Sunstech reader"
+      tickets: [1231590]
+
+    - title: "Allow using both uri: and url: identifiers to create two different arbitrary links instead of just one in the Book details panel"
+
+    - title: "E-book viewer: Make all keyboard shortcuts configurable"
+      tickets: [1232019]
+
+    - title: "Conversion: Add an option to not condense CSS rules for margin, padding, border, etc. Option is under the Look & Feel section of the conversion dialog."
+      tickets: [1233220]
+
+    - title: "calibredb: Allow setting of title sort field"
+      tickets: [1233711]
+
+    - title: "ebook-meta: Add an --identifier option to set identifiers."
+ 
+  bug fixes:
+    - title: "Fix a locking error when composite columns containing formats are used and formats are added/deleted."
+      tickets: [1233330]
+
+    - title: "EPUB Output: Do not strip <object> tags with type application/svg+xml in addition to those that use image/svg+xml."
+      tickets: [1236845]
+
+    - title: "Cover grid: Fix selecting all books with Ctrl+A causing subsequent deselects to not fully work."
+      tickets: [1236348]
+
+    - title: "HTMLZ Output: Fix long titles causing error when converting on windows."
+      tickets: [1235815]
+
+    - title: "Content server: Fix OPDS category links to composite columns"
+
+    - title: "E-book viewer: Fix regression that broke import/export of bookmarks"
+      tickets: [1231980]
+
+    - title: "E-book viewer: Use the default font size setting for the dictionary view as well."
+      tickets: [1232025]
+
+    - title: "DOCX Input: Avoid using the value attribute for simple numbered lists, to silence the asinine epubcheck"
+
+    - title: "HTML Input: Images linked by the poster attribute of the <video> tag are now recognized and processed."
+
+    - title: "DOCX Input: Fix erorr when converting docx files that have numbering defined with no associated character style."
+      tickets: [1232100]
+
+    - title: "EPUB Metadata: Implementing updating identifiers other than isbn in the epub file from calibre when polishing or exporting the epub"
+
+    - title: "Amazon metadata download: Fix parsing of some dates on amazon.de"
+      tickets: [1238125]
+
+  improved recipes:
+    - National Geographic Magazine
+    - New York Review of Books
+    - Focus (PL)
+    - Carta Capital
+    - AM 730 
+    - Ming Pao (HK)
+    - Neu Osnabrucker Zeitung
+
+  new recipes:
+    - title: Various Uruguayan news sources 
+      author: Carlos Alves
+     
 - version: 1.5.0
   date: 2013-09-26
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 14384a4b9a..d1762209bd 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 5, 0)
+numeric_version = (1, 6, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From ec9b69a299d68706af7ed425d47e1131a5ade96a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 11 Oct 2013 14:51:47 +0530
Subject: [PATCH 0961/1154] ...

---
 Changelog.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index a34d993259..881e58457c 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -21,7 +21,7 @@
 #     - title: 
 
 - version: 1.6.0
-  date: 2013-10-07
+  date: 2013-10-11
 
   new features:
     - title: "Temporary marking of books in the library"

From e5f5f2818057c56e6eae543449bd2e962b168c1a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 11 Oct 2013 17:37:31 +0530
Subject: [PATCH 0962/1154] Finish the implementation of delete files

---
 src/calibre/gui2/tweak_book/boss.py      | 84 ++++++++++++++++++++++++
 src/calibre/gui2/tweak_book/file_list.py |  4 +-
 src/calibre/gui2/tweak_book/main.py      |  2 +-
 src/calibre/gui2/tweak_book/ui.py        | 46 ++-----------
 src/calibre/gui2/tweak_book/undo.py      | 35 +++++++++-
 5 files changed, 127 insertions(+), 44 deletions(-)
 create mode 100644 src/calibre/gui2/tweak_book/boss.py

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
new file mode 100644
index 0000000000..7cbc6a25fe
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import tempfile, shutil
+
+from PyQt4.Qt import QObject
+
+from calibre.gui2 import error_dialog
+from calibre.ptempfile import PersistentTemporaryDirectory
+from calibre.ebooks.oeb.polish.main import SUPPORTED
+from calibre.ebooks.oeb.polish.container import get_container, clone_container
+from calibre.gui2.tweak_book import set_current_container, current_container
+from calibre.gui2.tweak_book.undo import GlobalUndoHistory
+
+class Boss(QObject):
+
+    def __init__(self, parent=None):
+        QObject.__init__(self, parent)
+        self.global_undo = GlobalUndoHistory()
+        self.container_count = 0
+        self.tdir = None
+
+    def __call__(self, gui):
+        self.gui = gui
+        gui.file_list.delete_requested.connect(self.delete_requested)
+
+    def mkdtemp(self):
+        self.container_count += 1
+        return tempfile.mkdtemp(prefix='%05d-' % self.container_count, dir=self.tdir)
+
+    def check_dirtied(self):
+        # TODO: Implement this
+        return True
+
+    def open_book(self, path):
+        ext = path.rpartition('.')[-1].upper()
+        if ext not in SUPPORTED:
+            return error_dialog(self.gui, _('Unsupported format'),
+                _('Tweaking is only supported for books in the %s formats.'
+                  ' Convert your book to one of these formats first.') % _(' and ').join(sorted(SUPPORTED)),
+                show=True)
+
+        if not self.check_dirtied():
+            return
+
+        self.container_count = -1
+        if self.tdir:
+            shutil.rmtree(self.tdir, ignore_errors=True)
+        self.tdir = PersistentTemporaryDirectory()
+        self.gui.blocking_job('open_book', _('Opening book, please wait...'), self.book_opened, get_container, path, tdir=self.mkdtemp())
+
+    def book_opened(self, job):
+        if job.traceback is not None:
+            return error_dialog(self.gui, _('Failed to open book'),
+                    _('Failed to open book, click Show details for more information.'),
+                                det_msg=job.traceback, show=True)
+        container = job.result
+        set_current_container(container)
+        self.current_metadata = self.gui.current_metadata = container.mi
+        self.global_undo.open_book(container)
+        self.gui.update_window_title()
+        self.gui.file_list.build(container)
+
+    def add_savepoint(self, msg):
+        nc = clone_container(current_container(), self.mkdtemp())
+        self.global_undo.add_savepoint(nc, msg)
+        set_current_container(nc)
+
+    def delete_requested(self, spine_items, other_items):
+        if not self.check_dirtied():
+            return
+        self.add_savepoint(_('Delete files'))
+        c = current_container()
+        c.remove_from_spine(spine_items)
+        for name in other_items:
+            c.remove_item(name)
+        self.gui.file_list.delete_done(spine_items, other_items)
+
+
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 9c210f8872..b7f1dce6d9 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -260,7 +260,7 @@ class FileList(QTreeWidget):
                         removals.append(child)
 
         for c in removals:
-            c.parent().removeChild(c.parent().indexOfChild(c))
+            c.parent().removeChild(c)
 
 class FileListWidget(QWidget):
 
@@ -274,6 +274,8 @@ class FileListWidget(QWidget):
         self.layout().setContentsMargins(0, 0, 0, 0)
         for x in ('delete_requested',):
             getattr(self.file_list, x).connect(getattr(self, x))
+        for x in ('delete_done',):
+            setattr(self, x, getattr(self.file_list, x))
 
     def build(self, container):
         self.file_list.build(container)
diff --git a/src/calibre/gui2/tweak_book/main.py b/src/calibre/gui2/tweak_book/main.py
index 57abb2b786..be5aca6eb8 100644
--- a/src/calibre/gui2/tweak_book/main.py
+++ b/src/calibre/gui2/tweak_book/main.py
@@ -40,7 +40,7 @@ def main(args=sys.argv):
     sys.excepthook = main.unhandled_exception
     main.show()
     if len(args) > 1:
-        main.open_book(args[1])
+        main.boss.open_book(args[1])
     app.exec_()
 
 if __name__ == '__main__':
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index 1f6a2055a4..a6e2c6c852 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -6,23 +6,13 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import shutil, tempfile
-
 from PyQt4.Qt import QDockWidget, Qt, QLabel, QIcon
 
-from calibre.ebooks.oeb.polish.container import get_container
-from calibre.ebooks.oeb.polish.main import SUPPORTED
-from calibre.ptempfile import PersistentTemporaryDirectory
-from calibre.gui2 import error_dialog
 from calibre.gui2.main_window import MainWindow
-from calibre.gui2.tweak_book import set_current_container, current_container
+from calibre.gui2.tweak_book import current_container
 from calibre.gui2.tweak_book.file_list import FileListWidget
 from calibre.gui2.tweak_book.job import BlockingJob
-from calibre.gui2.tweak_book.undo import GlobalUndoHistory
-
-def load_book(path_to_ebook, base_tdir):
-    tdir = tempfile.mkdtemp(dir=base_tdir)
-    return get_container(path_to_ebook, tdir=tdir)
+from calibre.gui2.tweak_book.boss import Boss
 
 class Main(MainWindow):
 
@@ -30,13 +20,13 @@ class Main(MainWindow):
 
     def __init__(self, opts):
         MainWindow.__init__(self, opts, disable_automatic_gc=True)
+        self.boss = Boss(self)
         self.setWindowTitle(self.APP_NAME)
         self.setWindowIcon(QIcon(I('tweak.png')))
         self.opts = opts
-        self.tdir = None
         self.path_to_ebook = None
         self.container = None
-        self.global_undo = GlobalUndoHistory()
+        self.current_metadata = None
         self.blocking_job = BlockingJob(self)
 
         self.file_list_dock = d = QDockWidget(_('&Files Browser'), self)
@@ -49,37 +39,11 @@ class Main(MainWindow):
         self.l = QLabel('Placeholder')
 
         self.setCentralWidget(self.l)
+        self.boss(self)
 
     def resizeEvent(self, ev):
         self.blocking_job.resize(ev.size())
         return super(Main, self).resizeEvent(ev)
 
-    def open_book(self, path):
-        ext = path.rpartition('.')[-1].upper()
-        if ext not in SUPPORTED:
-            return error_dialog(self, _('Unsupported format'),
-                _('Tweaking is only supported for books in the %s formats.'
-                  ' Convert your book to one of these formats first.') % _(' and ').join(sorted(SUPPORTED)),
-                show=True)
-
-        # TODO: Handle already open, dirtied book
-
-        if self.tdir:
-            shutil.rmtree(self.tdir, ignore_errors=True)
-        self.tdir = PersistentTemporaryDirectory()
-        self.blocking_job('open_book', _('Opening book, please wait...'), self.book_opened, load_book, path, self.tdir)
-
-    def book_opened(self, job):
-        if job.traceback is not None:
-            return error_dialog(self, _('Failed to open book'),
-                    _('Failed to open book, click Show details for more information.'),
-                                det_msg=job.traceback, show=True)
-        container = job.result
-        set_current_container(container)
-        self.current_metadata = container.mi
-        self.global_undo.open_book(container)
-        self.update_window_title()
-        self.file_list.build(container)
-
     def update_window_title(self):
         self.setWindowTitle(self.current_metadata.title + ' [%s] - %s' %(current_container().book_type.upper(), self.APP_NAME))
diff --git a/src/calibre/gui2/tweak_book/undo.py b/src/calibre/gui2/tweak_book/undo.py
index c221c0327c..865ba90ef7 100644
--- a/src/calibre/gui2/tweak_book/undo.py
+++ b/src/calibre/gui2/tweak_book/undo.py
@@ -6,18 +6,51 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
+import shutil
+
+def cleanup(containers):
+    for container in containers:
+        try:
+            shutil.rmtree(container.root, ignore_errors=True)
+        except:
+            pass
 
 class State(object):
 
     def __init__(self, container):
         self.container = container
-        self.operation = None
+        self.message = None
 
 class GlobalUndoHistory(object):
 
     def __init__(self):
         self.states = []
+        self.pos = 0
+
+    @property
+    def current_container(self):
+        return self.states[self.pos].container
 
     def open_book(self, container):
         self.states = [State(container)]
+        self.pos = 0
+
+    def add_savepoint(self, new_container, message):
+        self.states[self.pos].message = message
+        extra = self.states[self.pos+1:]
+        cleanup(extra)
+        self.states = self.states[:self.pos+1]
+        self.states.append(State(new_container))
+        self.pos += 1
+
+    def undo(self):
+        if self.pos > 0:
+            self.pos -= 1
+            return self.current_container
+
+    def redo(self):
+        if self.pos < len(self.states) - 1:
+            self.pos += 1
+            return self.current_container
+
 

From 5572db6fde03ce6b13709fa20beccf078fd4a539 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 11 Oct 2013 18:03:55 +0530
Subject: [PATCH 0963/1154] Option to mark newly added books

An option to mark newly added books with a temporary mark. Optionis in
Preferences->Adding books. Fixes #1238609 [[Enhancement] Set books as "Marked" when adding](https://bugs.launchpad.net/calibre/+bug/1238609)
---
 src/calibre/db/view.py                 | 4 +++-
 src/calibre/gui2/preferences/adding.py | 1 +
 src/calibre/gui2/preferences/adding.ui | 7 +++++++
 src/calibre/utils/config_base.py       | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 76690f440b..1a3d195e66 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -13,7 +13,7 @@ from itertools import izip, imap
 from future_builtins import map
 
 from calibre.ebooks.metadata import title_sort
-from calibre.utils.config_base import tweaks
+from calibre.utils.config_base import tweaks, prefs
 from calibre.db.write import uniq
 
 def sanitize_sort_field_name(field_metadata, field):
@@ -426,4 +426,6 @@ class View(object):
         ids = tuple(ids)
         self._map = ids + self._map
         self._map_filtered = ids + self._map_filtered
+        if prefs['mark_new_books']:
+            self.toggle_marked_ids(ids)
 
diff --git a/src/calibre/gui2/preferences/adding.py b/src/calibre/gui2/preferences/adding.py
index 266b0ca9cc..f41e830083 100644
--- a/src/calibre/gui2/preferences/adding.py
+++ b/src/calibre/gui2/preferences/adding.py
@@ -35,6 +35,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
                 (_('Create new record for each duplicate format'), 'new record')]
         r('automerge', gprefs, choices=choices)
         r('new_book_tags', prefs, setting=CommaSeparatedList)
+        r('mark_new_books', prefs)
         r('auto_add_path', gprefs, restart_required=True)
         r('auto_add_check_for_duplicates', gprefs)
         r('auto_add_auto_convert', gprefs)
diff --git a/src/calibre/gui2/preferences/adding.ui b/src/calibre/gui2/preferences/adding.ui
index 8b9b9c0cd1..383f1b9b04 100644
--- a/src/calibre/gui2/preferences/adding.ui
+++ b/src/calibre/gui2/preferences/adding.ui
@@ -151,6 +151,13 @@ Author matching is exact.</string>
          </property>
         </widget>
        </item>
+       <item row="3" column="2">
+        <widget class="QCheckBox" name="opt_mark_new_books">
+         <property name="text">
+          <string>&amp;Mark newly added books</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index 779fd84b54..3f5e4048b6 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -400,6 +400,8 @@ def _prefs():
             help=_('Add new formats to existing book records'))
     c.add_opt('installation_uuid', default=None, help='Installation UUID')
     c.add_opt('new_book_tags', default=[], help=_('Tags to apply to books added to the library'))
+    c.add_opt('mark_new_books', default=False, help=_(
+        'Mark newly added books. The mark is a temporary mark that is automatically removed when calibre is restarted.'))
 
     # these are here instead of the gui preferences because calibredb and
     # calibre server can execute searches

From a8a98dfeb1860c7c462d0fae1f46fd6d0a14989b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 11 Oct 2013 18:27:59 +0530
Subject: [PATCH 0964/1154] Fix #1238636 [Calibre 1.6 / Find Duplicates Plugin
 /ERROR: Unhandled exception: <b>ValueError</b>:tuple.index(x): x not in
 tuple](https://bugs.launchpad.net/calibre/+bug/1238636)

---
 src/calibre/gui2/library/alternate_views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 68ebe74ba1..a3885bf135 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -827,6 +827,9 @@ class GridView(QListView):
         changed = old_marked | current_marked
         m = self.model()
         for book_id in changed:
-            self.update(m.index(m.db.data.id_to_index(book_id), 0))
+            try:
+                self.update(m.index(m.db.data.id_to_index(book_id), 0))
+            except ValueError:
+                pass
 
 # }}}

From e599f82f1e1b8442b448fdb4e0d4fce02afee895 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 11 Oct 2013 15:06:18 +0200
Subject: [PATCH 0965/1154] Handle case where cache file does not exist.

---
 .../devices/smart_device_app/driver.py        | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 4d7af0e8b0..c6cfdd3781 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -730,27 +730,28 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                                 '_metadata_cache.json')
         self.known_uuids = defaultdict(dict)
         self.known_metadata = {}
-        with open(cache_file_name, mode='rb') as fd:
-            try:
-                while True:
-                    rec_len = fd.readline()
-                    if len(rec_len) != 8:
-                        break
-                    raw = fd.read(int(rec_len))
-                    book = json.loads(raw.decode('utf-8'), object_hook=from_json)
-                    uuid = book.keys()[0]
-                    metadata = self.json_codec.raw_to_book(book[uuid]['book'],
-                                                        SDBook, self.PREFIX)
-                    book[uuid]['book'] = metadata
-                    self.known_uuids.update(book)
+        if os.path.exists(cache_file_name):
+            with open(cache_file_name, mode='rb') as fd:
+                try:
+                    while True:
+                        rec_len = fd.readline()
+                        if len(rec_len) != 8:
+                            break
+                        raw = fd.read(int(rec_len))
+                        book = json.loads(raw.decode('utf-8'), object_hook=from_json)
+                        uuid = book.keys()[0]
+                        metadata = self.json_codec.raw_to_book(book[uuid]['book'],
+                                                            SDBook, self.PREFIX)
+                        book[uuid]['book'] = metadata
+                        self.known_uuids.update(book)
 
-                    lpath = metadata.get('lpath')
-                    if lpath in self.known_metadata:
-                        self.known_uuids.pop(uuid, None)
-                    else:
-                        self.known_metadata[lpath] = metadata
-            except:
-                traceback.print_exc()
+                        lpath = metadata.get('lpath')
+                        if lpath in self.known_metadata:
+                            self.known_uuids.pop(uuid, None)
+                        else:
+                            self.known_metadata[lpath] = metadata
+                except:
+                    traceback.print_exc()
 
     def _write_metadata_cache(self):
         from calibre.utils.config import to_json

From dd7f18eb54aaccf39828212ea85c6551b488578c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 09:19:30 +0530
Subject: [PATCH 0966/1154] Robustness improvements

---
 setup/hosting.py | 4 ++++
 setup/upload.py  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/setup/hosting.py b/setup/hosting.py
index 7d16354bd4..9ec1a34a3b 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -508,12 +508,14 @@ def upload_to_servers(files, version):  # {{{
 
 def upload_to_dbs(files, version):  # {{{
     print('Uploading to fosshub.com')
+    sys.stdout.flush()
     server = 'mirror1.fosshub.com'
     rdir = 'release/'
     check_call(['ssh', 'kovid@%s' % server, 'rm -f release/*'])
     for x in files:
         start = time.time()
         print ('Uploading', x)
+        sys.stdout.flush()
         for i in range(5):
             try:
                 check_call(['rsync', '-h', '-z', '--progress', '-e', 'ssh -x', x,
@@ -522,10 +524,12 @@ def upload_to_dbs(files, version):  # {{{
                 raise SystemExit(1)
             except:
                 print ('\nUpload failed, trying again in 30 seconds')
+                sys.stdout.flush()
                 time.sleep(30)
             else:
                 break
         print ('Uploaded in', int(time.time() - start), 'seconds\n\n')
+        sys.stdout.flush()
     check_call(['ssh', 'kovid@%s' % server, '/home/kovid/uploadFiles'])
 # }}}
 
diff --git a/setup/upload.py b/setup/upload.py
index 0475773e01..5d1936c739 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -70,6 +70,10 @@ class ReUpload(Command):  # {{{
 
     def pre_sub_commands(self, opts):
         opts.replace = True
+        exists = {x for x in installers() if os.path.exists(x)}
+        if not exists:
+            print ('There appear to be no installers!')
+            raise SystemExit(1)
 
     def run(self, opts):
         upload_signatures()

From c185e93ea9c44feba22f645a7880c877db1d0cce Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 10:27:52 +0530
Subject: [PATCH 0967/1154] Show full path to the format file in a tooltip when
 hovering over the link to open the format in the book details panel

---
 src/calibre/gui2/book_details.py   | 15 +++++++++++++--
 src/calibre/gui2/library/models.py |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index 1405a1be50..4e78edb638 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -5,6 +5,9 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+import os
+from functools import partial
+
 from PyQt4.Qt import (QPixmap, QSize, QWidget, Qt, pyqtSignal, QUrl, QIcon,
     QPropertyAnimation, QEasingCurve, QApplication, QFontInfo, QAction,
     QSizePolicy, QPainter, QRect, pyqtProperty, QLayout, QPalette, QMenu,
@@ -164,8 +167,16 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
         elif field == 'formats':
             if isdevice:
                 continue
-            fmts = [u'<a href="format:%s:%s">%s</a>' % (mi.id, x, x) for x
-                        in mi.formats]
+            p = partial(prepare_string_for_xml, attribute=True)
+            path = ''
+            if mi.path:
+                h, t = os.path.split(mi.path)
+                path = '/'.join((os.path.basename(h), t))
+            data = ({
+                'fmt':x, 'path':p(path or ''), 'fname':p(mi.format_files.get(x, '')),
+                'ext':x.lower(), 'id':mi.id
+            } for x in mi.formats)
+            fmts = [u'<a title="{path}/{fname}.{ext}" href="format:{id}:{fmt}">{fmt}</a>'.format(**x) for x in data]
             ans.append((field, row % (name, u', '.join(fmts))))
         elif field == 'identifiers':
             urls = urls_from_identifiers(mi.identifiers)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 5e2ca4d0d0..9fe8606fca 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -493,6 +493,7 @@ class BooksModel(QAbstractTableModel):  # {{{
         mi.id = self.db.id(idx)
         mi.field_metadata = self.db.field_metadata
         mi.path = self.db.abspath(idx, create_dirs=False)
+        mi.format_files = self.db.new_api.format_files(self.db.data.index_to_id(idx))
         try:
             mi.marked = self.db.data.get_marked(idx, index_is_id=False)
         except:

From 224f03e1fd67acd37b4dcf2209ef1ebd7edf7718 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 10:48:24 +0530
Subject: [PATCH 0968/1154] Option to hide displayed cover size in edit
 metadata dialog

Edit metadata dialog: Allow turning off the cover size displayed in the
bottom right corner of the cover by right clicking the cover and
choosing "Hide cover size". It can be restored the same way.
---
 src/calibre/gui2/metadata/basic_widgets.py |  3 +--
 src/calibre/gui2/widgets.py                | 25 +++++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index 299984c5e4..f46f05cdcb 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -892,8 +892,7 @@ class Cover(ImageView):  # {{{
     download_cover = pyqtSignal()
 
     def __init__(self, parent):
-        ImageView.__init__(self, parent)
-        self.show_size = True
+        ImageView.__init__(self, parent, show_size_pref_name='edit_metadata_cover_widget', default_show_size=True)
         self.dialog = parent
         self._cdata = None
         self.cdata_before_trim = None
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 71cc7b6169..ad51090556 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -247,7 +247,7 @@ class ImageDropMixin(object):  # {{{
     def set_pixmap(self, pmap):
         self.setPixmap(pmap)
 
-    def contextMenuEvent(self, ev):
+    def build_context_menu(self):
         cm = QMenu(self)
         paste = cm.addAction(_('Paste Cover'))
         copy = cm.addAction(_('Copy Cover'))
@@ -255,7 +255,10 @@ class ImageDropMixin(object):  # {{{
             paste.setEnabled(False)
         copy.triggered.connect(self.copy_to_clipboard)
         paste.triggered.connect(self.paste_from_clipboard)
-        cm.exec_(ev.globalPos())
+        return cm
+
+    def contextMenuEvent(self, ev):
+        self.build_context_menu().exec_(ev.globalPos())
 
     def copy_to_clipboard(self):
         QApplication.instance().clipboard().setPixmap(self.get_pixmap())
@@ -276,13 +279,16 @@ class ImageView(QWidget, ImageDropMixin):  # {{{
     BORDER_WIDTH = 1
     cover_changed = pyqtSignal(object)
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, show_size_pref_name=None, default_show_size=False):
         QWidget.__init__(self, parent)
+        self.show_size_pref_name = ('show_size_on_cover_' + show_size_pref_name) if show_size_pref_name else None
         self._pixmap = QPixmap(self)
         self.setMinimumSize(QSize(150, 200))
         ImageDropMixin.__init__(self)
         self.draw_border = True
         self.show_size = False
+        if self.show_size_pref_name:
+            self.show_size = gprefs.get(self.show_size_pref_name, default_show_size)
 
     def setPixmap(self, pixmap):
         if not isinstance(pixmap, QPixmap):
@@ -291,6 +297,19 @@ class ImageView(QWidget, ImageDropMixin):  # {{{
         self.updateGeometry()
         self.update()
 
+    def build_context_menu(self):
+        m = ImageDropMixin.build_context_menu(self)
+        if self.show_size_pref_name:
+            text = _('Hide size in corner') if self.show_size else _('Show size in corner')
+            m.addAction(text, self.toggle_show_size)
+        return m
+
+    def toggle_show_size(self):
+        self.show_size ^= True
+        if self.show_size_pref_name:
+            gprefs[self.show_size_pref_name] = self.show_size
+        self.update()
+
     def pixmap(self):
         return self._pixmap
 

From b7778034737874200229d5539fc55f683ffb5959 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 13:32:21 +0530
Subject: [PATCH 0969/1154] Make shortcuts config file a variable

---
 src/calibre/gui2/keyboard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/keyboard.py b/src/calibre/gui2/keyboard.py
index 362a074304..e753555ace 100644
--- a/src/calibre/gui2/keyboard.py
+++ b/src/calibre/gui2/keyboard.py
@@ -71,10 +71,10 @@ def finalize(shortcuts, custom_keys_map={}): # {{{
 
 class Manager(QObject): # {{{
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, config_name='shortcuts/main'):
         QObject.__init__(self, parent)
 
-        self.config = JSONConfig('shortcuts/main')
+        self.config = JSONConfig(config_name)
         self.shortcuts = OrderedDict()
         self.keys_map = {}
         self.groups = {}

From a7c86722331e159c6999e71078058439e66ed6c1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 13:32:45 +0530
Subject: [PATCH 0970/1154] pep8

---
 src/calibre/gui2/keyboard.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/calibre/gui2/keyboard.py b/src/calibre/gui2/keyboard.py
index e753555ace..12ea5310e8 100644
--- a/src/calibre/gui2/keyboard.py
+++ b/src/calibre/gui2/keyboard.py
@@ -28,7 +28,7 @@ ROOT = QModelIndex()
 class NameConflict(ValueError):
     pass
 
-def finalize(shortcuts, custom_keys_map={}): # {{{
+def finalize(shortcuts, custom_keys_map={}):  # {{{
     '''
     Resolve conflicts and assign keys to every action in shorcuts, which must
     be a OrderedDict. User specified mappings of unique names to keys (as a
@@ -69,7 +69,7 @@ def finalize(shortcuts, custom_keys_map={}): # {{{
 
 # }}}
 
-class Manager(QObject): # {{{
+class Manager(QObject):  # {{{
 
     def __init__(self, parent=None, config_name='shortcuts/main'):
         QObject.__init__(self, parent)
@@ -127,7 +127,7 @@ class Manager(QObject): # {{{
             'map', {}).iteritems()}
         self.keys_map = finalize(self.shortcuts, custom_keys_map=custom_keys_map)
         #import pprint
-        #pprint.pprint(self.keys_map)
+        # pprint.pprint(self.keys_map)
 
     def replace_action(self, unique_name, new_action):
         '''
@@ -255,7 +255,8 @@ class ConfigModel(QAbstractItemModel, SearchQueryParser):
         kmap = {}
         for node in self.all_shortcuts:
             sc = node.data
-            if sc['set_to_default']: continue
+            if sc['set_to_default']:
+                continue
             keys = [unicode(k.toString(k.PortableText)) for k in sc['keys']]
             kmap[sc['unique_name']] = keys
         self.keyboard.config['map'] = kmap
@@ -343,7 +344,7 @@ class ConfigModel(QAbstractItemModel, SearchQueryParser):
 
 # }}}
 
-class Editor(QFrame): # {{{
+class Editor(QFrame):  # {{{
 
     editing_done = pyqtSignal(object)
 
@@ -403,10 +404,12 @@ class Editor(QFrame): # {{{
         self.current_keys = list(shortcut['keys'])
         default = ', '.join([unicode(k.toString(k.NativeText)) for k in
                     self.default_keys])
-        if not default: default = _('None')
+        if not default:
+            default = _('None')
         current = ', '.join([unicode(k.toString(k.NativeText)) for k in
                     self.current_keys])
-        if not current: current = _('None')
+        if not current:
+            current = _('None')
 
         self.use_default.setText(_('Default: %(deflt)s [Currently not conflicting: %(curr)s]')%
                 dict(deflt=default, curr=current))
@@ -461,7 +464,8 @@ class Editor(QFrame): # {{{
 
     def dup_check(self, sequence):
         for sc in self.all_shortcuts:
-            if sc is self.shortcut: continue
+            if sc is self.shortcut:
+                continue
             for k in sc['keys']:
                 if k == sequence:
                     return sc['name']
@@ -484,7 +488,7 @@ class Editor(QFrame): # {{{
 
 # }}}
 
-class Delegate(QStyledItemDelegate): # {{{
+class Delegate(QStyledItemDelegate):  # {{{
 
     changed_signal = pyqtSignal()
 
@@ -555,7 +559,8 @@ class Delegate(QStyledItemDelegate): # {{{
                 ckey = QKeySequence(ckey, QKeySequence.PortableText)
                 matched = False
                 for s in editor.all_shortcuts:
-                    if s is editor.shortcut: continue
+                    if s is editor.shortcut:
+                        continue
                     for k in s['keys']:
                         if k == ckey:
                             matched = True
@@ -581,7 +586,7 @@ class Delegate(QStyledItemDelegate): # {{{
 
 # }}}
 
-class ShortcutConfig(QWidget): # {{{
+class ShortcutConfig(QWidget):  # {{{
 
     changed_signal = pyqtSignal()
 

From f571e6f06682d386f31fa9758fd5bbc3824ff960 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 14:30:15 +0530
Subject: [PATCH 0971/1154] Add Open Book action

---
 src/calibre/gui2/tweak_book/boss.py | 17 ++++++++----
 src/calibre/gui2/tweak_book/ui.py   | 41 ++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 7cbc6a25fe..61c11597ed 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -10,7 +10,7 @@ import tempfile, shutil
 
 from PyQt4.Qt import QObject
 
-from calibre.gui2 import error_dialog
+from calibre.gui2 import error_dialog, choose_files
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.ebooks.oeb.polish.main import SUPPORTED
 from calibre.ebooks.oeb.polish.container import get_container, clone_container
@@ -37,7 +37,17 @@ class Boss(QObject):
         # TODO: Implement this
         return True
 
-    def open_book(self, path):
+    def open_book(self, path=None):
+        if not self.check_dirtied():
+            return
+
+        if not hasattr(path, 'rpartition'):
+            path = choose_files(self.gui, 'open-book-for-tweaking', _('Choose book'),
+                                [(_('Books'), [x.lower() for x in SUPPORTED])], all_files=False, select_only_single_file=True)
+            if not path:
+                return
+            path = path[0]
+
         ext = path.rpartition('.')[-1].upper()
         if ext not in SUPPORTED:
             return error_dialog(self.gui, _('Unsupported format'),
@@ -45,9 +55,6 @@ class Boss(QObject):
                   ' Convert your book to one of these formats first.') % _(' and ').join(sorted(SUPPORTED)),
                 show=True)
 
-        if not self.check_dirtied():
-            return
-
         self.container_count = -1
         if self.tdir:
             shutil.rmtree(self.tdir, ignore_errors=True)
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index a6e2c6c852..394a2ef4b4 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -6,13 +6,14 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from PyQt4.Qt import QDockWidget, Qt, QLabel, QIcon
+from PyQt4.Qt import QDockWidget, Qt, QLabel, QIcon, QAction
 
 from calibre.gui2.main_window import MainWindow
 from calibre.gui2.tweak_book import current_container
 from calibre.gui2.tweak_book.file_list import FileListWidget
 from calibre.gui2.tweak_book.job import BlockingJob
 from calibre.gui2.tweak_book.boss import Boss
+from calibre.gui2.keyboard import Manager as KeyboardManager
 
 class Main(MainWindow):
 
@@ -28,12 +29,11 @@ class Main(MainWindow):
         self.container = None
         self.current_metadata = None
         self.blocking_job = BlockingJob(self)
+        self.keyboard = KeyboardManager(parent=self, config_name='shortcuts/tweak')
 
-        self.file_list_dock = d = QDockWidget(_('&Files Browser'), self)
-        d.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
-        self.file_list = FileListWidget(d)
-        d.setWidget(self.file_list)
-        self.addDockWidget(Qt.LeftDockWidgetArea, d)
+        self.create_actions()
+        self.create_menubar()
+        self.create_docks()
 
         self.status_bar = self.statusBar()
         self.l = QLabel('Placeholder')
@@ -41,6 +41,35 @@ class Main(MainWindow):
         self.setCentralWidget(self.l)
         self.boss(self)
 
+        self.keyboard.finalize()
+
+    def create_actions(self):
+        group = _('Global Actions')
+
+        def reg(icon, text, target, sid, keys, description):
+            ac = QAction(QIcon(I(icon)), text, self)
+            ac.triggered.connect(target)
+            if isinstance(keys, type('')):
+                keys = (keys,)
+            self.keyboard.register_shortcut(
+                sid, unicode(ac.text()), default_keys=keys, description=description, action=ac, group=group)
+            self.addAction(ac)
+            return ac
+
+        self.action_open_book = reg('document_open.png', _('Open &book'), self.boss.open_book, 'open-book', 'Ctrl+O', _('Open a new book'))
+
+    def create_menubar(self):
+        b = self.menuBar()
+        f = b.addMenu(_('&File'))
+        f.addAction(self.action_open_book)
+
+    def create_docks(self):
+        self.file_list_dock = d = QDockWidget(_('&Files Browser'), self)
+        d.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
+        self.file_list = FileListWidget(d)
+        d.setWidget(self.file_list)
+        self.addDockWidget(Qt.LeftDockWidgetArea, d)
+
     def resizeEvent(self, ev):
         self.blocking_job.resize(ev.size())
         return super(Main, self).resizeEvent(ev)

From a03309a7b792b75ca885a454575ae1fd9349d46f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 14:36:39 +0530
Subject: [PATCH 0972/1154] ...

---
 src/calibre/gui2/tweak_book/ui.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index 394a2ef4b4..d445429f80 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -33,6 +33,7 @@ class Main(MainWindow):
 
         self.create_actions()
         self.create_menubar()
+        self.create_toolbar()
         self.create_docks()
 
         self.status_bar = self.statusBar()
@@ -63,6 +64,10 @@ class Main(MainWindow):
         f = b.addMenu(_('&File'))
         f.addAction(self.action_open_book)
 
+    def create_toolbar(self):
+        self.global_bar = b = self.addToolBar(_('Global'))
+        b.addAction(self.action_open_book)
+
     def create_docks(self):
         self.file_list_dock = d = QDockWidget(_('&Files Browser'), self)
         d.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)

From ddcaacc4135cd58fbf7c8a08f4f4e1e3b6dd4b5a Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 12 Oct 2013 12:55:54 +0200
Subject: [PATCH 0973/1154] Robustness improvements in smart device driver

---
 .../devices/smart_device_app/driver.py        | 75 ++++++++++++-------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index c6cfdd3781..7ec8feae52 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -682,30 +682,36 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             return None
 
     def _metadata_in_cache(self, uuid, ext, lastmod):
-        if lastmod == 'None':
-            return None
-        from calibre.utils.date import parse_date, now
-        key = uuid+ext
-        if isinstance(lastmod, unicode):
-            lastmod = parse_date(lastmod)
-        if key in self.known_uuids and self.known_uuids[key]['book'].last_modified == lastmod:
-            self.known_uuids[key]['last_used'] = now()
-            return self.known_uuids[key]['book'].deepcopy()
+        try:
+            from calibre.utils.date import parse_date, now
+            key = uuid+ext
+            if isinstance(lastmod, unicode):
+                if lastmod == 'None':
+                    return None
+                lastmod = parse_date(lastmod)
+            if key in self.known_uuids and self.known_uuids[key]['book'].last_modified == lastmod:
+                self.known_uuids[key]['last_used'] = now()
+                return self.known_uuids[key]['book'].deepcopy()
+        except:
+            traceback.print_exc()
         return None
 
     def _metadata_already_on_device(self, book):
-        v = self.known_metadata.get(book.lpath, None)
-        if v is not None:
-            # Metadata is the same if the uuids match, if the last_modified dates
-            # match, and if the height of the thumbnails is the same. The last
-            # is there to allow a device to demand a different thumbnail size
-            if (v.get('uuid', None) == book.get('uuid', None) and
-                    v.get('last_modified', None) == book.get('last_modified', None)):
-                v_thumb = v.get('thumbnail', None)
-                b_thumb = book.get('thumbnail', None)
-                if bool(v_thumb) != bool(b_thumb):
-                    return False
-                return not v_thumb or v_thumb[1] == b_thumb[1]
+        try:
+            v = self.known_metadata.get(book.lpath, None)
+            if v is not None:
+                # Metadata is the same if the uuids match, if the last_modified dates
+                # match, and if the height of the thumbnails is the same. The last
+                # is there to allow a device to demand a different thumbnail size
+                if (v.get('uuid', None) == book.get('uuid', None) and
+                        v.get('last_modified', None) == book.get('last_modified', None)):
+                    v_thumb = v.get('thumbnail', None)
+                    b_thumb = book.get('thumbnail', None)
+                    if bool(v_thumb) != bool(b_thumb):
+                        return False
+                    return not v_thumb or v_thumb[1] == b_thumb[1]
+        except:
+            traceback.print_exc()
         return False
 
     def _uuid_already_on_device(self, uuid, ext):
@@ -730,9 +736,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                                 '_metadata_cache.json')
         self.known_uuids = defaultdict(dict)
         self.known_metadata = {}
-        if os.path.exists(cache_file_name):
-            with open(cache_file_name, mode='rb') as fd:
-                try:
+        try:
+            if os.path.exists(cache_file_name):
+                with open(cache_file_name, mode='rb') as fd:
                     while True:
                         rec_len = fd.readline()
                         if len(rec_len) != 8:
@@ -750,16 +756,24 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                             self.known_uuids.pop(uuid, None)
                         else:
                             self.known_metadata[lpath] = metadata
-                except:
-                    traceback.print_exc()
+        except:
+            traceback.print_exc()
+            self.known_uuids = defaultdict(dict)
+            self.known_metadata = {}
+            try:
+                if os.path.exists(cache_file_name):
+                    os.remove(cache_file_name)
+            except:
+                traceback.print_exc()
+
 
     def _write_metadata_cache(self):
         from calibre.utils.config import to_json
         cache_file_name = os.path.join(cache_dir(),
                            'device_drivers_' + self.__class__.__name__ +
                                 '_metadata_cache.json')
-        with open(cache_file_name, mode='wb') as fd:
-            try:
+        try:
+            with open(cache_file_name, mode='wb') as fd:
                 for uuid,book in self.known_uuids.iteritems():
                     json_metadata = defaultdict(dict)
                     json_metadata[uuid]['book'] = self.json_codec.encode_book_metadata(book['book'])
@@ -768,6 +782,11 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                     fd.write("%0.7d\n"%(len(result)+1))
                     fd.write(result)
                     fd.write('\n')
+        except:
+            traceback.print_exc()
+            try:
+                if os.path.exists(cache_file_name):
+                    os.remove(cache_file_name)
             except:
                 traceback.print_exc()
 

From b108bfadeee31fda5fa54fd1559540c3146b6142 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Sat, 12 Oct 2013 05:16:25 -0600
Subject: [PATCH 0974/1154] Fixed typo in diagnostic

---
 src/calibre/devices/idevice/libimobiledevice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py
index 213d7f9699..c1cf444194 100644
--- a/src/calibre/devices/idevice/libimobiledevice.py
+++ b/src/calibre/devices/idevice/libimobiledevice.py
@@ -274,7 +274,7 @@ class libiMobileDevice():
                         dst.write(data)
                         bytes_remaining = 0
             else:
-                self._log("copying %d {:,} bytes".format(file_size))
+                self._log("copying {:,} bytes".format(file_size))
                 data = self._afc_file_read(handle, file_size, mode)
                 dst.write(data)
 

From 6afd231a14c4fdb244a38f3e0637c93671e90ba9 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 12 Oct 2013 18:36:18 +0200
Subject: [PATCH 0975/1154] Fix formatter function days_between to compute the
 right value when the answer is negative.

---
 src/calibre/utils/formatter_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index b8ff7b0387..2d0106c59a 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -1187,7 +1187,7 @@ class BuiltinDaysBetween(BuiltinFormatterFunction):
         except:
             return ''
         i = d1 - d2
-        return str('%d.%d'%(i.days, i.seconds/8640))
+        return '%.1f'%(i.days + (i.seconds/(24.0*60.0*60.0)))
 
 class BuiltinLanguageStrings(BuiltinFormatterFunction):
     name = 'language_strings'

From 00e0901249d1bff00a3423106df38c6589a28d2e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 22:35:15 +0530
Subject: [PATCH 0976/1154] Fix error if a marked book is deleted/merged.

Fixes #1239161 [Unhandled exception using "Mark books" feature](https://bugs.launchpad.net/calibre/+bug/1239161)
---
 src/calibre/gui2/library/views.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index ccf15a2be9..5aef45005f 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -693,7 +693,13 @@ class BooksView(QTableView):  # {{{
         self.alternate_views.marked_changed(old_marked, current_marked)
         if bool(old_marked) == bool(current_marked):
             changed = old_marked | current_marked
-            sections = tuple(map(self.model().db.data.id_to_index, changed))
+            i = self.model().db.data.id_to_index
+            def f(x):
+                try:
+                    return i(x)
+                except ValueError:
+                    pass
+            sections = tuple(x for x in map(f, changed) if x is not None)
             self.row_header.headerDataChanged(Qt.Vertical, min(sections), max(sections))
         else:
             # Marked items have either appeared or all been removed

From 12e83a09b0f254a611fe4260bb653a93d2176200 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 12 Oct 2013 22:37:53 +0530
Subject: [PATCH 0977/1154] Allow marked book button to be added to main
 toolbar when device is connected

Fixes #1239163 [Mark Books cannot be added to "The main menu when a device is connected"](https://bugs.launchpad.net/calibre/+bug/1239163)
---
 src/calibre/gui2/actions/mark_books.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py
index 8543df4461..2dfdc2781b 100644
--- a/src/calibre/gui2/actions/mark_books.py
+++ b/src/calibre/gui2/actions/mark_books.py
@@ -20,7 +20,7 @@ class MarkBooksAction(InterfaceAction):
     action_type = 'current'
     action_add_menu = True
     dont_add_to = frozenset([
-        'toolbar-device', 'context-menu-device', 'menubar-device', 'context-menu-cover-browser'])
+        'context-menu-device', 'menubar-device', 'context-menu-cover-browser'])
     action_menu_clone_qaction = _('Toggle mark for selected books')
 
     accepts_drops = True

From 00af6187a370d54a830e0240acb9c2276debd916 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 12 Oct 2013 18:26:21 -0400
Subject: [PATCH 0978/1154] Fix title of downloaded ebooks.

---
 src/calibre/gui2/ebook_download.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/ebook_download.py b/src/calibre/gui2/ebook_download.py
index 1b2f8b38d0..9f678bd506 100644
--- a/src/calibre/gui2/ebook_download.py
+++ b/src/calibre/gui2/ebook_download.py
@@ -15,7 +15,7 @@ from calibre import browser, get_download_filename
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.gui2 import Dispatcher
 from calibre.gui2.threaded_jobs import ThreadedJob
-from calibre.ptempfile import PersistentTemporaryFile
+from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.utils.filenames import ascii_filename
 
 class EbookDownload(object):
@@ -56,7 +56,8 @@ class EbookDownload(object):
             cj.load(cookie_file)
             br.set_cookiejar(cj)
         with closing(br.open(url)) as r:
-            tf = PersistentTemporaryFile(suffix=filename)
+            temp_path = os.path.join(PersistentTemporaryDirectory(), filename)
+            tf = open(temp_path, 'w+b')
             tf.write(r.read())
             dfilename = tf.name
 

From 22289f95d44c98490a0f537b55139917f2d622af Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 13 Oct 2013 07:36:49 +0530
Subject: [PATCH 0979/1154] Fix crashes when switching libraries with marked
 books

Fix a bug that could cause calibre to crash when switching from a large
library to a smaller library with marked books. Fixes #1239210 [Calibre 1.6 64bits crashes when changing library](https://bugs.launchpad.net/calibre/+bug/1239210)
---
 src/calibre/gui2/library/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 5aef45005f..aa20670738 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -66,7 +66,7 @@ class HeaderView(QHeaderView):  # {{{
             try:
                 opt.icon = model.headerData(logical_index, opt.orientation, Qt.DecorationRole)
                 opt.iconAlignment = Qt.AlignVCenter
-            except TypeError:
+            except (IndexError, ValueError, TypeError):
                 pass
             if sm.isRowSelected(logical_index, QModelIndex()):
                 opt.state |= QStyle.State_Sunken

From fac708b267f1c3cfd0f2f88c35daad0e04a5b684 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 13 Oct 2013 07:50:48 +0530
Subject: [PATCH 0980/1154] Update Diagonales

Fixes #1239235 [Updated recipe for Diagonales](https://bugs.launchpad.net/calibre/+bug/1239235)
---
 recipes/diagonales.recipe    |  74 ++++++++++++-----------------------
 recipes/icons/diagonales.png | Bin 0 -> 4876 bytes
 2 files changed, 26 insertions(+), 48 deletions(-)
 create mode 100644 recipes/icons/diagonales.png

diff --git a/recipes/diagonales.recipe b/recipes/diagonales.recipe
index eff06efc1d..65542697b5 100644
--- a/recipes/diagonales.recipe
+++ b/recipes/diagonales.recipe
@@ -1,72 +1,50 @@
-#!/usr/bin/env  python
-
 __license__   = 'GPL v3'
-__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
-elargentino.com
+diagonales.infonews.com
 '''
 
 from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import Tag
 
 class Diagonales(BasicNewsRecipe):
     title                 = 'Diagonales'
     __author__            = 'Darko Miletic'
-    description           = 'El nuevo diario de La Plata'
-    publisher             = 'ElArgentino.com'
+    description           = 'Para estar bien informado sobre los temas de actualidad. Conoce sobre pais, economia, deportes, mundo, espectaculos, sociedad, entrevistas y tecnologia.'
+    publisher             = 'INFOFIN S.A.'
     category              = 'news, politics, Argentina, La Plata'
     oldest_article        = 2
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
     encoding              = 'utf-8'
-    language = 'es_AR'
-
-    lang                  = 'es-AR'
-    direction             = 'ltr'
-    INDEX                 = 'http://www.elargentino.com/medios/122/Diagonales.html'
+    language              = 'es_AR'
+    publication_type      = 'newspaper'
+    delay                 = 1
+    remove_empty_feeds    = True
     extra_css             = ' .titulo{font-size: x-large; font-weight: bold} .volantaImp{font-size: small; font-weight: bold} '
 
-    html2lrf_options = [
-                          '--comment'  , description
-                        , '--category' , category
-                        , '--publisher', publisher
-                        ]
-
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0cm; margin-top: 0em; margin-bottom: 0.5em} "'
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
 
     keep_only_tags = [dict(name='div', attrs={'class':'ContainerPop'})]
+    remove_tags    = [dict(name='link')]
 
-    remove_tags = [dict(name='link')]
-
-    feeds = [(u'Articulos', u'http://www.elargentino.com/Highlights.aspx?ParentType=Section&ParentId=122&Content-Type=text/xml&ChannelDesc=Diagonales')]
+    feeds = [
+               (u'Pais'        , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=112&Content-Type=text/xml&ChannelDesc=Pa%C3%ADs')
+              ,(u'Deportes'    , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=106&Content-Type=text/xml&ChannelDesc=Deportes')
+              ,(u'Economia'    , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=107&Content-Type=text/xml&ChannelDesc=Econom%C3%ADa')
+              ,(u'Sociedad'    , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=109&Content-Type=text/xml&ChannelDesc=Sociedad')
+              ,(u'Mundo'       , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=113&Content-Type=text/xml&ChannelDesc=Mundo')
+              ,(u'Espectaculos', u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=114&Content-Type=text/xml&ChannelDesc=Espect%C3%A1culos')
+              ,(u'Entrevistas' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=115&Content-Type=text/xml&ChannelDesc=Entrevistas')
+              ,(u'Tecnologia'  , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=118&Content-Type=text/xml&ChannelDesc=Tecnolog%C3%ADa')
+            ]
 
     def print_version(self, url):
         main, sep, article_part = url.partition('/nota-')
         article_id, rsep, rrest = article_part.partition('-')
-        return u'http://www.elargentino.com/Impresion.aspx?Id=' + article_id
-
-    def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        soup.html['lang'] = self.lang
-        soup.html['dir' ] = self.direction
-        mlang = Tag(soup,'meta',[("http-equiv","Content-Language"),("content",self.lang)])
-        mcharset = Tag(soup,'meta',[("http-equiv","Content-Type"),("content","text/html; charset=utf-8")])
-        soup.head.insert(0,mlang)
-        soup.head.insert(1,mcharset)
-        return soup
-
-    def get_cover_url(self):
-        cover_url = None
-        soup = self.index_to_soup(self.INDEX)
-        cover_item = soup.find('div',attrs={'class':'colder'})
-        if cover_item:
-           clean_url = self.image_url_processor(None,cover_item.div.img['src'])
-           cover_url = 'http://www.elargentino.com' + clean_url + '&height=600'
-        return cover_url
-
-    def image_url_processor(self, baseurl, url):
-        base, sep, rest = url.rpartition('?Id=')
-        img, sep2, rrest = rest.partition('&')
-        return base + sep + img
+        return u'http://diagonales.infonews.com/Impresion.aspx?Id=' + article_id
diff --git a/recipes/icons/diagonales.png b/recipes/icons/diagonales.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fe7c850376bc2ebdb1ede28e6911a704497367f
GIT binary patch
literal 4876
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

literal 0
HcmV?d00001


From f1a3bc8b2e9ff2fae248d8905c85f9c1eaad0c75 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 13 Oct 2013 08:35:30 +0530
Subject: [PATCH 0981/1154] Start work on global undo/redo for tweaking

---
 src/calibre/gui2/tweak_book/boss.py      | 17 +++++++++++++-
 src/calibre/gui2/tweak_book/file_list.py | 29 ++++++++++++++++++++----
 src/calibre/gui2/tweak_book/ui.py        | 11 +++++++++
 src/calibre/gui2/tweak_book/undo.py      | 19 ++++++++++++++++
 4 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 61c11597ed..1857e91900 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -71,12 +71,27 @@ class Boss(QObject):
         self.current_metadata = self.gui.current_metadata = container.mi
         self.global_undo.open_book(container)
         self.gui.update_window_title()
-        self.gui.file_list.build(container)
+        self.gui.file_list.build(container, preserve_state=False)
+        self.update_global_history_actions()
+
+    def update_global_history_actions(self):
+        gu = self.global_undo
+        for x, text in (('undo', _('&Undo')), ('redo', '&Redo')):
+            ac = getattr(self.gui, 'action_global_%s' % x)
+            ac.setEnabled(getattr(gu, 'can_' + x))
+            ac.setText(text + ' ' + getattr(gu, x + '_msg'))
 
     def add_savepoint(self, msg):
         nc = clone_container(current_container(), self.mkdtemp())
         self.global_undo.add_savepoint(nc, msg)
         set_current_container(nc)
+        self.update_global_history_actions()
+
+    def do_global_undo(self):
+        pass
+
+    def do_global_redo(self):
+        pass
 
     def delete_requested(self, spine_items, other_items):
         if not self.check_dirtied():
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index b7f1dce6d9..910aaaed80 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -89,7 +89,25 @@ class FileList(QTreeWidget):
                 'images':'view-image.png',
             }.iteritems()}
 
-    def build(self, container):
+    def get_state(self):
+        s = {'pos':self.verticalScrollBar().value()}
+        s['expanded'] = {c for c, item in self.categories.iteritems() if item.isExpanded()}
+        s['selected'] = {unicode(i.data(0, NAME_ROLE).toString()) for i in self.selectedItems()}
+        return s
+
+    def set_state(self, state):
+        for category, item in self.categories:
+            item.setExpanded(category in state['expanded'])
+        self.verticalScrollBar().setValue(state['pos'])
+        for parent in self.categories.itervalues():
+            for c in (parent.child(i) for i in parent.childCount()):
+                name = unicode(c.data(0, NAME_ROLE).toString())
+                if name in state['selected']:
+                    c.setSelected(True)
+
+    def build(self, container, preserve_state=True):
+        if preserve_state:
+            state = self.get_state()
         self.clear()
         self.root = self.invisibleRootItem()
         self.root.setFlags(Qt.ItemIsDragEnabled)
@@ -221,7 +239,10 @@ class FileList(QTreeWidget):
             processed[name] = create_item(name)
 
         for c in self.categories.itervalues():
-            self.expandItem(c)
+            c.setExpanded(True)
+
+        if preserve_state:
+            self.set_state(state)
 
     def show_context_menu(self, point):
         pass
@@ -277,7 +298,7 @@ class FileListWidget(QWidget):
         for x in ('delete_done',):
             setattr(self, x, getattr(self.file_list, x))
 
-    def build(self, container):
-        self.file_list.build(container)
+    def build(self, container, preserve_state=True):
+        self.file_list.build(container, preserve_state=preserve_state)
 
 
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index d445429f80..93275368a6 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -58,15 +58,26 @@ class Main(MainWindow):
             return ac
 
         self.action_open_book = reg('document_open.png', _('Open &book'), self.boss.open_book, 'open-book', 'Ctrl+O', _('Open a new book'))
+        self.action_global_undo = reg('back.png', _('&Revert to before'), self.boss.do_global_undo, 'global-undo', 'Ctrl+Left',
+                                      _('Revert book to before the last action (Undo)'))
+        self.action_global_redo = reg('forward.png', _('&Revert to after'), self.boss.do_global_redo, 'global-redo', 'Ctrl+Right',
+                                      _('Revert book state to after the next action (Redo)'))
 
     def create_menubar(self):
         b = self.menuBar()
+
         f = b.addMenu(_('&File'))
         f.addAction(self.action_open_book)
 
+        e = b.addMenu(_('&Edit'))
+        e.addAction(self.action_global_undo)
+        e.addAction(self.action_global_redo)
+
     def create_toolbar(self):
         self.global_bar = b = self.addToolBar(_('Global'))
         b.addAction(self.action_open_book)
+        b.addAction(self.action_global_undo)
+        b.addAction(self.action_global_redo)
 
     def create_docks(self):
         self.file_list_dock = d = QDockWidget(_('&Files Browser'), self)
diff --git a/src/calibre/gui2/tweak_book/undo.py b/src/calibre/gui2/tweak_book/undo.py
index 865ba90ef7..c39b2b5694 100644
--- a/src/calibre/gui2/tweak_book/undo.py
+++ b/src/calibre/gui2/tweak_book/undo.py
@@ -53,4 +53,23 @@ class GlobalUndoHistory(object):
             self.pos += 1
             return self.current_container
 
+    @property
+    def can_undo(self):
+        return self.pos > 0
+
+    @property
+    def can_redo(self):
+        return self.pos < len(self.states) - 1
+
+    @property
+    def undo_msg(self):
+        if not self.can_undo:
+            return ''
+        return self.states[self.pos - 1].message or ''
+
+    @property
+    def redo_msg(self):
+        if not self.can_redo:
+            return ''
+        return self.states[self.pos].message or ''
 

From 38a4942a6e8059057504e22a76221c0e6a9dd3a2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 14 Oct 2013 10:08:41 +0530
Subject: [PATCH 0982/1154] Update Carta

---
 recipes/carta.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/carta.recipe b/recipes/carta.recipe
index b63ab0aa6d..7f2a9e1e19 100644
--- a/recipes/carta.recipe
+++ b/recipes/carta.recipe
@@ -12,7 +12,7 @@ class Carta(BasicNewsRecipe):
 
     title = u'Carta'
     description = 'News about electronic publishing'
-    __author__ = 'Oliver Niesner'
+    __author__ = 'Oliver Niesner' # AGe Update 2013-10-13
     use_embedded_content   = False
     timefmt = ' [%a %d %b %Y]'
     oldest_article = 7
@@ -25,7 +25,7 @@ class Carta(BasicNewsRecipe):
 
 
 
-    remove_tags_after = [dict(name='p', attrs={'class':'tags-blog'})]
+    remove_tags_after = [dict(name='div', attrs={'id':'BlogContent'})] # AGe
 
     remove_tags = [dict(name='p', attrs={'class':'print'}),
                    dict(name='p', attrs={'class':'tags-blog'}),

From ecf1e290b8306634773f03f87d23b386d146dbec Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 14 Oct 2013 10:17:04 +0530
Subject: [PATCH 0983/1154] Update Television Without Pity

---
 recipes/television_without_pity.recipe | 91 ++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 7 deletions(-)

diff --git a/recipes/television_without_pity.recipe b/recipes/television_without_pity.recipe
index e48bce5859..4cbc57205d 100644
--- a/recipes/television_without_pity.recipe
+++ b/recipes/television_without_pity.recipe
@@ -1,21 +1,98 @@
 from calibre.web.feeds.news import BasicNewsRecipe
+import re
 
-class HindustanTimes(BasicNewsRecipe):
+class TelevisionWithoutPity(BasicNewsRecipe):
     title          = u'Television Without Pity'
     language       = 'en'
-    __author__     = 'Krittika Goyal'
-    oldest_article = 1 #days
+    __author__     = 'Snarkastica'
+    SHOW = 'http://www.televisionwithoutpity.com/show/SHOW-NAME-HERE/recaps/'  # Used for pulling down an entire show, not just the RSS feed
+    oldest_article = 7  # days
     max_articles_per_feed = 25
+    # reverse_article_order=True # Useful for entire show, to display in episode order
     #encoding = 'cp1252'
     use_embedded_content = False
 
+    preprocess_regexps = [(re.compile(r'<span class="headline_recap_title .*?>', re.DOTALL|re.IGNORECASE), lambda match: '<span class="headline_recap_title">')]
+    keep_only_tags = [dict(name='span', attrs={'class':'headline_recap_title'}), dict(
+        name='p', attrs={'class':'byline'}), dict(name='div', attrs={'class':'body_recap'}), dict(name='h1')]
     no_stylesheets = True
-    auto_cleanup = True
-    #auto_cleanup_keep = '//div[@class="float_right"]'
-
 
+    # Comment this out and configure process_index() to retrieve a single show
     feeds          = [
-('News',
+('Ltest Recaps',
  'http://www.televisionwithoutpity.com/rss.xml'),
 ]
 
+    '''
+    This method can be used to grab all recaps for a single show
+    Set the SHOW constant at the beginning of this file to the URL for a show's recap page
+    (the page listing all recaps, usually of the form:
+    http://www.televisionwithoutpity.com/show/SHOW-NAME/recaps/"
+    Where SHOW-NAME is the hyphenated name of the show.
+
+    To use:
+    1. Comment out feeds = [...] earlier in this file
+    2. Set the SHOW constant to the show's recap page
+    3. Uncomment the following function
+    '''
+
+    '''
+    def parse_index(self):
+        soup = self.index_to_soup(self.SHOW)
+        feeds = []
+        articles = []
+        showTitle = soup.find('h1').string
+        recaps = soup.find('table')
+        for ep in recaps.findAll('tr'):
+            epData = ep.findAll('td')
+            epNum = epData[0].find(text=True).strip()
+            if not epNum == "Ep.":
+                epT = self.tag_to_string(epData[1].find('em')).strip()
+                epST = " (or " + self.tag_to_string(epData[1].find('h3')).strip() + ")"
+                epTitle = epNum + ": " + epT + epST
+                epData[1].find('em').extract()
+                epURL = epData[1].find('a', href=True)
+                epURL = epURL['href']
+                epSum = self.tag_to_string(epData[1].find('p')).strip()
+                epDate = epData[2].find(text=True).strip()
+                epAuthor = self.tag_to_string(epData[4].find('p')).strip()
+                articles.append({'title':epTitle, 'url':epURL, 'description':epSum, 'date':epDate, 'author':epAuthor})
+        feeds.append((showTitle, articles))
+        #self.abort_recipe_processing("test")
+        return feeds
+    '''
+
+    # This will add subsequent pages of multipage recaps to a single article page
+    def append_page(self, soup, appendtag, position):
+        if (soup.find('p',attrs={'class':'pages'})):  # If false, will still grab single-page recaplets
+            pager = soup.find('p',attrs={'class':'pages'}).find(text='Next')
+            if pager:
+                nexturl = pager.parent['href']
+                soup2 = self.index_to_soup(nexturl)
+                texttag = soup2.find('div', attrs={'class':'body_recap'})
+                for it in texttag.findAll(style=True):
+                    del it['style']
+                newpos = len(texttag.contents)
+                self.append_page(soup2,texttag,newpos)
+                texttag.extract()
+                appendtag.insert(position,texttag)
+
+    def preprocess_html(self, soup):
+        self.append_page(soup, soup.body, 3)
+        return soup
+
+    # Remove the multi page links (we had to keep these in for append_page(), but they can go away now
+    # Could have used CSS to hide, but some readers ignore CSS.
+    def postprocess_html(self, soup, first_fetch):
+        paginator = soup.findAll('p', attrs={'class':'pages'})
+        if paginator:
+            for p in paginator:
+                p.extract()
+
+                # TODO: Fix this so it converts the headline class into a heading 1
+        #titleTag = Tag(soup, "h1")
+        #repTag = soup.find('span', attrs={'class':'headline_recap_title'})
+        #titleTag.insert(0, repTag.contents[0])
+        # repTag.extract()
+        #soup.body.insert(1, titleTag)
+        return soup

From 2a336ab7a7b9aea2bdee2137ee1f46c908539840 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 14 Oct 2013 19:12:03 +0530
Subject: [PATCH 0984/1154] Content server: Use internal redirect for single
 item categories

Content server: Fix single item categories not working with reverse
proxy setup. Fixes #1238987 [Calibre behind apache server sometimes returns 'localhost' URLs](https://bugs.launchpad.net/calibre/+bug/1238987)

Single item categories were using HTTP 303 redirects which are resolved to
http://localhost:8080 absolute URLs by cherrpy (since cherrypy has no
knowledge of whatever server the apache process is exposed as). SO
instead we use an internal redirect, which does not suffer from this
issue. It does mean that bookmarking the URL wil have unexpected
side-effects if the number of items in the catefory ever increases to
more than one.
---
 src/calibre/library/server/browse.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 383d53f849..470eb0c1f3 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -500,7 +500,7 @@ class BrowseServer(object):
                     datatype, self.opts.url_prefix)
             href = re.search(r'<a href="([^"]+)"', html)
             if href is not None:
-                raise cherrypy.HTTPRedirect(href.group(1))
+                raise cherrypy.InternalRedirect(href.group(1))
 
         if len(items) <= self.opts.max_opds_ungrouped_items:
             script = 'false'

From 4e1e5d9a86ac22533ee950b50f1cfd8f9b0ccd58 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Mon, 14 Oct 2013 20:11:20 -0400
Subject: [PATCH 0985/1154] Fix issue #1239527: Htmlz inline css doesn't single
 quote fonts & thus destroys html.

---
 src/calibre/ebooks/htmlz/oeb2html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/htmlz/oeb2html.py b/src/calibre/ebooks/htmlz/oeb2html.py
index b162d9e19c..820f6e5839 100644
--- a/src/calibre/ebooks/htmlz/oeb2html.py
+++ b/src/calibre/ebooks/htmlz/oeb2html.py
@@ -267,7 +267,7 @@ class OEB2HTMLInlineCSSizer(OEB2HTML):
         # Turn style into strings for putting in the tag.
         style_t = ''
         if style_a:
-            style_t = ' style="%s"' % style_a
+            style_t = ' style="%s"' % style_a.replace('"', "'")
 
         # Write the tag.
         text.append('<%s%s%s>' % (tag, at, style_t))

From 219f4c632fbf98f8b337068af1e3f195797ac728 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Mon, 14 Oct 2013 20:13:14 -0400
Subject: [PATCH 0986/1154] Fix issue #1239530: Htmlz conversion places <head>
 in <body>, not before.

---
 src/calibre/ebooks/htmlz/oeb2html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/htmlz/oeb2html.py b/src/calibre/ebooks/htmlz/oeb2html.py
index 820f6e5839..e9ebd676a0 100644
--- a/src/calibre/ebooks/htmlz/oeb2html.py
+++ b/src/calibre/ebooks/htmlz/oeb2html.py
@@ -49,7 +49,7 @@ class OEB2HTML(object):
         return self.mlize_spine(oeb_book)
 
     def mlize_spine(self, oeb_book):
-        output = [u'<html><body><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /></head>']
+        output = [u'<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /></head><body>']
         for item in oeb_book.spine:
             self.log.debug('Converting %s to HTML...' % item.href)
             self.rewrite_ids(item.data, item)

From 8b9f5bfe85543fea34a935a1e347a400b29560aa Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Mon, 14 Oct 2013 20:22:37 -0400
Subject: [PATCH 0987/1154] Fix issue #1239555: Htmlz conversion incorrectly
 handles <br/>.

---
 src/calibre/ebooks/htmlz/oeb2html.py | 39 +++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/calibre/ebooks/htmlz/oeb2html.py b/src/calibre/ebooks/htmlz/oeb2html.py
index e9ebd676a0..2130b95fb8 100644
--- a/src/calibre/ebooks/htmlz/oeb2html.py
+++ b/src/calibre/ebooks/htmlz/oeb2html.py
@@ -22,6 +22,18 @@ from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace,\
 from calibre.ebooks.oeb.stylizer import Stylizer
 from calibre.utils.logging import default_log
 
+SELF_CLOSING_TAGS = [
+    'area',
+    'base',
+    'basefont',
+    'br',
+    'hr',
+    'input',
+    'img',
+    'link',
+    'meta'
+]
+
 class OEB2HTML(object):
     '''
     Base class. All subclasses should implement dump_text to actually transform
@@ -183,7 +195,11 @@ class OEB2HTMLNoCSSizer(OEB2HTML):
             at += ' %s="%s"' % (k, prepare_string_for_xml(v, attribute=True))
 
         # Write the tag.
-        text.append('<%s%s>' % (tag, at))
+        text.append('<%s%s' % (tag, at))
+        if tag in SELF_CLOSING_TAGS:
+        	text.append(' />')
+        else:
+        	text.append('>')
 
         # Turn styles into tags.
         if style['font-weight'] in ('bold', 'bolder'):
@@ -210,7 +226,8 @@ class OEB2HTMLNoCSSizer(OEB2HTML):
         # Close all open tags.
         tags.reverse()
         for t in tags:
-            text.append('</%s>' % t)
+            if t not in SELF_CLOSING_TAGS:
+                text.append('</%s>' % t)
 
         # Add the text that is outside of the tag.
         if hasattr(elem, 'tail') and elem.tail:
@@ -270,7 +287,11 @@ class OEB2HTMLInlineCSSizer(OEB2HTML):
             style_t = ' style="%s"' % style_a.replace('"', "'")
 
         # Write the tag.
-        text.append('<%s%s%s>' % (tag, at, style_t))
+        text.append('<%s%s%s' % (tag, at, style_t))
+        if tag in SELF_CLOSING_TAGS:
+        	text.append(' />')
+        else:
+        	text.append('>')
 
         # Process tags that contain text.
         if hasattr(elem, 'text') and elem.text:
@@ -283,7 +304,8 @@ class OEB2HTMLInlineCSSizer(OEB2HTML):
         # Close all open tags.
         tags.reverse()
         for t in tags:
-            text.append('</%s>' % t)
+            if t not in SELF_CLOSING_TAGS:
+                text.append('</%s>' % t)
 
         # Add the text that is outside of the tag.
         if hasattr(elem, 'tail') and elem.tail:
@@ -350,7 +372,11 @@ class OEB2HTMLClassCSSizer(OEB2HTML):
             at += ' %s="%s"' % (k, prepare_string_for_xml(v, attribute=True))
 
         # Write the tag.
-        text.append('<%s%s>' % (tag, at))
+        text.append('<%s%s' % (tag, at))
+        if tag in SELF_CLOSING_TAGS:
+        	text.append(' />')
+        else:
+        	text.append('>')
 
         # Process tags that contain text.
         if hasattr(elem, 'text') and elem.text:
@@ -363,7 +389,8 @@ class OEB2HTMLClassCSSizer(OEB2HTML):
         # Close all open tags.
         tags.reverse()
         for t in tags:
-            text.append('</%s>' % t)
+            if t not in SELF_CLOSING_TAGS:
+                text.append('</%s>' % t)
 
         # Add the text that is outside of the tag.
         if hasattr(elem, 'tail') and elem.tail:

From 78f840906efb96a5b84cfc6e7bc9f6aac27f09a3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 08:56:51 +0530
Subject: [PATCH 0988/1154] Update cracked.com

---
 recipes/cracked_com.recipe | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/recipes/cracked_com.recipe b/recipes/cracked_com.recipe
index a702f93433..5a024f7b23 100644
--- a/recipes/cracked_com.recipe
+++ b/recipes/cracked_com.recipe
@@ -22,12 +22,8 @@ class Cracked(BasicNewsRecipe):
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
     }
 
-    # remove_tags_before = dict(id='PrimaryContent')
-
-    keep_only_tags = dict(name='article', attrs={
-                          'class': 'module article dropShadowBottomCurved'})
-
-    # remove_tags_after = dict(name='div', attrs={'class':'shareBar'})
+    keep_only_tags = [dict(name='article', attrs={'class': 'module article dropShadowBottomCurved'}),
+                        dict(name='article', attrs={'class': 'module blog dropShadowBottomCurved'})]
 
     remove_tags = [
         dict(name='section', attrs={'class': ['socialTools', 'quickFixModule']})]

From c9f5f787b3be52748e02dff2ef55d87238dc08ce Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 09:05:54 +0530
Subject: [PATCH 0989/1154] Edit metadata dialog: Fix incorrect size on
 multi-screen setup

Edit metadata dialog: The dit metadata dialog currently limits its max
size based on the geometry of the smallet attached screen. Change that
to use the geometry of the screen on which it will be shown.
Fixes #1239597 [metadata window height not remembered](https://bugs.launchpad.net/calibre/+bug/1239597)
---
 src/calibre/gui2/__init__.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 569a531216..816ed5b617 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -753,11 +753,13 @@ class ResizableDialog(QDialog):
     def __init__(self, *args, **kwargs):
         QDialog.__init__(self, *args)
         self.setupUi(self)
-        nh, nw = min_available_height()-25, available_width()-10
+        desktop = QCoreApplication.instance().desktop()
+        geom = desktop.availableGeometry(self)
+        nh, nw = geom.height()-25, geom.width()-10
         if nh < 0:
-            nh = 800
+            nh = max(800, self.height())
         if nw < 0:
-            nw = 600
+            nw = max(600, self.height())
         nh = min(self.height(), nh)
         nw = min(self.width(), nw)
         self.resize(nw, nh)

From 2277ed4b172b90c561ba6d02782f04e3c6fb06ab Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 09:28:08 +0530
Subject: [PATCH 0990/1154] ...

---
 src/calibre/gui2/library/models.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 9fe8606fca..81ea3e4643 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -928,7 +928,10 @@ class BooksModel(QAbstractTableModel):  # {{{
         if role == Qt.DisplayRole:  # orientation is vertical
             return QVariant(section+1)
         if role == Qt.DecorationRole:
-            return self.marked_icon if self.db.data.get_marked(self.db.data.index_to_id(section)) else self.row_decoration
+            try:
+                return self.marked_icon if self.db.data.get_marked(self.db.data.index_to_id(section)) else self.row_decoration
+            except (ValueError, IndexError):
+                pass
         return NONE
 
     def flags(self, index):

From a43941dc0dd9375e8c74c89729f57d7cc6e54327 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 11:12:51 +0530
Subject: [PATCH 0991/1154] Allow using textures for cover grid background

Cover grid: Allow using images as the background for the cover grid. To
choose an image, go to Preferences->Look & Feel->Cover Grid. Fixes #1239194 [[Ideas] -->book grid](https://bugs.launchpad.net/calibre/+bug/1239194) [[Ideas] -->book grid](https://bugs.launchpad.net/calibre/+bug/1239194)

The builtin textures come from subtlepatterns.com
---
 resources/images/textures/dark_cloth.png      | Bin 0 -> 19901 bytes
 resources/images/textures/dark_wood.png       | Bin 0 -> 134827 bytes
 resources/images/textures/grey_wash_wall.png  | Bin 0 -> 47433 bytes
 resources/images/textures/light_wood.png      | Bin 0 -> 171492 bytes
 resources/images/textures/subtle_wood.png     | Bin 0 -> 102184 bytes
 src/calibre/gui2/__init__.py                  |   1 +
 src/calibre/gui2/library/alternate_views.py   |   8 +-
 src/calibre/gui2/preferences/look_feel.py     |  85 ++++++++--
 src/calibre/gui2/preferences/look_feel.ui     |  61 +-------
 .../gui2/preferences/texture_chooser.py       | 146 ++++++++++++++++++
 10 files changed, 234 insertions(+), 67 deletions(-)
 create mode 100644 resources/images/textures/dark_cloth.png
 create mode 100644 resources/images/textures/dark_wood.png
 create mode 100644 resources/images/textures/grey_wash_wall.png
 create mode 100644 resources/images/textures/light_wood.png
 create mode 100644 resources/images/textures/subtle_wood.png
 create mode 100644 src/calibre/gui2/preferences/texture_chooser.py

diff --git a/resources/images/textures/dark_cloth.png b/resources/images/textures/dark_cloth.png
new file mode 100644
index 0000000000000000000000000000000000000000..17a4d6b42defcc8ebbad993bc91a2030f6c690ed
GIT binary patch
literal 19901
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
AbN~PV

literal 0
HcmV?d00001

diff --git a/resources/images/textures/dark_wood.png b/resources/images/textures/dark_wood.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e01b3d6f8636099d64917f082c5b383a43b0ae3
GIT binary patch
literal 134827
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
GLSTZyq@PXz

literal 0
HcmV?d00001

diff --git a/resources/images/textures/grey_wash_wall.png b/resources/images/textures/grey_wash_wall.png
new file mode 100644
index 0000000000000000000000000000000000000000..d54e8899498d67c0367db2096c8f7c371c41461c
GIT binary patch
literal 47433
zcmV(tK<vMXP)<h;3K|Lk000e1NJLTq00CYA009FC0{{R3O68mZ0001QP)t-sWo2b&
zXJ=++W?^ArV`F1vWMpDuVrgk<Yinz2YHDa`XkcJqY;0^^US3~cUu|t|U0q#nZf;y$
zTyJl0aBy&2TU&8)aavkhSy@?gb8~WXa&&ZbSXfwfb#+%)S9W%GR#sMbcXw4)ReO7T
zQc_aBCklZ80JxP&L_t(|UN!xPb|lHJw21<6Ekb3I?B4sFf99(9f5y8$i#64%nnh-2
zxI-EYfPG_bw{kAa+05KhDiKGrl<cVWE^D1D6-y<RnJwj#)B3E%*U!9i`rq?7mmN_&
z>{w}~eEeUvURU$y=VyPP|L=dle{;7ItrYV#y49T5dH&vY<@N8K)BVYFy0@CrX{oMU
zPfNd+j%>4e35#mU*S$XLTvk`TQ_UYflc(DD470Sd)v%O?$64z18kYG6&$Fa+<y6a2
z*IAEMs=L*-)=K9(*O_az;^|H?+dOm5rA3*^THE`HzyDlq^sCMB__OD=FaPegdux6A
zm1pb8+Kl!y=6v#5uVOQ;$fq4Sr)+7Zl~ej%c`dV?*D6->nR2c9ta+IwOC{G-a*C94
zs*C5#R_a=*+Hs_Orh4X@rk%A|54V+OSSqDNsil^ZJ!hY#rc^C*EvZ^wv9fbrrRCOV
zUJ+JvT{YdSmd{bv;pSypo<3*m(Y^ZgYs@jiJgoQPZV|KPJW9mMCDmzb&L|PKB5E|}
z(`3tcl$ujL&z15F&v~U9wVcOF=aI|0k5w(@oKloxwhqg=at>B%%3+pENwe=gYP+WO
z?<l*QkGQPO(f+Pz`-;|vHIF&DT#m|CJ?eR+l*^gYv5w#KJkGpU%{i}o@p;nvoS&1+
zNO@XLXDT)AD5<8>R%*!eS!!->F=zAIPBWXqW2P7lX){YXt>gG0K#9N1?v+a}CEEO6
z?HbS3`e-&<j^=kRt=cuC_-NjIjzE2Cj+x?`V{aedpP#Eg*X4fo@HWl%^PdqvKV$s&
z&*#ry%x!(9!=rjNo5y*cM=GV}5_#1bQIYIyCEdp=v2sOkb4kZhYO(5;{A#T=AB$to
z^O<RRjX5ns!s9kQ%;s#Rr5tW0mz+yoB`2%4EM_UCT<uK7EONAzo3$~b%of%<f9Xp6
z+1`gC5VKg6lIx5)X3Bh6^A>rJ5uQ@@$d=7(I?frX)_j~PiltOru{r1T-cYCAnr|zX
zQI&{no=eM})3VuG?|-e%Jx7mXoRCg2xX4mlo5lN>*<<GOShb|ct*%n@?AWS^u;epW
zYi1>*iaGLmTDFu@S~YB?8|ljBb0&+hoRWE)D<N++C4R#p1|o8swP<19ySF*6u;K2`
z=WP4wqn8>pTOc&)Oy|uJv=}`V^wP`RrOoN)5xXS|9yYC<2QO-Ovb*%s{7x+w_u<Hm
zO`F@I4UaL3{XIO4&vwN&>t;>YR7$d#XD-F~)Ci1O*+uuhcWd3ENAmKCz~Y*5L;dg1
z+Vk}PK@i9EJ^g!4o6XQZ#A=MbWhBZI9;H3gyma%7f#7j{M9m(#)FZEa)O@CC^{gk?
zoX&NlROvj=l#?SG)=IAD!n}^KoO4YnOtv~@F1hBMR+}?YnP!%4)oLEaXD;9A5zZ^s
z9Ei)b!uREHkJ-BZ_R)(yt?jG(j8c=&%ZeRGK8yLxSYzjQOUYQ0qn4u-o1QajbF6HJ
zk6Yozy8Fu5d#p{yuxGEyiY@$O#gkgHm1-&OC~Zz>wuK`~TuylL%Tq*7<^Gthbl_iq
zQ?Wd`oSAS6brh?&UESQL4WF}*;$u#$CERPc)lyfa&%d?Q6I<7O*56bQEdGrj$+*jE
ztCo9tHp55MinT6Qi{)f_S-p?rK2o-ZLs}`#l1e@6aS|HDK(BL~dA8QJncF(<&wbW=
zrBpv>N@g7CI*;VVaunlT%?nXP_<`csnzbfFL|R#QdJRrQt*P?663N!WT$d;b)6P%V
zoR&v#BbPQX(`|g`7^4p_)2C1KS!Tn)B67J+$LJEyl*sv5M=Htc(ucWoS;cZ5fk!S2
z8_=q?f^woSHdC1;Tdf6;SyxVcfK=RbMM7*v=F4;1n1@|CkUcXick)tk!Dl`#N?IkY
znNzOz#!xApDWa69#p`TVjNi64W68i^8q&IJu}{h=-FI5)v})-ND=EV8p|#dplIL=k
zbmT(3uxi1!nB81zU8%}1);syRYE9+L9B@jWa;`a_M+%n&IO<o9JExL;w%r}KJL7xB
z^*p7F{p``67TwPkR*z)JcuEB;PH-kCo~9FznDJ_vkZKk$A09b7iZNHDvTEQ@Y?jix
zAy3QPEDz$ec8yY!mmJ|W=jwhI#Y1O!_KF@hE8VlrQk#e28}8)<bTizID~p<Hs-9BL
zIfpqiW!XwuE3Z^i&e4c;3I6KuQI2#L?xLog&eBTb7LP(SDPMY*a@IJGJZm}$F4KAN
zQu$0P*W*qKm<#HkbDl;_)UK<PtC#Ez-&}LLOU|iI?9Q;nNnKIqjA~!&ZF}-In-f8l
z;AN1#l(}Z^wS3Ov=G+@^t9Z8L)^YMRr$jhi*7-@tk<RL=ro2`@Z({ma@XWnh4=Zch
z!uTo#$TO{a5}5Kj>t56M?z7Fk+x*Y>@9*d8EqZ%;Yu9$;GtTMdGz2Ugn&UZM8+4v^
z5#m_jpW{SK-O{RMadt&c^{ney_mR1j$avr}NDj(#+5FGt)mm~4^ATlLBqhh*ty{h}
zQR)gw&h*{ASQ|NK_tD$f-o0Q7%DJNCIb3q-mix3CvlvE$Xtxpd<{Wk5Vkg41QsJPg
zRdg#*!V;5<SoqF-hGRl)#jMx>l+ViN&bc1-$dP2Xir19x{7I`?J<i2-**a@JSE;d1
z0?|@(IjhCu_3_Xp*1Ej(D61rI*@?_B1O?eU>q^+-Xt4-Glie8EYR9s*xaGR?ap&TB
zc~~3fM1`w_kD_>~aGl<-=KY7$wo+#E-rVQ%hKDT{sg_MxZ}`j@eYb0%C0DF<eDW*4
z6{VbUrnNBbWw|Z<%r!^bkGCt&%dAUE0+GZ`dRlH74;UW9GY&50WWg&qPIE;h{j+ki
zhO`rYTU6d~5?FeP(#TMJ*xET(ZjZ-xS%mJGC`W2RY!kTPnl16#rI0h>9ZYAsGUCp&
zC_HsHn|+71J)MVKd^(bw&rNi9FU9&Nig)B3J%|l35*ASl{*O~C2PP5oaUw@4<@3Z?
zArHtf;-J89=DE%1xU4^|T?Dyj?f-4jcWtd-HNI{CH23Y~4W-tzcuPEmdGj5mN41#(
z<B+i5ZU-?1?}I{N*~3Ul2rc*?6sQz3GXAXM<g6lFJQ4auJY~gXkxNa@(2IiERJe;#
zEh&wdi-a}R<8xT$RgK)XU=l4d-$r&FWG8rcOrrPM+Vd0F-*@k8`bLA11FQe6^g%%G
zBb|BXb$;%&ETJO*)cYVp&6DulydjX^F?&lfqU4o*ecaB354(??NcgJWK3Q3o5@(Q|
z+$D}2-0>)0`u2SlAKtu}4dOH-H{sF_g7V0p>LZ&?+3MxZvC}K1;<(c+Cs)$6MC2J2
z!(aL9MMZAR0XO5VMLv_8$$qWGgH4ZwNB<CrWJ50aA+vPU8rf34kK$gBTu<Jpm>K57
zTiCuLkBFFd?MTzDjDC@yx1I<2QsMK2rRBYkVWhLQR&=OY`}^_)$rKRrpw(t2-XoU9
z)pfU=$p<YkBWC#SI)92c&Wg0(i?=z47tg84x?+cwXP<X98?%JZJu}~I&GTt?9>~yn
zlHR0J0T4zHS6*H5Ow**E6)(nD%~mdM#f+o=)ZY`&R!X*lD)4tY7cfnj=eDPXjkX(!
z;@Cr<Fv>O`E#_!fkNMrrNCdA8?y!3+xZF~5%&V;&HD9GPtW3^r%rUJrTYQHpn76Vj
zDv#AT?vJ8#rHAK%q?vFRBl+pA_tr_ip5pzdc_&UcQwEc35Juvos}!=Va#>iPF`BK}
ztWV5|kK`TvC3b7Ad{F!dzeel(J8TmXTjO>J4&1t}l+koA<}s}h;Z@}#IhDB<!50RI
zC=r-rMIPP9pQkzMoHo5Zn|tSeGBzxmhh;;Ti22P+T4o5iVL0<F-DaBM+gA30VJoAZ
z=X9I<jiS<>tRPrkmv9JKCNd}>BCHOk5{qf&%t&wK^S(>MfSBckDMe<@>?l@N&a2{(
zdnQKCt@W_@I`@{Ho2`6LD3vHy?ajuJm1EuKiQfcWI`4|1JorK}OaI<A*JI^XmiN}Z
z`*zZ<aFb;`4LHtnIn5#^sYf_)6<SV)yYMLhTh(XDQEPK@__B(8cI&ab@4w!n_UYAI
znxlpL@0kt~4=Xli+8$Tre5c5>R4dB|ntECbE0ecXHZ&)eJIPO5a7s0$qm+84g5oG=
z3d0;B&=$!fjo#WW4a9O<wuVHn8!LLJbmJkoXdFeZ>pbo<+XSTaMx0QW-o0@8`QXJp
z!W?H}rnf;?lfvsJ(DKcFj1xSOdM+}ZB{F`M1gvJ4VKZQee59I52?BRE16-!z`T8(W
zn(3gMPO3cuD<AwHhi;W5v=Rhw5M^+QzS|zxGtF9?b6sP$=H^XCg2bmp^=a+;y9iSH
z)gKqqsf^AE{g&Yz9K*jpwPwdJc*Um(wZ<9pA@S*wI6P&ES?1i4wr5L-SUQV53%ZUF
z83*t_EXLrh%`3M%u7P8lCAaLCM;m312#<^$hw_;dx19-`+;m}K)m=HL^NAvIAz&6N
z6R1s52tyuA8fn$ZxFXWz(-^SHh_*9UolBiDLGT=$wMAUDB%F|u4%M8w?QoadHf6-5
zP{j0PBzoz@2d>L2SwOTg3mDtAXIVZ$J!<Q%Vel)#vwL$}pU+Wp1&TP%%4zWgJZX?t
zpa$GGr)#+izv%9kKLE?UlnJc!Jb|4a$gCeidpzZuQHAqf$9b<CSR$?CbW);(THvn3
zbgSh!&Q;FOai%g`LaMo2kHjYjkf?fe;b!NVj<ceJ;7e`R<6a8+@ajiOM0r3F(OR47
z1OD^-y9hv2Dhm@Btv76V)H-KOzvlk$_j&%$e}A5z{qt;OU-C5T?6Wr`m(0YsEAc=%
z-H2Z+wx{oMdc+t6pnM3_HrEqTZLO>$J9r=1&9UAb5x}iPJwXdV1?SaD5t^7@fw6R)
zcRn&@mb?_~l<BSUL<@r!B@@n{**MdR=>V7nUq3&2raapV#*94`B<vXOcy~b^*bd-H
zQvIiuwn^*u^%DVbS9>wX;+mglF7sT)TQq7Jhvd9Fq22g-p6B{|_Q<=>-k-l=rEd#R
zG5jbnR-JWaG?km)qm|YQfdB!oUu`w?Y}XvExcjo!uylZ+gjWHi${$)Q#R)Sa$TPZE
zn-laoMUH6%D~hGt^t#&Q>|^2dkhHR&*dV%xMY-KTnzOxy2P@TQ=Jd`JDNFZ95EE+W
zS)tW^Dx)FFHXEfz_qKh;C}G_RE}pCR|NeZ(-*f%Xg>pr-sF-efhl*05dZv$c+5#Fn
z5^sCDp9`r9%cPRHN}$69(#cKD(PnSY-_PIw`P<{VtnYob=V{$7Mswb+J11Nt0EtS)
z`_5Ib-sZmA&vp4Vn@gI}Ts{yQJqXX*#1er1QoE4*p)7#57eTEnd#Tlqd(}wUqoB4t
zp=Ct@@@BT(hVf_N>olV{7{g0%x$md9vRb#<F-W;Iw;+zlq15`glaAx8xUF#Hpm{eE
zybO3@GZ$}{IY%0y;!RbKjV9t~371Rc7ZE3(PAVlOLonXJN6}PTWn!4z%A0l&B$aZM
z)_o9KRbXmdcAw?6KKke`lr!XF<qrinmWBC1yi5UALmN%z^Rv=IZ>QBedf~iz-IPG~
z61he3+Wkawhg<9B-43&Jck6sivdb1(z=XBz{S{VAI7Um$&NKaUBU)wMYvq{^P^jX&
z<0nF>;>k57pr=*M@^RxL(Fag^PQ_7=RBAp+OJ^wD_nE8|PoHAMGgV0SCjrwIzMkY|
zj?yZLm7TzK6_K(@iOzyJx*5ePpX6_Zp9{xXQ$0BrEPjCb{icec23{0`i#w2$uEGRf
zh0bQ!!**RhhZB&u7-gwU>H@s1*~G7(1b{h?b>>#qEN3mV_gY4?qT8w_wJrT>F`k)h
zkL#yhc76NzKcFz#+8Hgq7WF_ly;u=k1{6ffiTMV+P;u46>*AdHMZE-XTvy_tMi6+V
z+-6<NKt-wKwN%|=lGoqF68BmZ_w&t#mU0O<b*sl+(_I7vwJXdmYQL=czNobI?-=9i
z`}=o2BdqxX01Bm&7PWe!Dtj71JR!2QGnE<dh5TEjC#7bY%*dx(M#JYQm|9huDMLTs
z@qNDEHvZ=i?Xc!&^SsiX3wJZKw<*`?ty!rxPu|62lL7hbU_6FpAs3DFj*L{B0bJc+
zwx5(f=>%Kj%U-J&pfto5(;Ng@IeR;2jPxE)G~3^u%9s)0w3qu-HHPBqm2<=MozZQO
zMYZ`%>-(}XMw_;qmDa)|WZkL<De)0#RpO#O0$X$zAWF|OY(`1G^X!;5<JQZ#Vzy#$
zeQ^-IZohVK@qFie2xnU}kkLdv)6N4dsHP~hBoOiX7Da2>do<yJ4a;TCe3jiM(P6Q#
zDrH}6|KJb%h*Al*c(SsV-6`i5Hj7fj<4h-^PZH0;a$R=*b1txtbT7lXPD?78AywI%
zA{teHNENY=H_Q@1iBe{XmPn$x4hn0QNEQ^*))=!|oCnJ8dCq888IN=OkufSO1(l8%
z-;NCA{%pt8eXo8^tWc2Vl{5heY!Er@ZTq<fuIjIQO?6H|Unl;hhADKO)uw19g^Hrd
zbQ~sp#<PzG^0tWcjI%DnFJ@$A+(G`FErk?@I-*?I%7ju#+p0%+oi|?N7M_$QK>eO+
zx0(@#sBUdv^ZWhVt&hv+^Zjp|-=C*H-EHP&bIsT#=IGr5bBGuo_##9b{!a09PD-gJ
zOuKlA07I+A%a|zwhmHu`fO>bvA`(q<%_yKvg4Xk}G3Ln$)okRWB=Vp_=>&mnE$UpQ
zO0j$(k>-v}H}E>FLiwDv{+?(bplXd87QBBER#$l0QYjOFG<hRZvwSXy7s@Y<Vu>e@
zU#df3pKo1Z;g*e>wh>BMQFK9uPoQJ7q=WC{f}(jVfiucuW_vjBG~ByC(TJ*sXXLf_
zC>&%yQBUEi$C*^K6qp=B9J7w%=2+{ha_udW4`oWZ)(D6`n3-D68xhE<;Bd)*eR3y-
zq$?fOu>aHx++Dy(nOFZl<2-E5-2k$O^4|&~kh$Phxv6rl3L9%iIx7i&m8mIFa2mNx
zQ*pMH6WD=NA>dT#&#5(12P<50u_XVS5^xXZJU1jPm%yjzBXdUrvpC%1pO5WX#&dn=
zo<8^A{u}eze^<6hhyt>Z((-jD9cEp3N}sc0$^$i<Q;9vfQ_Oj;R7X}R_$V3TR0@N2
z(01$$*pyqh<Uw>SAt?sM#PDgKY+2w^J{)V5l`{|p2)ND_2|CVW-6;#j`{&FNDOpY=
zLvCw#pb2I0i(<VSar;FSrnt$-Mr!{2<^XQVq|(tIs4mxj+8o22V-<r6v}X|XS3xOx
zy&-+M?^4r|N>ITyq6Wxuqr?DzvDrHw3_n|~BxnHuYpr<eeSUj;Vt?D!u=wbEI&QSQ
zmO`|5e5z5fu2i2fLFDog?z3(Xr8@n<v=J^X6{?$Jr#4M;IsY&q9U@zECoXLu3KR`_
zF0k7uC%~J^J5&KN=En!ztwc8KDSH?1XeW>c2o=tOtmEnmYJHDlKE{}6-7{KyT5jK`
z4V%hD`^<xazWJ<24TV0!mCV{`6ia%a<7a&TGdRB)&ZBkU=i(p$XW~sqCG|LTjqYd4
z!!4aQMlEwZ-;R&lJ?Ap`+yKMH!HuqOiy%MU$b=l|abl`+`m9{gI1+zc-+}#E2i!$0
z+L=+|>cb|dnh0v}KHkF31?yw<E8?ZlT5^#sT;MK{XhFfj1Fe-d+B$l-^hx)P0%DOf
zVn2*)s54_Z$7t6cQJU=mbg-jcEnDA{V)X77pfzncHg;UsH`*q#uX$i8s*2^s$rODO
zk7Ix0x#qBban${<l@VZ&eb!PB;OEF>wx)pH&VsZR%*-TNSecM~Ibp;cKifqi`i|>o
zwD#wUAjLj37=q<3WY(0yf$J>Ryn$;Rgh$!#h0#>NCyp9;EW%D`2V~c??JG}2c1}-t
z&vCV6-OC;qc}>4s>DSf%^W9gYmdqK4Pta|$OV9UN#3R^OL@&OvwI$B`gwG<%9hMRh
zDb<X^#QX}Fzr<4W7(13h@(So25?v7oMceQMDp`t=T5?iYl$k4Zmipop<~6UvpB|X5
zQ4Jl);)dSq$av7-RNmwfoQ#ZHc~j)tA{rqy|EaH(5qK{Pp{>czb=0b;cUkt<_v}3_
zO1(SI_6;!T*l-X4IAm2<mcN~RX1w2V=G)`U(Ix>-nGcvt3#!0g1&JsWZ@c|9@32}p
zuTp=}pjw7N<$Zl4y8HLrF9#{EzGr*vgcc!`y;`8chY_K-5@>XQ9^$@pY@bb88n{a4
zg++!npzi?$1C|X8G)0qH#ZSBo<_W*1v_G%9LSafx9$5Ry&z%PAOK}(%Qiz2rS`DKp
zIC&A#R$BMH>iK&ZWJ_H9GN6E$v+!a9YkF?OXGi!(e`aslNv%lX0PHMOb1eBjkHbzB
zIZ;6k&quoJozgFgb)-_c!y~3r)i4|R1g~zQ0@-=g-&^2=h)S|!Cj_6j?wpBxXXXq6
zsNF-yf?OM6QIU5E*WuK3R$}vP>GxADo%d0ZNVD=h5u>=lR6c41-ml;?R8$7LAwIB7
zO((p}IFLUae9B%0Om~Fp{?vN#CSkQ;)=@;^EkWd2kd<|Qj{Bc8nbL<;Mv=c4SsQd~
zk@TKmy0Fz05mBkFuDII@Q4}Ahem+TQZ&^kJ2xLF<?|Ejs100D8dtSpUjK<z<KW%*f
zb47owU#(Jyi{a9k6s1vp5gb~GWs03r3&8bsBeJA2ZVlDx&4%0M@g=$OIoh3ix9Omt
z4f}pCJqeF;*E+3qE3P;uk2(5P_V<G9y0>pQIOiEJ^qjF5^BmplGp&6y+8h_AujP_e
z{XGc_0>f_nA``SDVHAk{5GM@5*ydilwV$hvY5SVHsc2uUP0ziRJfoJG$<54KIA}M(
z32y=OLA6>GgPa-ijiD^lY$ibeaee2!S}o1`b|1i=y9AKwTL3SYQe2C%eb0HJCs*%A
z8a^yzA+svkXnLLr*^_^<GJS&~k2c%by_xy*%>Lc8`=nrOfrk0?5-pduVFKTa4}VrS
zVzDsCKv=vi8>gJ)X1>A=k5fK}O|C?!ig3ab<z7`JI3!(|WGSW;H3`_yDa34F2emfz
z0^!Zo7Q8nz5oh2S@t%F2YfcKEPJ~B%&Z|IDOP+bV^Y}gQPo}7p>v5RhoHQC+g18l@
zvS$%#x(uH_%<T&Y+1;G-c9}qr7S?dOHX(Qb0gIZHDmi?Tl8O&*mVb}WKmQyVmu`HD
ziI$W^vSAit_?)Sn0#AF$A=e$H1&Oay>OyTHP(Vl`i!(<;j?bASEu%GI7c;lZYKNsP
zmOK`K!igw*GBi~%!NMXW6xy*M$5GC*KA2}i?TKGh=r;XLFevlwa3A|j_f!f1cBT+3
z$PlaST2}c~(BG$|-#Z7N(MTyG)*=VS?|Q~T93{Qh#R+SM$MyK`ySGjE2UO~qvlmzO
zwGiJNsY(R}3!lhLOfg+!HQ;W6;4vXhh*BC2RhYb4L~w21<Fg2XBg@ATZ~;0bAf;CZ
zCR7Ki?_pKKzKiN$@QGFN5F0?G#{ybuIdQ)A3{vh~ilTU++W-XevnnPtnM=i~*g9TM
zTwU(cl57z1QmZG`ov5S7oXK066(fN!C-u7j0UKFG?19|8P^~ZL0**#P-JSF7bQlz6
z5~U*dv%=dmOvK9-@%{Dh9-~2~zz`OAE=4fKLV&|<`poM%likpA0%zR7NQklLn3L>|
z`Ut1_=EZO5&_GO}XUluzMaqa6+bmu<r5QE^w8BQ8qfAB5b3S3dznyFA&jdy+A@J0Q
zVu;`krVVA6h3y8B#o!+w134~YH<y(m_ail6#m<{T3ZF7CB4eyY&INobhL;^=62;Q7
z)`!?o*#q(<YM4Uub(|lu*;5VdNJ?ZAa2+LJOVw2X=o8m)^fG4a*E4#v9^J}luxSR(
zAXSiPa$X+#Y5F}V-qbr(uyuIG*(WMj0Ks6&DoM%n#LFr8Dz<<VupnW5M+%2yTT63a
zX*RWa9I$byBcbRhk)&ZR0&sHMY`Ga8iGrR2Oq;R1A7(x$l%PBZcWZPWos!g`20B#z
z$;8~r5V=N%p`fpF{(KTOz@Yu*AUnWTU|cK(NK9SU^0BPQ{sxBgM!9G5E48RFYx*|o
zO!#rCtY(XR@t^bjS7c&Q$}4)1#Kkr&MLE*+q|zsno<9GG^kAhPguDYChmw>nS#UhA
zf;+4$^NV0|A{P|NG5X`VfRR<XY*;c1e|K;)r3M5zWVA(8%j8yo*u~2dvH=D-^Ksyz
zMR`+WO|~2_F9r!~Ht)ke$gmLgl3}Js7zZ2OfE?hl5*Nw>L8zKb)MdlcD*P+a8b#@4
z^rGF6q^+2wI;>3+-h3=z1G3rY+CM+@`9D9C{PE`rI*YCykeSo*)?iiyG?6!PQ7~LB
zbG&p7o_xtcZ_h>O>qwgrVVJ1ZY+ldo&-Z6PJ^BOYxG(?tv)TQ-{b>Ol2ekqGf1UHe
z7fwUKZtUGz9ptTs2@$o58Nh5rn=;#lqL{qYnHC=syl1-CwM4%m8pp>+S?6sl2)(eI
z;Rl4u<|+5L<IW=74K)z$pF2k6T38p&q!Rd3EI7{c?_s!HS@CJJMyZ3(ML>coQlBBl
z9JB4GQSrL|yZcrcxcSW`2B=UFJF<sLB|ssB;PCqZK5|K@l#vP5e7Xx-@M?B#L;1Zq
z2J@nf%7=YA;&hD@Xw0)H)rgI|cT8>XWoCyw{4}2l95(R3K#WBRyAgo`_M+?w9QOXT
zl6d$<PL)na)FL0B^Phu*r(B7B7t4ny8l=S~klo#RSdf9}yJX+d)m{|u+0HOP=$5%|
z42tfftopgvd7LM=2OkGaSY=7tB#4zHBvaNL&nF)m8CF+#;$<yOoX!OHBdvAr_Q=I+
z@Pm=gS#!%WN@dY#Gnb9#J>SGI5G@xpquaRx;?x0m#cwa+;rWw%@cwCGLJ9xN61*-#
zq_u_t9MiFl`HWcvuH=KH_k$@f>SPhbp2Ku_b-9CDCPetQ{5jqWsI&O%pP-nL#@wRv
zaalPG`Lo0Wzw9x`e=jv=hU7Nq|Id1(OvTd`&QqL_OF)dFrvYa|V(Yw^`9=7jP8UhV
zJg~)CfC+`@g#P@yqP}5mfu=wL5;%<*4Ko8i9H6KdmXC66cOSjeUv`$(5@9?i6^^F?
z)-T?iPEw+uk__Y7RR7}bn~}s*7b_<SH=z;$a;~CiicULw*xGScm6+!?L*&g}N?prq
z18EzL_B61&E7_b2$LEG}k0O{@R1qj@-IZia)ZF-rnt;zmMh;F(Y6QB!k}DQVxB>uZ
za&Ig_5xq^&C61o-P*m>r?X#%^Bqou;&%h`+uxjPpMY7M?F|SKR)3+EARd26!VY+%^
zt_N*OZsDVkHitE9F-1UjC$yO6o{|VmIs;;Jpw<?vl4({2z`P4@!6!5xG|8LtH#(wX
zLAFrK^7ryK4IJ83NAtvUm#HAWmE1rp>*>*Yia|)xHp;6LC^k3c-Pyj|dYk>Hv{^Y`
z>K<o4?@S~_Fi+b5o6yp8MJ#Z{C^ax3o(@YD!yacuEuoJ?0R>Sv;qL8vVq6~2RMhD6
z>IT$;#-F?g;Y>D#w??fXjvJSv`kQ+}H8c4v&L9V`9~k#!qQRXx-pGT>Z6V9Fm~CWg
zM*KmWC;hRDMA>O&QAn+#R9XPA)j(5_wQK~npEIu;s2?=S^K`Yw9Tbet6VNEXB#I{1
zhN_J>9cJn^KqSiaR2NaWLBTEAmtspi3|EfP#Y(A%fn)_r@x+uUugUJv1(y|~1Uvmy
zj%W~C6-P>XqoruHW})w6xWi*;eU|p$JpqLOM));_Hi~wOM+4%NZ`0`^cV|R~jRw&F
zA;ZT2NN_w0b22pw&|S1@Luw|?DiaD5fpu<nQa(J5t06c{D<2EaKTV<*s(sg!%m{L{
zVpgz4-oQxQ&<3o?G&ztBjt#3IVBi9|@g0>{;UH`@!<-;~VK+yXW)i(5E$I_kT>@ZB
z_mR@)sO9syYnYA~RK;ck4L=LrhZzKSsSKCp@y*m*D3))@AaW&g)K_VR7h6435`9RR
z!0y*BzM=2AA@dFJdS*S*r(ifxqPyMzudnpfn=&humz*f>qv^#26apkp>6Xav=aN@A
zk93I1JV9R->}3(VFughCW~zv@1OXhgV>G3yNd9Hy%~$FFv#+1O>+1VI|84%A@uemP
zsGlQ$Za9Fm+1RD^3l_>GM7Kae8|G(-h#MYDOdNxJ(EOwi5PY)3qVzWLzv8{tFy%H&
zlOp*1?(G0UEjC*I9EF^A6QsG<(GVG&O00U~6z}53hZD$DTFscUHsd?o9#_5C3Kd91
z=U2eXZnk?H3(Y&gQ!BR;^_R;wX$+^56)lMeU1-I?SsPJgCrfH>q3Y)T+jCOTqoew-
z_f!J&1Kv6L<lBvE9d$pCk2Ml{etXRtkJZc1n#C74$fwrSjXrGn^FS26E()lLWQ}eX
z+RU)XhK!h#hF{yscP_r<POIXWi^n3n4j{`GJCD;X!lSo_*&tQxP6jZ=#>>DruuJNg
z-H1uo2ZDNcio-e#*t4I1&-Hts=W?%b^7{90*!B0c>xvqmvu$q!Tl>sXJ?_(2GNo$f
z$0AWab0S412jseKN-d#g0_o<3rCqA63nfBk)kNl@biIktLY1Yft-@VeH!%eiBt60l
zpo6QwNXP?KZ)E*EPXhwXW83K4ZSS_fQYENV<u%O&>oPp*sY({KP{_TKxRTpbb*#n8
zeWrk3B6<ZRyECo8*<1GD94JSio~2gNg(A{%uDT}mDUg6jYKJ-VSt4M+;U?reCcrBE
zA<l0%_XaItG!=w#g(*R*iafrfwC2jophe|CCv(enIHB16S@(yQXlzAR+Bxvb6xGyR
zBv%1}NKz~dRtE5081b_sZhPz&*R^d%mU>Som@HYR6h$vki6v&iycWI@KPvd><kq4s
zG8!f2ITEr~d4DHz1ggn?2<jjV|9q%kSQgI$F`o4}RxbZ!<pgM!8FD@0rMT%Au8mys
zlS|>+%4|AIJ6|6Gqw**&3obnuy@!a1v!IEvJNM)~cyU0}RaJcSqT_@9b=RP8GN6bw
zAG}ENg`1PzPT3q(wl$8#5-|Wo$cCqVi4Fya_ImjgOC;HFx8bu`r`l$wGg!pX70`m>
zCXiHBG5rYKZ#*NFF)%}hL=?eZ!K;%Ff=JVTQN^wavcPl@yx>mP=XjGDJG1ddMi;<Q
z0|QLr&|AH+eNZKpF)8aoesH7s@&gi;BtU~9EFzhw!&^S0gU@gf;h<qE{enmiNOTT`
zLY&W(MvvBp$`TD^K@rd#k<?#<?^3O|5;v*EdOEEdr6TY&ff<(I^>nk^TaTz22{B6J
zcNTJPp*}mS&U}$R<9ZaIaP6f39XRx56mvs?)0hp~soU9<rj|NquDBf+91CQM-6Efp
zVYxq_&!V{iQM=D96@GI`1OV<>jA!(|OPP@IuHAO?B_#R4xI$VL#<pO39R*O_aGEan
zB{Kq0&?z`u4xtw51VAxGhc*kAu9yq(Or}a5uF*GmSzRh!k%QviFzO;E`&v@tT2#EW
zA`<0xutm_Bz<u=+8~s7d+Qd0RTNg=ORtWHG(tsFwG-4aE)gf~KwCDNCAREG-Bj|Zl
zU0uCR#STqB$w^{=6Nc6MT!wo$FzJ99VQV=uo05!it<boSwM@X_na(iJ(Ll1Wf6p^E
zWF$OAk*st+w6CM2Q=nUzk<6O_5%B1LKPi$+Ytdkw>hwNc4NcUi>yf}!09ukQa-D>n
zS*|Z>_RQj2VF`tlg<G^S%tB468R|6fRl-L`gJn8evJm#<<+M*3HcvC-GDO~j_*&%z
zOSN69j4E#`R^N%I!Irux>v(!FDYF;plS1G;@B8=&L%mP&?4q8_KvcsJ0&-Y^a3GMh
z3uZ){1ZdrdQi^3~nFJ&As_7ZTFLS)cz3m<&IH<a+%lZH}=;{rumqO1h8FxaVNKfZT
zgW{qFEViF3@9#6wh|4((cRJ-l`Bkd?w3Uy|<=<9z8y6hKsOmO^MAtxo=jPNQ3}M~r
zn;_e|7folu<5pg1V%?`YJ^2d-RkW5h9*D}&O#gnkas0g+8A41MLKe;oG+*g;Jy$+I
z=Xu`u`40)$eH>O!(k6__hfaC1Gq6F}8k^^wGzb68-h0eGDGrJq^TCH@8%}Ko!x00m
zEdEG19_KF2&hxCZ0Y=lRhH}ehd`QAAGo{U^;v(OF^QG9V$XH`~D@J5d%oX&T1A6fV
zjqD*gR+SHP&!tc+A1!L|4J$*XGyFAhO)ZNI4(u-Aa4UcDAUWZs9e6ZV^=r9eH}W88
z7D%YC|LZu<b^MlmaxKNCx|<U6R@Z@ROz51ggfuxZO5x`t#@J-{W<TvDh_fp9d15MV
zbr!=={uYt2EVpKO>uPIuoG);}iRj-Me^}wo54AgaiGvS-k1u9$csAk~&!8iXYM?R<
z<oU>_8rz6gD4uG@n#2jXbTWYiQZSgN`1Qg9lv!G*or8}x#)J_Wa>qqe>MW+9vj(Z`
z4025L*C$>X6a(tdhi^YWzZHv(d3+fm;8%c7(lSI2?;oDAk~LNIp2>7a=DQ>0!s0*^
zA()n<z0pWbp(~utgtt+$hvQdOCMUmy>~44_WZFeBC{cf%2_^t__+{6$292F7sx##n
z(-za|>iMaQ5_3s2h_OR`vG?x*c0!<)N=3%=f^n8Vu;GrS{t}q-`~<>*cXfHbxkpxp
zZZJ{#$m*`^*r$JTFbFS+7^-Mxx4B!zqT6hOpr4r+N5m~23i{Dh47;gY62!HfCs!)m
zz?83IJ(W(cY$!*T%I88AFS1QOkg&y1QUr41crZbTwET<Z?x0gM6cn{u{3JCH;m_@$
z>}j^l;JvNssP4*`r%%S?RW2vO@OKCm7}p74#7IhIcmv39(><6z3+6jU5tZeBBa|!x
zeksoiKQUCdU`42I;(@vwa9C|s)QiX(J=tPh)A;OT_8=PYsA=*;m>QKCBFwrtEwi`M
zy4~xxotq&YAXP7+q(?L0`5GQz#Wi^)RMpw39!*0Kh;3FFX5IX`Mvs(FtS~4>GL7&8
zU}RWlmY6MTNzRzJ#`*qi2Y~I*@YcPUNC??iIgk2W(;n=jm3@`!W^nuE90|*!l=F9`
zs<B`if`i%Q3b^$_>BGn`IN2&nWoe+!-XhIO1#ymSvu^^CsK7oz@ZASlk;lAr%;P^0
z{4(tg50q5IyGJzhJpsQk#B(t9<NSZA+UdE1`&R)^$8QDXZ1Ys8KnC;{-7=8~CfnTA
zGt__@!o5LYtMvos0Qh+)We_iqjdWDwLqbJ@X=>I5Kb12)-xD%Hulb~wCPHBZ=t_^g
zyJrs~rFC;m0qP$<La!kpO}a$f*2ueS@9k|5^~brQDZk;M_W7>HW1f^W&baLA;M7kq
zxS%t&edjq^B8mnsJxtY@<Q*~xj7+Pg_hobL|NQs)>AUys-$J2lOz(NUM2+0%<SA~U
z)&eK;Qcv11-EA0fTJRU@%Q+QkR3`L;b?=Zhr(qO9jS{~KcED_;)O(xlX+;yY&hx0^
z-XHclJ9ntDYAf|o^L)srvbC!LSmf$pQMlYhRq9`CCW+=*Y;jDys^tytY1h|*8pq!r
zgV23CKGJ3NYguDVN)gZHeO$Xoc>lI59E4%QB5b^d$MtP){p)Ewq%HmX{h@a%28`iW
z)Gdf>eaDw(A9lP+S~GBJ!Ow3tfhP*Qx;PNGX5&z$M&}*$x!$YhUS{JJQ<BzWlt{Y_
zeKY-|STORfE7AA_MOz>O)_aVft6$&#^IUDuarK#Fm2R9)Elysg2p*(3I@E;>AOh{Q
zm<;?%ReU_GZentvhWsK&6ym1HR6H^X>78St#v{fs?)=W8C@gic1%MAWb{7*g#Upz+
zGY6arfw1`y`vpT9P_xRAj*!nfCzTLgtI(sc>*s;rQ}18;i2HV?R@AZJ30_8X!Q%_o
zB9Of~SpUB0!uII>dzB}MVMB~*jz4Eq{df^K5p%%#B4?sY$G%|?%mBA$PPbLGABwCf
zZ;SZLN}LPVxQ@I8)PM32YN3Gc^yCIM{h>Yvts2DD>!LjOd(uEZ^CD~k08A=J)z3oE
zHR#pJHL188MkhP4BaXq!Lgum}lmu=|H}kPX5O$wLJE$SZzXih9$r8+x)sUk$pRQyI
zYiSGWraGiWw*z+~?u??~cNw-#$bNt`qzUvf1w^LbRYaAGmZbPq08G&cw^exTT5eIE
z7OG%pbX5Qx%?Q(M$Z2(bC_ch20M3WG19n$bU?89t<HitN6B{}4L8~hxR)a`YJpo)&
z>A9=08B-WB9SA2b9~Hl$Od27-1d&X;tV4i6IO$N4C!0H;yrc@J2A^78b($e~!-^)z
zZ&v)WIR^ahKA+Nd|Ngn}-Fwje37%?w0*brH(;82Q->|@?xhj}5N9O?$T>^EGIVfp;
ztb0|b1lx)d6@$le%LE(2E>0*GYAFrA=@d=fb4c654p@^=ly3w|F`Whw0U9YFB22#z
z`qFX|@{&$*x`)l0Ah`iJAj?@rCiqv58s+8x7AI$0HlmFfj#JP6nJW!ArS~V-6QU1T
zp}jm=6IgtlixN_Cb4{%=(@YegD3D`13W!u<?>J9iB6IVoP*?ruYSDY_K4Z*?09QIh
z7HJbvcW#A;oPuc0z$vo52)3~4qV|nKp!YfNPxTCcpw=ZQB;)-hNsY4=XdJNO-$2)A
z>5sej4AE8-%U0EFs5`wA!g%0xQ|Js2hRx{-m+HYVWi$r$H_dv2y8Rw!y_0btYN4PX
z_O9d$|B$nkTEQwO_K>QT#tLT1P<nc9)moMxaz!a{hMc$1xY_Qx5mmLU@Ewo@=5G=I
ztNK8V0i^mjVv)lMuERJF!oD4|wYbKapgm0Vb)Dr-6Hwkl8G$<GEX)d?p89~IhOh~;
zwayQjIYz_s!NX57V-8uNR$#h{n#4bMoVEiHD=#RBZ4W!o`&U_mYO?|f;Ir~T5bb+P
z7>9#fL+6>s3FB6sNJzgU`r^)Lk{b;^NHRoi`-huJXhOxryGGiSdm++Tz|=j>(;x$Z
z*<Ty>`siaoWBU1@;iK>Gm#%C2U2<Gzmw?V>XHtrGd8nmXvrrlzeNqSeE*lr%1;wcT
z_ZK#}iobDfv4f!yiY8R*E3c6k`WMBxQ4%fY-tK_EJ&KPeltyGZ@&dpP4akDCF~MPL
zo@(a|b;^LtAd=hOfL(4p8o;u*5D)2vGL$koC5QqYn7D*MAvqGQ5rftoXvd@CInE@$
zrt^dO7iF5U4mlYVaX9)Y!kq(C20=I6g_8(*Sbp~nAS=<B(FG|9BH{r!Du+<2=-(=Q
zHIeyJ0C-k47>>@({7r(OOGZ1JJ34K^!6GuP8cN%%&~I=9FZ|oiq`2IO*9#?vvVK=3
z&O}DfbA9g5!unRFBMG40L{3JW*N8<H=N2J&Jb^=5N_>bA7~{Ykbl@kxYUghu)Z=tT
zR$lZM2b{-z{H}K*xG1)nq4OfLq2JkvtSbb9QXGo_T)|CwSkV8XfPY#f#a*NwriLD*
zh=31;z+D7507j0mI^`Gv4sSKD7FMHOp47oj#`xwgQ9CJ{YJb@S#2pPoIny*{@COI8
zBmnuWm1vcS<WTwDz2XoEMJb8?{!`UUd1`h5_+eQhE(^D+Me}b^)mre;^yCZca4Wo>
zg<K+b+m;V15*2h2^(R~^U_a_2aDj7F5C|3Snz7}Q+A_9<lh(h22Q<37mq=&JhqdXJ
z8}H@r(ULq+GvJMBUZK66$1mfVr4iO9#q@mK$GR89n+O*p+RPx?Kw-<PoDftR>TDWn
zF!7(`YSHHPrBsfw;pBJk(2eG~G}<;FNo;hOl-)2cZZ`VB)Ryx;-EL8U7R_vl9ROnS
z!DA6dcmLjr(+?CUuziF9Gb?PTk;>~*Szt9SWZ+jRv4~!Ty<ljkx)-U0yfyJG`^{Mb
zi-#8pK-om72vAxCZ-mI6>Ax3_Ko5EqV#w4K)h!zF@or-hz}p<Ix+9r|VSZ8K{!U(x
zdfc}NN~pHy5TA4u`mcwFMx<*#M_D=YJI~?l54A0ynWWFd-8jXc&M?8WFP|tpU)>LP
zzGLoM!J@@GwNdkM+CKoQ7M!pOVX=^e5`cY(SOMxdevlUtdhJdIJDAg3#Pw?Ov78m=
zF9LR&P8Tt04ifwd*FNV@wewEm9W6UWS4>H`^w_&UPdwkBNxU?yopbgbK7RJI%?4RA
zVE_mKn<|W#CrJg2#Xco2-z(DTcO{S@QmVNRpE*@G@K>0;Zz*?C3)H-p)ZA?hY7hHA
z-*0bFX2;hd3ig8iWe&;o7KFn;*VXx_|NUI;x_+XN-%cYeN6}Yazh}yb$3H6(MpXtF
z)%1(;vIX)qXB)K_niY^odV9am7CtgW+(L!2IHc8rio@U$y_pqHuo9T;_6vCxF#ZEN
z_8X{3Iz9);eq^U#YvkoL3m2HbV~l60@0~$bp~9$BzwBjpMi~}$7-!Us+%dG|A+oI^
zT)Qlk;D8_hON}tcDeDlhxv6i;p&qb)Y*2Cq0;{jWC1ncO8_`Sqz_!ObZx?LoDzGo<
z+=i}R$L^ay=s<(zJ7R!gCv#Hpn@W_aLy<a70zx9oTZeh71P_2I>4wY~6^%M_FuIGu
zim>EtJk!2p>}}%SEJ@?CtXJCs1!D#=h>^{U8*+#VvOb>#dn|J?tNO|vzGdQ^;u=0-
z%apw>G6bZF2@KM(#T>a};^LhO<W4i#1ca78uNF3gd<v2Uw($D)w$%lKUAlh@D}pp)
z;rA@}=Qs|9n_0ljXmHToduPf$*DNTl1*IV!GBJM{7F;O)a}q7Y%!p5D3U{q_Pb74z
z0X}Jdg2L020|zUC5TORi^})!-QD@=!6%Bxjp^oN9d69=!p{$w6ef-z~!5JTTj#A>x
z?I?XxpV-@@?csgY96m7AQ6^=|TRVet${husoW)TFRN^|aqcHpFw)aT0=h3YN4^_HX
z)nkYcG}VV#0h-tSc{^>bU;X;~d#>wyZIaM$Kw^e`EHsSkOl_#G6L%}>-t3rw-3&eL
z&3@VwdC$$cQ&gTJ47wA$1VKId43yHh?&_NUNWjTiLM6~X8Z!TN-?wb!vD#TJFKk#o
z-{A|0Am0jm!m#<n#$MT}(Wx25l@gNL%}~QK1n31E?2wRC!&yMOpHvPU+}5p;Pnr1C
zDxhW+5UJg{3wWlwV%Tp7H>%yJvE;J*^g-q4`eXA;nag$=yE+k+0V+`)#F<-Bg39M1
zR7fYRy4h`v*2&PIvyCpCJJO=yp|S5p5lkd`a}$tLh9y(AxMt`b9vG3~Bj&I=-0Nw*
z3s&DJR1~xOZBkTi2ffZYFv-*x97!l{$Ue{k&V;c*WbZmSGpGubZlgN=4p7z1hrJ~9
z6B(=)2SEw-nM3T;6w_DKx^Am>R+(4p=A3HFV|yT(+S8QBTc%DQd@ED*Z<baVVFU$6
z=@KLp0>c78{=(5_eQ1o*xSnnpP@)73lcmZYE=W9@BdB}?$(Vj7o_>9pnncE$RV>Dj
zQ2Gs2DF|oIPe~I2HDTTw9wC6Myv$v-X>Jm5E0iY%4MvtE3!z#Stj-z7kktALj;(v1
zGG$)Lt>{xLm=a~lB@3A$2?!fAS`X-N!6h!hsPorO?04ec)EYRWO!ZJGWlR73vaG;L
zxB!5Hjx-wrNj`_RM?{wLxXARG*zEIr<Eu}yAS;=N0Np#!lYfp{Mb?FO+woMs9pkAX
zc>JPgxXnEoR7P3oh<xYHE0@ue#=?aLO-y>>b8>O4lUgf`G-hy|@lNmY1e}`n(uT(0
zOCwqEaamLzCXm!XO(c&cajj{(8eQnhHP;Y_p*d_jI?8V86wPb>(!vnXTk4^dGvCKD
zL2Ie}t`Pw>s?Ki9vr0=&`v_9xO;~SP!Mij5PTXsi)k_$on||XUP~i~-SqOrtf>{CA
zM3nL@3DG$S@S0*!ya?0lh9YKlxhHKe80|YBqAWGU^j@uxG#Hq*%QFdgZU1*T-&pv$
zc_8wTOV>?|NW~YM-OPp;8spS3LfO^`l9HO+ZbBXeZ;=nIv)L+H-7T0QH5$AC42L%(
zfV$A@pyi>G^hP~YJ64*y+w{_+mR&@>w&Om+MINuMiPYJs1Ge0);p{j|Dh>e8w45Gi
zRxg7G7d_KqK?r!);Pb2R7;sk@ik@JZT32K4xxdO>FE9Iw>p#!+{It>c7<u-NBcRKq
za(^{;Z~TJ0UT(YIz-zSU8f{-c*E6p^p05g5Mv_xHR0uWV-o<A#)({$SeZ;{0R2%46
zU<DK6e6auEz#OTESqyvtTJ2Rb%X$_JpN4QOwe{f@%j^S6$AB3-{h76qFIwwXo;}D-
zjhsUR3+~?{#yDItQqdzjBJ4HZUgFF!M2ZDS`cdxlQ{QHfBF*;Xqu$4Y*HMsK_jkq8
zaheL5u+U|T>#983JBOI4?P($#_ZdBp|329Q@u{o+GI}I=-&#wf&>2>GejaZFeqtY2
z?*Of^sBkM4?Of^e!B?NCd)2Zba5m8xx$Qbl{gkbU9ggM{NXbAuSrE%{o;7Ixlw_!%
z0HA5z3$3W;>lCme#??C$0Suzfk~ToOwFYl7sYzC#n*7+9Z%;NL2BTc$U{p$4BF?_?
zNg(CRj?%Cn8IP*{iw!&<-=ldNDcuUr)l6dv!=I8i9+u`s^kvdV`c=UROT_fEYSeO!
zu9X7HY8LNuV(*FXc@bsI^{DAMDBy#TJL93{`GkR0ESwdlg08&K#d5B5L<0sOtA|^s
z%9htWCa$QuBXx6mkjYd0s|W)qTFrWrvz{tz@`aav7d#Gz2Rwkd8uDE^KejBu_bedl
z83)1UxY4)<UN@f;L><y0wWd~LYP;him;-yf)15q<Ko9_L-80#@W>4f??-Q$=17yd_
z0jhbPGF)R~X^g8pOd~L@$9#Hk-f`y$U4*^K0W$@f^T)FsD=XI`ShC6GxJ7gE(5>;P
zQS9j}%Sp{}_}f}3Iwq!2Bf-6hAYe#k7CV~#aiN@jiX3cKQ8Ifs%*?k#-X}n&<-_Fo
zs>%)>W~Ghkkj}t2L)Ch5Uo@pyc}c9IaEx~Y;$+6^KPjCo%Y-q6ShSfSW`@m9V6wx~
z?q&CwB?WL8NkR*;ldx~Hf1Z9B)`4WzL+dD<VnG|~lvGJA#_ls0NlC~+a;54~0hdC(
zu<+sG^)3bE?^N%J)(2%dP!)|;6amO8P-i^kE6m*m=!AOthcAUQ#Cq!!Q(-Q#m3ULf
zS#FLzVFA@^VQs+_hhbGoYp|VDCI{@2nx-`rki6X0CG6YM3^*aRDDo9ZZx9`PnebBV
zoN;3CApV%mHhNRVIxK~272T}MHpy%g*R-|H!9Yb94E#@mgjVckp1Z+ZBQh6vpGr&2
zWX_0KwJKii`}26j-e>zZ(%skTdWmr8+(jXZsigolK+3=4klk6U9JRiU%&1B9H`ft-
ztTE-ZHr~I=TM3b6*bGFWSQeFb)q^+!(fNNyI`!PIi0$gc5ACtw%XG+O(dxIS`SkC9
zo40RK4NpxTC0uAHrq9Kj6=+DnC}x-fu;1fDu##}D$9Z~MGX6<QH^2#;t4{<K#EeUS
zX3pT-5#+Ji@o6Z>O*n57jM?%4Nu<e8rf6kk1t+a0er1tG`1+)rU2JUQ@scnJZF7Mm
z3~WUI#i2<Nwg{bnNfPYN$;3+SKKB>sO*OaHl1+ZhFS1oT<+3A-p$&Id<3!(L`k|Er
zXY#4p471uErJD+=`WQ6k<d4=J6z|?fO}nYftpNe3IUOIEmW)<H=+)#@mH=S~!4IrG
z159}KmGzq1@SC_RQp;}hzn3Fy*fK)yajh{L#z(++fx6(9_<!i%(K|ula5J91KT~yo
z)fCPplCEp^CJsl-AKKU~`RU{PHE3+t-)tMH7UQ{U;t%^XzU65?Is+H4?m>Zz`vvev
z|5aag9{>{|7n-9*{^@n8K!GoSFe#Bhmq8`b=O~N+O{T=GnA4LDa~R3ayY;@mJF21r
z-U&xW$W$Ap%a^oZqeZ~P7cD>A00hM)C?BJ>l=ogY;#L77yx40^8U;5J2h2#sn0X2k
z2hy5qC#@utWgYjw+)u_W=2HkX3||e}Bw)bxcw?K8u`wq9t}3&rX8Z|M0E2CRukkbX
z_iq<G6gHk}lsbL#ZS4eI$lkHzO{e;)=Y8Ows52b@-YQW?VKpKZG?XQ~@l<uz2?MKH
zR`*lQ$l3&W4V<Hf+!L3~z$S~V=dBO_>ECN^HYQ(vKY#ljVi&n7*CToId@FN##{{H=
z%U3wU>E8dZBa<nw8~O(xhSSOXV1cm*Wi$6Slc{UU-Q<JS%Bqw}VMJD;UM7#`?0a@=
zy<cN~cg(;4c)RBO`S0G}pVk}S)rOmgwwYHobAX(@N8YFsOT>s=IAX%Cn^`K!<e+Bp
zDuM>kA+knJPZZvgQUqBx<q{LfOt5UZ-O4j6BvgG#QKegvuy`Y3zJ-sY<V$lBGtMa)
zA5Ohe*(7%z?7yHP#5~m<R(~J`;HzGKk6S}$f%IX|VQEXX1A{Y43e2+HOT2?%w2EiM
zzJkNL78piR+ur1kA@v7Q1olpp^g2fD4Uo3S+<T124CeT3xO&RWqc?Yl{Unrdz=O4T
z>%MPy%bQ8lVw50(-$9HaB74M26W)gak!s_ODiL#XFQv3zE3i_49C<#fmm_P&ag^1*
zGp07;_NXelhBr7O(b`*8JgV4zF}3vSa0^^O;_?b}jNBct&C_WMwEHM>^o4VD*}s2p
z1t~n1z`4?fb~pYRtB%H)n9sgnhF!z(H^hw#U!fEN1AiVYn_6HGYG5wzxP+Stxx^`Y
zQcdeOKAq7q^N;8*B@FO1kU#1c=;|1510>hrYK}=RI9tzIjHihW_*EQK5!veeca=Gs
zB5_d(4p{SW7!_qEqDUuLc)|IQY?gEw*2v;P@4pXQ2(+(yj-N*>w!}t*lHm+lNGfB7
z;<^_I&KRQ{=dT3-fJ}ngJSs4V5fF{tpQ|<O4XJ+m&K|Qp#pjUrz{_yg_A3`hj@LNU
z2Y4Q|raMqRmYa|d)SYLf<d^<|WNloi#tUeNIUWs?Aa_$7l?u(5&!SZE*q9?>sIxR5
zPf1ss&lk^nG4Q>&eg%2NWK3=$H9bH792~VC%#bcmm=2UeNrliu1bWQfJv<=&ZuPj)
z`6m{hg5vIccN;BxZ->3(Ij?;MkzJd}g*OGlMf?QARM&Ev2k)zuykJP`HO+E-1@a@4
z3>0<wo+PD=D)x$RqE`{m25ut(E?Re3#9%@ch~=1Klz)?!f(9s8i|BqsB=Jx9DTCFb
zQBxVad5HOtx05mP+?jt9)XFd{u`LI&3WA(si{w2XaH)B@N5i5AyqSq*Tx-$hpO<v{
zd=EMSKX~>n+-m||K@ZZ<O3HkTfsB^mUU6hor42^1Mr#ojZKTJlz~pCgcJQzgQanZa
zM;Sg?Cy$^dh$_}=Ix5<p4ZftRPg;5j)Is>kI|v%7BG|mt;Q~u+B4)DUBQj{gcl*`<
z_LyHr7rG$8lC8IQe)DUWt#)3$q<Mc1fG3gpBjq{9Zf#5+t$BUAbxtm-=s=AY+~$mE
z#Z%P^DtRgSH7k3!DDiW(J~m<7zWzq$&{yIw96tlQv|BV27+AFa{0!^E$AD)*awQ6(
zk%c?@Q;1PlAwY|~5SEfez=QQcok=*5x`Xk27#TGD<doAdyo66ZnH+V-Tv0!8GDoQj
z(&|gwd)JrruFk3l9>HbL9&!2e^R&SX0JGRNH>`e9+qR&wD(r$sqdJbm@K&OSe|v`}
z?oY2k=M<UWjx_h#-9y7hP)ftSYWGao$Pp51;J9c42HYCSoMYOw2d=mC7*o}Lz+!~H
zDoW(=vNq!cSc1eO%Dz;1u}NDkL3|)0u6ALx4r0M?(&GAcqXF;ItAd0q0R*W=xQaqV
z2w{b{MFPRi@gOVzFIg*O|A_MJ`Fx4@z-|m_`p^G-`*ZaTp{~W>HAZV`?lr$|(T82v
zG!(VtqN~aRJ<;xPW-yB*AM1qz_yFXIuySa<&hy%wD?xf!iv~1-#&5dS(OVu*A7fG*
zsAuh#74~G&Ap(LDt*ycS0K`*st=?W?DwqWzs04E9Ww=kDg2^n3qEJubf4(KU9Nt1r
z6`Y4916=-jcW{>0q5|dQ-(`kGyFw?d{cunoudSA%dGi9&*qE!;TP+^5j&ij$<&xaM
z)Sdir<^^^K-V)RYWko}Xsdicjt5-MF8B0aYTXhyVP5}4vPg#_K+}g6H{9^wh(Q!@N
zonMSFtjyXpvN6w_grgAMIl1=S-oDR(y#g$3t&bkqPT`FyH4mWgaO9b`n0JRCuzzv2
z!baiDs)Z1170Nl*tae+3F6i+KsC_qLKn={tStlJbR&w{~6AFnhXqY|OA4q*Q!B4BS
z@au|3PkSvBk%X`tG@^l4|B@nVBo1cjtShFeV6AW%T&0}K8bxi@+;r1_Vg6M~6tp`I
z)GANmMGcZgdCUqul)1Itzy!uMFYVNRp8oTnztQ(kZ{P3p_xz_lyYwG848*K}0j{J!
z?5IGXLdF15#Kk4-0v(){g1O+x`nwXYiO(q@R(s3}AHxPXv%0p90?v|vyo$J!3F$O+
zH{1m}g&2r28)rdl=E9d946pO^*wN6imfIL`h-RN_I_gO%r3<wls(Ix5bNpYlu&#q3
z4*l`(2sa1EdA?;_{VL*KhviuVYu3c9>pnsoLQk&2r2M#QGcANt-yoUb?_IR~#ftbK
zlgIUJJ=g;AJbmw<IeTdBdH-sZa?GM|39F-8Qsq`D+2E^vRVy)3Pkw2=Z`OdTgv7AP
zz|S&8MV^D2^$e$ILvTrNQoN1YvwPoLqe}_qN4vh?YtyJUhOoNUJ+cIb*gXJ&pkj;m
zhXuyJl(j;GwgiqJEW~E|G#Ct71L%dlbJ;1tkYlp2>^=^hftOAYZTqt2T1a0_D@+wm
zJ1XE_59k&ti#*9&&KenwfBYJ|jrKG16`g2j4!F@4<KZFtwRgXsYwZ5l{QLLw?7#nf
zHw`)a=jy({s$%W`8GyE`o|nK=13AdVWh_utVpPx_L&)_M*67|y4M2pNpqhBXV^v);
zZTn8(YgxHT^st3)lMBbw{lazwt@Ag;ZLTmm(Q9y)X=$;=zr{(PqiIV&7P9I@oq0W(
z121&jXfFKKVm~%|sO7+N(l>fbdGq7Xoa{39=fBT*s6PH&-|gdiJf5(s-J`9QUL17)
ztZ#=*Tc9la+Pggu0FqdMjk;wYKRxyk9eQZ{b&Knv6m$)y;dod0_s%7BFl;QV`1FA~
z6;t82R*lvz`983xQ>AR5P`WXsfKkpFK~0JXaoD_y_j-Fd|DluyVhsvv*u-UAoZ!Ed
zdMZEc;GScfT^oG#+2UTgw}Po|UZ)p+%h4;JxBq*CS~~!HmE6~rRg{Ezt+mZasU>%a
zuIYqT3V!BE^G)|okhq@h*Asx**O!23PoPI_pQ&Z4-akuyn|#K9pRuoNXl-Q(RG`U3
z=f-A5>{iANX(ETbxX=Xy64k$$h+wqht|-GT9F-*uP$j}>-z#Euqd}@-6EM>}RzILE
z#F`N(DSV>f&%9*n@yf-g<4~RNiCK(rjt&x)yE$#o>ETnC;K_Jn&aRhm@v@~;2mF0Y
z_8*@ZJ2RVOZqUR5ZfYIDq*vKn>txz}Z`B(!Qk*m|Tj{R4xw5jqcSXse2{Dbl85^FE
zBnJ`%IVg6bot|>M@S6%{E~1M5TSzNjB3)JU8_>mhi$RD<GBL20hBu}#nWoV$DzXI-
z`U?P!HiybU%<&Sksj4T4nt3d5*=t@OC9)csH>yS9@W`L^U!A%tGqoszLfP3@g)IuT
zbAf;KS))T2|AzbC8<1)|t)^>_7WV!AUHyB7E5bg@^#C9H-Z1N%B>{YaUC*3tj^s&$
zV3a6OZp|}F>OKRPbr!0WY7%f9qnb5sG!Ot_h1`;o`WSuoFEh|U`AE@d`i==qxvHZ;
z*<cc=3@UWajUY>#`H&ocyZ^XSS+2-xAG7dznvTaNf?pWehsIH17nBVk6RswN-CUF9
z`_^Lh3EQG4Y84(bEj-jpGoOJ(RBU>E=jh_2!vq63=r7$YS#fVATV9}YLP*;bG~;9c
z&3*k$+L*@wY}1}k&ElhsGSv`B@AEe2RIYBm`JOgcHJ;<-C{qbVZt5hQ*h88a9Ur8E
zfL)QziA<&z!_3IaA>!I98+W0s+?faNSY7Uso!6)m=1Dc9w=7THTnrZIDoffE_%Fx?
z{B|X8u-d}PphE*U0L}qd1HLY-iwcNjlN%CzZ|hdjd7_xgf~sNDNvLtzrYmJYleraM
z%R6^An+*HAd-6?hT?5vsb=80F<E-RoGd#NEa&Q|7?4i{PGLk%sdQB6euCe<uot*^x
zD*kj}J@7&cC-&x}P$nk@tC8uzyQw37uupNi$&RTB$SE2~77L+zm`yKBQ=$~^9lu(K
z4cLSZAMjFz3@k@;MTyX!<k1`6P8E#eM_v=FjdjrJX&BM)d~J94X6@0CwVc(^D6;S5
z+BF=D<7(l}3QQy%<=bzdX9s}p6dA#5ra9DDgv2!^D4qV|Q+0XM_{F56GIyIyW#-^P
z8CF&z-yajZ?p(jWTCaj>0Hz;>O5T3@9M9O_{`{Z+wCnG=sEGOZr(J+#eUNHV(=rUS
zknA@xg8C(D=rmD!0=X#^t%f16Kz(m}f_O<BQz0u;+m$)mB81n~R7}`${atf|)$ZO~
zb-PrlqFS`x{XU)2p5qHq?w4y*Gc=;jErqun2wbqCp!pa<#EGM;OB*bt@kco@GdI@<
zzoAEKKRuAIkSzqHiKJ_->o*moXWc7PfD0pS<OrErFaEJ1Rzdk3XNkwEmh~zdpQD|a
zEn<J?ZkP3M^M3vJx%SX)=K1&Dy~pGnh>+Se?a}YAx>W3|gsxOwAdnv?TS8FOui<|Y
z>8vzMJB?j~={b6QHVwBbt!u`RSwp#un{L`;oRD6B<EKgD{dbWK`_r<Pk~J^Mxo6d5
zUf`h-W{a4l4jiUs`rH4AKBN>X0~(sx8#n<!Y4?2q$R5UcF~3|E5Ol;1*nkTkUT5Qz
z+Sn=@iAE3ll+Pp(s922_y?J99nC965@hNdmNC=iSogOAcA|(-6^DD*&G1csBBc9QQ
zz{Yh8!3bNz8p>?ikxZRl#4u=!B{$3!pt9N;vm$MK*V2cnZb`ZOIPzQ{P|FXMU&+oX
zo4it}w^Kbh{fx=HhURU1Zr=CI<(YaKEM>obYIKNN8s<;*lAQ?gth^Zt*yi_YQ(=P>
zF!yL!epjDWZCoYIAX=EkE<y^i`}>d<rj_Nb3G!6<FGP$;-b{vI>_VQ<ciRJ`e>kaR
zw2W(0J{Sw!NZpAC#X~ABymiumC*xLQ%rWZoSK4rVRvycI+wA*twwcAuzLR&YJYk7r
zmNyh*3{XZbzF9+CM71a;R+KgIa+*cQ9c1;KtnAv2Auv{3CuW;e(f%guRpzxPlYCk)
zZNwG|ds=aBVvpc*hX!{w5*UX;04yk;buJY)n^ZmhreZyr2GyzXf*<~fP!TU=2hyaD
zXqv1I6KSkx5}X4{aoQ@f(#^#V=TkyNFpYopKK2~5j#AoBYf&!64G9kKA-2ub6zB-T
z^WCZlrf?yyu{l`l*Y3mew}}RKHdl3q%?uGf+8!XX&0!80J3cGXB2`dxH{#e$ayu^M
z+(M**^*&Wb$OX(0^&&S|WiGpz;c>FP`&Vrc9LPFoTwx0z-x#?x&zfy$lD;oYT}{O2
z1CVq3xxDXce`?E@1y{)-=#$<gkiDhTh^gAJ(s%#PHm+_cx==-SEb5#MjFYCb!gFX=
z3@Dc2e#yVb#po82w6g(EN3#S(+5;ggB7ug-Y#8%**!|RJK}EQ}T#tG(5^CbdiZMi)
zQjI0AHi$T5#>y(OG{+D@$|ZjW<Z)Nw02rN8qlo4?mH>*TJ`^|6Rxl)lVq)l3=>(f(
z!S97nYK+d!6{It$;efDcYOjlAJ4K8$5*f%TBe<pKKmXG~QKOKdNw;aFGT*r7`ybWF
z+#8ZPxdI1E;biF5<hm8SsS+IxMJaD;jn)+C5|avOO|3;DE@}W%*Y5inV~}Lk4&#X{
zQ`{0(jZ(UUxD`jF2WvVw^fpeji`R+S-Mpt_Z{t>jVTZ^CdieQdKdW;ld?+x90J!3W
z2o+C*g2C-;%6HAmfiRCF8D@RtImt?WP~gi)<zke<yGHq9ac8KRM=2|~S@Rj|=1^8i
zcQhoS@4uft22~_8erCt~e#u%WM~ujAV4GrE6JBBDY4{U-)p4L)Y6Sb0S8_L*bh$PK
zuJ<9<3)+{e@{$)N1}-vn7(tmdrvy7%c*t&2q@34RLz14qK8(?xyG@7y>>qu`b!~DR
zS$`<hZ6<BMn!tyN$8Y708ZK%dM#^T|3V>@su~JP_!_NdFP4}NsZ9tVDe-B~S+)gj&
zpGMF3DjYsY>8xf&Bi&aJC@7^z0dSzH2$nfC8O98&t;tE`QiX4r07SOtMv)0WDn5R8
zLZ~qGSIMgOk;`=k#@?}w8_sxym?@kyrt1VWL%Yc3PWOm_j#SG_;mwY_k)dl?%C>iI
znH<#Tj!3beQM`2Qtl1<xoD{!_KLvolGoQk6p~g7}s70HmFiqu{-j2J>f{HsKLGwJH
z8rZWGG4_{+E?0(OSkQq51E<ple&cKaXb4)9ekj?b5K1w1#zNk*de2S`-b(RuLy7=N
zw|6q9GCZEU@sVC2ye+$SG;e>;4<YRJ0|Hu+amV3kU0GNpc&W;}J-ji!eiD^K1;AF6
z(6Y7kE<=hs#$sP(4(QTDd%6`pW-n8*Y<mV?lGeq&yYsyEj#T_$Gb<h_@j*p5C6Kn0
zI2j^l6eH#brPHEKOK#Mx&Kpp6y7PF&VeE{08@CqtB`1cklDWaElCZf)xwD6iGfif1
zzt%d-Jow7XvTEvA5ymT8P3|q_NlzaDvU!IpLldP2)mU#{Ti<GJnMN4xSxzxdP1+9v
znFl{Je_H!qqvg|8*g%A5en0J7k>lxq2}KZu_V<6Tzn{HFqbBe}@9*5t<t?|XU%Lqj
ztdQDY)Jo)3@HlOTTL+2<NS@RSxx8RBd#Ol%l;yn=4Me@~&x&-a{~+V&3wC2w++~b9
zHs?WT^UR*c&(HNYzW?+6fB(<-@B8=dYWc?pb8QjHC!iu4{D5tM&Z~S6%%)9Sq|qa+
zpwcVIv6y};N`EXzpX^xP+ZNPp%}b`Jpj35QgfJFy9j4vN=W3#R6y|y9MDqlZt(y<i
zTJt%oK+vLorrY7AXo+$XoQ-r8V%*E&-{P6)wevM>UVXaf1NM269Ri`mJZHp}s@uRQ
zi2s4COcQt~NDN>}TSrOwa1+@`M#U!m7^Nr{_f-)MS1XQZ)+BjkhnjLKM7pg;n>a3B
zt7nExW`Mwz?M>uK+~$Nv=%E{Eu>?4qP|}{uh9e2iKL{4$1xbm)iJv9By*Xioc;n=`
z4lZw#$C|3SNw$u%9Al*VUM<?78G(t`TDhhub7dt<OZgno;hm$(7KM+Jo<>6XP}+B7
z_~(Jtu%G{o{#f!B8p&P@O*l1aca1QtlR+Zpa+5Q(7`|y^5;RBE{ExM0FZJ#n)hFXr
z+$91(K(37D_86DD_hMK#>mIX5|JxIj`29Z@(YVL%gKuvjU2gKG4&o<WB`hNwd>5Ij
zC<V@7BjRd#TYZ=O%p|(8xShY*upW5RmVt`)K--~C+jb}PhC9;-PRW*5`@sZXTFTP0
z_+bXdHldR^Q*6XouP5xl<nu_jKJEqc%+ci2NX0Y>J9s%?pTkUjOX9#O8N}pIgPm9I
z6ssP0R5$D~6d8g~b0si9h>NP+4E)U7aa~NoqrW%`1kcf@U}td*q=@S<v=TbZAac^;
zq3ZDREt*nl2zSYRra0Km*Mj!{We3+^hH-sll9a<Q8XIE|bD|k#RG%5P>Zv6+POSl>
zfsHV24?`OBdH!PCtSIjN_xAGnkOpgltN>ra9+V0z2I@tuX>n*EGT^AobJvWFI_WLx
z5SW?hTK7>o)9Fg2!m1#PdL9-T{t>n&vW-mH5mQ#YylVk#B=JNzW=I+y;id*sl&9gN
z%yG_fa>5t~4>1PFJYhUYEYeBb8Ms<pr9!ed$i$w$tqbbUffaQkN^#b^{y+2u^8}6Q
zXL|ul8&pQ8SANtQkz^4I0-84&eTW(_yNBO~z-*~11Gn7Bc0VTxlNbi~;$EoJn+pg#
zz;<TCDFOrG)&LGSsUS>j@DsZ1euymoIoL#*6-0`!6=tsYU8y3GjVRKJ^7*l0J?(2h
z*Ux`99Rp1p*TNP#nPHkp$;7z;TlN8z=7jl)$dAbcZeT}kqC=y-fUg~zS3KOslXdo=
zBqf0-JuU0L&w3uzhx8WwVexQbtIEKuY0nCG9>cG{@7`Dc?@0Zcm>_pEm+>ppkz6y>
zi$FOY1kVh-bj<#N!iyMd?&j)Q(jMR3(=sjboGYoGg&4tu>SKb7f@Ifa)#RhZxyc4O
zi7Y@p1B%lj3>^s|>|k{B*40scnS0E7^kC2|qccFBFKREuK+Y{B^Q`h^S?GttFfXMI
zfL%pA9)lvBN62Ri)vq>GM#Rh6s`0MA`4p9641cpU#hYI)tQH*W$TQxd5O+P*c6L<Y
zOhqbg0Yb=T?fzWWP+xZ@xrW<Lz&*6IldvJA%^E%~HCoip482iF*<{)5N>Z+%_%NQX
zjg|zupkv0a!4-|*MKrA?z)0n%*#aFv@{|rDF=tdyKpCfY=72N@xfA>w1#4)hGC;&&
z`kLxLASJJ4HJ&2ZUo_UHN6pQ1qHa6QdvD`A#xSDxcfjgYq(p!R9<Qe3m_)wYPQ15R
zaF>;N;mqA|9C*2osY~L$yP*k`R=Kiv_1t#rAfByQVDWlH1yZ%Eml$<U6-NEXBXV~9
za%#l=o-<|SVb2eX?lxJ)M3ZyZiM6bR(dq%%YDpwQ6#j;ju91a@sE!CPso79oA%1#6
zDaxwS6uZwjMfJ}r<s~KeRD4ZE(z19GQoY)N0%L%fs&n-!%S=OYM^JGPWDT#1MmNn<
zOBw-@GLu%9;nd2@MX6Lke`SV5@Ja2$ulMG|-86wQ7HN1ZmSwQGRv_KcpFb<QuBkMr
zH3X=r)EzBhJa8Y(bH&BirG7zGs~Mx2W)fBJ)ckKa#YOFgK)WG-zyJ2WvhO|nek=qT
zfs>i{?Bzo5yu?G~xVKW;5nf~_waljwSj(lw5aujGlbXFvt1e(12`~(v6sW<+9=lZA
z^QDsKs6;$OKb;EjY}#4}OgphZgS1Yj)_UL*o>HFeZS(zcIaqsmom>O$uBhi&ZOq5<
z2WGQ^HjWDqJSVWEH^WUwAMJ&7LG+9G(x$q9;YK|H?V)8F)Uj?zQ^}I56w6%2u$X*)
z5EC`jX!YHS)mkEN*uXB8<g*7uF!tzw|MRrrW0z>p0CJ(wncqn3u3Rt$=Aw3Nj|G|V
zb7*ol9y5ol58V0W$rZz8oZXGpZwAUfM#}_f0@}4I02<)$@~DQz<q4U6@;tqd{@*dK
z>tanB#KJ$C>b-X%d)H{ycZs3UOmnDa90y}i#1l&YFmqgCg6Fu<{ORu3RE$kwKa6iE
z73r&-u%oP<b|z{=qxA`37OH79vI!D7a2?TYaYr$7yP6mZ{p$PYXL!F_54gwknk|}#
z7%X)Wjau}n0hW=q>pZxrxp3PU)6q>I<(JeGP!k{gj;zI++f5q_F{Nqa9sp}la4H%u
z+zgMP$*E{jMhr>_Z93p7RxpVm1tT@AW0;4KR_nxe6a|;+s9JFlB!fZD7E{A<iqfNi
zDvCk&sgYkFG&g0#lKmb^-xd*X09b3+M$H<fnht7&pd?0%<1orE^Sdj#97Bc%**N(K
z$LiCj^+~HE?P*{okRPV?a3s*@Gr#cB2r=2nO8sGGSTiNC*iHq!SPJ(w2FGhL28kI*
zCw>K4wc-b?_4#3YCPk#6hKolx_knO(nLU<25yc&hJO@UY*{vjSTrhH!sfzoc&j9#n
zu!HK*{6yJa_b_0vh=dDs#Eu)jA*`s2n|sX}TW==3k#8U<3t;E_JTgv8el@#Lm%Qc{
ztxNqC6YfgIcorB@edNhHe7s=GZf73(m~o?EH?)w(RcsDDd!M#}^osP|gdZDEiaIAz
zbA|UL3p9El#<k3ZTjEQiR?Sk#Kn@$qg5J8=am(PYiW$?g#63+wQ;rvEbyN#&v|(Pw
zgzOhNLLz<SxF&JDIQ^Vsqec9osh`eS5gzb9A!AaK>MRjjhj+)xxW|>r@I?fNSJ#FU
zv=;#~z08L?C=-k3-)<hN_khKfxW4<_IV3QLeu=hflZy<lDg}6z*MhR5um6ye)i!HZ
zcux=s4)nC|PoMn{<|7tmTKhh23wRE%wdD*kkR4={evO)-k;E>$mlfhF!}TC0=ee5m
zo_T5-p~Oab-@5PLoaI4?f|J{P_sNJ@ZHSGXA`ZGuh!CR}?<6ihyO+5GqoqCK4#eU?
zbTlR(IJ~2zkRG(hS<z};90azizDw(;W_OjS^Cxl;Df#vEYuNryTfVjX>^pT?hU8&<
zexZ0*QOpf~vbOn=7cG@iJj_jj!E^>yYIxFl@I>UZn?!$Jt~Reruv7FFJi?ySnuvOu
zywCyyUWjroY}GXIa{^r^R}=a_EL$NQafJk?He~IC(0Cc#r`l%_jo5D6$zq)n05;RO
z#YGIuCl<2c4EUfZXzu`IIx$4v)c6T(WQf2Td4;PK6Y&h1xUMfBse2xF_{dSXS`py*
z2;>%8=8cHauDr@{=L{UMF0wI&X7BcO(I1Daykt2@-4zpaEF;_8M0v}%+1pHToOaQL
z-hEjXzo2Lr22XA2ZFw;lb0T5G%4FyDWhGn_;IbYS(_zsnu>)v3w{#rIs1YtpDvPSW
zH#97`*5hOB!Hb8A8{r5<mG<m8eYcSx)>vu}iEq~<U~qDL{iWu9!@7v)4L)NOj)p{}
zX^oMR2%P&$q#{-XWY9s$aCGN&Nup9EKUN=wNZg<|A}PXcqlzh%0xdLify`6_KUqtg
zRo>ps$8~{@4a<3t)Sj;8vF?*cA#<G1ei|KESGLi!agG`!2<nz>HlXs-_OpM+9vsN?
zT>pLg)VQXL%d^}Y7+<d4?VU9{BP!{pf#KX1fj<z|rach%ar{eiqDB4yukL-f@AG9>
z*3b8EeE;8nqIQ3;@9uLyTP6Vg54bp~sVdi$xzm*~fCKTW=fY!<DoSbOnWl7=3JZEr
zpe@Ew3cUx;71%C|hdZHjgDHbUmLPaPEOBQo;xa6Yn2ZYM9fC#VH>t8ZdyU>F1^e#p
z8Bx!O$gN|f$^vh~p%E-UqiCMLnq4fLUIVl<CltI=p%S!Ec{(xIb2(oVssT0{Nvla*
z6QoVmn{Jxd;6^csAzA@;ZxL9*AoCJWqs~3r-+!KV{XEb9`(do?|LhA4qL377angzu
zo=&Vio~i-vHjW<p1h2t|#tDo4#)+5k6S_7+OORD&)N2oGq0NTtxKA%dcs^`PBY2yP
z0JLlkWw}@i<4x?^{@2CMzqakir^_Hy$t#85LB0drTu`JznF1M5qvZfdus58tMGh8F
z6yAO23_@kj8lR!OMFRRe)yZLJilyG4cMWjlI)yO0g*tg4VZ2p3ulH{y54GXN?PD%5
zs5nPW)?qm4+KY#5Hbi}lgcH%fX|wqK;f;>=CE_a}gM~*9Kh2neZ1_b-2Xi3s8WpEz
z2wUa~m&Tj|&dbVykeZ3>rsJIv&II7s*2CR}iHb}G!5y_Z429C)yQ=A1AQF!>VJtL8
zUI&97T~+sNOEp1E*Q|!)6OM?IgXFqXd^ZXu?|4lM`M(GSL3uX19GwKw@m*3H4-nRv
zg%O=zqLK$QGUvs6z+}B4;^ZB&@PI1bR8=FLLDi!xkY5y;#Y3Y^*AQC8%ib;pIi(vJ
zp!V3Nq;+=gR=CrqVdv`x>7x%0^+yvUzr?{su|Sk*V3kT3IXF43;7?j!E9?T(je`TO
z>LH*5W6Zz2L}*@xy!E6Tbe+!GMA$lI8jYJQ228v%KcZYMovMQx#H-0=V)mB9vuXbB
zG+fAjJ?iYv!l4hj5gk(>*gDz^Zz8D`bWedD{#yLWyKSeRBQsHiieiJ_oul;Gt`Jl>
zJ$BZ}Kd12H!3p<P85le$*>0v}iN_zAXEe}(g<RsTQx?>$B3}bm8;(G4Cljbu?TYt&
zdYr^N_tH+tm{V|&5e)@2g>u{_qw~pALcTGLx`IR6?|!B?Hr0BwJo&^N811MoXb36s
zr5*SR{R0J`71Mr%V+@Fn9Z+rz`|%7H`P%&|<@(~g8*b*P3;u#T3hkJPEEo`+#nE`j
za^U;9*yuTRH)}wjCe`2jJLdDZ>5+@jeq3}xr9xYo6xovv2XnyYm|q>!-&&=6CyLe5
zkWor1?yrM@vfZ0UsSSwY+n@hw!+ASj*7x2<ZIvUlg@0#b;~`vlPE0W|VE=CKUz*9w
z^)#c9009W#J;`yCGJmZx=wUEG!A8j)<Og2#9+#`SN^OpAUJK7&QtMZHXvW(HkCGHR
zzCV3m``i2c`=Md*KY!mI^XI3HAv@%^_<pyFVlFa;)UkXtW3SSXXXbKELI53m=SJGl
z%vVw;zqLK%8Q-UebAohMAGzMi>lsfgzDFNX#_nV9>p?DO`?1zI(6ba(@F^{~mFqtz
zQs^aLJsgZ|&{uGLpu>j44u5AO@l{`D6l{cPAU5gtSVZDDGcxh*B|8~sa;2kIM3@e~
zZI&4em=Mv@hHHz2SHNo?33;z!)Y#QL+W0cI8$C1cQR>_!keS_^g%Yd?5)x1eL%h`K
z3TXEG4~|C*d=7RcmxCPd?1RT&Dnh{}HT^&YsI=8JIBbgRQP`~z{fpK3KK<|eN0Q&4
zG3-0tpC{tE3f1w_Y^^4frQNkY+q*j=C}WYh1^ff0%AjM$yo(!>p`M(a^7DVy3y53A
zjhh}@e4z@*YhmOx;{wSMZPR_EYE(5Sa2&p>vW6*gmh$iBs=RGG{!L;HD{o$t<=z9;
z9yPgp>N9I65a%Y~iC0R6D^#y9h1-cczPNA7Q!gEl_-~qzpJ%h=axHm`W0|NlkfN*Q
zQ@sQfLHXenWkpHYk#vf$MKG?iHZF2_VRgSVSHBB<cs!2=dF^G*_s75hTYLV<07wF^
zZuP)|&Psi?Wg{64NZ=C@Z@o)}PP0LizSazVFx!|UotH<a^VG(7?_P-1c;OazLOrti
z66k;=(YGr4T<oj$j+yYfw8OgS2&y-Ueia&9-BD-~Bq8=Zv8+5U*ANf+Oi*<n8mCZ0
z;RBvUg(_5G<g6i~$EiRC3vCs}YK7}pk&BCwshec?2f@Y7nonW!^94a|y13_~_sgj&
z_Xw<DIHVWQVP7Z?wkYVDG%mX44{cn8l@^-u*TJc8THN`pzV4UX;Le{SF8KKvK!@MU
zij(&|PaEIs`BK)j_V-1xytjF^(LH7O6?sHcu;DD06_wRo8?4&(B%9z(RhCkCcFG(Z
z2ScGlIEnh4cm=cMmO#+RV^)!F<W|bd|Eb^tOe##^W`sc0+U}Jq2TZ|&3~Pm={ah!Y
z0b1^%swBFWnJSt{s4MzQ!df&?2xKtvML3NGX;Ly;Tf6==$fM+bT^re9TGjP8D~X57
zWu07kDO^_fEy6Q%RWmD4im2~LBJn>{Vwq;-o75`s_#tk8QvpmpyGAYlH&=8muiyom
zCl`IkG$aH~K_Yg7fT0slcDbqjGPjls<XtiL3D+ZHlJOKASY;TB;C4lQhS+=1U1eF2
z%hH~3gX9>df!7#DdWy7BQG229ihi`1PitlL=jX5Y9^>2lf4{T;0Fn*sn&~7tO{iHz
z9{?bo2AbYkX!1P7Y2P+3%!d2WXy9jGu`q9MO#)*JsVQt~DnnQ}u@&YhqTav9T^9+m
zb+t&LvKpQy8o-N*5P$662woyo-56$mV(~p91&_P{vYU2BM45ZTUBSG?0AMZZq!bt-
z){WbtGI%Oy;mb+#$?VQhB=a)wxjZ8ed<`Z>6oAD@ZZP;H?OOLfcY_zloE&WfGR|Hh
z5G3rJl#{Lq*Zu&vn9q*y4-@ldVO-eXF5r^e!aMmrm=U_#6mR+8w+X}k84brcibxOn
zP#bI_(q4sMwNk>Vzw1mIJBuIJ?u}!ay)QObl%=3{!RJpVXh@W5s@M+QF3*!bj+gcb
zZZlX`nH}x3^f??~r>@MVf?nTR#RJ3Z3)bxde|tpHmq8_EJ#OjjdEOX}NXHz3m8jE?
z2v1NomML!p9@X{;yt8Wlz*;Vl7I+Sy-(DC+6U<Mm=v;Dd<ZIZ*=mbJU9ntqJjpm<5
zKmHhFK5^IxgH2O06@`}(=Ls=azRv5FMaJf8W_p`>BiE`)l-bawAi+34H<^|?I85Cf
zxR`q8#|yB^Tu4(E#<t+wb6YVS>ItwY>hzyUKR1*I11$1T;ln!Cnfw8`Md#4q6+v=O
zmQ-5ucdATz2jop#MAtcJ)qeZ#iuPa|6KcU%*%)1g>y{)Ozos~jMO;IGyzZqHU9*T6
zqO35dKxgWSkpsn22W3mj3X=&4(3mroinGm*9W9NkTXe2}Blm)f?~@--T1cjdslFs&
z$yJ1L{02@WmT~%BY5lXnY%A`~a1Yqbxz<c6R^(Xk&qN71q+*Rc&b{a8U9hsERgbCF
zPTVU>qgoVC61Z~o8o@d=S~z8ypp1E$q=<{F!{Zfs3H8%0p@WH!h=}nGsvT=rl=D1`
zY{QBuS)sVwtE!3R9T%VLbYGB!%@mcRFJ1H@k<v;|vK=_6>Ry-dTk2B1h-)ylkpTdM
z(kEF<Hz5KgPZ#PJ!>muSkC;UOj^^nf0EdBJ6+IL#h+zweh^fD*`;qVecU7wsZ=v#x
z3GM(A(s>}GQ(x(g_XuMN&A`m$<Un`z-Dj6@rM@gsM`pI)%RbQOMHeVi<2)Tp^mf}9
zZP(&Kv==iFE%l&(cm+yQM<Tr;v*r4@H56_X(6J<{m*Jtkyqqd)bGX=lFNfTUp{kld
zYZzqkxPt%ik;gNX(3p0cpLw^Km~Hp{G?T3$X7cWFwO}C3HJ*O`m_5_?Txk~T4{l0q
z<Xm|th;G`}w(g<<DEbfyf4!uKa^Oz+Q~{@kL4X!x>CC;(FcJZz8g6jeQ5zIQ+n(Nm
z4TN3Ac^ldNBBB~;V>A3>oiwub=0E?l_nf8uJbU>6{E?}KIijcDx0{X-WLBF>6cne|
z_YG6vC&pq16C~p#<tTn42`YW}P^_q7S*+1Q^8hgYiaM{z5E!4CIqKZP!k&ErheEp@
zPsssrG7t^CPM%Y-fB$bw`|+Q@ZUflone3JbWjv?g*;M4Rt$th4oP{f=es$274qely
zd?sOHF>#m{Ur0t2zK}zDHP;8AHyuz<b`V!HuO-_qc@8pWM9<y$0iY098I79MC&z4;
z<7+M;l}^$++kYESz|$idxyxvYW@>GNQA-1iu~kY-%T0}p)Q++MxH*|gnW+dY6L%A*
z`N}mx3Z~cdZnnU}TD5?pNf<{P?)9G@SGy*%?Ls)cd$JBh*b2N(JS9gKw0E2uLS(TH
zB}pL;d!Bc^oG-?KH>V$zx3`$W>|r7F&N0N~-`+eULaNu1(JEvug#r#gk{$bq>GWXi
zDN2sl2Ml_b++xEj)ON-&v2o(t$7s)-OgZe+s(I{YHV8T&_wQ~Ob`xV#t@@O(COYKh
z1k~q{X4Bg69-z>n@JwmtL87d|#-o<;Is|MNVwoM&7JJfRfI7rml^8=0+W*?Mzkh$7
z>4F$P2vN-kOE%AHXC_`=Du*UiJl_SYhTYdeLtj4XQ4TFwW%*rGMTV$K*Z+aO7~-@6
zI*$>WZJfkYEy-_^0N6n0h6thZ$s#?wTlBrZ-k+!abs&HsjIfZ?o*F(mp8fryO}q3x
z{h@R4`&^qRp!HcCx>D;9PC|M-*CN-zn3Y+1l2jV@`Bz<$;xJSC6~J6BH9M`cnx!_=
zKz(>@w>g889Izuy<3_1u)`*}Ge1f13e;05TO7T?do{S7%v#Zxa`?{M;-zRxoE}6w+
zG|uG^8{Y!ADJHaI?nTn!P|uU~%_hBTdv3D9Z&M59K;Skc`5(7u#$P9|O;G(wI%^gN
zlr>!mOkV^g93p1$OB<+};4|nz=7LuGqhV|Vm!<g~U=}W~bGFFQ47pnOvDQ0P<QC&s
z?JzY$wFQw>PaiV^kDAtL3=ym8-+zuH-ABpnw9h8cC~Aq%nZt`<T<g1PkN|!}ZE;1Q
ze-sU-BuFxQx$0r6JgAR;ymf-<gUWjX4_CCr3R<6;SbBN5S6xCYj(v%)8783y{<A8T
zRTn;_O8|QOfTpe5XhOs>a4?Yd$Xu8L9k~{f!4rPu7v37FC5`9LDE%p#sW`4D{`%~t
zT~v_fHO-hl&d}0H-V~H8HQqf({s_u6)3TVAvVyZJQ_o!_gJg=?>9t}YVrx+67@I_9
z#P}IDErw~Qd<Uo>VPbI&Bj@}+Gv0R1YCNvd<XYdV>J9dEFsY?c%U2u-tN!Yj?QLGd
z?Ak+A-ZtjdJK|RB8x;)gm$2N<8v=zQnhzIQLgS~z0-p*|tB0B^iQTH5*k|t6D76m9
z1#WBYyUC+{?0#KtDiPVDzN`6JG+ubZ+^9uQT#q9uO4g2RnRaUgQur?`%jvK9MPdoB
z?}EmgW+l&JyI((hxBYXqvK+2ZSh6wdjAY#bHeEeuF%%1ahnDARLr>CzpT+Am2gcn`
zrApw2?BzhyT}<S77mY9v5q+uHS4_o<m=p340%2I!*`gY-+F^lkC=LL?o^bg>sPOsw
zsY?1hxDg|j$b=bQ2)9q|LSDzOdNeGBQzUj$j0{u6HJEbvc)B$|)Jk$E!*fD#tY|SQ
zDzSReF3S6}h>(>fEBE!*hX|`b*NCIloURF=UX{!{3m^f4DdF~3&+%ZgfmFEq^C;oy
zP^;BdCUDL<a4l)wl_g!rP5AC9z4g&#C=F!wQ@d8qb?}J;%tk>nY>XUG!LzEoLYMMg
ze3(|ed8dqeR}GC5(|#6Tt6GyDmFxh1;jV0e@o?xISRxKv$+{huxj&XYBCPsAKOWca
z;0yiwGLTqL{EdmqL^{rYAg(0CShk770N}VTii@0rwN}rYvI&kW+go*ZS6P~$C`Rvh
zV?foI{jWoC_-(C}-Eik^Qxk4i)vU&u)t^H_TBi+@;i$aayDS;OGW6rKFr0ROYOyx6
z3=dN70xrr3atpc|y)EN69Z-<qZh<w$Dz1%@<=rR(t)XzY0=cQ5fdE%C-ca#+v9*BQ
znE35(u`O-$=1l46+miQYUK4OK-O|V@G>Vyw+FYNxx9!iKjYh8R-{#mOLk1$8M!`^s
zn`2B|INv%)`~LU4^P=yb?@~GWCYMIIk|~wRP^clLpU1!O$IQ^#@U}O%$zZVF#az&S
z$!QhM<G5C}cWmCf`H6p`Wxl5L97ME8eODP2pGT`_cy%9>iM?(Axcj8B)B#L`>}nb0
zUSbQy8)r$!EzCEcpU+tf#x#l-BC1T)&qc3O-%TQay?=?bOu_gJ|DVa$+q#-JD|4xp
z6a!Rvq)48ke+dpzuwqHDk5WwpIEJnH9nMS7!Nk{pGQggI#|P?7Y$)|AYbnNE2`HVz
znVMd!Vpb|yix*FzE@*uG5l@oa=2Q95fRJ~uY(5Ck>D69z!9glD<!e|}H+quQZL}cn
zfX0%9s&+&V%z1pOLlop5J)#IAb7T}NTWPPVT3}wLpts}H-~~JF_cTk>VT5fF*kW58
zqMOequK!Hxt)%FqF)<!hxNe+fDi$&~7h}oc^ESw{s7RE!8n!B))~+y;+u_6(@?V3P
z9kyQ%{53c=k$Gx)xf&<u_ouY)z*Et&^L<97XaGN~w5>^oO7zWW>I=X*5Ot{!11`p5
zwl87-k&c5)Z_IxyW3j*N?buBG@j?)d3nl(Pg%s9`QkFpQl_&qTRGKU6%{NWOrMm*b
zD7eEwx<t`AXm)`SCt?zKErrQLl;DI2p*A?p?>8>>ebg8g89|iXOrXa^!KQB^<3+~1
z)Yz_#6MK|440uG}(J*ST=uJE5@{PAChx5h4zWuj8WcU*#u=%>rq{-7fr6Up7#AC*!
zgjY>ijEbc2f_RPt<}1yegl4EJu}>h_8U4BWehrAJqnvISI|Z7Ng_W;Xl6&%b#(u(k
z9E*T!Oem8<^5)*@@${#e432-tyc~p>07mm7TCo?GLI?wl8m|Z&k{}7i^S8VFT#<|@
zCvv;2eLee=CcwJSK2gCmv-iSTW-G`jM$#=&^R-c;5A$Bl#on=N$~T1@U~RgOeAn|`
z-+6op3GW4@wPa*~lhSgiC}WUSbwCGq!=5$>#vuTnh)zzPxk+*Xv?yEm22(ze@7iZp
zAlc`*7QFX!ZjS=^l08j?LY={ygZwQ%&pf6nU@??`wux!cOvn$Mpy(jul$>0a!Zg+F
zm^e-j(aiRh)0o$@K}Id|^|Kjk)h^;*^`0EJpjJVpfqhwN;bcQ&$cja>SJYgUoYYD-
zMfc&#`YDgV(<3MY*hc1srh&<$`)WnY3fEt}RxvGLq7Y?bYLUw$96pB0(o$W7ToHg|
zv=P3{R^WYNe(jsKu=d|Q$M?Cuc%$wnROV`}&hXUSyo+k7d`T?i#3^GXKB+CZM)q&c
zw+olm_9i5#<O41ko*w_0N}KBS9UlC-fLfb)GSP+-6>#<1V;qCj2_8^v<7&oPLmXf`
z^5=Xhc1j3>s0W(_VDt2D1~`QgUibackcK1`1%(oqUPM1@FGCNLN2L_4N$Xwz5fkHJ
zSu{y|Q*?kKvK!UdBU1|zn~TWe>hbe4XZ!ij6Rb>Z?Xm>9B2j%2Uj?{UnQL{yd&|^V
zx%dlPX0b4JYA^;(UgC(R8=Z{UAgPF@7wg@rO~5lTr;GinqBTwGEW^sw4W)OB!)~!D
zX)wq_?FJejh#OEnn!1HU_+_7hpQ^yoA&Mp{W{FB7O=umbRpV6s1=D5PQlv1sTz|y^
z)RD;51rbdRYf5v|r`~go>xYk(U}o?CKmeQ1MYw_Lj^<n2ymE4uOBkp*%IEiSy1yjE
zbo?^iY7$}slJ5Dj?(o5~HxAX{<~F&dQVYseT8O7v(06tDoGWU=o4;GNE79gXEYq73
zEx;|j+@8<UQ1@Wkc^0~iXmc^Rk0Lq&HyWXAXQHx|Yn(2Ih9Y9pcaF-34+rUUST81u
zm06P=SNQMEy?3-Xsb~aQz@ymWM--zXfDvH`yK}GrUibfMt^th0e6{|AzEPP27=#Fw
zHeJT4IH|^0Jv_7!%Yv+=K8c)#Nb_?5E5bF;9HN)iHikF&HWy?(gR3_#owVrO8UhyJ
zgZdC?VJt`nF?T*RC=)}oyi9g@)+4D(Y8VipSoanOhK>HQ?IK)~Z?zs}zf369EU2t%
z9LWH!Tcig9372h_VdD`@pk1IgDlc%ZCt$jJf{)k%%oenLcW*DDdPYI0sEu22yw16I
zL1ME%=(nZuTuj-sj`)t<HBO=B$&GtY{*39I5<gpc+<Zn(3M?bA0vSz-X$S%7`!H)A
zG=|Iz3AZYcU;OY=6g(rBsOoX6UZS+{-KUGj&Y6iC=86titBl@m@Wj__A&D)M9;k83
z4-Kq)HnTi?%b&A7{FsCOP<Av@0j`pP18s7I(WB!JZ06*<_-sIy{)c3%?X6H4M^NAS
zn)o&d)!??nFf%~NtKj_1uv-k#a1FsVo@Jf##|dkHwTGGu81U!}vmgE9Ek|I>41sT5
zZO{VAk~Oc(MbGl!Z~UVX!5-<Zm}+&%Atg9Jd;2)=gZKQ@vOvGc84%SyCJhT0p1~kS
zoh4*<NVJw&@4HK~a`JaUi-p6gR~FT5v7tdm%~6HsrXEI{ZcG!W^Utp<Gkd9JK?BWt
zu}h@OFHxIY{<*F(JO;^^%C@d;yZC$6??pt)xO@Zi3o}h;k%tgv0=C>I@sq++J15f`
zWjSW)ETA@mLzqt7QH}F-ZFld3=Ig=!g6SH7a-)JZaXwnANNguxD}oM1-OANffZfl{
zh6sRNV^$cx!b;Y|hkZv)*MR+B{M)YP&viXx{I$PlBYe+wk@sYxBHpstij-6*ka;&^
z3^~F)cb6XNS?^yh2BUA1uiWJ56IC=yjcr=@GWMKQInNb`5G%{zCv90-qmhTb5i?0w
z-Na7>N(n|b1Z8dKo(-s&Y9xj#d(o^_So@=6-&zqSv~6<b5$_<vkf$g~(7p!{-6~PI
zQ6>uzNNl&7r|BY_TD9LL#4m$e-$_E$N(LmWW1HHz($1wIM30N)WM%XL=@Qd+5$i(I
zgg19Zb00bp%wL=&El8E=GoBj5RQo$@*eqRr&(147qm+A%7&CkNN4+87RqF4H)26H2
z?Mxx^>r|FtZqaA;GAV5U>`UJg)0LGy#A^npRRT(sC@<kE8J@rVCszxvtZ$pyhiXXe
zT@V}jvkqvgrbbQ;C?`6JrRcd9<w_GUMw802k#2iFWiW~5<<iP&3V$^{WJW87*Ypf6
zc!Lmu=a1<H<=%ygSBjPe#Fy5aolF<dx)6~h(xMDjOO51s_;YlkvTR^dlf1sns}&sk
zB)#vY`oLHoi`4pUvB)k^;vJqW5P99}SZH(UoGeINwmHdQy@Yo9<6y{;G`=!9DsNaK
zOgOxX6oN(3oVo&z0k=;e3@aT$<2IrdsIF(E&!RuoQlxZ*VcE&Fq;8bcaq5LC<e6A{
zzXW)vQ|ZI4;zS}~Sf47Gy<h>P)yF5zb!PjyMr&V(zxZs5DXK41;l0$Tx7+42L%X$s
zD6372iHjUI_cXD$LL6f#Z<Jq6Wi<kOdLR(<`DQ|%Z*&lkTSFwH`_R%YRGDa;C&GR9
z;Wl!#y3|C4-9$dhl<mpyvZ*;WC%I3myP;_#m&I2{J?C83Wu&}Hggu9O<)%DT_a=xr
z69-*)%sEfvCk0T{00kmyHg6aoEk__c^?-DO)}S)e1JCL}!NJvlycLdkaRBwm!xlyp
z*O%`F84LT1FDB2xjBKNU%<E0TLBIsSs^$(`Zz6t}24RLrdu)<DoP2e0wI!f@xd<t#
z*PC~+dEV-z(k?G@NsNNTNaSFIVp^;Db0gNVvh>%IV|33Y;mlkG0RcJw#@rmO;;QOx
z#!l*ksm_gIRq3ko6M7m{wD;?;zg&yjBsn(P*2*RK2ck>9@y}+WvuiMxzkCHiR@KpH
zD_LAP@fAY8$Pprn+&lV)N6ksIRhqI%(6nV0zk&K^?HtE*)W+k^w>du$NczSPJtN|Z
z^@5N0|6BYUJTmT+OaLryRj_ahi0GyeyyoIi#L(VD9s+~PeE(k-$5oE*G~06&Pxw4L
zEpZE}1j)^Pa)B7~C`vToyPXY7#wV=+5m~TsRPX-I+d?Z)ZSsUUB5|C1bowp(-ZVHA
zC!QG?`!RgRFb$rV*jSg(mT6E5xI|YfQHA&>iqO6S-~ru^r7v^Vpc^(Til4IKSZr01
znM0DEf)^qiWI2r*;hK}AU1Zv`ednrCCyjtN+(Tr!(QQG8Z;fvRVAXfW^)uWGPq95(
ziZ(mGgBHI^UjX<tah3+eN6K$=<Gnx^A*f-xX_dZNTvM`2S3z`U#^ZfNp)O}3!AVKs
z5c=KbKn2OeV?G|8#2uYlsZr!^)jHX5at)f8><hJ*6Bmj5F<6R1c-*b@mx@ye?%e(D
zE+c1O&Gh|K_!N?-g+PdWTBgBLWYeCI-OQ<mquiz;#L&XcJr$w|;d@WNzH|SVu);Nk
zb@1};Hc+f=A_AdOQ5Py0xOf754pM3`hqpm}qL*GO4k6X@@4dhn7KqSsuREQen%1E~
zv?_X?nkO}yk;!15F%jkXkfzbFg^wp<Rw=WBfC@S)`L&iY0XhI~bYw|W&us9(fl#(E
z!B{9mk)m?!z}oC%CRc&?8&0Lz-Ms$$o0X2@0*mS~92fCDR+wHY=BDPHm7E=ARg<Y2
zZcD4W!aRAO<gvkM<r%#dh`n=udr`L!jzZ*XEjZwAh_6*E<PESqG$HsBrBh*z!IqqS
zKkM(gTz4(mHS(WDW!R3B`U)?(aNMvWLR(_0!IQdOVW~-s7>+2e!G}#SWT9fqVh`)2
zf0U-Zc3qA9Mfm=X>W3D?M+m@|{i*NvgPKe{Q;iJI^|&=gwmS6VU#7w({R!(2rRbzA
z;<}r~Qe0%kIWY`&Yg+S)2Q_eym~NLw#<#I2dC+zNq_ZLd{h}}!&qYj(YIV0OL;1S~
z;8K(+P&>50@8d6V-r^Q6q1JP&F^Y#4-vyo(TTU8uuJsQ&n32LSjfb^!eU5bi@{3iF
zH=K4NhBib2YTeQ0A<fM23J5hE1Z%b$c3`xV!dPOV)*1@$k;*?=MPggoHOcElDXdi<
z!i98|K!pGIgGwb{xR$Zo7v6mru{B&R8k&L;Dm<hj+@&B4`Bpp1(xN+J(G~?n(ZAhB
z@D9)=oI5u2;UpV#>)W8W<k;3mzz~#eXzuXo03L`*iNI1c`z%L>4~=_0kwqA?_7>hz
zW~r<btC8(Q&Gz$i_3!-8-`{inY`@T)-uH&x%eADVzC?W<qJ@qQUxc(8-T~$bh<9n_
zPI)1V<;FWC&R!!pJyk}iQ|hQ3Z!^Ebj7ux+@lLmick7c_mmF1iOaXrlznE6cKyOzq
zszDXC!m(0o6+~x*(?BFitkgxgj!8Zxf-gZ!_y^{={9=nj#gr&Ym_`pkbfRfR;)*DN
z0pGHGbm$6kUC%ayW9tN@Edb!VP=tggqh$i~@_BRYN}lj%e1p4+>N91A<d*I06yASk
z$h0p{?(~zeMk~xQLUMTG2!MqqjCoi_@xxnnE5a4SS(eK)!)p;O!%XC291VWmbrZIM
zTvSH~;}gBo4B<p22@;ysb2bB1330++^s{a8kqZy1Mq{5gbe>2wEvZTLx>YL@b<n0*
zg+(D9#oOqB*28^l56hD}EQ;q`pPM+UD>|)kl;$kA(Z}Q7{oChH;}WVtItZrGddom~
z&DNEZUDufAVrti_Ffo$K)ma9&O_iV;t_SxiEMA+-&Qn!`1m3R3)2JtQS%IvI5o3A-
zSn(O(+1jIGjhl(p=A{VM%)r&vUcwBBn4*N2i}3E{NE|WTdFWEEqx}4)<xMaoA2G`L
z@1f>{=o&Cc=*I}qOjo&Y<~B9W=@S;{y|e63d68*VWX-~{jT9k*_RJOw!=WhALi|pX
zCqSWZf+z(Cx!^;LmyL#Ly8iM9p#;B)&&T?7=Hkq(=AN3kV=<HT<H+Pv2z9E!LFmre
zVl_|H$Vxz`Q%Q&*6l7QwS|wXJajgxJtX_qbk6bk>MoOJIJBf7~?xDfQhZZj$Cq05W
z6k8`d@87#Fs3Ca5bf0`tRle|QqoYcSy@&VNJxs>=EJM8)S!h!V?>TDXK1By0rfbtg
zM(<N{3O9iar6ctI#xo)uAwZap;({w;>O{rrP!ScINV;J~3Gd3vf~_G+ht!#%O2IBI
zP}yrH6jOuAl%*5eSX`!Yv3U2BdYlJ7@DN%NBwwPerz}F5#_g*h{Q;Dqwkt40YMqJ*
z`7Im`hlR7+#P(o2M8+CHw`hZZ1U8CKI?@!OSKVIq?Z=yO?QelnGk2d)-`DqTkx0nt
zHxf12aIMljY4IqpbpkR^x-QT8ILk^faDG===|DG^);AGIxT=$(LZa3m6^x@1*VNBS
z2WfcH-&rNS6X!<{tb*_gT@d@nC=KZ3>x^0sdMgf1X9-s)Q}8ZVGfsq%>>xx;=mt_w
zU4+SHka@h<OTcG2+>};umel<x`pGMVv~ou4E%qPN$-}Q!<|NS*?NuBo8-EvTW%BOk
zdr(y0phQTXiuCV{J&M!~HqgbG%FFvRCa-es9%WwU<H6N1(3rD}%)v=uqJV^>7aCm4
zKrVo%BJDXNE09&o5qba|GhJ-^*tl5JB3;4HB@ip4hR?th?e|PF%i1(<OmH<h8!c!n
z$i75wTaIzHxcV&p=K}iI+T?3%I^V<`5KHCd9f)^Rou9=RP9?L>|LSmm{%8OE%;)?3
z^wHuwfsaa!wlj*C4TPa#w1?G-06;hfPXT1t@(cC#tkd3oQ44wk#b1OUroDg=Ig94@
zJag!p`}e=S?69H5cB5VUi8<jUjrlG)f2ZJRxiHQ+p`R1?-J&4*vCMcLBrEgAblvk!
zBnsK`J3Bd{gA`0S-s4VUq^@=9s3Vju%i=C%VjbG28ao&3&{d)e>a?gqN;WBP#`U$`
zt|q;iO&HFdlZkUj{{=Vr8Wx!ZU_fqWx9@kpt4RA$`&MalK?67iV-Yirh`2`HKh22x
zx7fzsazZ7uhqu{)CmYp8F~E`EE7JB2Ob>ufPT88TW;M5je<?Jq@z7-gHib0}Q=`O6
zex2p7DB2&H3_*l2iCHG}5|pJpTO63II_&{f<Cjdla8)E@B>PECudcLx^1@bdL_$j{
zlXngp)MgfaFJXMDP;-6>a=^>0Nmj5e0%q8>ssvISUnNk@0dw2+EiBVa#w&5k4W3nX
zeyo?}VW^R;M|p_@$XaSWLamYh^#Jq6si}npv|bQYUN@MGO=TMM`R)RZ?je;kZ1nE)
z+8so>h#`d!S3|3tDQ73a5&28=*->IW1rI6?3??$eE^=YMCO(4(P*@HhsGiNZ;Tfe>
zy*3ERym+zmJ`?J9|E@RZm2Ju*h#dFy+FYs|0Ry3C8KWaC1hwgvT{uB>(O2M6G{dJQ
z@x$Jg#8N{wZvJiW?>tl-we4rlhQCmf?0~kQw{jJHzR88kCF<H^oxgH)0ThYf_jD5)
zE_@jgzJ|j$t1!iV)fpl0lxD@TK{MjP#o^b^N05c1o>qUMKxT|6b8I!2Q5!l0>iDdm
zbBai=7%rbPi!!3<n?v7UYXGjC)Ma*oA@uxFrf@K83_=w@u^h*d^iGBgFO*OS+D=^|
z(Suz~Q3|}%e!iVU+7EEU)a&bmIVLzj3xgvH>L=+|oiHV@1ahDu*I%QlAD8#jmSuZ9
zJKE8-DsfJZ`~>hgA=G}TB`z8QoZ*GrPK-(cs_Zp8BIqw-%3+$d?K3DNn?%#I!83zx
zO(;~u)XYfCe`46n?{TY8bci(Dt~T5oW9Qnw{59<Tiezz|$69BU`_^*etQ=W%2F1i@
zHQF|tCMA#XQYrTbl`i_A@t(;u3Ss%+o=7KLpSffKclnU9hFwG|N?PZ1#YH9nZmP(P
za%x8hKuXORKCKkbo<7AxTzz$D%>Co!9?#zY_a-4Isl#2F*IcT8AHZ}o!(PDlVYlG7
z3u`oLxzQe<J6Ca=O$oCTEm^!7%n7&bP=O6>jp(qqT7V(Fw-3nZlTQq!pP!OURe;@;
zH%?39eQaJ@`#q<+yQ}+zw!o2Md=-EcvG0Bl8=G)L^w4>sq&|CAp&v%@L`EApT?7Bn
zh=A&HTh&7Inl1F+S7gEig=c4gcwmf^V@xwI7#>&=d{<h6AYYmv=P;s_!#q!OKFe&b
z0F2JvzXk)AgYa1=;!(j+(_yU+TppmX2uTsGkQ)x~Ki(i7OtHxEX<;FCObnqG5)fxf
za>g<JYBo30Jhc+A@$b(GZ(mHf@=Ha;i;5rC2y%eB^69G@OLA+i|D3<rlcl(e8d`KF
zt6`#V5;Q51_eiz%>e?9{t_A!3YJb=M86`~fHX_OaM78)|6RaI>!$4NlxzR~;Bf-Nx
z8AD4ZqW}mukir(HOMOAz^j+j_!n5W`-K-S(d+yDyi~2?<-c^V;8|UK4Q9g-y*Mh>?
zNGX?<E3$v_WU|N+qXBe>&*-Y%z@W)9fl7z*`{p7VhH!J0?x3>0<?lkaBqFlf5vtNv
za}Xl!G7Dzler^C-6X9G%2E9V9w+1TH3Ev$YW;&`8;fQR5iXcQrMds*mPVn{`Xk;<r
z>1$1VL|IOJE|XP0*$Ot{Q+S-Y@u=3UTWzl7Ym8}%6&xV~$tukQzEo(kNN&Y0Y}@vW
zdF*F<aC>7!$*vVO6R1mzFY7taL+VHg91pMPZ|Msn@06DjA>MXtraEN`0tXZCr#Sv0
zC%i)Dn_GOQ-{LYR!_O=oT`q=M#lx2AAi|>R6MXPFs5WNd2w?0~?YKe`>(WeB8Ng3>
zapvrNGh@)hVyI;4t?f%2-zWF?PD~;iOy;0b)W?7u%9)#mMY<W*t{181A!eveK}p_J
z$rBVoXR@m|nc#h*RI(`IRLyHXf1L@njhk&i$Zohy&h4L+R@9nrf`QhEOr*us2uTl`
zW`-)mR^I@WJ=F-PM{1=_R_F>X5hj#@fSL)yBP7V#RAwajj%Vz>`<~CwbM4LM%d214
zPwyUBF`M22XF02S$~(4cG(dXpzz)aC;aeTeGKmba=X^i`kJFNCkDPWmLBg~>A-8dA
zhBzyZh@uocUevUH&f5Z&YZ@x8Wj2asJry<jh`!;jc*5UN9st7viL#;u!cgaA_q@L9
z>>(kC-fMrmUz;l+u|WAEtCryf*;u7w&rP(WB9E}IISPt2iMYoot=D*P&Ztb0^Rl*5
z7x*fKsKkiIPwa`lvboZ_b#OP6*?I+{j4;!r&Wb(2DG6#pArQMga^gq`1P!~ixJ7z8
zeYCxoUw=RChxr5i3b*L)UT_xL3tKl)duv8sqHY0dv!BzPqfSDA#IZiI*CO~I#+s&+
zSwO43NoHRBu?Rhy3p+-lf()5!iD!U$SX8`jE833(&c^W%w>u~&S{1R9!z~nOP;5nP
zUagnh&>^aA0OnE=kKP*ISrfz1c4#S<K<l&)b}D)ZO0rJ8igsdLwD^Od%;G5X&aEyL
zxmJ-50bE%UI;EY+7V;{#=EY#Q*`(z(sY3^UF6w>(4mCJ5ZB1AHhfi!-R*xf07FE!@
z){_9Fm*r3wVl5&$^@cUxU+V?r2hu@!rM<#RPXwOJ&YrV!9g{R5Ym>G(9T0#~EIaVp
ztpC$)iOJ#rKl2V%qBu!tG}|s?6+9szyA_yx7r^C;@AR2_^pfdjCS-P1w-Pxp??#Jc
zML;04{*&53Rw-==!KcI_utY21S0)D+V>+4AYcofTKgomdL5(QJg2da5!MT}vG{ms}
z@2QuB%po?CS}s%y7rvKJjRf*})I0rZ-YloEOh0|R&7HzO&dS%dJT6*N$bexGqwF<7
zK<*;D$8>r6m1Y!qZ3e$K56mx{bXrWrrADb7Yd!VM5$fvqz$8rzchl6c_VaB&egFN9
zeqFPDFH~l$o;O#c`Ej}mnChM6*~9XnSWe^LiiBuoBopVH3|WmVR9VR`KLQ+1pkIz;
zV`CokBwmeco1kZRO~+|DfF`UVx4^6&BkR<s#Y>ldaNH^pr5dS-Lvsh|1^Xs65<-|f
zlbS-zYddPi=dUGdD`05m8p46ur?z3A%W4u|$y?5fw5)A_a`zS)Wh(1t@&6>kz>I<6
zO;B=C{94Ew8$3XAYib+Mw4vBsBxKcXwwJbyAcyc!(NZORJywAhM-SoWP8D7u*NH(5
zO&rM)lPfI(UE;Cg82zgE<N<!uzxVOWyL2FvXJ6MIjYFPlHY;8!5T2j)iqu`Tyl1gL
z@gzmZSAZ4w8rBByOSmvp=0v-Fsd@<YEs5|$*yrZ3<bRXnfE?d0=JkD-m5+~`j5TP^
zjkn0+<AsqRJS`}&P9FsVB+hc!9N~4EQZp+~HmInITXtBm;Smu@)a!VMAz~p@b#fla
zE!-WqhZK>6M_<@nNV5d8X0xjbajWe2a;zcO2AA3Cw=51!y-LrvU0c?HOAZEYskhVM
z_e1M+<pnt8OiZZOtNC*^IM-Bmp}@C|5603L4XF)NGB2zS*WR1;g>5O9yrFnVL?`CT
zAXVWcg|Xzmrqe*PUhY$nzhRwff6O#P9hQA@UIp}hpIK#`M*e2e@QF4nopsJ1C?+<M
zGLrU+=9bU~we+D2PMU@}!a8XxBinnh2qSEN1=78*$}Yjh@Weug<>y3rj<U4Zm1oaf
zTKLO0!+i#ZOCO<%SH0xl3I}N^clY?2wY#?olwu(L%{wf}_TT?J)8k>h=$cX0S7Qlb
zcqb<VT;4a>Xu~MZl;x+((j$w#`1XosdWNc8w+q=R>&`6>T@dNBa1q-LQJMqW>{+2#
z)izoc3HjJH)cGIft)C-+6Qhu76%IyF8m-CcuVN=Zvxrj3=&Xq8VN_%QpQcMzD!w$b
z2&d%(<CPyxN4@WZdKSm4I41#&_ox7qwO=i$+J0T@tj8CFodre?I7*ijt!sRPrD^^a
zYE7w#pc*JJ^4eAR2wHgnOP3<x5@xVL1y27a3Z2Tl%K)RK^gXe>)UryIOE6e0=>x;A
z(Fk;Uj3Ne~2}9wK=O&A|c2LwEIHhU34Zk59&8y4~*p7F_^=qf5=<86YKxiX#StdEe
zJr?b8pdR6LYr;iS(n&o+blgQ2M=GoazjrFVg~jY+e-+(sih9#J@`Ah4g1(i0KY)pG
ztkYIWzt|@P@4gf5v*>iIDXPz;q5YUKj1smL&^4*-*~v*vexD|C5Ok7#R?2b0Yu$$`
z6K?LPLSlXSb2WQ9P<A?tQvm?#Z~uYU6wN*P)gwh6u!L0<&ItD+rhRa6!Ow)^@Tt8=
z`f#zgV3%(;WZkn$sG3c{6@n8~Ric3UIwJw@H+)(DdmsnowhDcLHI{!%3dE;q%zxKz
z?}D{>@wRn}E3AoaV_JVE=)Q49Ig+XNO+Me)0cCLsniCD~-H{@rZZ;a8mL^^gQ9IIn
zi^c05Y@8J8lFAOm4}A)dDk8wHUebKt983aB$BI9e=eXueGO9z#I|s~RDC-no`B?QO
zaY=ho^aaqWEe%y16|<@s#Q;m!QeRs&-X}rR<kC6Xk}1{eW8yTUo@MyBFr_vfTSV%h
z%BlcRm={;_4nlqX5iXfiH4S;NHQz3*WJEUsm(^|zBY&RMn6La|a9-K2puFIEqgKio
z9{=NYZX-O^{2j1MCAn=g=Xm%15_!ciZ(Ut6g;_yErTidVw@+Ft3e=y3@|~!3iPG$4
zpuCkA{5Bc3VeeO_>XqL`=PoMP%m~X%^3?_o^*&q<Ee_F2xlSA>1&);4HAZh>D{nC>
zyoiEIA_}QPq-j3%n1Y+%6+r$5Y)m^H0z;JF*-V-szG+1EAQf+x@0>YYZtBp+TCoTy
z{%A#dm^6T2idHGEk;c#t(6se>EuiR?&<G~BUz@;jxc6E)9Lnn+%x7Kb+hH1Rq+V-F
zZF-L^&=>L;-7d*f5>9~{kvYbSCQ1Z{Hc?-R;Y2QXBQ{{wL^MB<s^OB;SV=t({X0h6
zS8oFt7Os2pqRpuQw7d8JJfr(ieCui?sJgo2pChfxO21llY~dDdYAu4WWejl=?+r*z
zB7Q_L*-<diQmv47oul$3W?2!K<+CZBN5_3IL$!&)g)&em#?X`(RuglGYbW5qI`d?R
z90iM*0p-dUcHZl0?Nt!-cpCL4ImdiWQ-_4`kQw1w$VrRp%-N4<qa-5e?RHPV3z8zN
zH!@riB=W*~eL=GA`|Qo%&lTX3vv>2S1Ho0wkY8TWppWv%LKt%u8_(n$!h{itV=d?F
zD^#h#ck#eOSf)@R_`3oevbOw}de`6@qSnY6RWgWwr4=Ad%6QtcT}HMs;(;kTvR&Cz
zFCu%Pi8<>+GuhG^UXLSFxmnrdh6pRu9A=Z;GNNHqHSh_542Pj*{C2{6Z?SDU+Jz~x
z=I4sI)7$c1%`b?KvzTV?eJ~h>tA$!#in4|<hB~yCDEp0GCR}EE&%UD=Se6T}u`$*s
zc?Jnmb=<LGA$OedYUHOUvx#%nN^TOvCD_W47L|b9>uhjcoxi;A7#+BMx7l-O93-Lg
zs{A0FGhjeF@3vOAr2^0f;fGTxQ&(XnTlf4T3uw@2eoZkTD1Y_bVrff%keZywQPF_b
zGCY8RP<n9#<q9in-2`H;r0jE+n5tLj_4YBSr0P{=LX{3(jX+V;ER*qyc!n4C0PH8|
z01wW~Bi;2rurPS)SNL0*(Kon)H!TLtzdlD<eTEnp^=)Vx!#%PyzYG^Q31$s313TvE
zYjGvWiTD$<p1||&-#qk2gTxgFK8bPz3E^_myRr~R5e8GlUMgm@vJ@ZW7E0=k4pMnh
z#qVaK#)_F`MQhwfm`0PjEzMgXLUw9Zm^2Z)3(kq=5<~%u=naeRA>t`=$Oj;=_+62X
z4@LxN-AT1B5&WBJ0s>n|8KTdy@;)6j(NdvEMV+6gz?8*=Mtfc3$LEaLL4NAW&$V6z
z160BRr8(TsZ!^AVrN|6U9-i1W!?i<6$W*JT)DU2Fn9`;W<Xq&Dlyo8{72mOzhl-L$
zuzwJ(oYLGC`MxU`9$_lY>qBvKtD3`nDU=WYt*cDLrIHJOQY8wce!4VZNfR~T>S@e;
z6NUGUBWXL08itMdat^!02Jy0cLg=SzX6YTYn`<k1J6Tf!fXAIqfEalOSg5m1YfVf+
zht$OkUvWYqWwh^~yT-P~c2`mkv<Cx~%<o011L~mq!bFrRWd(<?l9{6gb8apCAn?|W
zs^^uxwTv{qproH!F3F1|#_I9G8=7CmhRb4lUBr42@_{M%F8Rf(hz)%7JSx@pK=d<T
zw<5o=1o&2UblqnDn059)AzVcK$u*yCBx6%k!xyRhWKv;vy(WukXUg5e5Mr%ARQ>s!
zZw{I$$I;I%Q~eSfP=j3Q-}uaOB+WbiEI_U5RWtFciJ-(sq--1AO=0_Ym+SI^U3a_Y
zBKOINp=uDr9hj&2s%}&o_t?&!g!cFI*V`U*|FpR+{`Tl!I@hB@Y#Yy9j-pnJUvjFV
z0vdy^lZjkGYcsq7b>13)1aFm8V$vjWxmUF;zGe70KWjM&l3EJ?E!A;mYfK9Q!0dQ#
z@z$M8lh4Yz1Oy_-FkfV1LvwrFJ+ztguo~q?1F~y&+7W$eXmAo!-x9K*x`>j~uyg_t
z(+(%<zX3j#WNIsF8V3u^YoW3>rfQq<(gI6^PU661v7olQ*`RRx?+S`z(=KSU4sfX^
z7PW9b8>6?ygKNdVdwl<{xgQ$s6lDcy%<r*2_vbXhY!Cy1EVQEp*z`PgqsUgu_y3B8
z1~pB)SqULl{C*Z_Y%(1$T5Nc5h#P|#HL|KbLXty~adX>`4ldg@6p<8l4wVKCXcA~6
zcbN9(IMLTmVjE9;3r88D#2wgTU?&g;@W>5jVdNEU^ge>^X#vLYu$#lL|6IGP&u9UF
zF{A9HyewQy16N*To*BAzX*6T$+xFGw&v$;m{ds^KGt?p96PAsMqr>6T&ue`+fLY?9
zp?IN6+`5NG7~JFuM>=VGUiGlFl&Lxgyx97zfd{$ViSCiK7NOQZx0)UoF17S8tbCTk
zT~F8gd@_MI3%6Kx(F2-~UzmC)<(2g>t5@%j61kiZG$&h~-6nG(=n0Hw0|Q#%$SNjf
zgQmG5ChPbxe+y@Ouiw)$N)<9?rk4a?OD@obIu7PN*A5t+v-cK|K*DP2guG|Cog$^x
z^B>Y>dznU}(!-*ts}havE{hBzDfb4*<dxXMN{BB^{2(ZjGy_Zs7OBYkU>gQc1m!d2
zt5!rRW1tlol~X~G1W4IjeSce)ZlfT}f<ZH{n@PF?RV}A$wk-+7rgg2f$vj;5)Ot~W
z%vqURapZhtGaL)<y#Ek{c@5?~Vn?Q$yImbQnzM6%{$<F<fo6UDZCvSFZPq<lHAV5>
zv}KU;G8ECEQpUDXYmeK{Xr4z?B{laD&sW2cs49=^^6PKBoe!QW2WzJFo2k%sZBw)~
ze>V<qb2mGcSl8csk^9b*%(-fmR-Of08#ze7y<l=d;pFDtjikzIc!^`JsG`xLo!Z5v
zMu5^(?Fd!H?3bf+G9-|HdKzlZJr-(%0ZKsjUQpIZ`Cz$^o9gKK_mk84ImKXIOYXGR
z#m6CLR=rL+J7|{R3av7$=$Up(01-zrmlOubaJ4S>g%im(!vgtSSfQTVv#;IvV9a$Z
z-ZX4=63Fxcwp^{1LAQ)up3F@c!J2R<&O=;&`HyVD`K)^Uy9g1K^WUPXTPkYXQQ0dK
za|!9OY{#MSFK5~|k9u%iw<tuX$fve4T52H_NhBl1rEkyE6io`}XMN}Sy}ZXF38(0Q
z=|$S>0%nEp1Tr5kK*B{ZLF&RHWPfkqoB(X1(x&h|mjhb2BNt5An`#ieUy^Umrfonx
zeB}xjS_#C4c1IB~&3&Y_?It9yoWFHaz^jecNYl0-wfp!Pd;jO>p*}zujf4Ac8n50`
zle|e))OGx_;G<NPytLmZlrv#CIrV8vwNsF!DtVYC0|bF*;|Py@ANQhIM}b#ycDP$S
z0Q^_$!0KeXsVGmbNpq4f=5(|liXX{(4`43`JfaKZm?<byrikOEgwL085ltNwX~J5;
z_rc-3dbtKg36Hmhy;kz{@`3}hP%uTRT{N<e*x&GpnW19mU7WKS;#=kgN4ONZm0#LA
zH9gvMHPjzu{XS?Uw%)G43lr0JNoztW=?anFZTmx!OLhw3!pX2)IVPx_sRwJV<s52`
zs-#4rK8Y|fZ5#XhH~s0u%1<OQ@^EF#FljzLdGoB;D5I-YB!aj3*;u=Z?e?P3`8e<o
zMEuC|*oFj$y+jZ&@4_(^U<|O4+IuP<(~B#XJeQOocnN?)qG78RKvVNfqCn7PDu$r7
zLLX<xUl{@rAMi!Y%6SXK5rN~tO#UVgE}bN{ZV{yW@z=lC^&NjdZ9Lb{PutDf_wQ-#
zt0<!NiOusYj1U@8CQ~|p&)-vHt8qw`r=n&@3F-H9uFBgdaj^`H0jkaSr#NBC7(ds4
z|8v<bN8J!$RGZAivzW6yV2HVZ(;=dwJZJOdG?HjbPW*~et>gII49QbsjMp^u$r@%N
zCyjwA0?`-$A5-S8M$te@{!0*ndjME3sc8cQ2uk#~Wuu5(C3^@d103iHAG6!O#!s7=
z0s<D`34#mt;Iw2x4)B5I<E*!U5%tCUMgQ5?Hc<<KV!#!&QpO8?Viql*i4YR|2KAzP
z6nk6nec6G{))>?o#u$*tR0Vc*>$n>nCsE%snQ{~-gGw0e$ReAS>FLI##u8uDvA}Pq
zW9yC&QG}_%*JUbA%m7ZcXt@FsDRiNj@MF|PrApj{7{qTEOlv$jrG$S{J!3|4TklLG
zJ6EV}OYW&ui9o`^aF2kI^X=)VxMBv1XyfzMw>x}BbNDo{z=Q90%sMz#HB)i#>Iukr
zYjuT|%mkXA&bod6wWLU-dw|Jn3>q$FzT-3yaBRyJS+0pvRhVHqwB+zDZ<{y!+57o<
z_Lo^XO;y@4tB3J4)CP+xh5u?ZeV`{|jB%vt)Rq!uIB3c_fhp8WGQDs)R^M85AmbSy
z5?X}kmH}HeKjodt=1hJ*c<M$s({O9#XBrB%qxj>k`#Rih6*&z;Bm+VrI1GZf6$saY
za%0|SnPW4-Dee&Y57+~DN%lzGEkfd2MWtjf-0*2w%lywW6pTUvPG`FIFJ`U<rH&HF
zP^C|=nEQ$*CRB3Is`(NWe@yAtopVz2z|4xax_a!FOlKwxtnVnEQ&TLD8^f9LLH%id
zwasjGfZj1Z*%hg<m!S%r)2P-nahi|^I0T&1DhEv)!nKlql`8bMP*H1BlTEc=G^$k2
z_eO)+EoB#;k|sgCgbU5IiDPOUL?3&q{cw+3%IIpc6<%#x&v=E8vCZD&?i;MlqJ`s~
zhHoaE37}$ncI0%!oXMJ@n{*Z0Q@$2~S<a1#dlvy0ZjmxTnF7fO;K)YELUNfp%Nkjb
zt&-TxL1ZfZ=jq(866(r995sbmm}}^xp#q={*PJ}>G+Wp^jRVpEWdaN^W<v(TcVtt!
zKp#`}Wp&e|Z{-xtj9|-%ctscFva$w{sl;tTpN2WEo7x?3V%=S=K34&_1StfEeQmx#
zseAIC-l8D^NUDXaH=T)X2S#)`ewi{}<bC<I(Xn>}H%Xs>HQp=|Ug`4--NO(Wc7~|S
z+K4EvhB}euSMBlCqBffvK%Q>UE}T#?{W}R9Ai$DO(y5z5tl9RLVHV<SzzT10$5m}s
zS&@<LUfmjUclG87Ag!G&dV0RyzS}mCt~lEB1!nK;MsXiS3NMO?D!(CU(GUeOU+(*c
ze{rvT-@sd0looL9hUSYG=MbFswYO(fv-K#?&-BgQiU#=yR`|C?L2q~47ke|uhFM4Y
z=xvJEQ30Ao3sDo^N`j<BT{jDLWmUX_rfbIuYPTv(zl?TZYcgyDLeSamc?3X-YSkw+
z6Q5T`I^a9ow0hph5_uh7%+*{iedt6YOa{x$?JC}*wM31ldugMZyLdKkwkM1NOD*y=
zA(=<wpG8tC2a&XR5v9i!CX78+M2k*%cJL^r)+o4bkxin`n2NNjD~qwQCn)4~wUH;w
z&FD1VO_@qq%Yc{D)eeoTmlh|4RGd|t>0YbchtMy1?fc9XB9xA|-YHTi?C@ORrAF<$
zXteSRP-jYMM%ZYI$TCNMAt^LYsiz#rVWr{TT#kb@=^*CL{ucOK7-vyk&a0FoGqcmR
zD;bI=tkLkg0&iQK^AT??&iiH)Dxa6N?`;2)QOE7dV4T&GamwzB(y|g2vmVtQ2UWx=
z$Wvb{sNW<W;+wK>0DHfHU?F6d=}OE?)8$#@Sa>bl*h2R}v&zPqexo_%=%-((Rx3r|
zP)V`W1N-W8{`V8~(de#SbpA8ax&px~DEeZ(s@gc9@|)M>XEyg(rXZ#92f+r}zN_yL
zRe|V)U&ks*IfG5jXK2&;o9EPc&_l(|rJTTAoC0M~O3e}{aGD)rug>`n@58oa!dF%5
zP2ni%hPdloq(^^TD_*cE(S{}cYylAGSu4RoR)%tdQTklM5r|U4mzm*{=a>N%z#hzl
z8|d|(qZ_3dZ^Jmg#K1tH$h0aJL8Zxz4r`h?lxQQ&cJJwoxu__$SwpwZ0sU$<pGGG(
zM79}0W;As^b)SJglVC?IK61bub$qR8?bB$^!Pz8azX}<{qqO#)|MNVtfQZQyE&5~}
zo19^HE$xpcLtPsDJ)X%y%!8<N&g-v)P%uC_@e2g$WDp=EVfoa#Qh07E_|HD0N8j!F
z`P=*Xw*G|mt_n<PMk|46dWN_aH#|e)E6eA+W##6#<slfjXW>e76FtS5{T<WnlV0KK
zrw#)FJ8sQ63>AX3-!tY)8m34N$*!)3BU75DI34sDIvbS_=geKa1o{T7<<pfA>uQ#|
zyAX_*`P^&@sNfoKUL|i(dYp%m+y4b$Z5?&Zs#V~e5=gR!G31*x*sAm9U^i6HL_xjZ
zg`_wba|o=1_%hyg{Y~8NzI*g;IFL^MBeUi(q`e3hAWzoJY_0{KMHZraf0h>k)`+ti
zG)Tq52|T4#C73c%z2Z;h2!!IMSwF38O$GMIJpSWoXBOdjk#~9fxnOW=L>=LcXzbe2
z?fjQuT*<@y8EJe=*&@ta$Udmli5OXYJGxt12LRV>_i_d>x|ynXuZAE1VG&?OjrLm0
zWML|64j=vd^zYw~UEl9?7$wioZVibphUhL6>2;mK|5ijxG@=9yMUi7Fdv-Aa*$aED
znCglkA&%}@lgGmYFAI=3L41mi3ub7w0>hJ1JWNz=Jtpa!0Uvl51Iw_B!%E?>3DWC%
z@6%3R44iX8KT`sswHPoj7wF6+)dD3*U_x#*p9<kEr>}Ij7Pg5ZS{5`a_i|7O>QDzX
z9&w9Dn7E*RYE5t3{C>^?Yt7=J@B+8HfxDuz<v7W6h!@%yhGzt&pZ%TJ^`F1?^Bq*`
zTujo;&0&gZt)>p3JSYXtn4%sEaaN{@A}XGua7t@9+#ki;s?cX#fZ+LJGOSj#;>?mk
z{$3~Ks5h*R1O$bLRDLf8o9O;+6)St%)y?KmThC9Y^gmsu-g>;SOSYzt;_$&GwD*+c
ztJ)4=z|<%dlvg(v3oBLu6!^Ulf~G0Iz7ESUG9Z9Fk%9Y~-1juNMSbF?bB|1dg&|b;
z5F2%0ev$<()mQ-tMW?UVDUrNsE3G(1)?}Y+)y@!)vVQsTcWed2H&qZkwaP=)$HhTw
z)}WUt{P?uq-5}9{c1$XM<t|8*HXD1C+dMB0K>gmcg%)0^a9_0QU4wIAAaO|i2vmzc
zEcKqp|Fja6*!}b=^G4J%HT|Ki7zPHA#c-eDUaZ%3iK<`PtOohhO}(Q5V1k!hGL2Qs
z95D$@H^dX0JuNn*gSh_ZDg7#Ck9JKPKMlBL<b}JMyt5}wbGtZe%G^TYqL3vcV%117
zQ;edxGpUpsZ&R21A;+6)bKI_JA0~h+=US4QOnl0?@HGz<0l>$+X%+2pAgisMLPyl<
zx;SpdkQhj1)oz3e>FOy~IuCgRMXF1fzJR8i>XJ%qXoljS@V_T)Yj%)newzA1vI>MM
z-PoPt$VUthCz)0kJw~EnD~xiqFcp_0z>plazcX1_008Xy{LgNWfEGH2f$Rr$HE>df
zHEl`=xX7!iL}f|PpO^DqMeYPQh(j+b(;R9wq;Bw=1J`Kkw|)s1p^g69eBNCi@`fwS
z*%4aP`!g$a?}OJmEMY90+RxW%^SHr`aBP9Ia{Sc{gHjh^C=hRwK8Pk1)}<~?eMn{^
zL=}5!t-Ht^B`th)E`VjliXoI3*B1&%rhtKa@(83H7kKr_FNorOW@V%8`u39K@GImI
z2Tuxjt2gQ~|M0V={R|@|jXpF0_3<OYpG*xe7v)_gC;srE+1{EPdNTC;LsTSplBzHR
zv-Iy#(&t<%W}lyeaGPtOuTZYYrHbuFcv<ZhHz`3(HUJtAK&+iRJcMUv;{0^q)&vWf
z7de$`j(xU?{7XD*KK`NCZDA<h)mz;%2rn4&jus>GoShHSia{OOv*hO@OQ0@%_32x6
z$#n?V;`&!&4WgJxjw2*NeQV9CSw~qyVOn_?*dzG#P?keVhhHmRVaSg`IbdCRMW>YH
zEu)DLv1?%2D(`Gj)dox1#NHKc#i86=js`+b06V9ex<(jvy_G0fWc7s{`UD@%4Y18g
zhKJ92g_thItJ1{f<$n`IUNKtcDAh-|0J`z)QhyWBDU?eoGOK!zmjnVh3Kl5;Q=)nn
z*bR3xX@Zh(Wk~MpPJ+724fafFS2g@939qT(BQlN^L*)ZQWOE?+ArhEE=kqN&-UmPE
znv-;f36CV?n`t_fQw@6TUVQj<rD$<s<!~OL_FSA1fkd+F(W)dZ6%-SrfB)k?aKQ!0
zFu_is`SEeX9nIv^Q3oK72S=+?@#W>~<}J7W?WCdO`?LT1{C($l^w!BmRN#y=pLdNU
zl%q)KNkO?*FD8y~>rL}};n?DL4-Rsf#<e7i;8G{rpOft-wr6qCZ7`wY5US<|VwpHx
zl%ge3SDbeRYMfn$zXzS9SM<KKX6Re=C~!{<M~!yz!)@jTXK~rAu8bv{aW7+UnqYF^
zIN;8pPk34=%tGQ!jT1{FPHFb8etyy!>cCLz_lX;UX}+}PYFQ3a`_hsz-)F`%%5`<F
zMDJ-eTuVEn*4~o1W4+Do(VnYoj%Zl_np-yT6_6d6aB708<bKsH>KT=fm4R(ZV1b0=
zSOh?HS1wN3_QZBWmP?=&ONAl=N`fM^M|XlQi7+?aNZz!f5L+z!9u2~s+tm_96LbMJ
ztZ`u_p~GNQ;f3KVf>a2>Tk6xt^%fpNOOkn8sdmbK=$hdf*i40HRN?1J92d{-baPsg
z869Af;_Jh8#{H|W(6B}eH0g394v#U0nb+ypH`@NXYvKXVGsV)ne~(f=M=t5+s1!zj
zGzHqUbxRB1Gwa^WA{`TNiasZ-k=+NSW{Qn!HZ#&4lB@A}5W<8?y~~TJio})cOf(SO
zC^}&FTeVk!fcKK&Slo>T;dEXn<&<BM+g4DkQL|ozk<=G)iA|VtN+?QFxA>qKuJybf
z)_9)#8I9#LSGam{F+8<|f{j9w%ikF>*E)_;JyAkP%sx^SpoK7lm=p&`j49Gs$($7#
z?n*Dr4dNT3)Kwc%&KuE~J=9H9kgk8=Zo;uuNvm4<9BK?y!ZcG%ewXhRGx_(TiuLWH
ze95V)k6?7HRX(#*5}rw2Oe*pc8NECzxZJBEYhp2E7u@bHEHPMfiRDt4CUqp6ISl;{
z=aUjWial?xezC}(R7I5oldjo%5_CpZBr>zVwO=q@tF6Blgx#-9{}I1}tRq;*Ow@Fy
z3g(s;6q%w#N5~}zLhq#w|AP2_g8^zlbEJHl*{qp*jlip49zJ$|ep=p5h}so4$_jW1
zks`DV@x0~d?QQ9)5^jt_NiSB;&e4o@^4Whj<&yx0VJ*dQSzFR?O{|yE;I&9J-IoS*
z4O)ELL?pB|44^T@IwpW1P6U5%#ni?T2A6L}3q;hFMyE*YK9`j$0TCJiQfZTmQ9m{u
z_z6a>sgTzd_V;tyKr7+#wV!TbS06F1@6Z0(Pka8mTizW~C7k$qL3~l86h^M%2f+S0
zr64C}7AWBuJPNe9daJyB1b%{4aD6zw<2WIkE)7Pl!L{WnASi{zjn1|D&%el)X*Y(|
zW4Q>!2DXvy-BUYV$YxY5&Hu6h`##Hp-)WyuQMg6+4VLhX>u<NQq3lQa2$)gR`|x%F
zRa>3!^e+tQ`e^8+=-?JZNig9a@hwmk7=~&DqWCS9vVoHwc^Q6|^&2RFC4u~|MShl1
z3#|20e*5;!VMn9Jf|=k-NumEVz87>!9n|LstD@9UjksRD1bBCJ_e)ELY`CMaNSTJ}
z@`=P*fZ`}ZLwiY7)l3HOUQkFCWudemh2Kf6-)=P%pvx!%bI05Dh;=iy2~%&*%{iTU
z^>>3%W=4&>-Ul}P<T)rtxT{)f0l1B%Ld+q>s}c$~oFn=*!v$QycKXZl->-kamzWrP
zhQ=4T3Gbfm`g#7k?Y1BP`MbW?<-MKtdS@-|)+7Hg&99HXpH7MB`uRT8f*z)-{LtCO
zj*|XR2F}i1gX>4OwW@n{5d%kw=|jE!?8|ch>6v|iDsnWQKV&M?u`JF+kfR!9h~iSw
zM43^W@Y9we9+|%-9aWdqEX!v)Z;YurU+-Io<Ax0OpS{O5Hu$Z>`PpKU1H|KG#CvI`
zoWH!jKN74woYKK$ptgTHl}TJa|2~0U#LNt<-QAr!f1eZo<>Y?HS!~thQv(ceJ{_Q+
zEXO80ZxBorRh}oJ0`8i(H$;<|n->?wCbJHoEoya%|NOz)sU=}$vXx|^ccC8fmf%0f
zQP=P9q44l?AL;!39{fi;t17s~h(1zvVY=0~K&xKtMNiBe6xoF0szj09(|JT%2i$!M
zVK2!>+pqERF97N=Qr*#tQvAG=>GisqfB_50hl*rXuK}Yittvsw2XRMxy4!&0NBT&*
z=W(3GH8}}JC>+b=Hx*0_M^)BMVv#~>0q-7_k3~WOK;#%NbUxeQa;oMZlqg!kxZ9Kw
zn<Ll7zFfj;=nDpG{&Q=hcCA!01y!v#XT?=uRad4&eJ&xN;srIDY}+oM_{tL{X8~bN
znho!-DK}scG}kRu_zle>J>GF9LRRY{We5F)=h&gr&8JUDwMo1T58hnY<<kT;Ak&~N
zobfyVZgJn*2~honW5fFrZPeEIUV|k@o_;Y&P@AATIEGA`qVRW>ezUo4wn_>PgPqFT
z{u!gWmZ*2bE9^h;e;Z~U$EtS3g^x)U4I_QnENW{g%s7rv;WBx~3UnXCI66pLqA8U0
zK@%g39H1%oPw&@bR>t;{NccxIQtFloByIUiU{F<bMj4?t!*N6YS*FDLL#|uS0@Qnc
z#G}P-sqG?{7FAs>XBHJjWL;H_YZ5Cvl2_Cc8_BG3<QTRZ>gxt~fi#lPquD{glX+7v
zYlicwT33F|wkp%?dh~+Qh+p3eA_V?NZp&QkjWitr1?%^sfp1Z;CQt@Es=2rd@88FL
z{MPh2{yjgxpHCtQ%n}dEbVHw@&(u&mBCTJsmjC_5Mr27%<d%;j8t^CO+gKOhW@KXs
zgY}JG>i)Gzq|)|w)Itc7*{g*$0pe4I3g$G?r}BbjrMHz#dPy>|iY&LSqJU*NZokDX
z+=tV5uNcUnz8wB-DcK$in&F^^F~WG1UJ`y;n|qFMIp0}o)FMQUn8`Z_7}sM<Tu9QH
zY2J$n0Om8XokGs{oqK3)cQGM*K!WmEPNqso?vxf`C|HFZmh2Zqo6x1IlH!D3&f}*>
z8vjmhTF0GDTTqGH>LRx~=^PRjy@fPhpQN~r2W@Cqt>6E1WyUJ?{!?NDLga{mW1Xz7
z8)wO{Oh<%KQm!rc@aMgNoJ@jf1yqywDJ>3#U9>JDQt5@uvG8#g*F{y3IPpu%oe1y1
zDd<YoH=ab-_Rs$^pM|7?fi7;NkKiaNtE)r3S(jN-_M_+(ABz}!wmAm$;Mk+}t*XZb
z>$&=DJuxDD&+rrDSL*LSB(>U{Z{;Xe3q96(+@CZNd9tXpB1_So^s?kiQ1Q_YxX+39
d^eLq9{|{^k0!*D07)k&D002ovPDHLkV1incL_Gii

literal 0
HcmV?d00001

diff --git a/resources/images/textures/light_wood.png b/resources/images/textures/light_wood.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b4c35f8c321b6774e256e0cfff178831eaec894
GIT binary patch
literal 171492
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%0A|9}F78+}#FNE!|6l!cBj{@N1Hra2>xjNEpj
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

literal 0
HcmV?d00001

diff --git a/resources/images/textures/subtle_wood.png b/resources/images/textures/subtle_wood.png
new file mode 100644
index 0000000000000000000000000000000000000000..22f2450d3adf35f46fe00e7e7a4d25eca1c6554d
GIT binary patch
literal 102184
zcmc$_by!qi+cvysh8Vg#9J*WS7&@e-q`RcM85-#nkWLXq5s{Qe8U{fLX#r_QL>O>H
zK7RLe-_QH}@g2|m=R3!F%wB8n>%3ycwP*HP`>DRJIuSlSJ^%njni?vG006!#f&nPx
z?l4rxK6ZDY3s5x+c;xLI5Nzk?1SmRs+dIKDJ?&ha44v#8Lw(1cWB~y3#LdVoz)VM5
z+QHjX(C!}@!4OZMJ2n8wDunphIXrO+fZ02_xOvI3qPqK7VQ!9ctfmiigmrwBom|~C
z!u*^bh3OhOggtSPa%5GIhslOW-zo5P3b2EPczSsGONYp@{!6d)UHPBWLaeZVi3B{6
zWBo6u%yjf&%HDoXum^%-0uI6=A~11rL6Q3p#KlGUVWPq!qC&!V5El@+Fa1DVT2un|
z?+@#pH9tpZX+ssYf7`mN$+5Zy1o%h`2?YlS3kHh`di%KuiAYIF{i8!vRNziRz(3S0
zz%E3<%b)E(8dRM89sJyU0^Gd4VE<^ev-b`RkYl~`^uI#z^f7dEaSibQZ{=S8|8A_i
zW)ljr^AQpe6c+OPm&`x${fDKa^S?7ZJ^x$UKfuuG|2Y5utKZ)!)W=E4(8=FB(9hwn
z7oFMuhpGSF&_9CzjzL<-&hLrST`#KHdH6g1>w=Dsw2HSwpr?~pfToHZ>z$~eqno3&
zh_Z^Bh@`N%inyeTh={6)l(4v@q^hLU{Rbk7N-APv|KVzS`3Kl}IXL}?>-K-R5B^uK
zw6dR*U4XZrk+-+Ue+GlTt9O96zpJ+oO!<)*Ovlc_&Fi1~KRtEl*FT;*`MCu-IjZ@2
zd&2(JXwq)~!+v1kopB{maWQc*6$vGANhuXo5fMdIB}qwf2}xxUWeG`1Q3=+66CM9Y
z(Emjg`M(f_?%WXiXN3HZ5%Zr@cf;_X;(w3-yUKshASbW82KT$0AC#Z|*51vnaeZwg
z)$Ose?XmLhv5M{Sik*K@xien1GhV$jQN1%+vpZS4J5~FAs_y&Li|^C*-=|-GpSeTB
z-W`yQd&pON$fmv7roB(E_y570{ZGyNb9Z>VKi6_Fe}{L6cldmV*26FF55Ke>erZ4Y
z(s8tKht8wLJ9Hf_-J$z<>BI4I&+&5a@z*=_9k2AC{DXnhe=vBuI(WJ^bh<Wty7uvO
z{Ud691hqbj+PK3QYV!``KQ_lp)apzCP)d}hilPxM9oE377RSYW$Hjx*%csSFhRI7E
zp+ohX+h|SBqWlI;aFK+)P;h$XZSK8uWaQrv6dH4c=DSh&dv@{XUEj?OW)Bm+gDmeu
z9${{xtUGs)E~3zXsiV*OqHZyx5!=zo=&LuOX~7}U@^8NH-IPc7+-|R7(B~)@6y_$=
zW+NJ7d=z|{8C_%(rM7W!^L262rW}QwH;pL!`$y;YH}0*Rf_3!Y@R`gvw->(;P0^vZ
zp||_UzP?j~%Oi%w7mN33%aF+HuG^dT>U*f_Jq#wZ-1X!68s@a1Hwtt6i@|6BbFHor
z8hty9K0;kDViaz#uJ`t;H*T*kkhk}LZ@;<tb98~ZeemWc36**KJM#9=Hs4?LS){%V
zO8hQ_vyF|u$eX@5w^y0y=-}SJH`nF27dE#RSDrSg-zct)a)mp>`Sxg^wav!9e{{s{
zpOy1=G#dG4qc{5I@+hk3w0v*7Z?`WRa}SL~-TM6AzJBxN%{_(dlXjbTPQU)LOnXOI
z_nlsPM}N3g{rkHVwL3~;jq<+5WbWOJmiOIUdH)H$5c-q(dmj1bcKi14#f3uD-*<1W
zr*6MTN1fQ9ZjbjyGxcoRfB$Xy-53>edxp9Tu<3U2Uw4H6hhJ?6K@}((3(wZ}q=on9
zIueV>aP`uA>hyIqq&ylq!)m1b@cXcnGJ|<Bw5v_0d*LHIl`~CMvR~iSw6>~E`xN9Y
zjcRi;)+6hSRLEe`&>UA`D)Ly$aWef{a2~b+8TK&|R};3oFkbA!I9x=uVx00I;pJuX
zg`n=t5o0k%DmFz=)va@Bzhudn8es^9rfIOf#(OVz|3du@JTqm5^0U@6at@hC6X#hM
z{wJK|$)>gMGYnr6aPTqs9Ma>HAJ(=K%!<=Wj_$b*{E9O_e;X35LN<z7(B3~kl0RiE
z{Xs>q|2FLfc|x8R7TpM(Fh~09UZ_H!r=~K5r$GQ#Q^)?r^@~QiO^%C!w0q;0Cw+xr
z#hfjkFXsv?HjF&0ff7#LFG{s?MQ8_1=mVimkS(UH8gO=fYj|~fr4>=Vh;-r-<x2rU
z!$_Kkbqe$vWO?S;WGR(Z3m3UCTyqwR#)KSLpzTs*Npcr5;I-)dx6G%XC8$h2J)dA#
zU4ZnCC_foKAnTxc*u+b(`7ErdYN6tF`63dzJ!0iXhiQ7u6!J55o~Orlq;|=c1s|+=
zpIV!Q@3VU3!A(@?<nV62ZN=ek3cWqgH=j(j*eN8%&6Jbhiy+T1&uEF5@;!Dp8(hE>
z8~!|nL>f#VPwR6~y&FS@Oso8DsJe)wg*SIImE^)9r_=bO>(=r}XUzykb@&)cZW);n
ziaGDef2~-#W-P^<#^X?cpJy>rSNo=byP-qwu*Z$#hsO5E;6AgurE^cD`19uQD#+QG
zf?63dkibgi3D@TqXybTm@)`e6B+}a^vJrLJ1H!D!ZTVU+$GNMQH)Jj7Bh+H44Z6PD
z&(nAQn)!fU_Tv3wnEJT|^jTl?IHy?1CUfrfBVMXcZ5oADRdo+KD1}oP*;NpT;*?J~
z71GnchGyLy?adn$KdWg-tKgFW@9SimGO8vHSr4Y(*m#FQ46`-J<}OD>SN6hfA|p%h
zl3!-u%_Zje&6`hG?HgC4JC7aKK7TLOGwULDI#y)6U+<we8%*JjMUUOS*WrKq(lYSD
zQ)HW5>e82^C01nv4*gms0<nC2D`^K(jomW$%f;*MspSXL`%(URnPu&`eAEjwOr8nN
z@$n5{Fdk6j<>co6>R7g%sOg+6$54t2iwaTaCpBIj_^94cm14YBTwmDT0(fGnVgS#A
zH{rj`r^Oy3OMuNuQP<Wo+HJPI%DZ1nsi;`#_Q<TWHD|xtvogCL5Bq(K#pi&~wLd?O
zu77X0D@27yp)tsFVPxjL@(pXv&x|}hYfm_&lC)*^K^VdcH?O5Ig?q`;uBPj4oGNk@
zOT_W9*$C!zvIqT5_3>Cll=OJDIVA|rSrH7M0<-gJS-LtaGs+EV6e%b6A>er;{uVt?
zX<b^pD%^x8t`+5%mZ1P~69OB2KuwhE*_G5wDZglxexi~;+cF1>$NE+OJiR|Q9XckE
zoZ$HqsGN&ug}#n_w8;8IQ%K80fR&Y8@By~)8r@}!>gcknPf~0)t7|slQ^)Sq`@PM}
z(<e8QQMF6&rfU=Qez~F)+4xGTrZSf^wD{{1dK$Z|h;p?tvn?4{MiPXCe6?W-aFLHu
zZuKvFYMbZ*#RID?O|_Oh*opng?eAy(dJ5m>!J}3;A^zfX^Ni{9jdSFhVEUIz_v^E5
z6DK6JsA9i=`Kjm#N}+~X)H4qnnTKuf%*WMd>z~zk1GHEM95ES?2JJPqRdG)M)J@$=
z1KeL((k1gO*7D~c<VtL-f0*D}Eh6c|xs4;q?<VpL$PzZRP+vBnwF>;Cb+FBxz{X-+
z#h6>-#-8@`ag7)v+X&C~ymu?aTckE;-`%M~o1&6hc{H(2+r>ExKXk4n?lU#79o5&Q
zbmvuiR|S)e4RleP4f5vXk7f2nUM`bWImKYMsLTOe5g{DEVC1g##)ZwB{VfMu7qTJ1
z32u@;S~u_8kZr3!_iH!EO^r&UH6E-AS53%jG)zf?8bh1R@u8$p{Q0^XYWf<a-luF4
zejfd-hdi_3a>S~M)DXJm2O(>MzB$cH#x~~8f(Z?7O3gzj%bk#x%T&LygmrDP3fc_A
zMt_6{597zwteUxFXz65xeCzQZ1p!{%>MTCn_lmBUMpTBh#$W?HM+P<8s&k%D;_DLA
zpJp>A_K_Dqpx!lPkyvCJ*arNrsZAP{H0I)8;tuPac{u<>c2Wa^w27~uT6Y2jFh}Bk
z4EtKCG!&LbSp5fRh8?AB<wa|L%~sVQ8Z5x@3ov_`wqAs8e>E0B#-Uipsv`Kp+m_O#
zz1j-f%`&D_N*QFtnZWw)r4%{AMfRUh^B+kc2x%G(fN2i<--sPN<19T)%@OAA`W&&B
z@B{ZH_{orLMqD`OBTa!xelkU+AZ#r+00336j$fva3{;5OXe}so=(7BtW4gpfHWce+
zlG#yr=JUQ6CrtZNr;mf<>C59rx_hls-(qesag&z9#!}Nth51nb#q76b4J#X+BFG##
z#;UYe6>wiQ#v;z~fF|I>6E|&dy7r$tF)s`|u;3@eY7#)LRamEb=9Co*A7j;nY0UwR
z27LNN-l++n1wk<i1FWQ#@$IN&j{#+Ep~SG1WoeC59ryJoQ(pJvv{Nu-B?XOCjjWdX
zxm8hpUw8$Gpk;=iVrz4$`6Fq0lE3=TVGcr{sdeQnypqXRevD)Oz5!7O{Y=ixDk1R<
zRKMTT+kNpc<puUKJ{x>2<*R`<g%od@prqkDwuYo;vU(^x7EHr#5r>-+b`lco(@0sL
zXMsn6^`e+C-I2%rVTI~vI2~E*uji4R#RjydPRxy(O|1PwG+6HJ+<q2V=C4ZCXbxIa
zyf^|An`_e)Ks~6Jd=_O*o$c;U5*=>pS!nr+&^LNPK)gA~xT>wpDl|IMc_?Vgq6%68
z2I_PO?OX2+SE*lrcw}9ad$3X+tm1t6(pnuQQ^%%HqnwT3SVy7#s3WV8UHX8HvTW~L
zQzMaxX<fqDC&_aB7Q^|&^?GB)h`IZ<2_{h2m_wj$k~J%ZlpG8q#{<vVKTg3~<*VkS
z(a@p5=fCeN)Uh&%uekXe>RE#^dp#ZcNxtiOAw4&=uCWk5>E2gm?(zE*Z&$~j6*+zm
zxahHbmWz}UN~vV9K3(Oj{3T148r1t|ouoRJH6{Pf^sd`5m+#@i{p6H<g4p2}*3QVp
zs^?du)sg6R<`nqPsAPwXH?!>e%Ne#6UmR<_u$5qMH|hhk8(#bk8<jz_nzz5k0TlUs
zUNn|bUzgfF{M@yz&%QhbSLJB}c=<ki;*Y_8Sp(*Cb;&8|*w6rTs@#u6CLGQ5pOpr{
z_6FrWt!Zlyio6~W<xCci%|EA}Co5BXs;~EEWf3Ob8~4~MFoXKF+#}VKWaMaLHVKl9
zs`~U~p3wNyTAGXcMAE%rR1LE`D|y>kCO7HXR$%^nd>APV*f*orB+PzP?P$$aF7uAh
z50&=96Lj=GI10Mf=&&Yz7;7HMjq^F)V14VIv*9Oa@)qzpUDYFg$bB^i63R~q#mSD^
z8fpnZotB2H{~$lT>)unSdn3U6wG~Ij*pwtyupukCIE-F=UWuDzER__yk%Qdy=_81&
zM5YAwSqVLmmV!-QlHS2h;6?p(%l!R=a=ARukIJzf3VdC%M58Aa8KV%TQJ^6q6Ijds
zZLMsvMSUe(=LZTWYd11H8z~9^V!rw+0<d|jmGWMVnxFJRc4#)gZ#^dF0Upm5&oR|c
zKL)I&G;k+&km5TTwm&)+#GyY8bCxz|r@9wYU#<wwgj5I{j~4bHJipIP5Pu&wi4D_r
zdI4}C*6CdVer`E^{Le0wifXH9Ny4l(O1xwh4)Cy|Qki{KmGR5k_t{!8_8+H}zS<j*
zIvNP_Q{`WNrK*Us{H+~DJ)`}F*NF^<X22&GxCj6#RR+INMTJh^Y&xyh&U<ng=~tB<
zY{^m67y_<j*c?AwZK0wc7y3^%(E@Lf9wU6b$H=|F-t*B^wKy?;!&JgCf!2`cR1e-)
zICy@qO+TW*p}KfvUeuHVWUv;&=P8Yh470neg!yv>K^m2<ls~{<YP=wn;QN5BBB^j!
zy-691Vn7L&dCV_SL{?z<PKw2zJ2GM;^etXZ)xAeP8Q-cHC&M`;Dz1%oO}gdvpJ(tr
z>(;7gSJplKa^q7b(B{~~=fVEbvX#~~c!KVmZ|Ll_Psy_vcC}}h+*u#WX~MJU*@w*&
zz?9@h!ic$VsRw9sjq*u07107Vdb#VPMRbwM_IN%Iw=r33Gpw7>@iX>#udo(}REM$h
zmqs;3&-4VI&l;vYP3Ba!KWASuf?C@e4T0j=6ytF-Q+Ezwaw^KLrIK6}2{}R34Jj!;
zxp2T|jaCAnYfjBL;l=L$Lsh9+XpF{akU>IQE!(rv$De%Y)09$}4_-G=kN-8edVqX=
zy7wW`M_a)_F^?{Ls*?uz^0<~kNB(P!@{-YgGx9M-snGBU#nu{CHZcBsBKhv7T8aeo
zVwM5{$vkMip@>W9cg!Br=4R``YicSWxUQ8zQ+mlbvTIc5b?^6BdNFr}mw-Y1tXpR-
z9L_bTPQ{QN7Qtt-uJI9@w4U)@El#tC08F9{kZfU5ZOy{|1bcepYWl!d5nJEYjYuCW
ze5qHraiHhT;y0}iiA~sWUWB3cqsLVuIz?YGZK>=Jvdjr7Jqey~M-q5i{K&JcrXI>r
zGkN%>d9<@V>4R5Zky7m#$FP8*hpg$mrh6_9I|~q__ciqG(-qa1Qwi%oKVhv%X3M+V
zI%BRZ&~H#h!;g&E%?O!62~Sj16$n}3m(Y@?2ZF2tHHl#=4u&iVCexeZ&7vB<rjJJI
zDyk^)#j(vniujDY#;_2)Cp@-rypQmQ?`D_k;X;DQnmtN5G=OdRhH##>sSIUYBc&eO
zrkc1a5wH51aMpgjBYT~^MvrXntE^W|XBb{292x3GKG}K3Pp+@2@s=G3lH$mlo_A+-
zUkfu}<Ddiu?=rCw@#w#&1+YR|S`)pMi(coUW?i0BeJ1qeeKqADeD(&tP3-WV_t2ib
ztJ313+Lz(lK;f<WVc3R@VPmC*{^P2bjKZtsZ_eeTZ;m#KP=7|Fqtv6BZqKhHqcG*S
z7z+O8<a%;fx3?0T`45;b^eF?_2@$#n=KvIdS7EC>gve_UDb<vk+}oem<@#jj%9DTU
zYqebEaWLrGu1Vdf6aUr!$=nOlQ*G5Ie2K%T40^?#1)D1kLpQogS94AOEEC5v>j>=B
zYY#`OlB3sJ5#&$ZqkA*&&r5l&GaF^es2~hmTGz2fjU6}+CliICt8-G-(~IXWGwXj#
zI*Ho2J8HWtD)PSZ=xfKnbBLLF{2)?(!$Ogd|1QT-2jRIJe5{Kv!qIQ{w;u82%i```
zr2hPfPK)hSmn_8aDG3f-R|MMZ{+3cA=>5w&76vzEf@E;5zsJ)=$jteU{rUz^K>e_Q
ziN4h9pj7r|GV<rP?fV~G+IDkW`37W!)rs6~s=L~{S{pj=84=NSyLKK8?U5IJ$PoMq
z(=V_Z#x}U5;QRSI4x8<%7RcC$A;Yy4=DH-)V+_q~SFsh;cus=6*<JL0S1wIP%}X`L
z%f{O-c;ApZ=1bW9ITj+L1beW=OZDAPRPS5E>)xkh<M0J;TNXLy0JAt#MBqt%c-{?E
zyVfY+s0shR0GzM+H%@c%GMG{cJ3z56tD~Be$2r(y^?Br5BaJajS89$aYE5A!T~aBJ
z!uiM<WLdpEwtt<6XXIvmsphAq=T%~zVN?dqDmqilP9j@~at5_zL!;7#s;m>)wf8T#
z6xEozYHdLQL5q0&yrx6OkVdXTFd3r`Ym{@@`G-r)lS^5E!PN<u>O(d;dj-Ine}8KG
zlC_i!NU&tb)2`@n2h!L>blmXiO%1){xm&BWc@Xj3{?DJ&!e?RT#?UR3D$Pf*WJVg^
z7$;nIE)D&sKV8-GKf66Q&xmL)qBB=<66UEQr1E$DibcAZDas)F+mdOKt)nHkEO)Le
zpHfS!GDc9tfklJY4HIUTs`yMuQHjJi^>Yn^yG_RFtN!65?D%Fk)mB6MkYAl|2k#HJ
z$iG!_cs;<0xwu}aMDi(IyoZtk^#UK=gjy*pAYZ9dEizc1@E}MVtiRM_tJUiBO;NUg
zkuoP8GdeUhFnX%xNycJQY99j=03N}0C`%UL2CN4C?k!2rl!~wx@k^{+Qxjsu=IN#P
zc4+G6K-k840*>_>MR$2j6u90mA~06#F=o4;d(`SO+u+G}9N%RT$iY39pyVlMjyCLb
z*ldcrvJD%vBeSdX`5=`+?DSwx%k^`e5;u2I%rIV8dXJa{CFzNh>AQ^YzQ=m956d^u
zn4&1TT-LT0i;8wisAzu!f}R~T-^<p>m#q8IL@8DbXsvcm#kZv*<@x*))M$hQMUWOY
z;pd3wnt9p7A3UTcgnpVZIyvf4t*VEsfKvPgAU__yIPh&ZnPhE$ws+k{)!sy~uJp2k
zJ*P(NWa5>spU+u1!Ow+Ci2U>tmgNY`vF@WZ{I)z+Dm!<Az2|}7T<S!r2t6$xR|zz@
zo-EirN;FZ^RW&#E^puR<IVMNecKo`EdSaV1j9Gl`FQ(A<{(SH6d1l|wE^j<nG6F*h
z=mV<H0a#v7i1YXS&BMD8I$bfb4yxF~9@cwA<RES~1w0SKn959QETI0m?auMG?I&tA
zeO^X;vXA;Nm9iHpyp6aoED5O)Ko(zCy+x86J_S{9XQpw*^Jzs5)!1E+74ZfII`49u
z(s`@%(CPE0koCzB?}L+qM@1~NOe*-SQxx@-_@!+*Y0FPnBbgQ1_k4J2sPRt>mWR6a
zJE{C!i}G1B@?T0NgyQm5!EDh#LiPXpYOIz|kxZwS+eG(V9TBYky{M(`HzI-p_&mOi
zgcek$%cIs0*aTV`--BlBkmpv$ty)?Awyr6Oj}PjsD(azFhw{nP5_8ZWwIN<)2{?~B
z!7tr;RNZYhj2g^S-L;e-npcp&X0NNA%b5BW(u@57lcvJaHS&l@+D8SFtkLRj+MB5%
z`jke1&K^AnE<wC{h7;-f(8Af!8HBGFOde0GvDqLjt<=Dk;IbSlFaI%B|4Ha#GJ?D5
zfYJsJQu9Ti`%8hUp;o#JacFPZo5icE$@3ERy`p=_59a2!HIx<c;Jg2Ar25bKnJ$Oq
zC@jG79*@l}hwJt61rS*q8?$5>uOTj_TK%kw&xS9Dv7c?L!YZf`DO#%9A_An17LB6d
z!1Q=1zLG1TDLvXXSEs|$ZaDyjP=~=QdArit>G3EN^=cTRN|60K@0wU&PJVfKD95y*
z#kXdGNX2U1#4?&M930DR5~M0BiZ4>(b|v6l3;hUYS4>iR*br-2KNVDH)&3f8H}@^)
zG#?A@C9ZT*J<VX>A*b#NGG)cm^vq^g*`r`%p?dj?+dJPSFIJ5x6Ok5&q;-FP1Is*|
zrY4oK{&YhL0;cq1aGncbQ-!ADAu0lCAhXZgRL8RBUZ3J?d5<U>BH<jx?v3{H$p!@F
z{xU|VXcsp`1MeIHmUxP7)Sy=KOlmqWoZjw4o8qD8+No?OdWxGxpn(XhU0GkXBFZ4R
z7K!Vt<_mrp@s;wPAGVIP{;=H_tsFdo*M*8kx*l<S=t`S(sJ@~>JLykQ*ZhMd!0vl9
zPkv=>#V;i{RpbX{z>Q<Sbi6HeT5GJzC{eZaOA*`q3g<-D6NcPpIVP+000TfLjb9@W
z_Bkc_$hkG~2JWO>Y!1T8sH=Vd)tr*OR!32b4{qP2r-?~U5=^ANR%RnpY+!Z4Rt*8#
zpDr~%NAAB5J@_ukmnYpYH*Tc#QXDNG_t1^n_n{{*h*Bi1VCkg!XuZhlQ#a|$dfsG8
zQ<b?}JyJ#v%@+2tY)XUkvBLwF&A&;OtP#idzl{@%4@Ki>>TU$r@^Y6w<=Qn7Lw}0O
z!^a8oYa!^p)mrSuM_?#p<P7WMs$l`2R36ruaF4Z?XQ@fSyT3GJs3e686X=eKQLAS0
zG0D9SY!4Bv$L^O*uOKV}&1TX;jo?^~Ko2nV+oNxK!X6ToAxOyBx6PdkVa5`!^688x
zt3fgVN6f)OxFYfX61saUe}mrVHA&yfTjpo|<G~6p8w_Fd1?sefzm<Zs@W(C%kl#CH
zlFBwPxYQvV4%xA7vKt$@C&l+b8H88iYyE;fz{6)d);Z6^ubQ%&P<TKDGvBL~vKQf_
zJ`#Ho&r}FEDMR-02*0V0Og{{pwzBuPL1rZoGtJJ0OoCcsJ3#Fn>F+KQAQ@P;g|G5O
z5G@>N0a~q9K^P^7drBnkX~y}hy#XurnJIs1wG0otw*<DMI!j^5gO9dt-A{)G&IO*Y
zJsWJ23ct8nDEA#IP6|*u+7etY%Su-dW-|(%Iq5H=7H1zaW4?MNi>vVGy3<jLMk+zN
z4ReY&9~Ua&6Luyr`<&YcCuXcIvPG1~InEg2`xVLzQ$7=Ek*97(@PvNq@h91kU~vA(
z$W(HIk)Uf<mMR)}r}Gti_Wd>K2DY8k6%lHN93L2t>#kxu4(&hhWoWeP_HfL?wlk$o
z>lomb+wo<7Rz4p54ZmOTSMEw|kHyB^55MnHUWFcBj)C#Jh+^fw>4@{(9^^ZhJt)Hh
zHaDiRGZ?SU4dh(+g!`TumrrGhn8MrD$<b4%{_9s3k41Nm%%bZn81v!>M*1JbHC==J
zyp=L<^n*Sq_4!O%EzG0IrPwuB_aQSZCE7wLaS49HVr<6c2KQjUZU$UNasR%SYHE3P
zH>qkyJ7!h8>Zo2xGbxA(BsL(cGgzT~eQ3~qB$5kqBdG|e`LA2Id%`80o58yH36dci
zC^iPE67--+PNlHK%+RvLY1DG4pZPL%eD+P$c?kMr(ni75FTaVuF|T?(&zc7&irSo)
z+}`U|OrGS2dat5vD|?^luE-Pae{=qpoi3@e@KjrSBW41_Svk@ZljBLarJEAcR}xfi
zD&$~h9TpCcdk93EOG{r^`vFDo#Y~q{We5j3)>-QM9{5H4mKQft4$SJ`TtO+s52Qm1
z@mpQ2?v3qo9kDHI?FXmn#6T~3_mhcwWV)*caSqpqh_H5g*`iR?mzUr0KRaI!^qk?l
zc<{VNm0tzzF0`Kh+`^QjmjfI3%F7ns{Y+bM^6`cb;rJjxUuV{cxz^>ypVGaxk`1n#
z<Wa;K*%sK#yszCg3v2?Q;q3EXDVKLO?cTeCW8y!&nj=O+y=jSZx3nY%rRboAM`0cF
zVzlUssf<#>r{NL+4qWs__i%nhm(OGd!5pg@GO{lk`3MelFtxmmpxyfM{av>Qim`(i
z(#q{+0ba*$*I`W-U}_d1HR)Im*@)br_AMJeU!1{Qqexc1ITD_oR-!d{UPlsr*y-$>
ztT|OGd&eZbbWZooDtE@4jUbLl8Waq6m=%eLC(`hq8Hn@S5fOdd$@sGsp~vL`J@2<A
z6<^D7l&MS;w(T~nK{c1Ta+zMNnPdv#*9Y#2C5DrIx=)EY#_ve^8RJc&{aLJC;G(3S
zab>cN`XhMe!v7K({rf46BLiHKR+3nFHk_%vLW8Tf6a;1<#ZQ|b4@-v-HqQl+?f=?s
zM(;Jd$l^Wgl|4oFUFH}F&($ow=<yd-2S~5RH@;tu`&m;3%{0Hc$1*D4Ob*9UmL!I2
zE$lv4un2geQE;ZT>;t87uIZN@FhGDEnvw6U$LqFB%FBVlXXjRi{oN0e@S7uua{}=R
zcdk;F$R_SJa<Rc4{f_+7(~%$~{`-e@%R%<^3vXZg(ScJZrH6{22EQL*itpLgoI0Hc
zb(plZYs61(@9QV)(SjjtA&#@2f4i8z<BV#uB@#`IZI;|E6f;r?UH1-~Tx~`7>L-BW
z0v@&G3T5`f2Qzk%HzOd|)Bc!2D<J6jQc!o9lVUYt+U|!dvh$)sJ;FzV(pbEvOS3%b
z0ZEz%)Ir)-8LDhFhV$85jP{`Gy@?>hNL&Hm=h7iwM}91)S1D5c-=523%DyPc$oa)R
zE)%vy`CY!InTn;|%xLkij~<jv+}&Crbh5AXNrg4%ukLlC2t4=2g~{5X+B2Pf*=spg
z<~^n^CKFlshGs<qKcdRTu9$|_U7l=jpyw1TSAHE5ma2DU>ReJ5qv}7)U0l&*6I&L$
z^+{Nr^*E2gwjFOjAd>7$uDzyn*QU{DyNr+Jqkj;eX^);siF*03Qa48WRZnRz1U$Si
z(EeR@H3#m8x58w`xGGy908HiQr9s9JWFX^0u1eX~5cw>M%;scE=hM=j-0aHc$k4C;
zP{xND7IG1NqA`<QEQF&Y?5`tNQ4A7N2k}rovWip;)8xAA(*9b42<Z-%=<?E(_4Z$`
zsT<G!@UHW%WlVJ6e%2P1U}*VG+f}P3ddFGsG$t|-yljCow%u7cCmn~Qrw63;m6tn)
z-{-EPUR<&^(zWCK5GEmP%GeD>*l(paYp`#|55(l>Iy!s-XZ3`KC1p}(K$_$_pAg6R
zhvn1JW&~2;30Sa5#N1`p^WdF7{h5}ryp9{|Ld4%x)rFROa?+AO{TwbbPaHd5P7sV6
zt0A1cZx+9E_V+?P7{<!tco;TmyS%r_)Xl3Q`kY@m<ZjxI_kgpA>+y)_;9*br#_pCt
z)?O2BMe@7S?-=HQ;HNz9<4a*X=OxA$x&dwj7wC}?g4NLFH+nah)vt%oFHfJZFN4OI
z#ox;v0JQCXY!kzvt7aJ}Lf_1hZ9}@tKl`_olcnVgtd{Au?Fz4>aM0|UluE>7Z~cn$
zH1%n3erR=%J}qaaDkSe2V-D2g@y&Iib>ReJfR-{ZJzbyVRX{wE!8pi_xqYk4)AX4n
zwN^!Fn_FdedQD4GQ;EMh>1q2GdJVg5gJG;U^213~S#Ww=Dvz!-`oJcjw?vsK4<i5F
zx+kG1E;Gi8>4zjZz~RWRYilpBvOJQEMQV$9#qypc>q2-Y?YbAlwgcZs=JI>VzVv0j
zZi=e7XP~Nu)VK`RzUs(0z|@`~;`aeQS3v1KP-Q2GBrc$8*Inm;?<(S}FQ|jlp5S1s
z$w$j?Nc;K=<AB6_LJ=Gr;fA!~W>k#2OH_{jNv;5s^2ne)n^(oGN=JC;)ZR|Vt3^nB
zdpK73%-Dq4im<cU_>$yO6ftVLu6yspbdPZ~YUUlv?#Z{!Z@@9QYk;#oXZ`9~kW4o^
zIao>(z+b5+fyiI(t_<W6c3^`5A|;`n64a46EwCe4d{B|P`o?uR?F(HR1urQ#Y_b2N
zOij2b@*Q#Sc=sw>@ahYiZ`dYnimTt&0OHL~>=hq^a)|O0CoDscbo4=wtF=O@t^#s5
z0tcKBh-k)?ObRwTr`EGq|E+<W*6TgFic*MXuip2Hjkl54`)%K^O7ZyKmbGnmJK!br
zqHo<idQ^2{`KILMg};dgx%E>*M{eLlAI<Bu>|fMs-NZJcF+3HL>oo8Cy4DClwy+Wp
zL+2o0ofc19Y#cMQ1u}lwYTO{PM21&CqLOS;&9F5`RTH^j+;SHNy;H8qdzZ`M5kspu
zW=zcsOsETL!8NJ&X5I+MbqVpR{@pzfTESQO&c8yWT$s`0@@HZ?O^wDr-fNk{PE~~u
zLt+V)3g6L@w!y1BH(`DY5hZ)QYU9<r$Wt<D687GY?3Q^p86zl3Z)NN0Fp?wY{3>m%
zX8<6XD(@uNuW7*^dc9L7{Fc6L{7L^wI~@<0u#H}vccNki1UCKdLlZ2K{Rz@4ur~U=
zN#8;-L<TT9o!G=*2fEpY*10BAuhPmK+LlF^@~no+GK2RW*J;uq_|?t+zpr{Hu*65q
z$Z#qK&U=zPA*2}rN3}xzr`j=gmDAGVjvbd~{z-4eezKDET~Dq}Zc|*Vg(B~b;0@)7
zuZ}ZJtS#$YdBi(yU+)Ns?DX72$&u_*prYBsW^B3=y*6nZu|OI*7s({RgL8w6GYf)A
zu}#6^&>%bCyybCV2ih9vwlTx5xzt0m2V&fAE`|ImUVQ@+w8TQZ4M!#Z$`FW6GZ<i6
zSzNN-FYB3{L58<%nM|lU>c`Ith@MVor4kyW%Es1)0hrI{0oh5r?SN4ctfdj<GK^nR
zMzF4rE8@o{4|nRYOnj(#5NOmzD4d9I*Wvo(-jKKh?<x7y;3pFAWWeC1gL7--{I9Yg
z=Z)*c(kn({nou}<|7<BBnb~bf+CoD$G86jSi*Wdxz$ws=Jz^$`#mXSO;Pc9-L*kG(
zAH1pZDejaRJu%JHT}PRR87wtKIRO<xEXB@?O}qSzK`4wU2^G0}l5*0Dt=J%&({q8A
z)e}K~8(c-85Em?}V!ljtOh$WHM<~%B<1wazHETv2mzN=8PjzbQhkC3d`AdoIdz1nl
zUv743VfJ~C0!Q)VWQJkgKU<<tdWo{~*5nHPPbcrWlju+<SxpEZPb{$^!q2|}%L<I2
zl!5|{7O~rmNhwco&UN#)lIN>5f$Rg;SIPz@zT3U`dKHkW@%R(@khjgm0DL4N9a|T(
z&x4Xgp@O+;wRrGl;G?$1l4h&TjualZ%g@dO=okhmZ2|6B(v3q^{Vi+l4k*yQ-vpN!
zHN&xBh9ymeaQR7f1Lx-uhVRX*4|To2nszAZ>V<b)yOsNOO{Eg@bni%6jt0a(QIZ=f
z{e@1S8VXiueNF-3e2_qTQf@sW@fRx&xh70hAntLX{p1VMY!(e>d)<$-*LtZtcD@-P
zEatk~>|N9<;|4OV*&Cyr*&@VI6OU;c2T~*WM&E|#>IdmMRu{Z?s0Kf@U3m*etFbq`
z2rtQpl1b9}8!y=ct&eyzX=pdC3S2t)5Z%k;43!Os-R}XEu(VUY$1nPkkQr`V!!qyc
z@SlIJ5&E(&A15EbE5@Jq*tGJx8JoV&eo^**FZ`VGu)O`pLB1AV!8R|EaJ+ghep>%N
z)En)R3*r~;fOHM@hz$Z6LwE=Qn5<c%dqBKjyb@`1Jfn>L$TykO(s5`)?P40p0N9t@
z#Q8Nw6kKx5Csg)vf}>b@v<vT`n-S_z5}!K1p7J0LtX4w^flZ0Xx^PrMTD*RZg(VQV
zvO>Jdp5|4yQ7onAZuNBdmV0dIMf*?oY*aiAKw`pQNOr@^rhKGOoV&|pDP5P>H5ZWb
zwZQ9H&hYV@9!qF<8l%369%2ht{%d#UvVW~tIQDukQtIece;Ufkr%`F_loAgHbR|qD
zqvW_4g!o8nGlUiC7S`n2LknS03ol(-4>%Dc;?>HC@6q^Ixv`dr5OjzMYjOCQpk#k<
zQ&h3<=1(ln6v^q=aVO)zQv9SHSn;xV)CwoJWMz6&nlp|OTS<p26o(fi$b~j>tbJIt
zy7$4R&8H=A^`>L*ufKth-6N7?sg1v@!44xbw1fx6+KvjAYd#XokrG~bLLs<BvgPWz
z0%Tz=D?(GO3_cjI`v)F-<^Vh~y{?0@qQz4e2;uXX50CNi;H~JN8UrTSRzg=nF%NJr
z;}l3y#>+VaU!jn_p;M-)VvohCo8NJk%4;THi8yDyy7{i)iq%6LJ>5QR5T`V4@lZzq
zijp7Hnqjw=wv&cWh~X&Xs@He`eo!>JDXE`Z3^T1)u8!M9(;w;I=bx}8ZZcSaJejws
z*TdiW(7Y>16cI5)43SRSz+618)MFLmEZLc-v2b+W5R#yC+`#GRY%H3S>IuwMR5P3P
zB-thVK`23L3t6>=2jnzBg&l=m_xeiozB?S@(4$M-YiL?eDwg@Mv5wrfF?0E`Yax#3
zAOgIjdVo!Ng)pW6{N2`)=5)ax3=n2-5jMk0UcsZKYax2kScL$<gheKa4Dk&;RDzUr
zap)fOo-F9}B;!0QY2({=sETZ3_UWHXHv69!5dMZWzopA-f2Bgy(%61*CWAU9^;qEv
z-3cUUSz^>rGBV`mPe;p=h+RMDVB}M;L`6p6q2Q4Ro$_aOLD#R33p8jEbF#ubEDESy
zI~t|aqmhZ_eWrJ2R3nKVK2qB;CBZr-s1N8+Zsamf=GtJzrXz07xN1r;Yf{LzXAK0)
z9gI2!VtG-4PW?-BEd3){yF6eS@=-d`I%Qlm?I42sFsWo?14%pD>myEXZT)laZ`8)k
zCAzl{9faEGJ4UzP{%Mh^Tb1G22#oOMLn2CxNIDkxP~Icb!R?}BO;R)PeJ#y}%d4~J
zL=sYT?N|MIL~8*n%!^oUvCQiA2;9>qy!I2Z8E-oEB|x7vW_!uEF42E9tB0B3@-Khd
z(@OxVylOUwL?>RJ%PDN^>XdZ8LXUR`1%W8(w`l9Rg_JWr3c8^PR;W2BVtDiPTG(49
z?n)k33?Nz(ULG?t!lus%t0`iG%*XbQP@}IgzXBccmKJY+V~{rrX&-L)_Fmj>MF0JJ
zjFFX!yp1Z~;46Ul?(N)!kF7=geVJ98<sbT8X-2EM?;%}p1aAN^wI_g#jT2gsSo7<R
z(%k5zQ(1Yp8}+Aw!CL$*`eyM~28~hvc7EL3Cvp4t4f6K9JUaTRD9$End`t_IoCUMl
z^4naZ>+nnuK9{2MUjF_<iu=qc-wm|c;rL@2CYIOoNpF4S8p8k{niHo#cMmp&N0N9Y
zVP4pP@Dn_a{_%-b+iga1TL4l@sBe@0UMOyIc|&GdKY(KVon0TgWZN^oa77{M9{SCB
z=xX2J#lGA>sN3Iv7Nc)5ebIkCF?)3IDgD0t&vq?C<+^PiwF%Srpvf4!CfAT+n_%Fl
z04%V8zx;<|&F#Urk9TXrF{3|;7pZX$@tSMco98cd{5HhDUe5}uE~#3T{<JpG6!*pj
z0zz$9>5{v-H`_pAGd*S2g5Sg}gM}*Eho;0iXe0{DBQ2KbKD-zDZT;YYQ!7T4)&uDB
z)b{6NGBs%@lBt^qbqx%`<9ja*)M#wIQ6-`!R>Xf6esM(+zad2UM^E<%Wq54;6<ndY
z!W0)fQaC1gM$EJmHv}^d;9Y*F=#V%PE1Vd#4_I)qxbzw?oUI`(5Oed$B+M2$70<S=
zFY>cP6>n*qCvx^4h5nX}SyZ+Oh<jC83Ur%-P5_>3>NbCR#{E5Q32ws2TYJ4O{^5g5
z@yk_g?VDS~ciS-d;B<;@EU_peKXqIg2E?m=ET{Rm@tl;w;1$#TMt~58pcdoyAb8b9
zq&_mJPdm7cjt=YhAMJLkF1fi`Mqv{0!j?{@D`?87u{xVOOK4bDiT%G{FfQ))3;c0B
z#_)M%=URK(t@K8s^|6MyHsrhWtuj?{R&XT+gS(_=E+fR3zj5pS47Yn;gVMRY#*#-n
zQ`5nm*x3Z%#)n2*DOEr=eh=@wV<Z7cu}bKEZQcE*b1RGbJ01RUEhn4slSy3GtUmf{
zkTBq(yuC_*04Q(}EBeSiOk@dXJ{0$53^g_YuPb&yNlL0rf<zo(Dv-T&Ndcsl8uMGX
z$%|I}NxHHV-2p>|e(W^aKM9FF-a)&k{n8{hCYA(JF1!qq*8=u!y_29EYvwwSW3=ce
z6+zvUmGt8a#vn~Z=X;0e#s*`ja^Pk8Z{nXpku1bDAITUFlk;dh&tH-|R#1#cGE(N|
z4=_-nd-p<uG1mvvN$WY1U$Nj$dge>}aD2x8pfG|fVns$s9;O8~^FpZOa=8L@>Y70T
z)a!~M?7-aE{Y13OA+}<uD8Hm)PLx%sD0iP;OW6Yt?E(>|ZjTbex(^c3M|>L|)lLru
z4;X`ga-tCao1CJ8xT~}g%R7v=@!!t5!1Jck%feOszm%Ds8I}5*cD%k|UUA!P6jQc@
zmSs$XyJF%mJh0J;%sC#c9?Z*20APMT*vjW4&$!RD){q{)D#;Yj)SDW{0P$hq++bk_
z7!k`+(R<jhiyg)jfmMbz($!MoWQwffaw60w43+?ju>i1e##ClIJeB2y-4n$JPh_@8
zrLq95PalcfzK1#r(k0omZ#QpC+I8w|2>m)s6gGDxt*bcfMaPu<SzX?x9z*OQ?f%|k
z4a8*dYuYm^qQ?%G<&<u3bHVH}H3679J~l^c;@85@;4dJ}h*tP7Gx0yVZj8s>xI|Yz
zLc(T@`i!)I+S{S1ZQY>d65Bz}P(U^|FFfW+5Pv?Nik~p@l-|ovGslkYAov%@E4Yb@
z;)YZAd3Sshn8B87tj+f_XPROkTjhI0KyG%FgzadM10>m@<5Q;zB{?v99o|19>2l!d
zATnmJJ|LXc{8tpE%ix5aD}ZY$zb`);yIQd__yfcnZk0;RxhI_CFS;*EiHbx8a*27G
z2{Z6NV<ilKyay>%t0M*+vVQw`=TL}q^C!L~D3~6vAP1x<A$qhKSn=HP5jZtX=P{yV
zMYE`|A|^VR?avZHYH<>_<yG1qP@6Ayhn|<LgHv3KD3hY#*U6!btnfv(7(ZHo(-N41
z@Bw`sS&HC(`54mi_~^e<21Ux!+f?ZDH+x=BXh>=4W~g6U6Bqyf`RBC9(r=k~LNoGI
zGCK~J62AU}iEt}zd(bk-W`B4fc)@C^Ua8Q!Z6>%L!is;F(O*q*SlY8Ahk9bt`!U!c
zI~{Q_#1&Mx508+SZb|j062IS3%%z{Hy}2bEu{mc2Z*eMUxQeS^r=b8$>C|ygSTO$O
z?~;M+X(GgxR&Z8!Ps+^0&yq9N@kv&8a0d=X-!Crpf@y~ulIqWVY(TGE7?T4o|Ne=D
zI~i~ylH)}eW5_yPhUP!%Kb8_XdU*J0EF~ZmSkh0P`xJcR>JN4*5V)cP1**nW4=yEm
zT4la6G@0L(_)%(2-0ewXVaxWrw`)p$<T}|ScQ8fCAOkxt>-D7Ia@c_Gy5a)uMvJHK
zFJRs`Eaqdnz~8{Xnm8zSL=&*Rr~T_%QbrLZ4zFVb;(NkmMn2}JW4}<QrL}O&1hUY@
zu%$IH_NElRJ-n@t=#^dEF8NBx-*2K^N@~7yp4FzKnJwtDtDH3UA8(7#F4xZq&$Ewj
z%tkT@W2}ITBk9YI0bSg^o&n2yYL{m-63C#RvIc)V5NlJ@9H;iJE{zVk89kZ|Jv2%f
z3ftKegWUv>#7ANYeKki9DO5nb=j_o3AqFvq<8?mYcYatagY+~6T&BxRWk>Hc&g^2*
zvG}7DP+0%7_aWTAKifLr(An$E(Vzv}C~XOCg=J(>;rfCvD1?P)aB|<uoJf%%UJ$(5
zEeZa)t<V?V=7~x+T&7g)|1;dW=Z6~j)Wu`p=HVif#1te{L5-{Wcxx$R;ClQ<bfIMW
zOgmT<4EOEd(kc*B>P!AgPNH(ji?h*a=d)B59N>l3qMHnZ<0hdx99+w%ajn`#ag~8!
z8r+#-`s<%Oq9b$@Qn14w`eoLlW^7H97>gF7AQpLiz-f#&C(Z8N;n=3GGajMLqZt8y
z4>&DN=NAe_KQ639Z3$Dv$4CW|t;=Nw`?r!vOzFE0zHXk)vs?gLa1#;5wIiV|i0t9#
zzy1X2#(8wN4khYGpfQSVHeJT`)BX*K5Jd(87HrMjNJ>{i)wXMr+oQe&*((i|@4x{K
zQaiCm;`#eRJ(%mUK;S@32p5S!c!6guI4GAW=Qu&2(H5I*RIZ$8sr@%hR8f(&M;i+c
z14@9#SN&u)%C_|px;%3d8F*<L&Skp#q@Tax$9Rq%LYwXLIT-Q3M2BU_(iLdZh2x%|
z6<|q=KO`xAYD+mKUb>o87Wr5{(DGDHv0#Jmp7*ATXyIU(j+gqGY#CLekDefV9KBhh
zV2kf;U^(QpXE$R@ndSHLWGJnmeviy^|CBu*A(zxLwS_NYu`bOCpzi4&L|^SnSU2<s
zG_HI4JgDS!skG}bvI!5E`g6E+X7bHg_f5twY)rc%KW7U{83Sb1U+D)}5U!*E8)p&F
zVS+S!+)$x34;e~YU^b+F7KwbwzhApC<$%|&UiM*(DybQ-K2aN=IKq0_k%4Gid@;}W
z`M~qA?03|aD{T)~*Be>7r>EtkQPvYuO_d!ML3Gnms^BF5k`GB6Yu0NrBlKQuXQx|X
zEn;IX_%S?{+XGyX=n9G+4-afk{>XC3>;y(hCK=x41sNzx7=e5YXtp64|32SMeE%`4
zhr@PS1!ERbYkEKVya*{&JJEF~svUf{-6D!(!eSYq<zAYQrW1~+j1)~C6AvHAzdFX}
z8Y<A?!itjfZ+<&)rYec3Q^t9tTbQvuc252+vA_|v73^4M!kFCB^dUbxo+P;XRUpf~
zHeIqSYd9~LL$(1tOk(nee3ET%`o(aC?FeMq7Qu#~C5b;7hX+Wnu#BITigmAv&d4%!
zRpxf;&P=#{;JM&`wX=_W`Guvw+9)Lfn(8y`Rb1S<!i1)x#qSWYjh~E9OJZefg>off
zwNoqBO$S~6W=ew|Bc=R_<4N(G<)h12ZD>~`6Ze4|#4O+7gt;RZLH*O7$y}lDbk7Kv
ze>BlKeBom}6(@+-q+xXN?$;BH&nYhdHkGQCMYir+tIuEe2TSONX;bYq;*zp2j?yXU
zI%>X!Y{@nSsn?pID$EM&_E=(ZU|x{6Wb)uHm?ZmX<%OH(T5W~zb$|maaHCnGPr?u3
z9&0)CUw_Jvt1%*8O{`_&uNbgttIEiA3jI0wgUM^FDc2PZI6VYNpI>;6UY=ZEGA`Y{
zP|+Q!aBQRCjq6POv_CPsUk&ct!_X~jrL`X@PV#auf_DWA$5)!fP`AbOLa5t`TNpi9
zxa2wC!lL+ifosSb+oY`hUA%JvPr1zF7{#ylWk@eNa(N^O+73&CK`bXB9$qUIJ`c2o
zkR<^WI4dp~=e2&r7OD}#CJ#A!P6v8iL7+gVdHe0RA}~V;7D1R$);LaQ*;?30;?r^Z
z#LMSc$o^iSz%%Y3g~9Htgw?|I`nei}--5k!=(|fiq-)?(n0sABO)ZDW&gWsTQ;U7N
zLefCXB2+D?Y-qwRW%D(cl;??+Fhz!c!k7Bhiji*rpwXCA4bzVs-g?(E605TFOSvCB
zq`0I@kV)7xh0D8V7q1vN7#wY4po6Kz{Xxbg`{I7K4P4U(qHkQ#m2*tK4wm8}L4#%p
zl}&M)i9l!st}OdDxJtzb;)<)>AZ(7eQb;oT6R4x<zXpUv2*um9Qi*FLg3TfwCyp*P
z9*Z4!-ZUpY0eg5f|6uEtnm%yc^>{Oy>X@$DAF7t^Mu^*z-K5-p=<_b6WR0j2OmI-_
zS&A5as{^z#1cVoB+6{$vL@UT$jywI#`Q?}3;k)zZUCu~iLTAGf{)$FloYe7JBBKnU
zazpdhEJ<_8+QBx0WseT(xWdQi%-uX4!yFJV!pXF{Ay@Q(fl!Z|;q0`-Ik?#(=s}kq
z58vn_;c{}4^sx0g`D_hSHG;4rc;#f-^K4M|>{%LMJJ$~~Ey9<48D@fYB7ST&6ws+N
zKvL2xxT8$c7hjo+=iGvKt>|&K67wS>ymvzkhfxN3xJ5qP^W)S<sFSHpiwh-w@8)I?
zV7jd3T%K`}MUsSf^s#f{$?UYpfb+6<qKX(SmMUi1?AYZINxaJzr!sf@$z>*AuMV{t
zs9|X+wR^U~m>8CL`)y^>rGsjWSm7^n9OWx(Xlfy*z@T5|QfH9|7_#rHo5beh`za~A
z{@?>M*#G;wB~zwu$XAfVShH1OV@b8epo#X@g|klM%5|3VrIX{BXJUUP<W!{vOQC$P
zr8E$TIoTzCEdN0R*ER7)Ei)rsHNlCs-{bz(@Yt&`n_w72^JM7vGtBc2r)(QUQgFXt
zT|mXoF)>cCXhgj$THjQMOO-ld@)`baYd<HW7IC39tqL%OlR6xrjhn{8Mzb7Wm6uDT
zx!hcN#FOD))nZzhJn1Wr%f1SF;0a;q8aU0nTi(_6I=NXbW4XVRY>OvjEy1r|_R(5e
zwp5+TNO1Tu`l9ze1G!as&szY>ZK%sRnm+ROmuezHIfa4GTu~Q?i$5GCwGjGv+*8+N
zj&qs1*XlkVV=%IlIdc5kgL-3nm7&P6Lk*&m7?Vy0gxgrYJF<KABR!6=J*jMTm7qJ_
zV~Cp2Z9oy2Sju|Gg#09tmO%upj(-4}y&Ow}26-+ohqw#1uj~-<WZzrkL`EKa<i-@U
zLcU`1*D)$4KT4RR49=CawrHs_swc*f+_mM#7tK?@gp(s=)Q#%s*Hc>tNblE5>&l~E
zuWTN|ws`X@w_vBbFCBe|QF6s&L8oie^KbOXX8iUgd6;T?q#S<y4iQ%<fNl56qWubs
z8IJ!y09HV$zfL>j<icdDn{;6ckgUL|&kB_yQ}_<vB5S{}$458X#cm|PfOl-t<E?z|
z1vUn-iQLi|(--I!c0dB}BOG=;$BZ~dHYuyp2BABl^g22V+ir$se+IO!y0~+ti}Po)
zIT(ZS4uErZ0|`LyJHm#564>;t-xVc5b#$Nwb@w`0k9j_Ka=qcbKOYBgKT3u<k|<;_
z#NPRI>^XIp9p_uQaRH&Z7fl&ST3MxM{X9_L?N&S2u>ukyY;(~299V>dU1};L2uv^x
zGd<Y_xZp+rC*wfw^I1A~4sZd;x~*kC0_%_>fMFZ~g@~|xx}nq!!ZMIyBLOf>mfJ8g
zJXCjmWF(Zb2p~)sFDv?fU5}-^T@T?#*~ATl42rp5SUb+Ml_bn;O!N6(PFU8F!QB#{
z-2}%*2So?ZC#Ri70-<o}(`*b5NS1*oLhRUX<UH-hdIC%SG<KJ-;rZSp%l15hLs|(t
zkG|tz0Kyn+NkI9MM*RII(I<j%J?mW!gH`MacF($mvE}suc%*;oRp`XR1(-XZ0mHt3
zKbt3oQ$F3mbO1PDurjQ1zZ$1qK<)*Fz=7r26c$!p&Ylxgf`XQ;5En2&VW0PNuS;&f
zr<aG{UZ0fWI=8`9g>t2Pzt9cO=;YMn+ci(Du*<;#v{2d3ZqDY#ci3r%=hN$My!Vp4
ze>kbo>q?~G?m*!%VI`cKfG@jQKMuHkVC62rguXlHq=m5Y@RI%b&AkygsK|RI8?bF;
z?iNv4ArQt8!k~kE=5|;C3_%7%{C;6;!x3SFEh$RBXd8gB;&Be}0DxXV*qEnf?rL|q
z0#X3L%)_SWy`lwC!8V4@^mcN;i(8}P-1hlEj#QnQ-O0@fw@jk$nr$UtJd%Ogmhr=2
z6QUD1v0qQU>tHWiEe4Vd(;*wUh1YIpxca%@*52%z5pXvTY)=4GEE3@0N_q~Bi;?E<
zZ`gyz?m*zpvr+ob`K!MV|NN=UFAUwbz_Tu0N`zY$JQqhsVT^Om?fH~@2XcjlL_E#l
z;8mfYP})uBHg`4$x&|FW`{j}_$2tY(28hB~`$&rp?!X}%h-d*ID~}W|YX=*{US61Z
z*e$4qj&n8+W_UV-2{z&FMgah%(#LChm(jPh9N$B{O@iDBvb(?{ysh%sW$owmC<BHJ
zPuoi@kT>V&%<&{(4h+nR##bdfESYcJN#|kN_nf>rGw0_|Kgo7XC`6^7Uy*;`pXc^7
z&c~~eut~SDgw~6ULCzF?fGvy}c0CTOtknU<^~{WW704B(1>K}W_f?wDg#|X$cTBH>
zjL8TW1^`T9QiH${3`8(dG8`SyE`4{*)33lX;Bz+kgkAcw2z%}I^d_tq-wwa<xjf&B
zw@)EzIb7)ujnLg|+O+3%Q&129V0llvt1EWO=)9AX)$scFPxrfN3%P_NK1W3^0Ivax
zgALuWw{l~clHL6DKD)f>`{E-r<9<E?G`~A$fA;g!{(Q77p)WXe$0=~@1D)sG;fkV-
z^S)+qst}Zmy_3pUabq(m;Rt%3C!bHAljA4yor8`>LQgmyFo7;i%myHLAc*ssx|nUA
zP+%AG^3T72=fD5??*IPJ|MQdoeD}M*{`J5ASNl8wi>JSGkz+3|ZoU3+x&gi9AKXhW
z$M2u8>Cs(fhBN6r4B9pHruF0u3xU(;Sy8r&tZeJ_0GY)V)+XJLUuNy~>O9<KfknU#
z?||JC#xc@!c1+g3-@@X0PH)1JedoaGrjNXT`{d7mob>zs{C%fiZ=dh%PVXW#0Fe9R
zo^rxHY~&7Dm?=T&fi#WkHa53|F=x;I^I!jr(%t9Y|4yG?zV3d{{@u7Sw|#b6ZuH$5
zjFBMFAq-^q#}?Sh<-oe{X>rIr;G{#?b`P<uj=PW3Zj;1!8LBYbdzBsTUUDw{CQtKX
z@}02QGa(mB^19g$IS<3x?))r#RsccX+MIU)EO*PLGv~VV^Jkrn?A?aEfB#;WxCICx
zfsQx58LZqnv1uMt)}Qwt*$g*-{a4Q!JpcawZCIATAv(9``^#Ux_dK7cU!R+WX(z&<
z9Nbh2+j5YsgB`bdK(|E3L5kuk=6Obw(LbJl`TUQ+{`%KnfBpRV^WXpVpZ(|Ge?RxX
z|KI2LD}bhmzI#jVdoC2f!RUZ_3cNS)zzZD+e3)iYIDms$8J_h;6g-?~()C52EROjT
z9Ofxd6SqO1hw3dRn;T;fL#DW8<0?TPe0J&AoSU5637X6B?P2E{lP%GH1BEK3+~NLw
z<9M8CphZ7V1LHg2DQkiI&Mdjvd2HVgyFOW$tkufCv-h4ePRvMh4z54_b3cFYyPO|-
z#M}G=b_@mJtRrH9IlVlCC2UhvpAe7gD;IX2cVwK=a-PrU$@4MK&%^Wg-=F8NpPc;t
z*K-mWBjd7{T{>^U!5s*eU8ur<VaA?lA0ZhytgsFd>;NEZ7^r32C5CNq9B@Fw&H%VQ
z+_85gwt5HLhAjYugTR68k=Y6WxgpOHKoGLYdAl7)iFy~?(z!}6;g@xDeGapX-85Uy
zMvAP?hk4kyYzCH(qxaeUW^xJFn^S$fFB?z{zHPQUch2g6Jb#Lx#J=P%A-<PLVXQar
zWl<<YaDuXnX1oIfu?BP5;+WK&iLA}Ki~H@jY{z?#+=X-kj1QsI)zCge;f~<g09aBi
z5=+UwXKvjJ7g7!drgZO=&{9{Fc|bNbFqX(zy5o6>@AN)@zIyMO^}J-brC>U7eGYgE
z^XAF>uJH8(zKEl)(UK2k7kXuDg@{fJ1@MyZ25#Mn`$x|^H%1e_`vhgT?+OITPPj+>
zt=}<^8=ud2(N#7i&spyl%`9j2`49dn=W{-3ZqMgr-16j=b4)TQgN;?;9D&DzAT=9d
z>lgxgH_CIfJWOHif-70~&V<3L2&ha0+<ICeS%Co{5O6ar01V&vP~s4wm;(U;U~7cF
zW1%HAoOX}itD@dRp(pnz=Vu6`Pq2jhq}*g1Q5-1pws!qC%#+;aUY9|6cqb)7FAq45
zz=q^7Q{7D2g|RPudv>_=5N>&nzBgRRpKlmLuw>M@yZ0RIcKK*IW_Qo$-DmByTR{z;
zHqg;MdEH;<-~V@<zhDwyGR~qaBo7IEcn@s`oNj_rM+ld6JBH!!8yMRyW?(LYtUC|g
z0r&XgrfVz!IUB)U$?0Hvfw94KgIIxksb(86V171)jVNQofj$85L>}pl=g@8O&R)z0
zSKfFzyUX8}jSoKO7W}^9R@vUsv;g$og}Z<*)U2xr>*~Rob}x)a0EH`WH+r)<Xz#Xj
zFMqzrjDjEHkI+gS=8oL}q>F%fd3hE&ua8`F^v%w8N^5IjpQmoiIe8g}JN$XSe{ulj
zuodk9Agl_<;d=W}`tAb((8Cy<m5t@IJzl_(t|3_gHaS`n#<^yK1zeb?8)3UYc_*7}
z4B3k#upld|*-mb{4FnEdZo3GKF@z*=SdhkZ7c@IyChI5dmcApt$&G$?ccAE9-i8;#
zbOT0K=6rx9lyuU#(cpSHj0<F4U$9qtaw~L$scbTKDck+C6t;SznQO(E!n1)m7!Bz1
zw8J;d``qj9q5MOhXVh_0w8wVcqGw5;zgG6JcR8n=$qC|ew&_kzHx9yj7ZEy80g%C^
zhRZ>!gQR*ZG?^$!C)eD1FX<=_6eQ1mV@0S6cH-EIf=CX_mZzvhhb=YtHT{*9BSc2{
zR%)<o$9m`39+fdE-tlZ~fqO4}FA!eo(m48snni^XH^PxDE5O^yE{tOhuo2oLADR?N
z=nz3TI<S-8viyI7;9y6xB|(;>s`-hmo(3Mc;{Sgh7Z2cq98TZLIBrIf-JDlyHL;6*
z?GA+vNMr-948RMV==Xd+EA1bB_U+D|Ku>NRgT2$VTOaP>_2$psie0wihpvITHA1<B
zVc!h0q+>aq4-1@a+NH}bFy-nczMO4?4eq7mZL*HNU;wD#VGl%4d$_O-aF7+0zQ7LR
z957+r%M!oGZSIwfI|d-E!Zr`vD94daXz5i@Y!7Gq{`LYq=kA1E+_NfCP4Iwlo`j?)
zFK}BA+hu6x-3Svq_K@g60bJ)`-NmGIbWJ|RdnLq^<pH~4$JXVu3hPDD!27$W<DP%X
zdFzq0`~7^bIO5yFQif)GertX5_dWdk&wknN<vVV0f<V<Mx%Y5a$Ha|7>}FrsIoImD
zbNP$_<q5nBstU6&VtOHm%XwZtz(CQmtB|w%ITug>003uSK|&{{-Cd@;h(wSU1;A`f
z?kJ;5hBE>e;J4=-z_Uy7@tp5p1iME$d?m;^gLlkltQYX5a~H$d=1$N%x!2`h!T4_L
z`keb34#SL1aO)zw7qI^DV(krftRfZ$48a!J+HC^4fBnQ~d-Bb`=H>YN&EvIR&RdM>
z)g<5VhhH}S)&G9+-+m|G!L#St{8)jJOcu{B8#E%tp?99!;OVv_3ZV(YE6z-EdIT9N
zySPoDw?f?j4eawMxczGd218(wfEkR<Tp!EsVUZ(Ffx)Up=^`8B4u<IaqN```(QKzj
zmh9zTPx+WnfMg9hr*#xcf%~4rRkoGm`eb_tS7N$uVei{82z@za?3|(Ah9QwIk;|d7
z6yJSu1rPMR0S+i2CNSO1y&0T?yXN65H_rvgc=G-GJ!xMi-|#ta@B)ExJzM^@|8UR0
z?hEC75M7z5G8`0rJ!1tQcLTUSLFjTM$$e!&_HsMUlyhUZVH3Ksz|o#ub_*zD7k)W1
z4;>UQxIPSHaWcxGaiW0fI~f5cFv`Zp1}`Z9mOIxWZ}-V?t3hC3_WSU@_(%G}+4#!(
zBy^!+pEJ-7VLONA@Y@q24CYxM-Xb?Z%YZXjva-V%#4t_!bC$GQ&Tj*3k#l`kCLIi>
z*bN*z2TG#5@8Lf0J-M928F}{iJ}$XtqOR<6PFg63o9ENZ{_ywiT^ocmDa-^QFrSRH
z55+MciZvHd#--akICSD*5#B3}fOqJ8>`mTdU`Pie?FLTS+N(<#bg(iQ<PP#K1Kh?y
zA<J|GhF$;x6$b2NtU1%YOWw&$05Hxoy??tv@UlIJW+!A?VLY_*Eo0iCIg!07#$E3>
zzyk0%R|stN3_MQ2@MmLln?PY78C+YnpFfmoHy94+F9@!~q0H@ZW9Rbx-G_#s&p&TM
zw#er~R-E_d`~CT>f3o}h<ZI8*_uFeuI4U6yf$^{|590!`KpP6+(-#CLoLF`_4o%(R
z-S=9+CS`V?Lm<!ZJ?~7a^4P<QU;t@c1|TpHP~7n4j4(HM$>6<r9w22{GGLqx0+~5S
za(v0G+^ghttVqe1?05It8}4yAZ$}zQQ&=)Wr^EKkp3@ylXV39se|bq^6<yg5D3uLx
z2$1#kZZOi_(Kz@*{Jgcum=1&$`oaKPp^?pFhTpS#NpI<&{mNyzTYnb^4v6+$J#Ifg
zf6L?d{Vs=*0jxTtb@ydtzi)F^C@?~)+TO};62?##Ct3#USER6>Ab{h<ug6}t`T)Kt
z%q)nEAt(r}1I)H3yS0~SDOF2R2B*7lkpbHAPQdRgVp{Y^BZ1J8?l7L)D4TODH}?Xb
zaLV%(#u`DmH_WRrM5IcF-65WF-C&!YhUk0%fL3l5VB|wLmoqE<tcJrDhD<lZ-oaq<
zJP-cl5OzL2KYeaE{qyNg$IK<!$-68q+qNh4U;lX*A<zE%zkb%s4q#px8yiWY-5+k)
zeJ0JW141rYoA(Wy8LN}c9$*)rFWd4CMmR%yPImh_=z33H#4CgD1R&oFJbx>jIspJE
z0k-D_Mgv3{yM)Oc2q-A~{Le4K){L!4&nb%!!sat%`T5U%IC{K;-=FD+viHx%^H8Qs
z??=D^0j}2|<~?{`%hllx0mL|#cYhcFW5`4R<l^V=JD%0=XO`!jWcqzbYi#Uf1DxLf
zx#jzxpI=t~^Z)+!pMQS;@BiL^H^2Ya|NJ|4zdfQwJ+Dn1@O=5m8le99&-cgbeZu|8
z^LznWTv*IoIm^%7LH782!ld?n)9W<3*#N7s^L!gm-iJ4|hei+%<2c;xibzfwb$wFN
z-n*!n0_KuSF3`o1P}rG(SuPt6SQp$BKox*tIu;b;WK=<@ORnkrkr~F*SNeJ07BNBz
zv|h%D!vbZaI<lnCx#50X@o)lkQ+9r@s{kOY7?@l)KiTVZ-Yjh4B)d7UK!z~pk^*x7
z*Z=XK!_RO2i=VoGp8u17{{3IyKh6L8{_hDr8?on-v#;dN=apxO?Rmbr{`|hgn|Vkf
z49G5k^;~9h;Ub=E21w!ii;$NDpSQbpx|xNBI1umU^R5{}Nl*G==#)O^J1kJaEq}?H
z3;@Qd4rB#-3%3W)mn8$>v;wg4$Tq<~z&72G>3ee=W^~*Go_ENO?;qux=g;XB*ti&K
z(4%3=U>#U`d0rh`SB0}Z_j7I!To1f#2&Z%7476}j!O^hC=WkE5$-A2)*)SJ}Mx+Od
zB7A-ZJoJ;Ayl2nPpFbaX`1idH&;B`0*!`SuAKW?pLJ~Z__j&N1KfTY&G*5cNpeHnk
zGB$kNFCCD2n7Rsh?&SL>m@iKYVW7^7z&fg7mlcI8M{!QZu;hD1pFx0ijGPTN9K*>H
z01$v~QYlA>Tx3I-V}o{K@-B8;x1Z18Fkx2^;4WD%yjb=P#0<bA9!FtzprV&;CIQ}M
z052Ku6kR>+YnHwGHW#=B0c37$VcJjLj`rtl{X9u<dOyz;)U*ypjQ6hXyRz<f+}hq3
zFWWtz+^;D8hWk9c({OLLcMov>5cuQEp?vN*xkp0>+QG@j6sNkF(6e7~Lpo516&mqW
z0{85lc9yCzIN(4MmhBDz5RNNu7y#ED@xq{HFhQFqOyL}u2evIin6L{2U{D5Q6{x`_
zaub4#!^%U;b63vullw{O&ZyUO0c`wLaM`xF8n#7-0y$fDZ*Rn;yMx`uGPoC%F$3ea
zX#8G%&*ytVe_(t>x~(@!9?H2dxC!TR*u_kyWkrOvM_09f7a$j=IC%Vi({j|ld}{Zn
z{mD*7%LT`-%_otZ-7$zy5Cp#3F)0As6Jgs1xUSWCH^%ZZj;=nIp?j5h&IO}&HE_uR
z7^5&?2MjO^aHTI42T7B~X;fit;$SoONhJVF+GOML9lQ+v1kN4v!{uoo`{y%wc9?Es
zK*{&lGvlIeaillzi@Q~rsA2fs85}NpxR%G&-v$I(VS5p_452^n{`xq^Bg(Fxhxamp
zgB!>Wbg^cG!N9FEfc<Xg_zU}x-~RZQWG4B3v+e7L%RSHN!#&|V16puM=#s(G2~2f`
z&fU2yNV?EH8<IcYcOYY7z?E*3l*8TIlaZZmW1rK@V9GZ8a#%Yh1p$O18vq`0dPiV@
zIG&mj>DU;;I*-G_0q`)s<NZe%Or5upHD}*g&;31Zx&s7<TMO^_$y>n9IOHx!kLM0X
zWx}<{ZMFbQYv{RO0&KXtIbd`O?tFUhNj3u7k^Hf}g~9o`Q#`wjUI7{A&}SFO5^jN>
zlix}7zTs;p^7(#q4xDf=rXi>K>?c>`o<tfTvUw!yk(B4m44no09sxNKkWcO)!$To-
z$rczbK*6~y7rR^o8<O=NMqm?Rh`<sG4v|Yb%0S14>Hx;1D4WAf0T}?j3XFc=H-LrB
zzK0P@KfH$JeS0s{GhvwJy&dP00)W|A#O)k9+hKCxc5@|e-%YLuTm(=ThGP>IIN5ma
zJfUA7jPDJ7*o=bbW6Sx((6}N@c7!lsqik{N>5bXpcf?<55TcYv?{|9uzd3pEv#aB1
z>zZ3cwE3+2<_L0!T-jCt)<n-_GFJ8i-JI^QVM`6$*b00IYXi_>o8xv)0R{qnGX#M#
z<nHwT<kilBcaEqE9yUb8;8PSwBDA#6XUDq^HtAsBc^>&Lz01#J?0m6z+b8&T=(<J9
zAi9~-o^Rdd4vcZI#RX*;?B%%6*+9ni86s}Er6((&rx)lQjQ)Q^6gox@u-&ABqATct
zfg@ZvFe#iL>YOR@zM;W$((d*=>+a5HgXNFF;jSNL(@q2+%hQ%aJD7QI7=;P2fz}wu
zGJxKx_PsT(Bq|K%07njWJ^h{{89iq&=Zvrlz+fi;0LRimLI4E-05KL0GFFC6WdLJ(
zt2=naZI`p|GTGmrT+Ys;XQiC!*x<{9#$k%E?~>KyB%a$Pj3<3I_Qfi<Ks^$x2M|q%
z?7DQ^&NGAorx)QlzyAcY?b1mwWg~eatM2M(p|2^aaK@I69Nxr0`HX}~&WUozvVAYl
zQSRsG@ow1;*+$RZ!(HS^1IXe$nLx|iSTZQ<1aJr|Y*cnA4(Qh7m2YRZlR*M^jw8zi
z#XTR`ILe&ZD<G9@yeGNLu@gm*!HT5>+3{}TCBVEThYPS)Nj&WIo}?b`7m@Oe-RILc
zPeDX5=g9*ykljGKlic5&GnO;pa8h>dP2l!<*z(yn6sI%Y=#V4Os9sNB`gS4g-V4s)
z3Y$CJdc3d-$wUAI3?~_AdU<>p8GpcA1m^QZ-%C!ezB^fNjVooq2H@>>WZcRV4p)b;
z(G744Y)m{`<T6dbO}7t(VX+)$FVCSpfk;qr#dQK6m$PBc#Sv*87=|0UeHo@RL)nO<
zS^x$E+)l<FY}xYeu*8<-+%PVIHP6`%fNy9&SwGgg1c6Vi9UJ2C%1Z!c=w!O&zIO4>
z(#2cP!-cpoA|3}zs-GdF#mnytJFwgDg@l$n20L!E$_fA^MRpVJv6DMM*g2>1aq%U+
zNaUQfq|MX2i)vtDN?=>8yYE|vhc-XMRp;8U$rRd-3mYt$mBWMsNcMSn(Cs+EVOrb`
zNC9x02j}_(Fw?<Ha61CP&T{s?&(AG1r>}znVOp~(k-Z3D9EPF0NOi&&$K7ELw`;%y
z4`bzJmjdOmLHn*_BTQj;<DV-Z7dvp>^Kc)o{r;S{nF*o`$T@SxA&h6q>#n+?JmJ2X
zXUgr4w;6^_QDiT{!iFGj<vILqxL_L?++)4x*^gH^%Y-fW(p&s^`TafaV_(3?=@UMC
zgS*{OApzf2ONdi?2YbsD*xkcL?7|do7ZTJ?XCM&v(jYy@K^b~zyJ5`zA^=TV6;5Ez
zql|nTf&1N60L>U2<`PO|EE!}X>p5pc7|_dwtwqLhx8ZPos;`#8z$N1rCy{{OUvS;a
zlRiHP?A)v4(CxeICGQ(uKCrDjY^&am+zamhT~^4+J#OO$pYB`2-UoiD)QBG#P%@<y
zOmE;;_Jr>j5xm%j<3~Ocvjt6i_im5>@^bG%e9nuv$?IvJi@OYl#u|18?mh5HS>*H*
z?_iL)tE_xruOm?DJ(8hjgE_n>W1<SfLC2t;!xu^1;yRE)rD_Ki+Xwu<EQQ%Q*|w`F
zz(7M6)~XmoWo$zbGK+yXocNTz$N70)N-P3ChfARa11aEn_6q<@sPX2MypaRLWCiZU
zXtL#O7bdP8JD5hjo>gPoVfOuGiwm1W7Uh>Hh#NQ}i(StrEA_6Ni}fdmU1;#rE&96M
zoFDI4sw5qk?&_@Pv@Gc1<?SDr+p_{b2YU5v00mHx!(c(3U@sWA{e;QN$`TZuK31S8
zBkzs4LBa-r08({@Z3cu$h%GaBs^_=5kCP!R(h@j?a@ZyDon_=i3)>bm$xQEd^84T@
z;@JeBOyGXOkZjSDThObVEuQ7jhvj59*h&pjo?%fLKHG`{(4I&1tjiv3Ny*3{8v<;c
z2ga~iBLHkWG<ebp-{xc^pUcC*)u#6*>BB95hW9Og!l?ZC=77panhfNuTb#X1I|5<l
zu(q3FFkpAGPzmhv5hmsNujgj4kc?D%d%)Uqf?`8CVUQNMFqreeg!AmOhdCo4Q^0b1
z$w80-1n4@)Dsb=NrAQe7!eNoW?*jvWPJnxT8EnL3b{GN*(12_{?|e-Zvr_7Z@Fl;C
zY`7VuIk|Ti)+fYp$E1?zG3oQ+TQcG90Jy49{QaINEC9k#fYsQ+wyoEM?{_boSKi!f
z6)qQ&TyyQ`z};2(=5G%&SUVRwDS%#hTKDGZEknU`7>w;u)c`}nJuI!q;U!M*<%~0D
z!m!_4-LX)0^NyMGf{a8!7aXt+&-M~2txq?zFgDX}0m^j30A^q`y*tlYzyU7eTN$qT
zVTIN6!k71Zp54r20f4S-0Ao_LcIV-D0B^N6>b@CFMA!yn+%IQLkdF2UVS^+7yg$#v
zBJ+MvSb<=M`~8bY?(fS4kZk~q8@h>7$@AO7sAnbt0nQfXKEE$K`S7jq-23;0wr6)&
zDck`%d3ntaw@x0`(FZW)^X*}{5)HzZO&9GP$sAj@mU$Qp_ck5SF*Cf}yUTNW1&1hP
zgsL63mE(mj2vWiv>V=KMoB-@(2*4I8+h9W!25~fQm*babS3e-{7i2hOR96Jn4J2vz
zxB_W&+z#kE?6{&b<c!{SxAQ!>Gr5;}sJB3Veg<EH*>@gbHEqJA_xYrKzZU=moq!B*
z2=l%W-W;mX%`+_YXkZO@eGcC4B>jJWPo}TkVJyj=pyIyoIj>o@k=w`0=q_FaH(?W?
z<BG3G1n52~;n44rq3({eWfM0Q#%UQ4(0PDe93YW*u%Qe#*<llSVLCPe5GXoYgixgE
zP1?;s@nQ3D1%ki>tUIz{A2>0gJPZUz-ND2cVGIvV4=~g1;=V7kZR5fY`(f7{Jf`FT
z0EDrT`0eWxKD(T}H_nU%VWelB*#L#%U?X*SwH?ss=U%uu+pTw#=d;T>x!2Aw-xm+u
z!}Gj63bcCGOMI`)2z>X+^0?6GdR)0L%9aDJP^WCun*%$JE#L|uDCx<#Jzkkk0FViH
zumIUS-<$h_4A=&Rq&(84-~mLCa%|xOL(51<WNgMT?2tLYc}mzyZ9lu`Uh<cle57y;
z3T&6y0g#a9vvs|QY+D~^Oy;@`D72(tNoV6KaL?8un~->U$o=h6xZ|7_etQNJx&sk$
zYzP2=y5-0;K?mplLeu+uVc9`jpC_$;KYO3|Br>PxIKq7x+zM;f5p_u5oSQK-Si+3D
z5-1c^(L3-AmW#kSgjGlvDua@3FaegVUZ}7Ygq_YIY`Yb*GOS^nBFF$htH8$CK)wa(
z1fa(oI|NV&`)q8$?!y?DA9;G8`}MvHtOL!40<e7Emp_KrcRq2x-@&ZG6|P5ss!$f%
zR`&ATCP0Z(4qLm!<IRuNOC!UU3qS`b3<BxE0cZ2v+gKTcHD7!YsxVK>4!w}X^Sk_I
z_m6NVKj%nJzl76Yi!>*U6Lw!d-O0;AnJ|tRw<{hX=uDx?7#I!!C}n_Jyh>FdFxa-i
z?k%#>h3z<S7+e@<v?rS}GJIeF5E5A7HYl)(KndI2pvqQ&k5{$<Q#f;F9mjX)X*)wK
zab@Ey5-3^zEKEKb7Te1@jQ2G;jLj9^7Kd(9zOP^q01%cvz<J)|a9<MyfKp=Rq7E(|
zE7<^;meIQ$y1+y2!@_=8%)KmjZ4|!W&-)MM9N*gfc?P!ij+`#s0Tbn1&$a_z1~Zi=
zk9Nl`9rqshPz2~D)(wDtU&Zy~Ezgj^$k7Zg2fWu7lEa)}s;<w&2u1ehS?j}CyRabx
zJsG>O3%Etb1O~A5D`DG4=sEZ8agk0CW%laMd494YM_>!w1qg!-6<~S}V};9oGt#GT
ziDBLn?$mjUOc~<@79P8R<bkuF=jii%JG{6_<8~rnDQACO1ULY=?XY++0OwZ8I+&}>
z@!hknv`OOm&G}pXIc=Z!`^f^2z0EWDX4{oZ7&C|KvwKb%3ig^Dda|%UDS`||?&bU4
z1h-u#LbyFomnE`HHarstgN_KqjSH?}42E~h$zXsny$E*B3v959?3ciZfFr5icMn@o
z)(et=w?q883q8H**{v@g*CkuofR4gej^5cP6Jtx3z3&c>-!;@gUEDU=|4$GcC0Vj9
zM|NChz9X~hp&!wIod5Vpp-@2JR^^H9W>mF1cJ_e4#6h)MI)^CFe@rF+e5wF~7TQQG
z+(OFHi?RYtgqqHPpqO6Hd&_ARHwQpMeRnO*K5xGIZfrw;mVyN(cFR>~M_Np^t+jgS
ze8-7|3b70iuZa|hS~Z|n^tP2xiV`Xct?@CXu0&cv72GO8L{Ozk>$J22Kt;VMU|>UW
zi>P=<0iy;Aq!tUHf=Z{-BBYI|2q?*R5F>fp&3ROvl_%R_dR$p8tr|*0fDS85kKT3L
z)E!Dh9<BGf9%wig4Sb)D3E<v>Kx!$%QssVMJo&phpwi|RoYu`0M5^<^E>H<+y7feY
zUb)4o(8U}TVNmCE*E8pXewfY8qX?9|T@5t~;@b4o8%ZI1+`1S76olJKU*Frtl+xn1
z0Hs4XLJAV_by@@{*90oCC?am9UM#3p3M<T8rUgVxo3%(Ka@!~f03?BMQK3?2C_t+g
zKq!$!CCUv*YLA<hG{wGVp<iD{n^PW|UIJ@CrYe9`p4McMR(*-T=Ap(;yKJXI_@J#A
z!M&dusnLdtwpCLszuix;Z@2~k2o^}$y1*zemI43>Ya3b>;UZr=3Kc;}<YQ%ZTDR_=
zpU<>eKVHqGM|fJbU*ky_4?|soksImG0|H&#iZZ_OnSjg(!6KkRdYMY16(EVyHVTq(
zR8ZA2n+B?a#zi8)bO{0^ti-n9J(5z{Mzm150UG;*6v6;N5S0XNB~mN^9YDU3w-PkP
z_g!he#BGf@e69=IfZZaABh)o1?l=fScE)h9QJYjjwM-oZEVv??VJo!=wn&;S#Xh~C
zXaE3FYN*r_J#YY90?{&vqO44}s^2}+h)(;ILJ@e*vGnjh{WE&GJdLMErdFiQ5vR+T
zwiuOxB=ZEZ3|;j)Lev%_0$N!Om?HWC1|)XD0McR`gVb6`6|798#!zL|Du|;b2tc*(
zTiF<dBn8j{6t^u(+6oC&5hz7=Q%O^y127h-rB#bnHI<g>S!A|gW@w?%NC60fwt*H^
zingk<qJTt;s;Q(3DobGMr*BXg#)>?kR#=uMI?}zd<p8{~9lBpGMU^B?MFj|e-kz4W
zENAK;k+>f(s>(Bw$ax;O%n#q6pSd0UCP(@*4FL6ER-?*_r94lHvX6qZxM%~Cz)No`
z6%g>23rfmEWfcsRixZ?bHI*nZfZL{`6jC<?2j4z^X@It!Z87qRVVd?92>_HzricO!
z6bfj7s+?YX=r$#LnO1TMJYAWna<uQ$Hqv0ETngA(OYJySwUxHCKsc1m{gg3a6<M~5
zL1JrgD*#d%Y67jOT|9j}d@fIS1d2n`Y&}RS)3j><QV{A&hYd|yIpRKo;MNGFYT({$
zsgHiX=by~B{-u{g#z|DPvZPl-v7@Rq8r_}B1yp#qV<grVb|R{dC`H7ew%}&K0=yrr
zX64{w0EuuCXi^kvS0WhcAq4<LRE`?U%mhR01yH@H<OLZjDUm7=kVP$&p(>JKh%E((
zxmC&(9uq}@GPI9SX`vF8gp^IKibg}B(9h>yq`Fr*qznZKKAL?cMPA9ptQ3Y6DiGDz
ziSN&?kt-TeHq1oY3Yq((V<RY1t7PfGNz5XoSOARtMiCHnW(*(k+2{TEbE}iar&<{y
z#iCP9YfS;`Msw>!Y19IV08KTux3IEhVYPyB8vu>jK1g7RN+1~#nO3w25JmFPaVytj
z=_vpbCfQ@{Hdg{4C=Eq8rBZ1C00Od8)Oa-ur66HLC{$o4jJDCtG`-~`RV|(@mY^+?
zTWf0+Y6q-23=}s>QyDdFt&2pk+HtnpkfE|fD2$-g#xnh?=C)EtEgUSYBpTUXWVTYP
zDNt%CmE3&=C`+R<soJWYR^)k}$MDft|C#f4BQquQ-8h$9RS!9lF4)nKxK+)tLpx8U
zx+$VYKrmo)3*NYa7EEwpgTXE>4pIOM3K9ss2+`Iq<8T10mB6NfkvdROG(bAgY6@b3
zVxSNJA|U{PQroK7wpuFc)B3Qq=Cb5R`XNS=bl<e85>SiUQbX9=hTO^^>4qW9^fLDf
zpddh2nYvrKji?0_1P$OvX=X1u(-9yQgeJ=o>n+p01qob=l_Cc^Ml<4raC~;jnIZ=S
zeP7SCzfV4M@ta6ldZrMT3BT3DB@mNJtBo*|lxS268qr7$DF}$TZ3|+zpaLxjN%c{o
z6p=-;5CN$r8nvO-l&-DkXuiL7?3vM5$@%)$ob&x%(*j(CK!O6aFaX*WLBfNB&`hr^
za*EiMh(fHz4WUIgf2)_KgIl5!$y7yx0oI`P<~;3If>zyp7LCLf0t03Zm=X&+aaRIB
zoZbl%_2@lc?+uTGM1X}`i56c5BpLwPLLmgJrSmoeg_*P;T)FKKX5L5#wCDT&{f2(-
zoVOj?An0oIJs+!b&pmgMHeeFzeL#Cy`y+-{Dl`Iz`3Tg4+PKH>Go~#rNa0<<N}@iX
zR)zwNkt$fG4SxUc|MmXUY5$79d-{8S?)$^@w#t8=tp+F=bZAustXvi81_WBWqD_xm
zG+5-Mm8$uR&rc#Jw6;_?=8a`e^Yu|E)wz-cjWBDYIt9^UQ*>tUqiU#|dIxqxnNVPv
zzIhTU6;Kh4n#6X#&i~xY>H6jT)S4Ez5DDf!S|<QSrZ}ZC@I`!s8x!b2MN6Nb{kp2Z
zu>JMn`<v@Nt?XvuYFfhK&ID=h4xwW1)pg-$g#~pkf&#VF3c{I4mI$a7p-_d=&^8+Y
zT4UKqstp_fB1b4tUX`zZ{pWlxkADB2o9|!$@$Y~CuWqYfzYsx!7KyQS)e7hp)ld)>
zt(1Zipr8e8awO#G9G7v?xKUG-P@}SUP6Aw93fS+({?vuKq>AK&=#gm-NPZVfNQh;q
ziVB+{LN*d9NN~H$e2wm{Cw5FlB^zxe7ePhtTj3_Oj5ab&&-7ZL2HG_Xl8_tA&-ct3
zzW&Mie%}53=ly&!pYG=?5$)a4-5gbOUq7pj&foV$%I^88SHLt>h*_W-aCH_zk>$#`
zv@01*q*N39=S(RD46d=qkTC{aZGrLc-~Ha->i4g?`}^xxnOVMvU(>Y(;trh;wh&0*
z#^t%Gpw&$~0(@nGT!zp{5Vg3V^h6W7NFuxbE`B3<sZc=;QURw8R3N1Ys^`Ai10L9Z
zxzbQ<+&anq*MaVLTg=K-Sp-U`+M`b}>s)#Zo7t5d&HMg-r3jbWWfdKTbSm@tGRU3Y
zBQ;OrRFTjE&lc~FUe0ewCOt07AC=NBvt^((j9Q`8wn_<8xfdZINS&iZs;0N51yI!@
zn}Ugq2t5?diWbu`EyA_5qEgv3uGZabOD_qbd6(X9Nd!d{gbNh6#ngpLqLd&(Em})d
zMF$|90?49(gi>p>fB7|b%~xlFs!}O^0I4|#sz;Ha;Ko)ZvYW~yRC!WVph!!X=-HWK
z@O)5Jpdd9n%xLfJb2(kRHE*a-MTdY~%t=QTGeuBYVYoS=xUnuPRt41HEA_RVoOwTb
z4*ZzKZQ_c%z)WHRA}}h54Ua+&mzI}}s^YFJv4wif4A>({w&Y{$d<CkeC2hfjLNB^S
zqO=CWY%7qWU%LfCWmHMGNeQjgj+=mKB}PlDwq)Da#&AZFRG<|A@CmW2<q<<P!~z{f
zxSxuCyuH|+ywC_FRM1w8A*sq#0g5~;ZqaUosE5(5BvGiKMru&Y6ah?d0EtR{cyH{>
zubUAXwW7S?9fEO9x(uzY(vXos=i&N^@`#j{9o1x|{?vKCzx}@a+kbaX{dY-A<-KR1
ztmt1RVh}-;uv^-@k7AsK(k*VvxH|9OzyI^!KYu<yfB*UCpU?gC^YiDw|J?WU=l=Qo
zBE}7iTHFATlBNO_smSmc37YwyN*J}E36i6&8w~(J0SP>Y!%}9FM5y(bpdu1bS`aN;
zL{+A2j{sn9eXs5Ll_j5QMoP=b%ZNY=MJwD7O)X8=rglXk#U?G1y5p8onMe?1>E1O;
z0h|Key+6tJ=8EOnEx<SktVs$|L`~&Fp>l74V7U>kmD>WUP=h6J==Z%R+~5Cw|31I|
zhsH5N${@no9^S8ot`<pwqp&*7ho{C%OvBO9^?;<G?(}E#U(T;{-}nFZo&WFt^51`U
zKUM~yD&2m~Pdt>bAf*LKl#=HyqAhy<xvoeItqQ>@f*o_s2+`J>mU7f!AgZJtiJ~mv
zlnOu;04UF&f{HS2yG%vBtM7fQaV_d;kZ%^$g5OYoN(U-OVCjfrC`R1FoS&MZ6$nyQ
z-l$uE0-%B<a<6>oyA1bxUXU6@<#U3krbF9>B1us4k?dW(U(=4TJd$n|302W^H^cqm
zJpBFj`@e60{ZEXp<Xx9(Vfsp9F5S7Dk1BVzmF4&QEX*nrQOG=cUWt7D@BDiHpATRC
z{yKl&=YLLq|M{=)bGE<#{AnqN1C@xe7epzbRxPM?KnNke^0s1;6-nAFMA?z1&)h{|
zNo`Hz6Hb7{Y9;W;U_^mJfq>BRol0r|&F0K(<ZkEoJo`qoC@Ff=uYGB3R{%n#{q@Nq
z(}aO`!6ymi{q3kVpfR-Nx}F>39Im(n$Q4Co(_iy>qbXl~XQ(P!S+$cOS_hyNt<Dd;
z&=H_H$_(iFNv(}4^}PN0>+StIKNmyqzkZ#!Q@ym7c-tYZ5xRXu>vQL%0G`^IOk<~{
zwC+|&jnvzBVWa%LyB~eJm44a}K~MtK)hYTCgv}<XLXZMX$63^I_5B1RBOz5ta@spn
zRjQ~Y45^_4V;L%;A_eRq^{7%++;r&5-CCcF_ft4ulr^08oYIsvi50s^3ji`=R8f7l
zQ0ho3K>PSs0JJG1#uqiEbh^Q&(72Ek2@!Vp@B4Rsy3h03*+@eUs$G&1txq)x&<I3=
zBq|9_B7_(D=#<(aKPgLduWf$#kCT1mSe5&He+jx0`SR97^PGQjB9KRbCY?%!{9Ogt
zx&mk=@QjuTYGv;G5Xs2WinU5{G_;g(#x#lOP*II7tU_r6fK;*yskIo8SW%UxwIq4v
zQOf|R;DVK==nJL{Gz1A!JuT|CSsEUJ0Akcgnj*a#S=o*-k(wE`>T5LMBguj`L6IN=
zty+T+08reUdJ>QoYPZE==;q<i-!>1K`I+Z)2h)cY?knsz&Br4Om}0%bhPEXO$ViO@
zL7GLa)6ZvHOZ@%$`q%7uR24~%y|O0jqjjZ@-jxo>+Ul5c42WGAznP|2qRX(3&aS3a
zEbVJzVke4FD#S%lJZ<?bMam*oBAPL%Q3C?p9+@lBVgbT6au5QIz$GC?9ttMxkKLIT
zi`2WwU9}2qX;iYLQey{bA{9IR(v_e%R2|#2O{!y*PM-r-TN=_gcpPXDF0?v{jHJk;
zY|(DjH49V@23X|%)5X<yUJX_6f|4$Q*pZ7&0SYylcwi8038tef1BH4Rq}zM%t|i}}
z&-Z^UzAo9XFM5V0p1yqf(h~E&HMMcOb6`tBBB>cAFeYt>>R`JR0p|3*EDS|K8#m*^
z_0}%A+ae@&ZERo!lqMC$NZBBZWonS7pr9fbROsYhnbsqbAPRX#1yC0RRHETbw*qlJ
z2(2cVtW9baThn)hG9GXWDHc)Fc$vZqgdK{WGhWDHt5=gED;O$?THBclj=~sAw4;P&
z^nUD|^T`MRyOKh-vPa0iA%LJ&MeOS6Sj@_)6jfLnQ)o3ox2@s%=AZs9XUWj1ziKt{
zwAIsC4)oTn4CFnMYVcjrf&_+fbl9b`c--b%TR=pN5N&kSQUtcx8bU#6mKq9eRTY&R
zN!`klXyt+Yok1X^&Q~F*k!cBPS0K|OQ~<XXrbs{+2x{cgmW+|&(Zxve^Od594jY+B
zmgu73%}_+9Hf^VPH9$ol7f=<|Qxv73m{5ym+)AUyCn7?S(q;BF_j{J_f@A|I_T`j{
zt#3u30x7*SA}InlC6c{$Iup%mR!kPPhJLF*^6RQnaO;P)hSA$ejuehIGcCxYaUDP{
zOy$SOl;)g*Q;%Z>wE#Xq!9}#e)C=gwZJ|h&XeqQvENT#!wDend`)Glwrt2cBDG7j4
zI)<ewsKqV?T1K8AU{b$T5TXdgD=2{4=Fl=SM%?OfXo{erXaGoTRYam7P}NwpxSB74
zTMHUxEK8|$3X$N|s8yQ|g_^b`TQ-)S{ya}9U9cCe?+3FZxkuRoMYs({z0T6^2f{oR
zCzle{N;UVV*oJ8G`FwL)-?#oMztl^plbyN8a6i38M0OEp2Y}F->IivC%X#WX#pqC}
zs7j4?C8XRAnZ|&$9pOYuYQ@?swKGi`s8oRR&{hpbl`yFg#e}9%RoVi8p-41VL8>JH
z3Mv%pHt1F$3Ph^>Boe(T>;_|P#-=qb4$xbH@j!JNQB^IiJg;O5&?dEtfEKkP>%m{N
z<x$I;Hc~0xzvR`)oVUL#_nfU*+ft*}(cFt7Kq7S#kISgQg7|nI`5Z4mJW^Zk%Q@cN
zjJZBzx_j&I(@9cWX@BXJ(7k{G`LyX5=ZXlm#1C*hY8mRpvF0e_VluS&GJ{+s><&=9
z9W)@&_Ke&GB?D0a3<l7~k3uxmgd)+3U@%*%(l=dN69ERIK*1v8wuo{L&1hG2QLYJ+
z1Xk&x(WB#)!?AY8U6m}fDn`JkE@+4l1wd%>vj7;NEG<9~pnL5!r<IB~(9#yM(fiqr
zCo@0uMWX2qF4!6MN@-;))6xj%Mv@{kv}H)@;YnFUEjc(+=Xosk`r*U$p^(a!wk}K~
zf9(#<Ar(lrv^-dv3MpA1A@h(z1#Tqk;8cb&6sAZ5dpV*4D)-I+YCFql+gb<-T2<Jh
z1Rcv1KmtKUQ6vcji~=n{OOW6eAwb3m(Lx|-SEGU|*`~~9JD}v`ZtNfsUD+hHYD6z?
zgA+C610bsrq$XJdrloMbwHARzm}w+Row#D7+=ImGM)&HZzqQ{~r6PCODEkb|DzyVH
z06DOBy9;%3p)0lA!Jrkbpg95zvl*A8Zx*Np3n|xm#}65*L$;_o6idtWOiNlx;9V;e
zr`29m+l@=zi_&Xa!eDp|-bl1fq?TH__2*JF(4>MxWJm!Rv8^Ja0jX^PQt+S_QGgQB
zhCn2Ujy8rsAa&PZ$t}_ain78k>;fgY$a>clLP|C2DMBuCMT#hf1hsJQdKM9Yn)DnA
zGTx4pVr!Z!QBW330BMazJy+jEqSmMi^eVL)o4o)6+SB47F0BIS%wkQ<f_jkv5or>?
z@6k_=mK~LB^`&gRqbq+dM;g?a3r0gX)ruOGAz<nj4CyxX@{AqG$(7ENo9Gb*D%s!?
ziAY-y2&-^hL9K2#EiM<O-uI}b9R(Rpi#CKp)orAvH!2880zev8wB{nVQuOHcNk<`}
zX)6%8T`QI0U@{0aszgf*cz_X^sp^UxsMJKj@weI=rAnm3EuW|{T~(sAuF#=lilN9j
zK$9NT{>-FnMO&rDERV2TwuddHO0DJ$2|Ff{3Png+l_HA3haG|2^<3*d@@{!q<rN|z
z-Gqr&$up=xLqb!hsVymhJP9Dz6zzL{pT<RrBw>OpRlOA<2c|DId1fIf8LxzkxM=~2
z_Xpu#SqiFvq!x0MGKK<K15l+@10af!Qi+lcf))?8qExC}s;@$tM)NoY5|ZUmEk>$R
zQ5mu4kb*{mL_{JhS~OwUmc?|OI9EifktoQ9B&r2TMWHIJ4&PS9&zIpn4upX+`7!Ge
zMZ#(g0Al3c1|UWe5kxA~#TBi&^7FVo_e{R#7o5~r!|F*Z$DX`1k+9)*1;bXRaiD-C
z3g@^GTXJ|lx5^f&DOAtEnnG1IH?7!G6@NKuQ=l!>I%?HoTkQ>P9xxJ;;a*yKlV;|J
zsepRJBpal(2=G*}s9{S>c&H1wqN2r9RAouZk-Oa*6$t|#-JQHjbtq>7-Fs$>%IvMA
z0Hj5fQ0yCx7+$1}49WO|ueEJ@5x89&x8BuxY~^cn@Mn2?MTJCp1#l#!NNQC%i?K*j
zDH65&%Ayk%_b3nz9X-$ahkV|1^{06@KX3o*EA)LE{(NzMc>ev>_6qYp3{|NNIUiRJ
zNbPK65PClarQPkKG)T&P{UZ^<TuC*N@YUQAP?b~wNJW6JL@}W>B@#wOZIFteTiROC
zJ3fkmwl+wPptY+8ppgV3%d7;TN;{ku;B0(b$-1kuxEXi43#3kIYd`?K#b&7e@pMNE
zNa|3Up0;*d5ye6PRdXJ~^Io)PW17{Bv{ZxSFjq%=x$5F5ZTR|Q!R|NdFKQKF-dD%d
zMX8s9yOsng-aCp)t0NA<@MlI}&-;JrKmPrH@b};E&pZ0BfBo<O^WV?!oO$1Ux`m*3
zeFm;Ym#7v+&{pH-sPJ<oP%2tiisW2SnL>ad?z#e{+a?%6E8}fJKng-c{U9mKkrpb+
z#FZAOl4u>&HmKkMAO%)n5Eqp?AT8e8w3@9Theb$e@(DAfXS&mm#ub~PAy72}HBLbr
zW0GD}p#c9sL2!&9OA_Q(@BtoK{bzP5kSgzgH0l(%JJXfn0L@}5fJ&9vfLf;pJfmzz
zU8FJk7*gV?dXwj;pjhwm{qK258jV}U2C8;cjU+0HX?#Q~NUd+Iv}-lpNwAA3ol)<#
zG|%yKG(Yy4@z3-5oH=vms5<>!U27@5BZ|ZoVq4Y4vHJod6_r#K-FA`M0QWkrP$MLc
zc~exV8Y*p#S`011LNTq7x*Jq*0i;T#u7_%fXfwBJZ=r=END4?ukXD2uh{i=mGNoya
zBx<CxeJYPuH*zdYJxVA5t*D*Gw3k-RdyQ0t%JB-pG&WpZM9JE%>8PZkK-aW35y+QF
zs@tPI=kCvZUsFAPcQ!s<+M1rN5f!Mf4dE_R(sfN*jo!K~K!t-p>i28#jk2`KCd-8d
zLYDdHml@4S#8}#(QY-C_I*3WAm;kg?va|QQw5|XsSk@{lt++&nDvTrupcN^t)DonY
zvj8d8RJ=K=2%+y9u|QL)lDeosfKeiqNZl$XlmZf!TJ&tUR%>%q7m&0JZ_M^mVvAO}
zAQ@V1r7EGXRG^`z6jYG5n)glXqe>X;7AT}ETg_T7o#{e}7(uWPZEdFaakmC_d*?wP
zNmHx<9?^7qD<9ZyK^v)(y>fC9*Tf|0NKN9lg<{o=8dIPxF7R`|axD-OeC|pjB2aB4
zQ5va;(j=08G}*Q=0d$6HWf&oe=q!RGHRxNV(pLR>at2bTP#v<BYAW|uNS2BKR1qR?
zMX7cr2@z-;5Jk!rLysdsqR@0`#cCi$J_=H)&t)O)ke=36XR1oH1W=IG<AOjzzak<O
zdVBnh6F(G5@<XIjjnh3w_+W`eEZRl(Z8K*a>1pQn=P)e@;LO}PV~GII?;Ufi=Uyr<
zm88)Y0J3d^Ai_Xb7#7^B6_N<iR3!koL0eW_LTB_AKq}3I5qbki?wXzvX~38dU%_$J
z8p*<mLd!F^U64@AE$^EuZi+!tWiAj5js93vLu7-iNfAKPhOB6Tyy7{af{iEwpps-p
z!Ul~~P>~yrdGR8LRwc}tBCy_gH7rm9TuLL|9-*TjLFuap`2n&(a3vAXBfHW-4d_Z1
z${kyM+D#{Yaw|$VvPv}CIpK`m$PEUWOmih|A;sLaQ&&n_M*BQe2f-IGEG-CxgcL9U
zG$vRqLR)&;NhT1egND5-iAcFqU<g11(1KV&7dmrv)vz0@o6ebX@vb6$Yv3q=lwd@e
zqGFAA5k}%}n5h<(N`-bPT8s*X6mX>q8G0$H-J$^yAf=T`o2mj8E@MCsp`xZDBdCp7
zgji@>o7n|<Dz)Zb*_Ek<ETEDad<4{T3^i(d$arg{EACCZh|;ZO74^P4EaB+R><s(L
zh}_gpFc7J2d|>XLN>{T&?dhul8PueByRN8cX;l>rqIBm;aPEST)kTSnzI(tForxn8
z{vU_8G2fXK+UBk~V@#1F3Nxk|YMZ&XM2^hlK1zxia-W%yG-sPDWXP>3Dfdx1(oG7L
zN(eu{f8ukz->=v6wBG6Ko+Os*&h770w?PO}5KjDfGOFscs~h#ko_q8<PBO^>9-cLu
zuU<DYa?b}{cEhrylJcKcKe<X9g>s9Lql=i~fdmP<wVe$Ay-%3*1Yx$#JOOH+nfV1`
zf5+~V;fZ4S9pP{I(rFdAOBq2NFUW<BL2x{y*mHL{l2wz>QnsM7e9<uh`8P){TeOAh
zuFHs)3tF8vW|?GIWmPYRM&Jj)Es}=s-9{C^t7%9#mB7TU02Xo1Z+|`WjUgLPSmv&D
z;%ctQUEa46e!BZlk=@U9OGw<&sL5(|y}W`7wE*=I-wd#Xj7$#IEA;UxC6YhE&MJ?L
z@v~MzLGd0YO5LEsf<&l9jJADHRk=p1?M#dWx7w{;4`Uvy($5lu^UyXQ@0zy_4quC}
zJp3mf;DauBzb+qJ48L-td>I$}94tKI)|HmvGE}yv^D_5&jj@g*!)IF8Rp3xi^Swad
zQm)9Cy#wX;<X&&8TuB<qG6zr>Kd1tlkGH!jj9xa`B7?LdFI-A_kyJ-0RnMH6Br*|`
z1i_+&-V+{wNb1?MAV!w2NOglyQPS-Gy+wwV8p&L-tPE3%04@rcYr}w=45ov7u1<VS
z{8$Z9;C4ao#6?~i!068;Cb<s+RA)LlfiEXg()wO87GMK;mCixFI#?zKP<VVc6&F`+
zDdZRX=kkx?=b>5Ukv`8f9)3#1IIV>-3x&S<53C`D@d<Qoj*Bh8Mue$S>Uqx07bqc0
z4ht#je8O6uBeB1KtU?`d@-_DqgelZLqB|m7K6H+>NK$ySiWK3qU|b1kk|9RO;D_BG
zPIssq#Y53)Jk<M%O0hkSIg^y^B&L|fQ6(P(06qxy^szbiHpG)GeYs{3uNV?X5cm0U
z-GeV-H)S_XfW#<UD3ruIy`>DRxn181YFu87A7~l04RUm=`6Y9LE~aRLRXc97rDIeL
z4jCu?>Bv(4Fq$wmIVg3q*dEoxxcmfdZ*FC89Dh9$S{ds1gC@2)H8xW6G=PNJvv~=W
zFzj;*O9h4bZ@Sq*)Dol5=Wl+72*98%PwTi8^Rh<Q?NNY&_~$dm5Gm~%00%j&7>AK?
z16+HVcu9{at?%vuDrzsujT<=q%5DGr*oblyTAVuF#4J;Atq6N*c_lYJvy3bX2bL78
z9|#8^YVbu{8Hlk;J)ABr?ZnvG`3qr2k3Z~j1jX5;^0hbzP3q0h+KohdhQ|E@{X-KO
z8YI}X_ew`DrqO{5$iXd<@P?&FTf65<eWj9~f$X03=m5xBn9AF0J!RyIijk$DqX_(i
z%edP)cGdbG$ts262_t`{aEC-5odv}e!z^^I=qe1e1tf+n@WN_TO9~r{cql4SCN%D6
zC!&tPBcI(n<GrjHGF0OVZzE>D9Z5RJjKO3QVh{%VikVxRM3D6;YiLXM6W%HGX34{(
z_M#=Lv-k77y*~S=PBvG}avdUkEE}^Ez&JT?;5ivITAE+3tGTpxO2|NoB_hZ!MT}ub
zUN748o4h_J?6WyF`PwNCNX7Fe+)jH$<bw*7Z?toeC^vFueRCFxqbHo?t;~0bbhkIJ
zJ@yS@XO|ooIm%K~W~lcFgWN~o7BHv{6eKzESdO!ei|t&qVqm54zN!q(n9|%@ODrI8
zoCCqXK-|l@gkk;tq8N0&E~$GE^Q7(F>-k~QyntxsndZ;ar#7FgE)~V9gq-}~;|e7C
zH=D_(1xqHSlm}5RNZC4iwaD0G8=3RNYfdNtWaLXq-GfKu=HCkLCt90l9kF<tyM9P!
z9Rr|%Y2m4I5N`95Wmm<VPbEEd|5oD`!T^6H&r08WfcO%SVS2dP$Ik)r7poWZiSx6+
zT(_KvF$+G{&*QMmb>apX4kf`0nkY*b<@yN;V3@bj_I(YuA5V;BfR0(S&{egMwWq!j
z!BQHz-}GY~yx!+$o7Cne0hC@V*bY8>KDvi7yLz(o2T?g9t3gfUjnVVt2KbfE*5DA>
zYYXz9C+#v;U_ha+HfPKR6(I;(@e`}QnC@!y+b-RnWPi~|oq+43?ziraeIu(|p?m`=
zJjC=-9uWZ1rJ2DLo>{0E{VS)<d&u0c#$rUl3rYN}vlOf-Vlk~Kos0pHHGkFq;uex$
zC_yKVOwM(S)qdwDp1&5OIMFPTLsO>mUcddai2XJ_N5EiNRE<Pc?0bL9FRDMqX>rHL
z;eU$V)Xm;&EquJCWw0Ipc60WUPgJC-T}$xo3+t-B1<m8)iaFvcDO!&PE7jkQKu$fr
zXNFauV9-o8u{9<)HS$p=JuHi-=vC5LB~+u+G&w7<ly5J1BY2wqocvm1%rEJ$4Zw_O
zzxnyRY|A?S<EB!iK;k1JRjvY3)o1-0;3UFCVguCB61~_p|EH)NCAOLHi`fBy(v1?A
zn<KrI%Yi<&RY!pQKcQdvW0m`up_6c;u23c7TW4@-NiQL{b834-IPE{@q&qJAHSVr$
z@0_YKurF?@h#0**Iw*&c(x>&R^=5J9{$lbgoB=t#wV4OLhWtC_MYSg&j?S4e_v>z*
zdh##v-UV8fL<0&_nd!l|jGMY~V_EwkD`_rq`hIM49;aJTbMm63Ou?Tyq)a3vx;nu?
z`9xs(d%L-k;;bSPi|T7#<B24%iK5w1y&B3B3Xxlx>wZKBauLIE2rN^x95k9S$6n-Q
zpU}T7PA<!<XgnrBR!pYxYzWiIQS`uk>T0-|vfS%q`_=OA-V88xxqGcS4F7vc`umFr
zF*(w$8}#~lj=YG*ZZ4)K4scsRUP<|UXu1kDhXvQ{4;6q2xWYU(6-2$HCKD`k6u2oc
z-3eB4X!B_ad<x7if@@DTUZg0N7pj*K<)?|6RPm67FCVrM5BsvkJv2sNiSFYID9ZZW
zlA`R_&$0lHIpji1q6C7q9{bA<xGPKf`F*FH`SB|)kvjc{If=zR#`T>kcBlE3CxT<h
zDVVDy%Apncu<2(mRSE^;IGsLJ$mboU0OQ$TV8pY8+oo6t#RRWG*3=m-yVIGWemSZ6
zx78idc^0RT-?eU#j7$Vn&(t$V8tT;k1bucJBs9?Yi=c@PSQWUtYCnCynb|{#oHXU$
z)6{w9uhCgHHA()6kA@u%yLzqcW&k)<)%fE5G8!}|B~`HQ_RJh2h7~BA1j^Y<8rGOe
zts4U6V~#Mapo5*|T!$R_2mv()5{Qi(yBg{mGnTFBydQ@~qTtL=>el0^XD2W1d>D85
z0g*Aet1EXQW6ikJXzz=|c<TG-r?c7@>zAB4iHJsXd9jyrFaA8Xje1(B<!&jtwTB3v
z8Iw@VdjE|G{9JK}YCLS?LNPc)r1Xl)dDLm@qiuh0@5|n|k5O$0k7fB@(^RhdzD%?^
zaqd4<;QEDD#N7zVe&Ymn0@SLfC=;ZMc>TN+shuw9XDbc@D0`!cA6GzP2iPNNeA(pz
z&Do1hjDBuk<}I(KFS*EwkLLvH=?3NAko0n_Px6wdXBx`w9Cao_-bsa)K0~Qa|9$b|
z^T56vppTi+QEAi1PW&y|vei}Gx-|6t%ov2XFU3`z+y=U5+OavuNBh+lZ+XSd4pC~(
zsa$BPmAo(U;NwGSGcmr?C7EfrY1}~hq!W@aYKLiD7LO2m4q}GgBqS0!_|*K+YoE`P
z#+%@@p3+h{s}Ii1bSekvc>x4p!Qp-t`cl-Y6m{A%_10krbVIT-KC`wu<Z@%<bhi}z
zSQb?bHKC+PSi<@)F=%GilJ>DJHDqo{6o&|u;7z?9KYwUMs-Z5BdiGh<(s@r>tN53`
z&+z%4pBA3LJf8}FHAF-$1tioBSfZzNO4h>?-vm@L`w7fNab9%=F-cX|Nd!>55&)A|
zY-YzL+!74EmyV{kr$(nL*eD6a1ik9Nb=>>tdfTtfUUou?C+T3$Xazutg5jZ<oLo>A
z)pOQbym5qNZSq+033Tzk4n=R(FsCuQ38B{kbNuwe^9GBe53<%n%gEDpOR_1XyYs7|
zJ?X7JcNDKLVg2gDnu4V?93PyFR7e|W`E}#K)>X#+lxfKzDAPc|smc!El_1|aEC8nJ
zt@jC;*J7?53u}Y1Q`EfIp^G1kr$+%il~@!HV+Z6d4hXG9@#A&#sC@f54KiDW1`(A}
z9+Bt`5>d21>pJ*L_Ki!+0!&7~!=-ziFY=t&YLbMxXa8|Bj(`9wOP>w+#37fQmuAIH
zCtp>1wX;zgp_{T`xN~Y@V{IYd(&+HT+X@2sN@1)I(36%cC?KJXI5B_qq`LQscza;_
zH*{I{V<+6dmD1q9W%+Gw_M|_N>4qkME=_xMTOdvx+SKW?mprcY)zZ+};?>y4bipGW
z#Y#b@u?sIP_4p-=mMIwnM(-i)Bx1Cmd^rwN0{r@?FnJ6g%=5g>)iB%4$fJ0gI`~TR
z6d*Rqjqe_Jt$TN!B#!a%_E$(1%MNVibM!v~9H$0=?tTt{`1wticn;C;Wb^NX+_<o>
zkdEC2gA=a)E75m$i|$5uo+NIstiQaG>;y*fZ$MO$_ue$ALIm%uZlBQjeaD~mcSl}|
zzO`ehEk;jEdzBLQ<G8GS{>G<c<9|~dgU`L8_QK?M-xLXWzn0ngZS`bi{asr!aI!2C
z`AUc}(?+(qi-!dr3lG$uZ)|!4wcFt4fO<<BaXF2`OLG_vZsgNj#r?O3M>?+yc)U(i
zP6i~E@hcq7PJW19{Sv+VK|m3Vv9f<nB)vNx!&e8hG_8|Gbz$Ztb=3Yvr<#nn$l@oH
zYQo(01G_KgcYkcGb?vN~E}Y-~=e<53y|LlCyA{3jTiaS3DHcChY2vSs_>@JyFe)?6
zWIZ#4bKmBwm&UdIr<p8M`Of7OQ26HfW5Us?tqkwyG#zSJ`QzuQ1q9f}XK6h%I>*Xd
zi6Z}}W@bu^z6p7#Urtts>6H>r{%Sh|A1*C3HCMP%Y7rTWB&n3+AF5wcwlUg$<0GrL
zH>=~vkGLmx^C-fo__!nQ6~3=ddLW&`UDVkF&?S5+1(Jl#T%4{EEF+g1G9n5~6wqvx
z5<Gq@-NO}7zj-*?Bsyxyb<f+qz3?w+Cu-;4#@6t{aQ<*CS@}P@7d~R!smyH8(UF5(
z$VH`mXL$&Aq(1p%o`{#`Gw0@y6~<`k_mw>lj0(9~LC&~VT6Imj7ACZQrqiV4Rkn?Q
z8EAl{wesqQeuakrKijg3_^bU7e>qkI`MBJKMkJ5?EH?{0J%;B0tD7;5(3a7ZQC8Jd
zh1u(VEEM8MH1uLWp8Mht+pC)29bSlu6EE$zwNg`fgU|$r0W=33tb8=o8c*pKKHzDx
zWYmIQrsF-s@BYVK3G*+zY`!zu?lQf!BGeqfo5LvIRrCtjkECZo09?V3$00Ive#?aX
zsH2vu7XXqplaR;9t4@!dFSJhSmggTj)T};M+0`s%l$%AIAnrq;T#87=lwW+sV@~L_
zn?{W=0k^9XVD@wKxS6+?Quch?7>yV*JyT}8PCScA2#!^&Ns}RJsKkR*%iz{MQx^+e
z@4ngHoIGx-2;qm8pR*I|Fv7Yhg<-%F?z62#Q9TLFa*c#FO}LEyiwt<!m;3GVWX8C<
z_xtc`zGo)?Da29hTQV<du3NQkVlGubLcq;3i-%pc9PjrXn+q~>JYmQQJ!Xb|6DZe)
zD6tFO|D#hztbyE}umqC0u52-LQWV737j0y#y*=<_%1zencxTj~7g}Iw(13Hb`;~#w
zc5B?&ez<OS1q>*dMpYYL3%IJH&}iea-(5xA=5&5;#R8@tn=5otHBaU7_M3%;wY3rc
z2?vEkOfn}slUsvT;MEZUqXWS)SlqPSr)m5W_>~Ym2}*tST%<ginw6vY^76tfRA-oY
zoEsG53$Myaw)Rm+3Fs*O+-hljcr$u4L}J#K&2(xE?tGqj3h)8X7WC1Hx>{dVf%bxF
zqGW_OBGaJm%b!)prdTz*V(@N1x~`abo3UaTl+vl;8%DPlW@WFJG@XV8O#A#$<{+y_
zWr2SAg0}=mA9Z)gOY!m5@o{ctxf5{*|NdIvesQ;JN9UW260TCrB(OQxjfhu1q`@cm
zT0)RD0E^L36^r;U`Zg(}EbeV)^^VBz$F^gcy8jw)rU@m@L0OsdM3GsK94Z<2E)gb%
zKixO4fw_57^gUa_wh0@T6ut6(ye5#Aa<K~j{cLpa6wSgJXb=J^laPzn2DVlPj<?QK
zK9?hwPj%C6)JY4YH4_eQI;5qXJWSQSljF39^K4=kn$J!cgA$Lx4H;P&T^|d^_-#GO
z8xD<Nou5~-P<`f)zy02e=NYgIRUCEv2z5iHu!ky~+Ddh|RQ$PfNVUD8>NAIyKfQ}~
zyC0vAv}T_<ilmba{r-H)|04QWjh0z(3@Pwi4SnezP1oH1BMZR4LA8l-A*#4tw7O53
z_PBd?&0+K1=Y@}37Y@7~A6jqSl#MP4Nc#37@ebuyaZ<t|)Zjg^)vR6-K9tN>f8o}g
zD@YuJKCeL$Dt|3;nQvPxwUW}WEq3~#6x+gNH7nq}5}|JUl^lta3S>oI002ydfY>D!
zQCGiqR?>%DO@)I6!pyc`G@$+6lwIs4(2P0&+>Rwi6avPiYh~BVREy7urb%%$bS<J8
z2=oKFNnhiW)nJq_CGQy@PQ`D>yoVrR()9dr1#5Hn9_q!*moF(@+1<06Z+Gp5wbxd<
zcEfgewtjkVU3;)CI$1yHv#aQ;7myXdS3Gd3wD^^C50dPh^g%-WT&AZ&j30?$f7iv|
zI7zg4x=I3LM$C%;8KJCQK_T;-<HrUpU>G40svW=pckC0d>7I>9Vnwj5jaizaUqVOp
zV0f7u59)s%!&g|wr|Z?o+hnSj{F-w|Ew%{5X3FNmZ!|3qAat{4zHQKK-mE=Mq0hcs
zf0nXrgV4RZSJ-H$TS>@0g}1L{O+FAz@7>)cbl~0YX*_nhIIhUZhIuZA-}f|o3gV%e
zWJ#iXghmlH{E2!8&*A;f%lXyS-B#1+>7DJl=)XU`H@rI|cf%G*m)Gns)}|LweGdC~
zbwv?q(1HTTO5Esw#)*TOct&1U<|T8DY1p&upK4No9<~NKKm(TSqFDwO%uNOXM!KKg
z@x4!%^`wdjmcZLR>}`7o`bCwyS3)LyuFsmZFAOvOg<A1_Mcv8}1RX{WRn4RYUIH>o
z=U!a3;lq(dOGM7&s$$3kBmWC)|IDi}|EVbbd$@5bK-Wp_#s1~oum{>W8<1}u_rOS#
zx_F7Pcd@&_-BE0oKYI3*|E0smApzf|170+3TA0*TjoUWd@s8`g;h2OsJq_c%VjY{6
z>V?#uOb~R2Wd!Xl<mqO=6HyGFU<=!5OFmFgM}IK6!3>21(4a^$-#rD^(Z+^Ze1%Ss
zIL;Os^Bx(8*G@?OwXbW~?D)->hX^$Lh7hyc{7-)@*{r%`VhTG*lqiDihpijpUD76#
z(OGp&(KyoY4m+z$cW1R5ZzfYv+!=sW(wK*`@PRlits8}rY(5|vuTwz=s~W#&7T9zi
z7+<`o`kdfbb&&Z%u4{XUGZpvq+{HWrLfYwtDLHRxzcdE0+*lx^=ia_1l_a-vk~7sV
zW1_&wVb1IKId%fT$n?L?L9Dcu3mix;7nC=A{i=J4bvYgoclG2%2<{t(*DK9Vwfuf1
z;^Nkqh{7%ROtCMCA-SVvdcH=yrC=qq*thg`#d_Zcp_nB`Ix+>l+~D@avz%gX#Elqy
z#j`h6HPcX$snVXbRcQcx)z(Yxp^~37V-$IP{7ORhxoHpIcZD3_o$d2g1v<25`t96b
zkp9M58+wM7GI#eBU$zX%a(%|eY>4V#x%`8t{QV}?&1af&`X`X<{8U#>SoI3P5ik-}
z)Cp2Da6&-GMBz_K9>qascnd92EmZmCtVJn~S$30ZN_U9w>C)BVd!^euwVMR6*S#^N
zJHsRP7bN?nOU+8q{hl!rnQ>f8?d8i^Ts5)$elo&bJp5#zA%B^^FN@E;56u5h9>uST
zt;!wN#AuJSz>yq=I_xpH9Xf4r=5oLxg`_wJ;FGV*tmO#7+T({gZs1ipe?(iTxG8%s
zyrr*nP6RoYW4$<ll%53v)71G`bF8mAo4u(h?1p%;GO5i3tE!Hr3Dwz_2D8-g<#NJe
z7{+>)x}=^KsLHbRBK+V-&dN2_)yQ?l7lBnmTW<!+TMm#Ejm`;UO0bD6qQ@w<-02nq
z09*iyg4F;TFPc)>H!h}0;1Y@{g2(c-&BAJDTVH{#e7sk&RmGG7iWGdRdI1kFm^thi
z5gB7jy+QQW5J)49FOPn@_w|ohh+P0WIBPOjk9F3_%K74S?`a|-)=fj{Zf`bJ7n2I>
zR`;J6X$t<p$|UElZ~x;3L0N|k{4^vj%Ahv%Ze^HoYfS5pgp&bc6->H%Dqsc&GHyTo
zWxK;K_LaQO!B$T}>ZuHiAI_>m16k_h1G&s(IE(0`LU^v0*@Uq^nWOJL7IW{6k4Ey`
zj`R&i*}xTh&rF;k;g%>~@L2~AS*e4NZzmnpP8|!<YjCv(eFn`s$+S#j-5)2qcn__+
zKJQmHpPBN)JT@q62=9+Ab;)SImDTzSk@xQW`JsFKP>Tx$48zAx=9s#o8c}^F_HeQ3
zS;ZIv>1lB}fDC@8evaxSr%b;^m~G#-dA463<(6?GQBgSd>b4D|KFK5pQ>G{hD=oYB
zL-Y>%xC+FIY5UcztOS2x-}CW9L<2q1<%VD@8%nW5hS~>IRvaYiT#!b-|NAk8$qQL0
z(sE`91JE*%M5U$r%Nt=4m80c`t)DO4*+b@#K(;>GJs@uS`NMMjpOF~E>1WyvRY7g|
zN}0{6iAM5Of$U8G_}|+IXm<HMAL4D%a*Q;cC^l{EjPb)A*&!y2>OcU(VCj^pybrgu
zo}3W}AtL5JQI85};w@01=_aD+m6pP14pAX8wgJx&_?*#c4V3%2QHr^{eWN{k(K3?-
zl3LN|jqIzj!b$%(nk@RWTg%nw>!_h0$;4YAc<j9;o~OKzl_ep4-8FV12lOc@c_2Ns
zs`63`D@P%ifI&1vHHG6Slr#6E8iqnTCtROg;MDs#Vs9RjJ@`r)(V#9Tmdd#CP366a
zKb&$b-Zq&){luQW1lK4bnob|v`F-z>0I)okL+22Qtyc_NQg4#=ZaU`F2Y{cd(*m*<
z&2fag(nd+cQDH4tKX3p3uT7}aEFPDMPsr=WOT@Yj4ya(6oWvVtzw)*vIpL4RR|(fe
zV<!s6ES=DsiK!e7?UnRlC~)<6ztBZrsF%hei-5^I$UzTa4kq%?%n-NBL9tRnkYd8t
z^7oiX=8(kq%9@nPbCzn8@kqf^#WrFR`2@xPq$+EiO$tCkn|f@o@VvVzM$XUVPY?3A
zN+tA_uTvSx)tUvhEFb`2#wr)Q32Brly-^W1by3KIAfj-Tg}@2uCWsymU+q{R<u8eW
zBtFeH*C!O<M*eH7#EWY6!^E=70=b`c$>a!Y4i6pnPn0)omGb8JshZ7|`ZcOxW79OD
z`%ul!zDW?_-X(E>1b)JUg%Q=#JM()}jo<en(&V9(4Gng9(#i3F*Nn`ku@=X}^Z7M1
zgo~rc#2pJQU7F6+XMUFLF(jp2`>NBX|4qh%lBmc7=Za_T!!us=8DX-0S4}^=YENc8
z#i2kB4w>oPPgXh=ZVmF~nlSk*Uv;qYZIm4_Z~x`R3m(*}+v`y#N+G(~L4&i=wvAFg
z8TL<>t=<JDB>xD%2&4eir2c(mN!#fOaW#3(Q(T|=#mPQvi)&<&o8al>$|6xoujRR?
z>n}V780oQ8J;*5}TwCqyUXHQs>I>iN^3wA4Ez<C_XC)@szqFdicAjTwf)bkq?6R8h
zSO;W^*v}4N=7;I(#<0Mam&X{;dt>E(PU+|Cn`Uxzhn~RWGz-?}K8Prb()an>&>##A
zv|@>F4Ht5HY_pV&Q|KljfsJy2M3YPD%~3-kZicBp+TiQ<%`;j2o`|ZXike1DkX?}U
z+ZX_Wcya_PBUa2S5K1=dV2Jj>Ne{kSLVQnx;;4C#Y)hB6119(vp>X*!);iyULQjH!
z_=WrOoN{fxFn=38Fp~SZHT4|94a~Ok+^(_6$ZU~lNOAi3JxB>PMizX-+~;I!;Sg|u
zlH`4kcZF_NUN;EGk1O&YIb!c8&`i5_qhu8^y6)GcsQ}as(3bzPVlgE&sOnfQvb@;|
zt;1zl9X(^b{%Lf1ZQ;kw4#&2E3K1t%Z$eYBz%PJtV2`RckDxK`lnt4RAe!}5_Og9T
zo7@Of6^{<LLV5{;{49Vb2FePo-iGS8Lb_|r9(di<=O&in#r)td*EzQ@iBi_hVbngh
zil0dMNtt&)e}oGQO9-a9F|$%HY$hvKNkJua;k0MzY3A<{$5iLm3;W+ayZ&F?C5#Ha
z?9<jA)#2B&xAsq3D5(*69Hu|&O7txRFoiMcueGVD-GYOMDkT+E%Zb~cUE7>}biCE|
zoD-v98sl|0zc=mGP%iog0B^M7gQ>94z2jgribxTxV!!u8*S)U1WcdS-7*M!mmzvfp
z+OLgZ(j==&R>K6c1-ar7Uam|X{mTbrEZ1a8x>geo&=k}PM)jg5xlg|y(7km;^wSd+
z(23-IcPvV{<t6GP0S7vmG5yoMZE~>~_M(zy$P$-`ew@3R2X`ItTAfk+RPjWxtf`;a
zEl6T0$BB&!@}7^lB_5hQFml`qQbx~d*s(hQ(BN*yS|?jKnUg)?K+W^^t-Mpo<cP%p
zZ39&HK^kixWeU=Rq(^M{XoZ-R`*`qt6_BWiGWX=86pdlU?r>UKJiGE32%n-XlTlez
zyj11jZISSzG$N`Zi7V{)wb)#H-@M2(UA^^B-kkbt)1=s7u@j9IdpmC6OYiyVhZ>1-
zr`jlB>ugFLf{S`{)t`@p%DvlrW%=!{sA31^p%TFI9u^_3PAmz`6e-dMGxWijmqHP7
ztcae}TKJ2|-BatEqy9fTuRa0NoZ+^e?_Y#ZAQ~e+QW`nLI)8EW7y)UZ&+8ry+Q^G>
z;zAxm=+q{c+<KVwxSLBN`V@m6ws6`x)=Xh<2US;)d|oie+pV_k!{+PNgKKZlAwn6d
zLI4incLVTqO2FHwyN4r3C|HW!V`Zu%EC@%6r{5K*nQTSBaAH-4HNZimeUFzGx1kL>
z4zc#?@_UiN>od?4t|*)v@BghPMyNofrm0b;_5gaA{%kClz#J0dXHM<UVyxdb?Oc6#
z+hS1D{ORe-At_?1^M?qGfPF9){b3%>xdt1fp2_}tkIh9*s*smSqPF51O{XIMLrib<
zMug!-B=F58egL1wGd{5v#VgGBR@M$~zdgcwA1*Bqh^%YbeS3eKTtC^5vx%idk~T+P
zpcc&M;k~VRz|~L1d?IVISU2a1@RAK6+%(7KhzJf0Jz=CSKh!A0&#vc*e0^|&(mak&
zwbbho%p9v7f`wKwCn|J7O?bSMi*pGMJwX=M*U-PW*Q!4ovYO^rZ`pCm&wLveGGjT1
z_X`?9C`=9rG1QTHFp0rp_5qNYTYD4>-Uu3yA|AWm7u@vte2VV$h0!)hS+4qcz8s7P
zhqEg|uOhcU(478RUOLVQYySN-LQ)2A&vWpT5v&kAvn=<rtLkdMn&#e&eH{y{&_~Nu
z{U!lCCGeB^gm-eQQ`vSNgxTQJ;wAy7ASWrrOUg$?({0A;xi2be;@F7c*eu_&eu+!A
z;^kY?C@^1wf)v)c@YAZrrc<uUe@k_cTJmj<<#|at!G|^)M3FPqyz#!>FHKGua7(|O
zP1Pi!wEH{>I-+>c;m3GJkf#WJ6lq2>AeuO+?+a$o9!=D{*}~LJ($?KOc!@<J;u3{s
zETvySKU`QGZ1PA=*@J(|CIbIfFv+oMEQV4Vn9tzA?~nkSuVs4kWg@N|nyD&%VuxB~
z8fBm-XuJ436`&wXm*sgK#(&*MErc2s*mHZtfubov*#aGm->H=mO&!l0;<)nDq^cJo
zFJ;dA92M>ee&}Oa6F)K0dPvt^+|iwSuq@ZsR~Z6gIzSm^%{oX0GmYv3EJq^icP$P5
z%mkZ#Pu<e1opxa|IdQP9^QFJ_J#o9-%_HEHrcF$h)bMH7!q%Bhn6<_-qbq};CM;IZ
zo{4B&mouG4sWgV3E-`bjuD>rKTsCn^D{;=v!EKQ4^1UOJ#KRXOKP5Xj4_5zHCMvf|
zOy3#LEpf1@fkDKQ7*&vq`${CaE}ZJnfWEZW29g(XOjUlO`%s5rG`&n^G(X(e*~RDU
zmQ9U!^VKaeA^R0b>??$~xSom?knVRQ(#0cQkuyzAwIiwBInIX8yU(eec&J7VP8bZg
zXIe1m^#!j=K+Yo+%S0v#{EQWaKY4ZCrQ`PvNTbM?M4B`qnK1pF;yCqP`X3eIjJe}*
z;OMt6>8)2NjKh-E!q3oubhSi;P*U-6PmVRDRIlJYCVJh=nrhS1GQSA=iR~GIfoEuM
z*C2u|#z)ZjW0z8tcno!^oI?SVB>6KtlcuHzjg^lYL-EG52JUIFVv21>!S`=1I__Vs
z^+dUxl3=kmv(u6y6hRgEw{){M2Ni1F1_bGVRI|r=qacztRf$;EAc-NYECy10>LZd|
zYuR=jAEtBd`0ZfYmqgZh1tw0I0i1@<-RzoPV^XAOiC6_&ks5sw!2M8)ML@fZB+q+l
zyftk|Q1~<ppC2Lm%l)08q+%t-rH8FRBO&=SX#Au;*JaW{Ar1XIQf2b^5=zQh4W@!z
z)z7=R+4k5mTC;Y{p#PQtQt8e!UmsVVwy^|k66H2`C%1MVUd<j}7_N;<kl;0{m7++7
ziaD{E8a=@!VFB*K!SEuee7_u3;pMk|5tE8=4V4z02Nc~gIQ~}z@bcPSEz`S2Mds!F
z0;lrIOVtJBOf&zxTlSJz^OJM+a|jV0K@AHwY*T^?s!THe1&JiBf=4HWJ`!Bugg)XU
z-Nq_b*^T2T;PuH=p9xEj#fX^j*F?W~Kt1BEnF(mNyAuUltbmWPzn<NC(e(ARrRjD7
zo@nijd4KzH-*+>lryEch0AV8V<s^`0t<vc4o=24_VO`)Dg3sivIz?`whypQlxim`T
zIbHG^R0{T~1Jacl4zVO8G!=@!u6u2AsIkhs@OG=tIKO~_aBU>$e^ioIP+&BSBZKJv
zhC1kn6~*fIt2G2MU6Ho8SuJfh6!-qi8zYQ?mJv%uj5re5BA;)sd@jg?T?r5lyoJDd
z)cEX~H!Xrb+e`=rot(&qGbLmfzYiY9f?bN%WC8f}hcmKHQ1Qab(PTw!nmD8tqJ}Ps
zs+g1wGf|%;lGOD*LsIq$>=0eggc_RD#EO>78XWdBA)*zHiPGYN0E+sgFq`j6o>!h^
zHg0OuMw_x}iWbIHBKEAZAblXV9RFkDaUV_rI6(@Uv0>-|Q4P-V;eyDYj8jUPvz=@?
z!E(o(T(y{Ru{JSVoR8iXOUd<L62<tIJD-A8vF34zDzV(Sr+|*U#rH@dI}336`Um#b
z_us#M6u4|$bJcq!k#^I<Q;(6lJ+(S@tPh<7O3I`v3uiJxNN}8mtQw*z6H}RSV#0){
ze85cgcMHgSTQhM4fOwCv5ty81{iL#qrPpXVb6Ew?PDpkY_QG>yl=N}|v1fIIReTS3
z?fhy!Qk$9`Qt#HDO;NwaaRXGjKl|F0{i*meRi1{rn-Sv#57V%-OTvirC})p05;14J
zBGlahhr7u@L2#VHNTpwqa4rP=4VHv|XXv1y>z7sD=k;m<vK%P;Wj<=8WVEAiL0X)6
zAFf`&iggsSp;7rreqFp}cB_u1qEjLW){mvDr$A3ulzTTJ8P565s#2L0vu{J^=fe;4
z`(fRHiOEhFe|;!x!Xaumt+SxYAE#MR`L-4?iq!KrKdkq6X9?G!IcI{rSaySP-oj;q
zsM$S1wPaT0&3MaEjx|cgXkGwUE8eSCbS5SAJ6L=*ERknhos>{WOvZX+FlJ;0Ga?m=
zwB|ce`iq5ts*esv{C;h6v2g!=ldgXY6#myZx%hJIdEVLInITc1iwsR3)!f65aRsxR
zE8orDW@)PF_es_JX$WSkKre>gDpx=j+dpR<t(j|dpf_KQ{!ts~m7d6jy~4FWuYY~R
zeuBa*EGR8b6;vYVfgx=;B1973;@eVXs?4htddQFkAX{)2kMNR44q-n&Y$5o5-#q*m
z?6)9(|1PhQhHfJ8M~V$s8QNp}m8eOUT1af=ThW?*uYj5Xsp{341==U5&vi{gI~yhJ
zlUN?Ezcx=Ngz9gs{rh@%_>fI(`60A>eYw_n^!DMu^IbbjA<<hRE3UiOyJnYm=XQaA
z|CoPiCsloHJdQrWrH}>qSvnFEAzJ5Yf4<s9D62GD*@`ZV4f)6FH@&eI|2ZHIZjW)d
z6Rt(imkhbRSx71%p{DZ#?0t!7JKmXPKbp8Hr|sER_TTtsL^%NStUysmS0@QYWdrBN
zg)oKhOolb|&WI=m|Kikz*{t$t3Kk-pad}UY<#I0gt6VXt1w&E2AIT{&7OMKulb*#y
zF)r1s=L~!QJL$_Gg!W*#^I=t54<mJx>nvyP{`$ARcK7p}u3evh1FLtVTibX4wS}DA
z<trsy(Avh42W=!T7Q^i90e}r$>ei-O<-M!NqF2>A1>rK!{icn7{fc7jZf8i|->0Jn
zkJmq9-{+tN+-jVzxX3=~Vim7i<jJXX<*MgJPSi$CN9`MJcO7az&?U)73bQ22@jfxR
zSP}W7ResIcl=MYz&fk8tT~eg!G?4YMZ`>V>c@&WJ>%k!DRWTTf2Tda~<ENd3UsT%L
zzkVaQ{;3D11E@C?Ui$Jf<maI?zB@Z-qqNJFViSv);TaPf|K=C&uA1zAIDD9WZ&-fV
zY-xMXPO)=73G`Fr935x4H8a(@1TJZ62~w{vTQ5#T&%S)LJ!P?&D}Vi);w@R#yV0jL
zP(Y*=66M}=U5?WoX)&Ks7<g@0Y2B1ue8%ukbp_7f_QQ~+lVNO7RbEj1H*tPf3%Y`s
za_0G>hAbo#SQo0j+{bb!8eG$EprcVuAfK0s@!z<xUS`TT)|YNpAfYJ`T7|7Cd+O%+
zh@vl=oih<H0mb<np7wkG?RwF}b-gyuMmlN{7$WrXiOOTD>xzBnk!Z<=rQ6^9h*wkK
z!W^2iu=K2BE+$b0=l8@9_x}<_j_31im6t*Jei=8LD`ny`A8nk?h(-cKUq(heYL>Pa
zU!{#F(*8?Z>ZGKwVb8a@iDTNIa>ho~-D4@eg`!y@X-*fc%2QP4*(WMB9pUo>yhEow
zP*21H!wzgEXWrTJ1y?3dG^PqT+$Qy4wN|jdxu=&m%^Q-izJW8#en-6a5`K>-A78(%
zMpop51`;_5$>2im)D&g4iyxA)b8p}8B{8!u|A5UWK9X@Du+z(L&~v?8jy_KL^E9ji
z{aQ|X!Zu<;VMu7BQ8MTSX{NGeFV4X5O%}YO*RxfFnG_$vHz9+CM{+2Dn1U<;9)*ia
zK0_njLD)rtoht=-sKkm=QOr_dg2Q7-^1uP2bzH#SEKZVHqOO=3Wk6fpYVFR>UU9&^
zax*uCDJXouTzst%d?~3sY)(d3N7L^%>^W_zB;4zDGE}JikzZ=EOcSNTA&fFhb@J0@
zcaJDe#OWkU6g_}d^y9^-o24mRi<8IO`l_!+mvr4fb`*91cl!zU#m&OC{Dru88&0pR
z1opU2xh4MY-zeth+0ggI3H^M*iIIl6`4j+^bS+>o%<jP}v<}c3FZxb6c#R5%V?rqg
zCBCa(Wm~zbHiiaA-2rqn1e|;tOdZ0k9O;NjSaZHZn-HxAYd|5%SJBULPQ4SkOJY|q
zT2mytj@DSzCr;iKC?=7@jzYhA#u2(<7UsE?dc{FQhELqV@dI2i=62hZU);nSSELLP
z2mvKWU;VVRc;|y?*8T|9)$*&{{*>2ZDfdLy+OH0+&u<q-n5-Lz+@r+{*lYL0=8W7#
z_{=s?W&r_@qgf(@*13@MW9mk$_BuJ=ex901<uEdq-flNlPRjzD00S;wm#93!ubr<=
zj@>#^MM;hWF)V~Flc^4B-8N4Tj+je)diZi5<Q!EEJN<UN6_qQqA9+rC+ey|cX~y5Y
z%|DaagDN5LvqA1Rnj8e#mC)%!X%Dd3!uUrBHkm=Suzx>Q(S6zalr4_tfD!jVTyEM8
zJz9Bn?sS_+PZkyFxsUJr@vG_9Ug+cghT-Y?`N&jhg?i4#+2Ne?$8$fHEuD@W0#!)h
zP<U3bP_mehSGmiVqEfsXEigKoH=@s;UX?VEA#pJ^9ItSmTJQyyw=b|I;78EuF9~C?
zCRU@)IYWuJDMnFhaK2nY1`n$Jjwp=>%a2oU=$A};zIbv_nJN(7_1{HD<O_{=PwON)
zvwIFw5C>{xCn<1X;6!qDRXvx39A)jxYl3G^qhD3VXLU0PW$di?r=4Z@JRCI~|Jn1e
z8*a2iwAYq)wg$U)w+q+TJ6&aa5Q%00B-H7Os-Cvde=(Xr9F?5|Z7wuD>Hy)-7SkOy
z(atIc!by|Zqra{kC@BIZVvhxU7H0FPe)VO@Ll!R{v6Z_!5*=VoNa?*yzfaNMI{Wv?
z&^AfBZgMhM^Hn`9?(1vLsjbMu56drF{6sH-_X580$IwT$c=0)yhu}v(Ysz4ApRA8W
zX>N6*C{qxHh_TEOKb3^AlRzay(VxQ|ws*R7yF!t5pY{O`-gBZjD<?Lr?Xmi!|8Cvy
zijIz6pZZ$y*53?546>FEPn)2iX`Ju1^<Zv)2c#}2zXkj*h4xyO^lYo#UZV^>r6VMa
z6%kK`pk!k9W>F%3y#)Z6qBw;*s>raPXy2BScVD}38hUhCXTOlW{+>_>Ra&wKld81E
zeXR8a{at&lnA$?9dgSSv=a89N$Cjoi%D@MG#D5j$!aY!=An<QaHXfuqO)$gNq&cax
z_i6=kf-3HQO>L#tBP$DC#%7iEcN&B9{;<Y}jqeUWcHRBGCHuyN?1=3p$6!e~y^ZsD
zN4NQsOA4RT8Jm{nI#)i8YOuAOq=g@<3%dB2i&XBh>|F#LK})rnS$%J7Qmh?I-++A%
z&0Vm)QgJPZ=nQU%3gx)1f4U#Av$?+eZ+U&|^Zng_U+3E916CtdMgf+7@gd^b+!W4@
z5;9KJv5)CzxqO^P%y6<f-tw^|1$3I0IbEAG477hnnFf!Wt3d3zf&zdXPBv*j(LZfk
z0EbHiF*d?mP2U~wNLcvRy7c+5smfvP?SVN>rv%3F?u~xa=<N6Js9p-({{+E+d_@u?
z@@V78tX&LATZoOgT-eAY9($m29ft9wS%37m?=My^0a-xFid5$w(PLwhaWU^BTE+}I
zAo5R7J4wCw{zMgczcxSg??abqRMgJKkLZ7{AO98Z-NFC99?sa^h&J&f2pHak%7{=-
zN&x23z3D|(OXTk_tOm50Mv7%*RN#HGmj=*GJxC|KxK4au;XSqDzBD>X9b*m0c(#R?
zJGy3?S&I`dOi`^OI<H=9zTSf0*@`Nfue?I{ogf_BUnz0DeRTN8;;99i$TZ718=$)v
zqXgdcljbJ+FgfQkX2Lmx=QY)uv5j|YIdD0uvc5+qMfdwG18=JVx58ZkCLhU9x>OKz
z%-3-&C3A^Y!2s6fMV8Zxj!&JsTl!%^Za9Cme?g8;MWb9`(2fIP+E&UK$fEa0Tyu8$
zii7(5ruw+i5!mnSL%1{7tjU20<Egu*dm+KQ-bMMQ(Z5a=Exb6sBPE~=A7euQ{lHq=
zHo-ia1L@kqKWMIlCXa7d9k9xn-^!@=)cR5O3ZFsxvU#U;XWL+SZNYGO<FRis;zC+B
z-~`w#KV~d7NJ#*xOiba(9j7#BlkmysO^#UK_WdFHaG&Ab<1Z=B8q&|vQtCkhP6IkI
zjETN`%aJCra`K0Nv~(PAH4_q7W`~Na8LX^wD3K5S><G7X`qbzKDo^qKec;(jl%f&)
z>C`~Hl7+=bKyc_lW`cn|Y*{JpCRDa8eE+V;)!fbKuI4X$w4I-K4ZKl*0z@fi{&VKy
zKSz{y$n<@KO*k-XE^?*jwrAJAedruhu&(^O_Odz0UJvdx7-1dHn|v8*y2Jbx61~eV
z(JydNVYionvWyLmKO8h(|If_qt)N?sl&5Xzif^Toq)wEVS|TO`LE_QAZDmC4n%N9J
z=72yDJWfn>t7mFOdd1w}$V(CK5Q07t%pfS8`dI(_iP{Tzu9_$ef-sxIu8mfs)Jlei
zzBt&2uhheDxnHW<!R%eOM5^u0Qfy0)pSxpn`zQ6CySrZ(*4MWW@BZE(bzNT@brp{9
z$_B)^DJmRM)T4-5_zqMS<0Q2jr1HKmHW^K8=&ojTal0v(EXWxD{PrVV^q(3BJcd>e
z36rj8szAd9Mw&F(;RTq>t$<8oPELbZOpln&F`9tofkmf^oHh?-4noFqBUOf|!cN}f
zP#`KfXRfxFbi7%wva8R+$0tj%sGfVgileW+Gk#82qrg-&CU)Q*yT0r_nX9e}da*V0
zT-vHSwEOOxw-0kDud$Smd;?I;ohB3OzKzPUwT0nf)1A+U2j$-EE}q=|xOEs85*=|J
zc8jIRXwGAF#=jjINLKHlksaCLpT9oYUZKC4S@OAyIl*+uR;%i*6R0Vh=-Jv}ZbXS$
zMxCb!x9-DF5^$&oPQz<oiXwKV9&dj!{J2nheNUmDA#=7zG?ad+&(qlKp-Hu+u~7PB
zTE771%TymkX*^OQz_%SszQuTRg%@|Ar$eL>fJk;q8tb~#d>ZMvSVY0XzXX5y-IU-E
zDCc?(TMys@_^?v<q~m!wK6me(w7<wz*I;4r0Z;9b=;yCl-0W=S4T)>!rLQOD+hXRT
z8|@p;rZ8(0zaal;+Xi7{U_ThFTIV~fT{#_3H0Jr9-yh+TsB`)&CM^=}ozaQIA=X0W
z#gNc20?w|4TxmAEvuBk&+nFD|+qs+Zv+Mlp_3JGQ3rDwWGxzF!G)|sOIM-si@%V<C
zpX$x*@;?(3)<6vX90^1C!fxmNUA)t^d&<zXm1}PoERxPsCLBMr<6!JG)hvW8Ugrh)
zJoA%M788G!?T=y#0aYdy1I43UiIeeURi0%|P%JI1#^6j<*3!-2D%dS*g!IrQ+~Ms(
zpd+X!l4j3SE^hz4kNx0hjUS53$(i0iytGynB5T_I+Hmtw^j0SZMlB4zL{b*N{GGHJ
zx!!T#bagX@3n|Iu?v)H+g3Cegb`~VB@BA3v-5T!NIXS-?y%YI!tNF=p&}RRit#B{W
z;Q>g)Ygysyp%ECoHYe(P8DxN|g3k&p=QuQcAE~;fA9(s<TWRGd<M(-cxs`w)n0iY?
z|8G>YK@uQl|MtmXAVDz@;hiPu=Mx)g_qr5tBoUF^Vf31EGdOm!bZd0$NF0E*`ET;I
z&}Z!D@(*1ZlZ5G?luWY@@3TO-Wb|sn8t%x@6<a{TfQ~&b$iw5$*7jqGu>O%Mv)`8_
z>f9PiP2isnU4LKo@ba4to0sqs(b7k{!O7-8c++<OE@b$V>+WWs_YV2ZLRZiFa97d#
zJ9|H^M@coz9?gfFR%*hl2;r8~$da{YLA4TqL~XF2@N`JdSF2xJB=N@`!*B~~pwzyP
z3W@Cgt0r#GrH7gq_Go=2Oy*Q#F5=)3C`>>sk49b(B|~$EL<O|wkIOeh{o;(MEx}%x
zM09ibXSX|@1+M{Ry0#j^Bv?rP5n^>pv210G|3@L8S1kJ<!~+p!rrX<5Chdz>?-Fhw
zZZ_P{cL$>p@0IV3neNcPZ?rTIdkVc!6~}1v5DIZ4W-R-dg!k7Zo7<K;Hn#6Of=Lg9
ztv<$oTYR)wdVZ+!_v81=Z>PkxOB#XX5^a=&$m)AtKFx~t`uU+fC7$CMHoaxtMm((f
z&(ngQP)!eka#sKoaq=myrI{>t4w0FxT#^5CoT}v`YCOpt6o@RgHcFwS)wbe!ft3}~
zGQ4iQnd2|M<AzG5qRLqA_2HPDQvbYraD3(yrgE4#*WPFFvB^f%PTunQEK<pVpDIMN
z@Kpt@ZdTQgklD1)A0kylp;qN%8lxrE7<QJ-y{58|3hRl1DTk-)^M?dS=w6x}3H50|
z<%-`|(w%Rv<!qC`fV0LFHCeQ~J=aN&v7W8r7Dj^^f1XliC3qMw85AM@dq~s`JGqA?
zPo^bFf+(`+M8fLHvWYSPWVWeZpYSPes?LM6&%dLDbsT))p4lw{Q53_#4w%p`6yS9t
zK~zmb{!iuVDdCFc%DNY37LWtRC}bu8rEagYAu+VC&Dh~k^U!3d&mJhA_8>9&(A2_O
zYN|o;@8FQKTnJGkvmL<T6roL0&%C}p*w*w`yv7UsY#{0!K#di58z{0|iEduh=>+Qg
z;i|HrT(yS5Z|hZ|)#1~@)}DORq^H+U0w9&zTTo6z#k}-kb@Di&%m`gq0xyF#`G*Y3
zKTGPF@Rcyz-Y&1F#j2FGQeN@f8Z=_AX8L!e5|y0Wx=s}rnw81bJ{3q-=6($d2n~`f
zcc>m<`i+(xtj0h`s3TC;`Hef?jXeiD#eP_R@=Q@q%Pvtp;W2zXOY@Weo9iRB3?x{}
zktR*;)_-I{{Q7G}_D$h4YTQ*v!*nGK6=w7~F*xe;N#tUau5qdn4i9!DXHo=LO5Yrs
z{$qLF)tEe4`{eTcHG{}RIV!LRBP+vy-q^FM(U@pQPvMq1EKE2nn0c|RY06@LV&uNd
zywrV78Dy(CnSB4z3K>AXo&hqm=wcPJ_=3h0s&Q|7!9`iVKK9B~vV07xKz!~ik08>B
zA$@cYG##e?{Z$c}y40~>LLNpLE6Ghpja`|4{^F_Q(sdV0OLs03;lczRGrx?ETV8m$
zuSJiUc_o9(0K=(w#0F(D(@8jSKu@ZBw5<wHn0G@9q`cKB^Mk%IG69`!f7OwD_Tx`4
zFOVX(M96R?r0$_O()|57?nF^IOb<+Bs9#)wS-}B~+|D*3GXI7lDYJA64b?qI)@+5#
zI;bU9W0nFw?!SutB7aW`pA<KD>aYR!Ad#17W6*boFsfvR&w$-JJ$x?u{=>oPTSrch
zh<;F=Jbl(6c#;kh*oul?ug`#LVKq+ZLny#sWTqcUL)~~`)bc8~j^(t*`msT1beA@I
zr(5#n)R{P^@0cY62l*KhRmpw2y2MxwrHF$U>2B|y7p@%0h0Dd!fod3D8TRWt3$C&m
zwi}XMo@)d*e+}iaDgnzmF8p6jd!0zJ*h6GE!AnZ1n{0D3jY2)U5}MU{>Cz7&tD}uF
ze*?t{Z#S=ne)89*ZETgduyc|T9%{YWre|pJ5Aqv77IvX^Syf;a(Cw_vDKm)uUQBgs
z(hXFm)|J5Cr}Lc-E{7y*`u?fOP>psJ6_b%{w{HE}iR^}N%;L(?A9~6PwoDGU6!zqP
zIJ;U7D0oBSpc^4c`{(JBGr)^N^P_*1y$L`o0NhJF@Pql(w-=g+F8J7J3#y$Sb19e+
zF3A>UV(|WZTBhd4k=||@8x43J!tam+_@oG35I6*RtY+hEy0_X2$U)hEXIgx}mPoa(
zW&C#V=7Iy6vdM1KLkXba>j@cS0mzLwE$GvpM67y?I{NMAjQ1Xc+igPMaJm%g(aenk
zKyd&sO7zIXmpI4>fXygFI70{wQKFAynS%%_?tK<V{Zg7BUJ(9ED-QuRFG^myp#CB9
zzYyp4-!~O2vD!W5nSqB+T)66M!pcX0oMwm?vG=lDQ>Bt+gflVhyv}#U_P$~$O$qfs
zPZ*OLtp5R&Kx@C$rKqKCnLk@&wH4&>{mg`xF^PCRNXW!<k7E@J6*-;9s=F=Htwam0
zl+qM+-gjP{Z;9@FzN5C>9g}M0ZeyfFT7xV;&ur|GrMPf5Vg@x56bS$jfEt&UcZA4t
zTBSlpbP+SM0U;t)aIYGP3eYX37f9sZnMA^306-K3m@on)oqjXyjFOkV^N4F$D7_4b
z3PYE%3X{$C&yV+M?w&&RurP;Il2nQ{jKNkbXsLQD13+c<=jZ#1-Xa-_u@Y&oJSr0~
zk>q)$RJ5Jxl}}Me?Z&Q&X(BO`PQ@~S#QLP?auT5-QjQ>-T^mSHfg+|A3RL^J;^jp8
z{&62x%^R6<QkODKM|e~Y8h-a=Z23q9<pR14Eg+aNTjWAZH*dL2YVy8rS{Y=@I9L^M
zK!Q>^xcERNNdwt7>3SEO;6f09o-P;!%qgIwv+J}9Y*$Rx{YYAg1hCT53#9l7YP#zO
zDeMeVEkr)k+XAwXiX~9owR7A+BxnKDx=(&-0dUd-<3_VD2=KUbN^ZqRH?<|Z1uR{u
zo1C+kq<Q<CyJE+!S_?X5gttnhRO%h46a)oRNfJ^?1!7xwsA}%T@zs6>2{0_h1tg>`
z7+5uhYUF5y=%I%jhMGc=)WR9sB51v@CzN#W21YCbBuauWumz+mqXd~!+;f!ns7NYq
zsdA44005PsbO!;k$)zm_b<gxWTMBk%DoGW}HQIJQFm%~);i-Obj}Wd91pt9eivdPE
z^m(=dL6C}}_OKLL;MPOp?<Pth7>Vr4T|0-uH7Q_8l5lg6Q%W;)x`mnwKvcbB&C{(d
zyoJ6ISamm2ww|rpwv;5&7x&~n$xBb9<#f1px6(!OOW!+mxj{h7W24&{uSH?>1tlOj
zLeS3aO0+?Bm+ZKjWt8mJrd35Ar4r{xy&6%##TQ8!EYbEjBypb~S@PSI7JwBT+N)iI
z5b=|^F${UHpy~_OR+y?x3l+3#1tNX!`(BwmV9=p}OiJ5!8JTJbfe6Lc5NazF36S+I
z6l_Z?w#tGFD!^6S`qNkf_R_codx}U~1Z<5Nq?Q4>Z6(t=?x^agtFk@?y{}V2MSxmO
z1f?m)z95nS8G%s4#}JV#L5sEMIcj~x=g-fNdNX>|hXO4cBQ2Pg!g0S9v?}NZJ@n}I
z^F!%!pkrWY1vRt?1Z@#ibpgD9hNShS>8_;I6#x|#60L#qJlCHfK#zU(5G%bRP&F6?
zP+EathEW;vdk=pfaz~890<=I85tXR>N^TVda{vUYs0Bp<P$ef6xr9M&5v1aAv6u=}
z<>HEECLG$XIaa^p??R9l>;ws{j7Nv4R`Z$A<E3rOv|`znseAVkG7;TQrrT06LZ!?3
z=K&R<u4Yt?G)la1<~-J3tg(?`x+lXxq#~tbDFs@i1$s`x4Z{Z^<kk2xAisFksMiHi
zU`6Euxhc@cp(yt<#dkdcfZ}d2L{36c@nooM4bEpG`&WbJ@itL4wG0BPNLURr&i?t(
zYGS5E6^NoTQ%bA8#;Jl@*tQbN4N=J+B4Jw3&`}W~l>i9hG_){gQOdM7m{cfQq2q4e
zQWfiFw6sSEijJUCgpd*yi@HH)+TsQ@T`XAzZT-sGQc1l-+IL_`kfdc|Ar;3%ANF34
z?#pAD0XT05d`l1l#fK6QtpZdta2IEhdWO={cCiv75D3(o(iS7yEh!M%Lizb|F`S`A
ziw7#v))ZM{f8lrc``z~L_iyQYGvDxg?^X~Bv;d`QpbVV({AB<9WF=S#M|Th+G!m(N
zGqiQDgw#<B6jDVF6SpEG$@gAVTx_WlLdi5CZyBRSNa`ragY7IE^_{lY*!>Q*`#s1l
zERJTLsF3195OP+8v=)AQ*d0+q3!ii>RG~`uiy@uwiiY$6<n5K)VqE&}_a1c<i=l${
zq7o#VLP2dqB>sPb-~h{#<T#R`s(bwE9uVN}+xwq#339qBGt4NGA~3e}vgdHkczerY
zTV-K}FpxK_k=6^q_Y3j@5~N?JApB$mK=sSwEzm06e{}z`|NK9@;XnWJ>t8R*um9wq
zfBgqPutcO6pnyYo*x{*k&vW<d_h=#R<WHm=Y_wYJ%c$Ud!detM0|jOd5azZ=?ocTc
zWne<h(<$%Fz<ELiX6bJ3I$_f0TkFQ%GX=bhD=-h+cbuQCb1~)X>4fvc$e%3H79_0Y
zPG8^+c%RH9^e6NEeqE=+hd0RK-J1`wC46qMz3%(AGrT~{`8oUj5jqdHnJFUqcws=8
z)TfJO;63{U#AKRE>O2e(ZKSQzO0RPR$6kOTaJM%Uq;O|hKmc06e|`V?&mD%If6e~$
z&&Pe{<3H0!qb&s(q!bBO=Jy44_LD>QVUg+kA!em_Dm2s}(s{S4ae^%XSpYk}GBeIl
z+NDHkOQ~Oz76<N&v)c|g3~<bjlA4Us3Lw;%vBGdWTL2j0%f851z$scOv%4@w3a@f*
zp1@ScNswDQMr37&X&ISXntFStfnBa6>)TT%0|W~ZY;Xcl5|c!M3*1**nckPlP3<~`
z?ynP-CLBs}XUb5pSJ-0k8KG3gU8yMT6QH+wlJ~yhrQi2WUY;aB4&e|45J#nzzAjmW
zU;o(q=bh2HwW>&&mXYWPn80j)>;nZX6baV3m<sd0j0rG0Nfl)HoXBlQJpP0hxi3@K
zW`@g-o$+n%ZHmpC3@Dd-yLg7>c2o2Av!>1rK(l3F1_}qfWX#A;Xx{nS&WjY15av=Y
zybs4^w9`NTeg^P;GV@uM4q=u<L4)ZFz%76q$~4At05GpDIB-49OBrQtS4?ai`C&kt
zx~23k1(wsc;sVgm*SyRG+82@0EjvIkk_MMDEwi>3r4=Yp>fwCOJLmrU@9*zFFhi}b
zOk2+ZC)1M9onW>27PSPdwgb}!fB^vQjf81eH<;VuzRXa_<(A#&=eFakiJ@8oa6dC;
zFL<XFkBxk)SjVykwS}gTf&c&jSoZy-)10qMx&6#TYtEuj&A?5AOr&!1{XhScv-T!C
zBXg0wBhb>kO~|V@odTn*-{C#BA=fE27a0^wA>8M~t=zHp4sufgxxME+n5={ek-%BN
z4h^lhFbxWT2+^6^qzH7t78FD^4T@#lufylV-#_=x%eWLeD(J3I);2da3{4S=wA10L
zP#tLt?LdK-d0LAo9q7CD<i*8C=wjZ!y@0=and#joQpzs3&U{L5anFUW*g$37T=19a
zB`ga|D*;GB(y9B-XO_zB%NG4TDqLm;@dGorJG8g^{&}kK<~Rz@v}2vtxsl47DNt!C
zn0H>*)7V1lcsYbrEs{dp%Ei)Z5kx3?;^=MK?)<##3_9=oIc1(i6fmxqFNNHO>qrF|
z5*#W3Ed|>P5z_I$nVkMSKR35~t5{LcQU-x$3Ihw5wvY=mWjI5T*|$`6fXb~1p&l+k
z`b9G~E9$)!IlU?Px|8u<(HR&%d#{^E3&>1)uXY|M`?++8AF)Jf3X?d!FUv(tJ=Kc-
z)VrT&=gL`Qo>Cafcrykap}+pwKktltANCx|9V-?nKoN>kt<aX)a<N0p=tTwq8(RR2
z7X)n@99oKT-B7!mPBS5yl>EGR@{?cBzehjiyuZ$K|NGB#Uz|dSzDS`k#9JrDz-7Th
z;ZU^EpTEyve*e6_-@TQ~KwJxjGUVdDOe-FGD5NN7tLJFm!oE4JGjk4vb2C$0Ew=*u
zp>Ju&G2Llr>bzGGSfQmm3>?NX0d6R~OX1au<tz*=b^1bvD9zxPv+QXK1F|xB@+ODu
z0D+hHfoakPZ*>`+QoerwJpG!Piyel`PD_g<2BDb_*P*cm<SBu+biMPTL6}~L+g31F
zTedcF#c7w0J7t=Nl~<gk+@Jd%zMtPee=lzF{+|2%`*~l%f-v-!rO@r|6jur;R9lys
zR$lx5{N3;G$(8rv^g1wLi%=w^0BM2<pwJdacB|C+)P1oXpwek-q5aIwZLu~lvkSem
zr|{t|?%uSePGjL(1W@!kw4EgPzPp*BJ5A1pZquGqX1$~UT8bAsvd1?hBlV;d&Ush{
zD}C>NO;K7}G+*=ar)T)|bqk7{j4ch=LT}Yl=nN3153>mtsWX%j-5Ksop-zWOE!;U4
z!9a(@%P=W*^m@EFj@8Rz8QX{TYh{Rnz%VUR855lXbSUL+g4@xtZ^!=mukZD?pFGhh
z02Mb#m}RI)5pE!L0E5NimaR4vo%aPB5u5XN0IiqL^nH_VFCU<RJV&O~O@T4j`RR$w
zm@v-031Mqq%|}}e(%b1PXKrmMl7P14hoMyoq?E=Rz_laCcAZ0xk-|m5oZqw0>&f2B
zIRXRR^%VphkuIR{I4}%9GbaUvW7&p`opG!K6jG;cz*%cSf$i&JC70Tvht6Ot0Hspq
zqTD*ucdW!-EFl7+YnYCZ43LH%JA-}m^8VoS`}cj8D512#%ie2?*p3|)n7|C3wgHAx
zz@hh&?2ZE7@|mTs7nz$rpHC&-ZHr@b89S(nfz87JE83a49<E8{-ob5@F{W6q(-td9
z6<QELxOd2;lirz>I~iYrAq@~%rJiX4mV)gwUx&A!c5Y^+(IsOM04UUtg(@ODT(*~i
zwji~@3cc3WqGRwKc{5{ZN{31!O>aFDITJcm6R-$jPCj0iI*?XNApo~H^1f_YFCYU%
zo|-GJJp45eCwu1ewC^%FytTma0w8ydhmi4whovp84Pe8qB)GPtO2bUUrQ-XJpbb=^
zX*rf1d`s{aBcSG<G0Vsj+Hul;Y<}*Y8p*=_VIEFz7ur@Rbd(>Q+%c2e_9bnH{^FIN
z0T%atfM?8VJC-(<m;RX#KiOsa^9~h;ygR9+0)Pl@g|TR}P=E@cbUM4ifLsgG;4CDr
zrJtcgwl}#>9`hM0_i>oE1(sBYOJ#rQz$8+ZLanpK?&m(!cYyXXfO7!~j0Jz4CZB(7
z&*w>>EH+j=S>LjaC@r)zEd?pXD@8LCi|_L~+&eRKcZQV+S?T43dBSdPa`K8MQ`fMq
z^S<VVbb@G`o!&q+Ntp6OUMlMk_}l|+Y7r;!bP3gCY2@IJl*xOWOIuzR&vZ+)y6uF8
zrnRPh-Ve{+FW|m007_8+fR+IeDcDLEfDQ!^W=eqy2v{QEQn+2l9;q<avJ^AJv`@rA
zRAxG`vnkqMb;4&{Qo?B7RxD29QmMVM>52@DNZ8Na&+_=ozJI!f^Gm9vLL9eDE^URO
zLt%QkQMIuJ=Xr7q106673v>h}xqR9$iiMrDWo9ZXOv25OUWNpDYCANuLwmgM-P65L
zrp$Mz<T|4Z2nCv-{m7UU&Yogz?whaPdRs2rvE|N5@n+20Zae4m^YfkV{xqL$lY1y(
zX#oHbbgF;_KxO+1G*V=!RUn*}TPg*H&cM?tXaUMWgMDE}IN_5rh(ODo&42)nwcTk8
zFhEkynU_grMtZmn4GI)iIz0XS+M$!#rkr$UN5NJI%-mNi_6^;+2q*=5p-?g>m$n_C
z^hFr3kn2!7zX$_h3S=DJT!ssMJ(!tH3*?m?qQDsD?Y)y}=hARnI>TEEG&9`=Op$Wj
zhC3PGa*5+tuZeY(S*x1cGI2_#Fu|Yj>wT_Y<QD4O?tRt9(}ETWN@;;}!WaP!$TT#J
zL&vZJ;8ROmsY2^OL5OCWc3LJB!4?SKz9pSHgq?f4w(U?cj?`Dc2_7skDagzegR}N-
z^Oe8v4qemf+qiNYkb0;Bfb`AbBF2GqkQb5e(l`op@6n;Nh)AJwAM@@Elqz^LWZB7-
za{IVJhxO1Q(o0aHl)5);I<@J5HIVFF9a=@9xX;zDT!hz-&v5N)y4KzCEx!2#p><1J
zr1Lx9{qUV0>`fSj`zl4S1uBT(g6MY)1=d1)ZU-j~($S?tI;S|;IE9CWwBU3|W}z?2
z%b>$FbijgkigMbZ6$?%waDccH_o1dvYsi%>b$?AWlP0k1XD+6ewmkrpATtF3w%H-j
z0%(G_6+7IYtHP)wj5nR8gHn@8J;zI5Hl;R<>`o?y;WCxp048C#Yi)DRk~z6-YwbmE
z=RQDp`!!^Sqy;U6&azA9?ac4fuMF>**C`5f%k-N=It`^%Mfu!kK0o)JmHYrG+&b(4
zrYJDjvLbD-LMgzE^i~&b(;aVVvCh|d8JptJR)EP2d*HS$3U@XD?TZM7g|rt0Q=q+2
z!`_Yuw4qRhj>zrz3(-1fGM_W)a(*A2QV?WzN=itD0tK|00fGmb0E(VTv7HVK48UyA
zH2~BZ9%biJCb{&S%M2?SL1s;vd%sZ0J)E|IR`Ko^?;S3YE4*$XLqS@kB@!nWL%|QT
z{AAB=CqF(vv$M9R$l<BdS-n?o_BJs4^y@xFeecKs=H-lQE5Mo1ij+cafmA`JZA$`3
zd!b<K6iXZpLbL<bA!}w6Mn2RsN{XLKN=pHf;fJAx!~!x#!%~)Z0|FK-XD`@#bolmb
z_iWysJ6@WuLnW2AzNN4fX@LUZ0CY|T{4GR=iw-OT?$D1@O&w?g=Oaw-Knu)H{3Iow
zi*>l-51X$8l7<aHGOlqiPRobK-np;5rJSM=hsznU8Vi=m`gLyShESIqkXXVnc9$P1
zq1Wl&=U0E)!|Bb;1So?&Gqkit>P}{hnAiwFf$Kms5>mGcFjUG&1ORD9Y@{W9J1~T_
zOoP;c5fmzUlM87JduCd7l65`l5oVz!XaatH8sM^Vp8x-SzV^4@KX;Mm3h>SV%%ylr
zJyIy5rH2T;!X^~Bk*${9Q82MLv{`%X?ERrBd@L*2pE9qma~0cNJ`~}ZTi@)Yw9|;)
zWp@ranc7x0w|!+U_1Cnjr1(~+1r?sGpYfP4MQ#AS+$+CqFd(;Fw$u;Pm#^n1%YO0h
z7D6BJ6ad620*Vznmjzm+wwj{3CZZq%(Wr&;K!c#t&IXxr?q#m$>AbaIscXxe(mU<`
zwlkOPwnfMGjuPBvItsU&qBPER6J{nq|MUDl&-?tmrydMUo`Ahq0H->%LT7Ya^CAg2
z&Op+@oN)$5@2u6!xKu(rWGg>!0W7W3GP6furi|M#XyE33ounn*ws!aY{=mF*oto|`
z+ag0)m68i+*47MK%a7yd$OVv@zL$&49oc)QLCRhz_1K5M?swgur7u``O9cQxNn6Nh
zM~T|2pcKHRwL%f0&}ODF(L1X^ZK=hX*(c@!D>`yD%B>}b3^&vdbfHdTyIbZ~h_iJY
z?oLXeO4%H_;LNY*zrVk~zki+wgF`(9iuVepMhcXHP<&g;*p`uaOM!kJ=)D6t=|HcR
zavO1k`_>dFFuZ$#*{MNw>J-?UY3F@`PKt?B$8)$RRO|SY&nTn;2`h7BpF3Zx;Jn(h
z9`dpC)}Y5e@4U^-b0rrn0=tm#&f)UepF1a7O4pe#Lmhxs`;^JeZqZ~dZz&`Qz<8ac
zEkX;WwORrIL#wo*7x2FO>A(O{m?j6Ds!$Pd0SX*2U1+sC1?tYz%!*bNA+~|x{QBzO
zfByb{`SGi8GfH>BrT}!{74IFi=q-+x!jj8Skx>Fni$(J0&W)XYtG3hkX1;=mlY7m3
zMu8U!6#b-WsDmhdtAp*fJNxcprOwS*11qthm5)K6r<Q)|{mcE=|NVV_GoL-bzwi9o
zzy3Ua4_xcv-XW+4;0g2Q%RGL*uS;Y@3%SeKw!%PZJ42le$xsmNr2w>WF>RZSbphdR
zI{;BAGc&YXx$Ml1OlO)+&uNPE9ja8#qb^JtFSK>b+hr_zISm7aC{6?Q<g&Z^``7b*
zb3VMEk*3x6a1Sp~pp?(F(0U3ms8Kt0hKpF{qscjw+!yF=x?l_H1Yi3=!L~aYp4ZPT
zWsov)>3gSbrVJGz5a{kZ=jg@SF|(giw%V>$>6cQ>P2nOAWx2ML=?c?efYbSOiN2NG
z87RajC*OB@GGA|ow1@!!Kp>A$K+Tf?00<&silk%hEm{<?X(|+_1v)^pJkSqZ+EIbi
zyPxK|+zyuk8VlN{K~zz)nHkHrJMRm|mNj_WHal-vz^|RNpR+$uA{V<xZw4)I%+3oQ
z8c~CUYAKSR+e+E7g=s0ImjufAwj&|)kqhOf&Iyyt*RdAu1%x7HW{MaZ)FS0RZUNd1
zGfdmb#f#z&<ygrvo4d=J*4`V_kRQf)c)vC<gxlOs+Cn%fF!MT>o%ii$Wv;;kuoj?*
zYM}t6i6TfZ77!6B5<zJKkY1Y=5qUvr)1F~>YAdq6+a7;jT7+qq(jqkszTY_xiX^nB
zoxW#J16C1aK!2_zJ$wK5^Yz!SJ?E1b8ye@s2(7l-0+tS?K&9SDW{i{PwG>Mx)qw_p
z>xXZhrk!fnKwCg=;hlaL(*xAhX<A8Pfa<NVb3IejTb}cExu-9uw|16diga45o#|x;
zeR1>Pl$-mG6-`pS*Os-=Dbn4rln%ez!_R&_54tp<Azd>-gQQj%=#0G2&J>|gfqFXt
z)lum{urzC`EH8Kgxs2O~v3e<LBgHl=h#6bQLa-TAC6%$JjB)R~+wy}_!O<Ipp{Zxy
zocZ;2#$P-;4cOgii$F)9Ohai~fpLg9nc?l(8EeDzq60T{<d#2hWw@~34VLucPyr#i
z30hCOc3jJC%MiRRWU3wi++1MpU^#^$F1G+RSsw<P+Zma>+U87h^WHKAu+2cy;Via$
z3OQ$D(vVx0KYZT4cm0xHioOy62S~Zd^bN9y8EjL>27myC+TBR8B0xv@(uRRDT8cL$
zDD|jCcy(cb7P*zS&}}YVer_s|(lZQz`xJmQ(k=z4$NP#Wk1jJie~=Z+smmBfC^H2B
zRsc$&9okI4-vv^wa!3XWLlxj~sRSvV(%bW8dRD(ale))6k=(0_)3}sUd(VB@ooW8O
z{LFdjP_Cmm-2{N7%;ZXE0}S|axD1!vB%M~FPNA0xB-Hv*-N01aUhQ3e%I8eHNjp>M
zQ=}9?kQ=!bM(~KY6anl7pduA5K&gUl8>~QK<i4|-FmcM>EWk7Y6eu7C0O}{#wj(s&
zv9=xxNNBCov<y#&_bQzy<kv6f<beWlL8tb@LaxBo$s6iOI}{{HQ(A#K1P&BPbmr^(
zdf#FuB-{KX-~UDS=jJ{??|1m~D&KkkIDIHj9GFbT;hi9`nNoPR^y|-*_v`a#q7(-O
z9>Ox#W-_;Z#*f^&c^f0sJHp&>rS;q?^E5%6+I?+H`~Ld+et*yR<=5w-ZKZ9eDKtP~
zN-<Diz~CfNC{hQYk_<Tx6e)EwouW*+vwwa8&8&5E+otej8b%5LHth_+1kutN$F!7l
zKh4bdE&*7E6eh8i=PwRVK4^Y6Uu2HY7lS|n=|C$`pm$kve<PF%V3DkSkF=xSz*$~i
zm+Q2=XP{EOt^Y62U*CV<e|_=&^PQKkJAeQD`RhNV*;3?XKue22$+1jO_cnCzd+u=j
zQ~?CG@BXwNz+P2Ag^T3ToLTR(cyDOw*puQwp_DP@y7`9BH#5%*`()D6C1XK^3RG(Y
z6nK9FrDhNWY60*;C>94mXr-kK#43esFGJ!$j~!K%QYhF<08NHlN(KRvPMN^{3@uak
zT5Jwj+ts=EYfj4F?(I3}wcX*4ut8e63$QTmU9XL`9RLb>|9Zb?Z`v8CFy{=+I?a7h
zX1(sro%XX|=da(p`1Scc=d-i_{Kpq_?7|Rj8B~EHOaTDs>&C9ZulgU8(>JH39s9zq
zRI2QZ(_NF^_I?i2+X!>ES6WxMbdU-Ik|>9t*_|g}dGC8}7BF&6iQvy$AfknUG%1L#
zEfk&2&rn9H^rbC08G5xq!do4|DKfoqz?V<2j$@fh!FiF{GOZTvO<-tXLfClbeY4KE
zE|Mu9x?$cqPd>BKJo$Mz_w@yhFH;0z(^ju_m{#C3L7;q=bd03|Mhl}Yw%!C<7#R)4
zX@ll{u+aLRU#CCM_w!kx7C4TSAhjS3J96)RGjOo3UwPxbzV-qHR=7!Nr%l-zmU~}k
zL_^Ct@3E9><us*^rh%;1AzUw?39+RHAy`V`*rEYt`e>}wg+>8}mJpnl+o^MDX<MO;
zHzpLf7b|2e*9iixEr(kfZKo*nkyrqM-a6)Xr?kco`H2~sd)?t}&v4$K1AFuJOZfU6
z@5`q>7ck+%ScQo|AlSixv?a7muszZWV_RUL<svgX6gutTPH?7KNn1vAzVBcE`09WC
z-9tyJD}~b3UXUWD_SXDlICp_?W?FhlQ{c8pq&-2Kui<8H6KP*gp<98%?KG66xuv_7
zt}W3^>3sIhE&odp93V@Q97h&>W*%AHGXS|Fd;d%Bk_7r!hMQ3pr66%50l+wmMik-M
zb|o3q0s;th0cfvGZx4;yRsuw}$Xkj4iK?8eAPu^>o2s!SAZYWnNT^#1Ab|>IbVEIR
zzorDLLIVh0NtpQ9+Me^Y&shWBv{iwEDAd@X;3Btb0Yr-$Y*A1s0s~50q>2=)-RcZm
z8Nz3i^-u!;=J)7$W=(+>07NQDh{{zeIc;j@QY+QskQVJCTnVzI`h5@`DeZ1iOQK->
zRusF}Zka&iB2y`<X-_F*opo<K7SJ|8Q40hl7$<EjwaJJc142NnK-AWb(MUsS8#)BQ
zh+vQ#6jNm4M#Tl)b7)n7rj99%wi>mlRoe_Ri<jve=>aORYf$sd^;z=HkwLfCTCrwC
zZ>3_yN>x!S1QkFFBT-tX08#;pKr$eytttRah2;6}Cs*q6vhmP2GxuNfcQ22lqL%SO
zC5{?Ik&1=X+E?C3Sgrb9ch^q?P+7178&3g7t7czOk~x?3Xxg^wTNwllKr?~`7(9!7
zb^4xy$Eoc1S~N#ci9-c~CRE)3#Rdv!kP!t$I-G-=P=SeyK`5oPP*DLTOfOk)Ok|cy
zRjYP{)S~vW)kJPvO@nr=uA~-7M*#%&{>d?<JRa%3+c%@$(sMnLI7CGhy9H?!1!Dv%
zLIqY`M8%{63`)&Lk^(U-_O!SN8ScE2NgM8de*1aA28^bUg7%2EC@D%g2`g^b)NO6B
zQcg;Jh+6g>UUelZNZFebWVwG9@tlShwROv)bP>DFtq6v>nR$8oCsfl$#oGb^I4}bW
zHdm+207wEV6-rB?@X;*-d?_YXqk@Utax0}sBLyQ$5nRx0dJz=@(Uo1mI5wCz)nj(G
z{LZ(B1ZuWJ!L-({h4;PE97XBfv)UEboK%7cOhJ^=3RDT2idF^rp+Ge>L13VsLdOz9
zGG(lG&a}1mrTKNrjhCPK_4{vs&o5C>)Br^#Q7S#BS<+&tUp_QS)Xr{Dz8geo`x$t5
zPK!A0IIBu1ob0XunN7|k4Qfy}P>dy7T^L@RJN|ivkPAS8B1EMGfU!c2OpvIAAj%BK
zfIwdaP(33c5kexUkHJ(3fdLG?2x*W;rnPFIsFi0CMJ2X`(v@-=!{j1DELa>cWOX(+
z>TVv+hd@@5HE;w-6d0nGG%_~_N>SP}!>!#&&?-bOy9V0XKwZ*G0G)YrlImh|H}h1z
z%I-eDe)lU+EER%jeL$F4V<aRg=^pZFGA#nAg{Cd4klwYfv?zG5`?U?n9+)v6W<yI_
zWC@Z{smDCC^aq*M;oA4lwQVhy2mk^?g(>WuIIyB10|a13)f7ggH6=P3l@eU6H1Yxw
zAh`sAptz6^v1?j$TY)Gc(^6AKMRJQ$cY4pf?|di;Ehj+^wCCr`gXa7F!zqTP06#+p
z1YuMg0gZ&|g%+rU%4vYC1PB-aFen+TYE{&r3Og;i)%6)i%P8!8(9b>ohTR4LRU$TR
zkq#}b!t_sjId}S)VyCB3N(CTF$0$f@+u+Su`#k3}T1FoeFGDEXh_>e-nsSP<L5z&b
z=x2?G#Z`+Dz_=11sUWpzC{P(%=#XpyK%%tvY-QwD8%K6_#YGe`E`W=R5H%^KsvIiO
zqRm<@V=;a+Zku7!v+wZl{XBBj<$OegVJqL&a}c_Het{%f$Xa-YfZW<uumY%s=`}nJ
zDw3cJ0;)p**@jZ#M{ZGXD^_Y#Dg%T#uT)hZu|I$Q^~$J4<02u&5<@Br5x39dhZo;t
zGJR=5TTub1Qg~)l3I*b+Xl2f4nr*zRrgpA~pa2_5v`;Su#7Zk|&)Ij3r$s|N)LJaY
zMQ(v+^a(~FQ6x%n1pw?K2@IZ(;Y<tE+}QJi9^7fhK^)Uc1*LLni{11%A{0whFs}Wf
z&D28a;itbJ7g}aKqM1URw;a{a#=l^!s_^MGn%csUc|r<pC6YOj7-$QEfkG+>q!O(`
zNXQ0>diL;jA$sLPu$%tjsIBIl{gVm_C>6Of<0kbHqaqtg&*R<6hqrR_)OHWp0Hs?J
zP})f99&Jg@ULAT{mZBlHw8BlF6QzX+4ei^f0gL#<t09jr7L<-gC=^PxS4j<~p;8gW
z1sV$q>ILxkg{}mz+{m{iD()gg2qH)h6ct5=aiv1)PiVD>(n{(ThZKOS8t!>642Tjc
za_EipUd|BIk+D@;op+6v0nvg4VvAABxD`PPh~Q#DRYDL-Yp`XI@w8wBs*BL}C`RqO
zGFv2l<1#g(C8ZS@q-BPv7-&6A@4@18jb=qG2r3j2fo{eN5QZI!*lZf7Fp*K+0=TMx
z(n4Z$xcfY-zH0o;OOdiJYSmgsD&+FuG(9e+#egW1P<d2}K`!8+Z3W%Ps=0fit(_}~
zxPTV+ofe}+QfeBcBFg}Rwm#{eGF?|wlzHC%reJ}n-xe=TneD3+Fz%dqrqE`j4Js-@
zXig9+;D%ADtP~Zgw4wnvbPX7!Ah{Z7;T4s13u0h<PPc{T4I+21DA<rkD=G{rAdXV3
zjUPqac^1`EouG{X1Ptwq-1cZE0_)9FGX0V6X0W8Sn6?NFS*%DFYAPyv{itQKnqR39
z!e}}IpcMit1O}8+Bxp$}l-NZAYB(fFYTJ$qNA%s?QVSK@*1@}?P!+uqmBmn58a7Bs
zEumH=N#z|g>cdYSeA<;1&DIda_OtJHWYAW_Jyxl_E*n)KLMx1?ftE#9s9YqJ8np(h
zE~vByq>7^#8)+F{%~q*L(aM>G+J@y|^iWL&1-nq87It+|_u@och@Ptmis&q=s2UIz
zRWQh;m`z=j_XlpS&EcXBi(N}}X6iHGynw52d=PZ8+Trb?qF6x!K-y9^<c7+XD3WL-
zrOYV+P(!HgtyDnd`lGkGP&Eiq^so{{hNaL^e@4pT7CiX|3b<QBTPe5Ahe{FaGxSKJ
z`JzgZ%<|~v&dd=n;(=-5;T6-mHStIQC`@57D-j$WRRA+Vs1ivrlA)!A?2an*Id_$N
z)K`3Cp-Kd+W!Im1K5QBTl5ha4qiW+;rLe$d_TReGQ&Yl$gi$M&NW~gaZ(MobY8YR=
zcZ$_PDo8=XZHyM6awCfCE=TNr@}4tEvfdcAVFcJMMMy9NL~ALWA^;(&1yl;Db_HNj
zR9j+KmfPZTOM&SE^qDm1NxgwuCX_T$!6K59mR$7MsJBP=*QpyY>>|O8+sp7nEPmOW
zqaHa(G;4pPDXEH8?b{XsfCNM;luBi<L=pXN<tA<cxlO6n0fj6rn0`!KIUrJ<n~r^S
z?`#b;t%T4bsMz<RPA2c0>DLc%rHa)+kVF}ff+Px?5$_hFY25FvtSGsy5Y6I7TY9lu
z?7*XH3o3S3(*Un!V+sH_1HI77q6j2LNLCB9Dg}X&c3u0sc}O2Iii=OLYzZJ9L<^y7
zP)}QH!vL8Uwrl+anxR6W!uzdi1;yvvU-oeU0HsA1-00l5aqWGt4z^9{v}fytpva4w
zY~@1%QShz+5C}Rp6}ekVVo885l!BC0?IQBTPjTgsX-91oN>}!!h$31L-wJ@zj7U+k
zSAFG8K2gWP&g(&3q^U#@EVO+$fHlqb`(?MVxQk|M-<3DAiYRgyiC7^<$hXt5=rkY%
zDhNzNOI3=&1hqzh3={#BRtW$&v;eyTS=az3w<Ccfno#0y<aedv5Gk-!LXwcRdr!aC
zLWk*HF?#h&k1B*}aJS91x}N+YbMG^GS0gm2I`=9|qRNF^t1E((fJr3+0)!bP0Q|OF
z0|u#7Y6_@2WC6E|x1IS6z6(e<#PsKiRBBbE1XNm48Z{EF(r4@5^+*}4ju3VMq%<yK
z3o_-tNPHfg5=$*I0$Pq1@rI$abrEjt<lZH{rIqLo=02i8DT6>DRLyq$YO<2Bg8-?B
z0*Z}Ql!2v)Bp#}f9viE(t3}|pU<po<v*|gzs$K2tBTy-8?aSPS)u5qGIo<R8&IJM#
zG>Iys<(L15N_Wh*XSCqbF7u+c1>Krb+={}cLNF_Us#vLtq26~N?;3C<GJ6H8YHg%c
zt@o(&ROdvZCHnL3i-B|`s%|L_LXYI6n}dFC`!{jFtjmo`84y(gHqjucCL+yS7!CIp
zID&~4HIgDdBr*q~0<<d7dB3r?JuXV?%d9CN0JWu{NM~YCH=-3BXhjzU09~<#%2XUg
zWI^$KUIvjdx(JE{lE<_%DOO5{Y8zTevrCbI;;hDpjH+H+`@TAcLPbFhES~o!vpO_)
zeDng9mx%{TiULS&rKXUMk*I;yDLG_zGg~&8)_@0zsBRlnsA^m2Q0|%9l#1EjclSfo
zP6aMw#FZ-9KoH|@<KMH+r2~vQ-2r670`Vyp1OUD@Jiq%Ut!lW`YC$BOkEje3Xt4yS
zz#FP$KH;=gayD2+261aiv;a*tsf6+klBg6?Q9z-M1ZYQ0YqLFCPtH*fIDiDD6sTxb
zRD-A%-t5;@NUd8nB^T)1bGia%_jz=0H%62;uDpdUqYIPDysghO8rQxxj6`X-Ah4F=
zG+>o30ygd#W4~+O;|t6f^eAm>l?qKn3Zj*NJTO=-T?z>wUW6o2i(S+fxh<+5NDtrV
z^SPankD|h}i?<`JyXvAs-$j$sjyVvdZlyH}0xCz?l$I7jU;xys@ovspNSI0*`*zg0
z1-VIqic+@_1*wHb0)Zk#kcH7C7$B7(I$h0tCMj~OEI?@;&P0ax`7|Vip$l$~=|Xf-
zMPn*PY1h8Y(}flxdP~}k)b^bDDMg~~S{j{=l(icwx2;TyhQ5F(K)+%ONWvr%tDEO!
zHIiFQrSJ%~Y9d99X=w-Y;Ne9i?(_Sz|E^-YDy0;vQn>{TL)r4#<Mmy}ofR}{A&itt
z2Bllc(yY{KUwD0P54EbPzyp#*QYisN1_~ko_a1X;s}>p)K`o$CMGGoYsv%0D3k?FK
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
F{{?f$si^<}

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 816ed5b617..67d4b80750 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -118,6 +118,7 @@ defs['cover_grid_color'] = (80, 80, 80)
 defs['cover_grid_cache_size'] = 100
 defs['cover_grid_disk_cache_size'] = 2500
 defs['cover_grid_show_title'] = False
+defs['cover_grid_texture'] = None
 defs['show_vl_tabs'] = False
 del defs
 # }}}
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index a3885bf135..75178b09a7 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -19,7 +19,7 @@ from PyQt4.Qt import (
     QTimer, QPalette, QColor, QItemSelection, QPixmap, QMenu, QApplication,
     QMimeData, QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QEvent,
     QPropertyAnimation, QEasingCurve, pyqtSlot, QHelpEvent, QAbstractItemView,
-    QStyleOptionViewItem, QToolTip, QByteArray, QBuffer)
+    QStyleOptionViewItem, QToolTip, QByteArray, QBuffer, QBrush)
 
 from calibre import fit_image, prints, prepare_string_for_xml
 from calibre.ebooks.metadata import fmt_sidx
@@ -586,6 +586,12 @@ class GridView(QListView):
         pal = QPalette()
         col = QColor(r, g, b)
         pal.setColor(pal.Base, col)
+        tex = gprefs['cover_grid_texture']
+        if tex:
+            from calibre.gui2.preferences.texture_chooser import texture_path
+            path = texture_path(tex)
+            if path:
+                pal.setBrush(pal.Base, QBrush(QPixmap(path)))
         dark = (r + g + b)/3.0 < 128
         pal.setColor(pal.Text, QColor(Qt.white if dark else Qt.black))
         self.setPalette(pal)
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 4fc32b0e77..9e26db4563 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -8,13 +8,15 @@ __docformat__ = 'restructuredtext en'
 from threading import Thread
 from functools import partial
 
-from PyQt4.Qt import (QApplication, QFont, QFontInfo, QFontDialog, QColorDialog,
-        QAbstractListModel, Qt, QIcon, QKeySequence, QPalette, QColor, pyqtSignal)
+from PyQt4.Qt import (
+    QApplication, QFont, QFontInfo, QFontDialog, QColorDialog, QPainter,
+    QAbstractListModel, Qt, QIcon, QKeySequence, QColor, pyqtSignal,
+    QWidget, QSizePolicy, QBrush, QPixmap, QSize, QPushButton)
 
 from calibre import human_readable
 from calibre.gui2.preferences import ConfigWidgetBase, test_widget, CommaSeparatedList
 from calibre.gui2.preferences.look_feel_ui import Ui_Form
-from calibre.gui2 import config, gprefs, qt_app, NONE, open_local_file
+from calibre.gui2 import config, gprefs, qt_app, NONE, open_local_file, question_dialog
 from calibre.utils.localization import (available_translations,
     get_language, get_lang)
 from calibre.utils.config import prefs
@@ -98,6 +100,33 @@ class DisplayedFields(QAbstractListModel):  # {{{
 
 # }}}
 
+class Background(QWidget):  # {{{
+
+    def __init__(self, parent):
+        QWidget.__init__(self, parent)
+        self.bcol = QColor(*gprefs['cover_grid_color'])
+        self.btex = gprefs['cover_grid_texture']
+        self.update_brush()
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+
+    def update_brush(self):
+        self.brush = QBrush(self.bcol)
+        if self.btex:
+            from calibre.gui2.preferences.texture_chooser import texture_path
+            path = texture_path(self.btex)
+            if path:
+                self.brush.setTexture(QPixmap(path))
+        self.update()
+
+    def sizeHint(self):
+        return QSize(200, 120)
+
+    def paintEvent(self, ev):
+        painter = QPainter(self)
+        painter.fillRect(ev.rect(), self.brush)
+        painter.end()
+# }}}
+
 class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     size_calculated = pyqtSignal(object)
@@ -209,10 +238,24 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         keys = [unicode(x.toString(QKeySequence.NativeText)) for x in keys]
         self.fs_help_msg.setText(unicode(self.fs_help_msg.text())%(
             _(' or ').join(keys)))
-        self.cover_grid_color_button.clicked.connect(self.change_cover_grid_color)
-        self.cover_grid_default_color_button.clicked.connect(self.restore_cover_grid_color)
         self.size_calculated.connect(self.update_cg_cache_size, type=Qt.QueuedConnection)
         self.tabWidget.currentChanged.connect(self.tab_changed)
+
+        l = self.cg_background_box.layout()
+        self.cg_bg_widget = w = Background(self)
+        l.addWidget(w, 0, 0, 3, 1)
+        self.cover_grid_color_button = b = QPushButton(_('Change &color'), self)
+        b.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        l.addWidget(b, 0, 1)
+        b.clicked.connect(self.change_cover_grid_color)
+        self.cover_grid_texture_button = b = QPushButton(_('Change &background image'), self)
+        b.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        l.addWidget(b, 1, 1)
+        b.clicked.connect(self.change_cover_grid_texture)
+        self.cover_grid_default_appearance_button = b = QPushButton(_('Restore &default appearance'), self)
+        b.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        l.addWidget(b, 2, 1)
+        b.clicked.connect(self.restore_cover_grid_appearance)
         self.cover_grid_empty_cache.clicked.connect(self.empty_cache)
         self.cover_grid_open_cache.clicked.connect(self.open_cg_cache)
         self.cover_grid_smaller_cover.clicked.connect(partial(self.resize_cover, True))
@@ -270,6 +313,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.edit_rules.initialize(db.field_metadata, db.prefs, mi, 'column_color_rules')
         self.icon_rules.initialize(db.field_metadata, db.prefs, mi, 'column_icon_rules')
         self.set_cg_color(gprefs['cover_grid_color'])
+        self.set_cg_texture(gprefs['cover_grid_texture'])
         self.update_aspect_ratio()
 
     def open_cg_cache(self):
@@ -292,9 +336,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.size_calculated.emit(self.gui.grid_view.thumbnail_cache.current_size)
 
     def set_cg_color(self, val):
-        pal = QPalette()
-        pal.setColor(QPalette.Window, QColor(*val))
-        self.cover_grid_color_label.setPalette(pal)
+        self.cg_bg_widget.bcol = QColor(*val)
+        self.cg_bg_widget.update_brush()
+
+    def set_cg_texture(self, val):
+        self.cg_bg_widget.btex = val
+        self.cg_bg_widget.update_brush()
 
     def empty_cache(self):
         self.gui.grid_view.thumbnail_cache.empty()
@@ -312,17 +359,32 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.icon_rules.clear()
         self.changed_signal.emit()
         self.set_cg_color(gprefs.defaults['cover_grid_color'])
+        self.set_cg_texture(gprefs.defaults['cover_grid_texture'])
 
     def change_cover_grid_color(self):
-        col = QColorDialog.getColor(self.cover_grid_color_label.palette().color(QPalette.Window),
+        col = QColorDialog.getColor(self.cg_bg_widget.bcol,
                               self.gui, _('Choose background color for cover grid'))
         if col.isValid():
             col = tuple(col.getRgb())[:3]
             self.set_cg_color(col)
             self.changed_signal.emit()
+            if self.cg_bg_widget.btex:
+                if question_dialog(
+                    self, _('Remove background image?'),
+                    _('There is currently a background image set, so the color'
+                      ' you have chosen will not be visible. Remove the background image?')):
+                    self.set_cg_texture(None)
 
-    def restore_cover_grid_color(self):
+    def change_cover_grid_texture(self):
+        from calibre.gui2.preferences.texture_chooser import TextureChooser
+        d = TextureChooser(parent=self, initial=self.cg_bg_widget.btex)
+        if d.exec_() == d.Accepted:
+            self.set_cg_texture(d.texture)
+            self.changed_signal.emit()
+
+    def restore_cover_grid_appearance(self):
         self.set_cg_color(gprefs.defaults['cover_grid_color'])
+        self.set_cg_texture(gprefs.defaults['cover_grid_texture'])
         self.changed_signal.emit()
 
     def build_font_obj(self):
@@ -383,7 +445,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.display_model.commit()
         self.edit_rules.commit(self.gui.current_db.prefs)
         self.icon_rules.commit(self.gui.current_db.prefs)
-        gprefs['cover_grid_color'] = tuple(self.cover_grid_color_label.palette().color(QPalette.Window).getRgb())[:3]
+        gprefs['cover_grid_color'] = tuple(self.cg_bg_widget.bcol.getRgb())[:3]
+        gprefs['cover_grid_texture'] = self.cg_bg_widget.btex
         return rr
 
     def refresh_gui(self, gui):
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 774c017698..af09d6d50d 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -312,61 +312,12 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QLabel" name="label_14">
-           <property name="text">
-            <string>Background color for the cover grid:</string>
-           </property>
-           <property name="buddy">
-            <cstring>cover_grid_color_button</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="cover_grid_color_label">
-           <property name="minimumSize">
-            <size>
-             <width>50</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="autoFillBackground">
-            <bool>true</bool>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="cover_grid_color_button">
-           <property name="text">
-            <string>Change &amp;color</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="cover_grid_default_color_button">
-           <property name="text">
-            <string>Restore &amp;default color</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
+        <widget class="QGroupBox" name="cg_background_box">
+         <property name="title">
+          <string>Background for the cover grid</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5"/>
+        </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox_4">
diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py
new file mode 100644
index 0000000000..c48d274759
--- /dev/null
+++ b/src/calibre/gui2/preferences/texture_chooser.py
@@ -0,0 +1,146 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import glob, os, string, shutil
+from functools import partial
+from PyQt4.Qt import (
+    QDialog, QVBoxLayout, QListWidget, QListWidgetItem, Qt, QIcon,
+    QApplication, QSize, QPixmap, QDialogButtonBox, QTimer)
+
+from calibre.constants import config_dir
+from calibre.gui2 import choose_files, error_dialog
+from calibre.utils.icu import sort_key
+
+def texture_dir():
+    ans = os.path.join(config_dir, 'textures')
+    if not os.path.exists(ans):
+        os.makedirs(ans)
+    return ans
+
+def texture_path(fname):
+    if not fname:
+        return
+    if fname.startswith(':'):
+        return I('textures/%s' % fname[1:])
+    return os.path.join(texture_dir(), fname)
+
+class TextureChooser(QDialog):
+
+    def __init__(self, parent=None, initial=None):
+        QDialog.__init__(self, parent)
+        self.setWindowTitle(_('Choose a texture'))
+
+        self.l = l = QVBoxLayout()
+        self.setLayout(l)
+
+        self.tdir = texture_dir()
+
+        self.images = il = QListWidget(self)
+        il.itemDoubleClicked.connect(self.accept, type=Qt.QueuedConnection)
+        il.setIconSize(QSize(256, 256))
+        il.setViewMode(il.IconMode)
+        il.setFlow(il.LeftToRight)
+        il.setSpacing(20)
+        il.setSelectionMode(il.SingleSelection)
+        il.itemSelectionChanged.connect(self.update_remove_state)
+        l.addWidget(il)
+
+        self.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+        b = self.add_button = bb.addButton(_('Add texture'), bb.ActionRole)
+        b.setIcon(QIcon(I('plus.png')))
+        b.clicked.connect(self.add_texture)
+        b = self.remove_button = bb.addButton(_('Remove texture'), bb.ActionRole)
+        b.setIcon(QIcon(I('minus.png')))
+        b.clicked.connect(self.remove_texture)
+        l.addWidget(bb)
+
+        images = [{
+            'fname': ':'+os.path.basename(x),
+            'path': x,
+            'name': ' '.join(map(string.capitalize, os.path.splitext(os.path.basename(x))[0].split('_')))
+        } for x in glob.glob(I('textures/*.png'))] + [{
+            'fname': os.path.basename(x),
+            'path': x,
+            'name': os.path.splitext(os.path.basename(x))[0],
+        } for x in glob.glob(os.path.join(self.tdir, '*')) if x.rpartition('.')[-1].lower() in {'jpeg', 'png', 'jpg'}]
+
+        images.sort(key=lambda x:sort_key(x['name']))
+
+        map(self.create_item, images)
+        self.update_remove_state()
+
+        if initial:
+            existing = {unicode(i.data(Qt.UserRole).toString()):i for i in (self.images.item(c) for c in xrange(self.images.count()))}
+            item = existing.get(initial, None)
+            if item is not None:
+                item.setSelected(True)
+                QTimer.singleShot(100, partial(il.scrollToItem, item))
+
+        self.resize(QSize(950, 650))
+
+    def create_item(self, data):
+        x = data
+        i = QListWidgetItem(QIcon(QPixmap(x['path']).scaled(256, 256, transformMode=Qt.SmoothTransformation)), x['name'], self.images)
+        i.setData(Qt.UserRole, x['fname'])
+        i.setData(Qt.UserRole+1, x['path'])
+        return i
+
+    def update_remove_state(self):
+        removeable = bool(self.selected_fname and not self.selected_fname.startswith(':'))
+        self.remove_button.setEnabled(removeable)
+
+    @property
+    def texture(self):
+        return self.selected_fname
+
+    def add_texture(self):
+        path = choose_files(self, 'choose-texture-image', _('Choose Image'),
+                            filters=[(_('Images'), ['jpeg', 'jpg', 'png'])], all_files=False, select_only_single_file=True)
+        if not path:
+            return
+        path = path[0]
+        fname = os.path.basename(path)
+        name = fname.rpartition('.')[0]
+        existing = {unicode(i.data(Qt.UserRole).toString()):i for i in (self.images.item(c) for c in xrange(self.images.count()))}
+        dest = os.path.join(self.tdir, fname)
+        with open(path, 'rb') as s, open(dest, 'wb') as f:
+            shutil.copyfileobj(s, f)
+        if fname in existing:
+            self.takeItem(existing[fname])
+        data = {'fname': fname, 'path': dest, 'name': name}
+        i = self.create_item(data)
+        i.setSelected(True)
+        self.images.scrollToItem(i)
+
+    @property
+    def selected_item(self):
+        for x in self.images.selectedItems():
+            return x
+
+    @property
+    def selected_fname(self):
+        try:
+            return unicode(self.selected_item.data(Qt.UserRole).toString())
+        except (AttributeError, TypeError):
+            pass
+
+    def remove_texture(self):
+        if not self.selected_fname:
+            return
+        if self.selected_fname.startswith(':'):
+            return error_dialog(self, _('Cannot remove'),
+                                _('Cannot remover builtin textures'), show=True)
+        self.images.takeItem(self.images.row(self.selected_item))
+
+if __name__ == '__main__':
+    app = QApplication([])  # noqa
+    d = TextureChooser()
+    d.exec_()
+    print (d.texture)

From b49417adfdc26520bc9f98857577ef1556e96596 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 11:45:52 +0530
Subject: [PATCH 0992/1154] Fix removal of textures not working

Also credit subtlepatterns in the texture chooser dialog.
---
 src/calibre/gui2/preferences/texture_chooser.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py
index c48d274759..e10d7d7233 100644
--- a/src/calibre/gui2/preferences/texture_chooser.py
+++ b/src/calibre/gui2/preferences/texture_chooser.py
@@ -10,7 +10,7 @@ import glob, os, string, shutil
 from functools import partial
 from PyQt4.Qt import (
     QDialog, QVBoxLayout, QListWidget, QListWidgetItem, Qt, QIcon,
-    QApplication, QSize, QPixmap, QDialogButtonBox, QTimer)
+    QApplication, QSize, QPixmap, QDialogButtonBox, QTimer, QLabel)
 
 from calibre.constants import config_dir
 from calibre.gui2 import choose_files, error_dialog
@@ -50,6 +50,10 @@ class TextureChooser(QDialog):
         il.itemSelectionChanged.connect(self.update_remove_state)
         l.addWidget(il)
 
+        self.ad = ad = QLabel(_('The builtin textures come from <a href="http://subtlepatterns.com">subtlepatterns.com</a>.'))
+        ad.setOpenExternalLinks(True)
+        ad.setWordWrap(True)
+        l.addWidget(ad)
         self.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
         bb.accepted.connect(self.accept)
         bb.rejected.connect(self.reject)
@@ -137,6 +141,7 @@ class TextureChooser(QDialog):
         if self.selected_fname.startswith(':'):
             return error_dialog(self, _('Cannot remove'),
                                 _('Cannot remover builtin textures'), show=True)
+        os.remove(unicode(self.selected_item.data(Qt.UserRole+1).toString()))
         self.images.takeItem(self.images.row(self.selected_item))
 
 if __name__ == '__main__':

From d1f35bebdfa167d1dfe679d4b917b5c802ba3244 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 16:23:13 +0530
Subject: [PATCH 0993/1154] Hook up global undo/redo

---
 src/calibre/gui2/tweak_book/boss.py      | 16 ++++++++++++++--
 src/calibre/gui2/tweak_book/file_list.py |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 1857e91900..fe7e56ada9 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -87,11 +87,23 @@ class Boss(QObject):
         set_current_container(nc)
         self.update_global_history_actions()
 
+    def apply_container_update_to_gui(self):
+        container = current_container()
+        self.gui.file_list.build(container)
+        self.update_global_history_actions()
+        # TODO: Apply to other GUI elements
+
     def do_global_undo(self):
-        pass
+        container = self.global_undo.undo()
+        if container is not None:
+            set_current_container(container)
+            self.apply_container_update_to_gui()
 
     def do_global_redo(self):
-        pass
+        container = self.global_undo.redo()
+        if container is not None:
+            set_current_container(container)
+            self.apply_container_update_to_gui()
 
     def delete_requested(self, spine_items, other_items):
         if not self.check_dirtied():
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 910aaaed80..1fc2eb4cb4 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -96,11 +96,11 @@ class FileList(QTreeWidget):
         return s
 
     def set_state(self, state):
-        for category, item in self.categories:
+        for category, item in self.categories.iteritems():
             item.setExpanded(category in state['expanded'])
         self.verticalScrollBar().setValue(state['pos'])
         for parent in self.categories.itervalues():
-            for c in (parent.child(i) for i in parent.childCount()):
+            for c in (parent.child(i) for i in xrange(parent.childCount())):
                 name = unicode(c.data(0, NAME_ROLE).toString())
                 if name in state['selected']:
                     c.setSelected(True)

From 4768f29bf2d18dd0d8e10e8a0a89e5ede682186f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 20:49:10 +0530
Subject: [PATCH 0994/1154] Update Wired Magazine

---
 recipes/wired.recipe | 112 ++++++++++++++++++++-----------------------
 1 file changed, 53 insertions(+), 59 deletions(-)

diff --git a/recipes/wired.recipe b/recipes/wired.recipe
index 965d8a82ac..aacbd903d9 100644
--- a/recipes/wired.recipe
+++ b/recipes/wired.recipe
@@ -1,9 +1,8 @@
 
 __license__   = 'GPL v3'
-__copyright__ = '2012, mkydgr'
+__copyright__ = '2010-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
 www.wired.com
-based on the (broken) built-in recipe by Darko Miletic <darko.miletic at gmail.com>
 '''
 
 import re
@@ -12,12 +11,11 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Wired(BasicNewsRecipe):
     title                 = 'Wired Magazine'
-    __author__            = 'mkydgr'
-    description           = 'Technology News'
+    __author__            = 'Darko Miletic'
+    description           = 'Gaming news'
     publisher             = 'Conde Nast Digital'
-    category              = ''
-    oldest_article        = 500
-    delay                 = 1
+    category              = 'news, games, IT, gadgets'
+    oldest_article        = 32
     max_articles_per_feed = 100
     no_stylesheets        = True
     encoding              = 'utf-8'
@@ -25,10 +23,16 @@ class Wired(BasicNewsRecipe):
     masthead_url          = 'http://www.wired.com/images/home/wired_logo.gif'
     language              = 'en'
     publication_type      = 'magazine'
-    extra_css             = ' body{font-family: Arial,Verdana,sans-serif} .entryDescription li {display: inline; list-style-type: none} '
-    index                 = 'http://www.wired.com/magazine'
-    departments           = ['features','start','test','play','found', 'reviews']
-    
+    extra_css             = """ 
+                               h1, .entry-header{font-family: brandon-grotesque,anchor-web,Helvetica,Arial,sans-serif} 
+                               .entry-header{display: block;}
+                               .entry-header ul{ list-style-type:disc;}
+                               .author, .entryDate, .entryTime, .entryEdit, .entryCategories{display: inline}
+                               .entry-header li{text-transform: uppercase;}
+                               div#container{font-family: 'Exchange SSm 4r', Georgia, serif} 
+                            """
+    index                 = 'http://www.wired.com/magazine/'
+
     preprocess_regexps = [(re.compile(r'<meta name="Title".*<title>', re.DOTALL|re.IGNORECASE),lambda match: '<title>')]
     conversion_options = {
                           'comment'   : description
@@ -38,56 +42,37 @@ class Wired(BasicNewsRecipe):
                         }
 
     keep_only_tags = [dict(name='div', attrs={'class':'post'})]
-    remove_tags_after = dict(name='div', attrs={'class':'tweetmeme_button'})
+    remove_tags_after = dict(name='div', attrs={'id':'container'})
     remove_tags = [
-                     dict(name=['object','embed','iframe','link'])
-                    ,dict(name='div', attrs={'class':['podcast_storyboard','tweetmeme_button']})
+                     dict(name=['object','embed','iframe','link','meta','base'])
+                    ,dict(name='div', attrs={'class':['social-top','podcast_storyboard','tweetmeme_button']})
                     ,dict(attrs={'id':'ff_bottom_nav'})
                     ,dict(name='a',attrs={'href':'http://www.wired.com/app'})
+                    ,dict(name='div', attrs={'id':'mag-bug'})
                   ]
-    remove_attributes = ['height','width']
+    remove_attributes = ['height','width','lang','border','clear']
 
 
     def parse_index(self):
         totalfeeds = []
-
         soup   = self.index_to_soup(self.index)
-        
-        #department feeds    
-        depts = soup.find('div',attrs={'id':'department-posts'})
-        
-        if depts:
-            for ditem in self.departments:
-                darticles = []
-                department = depts.find('h3',attrs={'id':'department-'+ditem})
-                if department:
-                    #print '\n###### Found department %s ########'%(ditem)
-                    
-                    el = department.next
-                    while el and (el.__class__.__name__ == 'NavigableString' or el.name != 'h3'):
-                        if el.__class__.__name__ != 'NavigableString':
-                            #print '\t ... element',el.name
-                            if el.name == 'ul':
-                                for artitem in el.findAll('li'):
-                                    #print '\t\t ... article',repr(artitem)
-                                    feed_link = artitem.find('a')
-                                    #print '\t\t\t ... link',repr(feed_link)
-                                    if feed_link and feed_link.has_key('href'):
-                                        url   = self.makeurl(feed_link['href'])
-                                        title = self.tag_to_string(feed_link)
-                                        date  = strftime(self.timefmt)
-                                        #print '\t\t ... found "%s" %s'%(title,url)
-                                        darticles.append({
-                                                          'title'      :title
-                                                         ,'date'       :date
-                                                         ,'url'        :url
-                                                         ,'description':''
-                                                        })
-                                el = None                            
-                        else: 
-                            el = el.next
-                     
-                    totalfeeds.append((ditem.capitalize(), darticles))
+        majorf = soup.find('div',attrs={'class':'entry'})
+        if majorf:
+           articles = []
+           checker = []
+           for a in majorf.findAll('a', href=True):
+               if a['href'].startswith('http://www.wired.com/') and a['href'].endswith('/'):
+                  title = self.tag_to_string(a)
+                  url = a['href']
+                  if title.lower() != 'read more' and url not in checker:
+                      checker.append(url) 
+                      articles.append({
+                                          'title'      :title
+                                         ,'date'       :strftime(self.timefmt)
+                                         ,'url'        :a['href']
+                                         ,'description':''
+                                        })
+           totalfeeds.append(('Articles', articles))
         return totalfeeds
 
     def get_cover_url(self):
@@ -95,7 +80,7 @@ class Wired(BasicNewsRecipe):
         soup = self.index_to_soup(self.index)
         cover_item = soup.find('div',attrs={'class':'spread-image'})
         if cover_item:
-           cover_url = self.makeurl(cover_item.a.img['src'])
+           cover_url = 'http://www.wired.com' + cover_item.a.img['src']
         return cover_url
 
     def print_version(self, url):
@@ -104,10 +89,19 @@ class Wired(BasicNewsRecipe):
     def preprocess_html(self, soup):
         for item in soup.findAll(style=True):
             del item['style']
+        for item in soup.findAll('a'):
+            if item.string is not None:
+               tstr = item.string
+               item.replaceWith(tstr)
+            else:
+               item.name='span'
+               for atrs in ['href','target','alt','title','name','id']:
+                   if item.has_key(atrs):
+                      del item[atrs]
+        for item in soup.findAll('img'):
+            if not item.has_key('alt'):
+               item['alt'] = 'image'            
+            if item.has_key('data-lazy-src'):
+                item['src'] = item['data-lazy-src']
+                del item['data-lazy-src']
         return soup
-        
-    def makeurl(self, addr):     
-        if addr[:4] != 'http' : addr='http://www.wired.com' + addr
-        while addr[-2:] == '//' : addr=addr[:-1]
-        return addr
-

From bec396158afb520b487adf6091df42bdbf3eb18c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 15 Oct 2013 22:03:43 +0530
Subject: [PATCH 0995/1154] Update Wall Street Journal

See #1239477 (Private bug)
---
 recipes/wsj.recipe      | 49 +++++++--------------
 recipes/wsj_free.recipe | 98 +++++++++++++++++++----------------------
 2 files changed, 61 insertions(+), 86 deletions(-)

diff --git a/recipes/wsj.recipe b/recipes/wsj.recipe
index 8c68668745..c138fb2a04 100644
--- a/recipes/wsj.recipe
+++ b/recipes/wsj.recipe
@@ -8,17 +8,10 @@ import copy
 
 # http://online.wsj.com/page/us_in_todays_paper.html
 
-def filter_classes(x):
-    if not x:
-        return False
-    bad_classes = {'articleInsetPoll', 'trendingNow', 'sTools', 'printSummary', 'mostPopular', 'relatedCollection'}
-    classes = frozenset(x.split())
-    return len(bad_classes.intersection(classes)) > 0
-
 class WallStreetJournal(BasicNewsRecipe):
 
     title = 'The Wall Street Journal'
-    __author__ = 'Kovid Goyal, Sujata Raman, and Joshua Oster-Morris'
+    __author__ = 'Kovid Goyal and Joshua Oster-Morris'
     description = 'News and current affairs'
     needs_subscription = True
     language = 'en'
@@ -39,23 +32,16 @@ class WallStreetJournal(BasicNewsRecipe):
                         .byline{color:blue;font-family:Arial,Helvetica,sans-serif; font-size:xx-small}
                         h6{color:#333333; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small;font-style:italic; }
                     .paperLocation{color:#666666; font-size:xx-small}'''
-
-    remove_tags_before = dict(name='h1')
+    keep_only_tags = [
+        dict(name='h1'), dict(name='h2', attrs={'class':['subhead', 'subHed deck']}),
+        dict(name='span', itemprop='author', rel='author'),
+        dict(name='article', id='articleBody'),
+        dict(name='div', id='article_story_body'),
+    ]
     remove_tags = [
-                    dict(id=["articleTabs_tab_article",
-                             "articleTabs_tab_comments", 'msnLinkback', 'yahooLinkback',
-                        'articleTabs_panel_comments', 'footer', 'emailThisScrim', 'emailConfScrim', 'emailErrorScrim',
-                        "articleTabs_tab_interactive", "articleTabs_tab_video",
-                        "articleTabs_tab_map", "articleTabs_tab_slideshow",
-                        "articleTabs_tab_quotes", "articleTabs_tab_document",
-                        "printModeAd", "aFbLikeAuth", "videoModule",
-                        "mostRecommendations", "topDiscussions"]),
-                    {'class':['footer_columns','hidden', 'network','insetCol3wide','interactive','video','slideshow','map','insettip',
-                        'insetClose','more_in', "insetContent", 'articleTools_bottom', 'aTools', "tooltip", "adSummary", "nav-inline"]},
-                    dict(rel='shortcut icon'),
-                    {'class':filter_classes},
-                    ]
-    remove_tags_after = [dict(id="article_story_body"), {'class':"article story"},]
+        dict(attrs={'class':['insetButton', 'insettipBox']}),
+        dict(name='span', attrs={'data-country-code':True, 'data-ticker-code':True}),
+    ]
 
     use_javascript_to_login = True
 
@@ -72,15 +58,12 @@ class WallStreetJournal(BasicNewsRecipe):
             if picdiv is not None:
                 self.add_toc_thumbnail(article,picdiv['src'])
 
-    def postprocess_html(self, soup, first):
-        for tag in soup.findAll(name=['table', 'tr', 'td']):
-            tag.name = 'div'
-
-        for tag in soup.findAll('div', dict(id=[
-            "articleThumbnail_1", "articleThumbnail_2", "articleThumbnail_3",
-            "articleThumbnail_4", "articleThumbnail_5", "articleThumbnail_6",
-            "articleThumbnail_7"])):
-            tag.extract()
+    def preprocess_html(self, soup):
+        # Remove thumbnail for zoomable images
+        for div in soup.findAll('div', attrs={'class':lambda x: x and 'insetZoomTargetBox' in x.split()}):
+            img = div.find('img')
+            if img is not None:
+                img.extract()
 
         return soup
 
diff --git a/recipes/wsj_free.recipe b/recipes/wsj_free.recipe
index 5f3cf476c7..eea9789f79 100644
--- a/recipes/wsj_free.recipe
+++ b/recipes/wsj_free.recipe
@@ -33,21 +33,16 @@ class WallStreetJournal(BasicNewsRecipe):
                         h6{color:#333333; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small;font-style:italic; }
                     .paperLocation{color:#666666; font-size:xx-small}'''
 
-    remove_tags_before = dict(name='h1')
+    keep_only_tags = [
+        dict(name='h1'), dict(name='h2', attrs={'class':['subhead', 'subHed deck']}),
+        dict(name='span', itemprop='author', rel='author'),
+        dict(name='article', id='articleBody'),
+        dict(name='div', id='article_story_body'),
+    ]
     remove_tags = [
-                    dict(id=["articleTabs_tab_article",
-                        "articleTabs_tab_comments",
-                        "articleTabs_tab_interactive","articleTabs_tab_video","articleTabs_tab_map","articleTabs_tab_slideshow",
-                        "articleTabs_tab_quotes"]),
-                    {'class':['footer_columns','network','insetCol3wide','interactive','video','slideshow','map','insettip','insetClose','more_in', "insetContent", 'articleTools_bottom', 'aTools', "tooltip", "adSummary", "nav-inline"]},
-                    dict(name='div', attrs={'data-flash-settings':True}),
-                    {'class':['insetContent embedType-interactive insetCol3wide','insetCol6wide','insettipUnit']},
-                    dict(rel='shortcut icon'),
-                    {'class':lambda x: x and 'sTools' in x},
-                    {'class':lambda x: x and 'printSummary' in x},
-                    {'class':lambda x: x and 'mostPopular' in x},
-                    ]
-    remove_tags_after = [dict(id="article_story_body"), {'class':"article story"},]
+        dict(attrs={'class':['insetButton', 'insettipBox']}),
+        dict(name='span', attrs={'data-country-code':True, 'data-ticker-code':True}),
+    ]
 
     def populate_article_metadata(self, article, soup, first):
         if first and hasattr(self, 'add_toc_thumbnail'):
@@ -55,12 +50,12 @@ class WallStreetJournal(BasicNewsRecipe):
             if picdiv is not None:
                 self.add_toc_thumbnail(article,picdiv['src'])
 
-    def postprocess_html(self, soup, first):
-        for tag in soup.findAll(name=['table', 'tr', 'td']):
-            tag.name = 'div'
-
-        for tag in soup.findAll('div', dict(id=["articleThumbnail_1", "articleThumbnail_2", "articleThumbnail_3", "articleThumbnail_4", "articleThumbnail_5", "articleThumbnail_6", "articleThumbnail_7"])):
-            tag.extract()
+    def preprocess_html(self, soup):
+        # Remove thumbnail for zoomable images
+        for div in soup.findAll('div', attrs={'class':lambda x: x and 'insetZoomTargetBox' in x.split()}):
+            img = div.find('img')
+            if img is not None:
+                img.extract()
 
         return soup
 
@@ -69,7 +64,6 @@ class WallStreetJournal(BasicNewsRecipe):
             href = 'http://online.wsj.com' + href
         return href
 
-
     def wsj_get_index(self):
         return self.index_to_soup('http://online.wsj.com/itp')
 
@@ -83,7 +77,7 @@ class WallStreetJournal(BasicNewsRecipe):
         except:
             articles = []
         if articles:
-           feeds.append((title, articles))
+            feeds.append((title, articles))
         return feeds
 
     def parse_index(self):
@@ -99,16 +93,16 @@ class WallStreetJournal(BasicNewsRecipe):
         for a in div.findAll('a', href=lambda x: x and '/itp/' in x):
             pageone = a['href'].endswith('pageone')
             if pageone:
-               title = 'Front Section'
-               url = self.abs_wsj_url(a['href'])
-               feeds = self.wsj_add_feed(feeds,title,url)
-               title = 'What''s News'
-               url = url.replace('pageone','whatsnews')
-               feeds = self.wsj_add_feed(feeds,title,url)
+                title = 'Front Section'
+                url = self.abs_wsj_url(a['href'])
+                feeds = self.wsj_add_feed(feeds,title,url)
+                title = 'What''s News'
+                url = url.replace('pageone','whatsnews')
+                feeds = self.wsj_add_feed(feeds,title,url)
             else:
-               title = self.tag_to_string(a)
-               url = self.abs_wsj_url(a['href'])
-               feeds = self.wsj_add_feed(feeds,title,url)
+                title = self.tag_to_string(a)
+                url = self.abs_wsj_url(a['href'])
+                feeds = self.wsj_add_feed(feeds,title,url)
         return feeds
 
     def wsj_find_wn_articles(self, url):
@@ -117,21 +111,21 @@ class WallStreetJournal(BasicNewsRecipe):
 
         whats_news = soup.find('div', attrs={'class':lambda x: x and 'whatsNews-simple' in x})
         if whats_news is not None:
-          for a in whats_news.findAll('a', href=lambda x: x and '/article/' in x):
-            container = a.findParent(['p'])
-            meta = a.find(attrs={'class':'meta_sectionName'})
-            if meta is not None:
-                meta.extract()
-            title = self.tag_to_string(a).strip()
-            url = a['href']
-            desc = ''
-            if container is not None:
-                desc = self.tag_to_string(container)
+            for a in whats_news.findAll('a', href=lambda x: x and '/article/' in x):
+                container = a.findParent(['p'])
+                meta = a.find(attrs={'class':'meta_sectionName'})
+                if meta is not None:
+                    meta.extract()
+                title = self.tag_to_string(a).strip()
+                url = a['href']
+                desc = ''
+                if container is not None:
+                    desc = self.tag_to_string(container)
 
-            articles.append({'title':title, 'url':url,
-                'description':desc, 'date':''})
+                articles.append({'title':title, 'url':url,
+                    'description':desc, 'date':''})
 
-            self.log('\tFound WN article:', title)
+                self.log('\tFound WN article:', title)
 
         return articles
 
@@ -140,18 +134,18 @@ class WallStreetJournal(BasicNewsRecipe):
 
         whats_news = soup.find('div', attrs={'class':lambda x: x and 'whatsNews-simple' in x})
         if whats_news is not None:
-           whats_news.extract()
+            whats_news.extract()
 
         articles = []
 
         flavorarea = soup.find('div', attrs={'class':lambda x: x and 'ahed' in x})
         if flavorarea is not None:
-           flavorstory = flavorarea.find('a', href=lambda x: x and x.startswith('/article'))
-           if flavorstory is not None:
-              flavorstory['class'] = 'mjLinkItem'
-              metapage = soup.find('span', attrs={'class':lambda x: x and 'meta_sectionName' in x})
-              if metapage is not None:
-                 flavorstory.append( copy.copy(metapage) ) #metapage should always be A1 because that should be first on the page
+            flavorstory = flavorarea.find('a', href=lambda x: x and x.startswith('/article'))
+            if flavorstory is not None:
+                flavorstory['class'] = 'mjLinkItem'
+                metapage = soup.find('span', attrs={'class':lambda x: x and 'meta_sectionName' in x})
+                if metapage is not None:
+                    flavorstory.append(copy.copy(metapage))  # metapage should always be A1 because that should be first on the page
 
         for a in soup.findAll('a', attrs={'class':'mjLinkItem'}, href=True):
             container = a.findParent(['li', 'div'])
@@ -176,5 +170,3 @@ class WallStreetJournal(BasicNewsRecipe):
             self.log('\tFound article:', title)
 
         return articles
-
-

From c58e7eb2e8a57bd1f8f768f88a7ab98d42f533fe Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 10:03:21 +0530
Subject: [PATCH 0996/1154] Implement saving of main window state and quit
 action

---
 src/calibre/gui2/tweak_book/__init__.py |  2 ++
 src/calibre/gui2/tweak_book/boss.py     | 28 +++++++++++++++---
 src/calibre/gui2/tweak_book/ui.py       | 39 +++++++++++++++++++++++--
 3 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/__init__.py b/src/calibre/gui2/tweak_book/__init__.py
index 72e61e5ae1..63519c9bea 100644
--- a/src/calibre/gui2/tweak_book/__init__.py
+++ b/src/calibre/gui2/tweak_book/__init__.py
@@ -6,6 +6,8 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
+from calibre.utils.config import JSONConfig
+tprefs = JSONConfig('tweak_book_gui')
 
 _current_container = None
 
diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index fe7e56ada9..0b6eb73944 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -8,13 +8,13 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import tempfile, shutil
 
-from PyQt4.Qt import QObject
+from PyQt4.Qt import QObject, QApplication
 
 from calibre.gui2 import error_dialog, choose_files
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.ebooks.oeb.polish.main import SUPPORTED
 from calibre.ebooks.oeb.polish.container import get_container, clone_container
-from calibre.gui2.tweak_book import set_current_container, current_container
+from calibre.gui2.tweak_book import set_current_container, current_container, tprefs
 from calibre.gui2.tweak_book.undo import GlobalUndoHistory
 
 class Boss(QObject):
@@ -72,14 +72,15 @@ class Boss(QObject):
         self.global_undo.open_book(container)
         self.gui.update_window_title()
         self.gui.file_list.build(container, preserve_state=False)
+        self.gui.action_save.setEnabled(False)
         self.update_global_history_actions()
 
     def update_global_history_actions(self):
         gu = self.global_undo
-        for x, text in (('undo', _('&Undo')), ('redo', '&Redo')):
+        for x, text in (('undo', _('&Revert to before')), ('redo', '&Revert to after')):
             ac = getattr(self.gui, 'action_global_%s' % x)
             ac.setEnabled(getattr(gu, 'can_' + x))
-            ac.setText(text + ' ' + getattr(gu, x + '_msg'))
+            ac.setText(text + ' ' + (getattr(gu, x + '_msg') or '...'))
 
     def add_savepoint(self, msg):
         nc = clone_container(current_container(), self.mkdtemp())
@@ -113,6 +114,25 @@ class Boss(QObject):
         c.remove_from_spine(spine_items)
         for name in other_items:
             c.remove_item(name)
+        self.gui.action_save.setEnabled(True)
         self.gui.file_list.delete_done(spine_items, other_items)
+        # TODO: Update other GUI elements
 
+    def save_book(self):
+        pass
 
+    def quit(self):
+        if not self.confirm_quit():
+            return
+        self.save_state()
+        QApplication.instance().quit()
+
+    def confirm_quit(self):
+        return True
+
+    def shutdown(self):
+        self.save_state()
+
+    def save_state(self):
+        with tprefs:
+            self.gui.save_state()
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index 93275368a6..bd8b90b2c4 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -6,10 +6,10 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from PyQt4.Qt import QDockWidget, Qt, QLabel, QIcon, QAction
+from PyQt4.Qt import QDockWidget, Qt, QLabel, QIcon, QAction, QApplication
 
 from calibre.gui2.main_window import MainWindow
-from calibre.gui2.tweak_book import current_container
+from calibre.gui2.tweak_book import current_container, tprefs
 from calibre.gui2.tweak_book.file_list import FileListWidget
 from calibre.gui2.tweak_book.job import BlockingJob
 from calibre.gui2.tweak_book.boss import Boss
@@ -18,6 +18,7 @@ from calibre.gui2.keyboard import Manager as KeyboardManager
 class Main(MainWindow):
 
     APP_NAME = _('Tweak Book')
+    STATE_VERSION = 0
 
     def __init__(self, opts):
         MainWindow.__init__(self, opts, disable_automatic_gc=True)
@@ -41,6 +42,9 @@ class Main(MainWindow):
 
         self.setCentralWidget(self.l)
         self.boss(self)
+        g = QApplication.instance().desktop().availableGeometry(self)
+        self.resize(g.width()-50, g.height()-50)
+        self.restore_state()
 
         self.keyboard.finalize()
 
@@ -62,12 +66,17 @@ class Main(MainWindow):
                                       _('Revert book to before the last action (Undo)'))
         self.action_global_redo = reg('forward.png', _('&Revert to after'), self.boss.do_global_redo, 'global-redo', 'Ctrl+Right',
                                       _('Revert book state to after the next action (Redo)'))
+        self.action_save = reg('save.png', _('&Save'), self.boss.save_book, 'save-book', 'Ctrl+S', _('Save book'))
+        self.action_save.setEnabled(False)
+        self.action_quit = reg('quit.png', _('&Quit'), self.boss.quit, 'quit', 'Ctrl+Q', _('Quit'))
 
     def create_menubar(self):
         b = self.menuBar()
 
         f = b.addMenu(_('&File'))
         f.addAction(self.action_open_book)
+        f.addAction(self.action_save)
+        f.addAction(self.action_quit)
 
         e = b.addMenu(_('&Edit'))
         e.addAction(self.action_global_undo)
@@ -75,12 +84,15 @@ class Main(MainWindow):
 
     def create_toolbar(self):
         self.global_bar = b = self.addToolBar(_('Global'))
+        b.setObjectName('global_bar')  # Needed for saveState
         b.addAction(self.action_open_book)
         b.addAction(self.action_global_undo)
         b.addAction(self.action_global_redo)
+        b.addAction(self.action_save)
 
     def create_docks(self):
         self.file_list_dock = d = QDockWidget(_('&Files Browser'), self)
+        d.setObjectName('file_list_dock')  # Needed for saveState
         d.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
         self.file_list = FileListWidget(d)
         d.setWidget(self.file_list)
@@ -92,3 +104,26 @@ class Main(MainWindow):
 
     def update_window_title(self):
         self.setWindowTitle(self.current_metadata.title + ' [%s] - %s' %(current_container().book_type.upper(), self.APP_NAME))
+
+    def closeEvent(self, e):
+        if not self.boss.confirm_quit():
+            e.ignore()
+            return
+        try:
+            self.boss.shutdown()
+        except:
+            import traceback
+            traceback.print_exc()
+        e.accept()
+
+    def save_state(self):
+        tprefs.set('main_window_geometry', bytearray(self.saveGeometry()))
+        tprefs.set('main_window_state', bytearray(self.saveState(self.STATE_VERSION)))
+
+    def restore_state(self):
+        geom = tprefs.get('main_window_geometry', None)
+        if geom is not None:
+            self.restoreGeometry(geom)
+        state = tprefs.get('main_window_state', None)
+        if state is not None:
+            self.restoreState(state, self.STATE_VERSION)

From f11ab7d0c3ab1b32076f66ed36997cf3321a1309 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 11:19:38 +0530
Subject: [PATCH 0997/1154] Use same code for initializing CC comments editor
 as for builtin comments editor

---
 src/calibre/gui2/custom_column_widgets.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 4223a638f2..5cbd318ee9 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -234,9 +234,12 @@ class Comments(Base):
         self.widgets = [self._box]
 
     def setter(self, val):
-        if val is None:
+        if not val or not val.strip():
             val = ''
-        self._tb.html = comments_to_html(val)
+        else:
+            val = comments_to_html(val)
+        self._tb.html = val
+        self._tb.wyswyg_dirtied()
 
     def getter(self):
         val = unicode(self._tb.html).strip()

From e60dce0133ef1505f9961680f9195d893da76d82 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 13:22:34 +0530
Subject: [PATCH 0998/1154] Properly initialize standalone comments editing box

---
 src/calibre/gui2/dialogs/comments_dialog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/dialogs/comments_dialog.py b/src/calibre/gui2/dialogs/comments_dialog.py
index 2734a1bd21..eee23f4b3e 100644
--- a/src/calibre/gui2/dialogs/comments_dialog.py
+++ b/src/calibre/gui2/dialogs/comments_dialog.py
@@ -18,8 +18,8 @@ class CommentsDialog(QDialog, Ui_CommentsDialog):
         self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint))
         self.setWindowIcon(icon)
 
-        if text is not None:
-            self.textbox.html = comments_to_html(text)
+        self.textbox.html = comments_to_html(text) if text else ''
+        self.textbox.wyswyg_dirtied()
         # self.textbox.setTabChangesFocus(True)
         self.buttonBox.button(QDialogButtonBox.Ok).setText(_('&OK'))
         self.buttonBox.button(QDialogButtonBox.Cancel).setText(_('&Cancel'))

From 8cc9440847c0942dc5e6595274615506b820e6d4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 13:53:17 +0530
Subject: [PATCH 0999/1154] Move join_with_timeout into the utils module

---
 src/calibre/gui2/library/alternate_views.py | 13 +------------
 src/calibre/utils/__init__.py               | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 75178b09a7..44c361e129 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -8,7 +8,6 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import itertools, operator, os
 from types import MethodType
-from time import time
 from threading import Event, Thread
 from Queue import LifoQueue
 from functools import wraps, partial
@@ -23,6 +22,7 @@ from PyQt4.Qt import (
 
 from calibre import fit_image, prints, prepare_string_for_xml
 from calibre.ebooks.metadata import fmt_sidx
+from calibre.utils import join_with_timeout
 from calibre.gui2 import gprefs, config
 from calibre.gui2.library.caches import CoverCache, ThumbnailCache
 from calibre.utils.config import prefs, tweaks
@@ -482,17 +482,6 @@ class CoverDelegate(QStyledItemDelegate):
                 return True
         return False
 
-def join_with_timeout(q, timeout=2):
-    q.all_tasks_done.acquire()
-    try:
-        endtime = time() + timeout
-        while q.unfinished_tasks:
-            remaining = endtime - time()
-            if remaining <= 0.0:
-                raise RuntimeError('Waiting for queue to clear timed out')
-            q.all_tasks_done.wait(remaining)
-    finally:
-        q.all_tasks_done.release()
 # }}}
 
 # The View {{{
diff --git a/src/calibre/utils/__init__.py b/src/calibre/utils/__init__.py
index 48f75c0428..ae68ee3b9b 100644
--- a/src/calibre/utils/__init__.py
+++ b/src/calibre/utils/__init__.py
@@ -7,3 +7,19 @@ __docformat__ = 'restructuredtext en'
 Miscelleaneous utilities.
 '''
 
+from time import time
+
+def join_with_timeout(q, timeout=2):
+    ''' Join the queue q with a specified timeout. Blocks until all tasks on
+    the queue are done or times out with a runtime error. '''
+    q.all_tasks_done.acquire()
+    try:
+        endtime = time() + timeout
+        while q.unfinished_tasks:
+            remaining = endtime - time()
+            if remaining <= 0.0:
+                raise RuntimeError('Waiting for queue to clear timed out')
+            q.all_tasks_done.wait(remaining)
+    finally:
+        q.all_tasks_done.release()
+

From f4d132b8230234d69d2227c1d72a797418e14513 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 16:12:53 +0530
Subject: [PATCH 1000/1154] Start work on saving

---
 src/calibre/gui2/tweak_book/boss.py |  10 ++-
 src/calibre/gui2/tweak_book/save.py | 125 ++++++++++++++++++++++++++++
 src/calibre/gui2/tweak_book/ui.py   |   6 ++
 3 files changed, 139 insertions(+), 2 deletions(-)
 create mode 100644 src/calibre/gui2/tweak_book/save.py

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 0b6eb73944..076f6edb82 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -16,14 +16,16 @@ from calibre.ebooks.oeb.polish.main import SUPPORTED
 from calibre.ebooks.oeb.polish.container import get_container, clone_container
 from calibre.gui2.tweak_book import set_current_container, current_container, tprefs
 from calibre.gui2.tweak_book.undo import GlobalUndoHistory
+from calibre.gui2.tweak_book.save import SaveManager
 
 class Boss(QObject):
 
-    def __init__(self, parent=None):
+    def __init__(self, parent):
         QObject.__init__(self, parent)
         self.global_undo = GlobalUndoHistory()
         self.container_count = 0
         self.tdir = None
+        self.save_manager = SaveManager(parent)
 
     def __call__(self, gui):
         self.gui = gui
@@ -40,6 +42,7 @@ class Boss(QObject):
     def open_book(self, path=None):
         if not self.check_dirtied():
             return
+        # TODO: Check if a save is in progress and abort if it is
 
         if not hasattr(path, 'rpartition'):
             path = choose_files(self.gui, 'open-book-for-tweaking', _('Choose book'),
@@ -119,7 +122,10 @@ class Boss(QObject):
         # TODO: Update other GUI elements
 
     def save_book(self):
-        pass
+        self.gui.action_save.setEnabled(False)
+        tdir = tempfile.mkdtemp(prefix='save-%05d-' % self.container_count, dir=self.tdir)
+        container = clone_container(current_container(), tdir)
+        self.save_manager.schedule(tdir, container)
 
     def quit(self):
         if not self.confirm_quit():
diff --git a/src/calibre/gui2/tweak_book/save.py b/src/calibre/gui2/tweak_book/save.py
new file mode 100644
index 0000000000..c18ce6de11
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/save.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import shutil
+from threading import Thread
+from Queue import LifoQueue, Empty
+
+from PyQt4.Qt import (QObject, pyqtSignal, QLabel, QWidget, QHBoxLayout, Qt)
+
+from calibre.utils import join_with_timeout
+from calibre.gui2.progress_indicator import ProgressIndicator
+
+class SaveWidget(QWidget):
+
+    def __init__(self, parent=None):
+        QWidget.__init__(self, parent)
+        self.l = l = QHBoxLayout(self)
+        self.setLayout(l)
+        self.label = QLabel('')
+        self.pi = ProgressIndicator(self, 24)
+        l.addWidget(self.label)
+        l.addWidget(self.pi)
+        l.setContentsMargins(0, 0, 0, 0)
+        self.pi.setVisible(False)
+        self.stop()
+
+    def start(self):
+        self.pi.setVisible(True)
+        self.pi.startAnimation()
+        self.label.setText(_('Saving...'))
+
+    def stop(self):
+        self.pi.setVisible(False)
+        self.pi.stopAnimation()
+        self.label.setText(_('Saved'))
+
+class SaveManager(QObject):
+
+    start_save = pyqtSignal()
+    report_error = pyqtSignal(object)
+    save_done = pyqtSignal()
+
+    def __init__(self, parent):
+        QObject.__init__(self, parent)
+        self.count = 0
+        self.last_saved = -1
+        self.requests = LifoQueue()
+        t = Thread(name='save-thread', target=self.run)
+        t.daemon = True
+        t.start()
+        self.status_widget = w = SaveWidget(parent)
+        self.start_save.connect(w.start, type=Qt.QueuedConnection)
+        self.save_done.connect(w.stop, type=Qt.QueuedConnection)
+
+    def schedule(self, tdir, container):
+        self.count += 1
+        self.requests.put((self.count, tdir, container))
+
+    def run(self):
+        while True:
+            x = self.requests.get()
+            if x is None:
+                self.requests.task_done()
+                self.__empty_queue()
+                break
+            try:
+                count, tdir, container = x
+                self.process_save(count, tdir, container)
+            except:
+                import traceback
+                traceback.print_exc()
+            finally:
+                self.requests.task_done()
+
+    def __empty_queue(self):
+        ' Only to be used during shutdown '
+        while True:
+            try:
+                self.requests.get_nowait()
+            except Empty:
+                break
+            else:
+                self.requests.task_done()
+
+    def process_save(self, count, tdir, container):
+        if count <= self.last_saved:
+            shutil.rmtree(tdir, ignore_errors=True)
+            return
+        self.last_saved = count
+        self.start_save.emit()
+        try:
+            self.do_save(tdir, container)
+        except:
+            import traceback
+            self.report_error.emit(traceback.format_exc())
+        self.save_done.emit()
+
+    def do_save(self, tdir, container):
+        try:
+            import time
+            time.sleep(10)
+        finally:
+            shutil.rmtree(tdir, ignore_errors=True)
+
+    @property
+    def has_tasks(self):
+        return bool(self.requests.unfinished_tasks)
+
+    def wait(self, timeout=30):
+        if timeout is None:
+            self.requests.join()
+        else:
+            try:
+                join_with_timeout(self.requests, timeout)
+            except RuntimeError:
+                return False
+        return True
+
+    def shutdown(self):
+        self.requests.put(None)
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index bd8b90b2c4..66ffd5ce54 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -8,6 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from PyQt4.Qt import QDockWidget, Qt, QLabel, QIcon, QAction, QApplication
 
+from calibre.constants import __appname__, get_version
 from calibre.gui2.main_window import MainWindow
 from calibre.gui2.tweak_book import current_container, tprefs
 from calibre.gui2.tweak_book.file_list import FileListWidget
@@ -39,6 +40,11 @@ class Main(MainWindow):
 
         self.status_bar = self.statusBar()
         self.l = QLabel('Placeholder')
+        self.status_bar.addPermanentWidget(self.boss.save_manager.status_widget)
+        self.status_bar.addWidget(QLabel(_('%s %s created by %s') % (__appname__, get_version(), 'Kovid Goyal')))
+        f = self.status_bar.font()
+        f.setBold(True)
+        self.status_bar.setFont(f)
 
         self.setCentralWidget(self.l)
         self.boss(self)

From 494a252f3f2e6eb955c00c331c9865cabfb63148 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 17:57:15 +0530
Subject: [PATCH 1001/1154] Saving implemented

---
 src/calibre/ebooks/oeb/polish/container.py |  9 +++++++++
 src/calibre/gui2/tweak_book/boss.py        | 23 ++++++++++++++++++++--
 src/calibre/gui2/tweak_book/save.py        | 19 ++++++++++++++----
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 66efb697c7..b8362b73c9 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -745,6 +745,10 @@ class EpubContainer(Container):
             f.write(guess_type('a.epub'))
         zip_rebuilder(self.root, outpath)
 
+    @property
+    def path_to_ebook(self):
+        return self.pathtoepub
+
 # }}}
 
 # AZW3 {{{
@@ -839,6 +843,11 @@ class AZW3Container(Container):
         oeb = create_oebbook(default_log, opf, plumber.opts)
         set_cover(oeb)
         outp.convert(oeb, outpath, inp, plumber.opts, default_log)
+
+    @property
+    def path_to_ebook(self):
+        return self.pathtoepub
+
 # }}}
 
 def get_container(path, log=None, tdir=None):
diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 076f6edb82..575978bdc3 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -10,7 +10,7 @@ import tempfile, shutil
 
 from PyQt4.Qt import QObject, QApplication
 
-from calibre.gui2 import error_dialog, choose_files
+from calibre.gui2 import error_dialog, choose_files, question_dialog, info_dialog
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.ebooks.oeb.polish.main import SUPPORTED
 from calibre.ebooks.oeb.polish.container import get_container, clone_container
@@ -26,6 +26,7 @@ class Boss(QObject):
         self.container_count = 0
         self.tdir = None
         self.save_manager = SaveManager(parent)
+        self.save_manager.report_error.connect(self.report_save_error)
 
     def __call__(self, gui):
         self.gui = gui
@@ -42,7 +43,10 @@ class Boss(QObject):
     def open_book(self, path=None):
         if not self.check_dirtied():
             return
-        # TODO: Check if a save is in progress and abort if it is
+        if self.save_manager.has_tasks:
+            return info_dialog(self.gui, _('Cannot open'),
+                        _('The current book is being saved, you cannot open a new book until'
+                          ' the saving is completed'), show=True)
 
         if not hasattr(path, 'rpartition'):
             path = choose_files(self.gui, 'open-book-for-tweaking', _('Choose book'),
@@ -95,6 +99,7 @@ class Boss(QObject):
         container = current_container()
         self.gui.file_list.build(container)
         self.update_global_history_actions()
+        self.gui.action_save.setEnabled(True)
         # TODO: Apply to other GUI elements
 
     def do_global_undo(self):
@@ -127,6 +132,11 @@ class Boss(QObject):
         container = clone_container(current_container(), tdir)
         self.save_manager.schedule(tdir, container)
 
+    def report_save_error(self, tb):
+        error_dialog(self.gui, _('Could not save'),
+                     _('Saving of the book failed. Click "Show Details"'
+                       ' for more information.'), det_msg=tb, show=True)
+
     def quit(self):
         if not self.confirm_quit():
             return
@@ -134,10 +144,19 @@ class Boss(QObject):
         QApplication.instance().quit()
 
     def confirm_quit(self):
+        if self.save_manager.has_tasks:
+            if not question_dialog(
+                self.gui, _('Are you sure?'), _(
+                    'The current book is being saved in the background, quitting will abort'
+                    ' the save process, are you sure?'), default_yes=False):
+                return False
+
         return True
 
     def shutdown(self):
         self.save_state()
+        self.save_manager.shutdown()
+        self.save_manager.wait(0.1)
 
     def save_state(self):
         with tprefs:
diff --git a/src/calibre/gui2/tweak_book/save.py b/src/calibre/gui2/tweak_book/save.py
index c18ce6de11..6c89a75413 100644
--- a/src/calibre/gui2/tweak_book/save.py
+++ b/src/calibre/gui2/tweak_book/save.py
@@ -6,14 +6,17 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import shutil
+import shutil, os
 from threading import Thread
 from Queue import LifoQueue, Empty
 
 from PyQt4.Qt import (QObject, pyqtSignal, QLabel, QWidget, QHBoxLayout, Qt)
 
-from calibre.utils import join_with_timeout
+from calibre.constants import iswindows
+from calibre.ptempfile import PersistentTemporaryFile
 from calibre.gui2.progress_indicator import ProgressIndicator
+from calibre.utils import join_with_timeout
+from calibre.utils.filenames import atomic_rename
 
 class SaveWidget(QWidget):
 
@@ -101,10 +104,18 @@ class SaveManager(QObject):
         self.save_done.emit()
 
     def do_save(self, tdir, container):
+        temp = None
         try:
-            import time
-            time.sleep(10)
+            path = container.path_to_ebook
+            temp = PersistentTemporaryFile(
+                prefix=('_' if iswindows else '.'), suffix=os.path.splitext(path)[1], dir=os.path.dirname(path))
+            temp.close()
+            temp = temp.name
+            container.commit(temp)
+            atomic_rename(temp, path)
         finally:
+            if temp and os.path.exists(temp):
+                os.remove(temp)
             shutil.rmtree(tdir, ignore_errors=True)
 
     @property

From 1e3d8983e15e62da5bcd92e296fa9b555c3a5eaf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 20:40:26 +0530
Subject: [PATCH 1002/1154] ...

---
 src/calibre/devices/eb600/driver.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index fbb323d6e5..0e19363c60 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -59,6 +59,8 @@ class TOLINO(EB600):
     VENDOR_NAME      = ['DEUTSCHE']
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['_TELEKOMTOLINO']
 
+    # There are apparently two versions of this device, one with swapped
+    # drives and one without, see https://bugs.launchpad.net/bugs/1240504
     def linux_swap_drives(self, drives):
         if len(drives) < 2 or not drives[1] or not drives[2]:
             return drives

From 12718e6785bb9855ec143552e86511e13fd4c488 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 21:16:26 +0530
Subject: [PATCH 1003/1154] Confirm on quit if unsaved changes present

---
 src/calibre/gui2/tweak_book/boss.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 575978bdc3..053cea151e 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -150,6 +150,12 @@ class Boss(QObject):
                     'The current book is being saved in the background, quitting will abort'
                     ' the save process, are you sure?'), default_yes=False):
                 return False
+        if self.gui.action_save.isEnabled():
+            if not question_dialog(
+                self.gui, _('Are you sure?'), _(
+                    'The current book has unsaved changes, you will lose them if you quit,'
+                    ' are you sure?'), default_yes=False):
+                return False
 
         return True
 

From 8d544eaada733a70dfdd5edeaaa764ab659b9939 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Oct 2013 21:33:22 +0530
Subject: [PATCH 1004/1154] Sort non spine items in the file list

---
 src/calibre/gui2/tweak_book/file_list.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 1fc2eb4cb4..abe0724843 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -6,6 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
+from binascii import hexlify
 from PyQt4.Qt import (
     QWidget, QTreeWidget, QGridLayout, QSize, Qt, QTreeWidgetItem, QIcon,
     QStyledItemDelegate, QStyle, QPixmap, QPainter, pyqtSignal)
@@ -16,6 +17,7 @@ from calibre.ebooks.oeb.polish.container import guess_type
 from calibre.ebooks.oeb.polish.cover import get_cover_page_name, get_raster_cover_name
 from calibre.gui2 import error_dialog
 from calibre.gui2.tweak_book import current_container
+from calibre.utils.icu import sort_key
 
 TOP_ICON_SIZE = 24
 NAME_ROLE = Qt.UserRole
@@ -73,7 +75,6 @@ class FileList(QTreeWidget):
         self.setAutoExpandDelay(1000)
         self.setAnimated(True)
         self.setMouseTracking(True)
-        self.in_drop_event = False
         self.setContextMenuPolicy(Qt.CustomContextMenu)
         self.customContextMenuRequested.connect(self.show_context_menu)
         self.root = self.invisibleRootItem()
@@ -158,6 +159,7 @@ class FileList(QTreeWidget):
                 # We have an exact duplicate (can happen if there are
                 # duplicates in the spine)
                 item.setText(0, processed[name].text(0))
+                item.setText(1, processed[name].text(1))
                 return
 
             parts = name.split('/')
@@ -166,6 +168,7 @@ class FileList(QTreeWidget):
                 text = parts.pop() + '/' + text
             seen[text] = item
             item.setText(0, text)
+            item.setText(1, hexlify(sort_key(text)))
 
         def render_emblems(item, emblems):
             emblems = tuple(emblems)
@@ -238,14 +241,16 @@ class FileList(QTreeWidget):
                 continue
             processed[name] = create_item(name)
 
-        for c in self.categories.itervalues():
+        for name, c in self.categories.iteritems():
             c.setExpanded(True)
+            if name != 'text':
+                c.sortChildren(1, Qt.AscendingOrder)
 
         if preserve_state:
             self.set_state(state)
 
     def show_context_menu(self, point):
-        pass
+        pass  # TODO: Implement this
 
     def keyPressEvent(self, ev):
         if ev.key() in (Qt.Key_Delete, Qt.Key_Backspace):
@@ -283,6 +288,14 @@ class FileList(QTreeWidget):
         for c in removals:
             c.parent().removeChild(c)
 
+    def dropEvent(self, event):
+        text = self.categories['text']
+        pre_drop_order = {text.child(i):i for i in xrange(text.childCount())}
+        super(FileList, self).dropEvent(event)
+        current_order = {text.child(i):i for i in xrange(text.childCount())}
+        if current_order != pre_drop_order:
+            pass  # TODO: Implement this
+
 class FileListWidget(QWidget):
 
     delete_requested = pyqtSignal(object, object)

From 66a88b5d6eadb2ea66c5e028a08332be96857626 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 08:20:19 +0530
Subject: [PATCH 1005/1154] Fix #1240644 [Chapter threshold maximum of 99 is
 insufficient](https://bugs.launchpad.net/calibre/+bug/1240644)

---
 src/calibre/gui2/convert/toc.ui | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/convert/toc.ui b/src/calibre/gui2/convert/toc.ui
index 6140816804..0e7b6530ea 100644
--- a/src/calibre/gui2/convert/toc.ui
+++ b/src/calibre/gui2/convert/toc.ui
@@ -15,7 +15,11 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="7" column="1">
-    <widget class="QSpinBox" name="opt_toc_threshold"/>
+    <widget class="QSpinBox" name="opt_toc_threshold">
+     <property name="maximum">
+      <number>10000</number>
+     </property>
+    </widget>
    </item>
    <item row="1" column="0" colspan="2">
     <widget class="QCheckBox" name="opt_use_auto_toc">

From 42cc5b28132cc34cc094311fc23f743342cc5c1b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 08:26:05 +0530
Subject: [PATCH 1006/1154] Update Newsweek Polska

---
 recipes/newsweek_polska.recipe | 356 +++++++++++++++++++++------------
 1 file changed, 223 insertions(+), 133 deletions(-)

diff --git a/recipes/newsweek_polska.recipe b/recipes/newsweek_polska.recipe
index ec50e0f438..0a608579ff 100644
--- a/recipes/newsweek_polska.recipe
+++ b/recipes/newsweek_polska.recipe
@@ -2,173 +2,263 @@
 #!/usr/bin/env  python
 
 __license__   = 'GPL v3'
-__copyright__ = '2010, matek09, matek09@gmail.com; 2012, admroz, a.rozewicki@gmail.com'
+__copyright__ = '2010, matek09, matek09@gmail.com; 2012-2013, admroz, a.rozewicki@gmail.com'
 
+import re
 from calibre.web.feeds.news import BasicNewsRecipe
 from calibre.ptempfile import PersistentTemporaryFile
 from string import capwords
 import datetime
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
 
 
 class Newsweek(BasicNewsRecipe):
 
-	# how many issues to go back, 0 means get the most current one
-	BACK_ISSUES = 2
+    # how many issues to go back, 0 means get the most current one
+    BACK_ISSUES = 1
 
-	EDITION = '0'
-	DATE = None
-	YEAR = datetime.datetime.now().year
+    EDITION = '0'
+    DATE = None
+    YEAR = datetime.datetime.now().year
 
-	title = u'Newsweek Polska'
-	__author__ = 'matek09, admroz'
-	description = 'Weekly magazine'
-	encoding = 'utf-8'
-	language = 'pl'
-	remove_javascript = True
+    title = u'Newsweek Polska'
+    __author__ = 'matek09, admroz'
+    description = 'Weekly magazine'
+    encoding = 'utf-8'
+    language = 'pl'
+    remove_javascript = True
 
-	temp_files = []
-	articles_are_obfuscated = True
+    temp_files = []
+    articles_are_obfuscated = True
 
 
-	#
-	# Parses each article
-	#
-	def get_obfuscated_article(self, url):
-		br = self.get_browser()
-		br.open(url)
-		source = br.response().read()
-		page = self.index_to_soup(source)
+    #
+    # Parses article contents from one page
+    #
+    def get_article_divs(self, css, main_section):
+        strs = []
 
-		main_section = page.find(id='mainSection')
+        # get all divs with given css class
+        article_divs = main_section.findAll('div', attrs={'class' : css})
+        for article_div in article_divs:
 
-		title = main_section.find('h1')
-		info = main_section.find('ul', attrs={'class' : 'articleInfo'})
-		authors = info.find('li').find('h4')
-		article = main_section.find('div', attrs={'id' : 'article'})
+            # remove sections like 'read more...' etc.
+            for p in article_div.findAll('p'):
 
-		# remove related articles box
-		related = article.find('div', attrs={'class' : 'relatedBox'})
-		if related is not None:
-			related.extract()
+                if p.find('span', attrs={'style' : 'color: #800000; font-size: medium;'}):
+                    p.extract()
+                    continue
 
-		# remove div with social networking links and links to
-		# other articles in web version
-		for div in article.findAll('div'):
-			if div.find('span', attrs={'class' : 'google-plus'}):
-				div.extract()
+                if p.find('span', attrs={'style' : 'font-size: medium; color: #800000;'}):
+                    p.extract()
+                    continue
 
-			for p in div.findAll('p'):
-				if p.find('span', attrs={'style' : 'color: rgb(255, 0, 0);'}):
-					p.extract()
-					continue
-				for a in p.findAll('a'):
-					if a.find('span', attrs={'style' : 'font-size: larger;'}):
-						a.extract()
+                if p.find('span', attrs={'style' : 'font-size: medium;'}):
+                    p.extract()
+                    continue
+
+                if p.find('span', attrs={'style' : 'color: #800000;'}):
+                    p.extract()
+                    continue
+
+                obj = p.find('object')
+                if obj:
+                    obj.extract()
+                    continue
+
+                strong = p.find('strong')
+                if strong:
+                    newest = re.compile("Tekst pochodzi z najnowszego numeru Tygodnika Newsweek")
+                    if newest.search(str(strong)):
+                        strong.extract()
+                        continue
+
+                itunes = p.find('a')
+                if itunes:
+                    reurl = re.compile("itunes.apple.com")
+                    if reurl.search(str(itunes['href'])):
+                        p.extract()
+                        continue
+
+                imagedesc = p.find('div', attrs={'class' : 'image-desc'})
+                if imagedesc:
+                    redesc = re.compile("Okładka numeru")
+                    if (redesc.search(str(imagedesc))):
+                        p.extract()
+                        continue
 
 
-		html = unicode(title) + unicode(authors) + unicode(article)
-		next = main_section.find('li', attrs={'class' : 'next'})
 
-		while next:
-			url = next.find('a')['href']
-			br.open(url)
-			source = br.response().read()
-			page = self.index_to_soup(source)
-			main_section = page.find(id='mainSection')
-			article = main_section.find('div', attrs={'id' : 'article'})
-			aside = article.find(id='articleAside')
-			if aside is not None:
-				aside.extract()
-			html = html + unicode(article)
-			next = main_section.find('li', attrs={'class' : 'next'})
+            # get actual contents
+            for content in article_div.contents:
+                strs.append("".join(str(content)))
+
+        # return contents as a string
+        return unicode("".join(strs))
 
 
-		self.temp_files.append(PersistentTemporaryFile('_temparse.html'))
-		self.temp_files[-1].write(html)
-		self.temp_files[-1].close()
-		return self.temp_files[-1].name
+    #
+    # Articles can be divided into several pages, this method parses them recursevely
+    #
+    def get_article_page(self, br, url, page):
+        br.open(url)
+        source = br.response().read()
+
+        html = ''
+
+        matches = re.search(r'<article>(.*)</article>', source, re.DOTALL)
+        if matches is None:
+            print "no article tag found, returning..."
+            return
+
+        main_section = BeautifulSoup(matches.group(0))
+
+        if page == 0:
+            title = main_section.find('h1')
+            html = html + unicode(title)
+
+            authors = ''
+            authorBox = main_section.find('div', attrs={'class' : 'AuthorBox'})
+            if authorBox is not None:
+                authorH4 = authorBox.find('h4')
+                if authorH4 is not None:
+                    authors = self.tag_to_string(authorH4)
+            html = html + unicode(authors)
+
+            info = main_section.find('p', attrs={'class' : 'lead'})
+            html = html + unicode(info)
+
+        html = html + self.get_article_divs('3917dc34e07c9c7180df2ea9ef103361845c8af42b71f51b960059226090a1ac articleStart', main_section)
+        html = html + self.get_article_divs('3917dc34e07c9c7180df2ea9ef103361845c8af42b71f51b960059226090a1ac', main_section)
+
+        nextPage = main_section.find('a', attrs={'class' : 'next'})
+        if nextPage:
+            html = html + self.get_article_page(br, nextPage['href'], page+1)
+
+        return html
+
+    #
+    # Parses each article
+    #
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        html = self.get_article_page(br, url, 0)
+        self.temp_files.append(PersistentTemporaryFile('_temparse.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
 
 
-	#
-	# Goes back given number of issues. It also knows how to go back
-	# to the previous year if there are not enough issues in the current one
-	#
-	def find_last_issue(self, archive_url):
-		archive_soup = self.index_to_soup(archive_url)
-		select = archive_soup.find('select', attrs={'id' : 'paper_issue_select'})
-		options = select.findAll(lambda tag: tag.name == 'option' and tag.has_key('value'))
+    #
+    # Goes back given number of issues. It also knows how to go back
+    # to the previous year if there are not enough issues in the current one
+    #
+    def find_last_issue(self, archive_url):
+        archive_soup = self.index_to_soup(archive_url, True)
 
-		# check if need to go back to previous year
-		if len(options) > self.BACK_ISSUES:
-			option = options[self.BACK_ISSUES];
-			self.EDITION = option['value'].replace('http://www.newsweek.pl/wydania/','')
-			self.index_to_soup('http://www.newsweek.pl/wydania/' + self.EDITION)
-		else:
-			self.BACK_ISSUES = self.BACK_ISSUES - len(options)
-			self.YEAR = self.YEAR - 1
-			self.find_last_issue(archive_url + ',' + str(self.YEAR))
+        # workaround because html is so messed up that find() method on soup returns None
+        # and therefore we need to extract subhtml that we need
+        matches = re.search(r'<ul class="rightIssueList">(.*?)</ul>', archive_soup, re.DOTALL)
+        if matches is None:
+            return
+
+        subSoup = BeautifulSoup(matches.group(0))
+        issueLinks = subSoup.findAll('a')
+
+        # check if need to go back to previous year
+        if len(issueLinks) > self.BACK_ISSUES:
+            link = issueLinks[self.BACK_ISSUES];
+            self.EDITION = link['href'].replace('http://www.newsweek.pl/wydania/','')
+            self.index_to_soup('http://www.newsweek.pl/wydania/' + self.EDITION)
+        else:
+            self.BACK_ISSUES = self.BACK_ISSUES - len(issueLinks)
+            self.YEAR = self.YEAR - 1
+            self.find_last_issue(archive_url + '/' + str(self.YEAR))
 
 
-	#
-	# Looks for the last issue which we want to download. Then goes on each
-	# section and article and stores them (assigning to sections)
-	#
-	def parse_index(self):
-		archive_url = 'http://www.newsweek.pl/wydania/archiwum'
-		self.find_last_issue(archive_url)
-		soup = self.index_to_soup('http://www.newsweek.pl/wydania/' + self.EDITION)
-		self.DATE = self.tag_to_string(soup.find('span', attrs={'class' : 'data'}))
-		main_section = soup.find(id='mainSection')
-		img = main_section.find(lambda tag: tag.name == 'img' and tag.has_key('alt') and tag.has_key('title'))
-		self.cover_url = img['src']
-		feeds = []
-		articles = {}
-		sections = []
+    #
+    # Looks for the last issue which we want to download. Then goes on each
+    # section and article and stores them (assigning to sections)
+    #
+    def parse_index(self):
+        archive_url = 'http://www.newsweek.pl/wydania/archiwum'
+        self.find_last_issue(archive_url)
+        soup = self.index_to_soup('http://www.newsweek.pl/wydania/' + self.EDITION)
 
-		news_list = main_section.find('ul', attrs={'class' : 'newsList'})
-		section = 'Inne'
+        matches = re.search(r'<div class="Issue-Entry">(.*)ARTICLE_BOTTOM', soup.prettify(), re.DOTALL)
+        if matches is None:
+            return
 
-		for li in news_list.findAll('li'):
-			h3 = li.find('h3')
-			if h3 is not None:
-				section = capwords(self.tag_to_string(h3))
-				continue
-			else:
-				h2 = li.find('h2')
-				if h2 is not None:
-					article = self.create_article(h2)
-					if article is None :
-						continue
+        main_section = BeautifulSoup(matches.group(0))
 
-					if articles.has_key(section):
-						articles[section].append(article)
-					else:
-						articles[section] = [article]
-						sections.append(section)
+        # date
+        matches = re.search(r'(\d{2}-\d{2}-\d{4})', self.tag_to_string(main_section.find('h2')))
+        if matches:
+            self.DATE = matches.group(0)
+
+        # cover
+        img = main_section.find(lambda tag: tag.name == 'img' and tag.has_key('alt') and tag.has_key('title'))
+        self.cover_url = img['src']
+        feeds = []
+        articles = {}
+        sections = []
+
+        # sections
+        for sectionUl in main_section.findAll('ul', attrs={'class' : 'whatsin'}):
+
+            # section header
+            header = sectionUl.find('li', attrs={'class' : 'header'})
+            if header is None:
+                continue
+
+            section = capwords(self.tag_to_string(header))
+
+            # articles in section
+            articleUl = sectionUl.find('ul')
+            if articleUl is None:
+                continue
+
+            for articleLi in articleUl.findAll('li'):
+                # check if article is closed which should be skipped
+                closed = articleLi.find('span', attrs={'class' : 'closeart'})
+                if closed is not None:
+                    continue
+
+                article = self.create_article(articleLi)
+                if article is None :
+                    continue
+
+                if articles.has_key(section):
+                    articles[section].append(article)
+                else:
+                    articles[section] = [article]
+                    sections.append(section)
+
+        for section in sections:
+#             print("%s -> %d" % (section, len(articles[section])))
+#
+#             for article in articles[section]:
+#                 print(" - %s" % article)
+
+            feeds.append((section, articles[section]))
+
+        return feeds
 
 
-		for section in sections:
-			feeds.append((section, articles[section]))
-		return feeds
+    #
+    # Creates each article metadata (skips locked ones). The content will
+    # be extracted later by other method (get_obfuscated_article).
+    #
+    def create_article(self, articleLi):
+        article = {}
 
+        a = articleLi.find('a')
+        if a is None:
+            return None
 
-	#
-	# Creates each article metadata (skips locked ones). The content will
-	# be extracted later by other method (get_obfuscated_article).
-	#
-	def create_article(self, h2):
-		article = {}
-		a = h2.find('a')
-		if a is None:
-			return None
+        article['title'] = self.tag_to_string(a)
+        article['url'] = a['href']
+        article['date'] = self.DATE
+        article['description'] = ''
 
-		article['title'] = self.tag_to_string(a)
-		article['url'] = a['href']
-		article['date'] = self.DATE
-		desc = h2.findNext('p')
-
-		if desc is not None:
-			article['description'] = self.tag_to_string(desc)
-		else:
-			article['description'] = ''
-		return article
+        return article

From 1c0849446b89957cde0622645b48005349c47156 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 09:07:15 +0530
Subject: [PATCH 1007/1154] Conversion: Handle embed font family and filter css
 conflict

Conversion: If both embed font family and the filter css option to
remove fonts are set, do not remove the font specified by the embed font
family option.
---
 src/calibre/ebooks/oeb/transforms/flatcss.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index 9c8442d391..c3b7f6f625 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -410,7 +410,10 @@ class CSSFlattener(object):
 
         if cssdict:
             for x in self.filter_css:
-                cssdict.pop(x, None)
+                popval = cssdict.pop(x, None)
+                if (self.body_font_family and popval and x == 'font-family' and
+                    popval.partition(',')[0][1:-1] == self.body_font_family.partition(',')[0][1:-1]):
+                    cssdict[x] = popval
 
         if cssdict:
             if self.lineh and self.fbase and tag != 'body':

From 09775678bb0b0bcda31fe077cb71a38c2f857ac9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 12:28:00 +0530
Subject: [PATCH 1008/1154] Fix custom device driver swap main and card option
 not working

---
 src/calibre/devices/user_defined/driver.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/user_defined/driver.py b/src/calibre/devices/user_defined/driver.py
index a88264c517..2449d5062c 100644
--- a/src/calibre/devices/user_defined/driver.py
+++ b/src/calibre/devices/user_defined/driver.py
@@ -120,7 +120,8 @@ class USER_DEFINED(USBMS):
         self.plugin_needs_delayed_initialization = False
 
     def windows_sort_drives(self, drives):
-        if len(drives) < 2: return drives
+        if len(drives) < 2:
+            return drives
         e = self.settings().extra_customization
         if not e[self.OPT_SWAP_MAIN_AND_CARD]:
             return drives
@@ -132,7 +133,8 @@ class USER_DEFINED(USBMS):
         return drives
 
     def linux_swap_drives(self, drives):
-        if len(drives) < 2 or not drives[1] or not drives[2]: return drives
+        if len(drives) < 2 or not drives[0] or not drives[1]:
+            return drives
         e = self.settings().extra_customization
         if not e[self.OPT_SWAP_MAIN_AND_CARD]:
             return drives
@@ -143,7 +145,8 @@ class USER_DEFINED(USBMS):
         return tuple(drives)
 
     def osx_sort_names(self, names):
-        if len(names) < 2: return names
+        if len(names) < 2:
+            return names
         e = self.settings().extra_customization
         if not e[self.OPT_SWAP_MAIN_AND_CARD]:
             return names

From 6b575eba33499ef175ae5239567d323dfd03553d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 12:34:35 +0530
Subject: [PATCH 1009/1154] Windows: Check if the books' files are in use
 before deleting

Fixes #1240788 [Calibre refused to delete book](https://bugs.launchpad.net/calibre/+bug/1240788)
---
 src/calibre/db/cache.py            |  4 ++++
 src/calibre/gui2/actions/delete.py | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 80361393c5..6a4ed4708e 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1397,6 +1397,10 @@ class Cache(object):
             except:
                 path = None
             path_map[book_id] = path
+        if iswindows:
+            paths = (x.replace(os.sep, '/') for x in path_map.itervalues() if x)
+            self.backend.windows_check_if_files_in_use(paths)
+
         self.backend.remove_books(path_map, permanent=permanent)
         for field in self.fields.itervalues():
             try:
diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py
index ab5e52d69c..ddd71ee18f 100644
--- a/src/calibre/gui2/actions/delete.py
+++ b/src/calibre/gui2/actions/delete.py
@@ -5,6 +5,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+import errno
 from functools import partial
 from collections import Counter
 
@@ -360,7 +361,17 @@ class DeleteAction(InterfaceAction):
             return
         next_id = view.next_id
         if len(to_delete_ids) < 5:
-            view.model().delete_books_by_id(to_delete_ids)
+            try:
+                view.model().delete_books_by_id(to_delete_ids)
+            except IOError as err:
+                if err.errno == errno.EACCES:
+                    import traceback
+                    fname = getattr(err, 'filename', 'file') or 'file'
+                    return error_dialog(self.gui, _('Permission denied'),
+                            _('Could not access %s. Is it being used by another'
+                            ' program? Click "Show details" for more information.')%fname, det_msg=traceback.format_exc(),
+                            show=True)
+
             self.library_ids_deleted2(to_delete_ids, next_id=next_id)
         else:
             self.__md = MultiDeleter(self.gui, to_delete_ids,

From b059e839ac9da07986584213ae09d885252d96d5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 13:02:47 +0530
Subject: [PATCH 1010/1154] Fix typos in linux_swap_drives() in a few other
 devices

---
 src/calibre/devices/eb600/driver.py  | 2 +-
 src/calibre/devices/hanlin/driver.py | 2 +-
 src/calibre/devices/misc.py          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 0e19363c60..12812f3b9a 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -62,7 +62,7 @@ class TOLINO(EB600):
     # There are apparently two versions of this device, one with swapped
     # drives and one without, see https://bugs.launchpad.net/bugs/1240504
     def linux_swap_drives(self, drives):
-        if len(drives) < 2 or not drives[1] or not drives[2]:
+        if len(drives) < 2 or not drives[0] or not drives[1]:
             return drives
         drives = list(drives)
         t = drives[0]
diff --git a/src/calibre/devices/hanlin/driver.py b/src/calibre/devices/hanlin/driver.py
index 513e083c6c..6ec93745c7 100644
--- a/src/calibre/devices/hanlin/driver.py
+++ b/src/calibre/devices/hanlin/driver.py
@@ -64,7 +64,7 @@ class HANLINV3(USBMS):
         return names
 
     def linux_swap_drives(self, drives):
-        if len(drives) < 2 or not drives[1] or not drives[2]: return drives
+        if len(drives) < 2 or not drives[0] or not drives[1]: return drives
         drives = list(drives)
         t = drives[0]
         drives[0] = drives[1]
diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index f6d10ef1cf..43157480b9 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -461,7 +461,7 @@ class WAYTEQ(USBMS):
 
     def linux_swap_drives(self, drives):
         # See https://bugs.launchpad.net/bugs/1151901
-        if len(drives) < 2 or not drives[1] or not drives[2]:
+        if len(drives) < 2 or not drives[0] or not drives[1]:
             return drives
         drives = list(drives)
         t = drives[0]

From 73e7ddcefefbfdc28c4f148900bcebaca1268ce7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 13:10:16 +0530
Subject: [PATCH 1011/1154] Update WSJ some more

---
 recipes/wsj.recipe      | 13 +------------
 recipes/wsj_free.recipe | 14 +-------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/recipes/wsj.recipe b/recipes/wsj.recipe
index c138fb2a04..16a523baec 100644
--- a/recipes/wsj.recipe
+++ b/recipes/wsj.recipe
@@ -19,19 +19,8 @@ class WallStreetJournal(BasicNewsRecipe):
     max_articles_per_feed = 1000
     timefmt  = ' [%a, %b %d, %Y]'
     no_stylesheets = True
+    ignore_duplicate_articles = {'url'}
 
-    extra_css      = '''h1{color:#093D72 ; font-size:large ; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; }
-                    h2{color:#474537; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small; font-style:italic;}
-                    .subhead{color:gray; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small; font-style:italic;}
-                    .insettipUnit {color:#666666; font-family:Arial,Sans-serif;font-size:xx-small }
-                    .targetCaption{ font-size:x-small; color:#333333; font-family:Arial,Helvetica,sans-serif}
-                    .article{font-family :Arial,Helvetica,sans-serif; font-size:x-small}
-                    .tagline {color:#333333; font-size:xx-small}
-                    .dateStamp {color:#666666; font-family:Arial,Helvetica,sans-serif}
-                        h3{color:blue ;font-family:Arial,Helvetica,sans-serif; font-size:xx-small}
-                        .byline{color:blue;font-family:Arial,Helvetica,sans-serif; font-size:xx-small}
-                        h6{color:#333333; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small;font-style:italic; }
-                    .paperLocation{color:#666666; font-size:xx-small}'''
     keep_only_tags = [
         dict(name='h1'), dict(name='h2', attrs={'class':['subhead', 'subHed deck']}),
         dict(name='span', itemprop='author', rel='author'),
diff --git a/recipes/wsj_free.recipe b/recipes/wsj_free.recipe
index eea9789f79..c8857b60d7 100644
--- a/recipes/wsj_free.recipe
+++ b/recipes/wsj_free.recipe
@@ -19,19 +19,7 @@ class WallStreetJournal(BasicNewsRecipe):
     max_articles_per_feed = 1000
     timefmt  = ' [%a, %b %d, %Y]'
     no_stylesheets = True
-
-    extra_css      = '''h1{color:#093D72 ; font-size:large ; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; }
-                    h2{color:#474537; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small; font-style:italic;}
-                    .subhead{color:gray; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small; font-style:italic;}
-                    .insettipUnit {color:#666666; font-family:Arial,Sans-serif;font-size:xx-small }
-                    .targetCaption{ font-size:x-small; color:#333333; font-family:Arial,Helvetica,sans-serif}
-                    .article{font-family :Arial,Helvetica,sans-serif; font-size:x-small}
-                    .tagline {color:#333333; font-size:xx-small}
-                    .dateStamp {color:#666666; font-family:Arial,Helvetica,sans-serif}
-                        h3{color:blue ;font-family:Arial,Helvetica,sans-serif; font-size:xx-small}
-                        .byline{color:blue;font-family:Arial,Helvetica,sans-serif; font-size:xx-small}
-                        h6{color:#333333; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif; font-size:small;font-style:italic; }
-                    .paperLocation{color:#666666; font-size:xx-small}'''
+    ignore_duplicate_articles = {'url'}
 
     keep_only_tags = [
         dict(name='h1'), dict(name='h2', attrs={'class':['subhead', 'subHed deck']}),

From 965db8806596539bc286077c3b70fc98e8b56ea1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 14:14:47 +0530
Subject: [PATCH 1012/1154] Printout tracebacks in debug mode for exception
 during template processing

---
 src/calibre/db/locking.py      | 2 ++
 src/calibre/utils/formatter.py | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index df27bbbb25..cc006f65f5 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -13,6 +13,8 @@ from calibre.utils.config_base import tweaks
 
 class LockingError(RuntimeError):
 
+    is_locking_error = True
+
     def __init__(self, msg, extra=None):
         RuntimeError.__init__(self, msg)
         self.locking_debug_msg = extra
diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py
index 2fa5901dde..34eb06a089 100644
--- a/src/calibre/utils/formatter.py
+++ b/src/calibre/utils/formatter.py
@@ -515,8 +515,8 @@ class TemplateFormatter(string.Formatter):
         try:
             ans = self.evaluate(fmt, [], kwargs).strip()
         except Exception as e:
-#            if DEBUG:
-#                traceback.print_exc()
+            if DEBUG and getattr(e, 'is_locking_error', False):
+                traceback.print_exc()
             ans = error_value + ' ' + e.message
         return ans
 
@@ -529,7 +529,7 @@ class ValidateFormatter(TemplateFormatter):
 
     def validate(self, x):
         from calibre.ebooks.metadata.book.base import Metadata
-        self.book = Metadata('');
+        self.book = Metadata('')
         return self.vformat(x, [], {})
 
 validation_formatter = ValidateFormatter()

From 9296118d7a8d589de969b5ca89a8fc8feb0db1cf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 14:22:16 +0530
Subject: [PATCH 1013/1154] Make deleting to recycle bin more robust

Make deleting books to recycle bin more robust. Ensure that the
temporary directory created during the move to recycle bin process is
not left behind in case of errors.
---
 src/calibre/db/delete_service.py | 87 +++++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 30 deletions(-)

diff --git a/src/calibre/db/delete_service.py b/src/calibre/db/delete_service.py
index d512562473..6d3e41ebbb 100644
--- a/src/calibre/db/delete_service.py
+++ b/src/calibre/db/delete_service.py
@@ -6,10 +6,11 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import os, tempfile, shutil, errno, time
+import os, tempfile, shutil, errno, time, atexit
 from threading import Thread
 from Queue import Queue
 
+from calibre.ptempfile import remove_dir
 from calibre.utils.recycle_bin import delete_tree, delete_file
 
 class DeleteService(Thread):
@@ -40,39 +41,64 @@ class DeleteService(Thread):
         base_path = os.path.dirname(library_path)
         base = os.path.basename(library_path)
         try:
-            return tempfile.mkdtemp(prefix=base+' deleted ', dir=base_path)
+            ans = tempfile.mkdtemp(prefix=base+' deleted ', dir=base_path)
         except OSError:
-            return tempfile.mkdtemp(prefix=base+' deleted ')
+            ans = tempfile.mkdtemp(prefix=base+' deleted ')
+        atexit.register(remove_dir, ans)
+        return ans
+
+    def remove_dir_if_empty(self, path):
+        try:
+            os.rmdir(path)
+        except OSError as e:
+            if e.errno == errno.ENOTEMPTY or len(os.listdir(path)) > 0:
+                # Some linux systems appear to raise an EPERM instead of an
+                # ENOTEMPTY, see https://bugs.launchpad.net/bugs/1240797
+                return
+            raise
 
     def delete_books(self, paths, library_path):
         tdir = self.create_staging(library_path)
         self.queue_paths(tdir, paths, delete_empty_parent=True)
 
     def queue_paths(self, tdir, paths, delete_empty_parent=True):
-        queued = False
+        try:
+            self._queue_paths(tdir, paths, delete_empty_parent=delete_empty_parent)
+        except:
+            if os.path.exists(tdir):
+                shutil.rmtree(tdir, ignore_errors=True)
+            raise
+
+    def _queue_paths(self, tdir, paths, delete_empty_parent=True):
+        requests = []
         for path in paths:
             if os.path.exists(path):
+                basename = os.path.basename(path)
+                c = 0
+                while True:
+                    dest = os.path.join(tdir, basename)
+                    if not os.path.exists(dest):
+                        break
+                    c += 1
+                    basename = '%d - %s' % (c, os.path.basename(path))
                 try:
-                    shutil.move(path, tdir)
+                    shutil.move(path, dest)
                 except EnvironmentError:
+                    if os.path.isdir(path):
+                        # shutil.move may have partially copied the directory,
+                        # so the subsequent call to move() will fail as the
+                        # destination directory already exists
+                        raise
                     # Wait a little in case something has locked a file
                     time.sleep(1)
-                    shutil.move(path, tdir)
+                    shutil.move(path, dest)
                 if delete_empty_parent:
-                    parent = os.path.dirname(path)
-                    try:
-                        os.rmdir(parent)
-                    except OSError as e:
-                        if e.errno != errno.ENOTEMPTY:
-                            raise
-                self.requests.put(os.path.join(tdir, os.path.basename(path)))
-                queued = True
-        if not queued:
-            try:
-                os.rmdir(tdir)
-            except OSError as e:
-                if e.errno != errno.ENOTEMPTY:
-                    raise
+                    self.remove_dir_if_empty(os.path.dirname(path))
+                requests.append(dest)
+        if not requests:
+            self.remove_dir_if_empty(tdir)
+        else:
+            self.requests.put(tdir)
 
     def delete_files(self, paths, library_path):
         tdir = self.create_staging(library_path)
@@ -96,16 +122,17 @@ class DeleteService(Thread):
         'Blocks until all pending deletes have completed'
         self.requests.join()
 
-    def do_delete(self, x):
-        if os.path.isdir(x):
-            delete_tree(x)
-        else:
-            delete_file(x)
-        try:
-            os.rmdir(os.path.dirname(x))
-        except OSError as e:
-            if e.errno != errno.ENOTEMPTY:
-                raise
+    def do_delete(self, tdir):
+        if os.path.exists(tdir):
+            try:
+                for x in os.listdir(tdir):
+                    x = os.path.join(tdir, x)
+                    if os.path.isdir(x):
+                        delete_tree(x)
+                    else:
+                        delete_file(x)
+            finally:
+                shutil.rmtree(tdir)
 
 __ds = None
 def delete_service():

From dba9397a5e457598f9f4d903b3e3447adf83dea8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 15:25:26 +0530
Subject: [PATCH 1014/1154] Fix a few remaining downgrade locking errors

Fix a few remaining call sites that could generate downgrade lock
errors. Also speed up locking a little by aliasing the __enter__ and
__exit__ methods on the wrapper lock object instead of wrapping them.
---
 src/calibre/db/cache.py   | 30 +++++++++++++++++++-----------
 src/calibre/db/lazy.py    |  2 +-
 src/calibre/db/legacy.py  |  8 ++++----
 src/calibre/db/locking.py | 39 +++++++++++++++++++++++++++++++--------
 src/calibre/db/view.py    |  4 ++--
 5 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 6a4ed4708e..fcb8b7c407 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -18,7 +18,7 @@ from calibre.constants import iswindows, preferred_encoding
 from calibre.customize.ui import run_plugins_on_import, run_plugins_on_postimport
 from calibre.db import SPOOL_SIZE, _get_next_series_num_for_list
 from calibre.db.categories import get_categories
-from calibre.db.locking import create_locks, DowngradeLockError
+from calibre.db.locking import create_locks, DowngradeLockError, SafeReadLock
 from calibre.db.errors import NoSuchFormat
 from calibre.db.fields import create_field, IDENTITY, InvalidLinkTable
 from calibre.db.search import Search
@@ -57,11 +57,8 @@ def wrap_simple(lock, func):
                 return func(*args, **kwargs)
         except DowngradeLockError:
             # We already have an exclusive lock, no need to acquire a shared
-            # lock. This can happen when updating the search cache in the
-            # presence of composite columns. Updating the search cache holds an
-            # exclusive lock, but searching a composite column involves
-            # reading field values via ProxyMetadata which tries to get a
-            # shared lock.
+            # lock. See the safe_read_lock properties documentation for why
+            # this is necessary.
             return func(*args, **kwargs)
     return call_func_with_lock
 
@@ -118,6 +115,17 @@ class Cache(object):
         self._search_api = Search(self, 'saved_searches', self.field_metadata.get_search_terms())
         self.initialize_dynamic()
 
+    @property
+    def safe_read_lock(self):
+        ''' A safe read lock is a lock that does nothing if the thread already
+        has a write lock, otherwise it acquires a read lock. This is necessary
+        to prevent DowngradeLockErrors, which can happen when updating the
+        search cache in the presence of composite columns. Updating the search
+        cache holds an exclusive lock, but searching a composite column
+        involves reading field values via ProxyMetadata which tries to get a
+        shared lock. There may be other scenarios that trigger this as well. '''
+        return SafeReadLock(self.read_lock)
+
     @write_api
     def initialize_dynamic(self):
         # Reconstruct the user categories, putting them into field_metadata
@@ -501,7 +509,7 @@ class Cache(object):
             x = self.format_metadata_cache[book_id].get(fmt, None)
             if x is not None:
                 return x
-        with self.read_lock:
+        with self.safe_read_lock:
             try:
                 name = self.fields['formats'].format_fname(book_id, fmt)
                 path = self._field_for('path', book_id).replace('/', os.sep)
@@ -545,7 +553,7 @@ class Cache(object):
         cover_as_data is True then as mi.cover_data.
         '''
 
-        with self.read_lock:
+        with self.safe_read_lock:
             mi = self._get_metadata(book_id, get_user_categories=get_user_categories)
 
         if get_cover:
@@ -751,7 +759,7 @@ class Cache(object):
         ext = ('.'+fmt.lower()) if fmt else ''
         if as_path:
             if preserve_filename:
-                with self.read_lock:
+                with self.safe_read_lock:
                     try:
                         fname = self.fields['formats'].format_fname(book_id, fmt)
                     except:
@@ -777,7 +785,7 @@ class Cache(object):
                         return None
                     ret = pt.name
         elif as_file:
-            with self.read_lock:
+            with self.safe_read_lock:
                 try:
                     fname = self.fields['formats'].format_fname(book_id, fmt)
                 except:
@@ -878,7 +886,7 @@ class Cache(object):
     @api
     def get_categories(self, sort='name', book_ids=None, icon_map=None, already_fixed=None):
         try:
-            with self.read_lock:
+            with self.safe_read_lock:
                 return get_categories(self, sort=sort, book_ids=book_ids, icon_map=icon_map)
         except InvalidLinkTable as err:
             bad_field = err.field_name
diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 8935110b65..fbe37713d5 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -132,7 +132,7 @@ def adata_getter(field):
             author_ids, adata = cache['adata']
         except KeyError:
             db = dbref()
-            with db.read_lock:
+            with db.safe_read_lock:
                 author_ids = db._field_ids_for('authors', book_id)
                 adata = db._author_data(author_ids)
             cache['adata'] = (author_ids, adata)
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index 64205173e8..cc69ca963e 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -154,7 +154,7 @@ class LibraryDatabase(object):
         return tuple(self.new_api.all_book_ids())
 
     def is_empty(self):
-        with self.new_api.read_lock:
+        with self.new_api.safe_read_lock:
             return not bool(self.new_api.fields['title'].table.book_col_map)
 
     def get_usage_count_by_id(self, field):
@@ -363,7 +363,7 @@ class LibraryDatabase(object):
 
     def authors_with_sort_strings(self, index, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
-        with self.new_api.read_lock:
+        with self.new_api.safe_read_lock:
             authors = self.new_api._field_ids_for('authors', book_id)
             adata = self.new_api._author_data(authors)
             return [(aid, adata[aid]['name'], adata[aid]['sort'], adata[aid]['link']) for aid in authors]
@@ -379,7 +379,7 @@ class LibraryDatabase(object):
             self.notify('metadata', list(changed_books))
 
     def book_on_device(self, book_id):
-        with self.new_api.read_lock:
+        with self.new_api.safe_read_lock:
             return self.new_api.fields['ondevice'].book_on_device(book_id)
 
     def book_on_device_string(self, book_id):
@@ -393,7 +393,7 @@ class LibraryDatabase(object):
         return self.new_api.fields['ondevice'].book_on_device_func
 
     def books_in_series(self, series_id):
-        with self.new_api.read_lock:
+        with self.new_api.safe_read_lock:
             book_ids = self.new_api._books_for_field('series', series_id)
             ff = self.new_api._field_for
             return sorted(book_ids, key=lambda x:ff('series_index', x))
diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index cc006f65f5..7d9bd21712 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -213,16 +213,15 @@ class RWLockWrapper(object):
         self._shlock = shlock
         self._is_shared = is_shared
 
-    def __enter__(self):
+    def acquire(self):
         self._shlock.acquire(shared=self._is_shared)
-        return self
 
-    def __exit__(self, *args):
-        self.release()
-
-    def release(self):
+    def release(self, *args):
         self._shlock.release()
 
+    __enter__ = acquire
+    __exit__ = release
+
     def owns_lock(self):
         return self._shlock.owns_lock()
 
@@ -231,11 +230,11 @@ class DebugRWLockWrapper(RWLockWrapper):
     def __init__(self, *args, **kwargs):
         RWLockWrapper.__init__(self, *args, **kwargs)
 
-    def __enter__(self):
+    def acquire(self):
         print ('#' * 120, file=sys.stderr)
         print ('acquire called: thread id:', current_thread(), 'shared:', self._is_shared, file=sys.stderr)
         traceback.print_stack()
-        RWLockWrapper.__enter__(self)
+        RWLockWrapper.acquire(self)
         print ('acquire done: thread id:', current_thread(), file=sys.stderr)
         print ('_' * 120, file=sys.stderr)
 
@@ -247,4 +246,28 @@ class DebugRWLockWrapper(RWLockWrapper):
         print ('release done: thread id:', current_thread(), 'is_shared:', self._shlock.is_shared, 'is_exclusive:', self._shlock.is_exclusive, file=sys.stderr)
         print ('_' * 120, file=sys.stderr)
 
+    __enter__ = acquire
+    __exit__ = release
 
+class SafeReadLock(object):
+
+    def __init__(self, read_lock):
+        self.read_lock = read_lock
+        self.acquired = False
+
+    def acquire(self):
+        try:
+            self.read_lock.acquire()
+        except DowngradeLockError:
+            pass
+        else:
+            self.acquired = True
+        return self
+
+    def release(self, *args):
+        if self.acquired:
+            self.read_lock.release()
+        self.acquired = False
+
+    __enter__ = acquire
+    __exit__  = release
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index 1a3d195e66..ff6b1cd1b0 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -205,7 +205,7 @@ class View(object):
 
     def get_series_sort(self, idx, index_is_id=True, default_value=''):
         book_id = idx if index_is_id else self.index_to_id(idx)
-        with self.cache.read_lock:
+        with self.cache.safe_read_lock:
             lang_map = self.cache.fields['languages'].book_value_map
             lang = lang_map.get(book_id, None) or None
             if lang:
@@ -223,7 +223,7 @@ class View(object):
 
     def get_author_data(self, idx, index_is_id=True, default_value=None):
         id_ = idx if index_is_id else self.index_to_id(idx)
-        with self.cache.read_lock:
+        with self.cache.safe_read_lock:
             ids = self.cache._field_ids_for('authors', id_)
             adata = self.cache._author_data(ids)
             ans = [':::'.join((adata[aid]['name'], adata[aid]['sort'], adata[aid]['link'])) for aid in ids if aid in adata]

From 28ca52be0b3495196b920424b797c757cdaf0f71 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 15:31:09 +0530
Subject: [PATCH 1015/1154] ...

---
 src/calibre/db/cache.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index fcb8b7c407..0313e6ffe6 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -57,7 +57,7 @@ def wrap_simple(lock, func):
                 return func(*args, **kwargs)
         except DowngradeLockError:
             # We already have an exclusive lock, no need to acquire a shared
-            # lock. See the safe_read_lock properties documentation for why
+            # lock. See the safe_read_lock properties' documentation for why
             # this is necessary.
             return func(*args, **kwargs)
     return call_func_with_lock
@@ -123,7 +123,12 @@ class Cache(object):
         search cache in the presence of composite columns. Updating the search
         cache holds an exclusive lock, but searching a composite column
         involves reading field values via ProxyMetadata which tries to get a
-        shared lock. There may be other scenarios that trigger this as well. '''
+        shared lock. There may be other scenarios that trigger this as well.
+
+        This property returns a new lock object on every access. This lock
+        object is not recursive (for performance) and must only be used in a
+        with statement as ``with cache.safe_read_lock:`` otherwise bad things
+        will happen.'''
         return SafeReadLock(self.read_lock)
 
     @write_api

From abcaae49e27b841edd358dff8cabadaca6e20464 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 15:41:29 +0530
Subject: [PATCH 1016/1154] Fix dump and restore not working on windows

---
 src/calibre/db/backend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 9d085935f0..9806ad927e 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1008,7 +1008,7 @@ class DB(object):
                 callback(_('Restoring database from SQL') + '...')
                 with closing(Connection(tmpdb)) as conn:
                     shell = Shell(db=conn, encoding='utf-8')
-                    shell.process_command('.read ' + fname)
+                    shell.process_command('.read ' + fname.replace(os.sep, '/'))
                     conn.execute('PRAGMA user_version=%d;'%uv)
 
                 self.close()

From bbac6e953d0edc052cdf57ec361dbd56a88e193e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2013 16:29:17 +0530
Subject: [PATCH 1017/1154] Tolino driver: Add an option to swap the main
 memory and card in calibre

Fixes #1240504 [Tolino Shine: Please change (again, sorry) device order](https://bugs.launchpad.net/calibre/+bug/1240504)
---
 src/calibre/devices/eb600/driver.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 12812f3b9a..67a8bb5242 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -59,10 +59,24 @@ class TOLINO(EB600):
     VENDOR_NAME      = ['DEUTSCHE']
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['_TELEKOMTOLINO']
 
+    EXTRA_CUSTOMIZATION_MESSAGE = [
+        _('Swap main and card A') +
+            ':::' +
+            _('Check this box if the device\'s main memory is being seen as card a and the card '
+              'is being seen as main memory. Some Tolino devices may need this option.'),
+    ]
+
+    EXTRA_CUSTOMIZATION_DEFAULT = [
+        True,
+    ]
+
+    OPT_SWAP_MEMORY = 0
+
     # There are apparently two versions of this device, one with swapped
     # drives and one without, see https://bugs.launchpad.net/bugs/1240504
     def linux_swap_drives(self, drives):
-        if len(drives) < 2 or not drives[0] or not drives[1]:
+        e = self.settings().extra_customization
+        if len(drives) < 2 or not drives[0] or not drives[1] or not e[self.OPT_SWAP_MEMORY]:
             return drives
         drives = list(drives)
         t = drives[0]
@@ -71,7 +85,8 @@ class TOLINO(EB600):
         return tuple(drives)
 
     def windows_sort_drives(self, drives):
-        if len(drives) < 2:
+        e = self.settings().extra_customization
+        if len(drives) < 2 or not e[self.OPT_SWAP_MEMORY]:
             return drives
         main = drives.get('main', None)
         carda = drives.get('carda', None)

From 4e46d4a9b3893b93dd6b22e339d2ca1eaf37310a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 09:56:00 +0530
Subject: [PATCH 1018/1154] Fix bug in handling change of filename but not
 foldername

Fix a bug triggered in very special circumstances (primarily on windows)
that could cause duplicate files entries (hard links) to be created for
a books' files when changing the title and author. The bug was triggered
only if the title or author were between 32 and 35 characters in length
and the book entry had originally been created by a pre 1.x version of
calibre.
---
 src/calibre/db/backend.py          | 32 +++++++++++++++++++++---------
 src/calibre/db/tests/filesystem.py | 14 +++++++++++++
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 9806ad927e..03187036f9 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1406,6 +1406,8 @@ class DB(object):
 
         source_ok = current_path and os.path.exists(spath)
         wam = WindowsAtomicFolderMove(spath) if iswindows and source_ok else None
+        format_map = {}
+        original_format_map = {}
         try:
             if not os.path.exists(tpath):
                 os.makedirs(tpath)
@@ -1416,22 +1418,34 @@ class DB(object):
                         windows_atomic_move=wam, use_hardlink=True)
                 for fmt in formats:
                     dest = os.path.join(tpath, fname+'.'+fmt.lower())
-                    self.copy_format_to(book_id, fmt, formats_field.format_fname(book_id, fmt), current_path,
+                    format_map[fmt] = dest
+                    ofmt_fname = formats_field.format_fname(book_id, fmt)
+                    original_format_map[fmt] = os.path.join(spath, ofmt_fname+'.'+fmt.lower())
+                    self.copy_format_to(book_id, fmt, ofmt_fname, current_path,
                                         dest, windows_atomic_move=wam, use_hardlink=True)
             # Update db to reflect new file locations
             for fmt in formats:
                 formats_field.table.set_fname(book_id, fmt, fname, self)
             path_field.table.set_path(book_id, path, self)
 
-            # Delete not needed directories
+            # Delete not needed files and directories
             if source_ok:
-                if os.path.exists(spath) and not samefile(spath, tpath):
-                    if wam is not None:
-                        wam.delete_originals()
-                    self.rmtree(spath)
-                    parent = os.path.dirname(spath)
-                    if len(os.listdir(parent)) == 0:
-                        self.rmtree(parent)
+                if os.path.exists(spath):
+                    if samefile(spath, tpath):
+                        # The format filenames may have changed while the folder
+                        # name remains the same
+                        for fmt, opath in original_format_map.iteritems():
+                            npath = format_map.get(fmt, None)
+                            if npath and os.path.abspath(npath.lower()) != os.path.abspath(opath.lower()) and samefile(opath, npath):
+                                # opath and npath are different hard links to the same file
+                                os.unlink(opath)
+                    else:
+                        if wam is not None:
+                            wam.delete_originals()
+                        self.rmtree(spath)
+                        parent = os.path.dirname(spath)
+                        if len(os.listdir(parent)) == 0:
+                            self.rmtree(parent)
         finally:
             if wam is not None:
                 wam.close_handles()
diff --git a/src/calibre/db/tests/filesystem.py b/src/calibre/db/tests/filesystem.py
index 5821c41433..132be6961b 100644
--- a/src/calibre/db/tests/filesystem.py
+++ b/src/calibre/db/tests/filesystem.py
@@ -76,6 +76,8 @@ class FilesystemTest(BaseTest):
         f = open(fpath, 'rb')
         with self.assertRaises(IOError):
             cache.set_field('title', {1:'Moved'})
+        with self.assertRaises(IOError):
+            cache.remove_books({1})
         f.close()
         self.assertNotEqual(cache.field_for('title', 1), 'Moved', 'Title was changed despite file lock')
 
@@ -106,3 +108,15 @@ class FilesystemTest(BaseTest):
         self.assertLessEqual(len(cache.field_for('path', 1)), cache.backend.PATH_LIMIT * 2)
         fpath = cache.format_abspath(1, cache.formats(1)[0])
         self.assertLessEqual(len(fpath), len(cache.backend.library_path) + cache.backend.PATH_LIMIT * 4)
+
+    def test_fname_change(self):
+        ' Test the changing of the filename but not the folder name '
+        cache = self.init_cache()
+        title = 'a'*30 + 'bbb'
+        cache.backend.PATH_LIMIT = 100
+        cache.set_field('title', {3:title})
+        cache.add_format(3, 'TXT', BytesIO(b'xxx'))
+        cache.backend.PATH_LIMIT = 40
+        cache.set_field('title', {3:title})
+        fpath = cache.format_abspath(3, 'TXT')
+        self.assertEqual(sorted([os.path.basename(fpath)]), sorted(os.listdir(os.path.dirname(fpath))))

From 68b5b16625aa97cf7c43eeaaf8228e9deac65cdf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 10:07:48 +0530
Subject: [PATCH 1019/1154] Refactor out the code to get windows file ids

---
 src/calibre/utils/filenames.py | 35 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index 02040fe0cc..a4aee1a9ec 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -201,32 +201,31 @@ def case_preserving_open_file(path, mode='wb', mkdir_mode=0o777):
             fpath = os.path.join(cpath, fname)
     return ans, fpath
 
-def samefile_windows(src, dst):
+def windows_get_fileid(path):
+    ''' The fileid uniquely identifies actual file contents (it is the same for
+    all hardlinks to a file). Similar to inode number on linux. '''
     import win32file
     from pywintypes import error
+    if isbytestring(path):
+        path = path.decode(filesystem_encoding)
+    try:
+        h = win32file.CreateFile(path, 0, 0, None, win32file.OPEN_EXISTING,
+                win32file.FILE_FLAG_BACKUP_SEMANTICS, 0)
+        try:
+            data = win32file.GetFileInformationByHandle(h)
+        finally:
+            win32file.CloseHandle(h)
+    except (error, EnvironmentError):
+        return None
+    return data[4], data[8], data[9]
 
+def samefile_windows(src, dst):
     samestring = (os.path.normcase(os.path.abspath(src)) ==
             os.path.normcase(os.path.abspath(dst)))
     if samestring:
         return True
 
-    handles = []
-
-    def get_fileid(x):
-        if isbytestring(x):
-            x = x.decode(filesystem_encoding)
-        try:
-            h = win32file.CreateFile(x, 0, 0, None, win32file.OPEN_EXISTING,
-                    win32file.FILE_FLAG_BACKUP_SEMANTICS, 0)
-            handles.append(h)
-            data = win32file.GetFileInformationByHandle(h)
-        except (error, EnvironmentError):
-            return None
-        return (data[4], data[8], data[9])
-
-    a, b = get_fileid(src), get_fileid(dst)
-    for h in handles:
-        win32file.CloseHandle(h)
+    a, b = windows_get_fileid(src), windows_get_fileid(dst)
     if a is None and b is None:
         return False
     return a == b

From 6946dc518129a3ead156dd216e69b2feee04eed2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 10:55:20 +0530
Subject: [PATCH 1020/1154] Windows atomic folder move: Handle multiple
 hardlinks to the same file in a folder

---
 src/calibre/db/tests/filesystem.py | 19 +++++++++++++++++++
 src/calibre/utils/filenames.py     | 30 ++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/filesystem.py b/src/calibre/db/tests/filesystem.py
index 132be6961b..5b84d89496 100644
--- a/src/calibre/db/tests/filesystem.py
+++ b/src/calibre/db/tests/filesystem.py
@@ -81,6 +81,25 @@ class FilesystemTest(BaseTest):
         f.close()
         self.assertNotEqual(cache.field_for('title', 1), 'Moved', 'Title was changed despite file lock')
 
+        # Test on folder with hardlinks
+        from calibre.ptempfile import TemporaryDirectory
+        from calibre.utils.filenames import hardlink_file, WindowsAtomicFolderMove
+        raw = b'xxx'
+        with TemporaryDirectory() as tdir1, TemporaryDirectory() as tdir2:
+            a, b = os.path.join(tdir1, 'a'), os.path.join(tdir1, 'b')
+            a = os.path.join(tdir1, 'a')
+            with open(a, 'wb') as f:
+                f.write(raw)
+            hardlink_file(a, b)
+            wam = WindowsAtomicFolderMove(tdir1)
+            wam.copy_path_to(a, os.path.join(tdir2, 'a'))
+            wam.copy_path_to(b, os.path.join(tdir2, 'b'))
+            wam.delete_originals()
+            self.assertEqual([], os.listdir(tdir1))
+            self.assertEqual({'a', 'b'}, set(os.listdir(tdir2)))
+            self.assertEqual(raw, open(os.path.join(tdir2, 'a'), 'rb').read())
+            self.assertEqual(raw, open(os.path.join(tdir2, 'b'), 'rb').read())
+
     def test_library_move(self):
         ' Test moving of library '
         from calibre.ptempfile import TemporaryDirectory
diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index a4aee1a9ec..e998a11c7f 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -318,6 +318,7 @@ class WindowsAtomicFolderMove(object):
 
         import win32file, winerror
         from pywintypes import error
+        from collections import defaultdict
 
         if isbytestring(path):
             path = path.decode(filesystem_encoding)
@@ -325,7 +326,13 @@ class WindowsAtomicFolderMove(object):
         if not os.path.exists(path):
             return
 
-        for x in os.listdir(path):
+        names = os.listdir(path)
+        name_to_fileid = {x:windows_get_fileid(os.path.join(path, x)) for x in names}
+        fileid_to_names = defaultdict(set)
+        for name, fileid in name_to_fileid.iteritems():
+            fileid_to_names[fileid].add(name)
+
+        for x in names:
             f = os.path.normcase(os.path.abspath(os.path.join(path, x)))
             if not os.path.isfile(f):
                 continue
@@ -340,6 +347,20 @@ class WindowsAtomicFolderMove(object):
                         win32file.FILE_SHARE_DELETE, None,
                         win32file.OPEN_EXISTING, win32file.FILE_FLAG_SEQUENTIAL_SCAN, 0)
             except error as e:
+                if getattr(e, 'winerror', 0) == winerror.ERROR_SHARING_VIOLATION:
+                    # The file could be a hardlink to an already opened file,
+                    # in which case we use the same handle for both files
+                    fileid = name_to_fileid[x]
+                    found = False
+                    for other in fileid_to_names[fileid]:
+                        other = os.path.normcase(os.path.abspath(os.path.join(path, other)))
+                        if other in self.handle_map:
+                            self.handle_map[f] = self.handle_map[other]
+                            found = True
+                            break
+                    if found:
+                        continue
+
                 self.close_handles()
                 if getattr(e, 'winerror', 0) == winerror.ERROR_SHARING_VIOLATION:
                     err = IOError(errno.EACCES,
@@ -370,6 +391,8 @@ class WindowsAtomicFolderMove(object):
             return
         except:
             pass
+
+        win32file.SetFilePointer(handle, 0, win32file.FILE_BEGIN)
         with lopen(dest, 'wb') as f:
             while True:
                 hr, raw = win32file.ReadFile(handle, 1024*1024)
@@ -380,6 +403,7 @@ class WindowsAtomicFolderMove(object):
                 f.write(raw)
 
     def release_file(self, path):
+        ' Release the lock on the file pointed to by path. Will also release the lock on any hardlinks to path '
         key = None
         for p, h in self.handle_map.iteritems():
             if samefile_windows(path, p):
@@ -388,7 +412,9 @@ class WindowsAtomicFolderMove(object):
         if key is not None:
             import win32file
             win32file.CloseHandle(key[1])
-            self.handle_map.pop(key[0])
+            remove = [f for f, h in self.handle_map.iteritems() if h is key[1]]
+            for x in remove:
+                self.handle_map.pop(x)
 
     def close_handles(self):
         import win32file

From 17f951e98a4827a5807df21ceb345ce5122e466f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 11:12:00 +0530
Subject: [PATCH 1021/1154] version 1.7

---
 Changelog.yaml           | 67 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 881e58457c..9a4cfaa8c6 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,73 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.7.0
+  date: 2013-10-18
+
+  new features:
+    - title: "Cover grid: Allow using images as the background for the cover grid. To choose an image, go to Preferences->Look & Feel->Cover Grid."
+      tickets: [1239194]
+
+    - title: "An option to mark newly added books with a temporary mark. Option is in Preferences->Adding books."
+      tickets: [1238609]
+ 
+    - title: "Edit metadata dialog: Allow turning off the cover size displayed in the bottom right corner of the cover by right clicking the cover and choosing 'Hide cover size'. It can be restored the same way."
+
+  bug fixes:
+    - title: "Conversion: If both embed font family and the filter css option to remove fonts are set, do not remove the font specified by the embed font family option."
+
+    - title: "Fix a few remaining situations that could cause formats column to show an error message about SHLock"
+
+    - title: "Make deleting books to recycle bin more robust. Ensure that the temporary directory created during the move to recycle bin process is not left behind in case of errors."
+
+    - title: "Windows: Check if the books' files are in use before deleting"
+
+    - title: "Fix custom device driver swap main and card option not working. Also fix swapping not happening for a few devices on linux"
+      tickets: [1240504]
+
+    - title: "Edit metadata dialog: The Edit metadata dialog currently limits its max size based on the geometry of the smallest attached screen. Change that to use the geometry of the screen on which it will be shown."
+      tickets: [1239597]
+
+    - title: "HTMLZ Output: Fix <style> tag placed inside <body> instead of <head>."
+      tickets: [1239530]
+
+    - title: "HTMLZ Output: Fix inline styles not escaping quotes properly."
+      tickets: [1239527]
+
+    - title: "HTMLZ Output: Fix incorrect handling of some self closing tags like <br>."
+      tickets: [1239555] 
+
+    - title: "Content server: Fix single item categories not working with reverse proxy setup."
+      tickets: [1238987]
+
+    - title: "Fix a bug that could cause calibre to crash when switching from a large library to a smaller library with marked books."
+      tickets: [1239210]
+
+    - title: "Get Books: Fix downloading of some books in formats that do not have metadata yielding nonsense titles"
+
+    - title: "Allow marked book button to be added to main toolbar when device is connected"
+      tickets: [1239163]
+
+    - title: "Fix error if a marked book is deleted/merged."
+      tickets: [1239161]
+
+    - title: "Template language: Fix formatter function days_between to compute the right value when the answer is negative."
+
+    - title: "Windows: Fix spurious file in use by other process error if the book's folder contained multiple hardlinks pointing to the same file"
+      tickets: [1240788, 1240194]
+
+    - title: "Windows: Fix duplicate files being created in very special circumstances when changing title and/or author. (the title or author had to be between 31 and 35 characters lng and the book entry had to have been created by a pre 1.x version of calibre)."
+
+  improved recipes:
+    - Wall Street Journal
+    - Newsweek Polska
+    - Wired Magazine
+    - cracked.com
+    - Television Without Pity
+    - Carta
+    - Diagonales
+
+
 - version: 1.6.0
   date: 2013-10-11
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index d1762209bd..807bf5d74c 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 6, 0)
+numeric_version = (1, 7, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 1de7cdedc07e55f248f1bb0100ee5d3515ac6402 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 11:18:53 +0530
Subject: [PATCH 1022/1154] ...

---
 Changelog.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 9a4cfaa8c6..0d29ea91a2 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -72,10 +72,10 @@
 
     - title: "Template language: Fix formatter function days_between to compute the right value when the answer is negative."
 
-    - title: "Windows: Fix spurious file in use by other process error if the book's folder contained multiple hardlinks pointing to the same file"
+    - title: "Windows: Fix spurious file in use by other process error if the book's folder contained multiple hard links pointing to the same file"
       tickets: [1240788, 1240194]
 
-    - title: "Windows: Fix duplicate files being created in very special circumstances when changing title and/or author. (the title or author had to be between 31 and 35 characters lng and the book entry had to have been created by a pre 1.x version of calibre)."
+    - title: "Windows: Fix duplicate files being created in very special circumstances when changing title and/or author. (the title or author had to be between 31 and 35 characters long and the book entry had to have been created by a pre 1.x version of calibre). You can check if your library has any such duplicates and remove them, by using the Check Library tool (Right click the calibre button on the toolbar and select Library Maintenance->Check Library)."
 
   improved recipes:
     - Wall Street Journal

From bc85b0948e7223676261dba0e50811e743495a9a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 11:46:03 +0530
Subject: [PATCH 1023/1154] ...

---
 src/calibre/utils/filenames.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index e998a11c7f..4bf1cffee3 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -352,12 +352,13 @@ class WindowsAtomicFolderMove(object):
                     # in which case we use the same handle for both files
                     fileid = name_to_fileid[x]
                     found = False
-                    for other in fileid_to_names[fileid]:
-                        other = os.path.normcase(os.path.abspath(os.path.join(path, other)))
-                        if other in self.handle_map:
-                            self.handle_map[f] = self.handle_map[other]
-                            found = True
-                            break
+                    if fileid is not None:
+                        for other in fileid_to_names[fileid]:
+                            other = os.path.normcase(os.path.abspath(os.path.join(path, other)))
+                            if other in self.handle_map:
+                                self.handle_map[f] = self.handle_map[other]
+                                found = True
+                                break
                     if found:
                         continue
 

From cb617f76be32682a7e282c400ab7804f639f90a4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 11:47:27 +0530
Subject: [PATCH 1024/1154] ...

---
 src/calibre/gui2/tweak_book/ui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index 66ffd5ce54..d54f55ed8e 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -41,7 +41,7 @@ class Main(MainWindow):
         self.status_bar = self.statusBar()
         self.l = QLabel('Placeholder')
         self.status_bar.addPermanentWidget(self.boss.save_manager.status_widget)
-        self.status_bar.addWidget(QLabel(_('%s %s created by %s') % (__appname__, get_version(), 'Kovid Goyal')))
+        self.status_bar.addWidget(QLabel(_('{0} {1} created by {2}').format(__appname__, get_version(), 'Kovid Goyal')))
         f = self.status_bar.font()
         f.setBold(True)
         self.status_bar.setFont(f)

From 4e086bb3d6e4a3b020e0393abf4b896b93b2957f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 15:26:27 +0530
Subject: [PATCH 1025/1154] Ensure installers have correct permissions

---
 setup/upload.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup/upload.py b/setup/upload.py
index 5d1936c739..e1a7fbbbc5 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -138,6 +138,8 @@ class UploadInstallers(Command):  # {{{
         available = set(glob.glob('dist/*'))
         files = {x:installer_description(x) for x in
                 all_possible.intersection(available)}
+        for x in files:
+            os.chmod(x, stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH)
         sizes = {os.path.basename(x):os.path.getsize(x) for x in files}
         self.record_sizes(sizes)
         tdir = mkdtemp()

From 4c89fcbe74c562d225c6890b30b76781ca8c26ad Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 16:42:03 +0530
Subject: [PATCH 1026/1154] Update push for new windows VM

---
 setup/installer/__init__.py       | 22 ++++++++++++----------
 setup/installer/windows/notes.rst |  3 ++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/setup/installer/__init__.py b/setup/installer/__init__.py
index e31e018f43..60946935e3 100644
--- a/setup/installer/__init__.py
+++ b/setup/installer/__init__.py
@@ -6,7 +6,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import subprocess, tempfile, os, time, socket
+import subprocess, tempfile, os, time
 
 from setup import Command, installer_name
 from setup.build_environment import HOST, PROJECT
@@ -57,23 +57,25 @@ class Push(Command):
 
     def run(self, opts):
         from threading import Thread
-        threads = []
+        threads = {}
         for host, vmname in {
                 r'Owner@winxp:/cygdrive/c/Documents\ and\ Settings/Owner/calibre':'winxp',
                 'kovid@ox:calibre':None,
                 r'kovid@win7:/cygdrive/c/Users/kovid/calibre':'Windows 7',
-                'kovid@getafix:calibre-src':None,
+                'kovid@win7-64:calibre-src':None,
                 }.iteritems():
-            if '@getafix:' in host and socket.gethostname() == 'getafix':
-                continue
             if vmname is None or is_vm_running(vmname):
                 rcmd = BASE_RSYNC + EXCLUDES + ['.', host]
                 print '\n\nPushing to:', vmname or host, '\n'
-                threads.append(Thread(target=subprocess.check_call, args=(rcmd,),
-                    kwargs={'stdout':open(os.devnull, 'wb')}))
-                threads[-1].start()
-        for thread in threads:
-            thread.join()
+                threads[vmname or host] = thread = Thread(target=subprocess.check_call, args=(rcmd,),
+                    kwargs={'stdout':open(os.devnull, 'wb')})
+                thread.start()
+        while threads:
+            for name, thread in tuple(threads.iteritems()):
+                thread.join(0.01)
+                if not thread.is_alive():
+                    print '\n\n', name, 'done'
+                    threads.pop(name)
 
 
 class VMInstaller(Command):
diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst
index 297279a8b2..b58c564f84 100644
--- a/setup/installer/windows/notes.rst
+++ b/setup/installer/windows/notes.rst
@@ -69,7 +69,8 @@ to login as the normal user account with ssh. To do this, follow these steps:
         rm -R /etc/ssh*
         mkpasswd -cl > /etc/passwd
         mkgroup --local > /etc/group
-    * Assign the necessary rights to the normal user account::
+    * Assign the necessary rights to the normal user account (administrator
+      command prompt needed)::
         editrights.exe -a SeAssignPrimaryTokenPrivilege -u kovid
         editrights.exe -a SeCreateTokenPrivilege -u kovid
         editrights.exe -a SeTcbPrivilege -u kovid

From 9854cef7b66a05cf4ff5abc255b2650b3e8f3e9f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 18:06:33 +0530
Subject: [PATCH 1027/1154] Fix lock debugging broken in 1.7

---
 src/calibre/db/locking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index 7d9bd21712..706f3cb931 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -238,7 +238,7 @@ class DebugRWLockWrapper(RWLockWrapper):
         print ('acquire done: thread id:', current_thread(), file=sys.stderr)
         print ('_' * 120, file=sys.stderr)
 
-    def release(self):
+    def release(self, *args):
         print ('*' * 120, file=sys.stderr)
         print ('release called: thread id:', current_thread(), 'shared:', self._is_shared, file=sys.stderr)
         traceback.print_stack()

From ef20239be6263777498d6bd812cfd9dff6682c13 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 22:12:49 +0530
Subject: [PATCH 1028/1154] Prevent key presses from acting during a long job

---
 src/calibre/gui2/tweak_book/job.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/job.py b/src/calibre/gui2/tweak_book/job.py
index 9024f67857..da8952c1de 100644
--- a/src/calibre/gui2/tweak_book/job.py
+++ b/src/calibre/gui2/tweak_book/job.py
@@ -10,7 +10,7 @@ import time
 from threading import Thread
 from functools import partial
 
-from PyQt4.Qt import (QWidget, QVBoxLayout, QLabel, Qt, QPainter, QBrush, QColor)
+from PyQt4.Qt import (QWidget, QVBoxLayout, QLabel, Qt, QPainter, QBrush, QColor, QAction)
 
 from calibre.gui2 import Dispatcher
 from calibre.gui2.progress_indicator import ProgressIndicator
@@ -59,12 +59,17 @@ class BlockingJob(QWidget):
     def start(self):
         self.setGeometry(0, 0, self.parent().width(), self.parent().height())
         self.setVisible(True)
+        # Prevent any actions from being triggerred by key presses
+        for child in self.parent().findChildren(QAction):
+            child.blockSignals(True)
         self.raise_()
         self.pi.startAnimation()
 
     def stop(self):
         self.pi.stopAnimation()
         self.setVisible(False)
+        for child in self.parent().findChildren(QAction):
+            child.blockSignals(False)
 
     def job_done(self, callback, job):
         del job.callback
@@ -77,8 +82,17 @@ class BlockingJob(QWidget):
         p.end()
         QWidget.paintEvent(self, ev)
 
+    def eventFilter(self, obj, ev):
+        if ev.type() in (ev.KeyPress, ev.KeyRelease):
+            return True
+        return QWidget.eventFilter(self, obj, ev)
+
+    def set_msg(self, text):
+        self.msg.setText('<h2>%s</h2>' % text)
+
     def __call__(self, name, user_text, callback, function, *args, **kwargs):
-        self.msg.setText('<h2>%s</h2>' % user_text)
+        ' Run a job that blocks the GUI providing some feedback to the user '
+        self.set_msg(user_text)
         job = LongJob(name, user_text, Dispatcher(partial(self.job_done, callback)), function, *args, **kwargs)
         job.start()
         self.start()

From 3b146a9b5ef9370a26a025dc2e24786bb4e0019c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 22:13:08 +0530
Subject: [PATCH 1029/1154] Nicer dialog when quitting with unsaved changes

---
 src/calibre/gui2/tweak_book/boss.py | 52 ++++++++++++++++++++++++++---
 src/calibre/gui2/tweak_book/ui.py   |  1 +
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 053cea151e..024b2d2b82 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -8,7 +8,9 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import tempfile, shutil
 
-from PyQt4.Qt import QObject, QApplication
+from PyQt4.Qt import (
+    QObject, QApplication, QDialog, QGridLayout, QLabel, QSize, Qt,
+    QDialogButtonBox, QIcon, QTimer, QPixmap)
 
 from calibre.gui2 import error_dialog, choose_files, question_dialog, info_dialog
 from calibre.ptempfile import PersistentTemporaryDirectory
@@ -27,6 +29,7 @@ class Boss(QObject):
         self.tdir = None
         self.save_manager = SaveManager(parent)
         self.save_manager.report_error.connect(self.report_save_error)
+        self.doing_terminal_save = False
 
     def __call__(self, gui):
         self.gui = gui
@@ -144,21 +147,60 @@ class Boss(QObject):
         QApplication.instance().quit()
 
     def confirm_quit(self):
+        if self.doing_terminal_save:
+            return False
         if self.save_manager.has_tasks:
             if not question_dialog(
                 self.gui, _('Are you sure?'), _(
                     'The current book is being saved in the background, quitting will abort'
                     ' the save process, are you sure?'), default_yes=False):
                 return False
+
         if self.gui.action_save.isEnabled():
-            if not question_dialog(
-                self.gui, _('Are you sure?'), _(
-                    'The current book has unsaved changes, you will lose them if you quit,'
-                    ' are you sure?'), default_yes=False):
+            d = QDialog(self.gui)
+            d.l = QGridLayout(d)
+            d.setLayout(d.l)
+            d.setWindowTitle(_('Unsaved changes'))
+            d.i = QLabel('')
+            d.i.setPixmap(QPixmap(I('save.png')).scaledToHeight(64, Qt.SmoothTransformation))
+            d.i.setMaximumSize(QSize(d.i.pixmap().width(), 64))
+            d.i.setScaledContents(True)
+            d.l.addWidget(d.i, 0, 0)
+            d.m = QLabel(_('There are unsaved changes, if you quit without saving, you will lose them.'))
+            d.m.setWordWrap(True)
+            d.l.addWidget(d.m, 0, 1)
+            d.bb = QDialogButtonBox(QDialogButtonBox.Cancel)
+            d.bb.rejected.connect(d.reject)
+            d.bb.accepted.connect(d.accept)
+            d.l.addWidget(d.bb, 1, 0, 1, 2)
+            d.do_save = None
+            def endit(x):
+                d.do_save = x
+                d.accept()
+            b = d.bb.addButton(_('&Save and Quit'), QDialogButtonBox.ActionRole)
+            b.setIcon(QIcon(I('save.png')))
+            b.clicked.connect(lambda *args: endit(True))
+            b = d.bb.addButton(_('&Quit without saving'), QDialogButtonBox.ActionRole)
+            b.clicked.connect(lambda *args: endit(False))
+            d.resize(d.sizeHint())
+            if d.exec_() != d.Accepted or d.do_save is None:
+                return False
+            if d.do_save:
+                self.gui.action_save.trigger()
+                self.gui.blocking_job.set_msg(_('Saving, please wait...'))
+                self.gui.blocking_job.start()
+                self.doing_terminal_save = True
+                QTimer.singleShot(50, self.check_terminal_save)
                 return False
 
         return True
 
+    def check_terminal_save(self):
+        if self.save_manager.has_tasks:
+            return QTimer.singleShot(50, self.check_terminal_save)
+        self.shutdown()
+        QApplication.instance().quit()
+
     def shutdown(self):
         self.save_state()
         self.save_manager.shutdown()
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index d54f55ed8e..2714120d7b 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -59,6 +59,7 @@ class Main(MainWindow):
 
         def reg(icon, text, target, sid, keys, description):
             ac = QAction(QIcon(I(icon)), text, self)
+            ac.setObjectName('action-' + sid)
             ac.triggered.connect(target)
             if isinstance(keys, type('')):
                 keys = (keys,)

From 3212e5f2a2a62aab3c56c77c8d0d6c8185f869cc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 22:16:03 +0530
Subject: [PATCH 1030/1154] Also disable menubar during long jobs

---
 src/calibre/gui2/tweak_book/job.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/gui2/tweak_book/job.py b/src/calibre/gui2/tweak_book/job.py
index da8952c1de..71379a9cad 100644
--- a/src/calibre/gui2/tweak_book/job.py
+++ b/src/calibre/gui2/tweak_book/job.py
@@ -62,7 +62,9 @@ class BlockingJob(QWidget):
         # Prevent any actions from being triggerred by key presses
         for child in self.parent().findChildren(QAction):
             child.blockSignals(True)
+        self.parent().menuBar().setEnabled(False)
         self.raise_()
+        self.setFocus(Qt.OtherFocusReason)
         self.pi.startAnimation()
 
     def stop(self):
@@ -70,6 +72,7 @@ class BlockingJob(QWidget):
         self.setVisible(False)
         for child in self.parent().findChildren(QAction):
             child.blockSignals(False)
+        self.parent().menuBar().setEnabled(True)
 
     def job_done(self, callback, job):
         del job.callback

From b3ce489f49f14c196b50972aa2179d7ce73f3c6d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Oct 2013 22:48:45 +0530
Subject: [PATCH 1031/1154] Just disable the entire parent widget

Paint the busy message manually so that it does not look disabled
---
 src/calibre/gui2/tweak_book/job.py | 31 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/job.py b/src/calibre/gui2/tweak_book/job.py
index 71379a9cad..4dd2a6946d 100644
--- a/src/calibre/gui2/tweak_book/job.py
+++ b/src/calibre/gui2/tweak_book/job.py
@@ -10,7 +10,7 @@ import time
 from threading import Thread
 from functools import partial
 
-from PyQt4.Qt import (QWidget, QVBoxLayout, QLabel, Qt, QPainter, QBrush, QColor, QAction)
+from PyQt4.Qt import (QWidget, QVBoxLayout, QLabel, Qt, QPainter, QBrush, QRect)
 
 from calibre.gui2 import Dispatcher
 from calibre.gui2.progress_indicator import ProgressIndicator
@@ -50,19 +50,18 @@ class BlockingJob(QWidget):
         l.addStretch(10)
         self.pi = ProgressIndicator(self, 128)
         l.addWidget(self.pi, alignment=Qt.AlignHCenter)
-        self.msg = QLabel('')
+        self.dummy = QLabel('<h2>\xa0')
         l.addSpacing(10)
-        l.addWidget(self.msg, alignment=Qt.AlignHCenter)
+        l.addWidget(self.dummy, alignment=Qt.AlignHCenter)
         l.addStretch(10)
         self.setVisible(False)
+        self.text = ''
 
     def start(self):
         self.setGeometry(0, 0, self.parent().width(), self.parent().height())
         self.setVisible(True)
         # Prevent any actions from being triggerred by key presses
-        for child in self.parent().findChildren(QAction):
-            child.blockSignals(True)
-        self.parent().menuBar().setEnabled(False)
+        self.parent().setEnabled(False)
         self.raise_()
         self.setFocus(Qt.OtherFocusReason)
         self.pi.startAnimation()
@@ -70,9 +69,7 @@ class BlockingJob(QWidget):
     def stop(self):
         self.pi.stopAnimation()
         self.setVisible(False)
-        for child in self.parent().findChildren(QAction):
-            child.blockSignals(False)
-        self.parent().menuBar().setEnabled(True)
+        self.parent().setEnabled(True)
 
     def job_done(self, callback, job):
         del job.callback
@@ -80,10 +77,22 @@ class BlockingJob(QWidget):
         callback(job)
 
     def paintEvent(self, ev):
+        br = ev.region().boundingRect()
         p = QPainter(self)
-        p.fillRect(ev.region().boundingRect(), QBrush(QColor(200, 200, 200, 160), Qt.SolidPattern))
+        p.setOpacity(0.2)
+        p.fillRect(br, QBrush(self.palette().text()))
         p.end()
         QWidget.paintEvent(self, ev)
+        p = QPainter(self)
+        p.setClipRect(br)
+        f = p.font()
+        f.setBold(True)
+        f.setPointSize(20)
+        p.setFont(f)
+        p.setPen(Qt.SolidLine)
+        r = QRect(0, self.dummy.geometry().top() + 10, self.geometry().width(), 150)
+        p.drawText(r, Qt.AlignHCenter | Qt.AlignTop | Qt.TextSingleLine, self.text)
+        p.end()
 
     def eventFilter(self, obj, ev):
         if ev.type() in (ev.KeyPress, ev.KeyRelease):
@@ -91,7 +100,7 @@ class BlockingJob(QWidget):
         return QWidget.eventFilter(self, obj, ev)
 
     def set_msg(self, text):
-        self.msg.setText('<h2>%s</h2>' % text)
+        self.text = text
 
     def __call__(self, name, user_text, callback, function, *args, **kwargs):
         ' Run a job that blocks the GUI providing some feedback to the user '

From 9f011a37a79fe0ff3cb1fc78f7876fad34215fd4 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Fri, 18 Oct 2013 15:54:32 -0600
Subject: [PATCH 1032/1154] Fix for lp:1241515, allow unicode catalog titles
 when saving presets.

---
 src/calibre/gui2/catalog/catalog_epub_mobi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py
index 3f938d523e..53d1b266f1 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.py
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py
@@ -287,7 +287,7 @@ class PluginWidget(QWidget,Ui_Form):
                     if child.objectName() == 'format':
                         current_format = str(child.currentText()).strip()
                     elif child.objectName() == 'title':
-                        current_title = str(child.text()).strip()
+                        current_title = unicode(child.text()).strip()
         self.parentWidget().blockSignals(False)
         return current_format, current_title
 

From 66263fdef12b2ced7c28354931736e0c8edaf760 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Oct 2013 08:49:11 +0530
Subject: [PATCH 1033/1154] ODT Input: Handle ODT files that have custom DTDs
 in their meta.xml

---
 src/calibre/ebooks/metadata/odt.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/odt.py b/src/calibre/ebooks/metadata/odt.py
index 7ce907311c..0c8c1105a7 100644
--- a/src/calibre/ebooks/metadata/odt.py
+++ b/src/calibre/ebooks/metadata/odt.py
@@ -159,7 +159,8 @@ def get_metadata(stream, extract_cover=True):
     zin = zipfile.ZipFile(stream, 'r')
     odfs = odfmetaparser()
     parser = xml.sax.make_parser()
-    parser.setFeature(xml.sax.handler.feature_namespaces, 1)
+    parser.setFeature(xml.sax.handler.feature_namespaces, True)
+    parser.setFeature(xml.sax.handler.feature_external_ges, False)
     parser.setContentHandler(odfs)
     content = zin.read('meta.xml')
     parser.parse(StringIO(content))

From 874367cef09c6c134354ad32f92204b3b66f2b81 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Oct 2013 09:19:08 +0530
Subject: [PATCH 1034/1154] ODT Input: Handle malformed ODT files with no
 mimetype declaration

---
 src/odf/opendocument.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/odf/opendocument.py b/src/odf/opendocument.py
index 69ada218aa..0b59b271a4 100644
--- a/src/odf/opendocument.py
+++ b/src/odf/opendocument.py
@@ -607,7 +607,10 @@ def load(odffile):
         Returns a reference to the structure
     """
     z = zipfile.ZipFile(odffile)
-    mimetype = z.read('mimetype')
+    try:
+        mimetype = z.read('mimetype')
+    except KeyError:  # Added by Kovid to handle malformed odt files
+        mimetype = 'application/vnd.oasis.opendocument.text'
     doc = OpenDocument(mimetype, add_generator=False)
 
     # Look in the manifest file to see if which of the four files there are

From b4f15bb8ca149e888f39c4ba1e949ebd9496b50d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Oct 2013 09:46:47 +0530
Subject: [PATCH 1035/1154] Ignore save error when saving during quit

---
 src/calibre/gui2/tweak_book/boss.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 024b2d2b82..0dda3b59d1 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -6,12 +6,13 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import tempfile, shutil
+import tempfile, shutil, sys
 
 from PyQt4.Qt import (
     QObject, QApplication, QDialog, QGridLayout, QLabel, QSize, Qt,
     QDialogButtonBox, QIcon, QTimer, QPixmap)
 
+from calibre import prints
 from calibre.gui2 import error_dialog, choose_files, question_dialog, info_dialog
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.ebooks.oeb.polish.main import SUPPORTED
@@ -136,6 +137,9 @@ class Boss(QObject):
         self.save_manager.schedule(tdir, container)
 
     def report_save_error(self, tb):
+        if self.doing_terminal_save:
+            prints(tb, file=sys.stderr)
+            return
         error_dialog(self.gui, _('Could not save'),
                      _('Saving of the book failed. Click "Show Details"'
                        ' for more information.'), det_msg=tb, show=True)

From 26c1fd06899892dac6a120064a2c5bdcf4f682b3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Oct 2013 10:22:12 +0530
Subject: [PATCH 1036/1154] More fixes for broken ODT files generated by mk4ht

---
 src/calibre/ebooks/odt/input.py | 2 +-
 src/odf/odfmanifest.py          | 7 ++++---
 src/odf/opendocument.py         | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/odt/input.py b/src/calibre/ebooks/odt/input.py
index cda01cae60..b66f766e6d 100644
--- a/src/calibre/ebooks/odt/input.py
+++ b/src/calibre/ebooks/odt/input.py
@@ -26,7 +26,7 @@ class Extract(ODF2XHTML):
         if not os.path.exists('Pictures'):
             os.makedirs('Pictures')
         for name in zf.namelist():
-            if name.startswith('Pictures'):
+            if name.startswith('Pictures') and name not in {'Pictures', 'Pictures/'}:
                 data = zf.read(name)
                 with open(name, 'wb') as f:
                     f.write(data)
diff --git a/src/odf/odfmanifest.py b/src/odf/odfmanifest.py
index 07754fd2f3..a8f1655e88 100644
--- a/src/odf/odfmanifest.py
+++ b/src/odf/odfmanifest.py
@@ -1,17 +1,17 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (C) 2006-2007 Søren Roug, European Environment Agency
-# 
+#
 # 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 Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -97,6 +97,7 @@ def manifestlist(manifestxml):
 
     inpsrc = InputSource()
     inpsrc.setByteStream(StringIO(manifestxml))
+    parser.setFeature(handler.feature_external_ges, False)  # Changed by Kovid to ignore external DTDs
     parser.parse(inpsrc)
 
     return odhandler.manifest
diff --git a/src/odf/opendocument.py b/src/odf/opendocument.py
index 0b59b271a4..8890c2a21d 100644
--- a/src/odf/opendocument.py
+++ b/src/odf/opendocument.py
@@ -598,6 +598,7 @@ def __loadxmlparts(z, manifest, doc, objectpath):
 
             inpsrc = InputSource()
             inpsrc.setByteStream(StringIO(xmlpart))
+            parser.setFeature(handler.feature_external_ges, False)  # Changed by Kovid to ignore external DTDs
             parser.parse(inpsrc)
             del doc._parsing
         except KeyError, v: pass

From 7f2a1f99daf02d61d17f10dc8efc1622c799b85d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Oct 2013 11:15:30 +0530
Subject: [PATCH 1037/1154] Drag 'n drop re-ordering of spine items

---
 src/calibre/ebooks/oeb/polish/container.py | 22 ++++++++++++++++++++++
 src/calibre/gui2/tweak_book/boss.py        | 11 +++++++++++
 src/calibre/gui2/tweak_book/file_list.py   | 18 ++++++++++++++++--
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index b8362b73c9..72814f4564 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -355,6 +355,28 @@ class Container(object):  # {{{
             for name in nixed:
                 self.remove_item(name)
 
+    def set_spine(self, spine_items):
+        ''' Set the spine to be spine_items where spine_items is an iterable of
+        the form (name, linear). Will raise an error if one of the names is not
+        present in the manifest. '''
+        imap = self.manifest_id_map
+        imap = {name:item_id for item_id, name in imap.iteritems()}
+        items = [item for item, name, linear in self.spine_iter]
+        tail, last_tail = (items[0].tail, items[-1].tail) if items else ('\n    ', '\n  ')
+        map(self.remove_from_xml, items)
+        spine = self.opf_xpath('//opf:spine')[0]
+        spine.text = tail
+        for name, linear in spine_items:
+            i = spine.makeelement('{%s}itemref' % OPF_NAMESPACES['opf'], nsmap={'opf':OPF_NAMESPACES['opf']})
+            i.tail = tail
+            i.set('idref', imap[name])
+            spine.append(i)
+            if not linear:
+                i.set('linear', 'no')
+        if len(spine) > 0:
+            spine[-1].tail = last_tail
+        self.dirty(self.opf_name)
+
     def remove_item(self, name):
         '''
         Remove the item identified by name from this container. This removes all
diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 0dda3b59d1..87f59a8d4c 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -35,6 +35,7 @@ class Boss(QObject):
     def __call__(self, gui):
         self.gui = gui
         gui.file_list.delete_requested.connect(self.delete_requested)
+        gui.file_list.reorder_spine.connect(self.reorder_spine)
 
     def mkdtemp(self):
         self.container_count += 1
@@ -130,6 +131,16 @@ class Boss(QObject):
         self.gui.file_list.delete_done(spine_items, other_items)
         # TODO: Update other GUI elements
 
+    def reorder_spine(self, items):
+        # TODO: If content.opf is dirty in an editor, abort, calling
+        # file_list.build(current_container) to undo drag and drop
+        self.add_savepoint(_('Re-order text'))
+        c = current_container()
+        c.set_spine(items)
+        self.gui.action_save.setEnabled(True)
+        self.gui.file_list.build(current_container())  # needed as the linear flag may have changed on some items
+        # TODO: If content.opf is open in an editor, reload it
+
     def save_book(self):
         self.gui.action_save.setEnabled(False)
         tdir = tempfile.mkdtemp(prefix='save-%05d-' % self.container_count, dir=self.tdir)
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index abe0724843..66d1aff212 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -22,6 +22,7 @@ from calibre.utils.icu import sort_key
 TOP_ICON_SIZE = 24
 NAME_ROLE = Qt.UserRole
 CATEGORY_ROLE = NAME_ROLE + 1
+LINEAR_ROLE = CATEGORY_ROLE + 1
 NBSP = '\xa0'
 
 class ItemDelegate(QStyledItemDelegate):  # {{{
@@ -56,6 +57,7 @@ class ItemDelegate(QStyledItemDelegate):  # {{{
 class FileList(QTreeWidget):
 
     delete_requested = pyqtSignal(object, object)
+    reorder_spine = pyqtSignal(object)
 
     def __init__(self, parent=None):
         QTreeWidget.__init__(self, parent)
@@ -211,6 +213,7 @@ class FileList(QTreeWidget):
             item.setStatusTip(0, _('Full path: ') + name)
             item.setData(0, NAME_ROLE, name)
             item.setData(0, CATEGORY_ROLE, category)
+            item.setData(0, LINEAR_ROLE, bool(linear))
             set_display_name(name, item)
             # TODO: Add appropriate tooltips based on the emblems
             emblems = []
@@ -294,11 +297,22 @@ class FileList(QTreeWidget):
         super(FileList, self).dropEvent(event)
         current_order = {text.child(i):i for i in xrange(text.childCount())}
         if current_order != pre_drop_order:
-            pass  # TODO: Implement this
+            order = []
+            for child in (text.child(i) for i in xrange(text.childCount())):
+                name = unicode(child.data(0, NAME_ROLE).toString())
+                linear = child.data(0, LINEAR_ROLE).toBool()
+                order.append([name, linear])
+            # Ensure that all non-linear items are at the end, any non-linear
+            # items not at the end will be made linear
+            for i, (name, linear) in tuple(enumerate(order)):
+                if not linear and i < len(order) - 1 and order[i+1][1]:
+                    order[i][1] = True
+            self.reorder_spine.emit(order)
 
 class FileListWidget(QWidget):
 
     delete_requested = pyqtSignal(object, object)
+    reorder_spine = pyqtSignal(object)
 
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
@@ -306,7 +320,7 @@ class FileListWidget(QWidget):
         self.file_list = FileList(self)
         self.layout().addWidget(self.file_list)
         self.layout().setContentsMargins(0, 0, 0, 0)
-        for x in ('delete_requested',):
+        for x in ('delete_requested', 'reorder_spine'):
             getattr(self.file_list, x).connect(getattr(self, x))
         for x in ('delete_done',):
             setattr(self, x, getattr(self.file_list, x))

From e643e34688587d5ceb4d3f7b554838919f8665ca Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Oct 2013 15:04:01 +0530
Subject: [PATCH 1038/1154] UI for renaming files

---
 src/calibre/ebooks/oeb/polish/container.py | 11 ++++++++
 src/calibre/gui2/dialogs/confirm_delete.py | 12 ++++----
 src/calibre/gui2/tweak_book/boss.py        | 33 ++++++++++++++++++----
 src/calibre/gui2/tweak_book/file_list.py   | 21 +++++++++++++-
 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 72814f4564..02c4df6937 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -237,6 +237,10 @@ class Container(object):  # {{{
     def names_that_must_not_be_removed(self):
         return {self.opf_name}
 
+    @property
+    def names_that_must_not_be_changed(self):
+        return set()
+
     def parse_xml(self, data):
         data, self.used_encoding = xml_to_unicode(
             data, strip_encoding_pats=True, assume_utf8=True, resolve_entities=True)
@@ -678,6 +682,10 @@ class EpubContainer(Container):
     def names_that_must_not_be_removed(self):
         return super(EpubContainer, self).names_that_must_not_be_removed | {'META-INF/container.xml'}
 
+    @property
+    def names_that_must_not_be_changed(self):
+        return super(EpubContainer, self).names_that_must_not_be_changed | {'META-INF/' + x for x in self.META_INF}
+
     def remove_item(self, name):
         # Handle removal of obfuscated fonts
         if name == 'META-INF/encryption.xml':
@@ -870,6 +878,9 @@ class AZW3Container(Container):
     def path_to_ebook(self):
         return self.pathtoepub
 
+    @property
+    def names_that_must_not_be_changed(self):
+        return set(self.name_path_map)
 # }}}
 
 def get_container(path, log=None, tdir=None):
diff --git a/src/calibre/gui2/dialogs/confirm_delete.py b/src/calibre/gui2/dialogs/confirm_delete.py
index 664afd507b..e129bc567f 100644
--- a/src/calibre/gui2/dialogs/confirm_delete.py
+++ b/src/calibre/gui2/dialogs/confirm_delete.py
@@ -11,7 +11,7 @@ from calibre.gui2.dialogs.confirm_delete_ui import Ui_Dialog
 
 class Dialog(QDialog, Ui_Dialog):
 
-    def __init__(self, msg, name, parent):
+    def __init__(self, msg, name, parent, config_set=dynamic):
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
@@ -19,16 +19,18 @@ class Dialog(QDialog, Ui_Dialog):
         self.name = name
         self.again.stateChanged.connect(self.toggle)
         self.buttonBox.setFocus(Qt.OtherFocusReason)
+        self.config_set = config_set
 
     def toggle(self, *args):
-        dynamic[confirm_config_name(self.name)] = self.again.isChecked()
+        self.config_set[confirm_config_name(self.name)] = self.again.isChecked()
 
 
 def confirm(msg, name, parent=None, pixmap='dialog_warning.png', title=None,
-        show_cancel_button=True, confirm_msg=None):
-    if not dynamic.get(confirm_config_name(name), True):
+        show_cancel_button=True, confirm_msg=None, config_set=None):
+    config_set = config_set or dynamic
+    if not config_set.get(confirm_config_name(name), True):
         return True
-    d = Dialog(msg, name, parent)
+    d = Dialog(msg, name, parent, config_set=config_set)
     d.label.setPixmap(QPixmap(I(pixmap)))
     d.setWindowIcon(QIcon(I(pixmap)))
     if title is not None:
diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 87f59a8d4c..77bab40a7a 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -6,17 +6,19 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import tempfile, shutil, sys
+import tempfile, shutil, sys, os
 
 from PyQt4.Qt import (
     QObject, QApplication, QDialog, QGridLayout, QLabel, QSize, Qt,
     QDialogButtonBox, QIcon, QTimer, QPixmap)
 
 from calibre import prints
-from calibre.gui2 import error_dialog, choose_files, question_dialog, info_dialog
 from calibre.ptempfile import PersistentTemporaryDirectory
+from calibre.ebooks.oeb.base import urlnormalize
 from calibre.ebooks.oeb.polish.main import SUPPORTED
-from calibre.ebooks.oeb.polish.container import get_container, clone_container
+from calibre.ebooks.oeb.polish.container import get_container, clone_container, guess_type
+from calibre.gui2 import error_dialog, choose_files, question_dialog, info_dialog
+from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.tweak_book import set_current_container, current_container, tprefs
 from calibre.gui2.tweak_book.undo import GlobalUndoHistory
 from calibre.gui2.tweak_book.save import SaveManager
@@ -34,8 +36,10 @@ class Boss(QObject):
 
     def __call__(self, gui):
         self.gui = gui
-        gui.file_list.delete_requested.connect(self.delete_requested)
-        gui.file_list.reorder_spine.connect(self.reorder_spine)
+        fl = gui.file_list
+        fl.delete_requested.connect(self.delete_requested)
+        fl.reorder_spine.connect(self.reorder_spine)
+        fl.rename_requested.connect(self.rename_requested)
 
     def mkdtemp(self):
         self.container_count += 1
@@ -141,6 +145,25 @@ class Boss(QObject):
         self.gui.file_list.build(current_container())  # needed as the linear flag may have changed on some items
         # TODO: If content.opf is open in an editor, reload it
 
+    def rename_requested(self, oldname, newname):
+        if guess_type(oldname) != guess_type(newname):
+            args = os.path.splitext(oldname) + os.path.splitext(newname)
+            if not confirm(
+                _('You are changing the file type of {0}<b>{1}</b> to {2}<b>{3}</b>.'
+                  ' Doing so can cause problems, are you sure?').format(*args),
+                'confirm-filetype-change', parent=self.gui, title=_('Are you sure?'),
+                config_set=tprefs):
+                return
+        if urlnormalize(newname) != newname:
+            if not confirm(
+                _('The name you have chosen {0} contains special characters, internally'
+                  ' it will look like: {1}Try to use only the English alphabet [a-z], numbers [0-9],'
+                  ' hyphens and underscores for file names. Other characters can cause problems for '
+                  ' different ebook viewers. Are you sure you want to proceed?').format(
+                      '<pre>%s</pre>'%newname, '<pre>%s</pre>' % urlnormalize(newname)),
+                'confirm-urlunsafe-change', parent=self.gui, title=_('Are you sure?'), config_set=tprefs):
+                    return
+
     def save_book(self):
         self.gui.action_save.setEnabled(False)
         tdir = tempfile.mkdtemp(prefix='save-%05d-' % self.container_count, dir=self.tdir)
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 66d1aff212..48fffc469a 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -27,6 +27,18 @@ NBSP = '\xa0'
 
 class ItemDelegate(QStyledItemDelegate):  # {{{
 
+    rename_requested = pyqtSignal(object, object)
+
+    def setEditorData(self, editor, index):
+        name = unicode(index.data(NAME_ROLE).toString())
+        editor.setText(name)
+
+    def setModelData(self, editor, model, index):
+        newname = unicode(editor.text())
+        oldname = unicode(index.data(NAME_ROLE).toString())
+        if newname != oldname:
+            self.rename_requested.emit(oldname, newname)
+
     def sizeHint(self, option, index):
         ans = QStyledItemDelegate.sizeHint(self, option, index)
         top_level = not index.parent().isValid()
@@ -58,15 +70,18 @@ class FileList(QTreeWidget):
 
     delete_requested = pyqtSignal(object, object)
     reorder_spine = pyqtSignal(object)
+    rename_requested = pyqtSignal(object, object)
 
     def __init__(self, parent=None):
         QTreeWidget.__init__(self, parent)
         self.delegate = ItemDelegate(self)
+        self.delegate.rename_requested.connect(self.rename_requested)
         self.setTextElideMode(Qt.ElideMiddle)
         self.setItemDelegate(self.delegate)
         self.setIconSize(QSize(16, 16))
         self.header().close()
         self.setDragEnabled(True)
+        self.setEditTriggers(self.EditKeyPressed)
         self.setSelectionMode(self.ExtendedSelection)
         self.viewport().setAcceptDrops(True)
         self.setDropIndicatorShown(True)
@@ -200,6 +215,7 @@ class FileList(QTreeWidget):
             item.setData(0, Qt.DecorationRole, icon)
 
         ok_to_be_unmanifested = container.names_that_need_not_be_manifested
+        cannot_be_renamed = container.names_that_must_not_be_changed
 
         def create_item(name, linear=None):
             imt = container.mime_map.get(name, guess_type(name))
@@ -209,6 +225,8 @@ class FileList(QTreeWidget):
             flags = Qt.ItemIsEnabled | Qt.ItemIsSelectable
             if category == 'text':
                 flags |= Qt.ItemIsDragEnabled
+            if name not in cannot_be_renamed:
+                flags |= Qt.ItemIsEditable
             item.setFlags(flags)
             item.setStatusTip(0, _('Full path: ') + name)
             item.setData(0, NAME_ROLE, name)
@@ -313,6 +331,7 @@ class FileListWidget(QWidget):
 
     delete_requested = pyqtSignal(object, object)
     reorder_spine = pyqtSignal(object)
+    rename_requested = pyqtSignal(object, object)
 
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
@@ -320,7 +339,7 @@ class FileListWidget(QWidget):
         self.file_list = FileList(self)
         self.layout().addWidget(self.file_list)
         self.layout().setContentsMargins(0, 0, 0, 0)
-        for x in ('delete_requested', 'reorder_spine'):
+        for x in ('delete_requested', 'reorder_spine', 'rename_requested'):
             getattr(self.file_list, x).connect(getattr(self, x))
         for x in ('delete_done',):
             setattr(self, x, getattr(self.file_list, x))

From 21540da4f4308b3499c4458ffd39cbeb76c79ae9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 20 Oct 2013 08:35:03 +0530
Subject: [PATCH 1039/1154] Include library path in error message about path
 length

---
 src/calibre/db/backend.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 03187036f9..851b9df1d6 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -317,8 +317,8 @@ class DB(object):
 
         if iswindows and len(self.library_path) + 4*self.PATH_LIMIT + 10 > 259:
             raise ValueError(_(
-                'Path to library too long. Must be less than'
-                ' %d characters.')%(259-4*self.PATH_LIMIT-10))
+                'Path to library (%s) too long. Must be less than'
+                ' %d characters.')%(self.library_path, 259-4*self.PATH_LIMIT-10))
         exists = self._exists = os.path.exists(self.dbpath)
         if not exists:
             # Be more strict when creating new libraries as the old calculation

From 0bc80abeabc52ef9d31f37305fc1f7a02286a5a5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 20 Oct 2013 09:19:52 +0530
Subject: [PATCH 1040/1154] Fix library restore failing on some windows
 installs

Fix the restore database operation failing on windows installs with long
usernames (this would cause the path to the temporary folder used to
restore the database to become too long).
---
 src/calibre/db/restore.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/db/restore.py b/src/calibre/db/restore.py
index 9569dbeab6..1440bd444b 100644
--- a/src/calibre/db/restore.py
+++ b/src/calibre/db/restore.py
@@ -99,7 +99,7 @@ class Restore(Thread):
 
     def run(self):
         try:
-            with TemporaryDirectory('_library_restore') as tdir:
+            with TemporaryDirectory('relib') as tdir:
                 self.library_path = tdir
                 self.scan_library()
                 if not self.load_preferences():

From 2fae9e67c78a4c811dd3d538b5dca1d73bf30f62 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 20 Oct 2013 09:43:48 +0530
Subject: [PATCH 1041/1154] Even more robust handling of temp library during
 restore

---
 src/calibre/db/restore.py | 11 ++++++++++-
 src/calibre/ptempfile.py  |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/restore.py b/src/calibre/db/restore.py
index 1440bd444b..3f513de100 100644
--- a/src/calibre/db/restore.py
+++ b/src/calibre/db/restore.py
@@ -99,7 +99,16 @@ class Restore(Thread):
 
     def run(self):
         try:
-            with TemporaryDirectory('relib') as tdir:
+            basedir = os.path.dirname(self.src_library_path)
+            try:
+                tdir = TemporaryDirectory('_rlib', dir=basedir)
+                tdir.__enter__()
+            except EnvironmentError:
+                # Incase we dont have permissions to create directories in the
+                # parent folder of the src library
+                tdir = TemporaryDirectory('_rlib')
+
+            with tdir as tdir:
                 self.library_path = tdir
                 self.scan_library()
                 if not self.load_preferences():
diff --git a/src/calibre/ptempfile.py b/src/calibre/ptempfile.py
index f3816f766b..83c39d6b34 100644
--- a/src/calibre/ptempfile.py
+++ b/src/calibre/ptempfile.py
@@ -170,7 +170,8 @@ class TemporaryDirectory(object):
         self.keep = keep
 
     def __enter__(self):
-        self.tdir = _make_dir(self.suffix, self.prefix, self.dir)
+        if not hasattr(self, 'tdir'):
+            self.tdir = _make_dir(self.suffix, self.prefix, self.dir)
         return self.tdir
 
     def __exit__(self, *args):

From 7c2f6056d6db4a2341e6584cd6f9d0284e2d9ac0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 20 Oct 2013 16:58:18 +0530
Subject: [PATCH 1042/1154] Fix #1242291 [ValueError:min() arg is an empty
 sequence](https://bugs.launchpad.net/calibre/+bug/1242291)

---
 src/calibre/gui2/library/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index aa20670738..2718b0335e 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -700,7 +700,8 @@ class BooksView(QTableView):  # {{{
                 except ValueError:
                     pass
             sections = tuple(x for x in map(f, changed) if x is not None)
-            self.row_header.headerDataChanged(Qt.Vertical, min(sections), max(sections))
+            if sections:
+                self.row_header.headerDataChanged(Qt.Vertical, min(sections), max(sections))
         else:
             # Marked items have either appeared or all been removed
             self.model().set_row_decoration(current_marked)

From 9a9530f34bd352e115ca9ad243a99b28b2b80c13 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 20 Oct 2013 10:40:42 -0400
Subject: [PATCH 1043/1154] Fix issue # 1242261: Htmlz does not apply inline
 css from <body>.

---
 src/calibre/ebooks/htmlz/oeb2html.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/htmlz/oeb2html.py b/src/calibre/ebooks/htmlz/oeb2html.py
index 06ba2b63d3..a0bbc4af18 100644
--- a/src/calibre/ebooks/htmlz/oeb2html.py
+++ b/src/calibre/ebooks/htmlz/oeb2html.py
@@ -11,6 +11,7 @@ Transform OEB content into a single (more or less) HTML file.
 '''
 
 import os
+import re
 
 from functools import partial
 from lxml import html
@@ -254,10 +255,15 @@ class OEB2HTMLInlineCSSizer(OEB2HTML):
         attribs = elem.attrib
 
         style_a = '%s' % style
+        style_a = style_a if style_a else ''
         if tag == 'body':
+            # Change the body to a div so we can merge multiple files.
             tag = 'div'
-            if not style['page-break-before'] == 'always':
-                style_a = 'page-break-before: always;' + ' ' if style_a else '' + style_a
+            # Add page-break-brefore: always because renders typically treat a new file (we're merging files)
+            # as a page break and remove all other page break types that might be set.
+            style_a = 'page-break-before: always; %s' % re.sub('page-break-[^:]+:[^;]+;?', '', style_a)
+        # Remove unnecessary spaces.
+        style_a = re.sub('\s{2,}', ' ', style_a).strip()
         tags.append(tag)
 
         # Remove attributes we won't want.

From 587d83b0d104161681c5193804332d77f36f0a8a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 20 Oct 2013 21:22:30 +0530
Subject: [PATCH 1044/1154] ...

---
 src/calibre/gui2/metadata/single_download.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index c65706a33c..a5974b0fca 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -305,6 +305,8 @@ class ResultsView(QTableView):  # {{{
         self.show_details_signal.emit(''.join(parts))
 
     def select_index(self, index):
+        if self.model() is None:
+            return
         if not index.isValid():
             index = self.model().index(0, 0)
         book = self.model().data(index, Qt.UserRole)

From 0ad58ef8a606ea2ecc737e546f6b4ba70f176045 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 21 Oct 2013 08:34:10 +0530
Subject: [PATCH 1045/1154] ...

---
 src/calibre/ebooks/mobi/mobiml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/mobi/mobiml.py b/src/calibre/ebooks/mobi/mobiml.py
index 741b0d6a8d..30ef270338 100644
--- a/src/calibre/ebooks/mobi/mobiml.py
+++ b/src/calibre/ebooks/mobi/mobiml.py
@@ -382,7 +382,7 @@ class MobiMLizer(object):
         istate.fgcolor  = style['color']
         istate.strikethrough = style.effective_text_decoration == 'line-through'
         istate.underline = style.effective_text_decoration == 'underline'
-        ff = style['font-family'].lower() if style['font-family'] else ''
+        ff = style['font-family'].lower() if hasattr(style['font-family'], 'lower') else ''
         if 'monospace' in ff or 'courier' in ff or ff.endswith(' mono'):
             istate.family = 'monospace'
         elif ('sans-serif' in ff or 'sansserif' in ff or 'verdana' in ff or

From f48d9a47ca286717ab1c716ee4166be3353af6f1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 21 Oct 2013 11:34:49 +0530
Subject: [PATCH 1046/1154] Fix incorrect cleanup when building simple book for
 tests

---
 src/calibre/ebooks/oeb/polish/tests/base.py   |  5 +-
 .../ebooks/oeb/polish/tests/index.html        | 64 -------------------
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 src/calibre/ebooks/oeb/polish/tests/index.html

diff --git a/src/calibre/ebooks/oeb/polish/tests/base.py b/src/calibre/ebooks/oeb/polish/tests/base.py
index 7dc4601539..4818127ac1 100644
--- a/src/calibre/ebooks/oeb/polish/tests/base.py
+++ b/src/calibre/ebooks/oeb/polish/tests/base.py
@@ -51,10 +51,7 @@ def get_simple_book(fmt='epub'):
             build_book(x, ans, args=['--level1-toc=//h:h2', '--language=en', '--authors=Kovid Goyal',
                                         '--cover=' + I('lt.png')])
         finally:
-            try:
-                os.remove('index.html')
-            except:
-                pass
+            os.remove(x)
     return ans
 
 devnull = DevNull()
diff --git a/src/calibre/ebooks/oeb/polish/tests/index.html b/src/calibre/ebooks/oeb/polish/tests/index.html
deleted file mode 100644
index 6d9ad92835..0000000000
--- a/src/calibre/ebooks/oeb/polish/tests/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>A simple test page</title>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-        <style type="text/css">
-@font-face {
-    font-family: "Liberation Mono";
-    src: url(/home/kovid/work/calibre/resources/fonts/liberation/LiberationMono-Regular.ttf);
-}
-
-@font-face {
-    font-family: "Liberation Mono";
-    src: url(/home/kovid/work/calibre/resources/fonts/liberation/LiberationMono-Italic.ttf);
-    font-style: italic;
-}
-
-h1 {
-    color: DarkCyan;
-    text-align: center;
-}
-
-p { font-family: "Liberation Mono"; }
-        </style>
-	</head>
-	<body>
-    <h2>A simple test page</h2>
-<!--lorem-->
-<p>To pursue pleasure rationally encounter consequences that are extremely
-painful.</p>
-
-<p>Nor again is there anyone who loves or pursues or desires to obtain pain of
-itself, because it is pain, but because occasionally circumstances occur in
-which toil and pain can procure him some great pleasure. To take a trivial
-example, which of us ever undertakes laborious physical exercise, except to
-obtain some advantage from it? But who has any right to find fault with a man
-who chooses to enjoy a pleasure that has no <em>annoying</em> consequences, or one who
-avoids a pain that produces no resultant pleasure?</p>
-
-<div style="text-align:center"><img alt="test" src="/home/kovid/work/calibre/resources/images/marked.png"></div>
-
-<p>On the other hand.</p>
-
-<!--/lorem-->
-
-<h2>Another test page</h2>
-
-<!--lorem-->
-<p>The great explorer of the truth, the master-builder of human happiness. No
-one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but
-because those who do not know how to pursue pleasure rationally encounter
-consequences that are extremely painful.</p>
-
-<p>Nor again is there anyone who loves or pursues or desires to obtain pain of
-itself, because it is pain, but because occasionally circumstances occur in
-which toil and pain can procure him some great pleasure. To take a trivial
-example, which of us ever undertakes laborious physical exercise, except to
-obtain some advantage from it? But who has any right.</p>
-<!--/lorem-->
-
-
-	</body>
-</html>
-

From f83313f593fac6ce8db07a484b3965519c578639 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 21 Oct 2013 14:29:53 +0530
Subject: [PATCH 1047/1154] Implement renaming in book containers

---
 src/calibre/ebooks/oeb/base.py                |   6 +
 src/calibre/ebooks/oeb/polish/container.py    | 130 +++++++++++++++++-
 src/calibre/ebooks/oeb/polish/replace.py      |  72 +++++++---
 src/calibre/ebooks/oeb/polish/tests/base.py   |   8 ++
 .../ebooks/oeb/polish/tests/container.py      |  85 +++++++++++-
 .../ebooks/oeb/polish/tests/simple.html       |   9 +-
 6 files changed, 278 insertions(+), 32 deletions(-)

diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 009902138f..e0e7a665cd 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -100,6 +100,12 @@ def close_self_closing_tags(raw):
 def uuid_id():
     return 'u'+unicode(uuid.uuid4())
 
+def itercsslinks(raw):
+    for match in _css_url_re.finditer(raw):
+        yield match.group(1), match.start(1)
+    for match in _css_import_re.finditer(raw):
+        yield match.group(1), match.start(1)
+
 def iterlinks(root, find_links_in_css=True):
     '''
     Iterate over all links in a OEB Document.
diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 02c4df6937..785056aa2b 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, logging, sys, hashlib, uuid, re, shutil, copy
+import os, logging, sys, hashlib, uuid, re, shutil
 from collections import defaultdict
 from io import BytesIO
 from urllib import unquote as urlunquote, quote as urlquote
@@ -15,6 +15,7 @@ from urlparse import urlparse
 from future_builtins import zip
 
 from lxml import etree
+from cssutils import replaceUrls, getUrls
 
 from calibre import guess_type as _guess_type, CurrentDir
 from calibre.customize.ui import (plugin_for_input_format,
@@ -27,7 +28,8 @@ from calibre.ebooks.mobi import MobiError
 from calibre.ebooks.mobi.reader.headers import MetadataHeader
 from calibre.ebooks.mobi.tweak import set_cover
 from calibre.ebooks.oeb.base import (
-    serialize, OEB_DOCS, _css_logger, OEB_STYLES, OPF2_NS, DC11_NS, OPF)
+    serialize, OEB_DOCS, _css_logger, OEB_STYLES, OPF2_NS, DC11_NS, OPF,
+    rewrite_links, iterlinks, itercsslinks)
 from calibre.ebooks.oeb.polish.errors import InvalidBook, DRMError
 from calibre.ebooks.oeb.parse_utils import NotHTML, parse_html, RECOVER_PARSER
 from calibre.ptempfile import PersistentTemporaryDirectory, PersistentTemporaryFile
@@ -105,6 +107,7 @@ class Container(object):  # {{{
         self.encoding_map = {}
         self.pretty_print = set()
         self.cloned = False
+        self.cache_names = ('parsed_cache', 'mime_map', 'name_path_map', 'encoding_map', 'dirtied', 'pretty_print')
 
         if clone_data is not None:
             self.cloned = True
@@ -153,6 +156,100 @@ class Container(object):  # {{{
                 for name, path in self.name_path_map.iteritems()}
         }
 
+    def rename(self, current_name, new_name):
+        ''' Renames a file from current_name to new_name. It automatically
+        rebases all links inside the file if the directory the file is in
+        changes. Note however, that links are not updated in the other files
+        that could reference this file. This is for performance, such updates
+        should be done once, in bulk. '''
+        if current_name in self.names_that_must_not_be_changed:
+            raise ValueError('Renaming of %s is not allowed' % current_name)
+        if self.exists(new_name):
+            raise ValueError('Cannot rename %s to %s as %s already exists' % (self.opf_name, new_name, new_name))
+        new_path = self.name_to_abspath(new_name)
+        base = os.path.dirname(new_path)
+        if os.path.isfile(base):
+            raise ValueError('Cannot rename %s to %s as %s is a file' % (self.opf_name, new_name, base))
+        if not os.path.exists(base):
+            os.makedirs(base)
+        old_path = parent_dir = self.name_to_abspath(current_name)
+        self.commit_item(current_name)
+        os.rename(old_path, new_path)
+        # Remove empty directories
+        while parent_dir:
+            parent_dir = os.path.dirname(parent_dir)
+            try:
+                os.rmdir(parent_dir)
+            except EnvironmentError:
+                break
+
+        for x in ('mime_map', 'encoding_map'):
+            x = getattr(self, x)
+            if current_name in x:
+                x[new_name] = x[current_name]
+        self.name_path_map[new_name] = new_path
+        for x in self.cache_names:
+            x = getattr(self, x)
+            try:
+                x.pop(current_name, None)
+            except TypeError:
+                x.discard(current_name)
+        if current_name == self.opf_name:
+            self.opf_name = new_name
+        if os.path.dirname(old_path) != os.path.dirname(new_path):
+            from calibre.ebooks.oeb.polish.replace import LinkRebaser
+            repl = LinkRebaser(self, current_name, new_name)
+            self.replace_links(new_name, repl)
+            self.dirty(new_name)
+
+    def replace_links(self, name, replace_func):
+        ''' Replace all links in name using replace_func, which must be a
+        callable that accepts a URL and returns the replaced URL. It must also
+        have a 'replaced' attribute that is set to True if any actual
+        replacement is done. Convenient ways of creating such callables are
+        using the :class:`LinkReplacer` and :class:`LinkRebaser` classes. '''
+        media_type = self.mime_map.get(name, guess_type(name))
+        if name == self.opf_name:
+            for elem in self.opf_xpath('//*[@href]'):
+                elem.set('href', replace_func(elem.get('href')))
+        elif media_type.lower() in OEB_DOCS:
+            rewrite_links(self.parsed(name), replace_func)
+        elif media_type.lower() in OEB_STYLES:
+            replaceUrls(self.parsed(name), replace_func)
+        elif media_type.lower() == guess_type('toc.ncx'):
+            for elem in self.parsed(name).xpath('//*[@src]'):
+                elem.set('src', replace_func(elem.get('src')))
+
+        if replace_func.replaced:
+            self.dirty(name)
+        return replace_func.replaced
+
+    def iterlinks(self, name, get_line_numbers=True):
+        ''' Iterate over all links in name. If get_line_numbers is True the
+        yields results of the form (link, line_number, offset). Where
+        line_number is the line_number at which the link occurs and offset is
+        the number of characters from the start of the line. Note that offset
+        could actually encompass several lines if not zero. '''
+        media_type = self.mime_map.get(name, guess_type(name))
+        if name == self.opf_name:
+            for elem in self.opf_xpath('//*[@href]'):
+                yield (elem.get('href'), elem.sourceline, 0) if get_line_numbers else elem.get('href')
+        elif media_type.lower() in OEB_DOCS:
+            for el, attr, link, pos in iterlinks(self.parsed(name)):
+                yield (link, el.sourceline, pos) if get_line_numbers else link
+        elif media_type.lower() in OEB_STYLES:
+            if get_line_numbers:
+                with self.open(name) as f:
+                    raw = self.decode(f.read())
+                    for link, offset in itercsslinks(raw):
+                        yield link, 0, offset
+            else:
+                for link in getUrls(self.parsed(name)):
+                    yield link
+        elif media_type.lower() == guess_type('toc.ncx'):
+            for elem in self.parsed(name).xpath('//*[@src]'):
+                yield (elem.get('src'), elem.sourceline, 0) if get_line_numbers else elem.get('src')
+
     def abspath_to_name(self, fullpath):
         return self.relpath(os.path.abspath(fullpath)).replace(os.sep, '/')
 
@@ -648,15 +745,15 @@ class EpubContainer(Container):
         container_path = join(self.root, 'META-INF', 'container.xml')
         if not exists(container_path):
             raise InvalidEpub('No META-INF/container.xml in epub')
-        self.container = etree.fromstring(open(container_path, 'rb').read())
-        opf_files = self.container.xpath((
+        container = etree.fromstring(open(container_path, 'rb').read())
+        opf_files = container.xpath((
             r'child::ocf:rootfiles/ocf:rootfile'
             '[@media-type="%s" and @full-path]'%guess_type('a.opf')
             ), namespaces={'ocf':OCF_NS}
         )
         if not opf_files:
             raise InvalidEpub('META-INF/container.xml contains no link to OPF file')
-        opf_path = os.path.join(self.root, *opf_files[0].get('full-path').split('/'))
+        opf_path = os.path.join(self.root, *(urlunquote(opf_files[0].get('full-path')).split('/')))
         if not exists(opf_path):
             raise InvalidEpub('OPF file does not exist at location pointed to'
                     ' by META-INF/container.xml')
@@ -666,14 +763,35 @@ class EpubContainer(Container):
         self.obfuscated_fonts = {}
         if 'META-INF/encryption.xml' in self.name_path_map:
             self.process_encryption()
+        self.parsed_cache['META-INF/container.xml'] = container
 
     def clone_data(self, dest_dir):
         ans = super(EpubContainer, self).clone_data(dest_dir)
         ans['pathtoepub'] = self.pathtoepub
         ans['obfuscated_fonts'] = self.obfuscated_fonts.copy()
-        ans['container'] = copy.deepcopy(self.container)
         return ans
 
+    def rename(self, old_name, new_name):
+        is_opf = old_name == self.opf_name
+        super(EpubContainer, self).rename(old_name, new_name)
+        if is_opf:
+            for elem in self.parsed('META-INF/container.xml').xpath((
+                r'child::ocf:rootfiles/ocf:rootfile'
+                '[@media-type="%s" and @full-path]'%guess_type('a.opf')
+                ), namespaces={'ocf':OCF_NS}
+            ):
+                # The asinine epubcheck cannot handle quoted filenames in
+                # container.xml
+                elem.set('full-path', self.opf_name)
+            self.dirty('META-INF/container.xml')
+        if old_name in self.obfuscated_fonts:
+            self.obfuscated_fonts[new_name] = self.obfuscated_fonts.pop(old_name)
+            enc = self.parsed('META-INF/encryption.xml')
+            for cr in enc.xpath('//*[local-name()="CipherReference" and @URI]'):
+                if self.href_to_name(cr.get('URI')) == old_name:
+                    cr.set('URI', self.name_to_href(new_name))
+                    self.dirty('META-INF/encryption.xml')
+
     @property
     def names_that_need_not_be_manifested(self):
         return super(EpubContainer, self).names_that_need_not_be_manifested | {'META-INF/' + x for x in self.META_INF}
diff --git a/src/calibre/ebooks/oeb/polish/replace.py b/src/calibre/ebooks/oeb/polish/replace.py
index b26589d5bf..a78f7b5ef7 100644
--- a/src/calibre/ebooks/oeb/polish/replace.py
+++ b/src/calibre/ebooks/oeb/polish/replace.py
@@ -10,11 +10,7 @@ __docformat__ = 'restructuredtext en'
 import codecs
 from urlparse import urlparse
 
-from cssutils import replaceUrls
-
 from calibre.ebooks.chardet import strip_encoding_declarations
-from calibre.ebooks.oeb.polish.container import guess_type
-from calibre.ebooks.oeb.base import (OEB_DOCS, OEB_STYLES, rewrite_links)
 
 class LinkReplacer(object):
 
@@ -26,6 +22,12 @@ class LinkReplacer(object):
         self.replaced = False
 
     def __call__(self, url):
+        if url and url.startswith('#'):
+            repl = self.frag_map(self.base, url[1:])
+            if not repl or repl == url[1:]:
+                return url
+            self.replaced = True
+            return '#' + repl
         name = self.container.href_to_name(url, self.base)
         if not name:
             return url
@@ -42,23 +44,37 @@ class LinkReplacer(object):
             self.replaced = True
         return href
 
-def replace_links(container, link_map, frag_map=lambda name, frag:frag):
-    ncx_type = guess_type('toc.ncx')
-    for name, media_type in container.mime_map.iteritems():
-        repl = LinkReplacer(name, container, link_map, frag_map)
-        if media_type.lower() in OEB_DOCS:
-            rewrite_links(container.parsed(name), repl)
-        elif media_type.lower() in OEB_STYLES:
-            replaceUrls(container.parsed(name), repl)
-        elif media_type.lower() == ncx_type:
-            for elem in container.parsed(name).xpath('//*[@src]'):
-                src = elem.get('src')
-                nsrc = repl(src)
-                if src != nsrc:
-                    elem.set('src', nsrc)
+class LinkRebaser(object):
 
-        if repl.replaced:
-            container.dirty(name)
+    def __init__(self, container, old_name, new_name):
+        self.old_name, self.new_name = old_name, new_name
+        self.container = container
+        self.replaced = False
+
+    def __call__(self, url):
+        if url and url.startswith('#'):
+            return url
+        purl = urlparse(url)
+        frag = purl.fragment
+        name = self.container.href_to_name(url, self.old_name)
+        if not name:
+            return url
+        if name == self.old_name:
+            name = self.new_name
+        href = self.container.name_to_href(name, self.new_name)
+        if frag:
+            href += '#' + frag
+        if href != url:
+            self.replaced = True
+        return href
+
+
+def replace_links(container, link_map, frag_map=lambda name, frag:frag, replace_in_opf=False):
+    for name, media_type in container.mime_map.iteritems():
+        if name == container.opf_name and not replace_in_opf:
+            continue
+        repl = LinkReplacer(name, container, link_map, frag_map)
+        container.replace_links(name, repl)
 
 def smarten_punctuation(container, report):
     from calibre.ebooks.conversion.preprocess import smarten_punctuation
@@ -83,3 +99,19 @@ def smarten_punctuation(container, report):
                 m.getparent().remove(m)
             container.dirty(name)
 
+def rename_files(container, file_map):
+    overlap = set(file_map).intersection(set(file_map.itervalues()))
+    if overlap:
+        raise ValueError('Circular rename detected. The files %s are both rename targets and destinations' % ', '.join(overlap))
+    for name, dest in file_map.iteritems():
+        if container.exists(dest):
+            raise ValueError('Cannot rename {0} to {1} as {1} already exists'.format(name, dest))
+    if len(tuple(file_map.itervalues())) != len(set(file_map.itervalues())):
+        raise ValueError('Cannot rename, the set of destination files contains duplicates')
+    link_map = {}
+    for current_name, new_name in file_map.iteritems():
+        container.rename(current_name, new_name)
+        if new_name != container.opf_name:  # OPF is handled by the container
+            link_map[current_name] = new_name
+    replace_links(container, link_map, replace_in_opf=True)
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/base.py b/src/calibre/ebooks/oeb/polish/tests/base.py
index 4818127ac1..4a09c3749c 100644
--- a/src/calibre/ebooks/oeb/polish/tests/base.py
+++ b/src/calibre/ebooks/oeb/polish/tests/base.py
@@ -45,6 +45,7 @@ def get_simple_book(fmt='epub'):
         raw = raw.replace('LMONOI', P('fonts/liberation/LiberationMono-Italic.ttf'))
         raw = raw.replace('LMONO', P('fonts/liberation/LiberationMono-Regular.ttf'))
         raw = raw.replace('IMAGE1', I('marked.png'))
+        raw = raw.replace('IMAGE2', I('textures/light_wood.png'))
         try:
             with open(x, 'wb') as f:
                 f.write(raw.encode('utf-8'))
@@ -69,3 +70,10 @@ class BaseTest(unittest.TestCase):
         shutil.rmtree(self.tdir, ignore_errors=True)
         del self.tdir
 
+    def check_links(self, container):
+        for name in container.name_path_map:
+            for link in container.iterlinks(name, get_line_numbers=False):
+                dest = container.href_to_name(link, name)
+                if dest:
+                    self.assertTrue(container.exists(dest), 'The link %s in %s does not exist' % (link, name))
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py
index 609766b6fd..4d854c32f7 100644
--- a/src/calibre/ebooks/oeb/polish/tests/container.py
+++ b/src/calibre/ebooks/oeb/polish/tests/container.py
@@ -6,12 +6,14 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import os
+import os, subprocess
 
 from calibre.ebooks.oeb.polish.tests.base import BaseTest, get_simple_book
 
-from calibre.ebooks.oeb.polish.container import get_container, clone_container
+from calibre.ebooks.oeb.polish.container import get_container, clone_container, OCF_NS
+from calibre.ebooks.oeb.polish.replace import rename_files
 from calibre.utils.filenames import nlinks_file
+from calibre.ptempfile import TemporaryFile
 
 class ContainerTests(BaseTest):
 
@@ -73,3 +75,82 @@ class ContainerTests(BaseTest):
         for x in files:
             self.assertNotIn(x, raw)
 
+    def run_external_tools(self, container, gvim=False, epubcheck=True):
+        with TemporaryFile(suffix='.epub', dir=self.tdir) as f:
+            container.commit(outpath=f)
+            if gvim:
+                subprocess.Popen(['gvim', '-f', f]).wait()
+            if epubcheck:
+                subprocess.Popen(['epubcheck', f]).wait()
+
+    def test_file_rename(self):
+        ' Test renaming of files '
+        book = get_simple_book()
+        count = [0]
+        def new_container():
+            count[0] += 1
+            tdir = os.mkdir(os.path.join(self.tdir, str(count[0])))
+            return get_container(book, tdir=tdir)
+
+        # Test simple opf rename
+        c = new_container()
+        orig_name = c.opf_name
+        name = 'renamed opf.opf'
+        rename_files(c, {c.opf_name: name})
+        self.assertEqual(c.opf_name, name)
+        for x in ('name_path_map', 'mime_map'):
+            self.assertNotIn(orig_name, getattr(c, x))
+            self.assertIn(name, getattr(c, x))
+        self.assertNotIn(name, c.dirtied)
+        root = c.parsed('META-INF/container.xml')
+        vals = set(root.xpath(
+            r'child::ocf:rootfiles/ocf:rootfile/@full-path',
+            namespaces={'ocf':OCF_NS}))
+        self.assertSetEqual(vals, {name})
+        self.check_links(c)
+
+        # Test a rename that moves the OPF into different directory
+        c = new_container()
+        orig_name = c.opf_name
+        name = 'renamed/again/metadata.opf'
+        rename_files(c, {c.opf_name: name})
+        self.check_links(c)
+
+        # Test that renaming commits dirtied items
+        c = new_container()
+        name = next(c.spine_names)[0]
+        root = c.parsed(name)
+        root.xpath('//*[local-name()="body"]')[0].set('id', 'rename-dirty-test')
+        rename_files(c, {name:'other/' + name})
+        with c.open('other/' + name) as f:
+            raw = f.read()
+        self.assertIn(b'id="rename-dirty-test"', raw)
+        self.check_links(c)
+
+        # Test renaming of stylesheets
+        c = new_container()
+        rename_files(c, {'stylesheet.css':'styles/s 1.css', 'page_styles.css':'styles/p 1.css'})
+        self.check_links(c)
+
+        # Test renaming of images
+        c = new_container()
+        rename_files(c, {'cover.png':'images/cover img.png', 'light_wood.png':'images/light wood.png', 'marked.png':'images/marked img.png'})
+        self.check_links(c)
+
+        # Test renaming of ToC
+        c = new_container()
+        rename_files(c, {'toc.ncx': 'toc/toc file.ncx'})
+        self.check_links(c)
+
+        # Test renaming of font files
+        c = new_container()
+        rename_files(c, {'LiberationMono-Regular.ttf': 'fonts/LiberationMono Regular.ttf'})
+        self.check_links(c)
+
+        # Test renaming of text files
+        c = new_container()
+        rename_files(c, {'index_split_000.html':'text/page one.html', 'index_split_001.html':'text/page two.html'})
+        self.check_links(c)
+
+        # self.run_external_tools(c, gvim=True)
+
diff --git a/src/calibre/ebooks/oeb/polish/tests/simple.html b/src/calibre/ebooks/oeb/polish/tests/simple.html
index ce23f8591c..0d1638071f 100644
--- a/src/calibre/ebooks/oeb/polish/tests/simple.html
+++ b/src/calibre/ebooks/oeb/polish/tests/simple.html
@@ -15,16 +15,17 @@
     font-style: italic;
 }
 
-h1 {
+h2 {
     color: DarkCyan;
     text-align: center;
+    background-image: url("IMAGE2");
 }
 
 p { font-family: "Liberation Mono"; }
         </style>
 	</head>
 	<body>
-    <h2>A simple test page</h2>
+    <h2 id="page1">A simple test page</h2>
 <!--lorem-->
 <p>To pursue pleasure rationally encounter consequences that are extremely
 painful.</p>
@@ -39,11 +40,11 @@ avoids a pain that produces no resultant pleasure?</p>
 
 <div style="text-align:center"><img alt="test" src="IMAGE1"></div>
 
-<p>On the other hand.</p>
+<p>A <a href="#page2">link to the next page</a>.</p>
 
 <!--/lorem-->
 
-<h2>Another test page</h2>
+<h2 id="page2">Another test page</h2>
 
 <!--lorem-->
 <p>The great explorer of the truth, the master-builder of human happiness. No

From 86b1f1d81a80c08e553371b91ec8be1d31d7092e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 21 Oct 2013 16:17:53 +0530
Subject: [PATCH 1048/1154] ...

---
 src/calibre/ebooks/oeb/polish/container.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 785056aa2b..19ea0eb14c 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -719,7 +719,7 @@ class EpubContainer(Container):
     def __init__(self, pathtoepub, log, clone_data=None, tdir=None):
         if clone_data is not None:
             super(EpubContainer, self).__init__(None, None, log, clone_data=clone_data)
-            for x in ('pathtoepub', 'container', 'obfuscated_fonts'):
+            for x in ('pathtoepub', 'obfuscated_fonts'):
                 setattr(self, x, clone_data[x])
             return
 

From aca7c64782baa4510f16e32746133c7c7f1af206 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 21 Oct 2013 16:23:10 +0530
Subject: [PATCH 1049/1154] Wire up file renaming in the GUI

---
 src/calibre/gui2/tweak_book/boss.py | 24 ++++++++++++++++++++++++
 src/calibre/gui2/tweak_book/undo.py |  8 ++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 77bab40a7a..e12b6e0026 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -7,6 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import tempfile, shutil, sys, os
+from functools import partial
 
 from PyQt4.Qt import (
     QObject, QApplication, QDialog, QGridLayout, QLabel, QSize, Qt,
@@ -17,6 +18,7 @@ from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.ebooks.oeb.base import urlnormalize
 from calibre.ebooks.oeb.polish.main import SUPPORTED
 from calibre.ebooks.oeb.polish.container import get_container, clone_container, guess_type
+from calibre.ebooks.oeb.polish.replace import rename_files
 from calibre.gui2 import error_dialog, choose_files, question_dialog, info_dialog
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.tweak_book import set_current_container, current_container, tprefs
@@ -104,6 +106,12 @@ class Boss(QObject):
         set_current_container(nc)
         self.update_global_history_actions()
 
+    def rewind_savepoint(self):
+        container = self.global_undo.rewind_savepoint()
+        if container is not None:
+            set_current_container(container)
+            self.update_global_history_actions()
+
     def apply_container_update_to_gui(self):
         container = current_container()
         self.gui.file_list.build(container)
@@ -146,6 +154,8 @@ class Boss(QObject):
         # TODO: If content.opf is open in an editor, reload it
 
     def rename_requested(self, oldname, newname):
+        if not self.check_dirtied():
+            return
         if guess_type(oldname) != guess_type(newname):
             args = os.path.splitext(oldname) + os.path.splitext(newname)
             if not confirm(
@@ -163,6 +173,20 @@ class Boss(QObject):
                       '<pre>%s</pre>'%newname, '<pre>%s</pre>' % urlnormalize(newname)),
                 'confirm-urlunsafe-change', parent=self.gui, title=_('Are you sure?'), config_set=tprefs):
                     return
+        self.add_savepoint(_('Rename %s') % oldname)
+        self.gui.blocking_job(
+            'rename_file', _('Renaming and updating links...'), partial(self.rename_done, oldname, newname),
+            rename_files, current_container(), {oldname: newname})
+
+    def rename_done(self, oldname, newname, job):
+        if job.traceback is not None:
+            self.rewind_savepoint()
+            return error_dialog(self.gui, _('Failed to rename files'),
+                    _('Failed to rename files, click Show details for more information.'),
+                                det_msg=job.traceback, show=True)
+        self.gui.file_list.build(current_container())
+        self.gui.action_save.setEnabled(True)
+        # TODO: Update the rest of the GUI
 
     def save_book(self):
         self.gui.action_save.setEnabled(False)
diff --git a/src/calibre/gui2/tweak_book/undo.py b/src/calibre/gui2/tweak_book/undo.py
index c39b2b5694..018a2df874 100644
--- a/src/calibre/gui2/tweak_book/undo.py
+++ b/src/calibre/gui2/tweak_book/undo.py
@@ -43,6 +43,14 @@ class GlobalUndoHistory(object):
         self.states.append(State(new_container))
         self.pos += 1
 
+    def rewind_savepoint(self):
+        if self.pos > 0 and self.pos == len(self.states) - 1:
+            self.pos -= 1
+            cleanup(self.states.pop())
+            ans = self.current_container
+            ans.message = None
+            return ans
+
     def undo(self):
         if self.pos > 0:
             self.pos -= 1

From 62d0450dee07eb3f9924253b82b92f2df7279218 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 21 Oct 2013 16:32:40 +0530
Subject: [PATCH 1050/1154] ...

---
 src/calibre/ebooks/oeb/polish/tests/simple.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/polish/tests/simple.html b/src/calibre/ebooks/oeb/polish/tests/simple.html
index 0d1638071f..3d9946c381 100644
--- a/src/calibre/ebooks/oeb/polish/tests/simple.html
+++ b/src/calibre/ebooks/oeb/polish/tests/simple.html
@@ -37,12 +37,12 @@ example, which of us ever undertakes laborious physical exercise, except to
 obtain some advantage from it? But who has any right to find fault with a man
 who chooses to enjoy a pleasure that has no <em>annoying</em> consequences, or one who
 avoids a pain that produces no resultant pleasure?</p>
+<!--/lorem-->
 
 <div style="text-align:center"><img alt="test" src="IMAGE1"></div>
 
 <p>A <a href="#page2">link to the next page</a>.</p>
 
-<!--/lorem-->
 
 <h2 id="page2">Another test page</h2>
 
@@ -59,6 +59,7 @@ example, which of us ever undertakes laborious physical exercise, except to
 obtain some advantage from it? But who has any right.</p>
 <!--/lorem-->
 
+<p>A link to <a href="http://calibre-ebook.com">calibre&quot;s website</a></p>
 
 	</body>
 </html>

From 7e56f63c331c0f34f795ba5178b046513fd0a453 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 21 Oct 2013 22:22:21 +0530
Subject: [PATCH 1051/1154] Update A List Apart

---
 recipes/list_apart.recipe | 41 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/recipes/list_apart.recipe b/recipes/list_apart.recipe
index c11956110f..c2a7f48f32 100644
--- a/recipes/list_apart.recipe
+++ b/recipes/list_apart.recipe
@@ -1,23 +1,30 @@
 # vim:fileencoding=UTF-8
 from __future__ import unicode_literals
 from calibre.web.feeds.news import BasicNewsRecipe
+import re
 
 class AListApart (BasicNewsRecipe):
-   __author__ = 'Marc Busqué <marc@lamarciana.com>'
-   __url__ = 'http://www.lamarciana.com'
-   __version__ = '2.0'
-   __license__   = 'GPL v3'
-   __copyright__ = '2012, Marc Busqué <marc@lamarciana.com>'
-   title = u'A List Apart'
-   description = u'A List Apart Magazine (ISSN: 1534-0295) explores the design, development, and meaning of web content, with a special focus on web standards and best practices. This recipe retrieve articles and columns.'
-   language = 'en'
-   tags = 'web development, software'
-   oldest_article = 120
-   remove_empty_feeds = True
-   encoding = 'utf8'
-   cover_url = u'http://alistapart.com/pix/alalogo.gif'
-   extra_css = u'img {max-width: 100%; display: block; margin: auto;}'
+    __author__ = 'Marc Busqué <marc@lamarciana.com>'
+    __url__ = 'http://www.lamarciana.com'
+    __version__ = '2.0.1'
+    __license__   = 'GPL v3'
+    __copyright__ = '2012, Marc Busqué <marc@lamarciana.com>'
+    title = u'A List Apart'
+    description = u'A List Apart Magazine (ISSN: 1534-0295) explores the design, development, and meaning of web content, with a special focus on web standards and best practices. This recipe retrieve articles and columns.'
+    language = 'en'
+    tags = 'web development, software'
+    oldest_article = 120
+    remove_empty_feeds = True
+    encoding = 'utf8'
+    cover_url = u'http://alistapart.com/pix/alalogo.gif'
+    extra_css = u'img {max-width: 100%; display: block; margin: auto;}'
 
-   feeds = [
-         (u'A List Apart', u'http://feeds.feedburner.com/alistapart/abridged'),
-         ]
+    feeds = [
+          (u'A List Apart', u'http://feeds.feedburner.com/alistapart/abridged'),
+          ]
+
+    def image_url_processor(self, baseurl, url):
+        if re.findall('alistapart\.com', url):
+            return 'http:'+url
+        else:
+            return url

From e360e989cff7e8ae64dd3a886dbc510a1f03caae Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 22 Oct 2013 09:54:05 +0530
Subject: [PATCH 1052/1154] Copy to library menu move copy by path to top for
 more than 50 libraries

Copy to library menu: Move the choose library by path option to the
start of the menu if there are more than 50 libraries.
---
 src/calibre/gui2/actions/copy_to_library.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index a17abbc2fb..f326ed3f12 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -280,6 +280,9 @@ class CopyToLibraryAction(InterfaceAction):
             return
         db = self.gui.library_view.model().db
         locations = list(self.stats.locations(db))
+        if len(locations) > 50:
+            self.menu.addAction(_('Choose library by path...'), self.choose_library)
+            self.menu.addSeparator()
         for name, loc in locations:
             self.menu.addAction(name, partial(self.copy_to_library,
                 loc))
@@ -287,7 +290,8 @@ class CopyToLibraryAction(InterfaceAction):
                     partial(self.copy_to_library, loc, delete_after=True))
             self.menu.addSeparator()
 
-        self.menu.addAction(_('Choose library by path...'), self.choose_library)
+        if len(locations) <= 50:
+            self.menu.addAction(_('Choose library by path...'), self.choose_library)
         self.qaction.setVisible(bool(locations))
 
     def choose_library(self):

From 93c872e8f3d18b11f045c2fb6e5e87ede2883df4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 22 Oct 2013 10:47:11 +0530
Subject: [PATCH 1053/1154] Book container: Fix handling of non-ascii chars in
 filenames

---
 src/calibre/ebooks/oeb/polish/container.py       | 3 +--
 src/calibre/ebooks/oeb/polish/tests/container.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 19ea0eb14c..f6b5841ca5 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -10,7 +10,6 @@ __docformat__ = 'restructuredtext en'
 import os, logging, sys, hashlib, uuid, re, shutil
 from collections import defaultdict
 from io import BytesIO
-from urllib import unquote as urlunquote, quote as urlquote
 from urlparse import urlparse
 from future_builtins import zip
 
@@ -29,7 +28,7 @@ from calibre.ebooks.mobi.reader.headers import MetadataHeader
 from calibre.ebooks.mobi.tweak import set_cover
 from calibre.ebooks.oeb.base import (
     serialize, OEB_DOCS, _css_logger, OEB_STYLES, OPF2_NS, DC11_NS, OPF,
-    rewrite_links, iterlinks, itercsslinks)
+    rewrite_links, iterlinks, itercsslinks, urlquote, urlunquote)
 from calibre.ebooks.oeb.polish.errors import InvalidBook, DRMError
 from calibre.ebooks.oeb.parse_utils import NotHTML, parse_html, RECOVER_PARSER
 from calibre.ptempfile import PersistentTemporaryDirectory, PersistentTemporaryFile
diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py
index 4d854c32f7..0ca95730d1 100644
--- a/src/calibre/ebooks/oeb/polish/tests/container.py
+++ b/src/calibre/ebooks/oeb/polish/tests/container.py
@@ -149,7 +149,7 @@ class ContainerTests(BaseTest):
 
         # Test renaming of text files
         c = new_container()
-        rename_files(c, {'index_split_000.html':'text/page one.html', 'index_split_001.html':'text/page two.html'})
+        rename_files(c, {'index_split_000.html':'text/page one fällen.html', 'index_split_001.html':'text/page two fällen.html'})
         self.check_links(c)
 
         # self.run_external_tools(c, gvim=True)

From e26090621174551c9782bb5a05fb619129924baa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 22 Oct 2013 15:46:31 +0530
Subject: [PATCH 1054/1154] DOCX Input: URL less hyperlink fields and stacked
 block level bookmarks

DOCX Input: Add support for hyperlink fields that have only anchors and
not URLs

DOCX Input: Fix handling of multiple block level bookmarks at the same
location.

Fixes #1241451 [links are not working](https://bugs.launchpad.net/calibre/+bug/1241451)
---
 src/calibre/ebooks/docx/fields.py  | 26 ++++++++++++++++++++------
 src/calibre/ebooks/docx/to_html.py | 30 ++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/calibre/ebooks/docx/fields.py b/src/calibre/ebooks/docx/fields.py
index 91dcd87596..6617728f0c 100644
--- a/src/calibre/ebooks/docx/fields.py
+++ b/src/calibre/ebooks/docx/fields.py
@@ -40,18 +40,16 @@ def parse_hyperlink(raw, log):
     raw = raw.replace('\\\\', '\x01').replace('\\"', '\x02')
     for token, token_type in scanner.scan(raw)[0]:
         token = token.replace('\x01', '\\').replace('\x02', '"')
-        if not ans:
-            if token_type is not WORD:
-                log('Invalid hyperlink, first token is not a URL (%s)' % raw)
-                return ans
-            ans['url'] = token
         if token_type is FLAG:
             last_option = {'l':'anchor', 'm':'image-map', 'n':'target', 'o':'title', 't':'target'}.get(token[1], None)
             if last_option is not None:
                 ans[last_option] = None
         elif token_type is WORD:
-            if last_option is not None:
+            if last_option is None:
+                ans['url'] = token
+            else:
                 ans[last_option] = token
+                last_option = None
     return ans
 
 
@@ -105,4 +103,20 @@ class Fields(object):
                     for runs in all_runs:
                         self.hyperlink_fields.append((hl, runs))
 
+def test_parse_hyperlink():
+    import unittest
 
+    class TestParseHyperLink(unittest.TestCase):
+
+        def test_parsing(self):
+            self.assertEqual(parse_hyperlink(
+                r'\l anchor1', None), {'anchor':'anchor1'})
+            self.assertEqual(parse_hyperlink(
+                r'www.calibre-ebook.com', None), {'url':'www.calibre-ebook.com'})
+            self.assertEqual(parse_hyperlink(
+                r'www.calibre-ebook.com \t target \o tt', None), {'url':'www.calibre-ebook.com', 'target':'target', 'title': 'tt'})
+            self.assertEqual(parse_hyperlink(
+                r'"c:\\Some Folder"', None), {'url': 'c:\\Some Folder'})
+
+    suite = unittest.TestLoader().loadTestsFromTestCase(TestParseHyperLink)
+    unittest.TextTestRunner(verbosity=4).run(suite)
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index cb33b255ca..a7afb5445a 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -346,18 +346,21 @@ class Convert(object):
     def read_block_anchors(self, doc):
         doc_anchors = frozenset(XPath('./w:body/w:bookmarkStart[@w:name]')(doc))
         if doc_anchors:
-            current_bm = None
+            current_bm = set()
             rmap = {v:k for k, v in self.object_map.iteritems()}
             for p in descendants(doc, 'w:p', 'w:bookmarkStart[@w:name]'):
                 if p.tag.endswith('}p'):
                     if current_bm and p in rmap:
                         para = rmap[p]
                         if 'id' not in para.attrib:
-                            para.set('id', generate_anchor(current_bm, frozenset(self.anchor_map.itervalues())))
-                        self.anchor_map[current_bm] = para.get('id')
-                        current_bm = None
+                            para.set('id', generate_anchor(next(iter(current_bm)), frozenset(self.anchor_map.itervalues())))
+                        for name in current_bm:
+                            self.anchor_map[name] = para.get('id')
+                        current_bm = set()
                 elif p in doc_anchors:
-                    current_bm = get(p, 'w:name')
+                    anchor = get(p, 'w:name')
+                    if anchor:
+                        current_bm.add(anchor)
 
     def convert_p(self, p):
         dest = P()
@@ -500,11 +503,18 @@ class Convert(object):
             tt = hyperlink.get('title', None)
             if tt:
                 span.set('title', tt)
-            url = hyperlink['url']
-            if url in self.anchor_map:
-                span.set('href', '#' + self.anchor_map[url])
-                continue
-            span.set('href', url)
+            url = hyperlink.get('url', None)
+            if url is None:
+                anchor = hyperlink.get('anchor', None)
+                if anchor in self.anchor_map:
+                    span.set('href', '#' + self.anchor_map[anchor])
+                    continue
+                self.log.warn('Hyperlink field with unknown anchor: %s' % anchor)
+            else:
+                if url in self.anchor_map:
+                    span.set('href', '#' + self.anchor_map[url])
+                    continue
+                span.set('href', url)
 
         for img, link in self.images.links:
             parent = img.getparent()

From c9a88a1a802e646c0cedd7f4a5345cd317de30ac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 22 Oct 2013 18:16:34 +0530
Subject: [PATCH 1055/1154] When bulk deleting formats use a single temp dir

When bulk deleting formats, use a single temporary directory for the
deleted files. This makes restoring them from the recycle bin a little
cleaner. Also might fix the reported issue with windows choking on
creating a large number of folders.
---
 src/calibre/db/backend.py          | 20 ++++++++-----
 src/calibre/db/cache.py            |  5 +++-
 src/calibre/gui2/actions/delete.py | 47 +++++++++++++++---------------
 src/calibre/library/cli.py         |  7 +++--
 4 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 851b9df1d6..1b87da8548 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -1199,14 +1199,18 @@ class DB(object):
     def has_format(self, book_id, fmt, fname, path):
         return self.format_abspath(book_id, fmt, fname, path) is not None
 
-    def remove_format(self, book_id, fmt, fname, path):
-        path = self.format_abspath(book_id, fmt, fname, path)
-        if path is not None:
-            try:
-                delete_service().delete_files((path,), self.library_path)
-            except:
-                import traceback
-                traceback.print_exc()
+    def remove_formats(self, remove_map):
+        paths = []
+        for book_id, removals in remove_map.iteritems():
+            for fmt, fname, path in removals:
+                path = self.format_abspath(book_id, fmt, fname, path)
+                if path is not None:
+                    paths.append(path)
+        try:
+            delete_service().delete_files(paths, self.library_path)
+        except:
+            import traceback
+            traceback.print_exc()
 
     def cover_last_modified(self, path):
         path = os.path.abspath(os.path.join(self.library_path, path, 'cover.jpg'))
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 0313e6ffe6..bf3a807984 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -1280,6 +1280,7 @@ class Cache(object):
                 self.format_metadata_cache[book_id].pop(fmt, None)
 
         if not db_only:
+            removes = defaultdict(set)
             for book_id, fmts in formats_map.iteritems():
                 try:
                     path = self._field_for('path', book_id).replace('/', os.sep)
@@ -1291,7 +1292,9 @@ class Cache(object):
                     except:
                         continue
                     if name and path:
-                        self.backend.remove_format(book_id, fmt, name, path)
+                        removes[book_id].add((fmt, name, path))
+            if removes:
+                self.backend.remove_formats(removes)
 
         size_map = table.remove_formats(formats_map, self.backend)
         self.fields['size'].table.update_sizes(size_map)
diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py
index ddd71ee18f..654da7d6a3 100644
--- a/src/calibre/gui2/actions/delete.py
+++ b/src/calibre/gui2/actions/delete.py
@@ -196,12 +196,10 @@ class DeleteAction(InterfaceAction):
             _('Choose formats to be deleted'), ids)
         if not fmts:
             return
-        for id in ids:
-            for fmt in fmts:
-                self.gui.library_view.model().db.remove_format(id, fmt,
-                        index_is_id=True, notify=False)
-        self.gui.library_view.model().refresh_ids(ids)
-        self.gui.library_view.model().current_changed(self.gui.library_view.currentIndex(),
+        m = self.gui.library_view.model()
+        m.db.new_api.remove_formats({book_id:fmts for book_id in ids})
+        m.refresh_ids(ids)
+        m.current_changed(self.gui.library_view.currentIndex(),
                 self.gui.library_view.currentIndex())
         if ids:
             self.gui.tags_view.recount()
@@ -216,8 +214,10 @@ class DeleteAction(InterfaceAction):
             exclude=True)
         if fmts is None:
             return
+        m = self.gui.library_view.model()
+        removals = {}
         for id in ids:
-            bfmts = self.gui.library_view.model().db.formats(id, index_is_id=True)
+            bfmts = m.db.formats(id, index_is_id=True)
             if bfmts is None:
                 continue
             bfmts = set([x.lower() for x in bfmts.split(',')])
@@ -225,14 +225,14 @@ class DeleteAction(InterfaceAction):
             if bfmts - rfmts:
                 # Do not delete if it will leave the book with no
                 # formats
-                for fmt in rfmts:
-                    self.gui.library_view.model().db.remove_format(id, fmt,
-                            index_is_id=True, notify=False)
-        self.gui.library_view.model().refresh_ids(ids)
-        self.gui.library_view.model().current_changed(self.gui.library_view.currentIndex(),
-                self.gui.library_view.currentIndex())
-        if ids:
-            self.gui.tags_view.recount()
+                removals[id] = rfmts
+        if removals:
+            m.db.new_api.remove_formats(removals)
+            m.refresh_ids(ids)
+            m.current_changed(self.gui.library_view.currentIndex(),
+                    self.gui.library_view.currentIndex())
+            if ids:
+                self.gui.tags_view.recount()
 
     def delete_all_formats(self, *args):
         ids = self._get_selected_ids()
@@ -244,17 +244,18 @@ class DeleteAction(InterfaceAction):
                             +'</p>', 'delete_all_formats', self.gui):
             return
         db = self.gui.library_view.model().db
+        removals = {}
         for id in ids:
             fmts = db.formats(id, index_is_id=True, verify_formats=False)
             if fmts:
-                for fmt in fmts.split(','):
-                    self.gui.library_view.model().db.remove_format(id, fmt,
-                            index_is_id=True, notify=False)
-        self.gui.library_view.model().refresh_ids(ids)
-        self.gui.library_view.model().current_changed(self.gui.library_view.currentIndex(),
-                self.gui.library_view.currentIndex())
-        if ids:
-            self.gui.tags_view.recount()
+                removals[id] = fmts.split(',')
+        if removals:
+            db.new_api.remove_formats(removals)
+            self.gui.library_view.model().refresh_ids(ids)
+            self.gui.library_view.model().current_changed(self.gui.library_view.currentIndex(),
+                    self.gui.library_view.currentIndex())
+            if ids:
+                self.gui.tags_view.recount()
 
     def remove_matching_books_from_device(self, *args):
         if not self.gui.device_manager.is_device_present:
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index f0760e7439..e52525be9f 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -398,13 +398,14 @@ def command_add(args, dbpath):
     return 0
 
 def do_remove(db, ids):
+    book_ids = set()
     for x in ids:
         if isinstance(x, int):
-            db.delete_book(x)
+            book_ids.add(x)
         else:
-            for y in x:
-                db.delete_book(y)
+            book_ids |= set(x)
 
+    db.new_api.remove_books(book_ids)
     db.clean()
     send_message()
 

From f0e64e56a2dfd2565a337d71aef1032b046ac0d2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 22 Oct 2013 20:46:24 +0530
Subject: [PATCH 1056/1154] MOBI Output: Fix handling of white-space:pre-wrap

MOBI Output: Fix text marked with white-space:pre-wrap causing the
Kindle to break lines at arbitrary points inside words. Fixes #1240235 [Private bug](https://bugs.launchpad.net/calibre/+bug/1240235)
---
 src/calibre/ebooks/mobi/mobiml.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/calibre/ebooks/mobi/mobiml.py b/src/calibre/ebooks/mobi/mobiml.py
index 30ef270338..64c8e208ca 100644
--- a/src/calibre/ebooks/mobi/mobiml.py
+++ b/src/calibre/ebooks/mobi/mobiml.py
@@ -75,6 +75,7 @@ class FormatState(object):
         self.strikethrough = False
         self.underline = False
         self.preserve = False
+        self.pre_wrap = False
         self.family = 'serif'
         self.bgcolor = 'transparent'
         self.fgcolor = 'black'
@@ -88,6 +89,7 @@ class FormatState(object):
                and self.bold == other.bold \
                and self.href == other.href \
                and self.preserve == other.preserve \
+               and self.pre_wrap == other.pre_wrap \
                and self.family == other.family \
                and self.bgcolor == other.bgcolor \
                and self.fgcolor == other.fgcolor \
@@ -136,8 +138,14 @@ class MobiMLizer(object):
             return "%dpt" % int(round(ptsize))
         return "%dem" % int(round(ptsize / embase))
 
-    def preize_text(self, text):
-        text = unicode(text).replace(u' ', u'\xa0')
+    def preize_text(self, text, pre_wrap=False):
+        text = unicode(text)
+        if pre_wrap:
+            # Replace n consecutive spaces with n-1 NBSP + space
+            text = re.sub(r' {2,}', lambda m:(u'\xa0'*(len(m.group())-1) + u' '), text)
+        else:
+            text = text.replace(u' ', u'\xa0')
+
         text = text.replace('\r\n', '\n')
         text = text.replace('\r', '\n')
         lines = text.split('\n')
@@ -283,7 +291,7 @@ class MobiMLizer(object):
             bstate.inline = inline
         bstate.istate = istate
         inline = bstate.inline
-        content = self.preize_text(text) if istate.preserve else [text]
+        content = self.preize_text(text, pre_wrap=istate.pre_wrap) if istate.preserve or istate.pre_wrap else [text]
         for item in content:
             if isinstance(item, basestring):
                 if len(inline) == 0:
@@ -377,7 +385,8 @@ class MobiMLizer(object):
         istate.italic = True if style['font-style'] == 'italic' else False
         weight = style['font-weight']
         istate.bold = weight in ('bold', 'bolder') or asfloat(weight) > 400
-        istate.preserve = (style['white-space'] in ('pre', 'pre-wrap'))
+        istate.preserve = style['white-space'] == 'pre'
+        istate.pre_wrap = style['white-space'] == 'pre-wrap'
         istate.bgcolor  = style['background-color']
         istate.fgcolor  = style['color']
         istate.strikethrough = style.effective_text_decoration == 'line-through'
@@ -487,7 +496,7 @@ class MobiMLizer(object):
             elem.tail = u'\u201d' + t
         text = None
         if elem.text:
-            if istate.preserve:
+            if istate.preserve or istate.pre_wrap:
                 text = elem.text
             elif (len(elem) > 0 and isspace(elem.text) and hasattr(elem[0].tag, 'rpartition') and
                   elem[0].tag.rpartition('}')[-1] not in INLINE_TAGS):
@@ -545,7 +554,7 @@ class MobiMLizer(object):
             self.mobimlize_elem(child, stylizer, bstate, istates)
             tail = None
             if child.tail:
-                if istate.preserve:
+                if istate.preserve or istate.pre_wrap:
                     tail = child.tail
                 elif bstate.para is None and isspace(child.tail):
                     tail = None

From 07bccb9761d4b31fb93d7905ca0174e613f65778 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 07:13:37 +0530
Subject: [PATCH 1057/1154] Add entry to crash/freeze FAQ for native file
 dialog problems

---
 manual/faq.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/manual/faq.rst b/manual/faq.rst
index 66f6ee383f..b718ce6b75 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -791,6 +791,13 @@ There are several possible things I know of, that can cause this:
       that prevent 64-bit |app| from working properly. If you are using the 64-bit
       version of |app| try switching to the 32-bit version.
 
+    * If the crashes happen specifically when you are using a file open dialog,
+      like clicking on the Add Books button or the Save to Disk button, then
+      you may have an issue with the windows file open dialogs on your
+      computer. You can tell calibre to use its own file open dialogs by
+      setting the environment variable ``CALIBRE_NO_NATIVE_FILEDIALOGS=1``.
+      See `How to set environment variables in windows <http://www.computerhope.com/issues/ch000549.htm>`_.
+
 If none of the above apply to you, then there is some other program on your
 computer that is interfering with |app|. First reboot your computer in safe
 mode, to have as few running programs as possible, and see if the crashes still

From 18d5d9a3a4662e7b42f5555356afd01f784bdb91 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 10:27:36 +0530
Subject: [PATCH 1058/1154] Better error message when importing test module
 fails

---
 src/calibre/db/tests/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 7a41161572..6499f27d08 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -75,6 +75,8 @@ def run_tests(find_tests=find_tests):
         try:
             for suite in tests:
                 for test in suite._tests:
+                    if test.__class__.__name__ == 'ModuleImportFailure':
+                        raise Exception('Failed to import a test module: %s' % test)
                     for s in test:
                         if s._testMethodName == q:
                             ans = s

From b4bf8710772d1b5973b4a09f3846e7660aae161f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 10:37:14 +0530
Subject: [PATCH 1059/1154] Test framework for tag soup parsing

Also fix a couple of minor bugs in the current html 5 parser (self
closed <style/>, <script/>, <textarea/> tags and re-mapped namespace
prefixes.
---
 src/calibre/ebooks/oeb/base.py                |  2 +-
 src/calibre/ebooks/oeb/parse_utils.py         |  8 +-
 .../ebooks/oeb/polish/tests/parsing.py        | 80 +++++++++++++++++++
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 src/calibre/ebooks/oeb/polish/tests/parsing.py

diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index e0e7a665cd..647c52c581 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -88,7 +88,7 @@ self_closing_bad_tags = {'a', 'abbr', 'address', 'article', 'aside', 'audio', 'b
 'label', 'legend', 'li', 'map', 'mark', 'meter', 'nav', 'ol', 'output', 'p',
 'pre', 'progress', 'q', 'rp', 'rt', 'samp', 'section', 'select', 'small',
 'span', 'strong', 'sub', 'summary', 'sup', 'textarea', 'time', 'ul', 'var',
-'video'}
+'video', 'title', 'script', 'style'}
 
 _self_closing_pat = re.compile(
     r'<(?P<tag>%s)(?=[\s/])(?P<arg>[^>]*)/>'%('|'.join(self_closing_bad_tags)),
diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index dd4ee11cc6..7ee02a27ac 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -83,7 +83,7 @@ def node_depth(node):
 def html5_parse(data, max_nesting_depth=100):
     import html5lib
     # html5lib bug: http://code.google.com/p/html5lib/issues/detail?id=195
-    data = re.sub(r'<\s*title\s*[^>]*/\s*>', '<title></title>', data)
+    data = re.sub(r'<\s*(title|style|script|textarea)\s*[^>]*/\s*>', r'<\1></\1>', data, flags=re.I)
 
     data = html5lib.parse(data, treebuilder='lxml').getroot()
 
@@ -116,6 +116,7 @@ def html5_parse(data, max_nesting_depth=100):
                     prefix = x[11:]
                     namespaces[prefix] = val
 
+        remapped_namespaces = {}
         if namespaces:
             # Some destroyed namespace declarations were found
             p = elem.getparent()
@@ -127,6 +128,7 @@ def html5_parse(data, max_nesting_depth=100):
                 p.remove(elem)
                 elem = clone_element(elem, nsmap=namespaces)
                 p.insert(idx, elem)
+                remapped_namespaces = {ns:namespaces[ns] for ns in set(namespaces) - set(elem.nsmap)}
 
         b = barename(elem.tag)
         idx = b.find('U0003A')
@@ -135,6 +137,8 @@ def html5_parse(data, max_nesting_depth=100):
             ns = elem.nsmap.get(prefix, None)
             if ns is None:
                 ns = non_html5_namespaces.get(prefix, None)
+            if ns is None:
+                ns = remapped_namespaces.get(prefix, None)
             if ns is not None:
                 elem.tag = '{%s}%s'%(ns, tag)
 
@@ -145,6 +149,8 @@ def html5_parse(data, max_nesting_depth=100):
                 ns = elem.nsmap.get(prefix, None)
                 if ns is None:
                     ns = non_html5_namespaces.get(prefix, None)
+                if ns is None:
+                    ns = remapped_namespaces.get(prefix, None)
                 if ns is not None:
                     elem.attrib['{%s}%s'%(ns, tag)] = elem.attrib.pop(b)
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
new file mode 100644
index 0000000000..ba47735018
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from lxml import etree
+
+from calibre.ebooks.oeb.polish.tests.base import BaseTest
+from calibre.ebooks.oeb.base import XPath, XHTML_NS, SVG_NS, XLINK_NS
+from calibre.ebooks.oeb.parse_utils import html5_parse
+
+def nonvoid_cdata_elements(test, parse_function):
+    ''' If self closed version of non-void cdata elements like <title/> are
+    present, the HTML5 parsing algorithm treats all following data as CDATA '''
+    markup = '''
+    <html> <head><{0}/></head> <body id="test"> </html>
+    '''
+    for tag in ('title', 'style', 'script', 'textarea'):
+        for x in (tag, tag.upper(), '\n' + tag, tag + ' id="xxx" '):
+            root = parse_function(markup.format(x))
+            test.assertEqual(
+                len(XPath('//h:body[@id="test"]')(root)), 1,
+                'Incorrect parsing for <%s/>, parsed markup:\n' % x + etree.tostring(root))
+
+def namespaces(test, parse_function):
+    ae = test.assertEqual
+    markup = ''' <html xmlns="{xhtml}"><head><body id="test"></html> '''.format(xhtml=XHTML_NS)
+    root = parse_function(markup)
+    ae(
+        len(XPath('//h:body[@id="test"]')(root)), 1,
+        'Incorrect parsing, parsed markup:\n' + etree.tostring(root))
+
+    markup = '''
+    <html xmlns="{xhtml}"><head><body id="test">
+    <svg:svg xmlns:svg="{svg}"><svg:image xmlns:xlink="{xlink}" xlink:href="xxx"/></svg:svg>
+    '''.format(xhtml=XHTML_NS, svg=SVG_NS, xlink=XLINK_NS)
+    root = parse_function(markup)
+    err = 'Incorrect parsing, parsed markup:\n' + etree.tostring(root)
+    ae(len(XPath('//h:body[@id="test"]')(root)), 1, err)
+    ae(len(XPath('//svg:svg')(root)), 1, err)
+    ae(len(XPath('//svg:image[@xl:href]')(root)), 1, err)
+
+    markup = '''
+    <html xmlns="{xhtml}"><head><body id="test">
+    <svg xmlns="{svg}" xmlns:xlink="{xlink}" ><image xlink:href="xxx"/></svg>
+    '''.format(xhtml=XHTML_NS, svg=SVG_NS, xlink=XLINK_NS)
+    root = parse_function(markup)
+    err = 'Incorrect parsing, parsed markup:\n' + etree.tostring(root)
+    ae(len(XPath('//h:body[@id="test"]')(root)), 1, err)
+    ae(len(XPath('//svg:svg')(root)), 1, err)
+    ae(len(XPath('//svg:image[@xl:href]')(root)), 1, err)
+
+    markup = '<html><body><svg><image xlink:href="xxx"></svg>'
+    root = parse_function(markup)
+    err = 'Namespaces not created, parsed markup:\n' + etree.tostring(root)
+    ae(len(XPath('//svg:svg')(root)), 1, err)
+    ae(len(XPath('//svg:image[@xl:href]')(root)), 1, err)
+
+    markup = '<html><body><ns1:tag1 xmlns:ns1="NS"><ns2:tag2 xmlns:ns2="NS" ns1:id="test"/><ns1:tag3 xmlns:ns1="NS2" ns1:id="test"/></ns1:tag1>'
+    root = parse_function(markup)
+    err = 'Arbitrary namespaces not preserved, parsed markup:\n' + etree.tostring(root)
+    def xpath(expr):
+        return etree.XPath(expr, namespaces={'ns1':'NS', 'ns2':'NS2'})(root)
+    ae(len(xpath('//ns1:tag1')), 1, err)
+    ae(len(xpath('//ns1:tag2')), 1, err)
+    ae(len(xpath('//ns2:tag3')), 1, err)
+    ae(len(xpath('//ns1:tag2[@ns1:id="test"]')), 1, err)
+    ae(len(xpath('//ns2:tag3[@ns2:id="test"]')), 1, err)
+
+all_checks = (nonvoid_cdata_elements, namespaces)
+
+class ParsingTests(BaseTest):
+
+    def test_conversion_parser(self):
+        ' Test parsing with the parser used for conversion '
+        for test in all_checks:
+            test(self, html5_parse)

From b9421065f9558bebaf8f0b1a978de89dcc24cff0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 11:04:05 +0530
Subject: [PATCH 1060/1154] Update HTML 5 parser used in calibre
 (html5lib-python)

---
 src/calibre/__init__.py                       |    4 +-
 src/calibre/ebooks/oeb/parse_utils.py         |   11 +-
 .../ebooks/oeb/polish/tests/parsing.py        |    3 +-
 src/calibre/utils/html5_entities.py           | 2125 --------
 src/html5lib/__init__.py                      |   20 +-
 src/html5lib/constants.py                     | 3177 ++++++++---
 src/html5lib/filters/_base.py                 |    2 +
 .../filters/alphabeticalattributes.py         |   20 +
 src/html5lib/filters/formfiller.py            |  127 -
 src/html5lib/filters/inject_meta_charset.py   |   40 +-
 src/html5lib/filters/lint.py                  |   63 +-
 src/html5lib/filters/optionaltags.py          |   15 +-
 src/html5lib/filters/sanitizer.py             |   10 +-
 src/html5lib/filters/whitespace.py            |   21 +-
 src/html5lib/html5parser.py                   | 4774 +++++++++--------
 src/html5lib/ihatexml.py                      |  184 +-
 src/html5lib/inputstream.py                   |  709 +--
 src/html5lib/sanitizer.py                     |  377 +-
 src/html5lib/serializer/__init__.py           |   15 +-
 src/html5lib/serializer/htmlserializer.py     |  274 +-
 src/html5lib/serializer/xhtmlserializer.py    |    9 -
 src/html5lib/tokenizer.py                     |  937 ++--
 src/html5lib/tokenizer_old.py                 | 1212 -----
 src/html5lib/treeadapters/__init__.py         |    0
 src/html5lib/treeadapters/sax.py              |   44 +
 src/html5lib/treebuilders/__init__.py         |   78 +-
 src/html5lib/treebuilders/_base.py            |  158 +-
 src/html5lib/treebuilders/dom.py              |  203 +-
 src/html5lib/treebuilders/etree.py            |  278 +-
 src/html5lib/treebuilders/etree_lxml.py       |  286 +-
 src/html5lib/treebuilders/simpletree.py       |  248 -
 src/html5lib/treebuilders/soup.py             |  228 -
 src/html5lib/treewalkers/__init__.py          |   29 +-
 src/html5lib/treewalkers/_base.py             |  151 +-
 src/html5lib/treewalkers/dom.py               |   17 +-
 src/html5lib/treewalkers/etree.py             |   74 +-
 src/html5lib/treewalkers/genshistream.py      |   59 +-
 src/html5lib/treewalkers/lxmletree.py         |   95 +-
 src/html5lib/treewalkers/pulldom.py           |   17 +-
 src/html5lib/treewalkers/simpletree.py        |   72 -
 src/html5lib/treewalkers/soup.py              |   59 -
 src/html5lib/trie/__init__.py                 |   12 +
 src/html5lib/trie/_base.py                    |   37 +
 src/html5lib/trie/datrie.py                   |   44 +
 src/html5lib/trie/py.py                       |   67 +
 src/html5lib/utils.py                         |  156 +-
 46 files changed, 7609 insertions(+), 8932 deletions(-)
 delete mode 100644 src/calibre/utils/html5_entities.py
 create mode 100644 src/html5lib/filters/alphabeticalattributes.py
 delete mode 100644 src/html5lib/filters/formfiller.py
 delete mode 100644 src/html5lib/serializer/xhtmlserializer.py
 delete mode 100644 src/html5lib/tokenizer_old.py
 create mode 100644 src/html5lib/treeadapters/__init__.py
 create mode 100644 src/html5lib/treeadapters/sax.py
 delete mode 100644 src/html5lib/treebuilders/simpletree.py
 delete mode 100644 src/html5lib/treebuilders/soup.py
 delete mode 100644 src/html5lib/treewalkers/simpletree.py
 delete mode 100644 src/html5lib/treewalkers/soup.py
 create mode 100644 src/html5lib/trie/__init__.py
 create mode 100644 src/html5lib/trie/_base.py
 create mode 100644 src/html5lib/trie/datrie.py
 create mode 100644 src/html5lib/trie/py.py

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 1383fae540..fdfb91d7bb 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -562,9 +562,9 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252',
             return check(chr(num).decode(encoding))
         except UnicodeDecodeError:
             return check(my_unichr(num))
-    from calibre.utils.html5_entities import entity_map
+    from html5lib.constants import entities
     try:
-        return check(entity_map[ent])
+        return check(entities[ent])
     except KeyError:
         pass
     from htmlentitydefs import name2codepoint
diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index 7ee02a27ac..df315df775 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -81,11 +81,14 @@ def node_depth(node):
     return ans
 
 def html5_parse(data, max_nesting_depth=100):
-    import html5lib
-    # html5lib bug: http://code.google.com/p/html5lib/issues/detail?id=195
-    data = re.sub(r'<\s*(title|style|script|textarea)\s*[^>]*/\s*>', r'<\1></\1>', data, flags=re.I)
+    import html5lib, warnings
+    from html5lib.constants import cdataElements, rcdataElements
+    # HTML5 parsing algorithm idiocy: http://code.google.com/p/html5lib/issues/detail?id=195
+    data = re.sub(r'<\s*(%s)\s*[^>]*/\s*>' % ('|'.join(cdataElements|rcdataElements)), r'<\1></\1>', data, flags=re.I)
 
-    data = html5lib.parse(data, treebuilder='lxml').getroot()
+    with warnings.catch_warnings():
+        warnings.simplefilter('ignore')
+        data = html5lib.parse(data, treebuilder='lxml').getroot()
 
     # Check that the asinine HTML 5 algorithm did not result in a tree with
     # insane nesting depths
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index ba47735018..7b9bda7e21 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -7,6 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from lxml import etree
+from html5lib.constants import cdataElements, rcdataElements
 
 from calibre.ebooks.oeb.polish.tests.base import BaseTest
 from calibre.ebooks.oeb.base import XPath, XHTML_NS, SVG_NS, XLINK_NS
@@ -18,7 +19,7 @@ def nonvoid_cdata_elements(test, parse_function):
     markup = '''
     <html> <head><{0}/></head> <body id="test"> </html>
     '''
-    for tag in ('title', 'style', 'script', 'textarea'):
+    for tag in cdataElements | rcdataElements:
         for x in (tag, tag.upper(), '\n' + tag, tag + ' id="xxx" '):
             root = parse_function(markup.format(x))
             test.assertEqual(
diff --git a/src/calibre/utils/html5_entities.py b/src/calibre/utils/html5_entities.py
deleted file mode 100644
index 0c4caef8fc..0000000000
--- a/src/calibre/utils/html5_entities.py
+++ /dev/null
@@ -1,2125 +0,0 @@
-entity_map = {'AElig': u'\xc6',
- 'AMP': u'&',
- 'Aacute': u'\xc1',
- 'Abreve': u'\u0102',
- 'Acirc': u'\xc2',
- 'Acy': u'\u0410',
- 'Afr': u'\U0001d504',
- 'Agrave': u'\xc0',
- 'Alpha': u'\u0391',
- 'Amacr': u'\u0100',
- 'And': u'\u2a53',
- 'Aogon': u'\u0104',
- 'Aopf': u'\U0001d538',
- 'ApplyFunction': u'\u2061',
- 'Aring': u'\xc5',
- 'Ascr': u'\U0001d49c',
- 'Assign': u'\u2254',
- 'Atilde': u'\xc3',
- 'Auml': u'\xc4',
- 'Backslash': u'\u2216',
- 'Barv': u'\u2ae7',
- 'Barwed': u'\u2306',
- 'Bcy': u'\u0411',
- 'Because': u'\u2235',
- 'Bernoullis': u'\u212c',
- 'Beta': u'\u0392',
- 'Bfr': u'\U0001d505',
- 'Bopf': u'\U0001d539',
- 'Breve': u'\u02d8',
- 'Bscr': u'\u212c',
- 'Bumpeq': u'\u224e',
- 'CHcy': u'\u0427',
- 'COPY': u'\xa9',
- 'Cacute': u'\u0106',
- 'Cap': u'\u22d2',
- 'CapitalDifferentialD': u'\u2145',
- 'Cayleys': u'\u212d',
- 'Ccaron': u'\u010c',
- 'Ccedil': u'\xc7',
- 'Ccirc': u'\u0108',
- 'Cconint': u'\u2230',
- 'Cdot': u'\u010a',
- 'Cedilla': u'\xb8',
- 'CenterDot': u'\xb7',
- 'Cfr': u'\u212d',
- 'Chi': u'\u03a7',
- 'CircleDot': u'\u2299',
- 'CircleMinus': u'\u2296',
- 'CirclePlus': u'\u2295',
- 'CircleTimes': u'\u2297',
- 'ClockwiseContourIntegral': u'\u2232',
- 'CloseCurlyDoubleQuote': u'\u201d',
- 'CloseCurlyQuote': u'\u2019',
- 'Colon': u'\u2237',
- 'Colone': u'\u2a74',
- 'Congruent': u'\u2261',
- 'Conint': u'\u222f',
- 'ContourIntegral': u'\u222e',
- 'Copf': u'\u2102',
- 'Coproduct': u'\u2210',
- 'CounterClockwiseContourIntegral': u'\u2233',
- 'Cross': u'\u2a2f',
- 'Cscr': u'\U0001d49e',
- 'Cup': u'\u22d3',
- 'CupCap': u'\u224d',
- 'DD': u'\u2145',
- 'DDotrahd': u'\u2911',
- 'DJcy': u'\u0402',
- 'DScy': u'\u0405',
- 'DZcy': u'\u040f',
- 'Dagger': u'\u2021',
- 'Darr': u'\u21a1',
- 'Dashv': u'\u2ae4',
- 'Dcaron': u'\u010e',
- 'Dcy': u'\u0414',
- 'Del': u'\u2207',
- 'Delta': u'\u0394',
- 'Dfr': u'\U0001d507',
- 'DiacriticalAcute': u'\xb4',
- 'DiacriticalDot': u'\u02d9',
- 'DiacriticalDoubleAcute': u'\u02dd',
- 'DiacriticalGrave': u'`',
- 'DiacriticalTilde': u'\u02dc',
- 'Diamond': u'\u22c4',
- 'DifferentialD': u'\u2146',
- 'Dopf': u'\U0001d53b',
- 'Dot': u'\xa8',
- 'DotDot': u'\u20dc',
- 'DotEqual': u'\u2250',
- 'DoubleContourIntegral': u'\u222f',
- 'DoubleDot': u'\xa8',
- 'DoubleDownArrow': u'\u21d3',
- 'DoubleLeftArrow': u'\u21d0',
- 'DoubleLeftRightArrow': u'\u21d4',
- 'DoubleLeftTee': u'\u2ae4',
- 'DoubleLongLeftArrow': u'\u27f8',
- 'DoubleLongLeftRightArrow': u'\u27fa',
- 'DoubleLongRightArrow': u'\u27f9',
- 'DoubleRightArrow': u'\u21d2',
- 'DoubleRightTee': u'\u22a8',
- 'DoubleUpArrow': u'\u21d1',
- 'DoubleUpDownArrow': u'\u21d5',
- 'DoubleVerticalBar': u'\u2225',
- 'DownArrow': u'\u2193',
- 'DownArrowBar': u'\u2913',
- 'DownArrowUpArrow': u'\u21f5',
- 'DownBreve': u'\u0311',
- 'DownLeftRightVector': u'\u2950',
- 'DownLeftTeeVector': u'\u295e',
- 'DownLeftVector': u'\u21bd',
- 'DownLeftVectorBar': u'\u2956',
- 'DownRightTeeVector': u'\u295f',
- 'DownRightVector': u'\u21c1',
- 'DownRightVectorBar': u'\u2957',
- 'DownTee': u'\u22a4',
- 'DownTeeArrow': u'\u21a7',
- 'Downarrow': u'\u21d3',
- 'Dscr': u'\U0001d49f',
- 'Dstrok': u'\u0110',
- 'ENG': u'\u014a',
- 'ETH': u'\xd0',
- 'Eacute': u'\xc9',
- 'Ecaron': u'\u011a',
- 'Ecirc': u'\xca',
- 'Ecy': u'\u042d',
- 'Edot': u'\u0116',
- 'Efr': u'\U0001d508',
- 'Egrave': u'\xc8',
- 'Element': u'\u2208',
- 'Emacr': u'\u0112',
- 'EmptySmallSquare': u'\u25fb',
- 'EmptyVerySmallSquare': u'\u25ab',
- 'Eogon': u'\u0118',
- 'Eopf': u'\U0001d53c',
- 'Epsilon': u'\u0395',
- 'Equal': u'\u2a75',
- 'EqualTilde': u'\u2242',
- 'Equilibrium': u'\u21cc',
- 'Escr': u'\u2130',
- 'Esim': u'\u2a73',
- 'Eta': u'\u0397',
- 'Euml': u'\xcb',
- 'Exists': u'\u2203',
- 'ExponentialE': u'\u2147',
- 'Fcy': u'\u0424',
- 'Ffr': u'\U0001d509',
- 'FilledSmallSquare': u'\u25fc',
- 'FilledVerySmallSquare': u'\u25aa',
- 'Fopf': u'\U0001d53d',
- 'ForAll': u'\u2200',
- 'Fouriertrf': u'\u2131',
- 'Fscr': u'\u2131',
- 'GJcy': u'\u0403',
- 'GT': u'>',
- 'Gamma': u'\u0393',
- 'Gammad': u'\u03dc',
- 'Gbreve': u'\u011e',
- 'Gcedil': u'\u0122',
- 'Gcirc': u'\u011c',
- 'Gcy': u'\u0413',
- 'Gdot': u'\u0120',
- 'Gfr': u'\U0001d50a',
- 'Gg': u'\u22d9',
- 'Gopf': u'\U0001d53e',
- 'GreaterEqual': u'\u2265',
- 'GreaterEqualLess': u'\u22db',
- 'GreaterFullEqual': u'\u2267',
- 'GreaterGreater': u'\u2aa2',
- 'GreaterLess': u'\u2277',
- 'GreaterSlantEqual': u'\u2a7e',
- 'GreaterTilde': u'\u2273',
- 'Gscr': u'\U0001d4a2',
- 'Gt': u'\u226b',
- 'HARDcy': u'\u042a',
- 'Hacek': u'\u02c7',
- 'Hat': u'^',
- 'Hcirc': u'\u0124',
- 'Hfr': u'\u210c',
- 'HilbertSpace': u'\u210b',
- 'Hopf': u'\u210d',
- 'HorizontalLine': u'\u2500',
- 'Hscr': u'\u210b',
- 'Hstrok': u'\u0126',
- 'HumpDownHump': u'\u224e',
- 'HumpEqual': u'\u224f',
- 'IEcy': u'\u0415',
- 'IJlig': u'\u0132',
- 'IOcy': u'\u0401',
- 'Iacute': u'\xcd',
- 'Icirc': u'\xce',
- 'Icy': u'\u0418',
- 'Idot': u'\u0130',
- 'Ifr': u'\u2111',
- 'Igrave': u'\xcc',
- 'Im': u'\u2111',
- 'Imacr': u'\u012a',
- 'ImaginaryI': u'\u2148',
- 'Implies': u'\u21d2',
- 'Int': u'\u222c',
- 'Integral': u'\u222b',
- 'Intersection': u'\u22c2',
- 'InvisibleComma': u'\u2063',
- 'InvisibleTimes': u'\u2062',
- 'Iogon': u'\u012e',
- 'Iopf': u'\U0001d540',
- 'Iota': u'\u0399',
- 'Iscr': u'\u2110',
- 'Itilde': u'\u0128',
- 'Iukcy': u'\u0406',
- 'Iuml': u'\xcf',
- 'Jcirc': u'\u0134',
- 'Jcy': u'\u0419',
- 'Jfr': u'\U0001d50d',
- 'Jopf': u'\U0001d541',
- 'Jscr': u'\U0001d4a5',
- 'Jsercy': u'\u0408',
- 'Jukcy': u'\u0404',
- 'KHcy': u'\u0425',
- 'KJcy': u'\u040c',
- 'Kappa': u'\u039a',
- 'Kcedil': u'\u0136',
- 'Kcy': u'\u041a',
- 'Kfr': u'\U0001d50e',
- 'Kopf': u'\U0001d542',
- 'Kscr': u'\U0001d4a6',
- 'LJcy': u'\u0409',
- 'LT': u'<',
- 'Lacute': u'\u0139',
- 'Lambda': u'\u039b',
- 'Lang': u'\u27ea',
- 'Laplacetrf': u'\u2112',
- 'Larr': u'\u219e',
- 'Lcaron': u'\u013d',
- 'Lcedil': u'\u013b',
- 'Lcy': u'\u041b',
- 'LeftAngleBracket': u'\u27e8',
- 'LeftArrow': u'\u2190',
- 'LeftArrowBar': u'\u21e4',
- 'LeftArrowRightArrow': u'\u21c6',
- 'LeftCeiling': u'\u2308',
- 'LeftDoubleBracket': u'\u27e6',
- 'LeftDownTeeVector': u'\u2961',
- 'LeftDownVector': u'\u21c3',
- 'LeftDownVectorBar': u'\u2959',
- 'LeftFloor': u'\u230a',
- 'LeftRightArrow': u'\u2194',
- 'LeftRightVector': u'\u294e',
- 'LeftTee': u'\u22a3',
- 'LeftTeeArrow': u'\u21a4',
- 'LeftTeeVector': u'\u295a',
- 'LeftTriangle': u'\u22b2',
- 'LeftTriangleBar': u'\u29cf',
- 'LeftTriangleEqual': u'\u22b4',
- 'LeftUpDownVector': u'\u2951',
- 'LeftUpTeeVector': u'\u2960',
- 'LeftUpVector': u'\u21bf',
- 'LeftUpVectorBar': u'\u2958',
- 'LeftVector': u'\u21bc',
- 'LeftVectorBar': u'\u2952',
- 'Leftarrow': u'\u21d0',
- 'Leftrightarrow': u'\u21d4',
- 'LessEqualGreater': u'\u22da',
- 'LessFullEqual': u'\u2266',
- 'LessGreater': u'\u2276',
- 'LessLess': u'\u2aa1',
- 'LessSlantEqual': u'\u2a7d',
- 'LessTilde': u'\u2272',
- 'Lfr': u'\U0001d50f',
- 'Ll': u'\u22d8',
- 'Lleftarrow': u'\u21da',
- 'Lmidot': u'\u013f',
- 'LongLeftArrow': u'\u27f5',
- 'LongLeftRightArrow': u'\u27f7',
- 'LongRightArrow': u'\u27f6',
- 'Longleftarrow': u'\u27f8',
- 'Longleftrightarrow': u'\u27fa',
- 'Longrightarrow': u'\u27f9',
- 'Lopf': u'\U0001d543',
- 'LowerLeftArrow': u'\u2199',
- 'LowerRightArrow': u'\u2198',
- 'Lscr': u'\u2112',
- 'Lsh': u'\u21b0',
- 'Lstrok': u'\u0141',
- 'Lt': u'\u226a',
- 'Map': u'\u2905',
- 'Mcy': u'\u041c',
- 'MediumSpace': u'\u205f',
- 'Mellintrf': u'\u2133',
- 'Mfr': u'\U0001d510',
- 'MinusPlus': u'\u2213',
- 'Mopf': u'\U0001d544',
- 'Mscr': u'\u2133',
- 'Mu': u'\u039c',
- 'NJcy': u'\u040a',
- 'Nacute': u'\u0143',
- 'Ncaron': u'\u0147',
- 'Ncedil': u'\u0145',
- 'Ncy': u'\u041d',
- 'NegativeMediumSpace': u'\u200b',
- 'NegativeThickSpace': u'\u200b',
- 'NegativeThinSpace': u'\u200b',
- 'NegativeVeryThinSpace': u'\u200b',
- 'NestedGreaterGreater': u'\u226b',
- 'NestedLessLess': u'\u226a',
- 'NewLine': u'\n',
- 'Nfr': u'\U0001d511',
- 'NoBreak': u'\u2060',
- 'NonBreakingSpace': u'\xa0',
- 'Nopf': u'\u2115',
- 'Not': u'\u2aec',
- 'NotCongruent': u'\u2262',
- 'NotCupCap': u'\u226d',
- 'NotDoubleVerticalBar': u'\u2226',
- 'NotElement': u'\u2209',
- 'NotEqual': u'\u2260',
- 'NotEqualTilde': u'\u2242\u0338',
- 'NotExists': u'\u2204',
- 'NotGreater': u'\u226f',
- 'NotGreaterEqual': u'\u2271',
- 'NotGreaterFullEqual': u'\u2267\u0338',
- 'NotGreaterGreater': u'\u226b\u0338',
- 'NotGreaterLess': u'\u2279',
- 'NotGreaterSlantEqual': u'\u2a7e\u0338',
- 'NotGreaterTilde': u'\u2275',
- 'NotHumpDownHump': u'\u224e\u0338',
- 'NotHumpEqual': u'\u224f\u0338',
- 'NotLeftTriangle': u'\u22ea',
- 'NotLeftTriangleBar': u'\u29cf\u0338',
- 'NotLeftTriangleEqual': u'\u22ec',
- 'NotLess': u'\u226e',
- 'NotLessEqual': u'\u2270',
- 'NotLessGreater': u'\u2278',
- 'NotLessLess': u'\u226a\u0338',
- 'NotLessSlantEqual': u'\u2a7d\u0338',
- 'NotLessTilde': u'\u2274',
- 'NotNestedGreaterGreater': u'\u2aa2\u0338',
- 'NotNestedLessLess': u'\u2aa1\u0338',
- 'NotPrecedes': u'\u2280',
- 'NotPrecedesEqual': u'\u2aaf\u0338',
- 'NotPrecedesSlantEqual': u'\u22e0',
- 'NotReverseElement': u'\u220c',
- 'NotRightTriangle': u'\u22eb',
- 'NotRightTriangleBar': u'\u29d0\u0338',
- 'NotRightTriangleEqual': u'\u22ed',
- 'NotSquareSubset': u'\u228f\u0338',
- 'NotSquareSubsetEqual': u'\u22e2',
- 'NotSquareSuperset': u'\u2290\u0338',
- 'NotSquareSupersetEqual': u'\u22e3',
- 'NotSubset': u'\u2282\u20d2',
- 'NotSubsetEqual': u'\u2288',
- 'NotSucceeds': u'\u2281',
- 'NotSucceedsEqual': u'\u2ab0\u0338',
- 'NotSucceedsSlantEqual': u'\u22e1',
- 'NotSucceedsTilde': u'\u227f\u0338',
- 'NotSuperset': u'\u2283\u20d2',
- 'NotSupersetEqual': u'\u2289',
- 'NotTilde': u'\u2241',
- 'NotTildeEqual': u'\u2244',
- 'NotTildeFullEqual': u'\u2247',
- 'NotTildeTilde': u'\u2249',
- 'NotVerticalBar': u'\u2224',
- 'Nscr': u'\U0001d4a9',
- 'Ntilde': u'\xd1',
- 'Nu': u'\u039d',
- 'OElig': u'\u0152',
- 'Oacute': u'\xd3',
- 'Ocirc': u'\xd4',
- 'Ocy': u'\u041e',
- 'Odblac': u'\u0150',
- 'Ofr': u'\U0001d512',
- 'Ograve': u'\xd2',
- 'Omacr': u'\u014c',
- 'Omega': u'\u03a9',
- 'Omicron': u'\u039f',
- 'Oopf': u'\U0001d546',
- 'OpenCurlyDoubleQuote': u'\u201c',
- 'OpenCurlyQuote': u'\u2018',
- 'Or': u'\u2a54',
- 'Oscr': u'\U0001d4aa',
- 'Oslash': u'\xd8',
- 'Otilde': u'\xd5',
- 'Otimes': u'\u2a37',
- 'Ouml': u'\xd6',
- 'OverBar': u'\u203e',
- 'OverBrace': u'\u23de',
- 'OverBracket': u'\u23b4',
- 'OverParenthesis': u'\u23dc',
- 'PartialD': u'\u2202',
- 'Pcy': u'\u041f',
- 'Pfr': u'\U0001d513',
- 'Phi': u'\u03a6',
- 'Pi': u'\u03a0',
- 'PlusMinus': u'\xb1',
- 'Poincareplane': u'\u210c',
- 'Popf': u'\u2119',
- 'Pr': u'\u2abb',
- 'Precedes': u'\u227a',
- 'PrecedesEqual': u'\u2aaf',
- 'PrecedesSlantEqual': u'\u227c',
- 'PrecedesTilde': u'\u227e',
- 'Prime': u'\u2033',
- 'Product': u'\u220f',
- 'Proportion': u'\u2237',
- 'Proportional': u'\u221d',
- 'Pscr': u'\U0001d4ab',
- 'Psi': u'\u03a8',
- 'QUOT': u'"',
- 'Qfr': u'\U0001d514',
- 'Qopf': u'\u211a',
- 'Qscr': u'\U0001d4ac',
- 'RBarr': u'\u2910',
- 'REG': u'\xae',
- 'Racute': u'\u0154',
- 'Rang': u'\u27eb',
- 'Rarr': u'\u21a0',
- 'Rarrtl': u'\u2916',
- 'Rcaron': u'\u0158',
- 'Rcedil': u'\u0156',
- 'Rcy': u'\u0420',
- 'Re': u'\u211c',
- 'ReverseElement': u'\u220b',
- 'ReverseEquilibrium': u'\u21cb',
- 'ReverseUpEquilibrium': u'\u296f',
- 'Rfr': u'\u211c',
- 'Rho': u'\u03a1',
- 'RightAngleBracket': u'\u27e9',
- 'RightArrow': u'\u2192',
- 'RightArrowBar': u'\u21e5',
- 'RightArrowLeftArrow': u'\u21c4',
- 'RightCeiling': u'\u2309',
- 'RightDoubleBracket': u'\u27e7',
- 'RightDownTeeVector': u'\u295d',
- 'RightDownVector': u'\u21c2',
- 'RightDownVectorBar': u'\u2955',
- 'RightFloor': u'\u230b',
- 'RightTee': u'\u22a2',
- 'RightTeeArrow': u'\u21a6',
- 'RightTeeVector': u'\u295b',
- 'RightTriangle': u'\u22b3',
- 'RightTriangleBar': u'\u29d0',
- 'RightTriangleEqual': u'\u22b5',
- 'RightUpDownVector': u'\u294f',
- 'RightUpTeeVector': u'\u295c',
- 'RightUpVector': u'\u21be',
- 'RightUpVectorBar': u'\u2954',
- 'RightVector': u'\u21c0',
- 'RightVectorBar': u'\u2953',
- 'Rightarrow': u'\u21d2',
- 'Ropf': u'\u211d',
- 'RoundImplies': u'\u2970',
- 'Rrightarrow': u'\u21db',
- 'Rscr': u'\u211b',
- 'Rsh': u'\u21b1',
- 'RuleDelayed': u'\u29f4',
- 'SHCHcy': u'\u0429',
- 'SHcy': u'\u0428',
- 'SOFTcy': u'\u042c',
- 'Sacute': u'\u015a',
- 'Sc': u'\u2abc',
- 'Scaron': u'\u0160',
- 'Scedil': u'\u015e',
- 'Scirc': u'\u015c',
- 'Scy': u'\u0421',
- 'Sfr': u'\U0001d516',
- 'ShortDownArrow': u'\u2193',
- 'ShortLeftArrow': u'\u2190',
- 'ShortRightArrow': u'\u2192',
- 'ShortUpArrow': u'\u2191',
- 'Sigma': u'\u03a3',
- 'SmallCircle': u'\u2218',
- 'Sopf': u'\U0001d54a',
- 'Sqrt': u'\u221a',
- 'Square': u'\u25a1',
- 'SquareIntersection': u'\u2293',
- 'SquareSubset': u'\u228f',
- 'SquareSubsetEqual': u'\u2291',
- 'SquareSuperset': u'\u2290',
- 'SquareSupersetEqual': u'\u2292',
- 'SquareUnion': u'\u2294',
- 'Sscr': u'\U0001d4ae',
- 'Star': u'\u22c6',
- 'Sub': u'\u22d0',
- 'Subset': u'\u22d0',
- 'SubsetEqual': u'\u2286',
- 'Succeeds': u'\u227b',
- 'SucceedsEqual': u'\u2ab0',
- 'SucceedsSlantEqual': u'\u227d',
- 'SucceedsTilde': u'\u227f',
- 'SuchThat': u'\u220b',
- 'Sum': u'\u2211',
- 'Sup': u'\u22d1',
- 'Superset': u'\u2283',
- 'SupersetEqual': u'\u2287',
- 'Supset': u'\u22d1',
- 'THORN': u'\xde',
- 'TRADE': u'\u2122',
- 'TSHcy': u'\u040b',
- 'TScy': u'\u0426',
- 'Tab': u'\t',
- 'Tau': u'\u03a4',
- 'Tcaron': u'\u0164',
- 'Tcedil': u'\u0162',
- 'Tcy': u'\u0422',
- 'Tfr': u'\U0001d517',
- 'Therefore': u'\u2234',
- 'Theta': u'\u0398',
- 'ThickSpace': u'\u205f\u200a',
- 'ThinSpace': u'\u2009',
- 'Tilde': u'\u223c',
- 'TildeEqual': u'\u2243',
- 'TildeFullEqual': u'\u2245',
- 'TildeTilde': u'\u2248',
- 'Topf': u'\U0001d54b',
- 'TripleDot': u'\u20db',
- 'Tscr': u'\U0001d4af',
- 'Tstrok': u'\u0166',
- 'Uacute': u'\xda',
- 'Uarr': u'\u219f',
- 'Uarrocir': u'\u2949',
- 'Ubrcy': u'\u040e',
- 'Ubreve': u'\u016c',
- 'Ucirc': u'\xdb',
- 'Ucy': u'\u0423',
- 'Udblac': u'\u0170',
- 'Ufr': u'\U0001d518',
- 'Ugrave': u'\xd9',
- 'Umacr': u'\u016a',
- 'UnderBar': u'_',
- 'UnderBrace': u'\u23df',
- 'UnderBracket': u'\u23b5',
- 'UnderParenthesis': u'\u23dd',
- 'Union': u'\u22c3',
- 'UnionPlus': u'\u228e',
- 'Uogon': u'\u0172',
- 'Uopf': u'\U0001d54c',
- 'UpArrow': u'\u2191',
- 'UpArrowBar': u'\u2912',
- 'UpArrowDownArrow': u'\u21c5',
- 'UpDownArrow': u'\u2195',
- 'UpEquilibrium': u'\u296e',
- 'UpTee': u'\u22a5',
- 'UpTeeArrow': u'\u21a5',
- 'Uparrow': u'\u21d1',
- 'Updownarrow': u'\u21d5',
- 'UpperLeftArrow': u'\u2196',
- 'UpperRightArrow': u'\u2197',
- 'Upsi': u'\u03d2',
- 'Upsilon': u'\u03a5',
- 'Uring': u'\u016e',
- 'Uscr': u'\U0001d4b0',
- 'Utilde': u'\u0168',
- 'Uuml': u'\xdc',
- 'VDash': u'\u22ab',
- 'Vbar': u'\u2aeb',
- 'Vcy': u'\u0412',
- 'Vdash': u'\u22a9',
- 'Vdashl': u'\u2ae6',
- 'Vee': u'\u22c1',
- 'Verbar': u'\u2016',
- 'Vert': u'\u2016',
- 'VerticalBar': u'\u2223',
- 'VerticalLine': u'|',
- 'VerticalSeparator': u'\u2758',
- 'VerticalTilde': u'\u2240',
- 'VeryThinSpace': u'\u200a',
- 'Vfr': u'\U0001d519',
- 'Vopf': u'\U0001d54d',
- 'Vscr': u'\U0001d4b1',
- 'Vvdash': u'\u22aa',
- 'Wcirc': u'\u0174',
- 'Wedge': u'\u22c0',
- 'Wfr': u'\U0001d51a',
- 'Wopf': u'\U0001d54e',
- 'Wscr': u'\U0001d4b2',
- 'Xfr': u'\U0001d51b',
- 'Xi': u'\u039e',
- 'Xopf': u'\U0001d54f',
- 'Xscr': u'\U0001d4b3',
- 'YAcy': u'\u042f',
- 'YIcy': u'\u0407',
- 'YUcy': u'\u042e',
- 'Yacute': u'\xdd',
- 'Ycirc': u'\u0176',
- 'Ycy': u'\u042b',
- 'Yfr': u'\U0001d51c',
- 'Yopf': u'\U0001d550',
- 'Yscr': u'\U0001d4b4',
- 'Yuml': u'\u0178',
- 'ZHcy': u'\u0416',
- 'Zacute': u'\u0179',
- 'Zcaron': u'\u017d',
- 'Zcy': u'\u0417',
- 'Zdot': u'\u017b',
- 'ZeroWidthSpace': u'\u200b',
- 'Zeta': u'\u0396',
- 'Zfr': u'\u2128',
- 'Zopf': u'\u2124',
- 'Zscr': u'\U0001d4b5',
- 'aacute': u'\xe1',
- 'abreve': u'\u0103',
- 'ac': u'\u223e',
- 'acE': u'\u223e\u0333',
- 'acd': u'\u223f',
- 'acirc': u'\xe2',
- 'acute': u'\xb4',
- 'acy': u'\u0430',
- 'aelig': u'\xe6',
- 'af': u'\u2061',
- 'afr': u'\U0001d51e',
- 'agrave': u'\xe0',
- 'alefsym': u'\u2135',
- 'aleph': u'\u2135',
- 'alpha': u'\u03b1',
- 'amacr': u'\u0101',
- 'amalg': u'\u2a3f',
- 'amp': u'&',
- 'and': u'\u2227',
- 'andand': u'\u2a55',
- 'andd': u'\u2a5c',
- 'andslope': u'\u2a58',
- 'andv': u'\u2a5a',
- 'ang': u'\u2220',
- 'ange': u'\u29a4',
- 'angle': u'\u2220',
- 'angmsd': u'\u2221',
- 'angmsdaa': u'\u29a8',
- 'angmsdab': u'\u29a9',
- 'angmsdac': u'\u29aa',
- 'angmsdad': u'\u29ab',
- 'angmsdae': u'\u29ac',
- 'angmsdaf': u'\u29ad',
- 'angmsdag': u'\u29ae',
- 'angmsdah': u'\u29af',
- 'angrt': u'\u221f',
- 'angrtvb': u'\u22be',
- 'angrtvbd': u'\u299d',
- 'angsph': u'\u2222',
- 'angst': u'\xc5',
- 'angzarr': u'\u237c',
- 'aogon': u'\u0105',
- 'aopf': u'\U0001d552',
- 'ap': u'\u2248',
- 'apE': u'\u2a70',
- 'apacir': u'\u2a6f',
- 'ape': u'\u224a',
- 'apid': u'\u224b',
- 'apos': u"'",
- 'approx': u'\u2248',
- 'approxeq': u'\u224a',
- 'aring': u'\xe5',
- 'ascr': u'\U0001d4b6',
- 'ast': u'*',
- 'asymp': u'\u2248',
- 'asympeq': u'\u224d',
- 'atilde': u'\xe3',
- 'auml': u'\xe4',
- 'awconint': u'\u2233',
- 'awint': u'\u2a11',
- 'bNot': u'\u2aed',
- 'backcong': u'\u224c',
- 'backepsilon': u'\u03f6',
- 'backprime': u'\u2035',
- 'backsim': u'\u223d',
- 'backsimeq': u'\u22cd',
- 'barvee': u'\u22bd',
- 'barwed': u'\u2305',
- 'barwedge': u'\u2305',
- 'bbrk': u'\u23b5',
- 'bbrktbrk': u'\u23b6',
- 'bcong': u'\u224c',
- 'bcy': u'\u0431',
- 'bdquo': u'\u201e',
- 'becaus': u'\u2235',
- 'because': u'\u2235',
- 'bemptyv': u'\u29b0',
- 'bepsi': u'\u03f6',
- 'bernou': u'\u212c',
- 'beta': u'\u03b2',
- 'beth': u'\u2136',
- 'between': u'\u226c',
- 'bfr': u'\U0001d51f',
- 'bigcap': u'\u22c2',
- 'bigcirc': u'\u25ef',
- 'bigcup': u'\u22c3',
- 'bigodot': u'\u2a00',
- 'bigoplus': u'\u2a01',
- 'bigotimes': u'\u2a02',
- 'bigsqcup': u'\u2a06',
- 'bigstar': u'\u2605',
- 'bigtriangledown': u'\u25bd',
- 'bigtriangleup': u'\u25b3',
- 'biguplus': u'\u2a04',
- 'bigvee': u'\u22c1',
- 'bigwedge': u'\u22c0',
- 'bkarow': u'\u290d',
- 'blacklozenge': u'\u29eb',
- 'blacksquare': u'\u25aa',
- 'blacktriangle': u'\u25b4',
- 'blacktriangledown': u'\u25be',
- 'blacktriangleleft': u'\u25c2',
- 'blacktriangleright': u'\u25b8',
- 'blank': u'\u2423',
- 'blk12': u'\u2592',
- 'blk14': u'\u2591',
- 'blk34': u'\u2593',
- 'block': u'\u2588',
- 'bne': u'=\u20e5',
- 'bnequiv': u'\u2261\u20e5',
- 'bnot': u'\u2310',
- 'bopf': u'\U0001d553',
- 'bot': u'\u22a5',
- 'bottom': u'\u22a5',
- 'bowtie': u'\u22c8',
- 'boxDL': u'\u2557',
- 'boxDR': u'\u2554',
- 'boxDl': u'\u2556',
- 'boxDr': u'\u2553',
- 'boxH': u'\u2550',
- 'boxHD': u'\u2566',
- 'boxHU': u'\u2569',
- 'boxHd': u'\u2564',
- 'boxHu': u'\u2567',
- 'boxUL': u'\u255d',
- 'boxUR': u'\u255a',
- 'boxUl': u'\u255c',
- 'boxUr': u'\u2559',
- 'boxV': u'\u2551',
- 'boxVH': u'\u256c',
- 'boxVL': u'\u2563',
- 'boxVR': u'\u2560',
- 'boxVh': u'\u256b',
- 'boxVl': u'\u2562',
- 'boxVr': u'\u255f',
- 'boxbox': u'\u29c9',
- 'boxdL': u'\u2555',
- 'boxdR': u'\u2552',
- 'boxdl': u'\u2510',
- 'boxdr': u'\u250c',
- 'boxh': u'\u2500',
- 'boxhD': u'\u2565',
- 'boxhU': u'\u2568',
- 'boxhd': u'\u252c',
- 'boxhu': u'\u2534',
- 'boxminus': u'\u229f',
- 'boxplus': u'\u229e',
- 'boxtimes': u'\u22a0',
- 'boxuL': u'\u255b',
- 'boxuR': u'\u2558',
- 'boxul': u'\u2518',
- 'boxur': u'\u2514',
- 'boxv': u'\u2502',
- 'boxvH': u'\u256a',
- 'boxvL': u'\u2561',
- 'boxvR': u'\u255e',
- 'boxvh': u'\u253c',
- 'boxvl': u'\u2524',
- 'boxvr': u'\u251c',
- 'bprime': u'\u2035',
- 'breve': u'\u02d8',
- 'brvbar': u'\xa6',
- 'bscr': u'\U0001d4b7',
- 'bsemi': u'\u204f',
- 'bsim': u'\u223d',
- 'bsime': u'\u22cd',
- 'bsol': u'\\',
- 'bsolb': u'\u29c5',
- 'bsolhsub': u'\u27c8',
- 'bull': u'\u2022',
- 'bullet': u'\u2022',
- 'bump': u'\u224e',
- 'bumpE': u'\u2aae',
- 'bumpe': u'\u224f',
- 'bumpeq': u'\u224f',
- 'cacute': u'\u0107',
- 'cap': u'\u2229',
- 'capand': u'\u2a44',
- 'capbrcup': u'\u2a49',
- 'capcap': u'\u2a4b',
- 'capcup': u'\u2a47',
- 'capdot': u'\u2a40',
- 'caps': u'\u2229\ufe00',
- 'caret': u'\u2041',
- 'caron': u'\u02c7',
- 'ccaps': u'\u2a4d',
- 'ccaron': u'\u010d',
- 'ccedil': u'\xe7',
- 'ccirc': u'\u0109',
- 'ccups': u'\u2a4c',
- 'ccupssm': u'\u2a50',
- 'cdot': u'\u010b',
- 'cedil': u'\xb8',
- 'cemptyv': u'\u29b2',
- 'cent': u'\xa2',
- 'centerdot': u'\xb7',
- 'cfr': u'\U0001d520',
- 'chcy': u'\u0447',
- 'check': u'\u2713',
- 'checkmark': u'\u2713',
- 'chi': u'\u03c7',
- 'cir': u'\u25cb',
- 'cirE': u'\u29c3',
- 'circ': u'\u02c6',
- 'circeq': u'\u2257',
- 'circlearrowleft': u'\u21ba',
- 'circlearrowright': u'\u21bb',
- 'circledR': u'\xae',
- 'circledS': u'\u24c8',
- 'circledast': u'\u229b',
- 'circledcirc': u'\u229a',
- 'circleddash': u'\u229d',
- 'cire': u'\u2257',
- 'cirfnint': u'\u2a10',
- 'cirmid': u'\u2aef',
- 'cirscir': u'\u29c2',
- 'clubs': u'\u2663',
- 'clubsuit': u'\u2663',
- 'colon': u':',
- 'colone': u'\u2254',
- 'coloneq': u'\u2254',
- 'comma': u',',
- 'commat': u'@',
- 'comp': u'\u2201',
- 'compfn': u'\u2218',
- 'complement': u'\u2201',
- 'complexes': u'\u2102',
- 'cong': u'\u2245',
- 'congdot': u'\u2a6d',
- 'conint': u'\u222e',
- 'copf': u'\U0001d554',
- 'coprod': u'\u2210',
- 'copy': u'\xa9',
- 'copysr': u'\u2117',
- 'crarr': u'\u21b5',
- 'cross': u'\u2717',
- 'cscr': u'\U0001d4b8',
- 'csub': u'\u2acf',
- 'csube': u'\u2ad1',
- 'csup': u'\u2ad0',
- 'csupe': u'\u2ad2',
- 'ctdot': u'\u22ef',
- 'cudarrl': u'\u2938',
- 'cudarrr': u'\u2935',
- 'cuepr': u'\u22de',
- 'cuesc': u'\u22df',
- 'cularr': u'\u21b6',
- 'cularrp': u'\u293d',
- 'cup': u'\u222a',
- 'cupbrcap': u'\u2a48',
- 'cupcap': u'\u2a46',
- 'cupcup': u'\u2a4a',
- 'cupdot': u'\u228d',
- 'cupor': u'\u2a45',
- 'cups': u'\u222a\ufe00',
- 'curarr': u'\u21b7',
- 'curarrm': u'\u293c',
- 'curlyeqprec': u'\u22de',
- 'curlyeqsucc': u'\u22df',
- 'curlyvee': u'\u22ce',
- 'curlywedge': u'\u22cf',
- 'curren': u'\xa4',
- 'curvearrowleft': u'\u21b6',
- 'curvearrowright': u'\u21b7',
- 'cuvee': u'\u22ce',
- 'cuwed': u'\u22cf',
- 'cwconint': u'\u2232',
- 'cwint': u'\u2231',
- 'cylcty': u'\u232d',
- 'dArr': u'\u21d3',
- 'dHar': u'\u2965',
- 'dagger': u'\u2020',
- 'daleth': u'\u2138',
- 'darr': u'\u2193',
- 'dash': u'\u2010',
- 'dashv': u'\u22a3',
- 'dbkarow': u'\u290f',
- 'dblac': u'\u02dd',
- 'dcaron': u'\u010f',
- 'dcy': u'\u0434',
- 'dd': u'\u2146',
- 'ddagger': u'\u2021',
- 'ddarr': u'\u21ca',
- 'ddotseq': u'\u2a77',
- 'deg': u'\xb0',
- 'delta': u'\u03b4',
- 'demptyv': u'\u29b1',
- 'dfisht': u'\u297f',
- 'dfr': u'\U0001d521',
- 'dharl': u'\u21c3',
- 'dharr': u'\u21c2',
- 'diam': u'\u22c4',
- 'diamond': u'\u22c4',
- 'diamondsuit': u'\u2666',
- 'diams': u'\u2666',
- 'die': u'\xa8',
- 'digamma': u'\u03dd',
- 'disin': u'\u22f2',
- 'div': u'\xf7',
- 'divide': u'\xf7',
- 'divideontimes': u'\u22c7',
- 'divonx': u'\u22c7',
- 'djcy': u'\u0452',
- 'dlcorn': u'\u231e',
- 'dlcrop': u'\u230d',
- 'dollar': u'$',
- 'dopf': u'\U0001d555',
- 'dot': u'\u02d9',
- 'doteq': u'\u2250',
- 'doteqdot': u'\u2251',
- 'dotminus': u'\u2238',
- 'dotplus': u'\u2214',
- 'dotsquare': u'\u22a1',
- 'doublebarwedge': u'\u2306',
- 'downarrow': u'\u2193',
- 'downdownarrows': u'\u21ca',
- 'downharpoonleft': u'\u21c3',
- 'downharpoonright': u'\u21c2',
- 'drbkarow': u'\u2910',
- 'drcorn': u'\u231f',
- 'drcrop': u'\u230c',
- 'dscr': u'\U0001d4b9',
- 'dscy': u'\u0455',
- 'dsol': u'\u29f6',
- 'dstrok': u'\u0111',
- 'dtdot': u'\u22f1',
- 'dtri': u'\u25bf',
- 'dtrif': u'\u25be',
- 'duarr': u'\u21f5',
- 'duhar': u'\u296f',
- 'dwangle': u'\u29a6',
- 'dzcy': u'\u045f',
- 'dzigrarr': u'\u27ff',
- 'eDDot': u'\u2a77',
- 'eDot': u'\u2251',
- 'eacute': u'\xe9',
- 'easter': u'\u2a6e',
- 'ecaron': u'\u011b',
- 'ecir': u'\u2256',
- 'ecirc': u'\xea',
- 'ecolon': u'\u2255',
- 'ecy': u'\u044d',
- 'edot': u'\u0117',
- 'ee': u'\u2147',
- 'efDot': u'\u2252',
- 'efr': u'\U0001d522',
- 'eg': u'\u2a9a',
- 'egrave': u'\xe8',
- 'egs': u'\u2a96',
- 'egsdot': u'\u2a98',
- 'el': u'\u2a99',
- 'elinters': u'\u23e7',
- 'ell': u'\u2113',
- 'els': u'\u2a95',
- 'elsdot': u'\u2a97',
- 'emacr': u'\u0113',
- 'empty': u'\u2205',
- 'emptyset': u'\u2205',
- 'emptyv': u'\u2205',
- 'emsp': u'\u2003',
- 'emsp13': u'\u2004',
- 'emsp14': u'\u2005',
- 'eng': u'\u014b',
- 'ensp': u'\u2002',
- 'eogon': u'\u0119',
- 'eopf': u'\U0001d556',
- 'epar': u'\u22d5',
- 'eparsl': u'\u29e3',
- 'eplus': u'\u2a71',
- 'epsi': u'\u03b5',
- 'epsilon': u'\u03b5',
- 'epsiv': u'\u03f5',
- 'eqcirc': u'\u2256',
- 'eqcolon': u'\u2255',
- 'eqsim': u'\u2242',
- 'eqslantgtr': u'\u2a96',
- 'eqslantless': u'\u2a95',
- 'equals': u'=',
- 'equest': u'\u225f',
- 'equiv': u'\u2261',
- 'equivDD': u'\u2a78',
- 'eqvparsl': u'\u29e5',
- 'erDot': u'\u2253',
- 'erarr': u'\u2971',
- 'escr': u'\u212f',
- 'esdot': u'\u2250',
- 'esim': u'\u2242',
- 'eta': u'\u03b7',
- 'eth': u'\xf0',
- 'euml': u'\xeb',
- 'euro': u'\u20ac',
- 'excl': u'!',
- 'exist': u'\u2203',
- 'expectation': u'\u2130',
- 'exponentiale': u'\u2147',
- 'fallingdotseq': u'\u2252',
- 'fcy': u'\u0444',
- 'female': u'\u2640',
- 'ffilig': u'\ufb03',
- 'fflig': u'\ufb00',
- 'ffllig': u'\ufb04',
- 'ffr': u'\U0001d523',
- 'filig': u'\ufb01',
- 'fjlig': u'fj',
- 'flat': u'\u266d',
- 'fllig': u'\ufb02',
- 'fltns': u'\u25b1',
- 'fnof': u'\u0192',
- 'fopf': u'\U0001d557',
- 'forall': u'\u2200',
- 'fork': u'\u22d4',
- 'forkv': u'\u2ad9',
- 'fpartint': u'\u2a0d',
- 'frac12': u'\xbd',
- 'frac13': u'\u2153',
- 'frac14': u'\xbc',
- 'frac15': u'\u2155',
- 'frac16': u'\u2159',
- 'frac18': u'\u215b',
- 'frac23': u'\u2154',
- 'frac25': u'\u2156',
- 'frac34': u'\xbe',
- 'frac35': u'\u2157',
- 'frac38': u'\u215c',
- 'frac45': u'\u2158',
- 'frac56': u'\u215a',
- 'frac58': u'\u215d',
- 'frac78': u'\u215e',
- 'frasl': u'\u2044',
- 'frown': u'\u2322',
- 'fscr': u'\U0001d4bb',
- 'gE': u'\u2267',
- 'gEl': u'\u2a8c',
- 'gacute': u'\u01f5',
- 'gamma': u'\u03b3',
- 'gammad': u'\u03dd',
- 'gap': u'\u2a86',
- 'gbreve': u'\u011f',
- 'gcirc': u'\u011d',
- 'gcy': u'\u0433',
- 'gdot': u'\u0121',
- 'ge': u'\u2265',
- 'gel': u'\u22db',
- 'geq': u'\u2265',
- 'geqq': u'\u2267',
- 'geqslant': u'\u2a7e',
- 'ges': u'\u2a7e',
- 'gescc': u'\u2aa9',
- 'gesdot': u'\u2a80',
- 'gesdoto': u'\u2a82',
- 'gesdotol': u'\u2a84',
- 'gesl': u'\u22db\ufe00',
- 'gesles': u'\u2a94',
- 'gfr': u'\U0001d524',
- 'gg': u'\u226b',
- 'ggg': u'\u22d9',
- 'gimel': u'\u2137',
- 'gjcy': u'\u0453',
- 'gl': u'\u2277',
- 'glE': u'\u2a92',
- 'gla': u'\u2aa5',
- 'glj': u'\u2aa4',
- 'gnE': u'\u2269',
- 'gnap': u'\u2a8a',
- 'gnapprox': u'\u2a8a',
- 'gne': u'\u2a88',
- 'gneq': u'\u2a88',
- 'gneqq': u'\u2269',
- 'gnsim': u'\u22e7',
- 'gopf': u'\U0001d558',
- 'grave': u'`',
- 'gscr': u'\u210a',
- 'gsim': u'\u2273',
- 'gsime': u'\u2a8e',
- 'gsiml': u'\u2a90',
- 'gt': u'>',
- 'gtcc': u'\u2aa7',
- 'gtcir': u'\u2a7a',
- 'gtdot': u'\u22d7',
- 'gtlPar': u'\u2995',
- 'gtquest': u'\u2a7c',
- 'gtrapprox': u'\u2a86',
- 'gtrarr': u'\u2978',
- 'gtrdot': u'\u22d7',
- 'gtreqless': u'\u22db',
- 'gtreqqless': u'\u2a8c',
- 'gtrless': u'\u2277',
- 'gtrsim': u'\u2273',
- 'gvertneqq': u'\u2269\ufe00',
- 'gvnE': u'\u2269\ufe00',
- 'hArr': u'\u21d4',
- 'hairsp': u'\u200a',
- 'half': u'\xbd',
- 'hamilt': u'\u210b',
- 'hardcy': u'\u044a',
- 'harr': u'\u2194',
- 'harrcir': u'\u2948',
- 'harrw': u'\u21ad',
- 'hbar': u'\u210f',
- 'hcirc': u'\u0125',
- 'hearts': u'\u2665',
- 'heartsuit': u'\u2665',
- 'hellip': u'\u2026',
- 'hercon': u'\u22b9',
- 'hfr': u'\U0001d525',
- 'hksearow': u'\u2925',
- 'hkswarow': u'\u2926',
- 'hoarr': u'\u21ff',
- 'homtht': u'\u223b',
- 'hookleftarrow': u'\u21a9',
- 'hookrightarrow': u'\u21aa',
- 'hopf': u'\U0001d559',
- 'horbar': u'\u2015',
- 'hscr': u'\U0001d4bd',
- 'hslash': u'\u210f',
- 'hstrok': u'\u0127',
- 'hybull': u'\u2043',
- 'hyphen': u'\u2010',
- 'iacute': u'\xed',
- 'ic': u'\u2063',
- 'icirc': u'\xee',
- 'icy': u'\u0438',
- 'iecy': u'\u0435',
- 'iexcl': u'\xa1',
- 'iff': u'\u21d4',
- 'ifr': u'\U0001d526',
- 'igrave': u'\xec',
- 'ii': u'\u2148',
- 'iiiint': u'\u2a0c',
- 'iiint': u'\u222d',
- 'iinfin': u'\u29dc',
- 'iiota': u'\u2129',
- 'ijlig': u'\u0133',
- 'imacr': u'\u012b',
- 'image': u'\u2111',
- 'imagline': u'\u2110',
- 'imagpart': u'\u2111',
- 'imath': u'\u0131',
- 'imof': u'\u22b7',
- 'imped': u'\u01b5',
- 'in': u'\u2208',
- 'incare': u'\u2105',
- 'infin': u'\u221e',
- 'infintie': u'\u29dd',
- 'inodot': u'\u0131',
- 'int': u'\u222b',
- 'intcal': u'\u22ba',
- 'integers': u'\u2124',
- 'intercal': u'\u22ba',
- 'intlarhk': u'\u2a17',
- 'intprod': u'\u2a3c',
- 'iocy': u'\u0451',
- 'iogon': u'\u012f',
- 'iopf': u'\U0001d55a',
- 'iota': u'\u03b9',
- 'iprod': u'\u2a3c',
- 'iquest': u'\xbf',
- 'iscr': u'\U0001d4be',
- 'isin': u'\u2208',
- 'isinE': u'\u22f9',
- 'isindot': u'\u22f5',
- 'isins': u'\u22f4',
- 'isinsv': u'\u22f3',
- 'isinv': u'\u2208',
- 'it': u'\u2062',
- 'itilde': u'\u0129',
- 'iukcy': u'\u0456',
- 'iuml': u'\xef',
- 'jcirc': u'\u0135',
- 'jcy': u'\u0439',
- 'jfr': u'\U0001d527',
- 'jmath': u'\u0237',
- 'jopf': u'\U0001d55b',
- 'jscr': u'\U0001d4bf',
- 'jsercy': u'\u0458',
- 'jukcy': u'\u0454',
- 'kappa': u'\u03ba',
- 'kappav': u'\u03f0',
- 'kcedil': u'\u0137',
- 'kcy': u'\u043a',
- 'kfr': u'\U0001d528',
- 'kgreen': u'\u0138',
- 'khcy': u'\u0445',
- 'kjcy': u'\u045c',
- 'kopf': u'\U0001d55c',
- 'kscr': u'\U0001d4c0',
- 'lAarr': u'\u21da',
- 'lArr': u'\u21d0',
- 'lAtail': u'\u291b',
- 'lBarr': u'\u290e',
- 'lE': u'\u2266',
- 'lEg': u'\u2a8b',
- 'lHar': u'\u2962',
- 'lacute': u'\u013a',
- 'laemptyv': u'\u29b4',
- 'lagran': u'\u2112',
- 'lambda': u'\u03bb',
- 'lang': u'\u27e8',
- 'langd': u'\u2991',
- 'langle': u'\u27e8',
- 'lap': u'\u2a85',
- 'laquo': u'\xab',
- 'larr': u'\u2190',
- 'larrb': u'\u21e4',
- 'larrbfs': u'\u291f',
- 'larrfs': u'\u291d',
- 'larrhk': u'\u21a9',
- 'larrlp': u'\u21ab',
- 'larrpl': u'\u2939',
- 'larrsim': u'\u2973',
- 'larrtl': u'\u21a2',
- 'lat': u'\u2aab',
- 'latail': u'\u2919',
- 'late': u'\u2aad',
- 'lates': u'\u2aad\ufe00',
- 'lbarr': u'\u290c',
- 'lbbrk': u'\u2772',
- 'lbrace': u'{',
- 'lbrack': u'[',
- 'lbrke': u'\u298b',
- 'lbrksld': u'\u298f',
- 'lbrkslu': u'\u298d',
- 'lcaron': u'\u013e',
- 'lcedil': u'\u013c',
- 'lceil': u'\u2308',
- 'lcub': u'{',
- 'lcy': u'\u043b',
- 'ldca': u'\u2936',
- 'ldquo': u'\u201c',
- 'ldquor': u'\u201e',
- 'ldrdhar': u'\u2967',
- 'ldrushar': u'\u294b',
- 'ldsh': u'\u21b2',
- 'le': u'\u2264',
- 'leftarrow': u'\u2190',
- 'leftarrowtail': u'\u21a2',
- 'leftharpoondown': u'\u21bd',
- 'leftharpoonup': u'\u21bc',
- 'leftleftarrows': u'\u21c7',
- 'leftrightarrow': u'\u2194',
- 'leftrightarrows': u'\u21c6',
- 'leftrightharpoons': u'\u21cb',
- 'leftrightsquigarrow': u'\u21ad',
- 'leftthreetimes': u'\u22cb',
- 'leg': u'\u22da',
- 'leq': u'\u2264',
- 'leqq': u'\u2266',
- 'leqslant': u'\u2a7d',
- 'les': u'\u2a7d',
- 'lescc': u'\u2aa8',
- 'lesdot': u'\u2a7f',
- 'lesdoto': u'\u2a81',
- 'lesdotor': u'\u2a83',
- 'lesg': u'\u22da\ufe00',
- 'lesges': u'\u2a93',
- 'lessapprox': u'\u2a85',
- 'lessdot': u'\u22d6',
- 'lesseqgtr': u'\u22da',
- 'lesseqqgtr': u'\u2a8b',
- 'lessgtr': u'\u2276',
- 'lesssim': u'\u2272',
- 'lfisht': u'\u297c',
- 'lfloor': u'\u230a',
- 'lfr': u'\U0001d529',
- 'lg': u'\u2276',
- 'lgE': u'\u2a91',
- 'lhard': u'\u21bd',
- 'lharu': u'\u21bc',
- 'lharul': u'\u296a',
- 'lhblk': u'\u2584',
- 'ljcy': u'\u0459',
- 'll': u'\u226a',
- 'llarr': u'\u21c7',
- 'llcorner': u'\u231e',
- 'llhard': u'\u296b',
- 'lltri': u'\u25fa',
- 'lmidot': u'\u0140',
- 'lmoust': u'\u23b0',
- 'lmoustache': u'\u23b0',
- 'lnE': u'\u2268',
- 'lnap': u'\u2a89',
- 'lnapprox': u'\u2a89',
- 'lne': u'\u2a87',
- 'lneq': u'\u2a87',
- 'lneqq': u'\u2268',
- 'lnsim': u'\u22e6',
- 'loang': u'\u27ec',
- 'loarr': u'\u21fd',
- 'lobrk': u'\u27e6',
- 'longleftarrow': u'\u27f5',
- 'longleftrightarrow': u'\u27f7',
- 'longmapsto': u'\u27fc',
- 'longrightarrow': u'\u27f6',
- 'looparrowleft': u'\u21ab',
- 'looparrowright': u'\u21ac',
- 'lopar': u'\u2985',
- 'lopf': u'\U0001d55d',
- 'loplus': u'\u2a2d',
- 'lotimes': u'\u2a34',
- 'lowast': u'\u2217',
- 'lowbar': u'_',
- 'loz': u'\u25ca',
- 'lozenge': u'\u25ca',
- 'lozf': u'\u29eb',
- 'lpar': u'(',
- 'lparlt': u'\u2993',
- 'lrarr': u'\u21c6',
- 'lrcorner': u'\u231f',
- 'lrhar': u'\u21cb',
- 'lrhard': u'\u296d',
- 'lrm': u'\u200e',
- 'lrtri': u'\u22bf',
- 'lsaquo': u'\u2039',
- 'lscr': u'\U0001d4c1',
- 'lsh': u'\u21b0',
- 'lsim': u'\u2272',
- 'lsime': u'\u2a8d',
- 'lsimg': u'\u2a8f',
- 'lsqb': u'[',
- 'lsquo': u'\u2018',
- 'lsquor': u'\u201a',
- 'lstrok': u'\u0142',
- 'lt': u'<',
- 'ltcc': u'\u2aa6',
- 'ltcir': u'\u2a79',
- 'ltdot': u'\u22d6',
- 'lthree': u'\u22cb',
- 'ltimes': u'\u22c9',
- 'ltlarr': u'\u2976',
- 'ltquest': u'\u2a7b',
- 'ltrPar': u'\u2996',
- 'ltri': u'\u25c3',
- 'ltrie': u'\u22b4',
- 'ltrif': u'\u25c2',
- 'lurdshar': u'\u294a',
- 'luruhar': u'\u2966',
- 'lvertneqq': u'\u2268\ufe00',
- 'lvnE': u'\u2268\ufe00',
- 'mDDot': u'\u223a',
- 'macr': u'\xaf',
- 'male': u'\u2642',
- 'malt': u'\u2720',
- 'maltese': u'\u2720',
- 'map': u'\u21a6',
- 'mapsto': u'\u21a6',
- 'mapstodown': u'\u21a7',
- 'mapstoleft': u'\u21a4',
- 'mapstoup': u'\u21a5',
- 'marker': u'\u25ae',
- 'mcomma': u'\u2a29',
- 'mcy': u'\u043c',
- 'mdash': u'\u2014',
- 'measuredangle': u'\u2221',
- 'mfr': u'\U0001d52a',
- 'mho': u'\u2127',
- 'micro': u'\xb5',
- 'mid': u'\u2223',
- 'midast': u'*',
- 'midcir': u'\u2af0',
- 'middot': u'\xb7',
- 'minus': u'\u2212',
- 'minusb': u'\u229f',
- 'minusd': u'\u2238',
- 'minusdu': u'\u2a2a',
- 'mlcp': u'\u2adb',
- 'mldr': u'\u2026',
- 'mnplus': u'\u2213',
- 'models': u'\u22a7',
- 'mopf': u'\U0001d55e',
- 'mp': u'\u2213',
- 'mscr': u'\U0001d4c2',
- 'mstpos': u'\u223e',
- 'mu': u'\u03bc',
- 'multimap': u'\u22b8',
- 'mumap': u'\u22b8',
- 'nGg': u'\u22d9\u0338',
- 'nGt': u'\u226b\u20d2',
- 'nGtv': u'\u226b\u0338',
- 'nLeftarrow': u'\u21cd',
- 'nLeftrightarrow': u'\u21ce',
- 'nLl': u'\u22d8\u0338',
- 'nLt': u'\u226a\u20d2',
- 'nLtv': u'\u226a\u0338',
- 'nRightarrow': u'\u21cf',
- 'nVDash': u'\u22af',
- 'nVdash': u'\u22ae',
- 'nabla': u'\u2207',
- 'nacute': u'\u0144',
- 'nang': u'\u2220\u20d2',
- 'nap': u'\u2249',
- 'napE': u'\u2a70\u0338',
- 'napid': u'\u224b\u0338',
- 'napos': u'\u0149',
- 'napprox': u'\u2249',
- 'natur': u'\u266e',
- 'natural': u'\u266e',
- 'naturals': u'\u2115',
- 'nbsp': u'\xa0',
- 'nbump': u'\u224e\u0338',
- 'nbumpe': u'\u224f\u0338',
- 'ncap': u'\u2a43',
- 'ncaron': u'\u0148',
- 'ncedil': u'\u0146',
- 'ncong': u'\u2247',
- 'ncongdot': u'\u2a6d\u0338',
- 'ncup': u'\u2a42',
- 'ncy': u'\u043d',
- 'ndash': u'\u2013',
- 'ne': u'\u2260',
- 'neArr': u'\u21d7',
- 'nearhk': u'\u2924',
- 'nearr': u'\u2197',
- 'nearrow': u'\u2197',
- 'nedot': u'\u2250\u0338',
- 'nequiv': u'\u2262',
- 'nesear': u'\u2928',
- 'nesim': u'\u2242\u0338',
- 'nexist': u'\u2204',
- 'nexists': u'\u2204',
- 'nfr': u'\U0001d52b',
- 'ngE': u'\u2267\u0338',
- 'nge': u'\u2271',
- 'ngeq': u'\u2271',
- 'ngeqq': u'\u2267\u0338',
- 'ngeqslant': u'\u2a7e\u0338',
- 'nges': u'\u2a7e\u0338',
- 'ngsim': u'\u2275',
- 'ngt': u'\u226f',
- 'ngtr': u'\u226f',
- 'nhArr': u'\u21ce',
- 'nharr': u'\u21ae',
- 'nhpar': u'\u2af2',
- 'ni': u'\u220b',
- 'nis': u'\u22fc',
- 'nisd': u'\u22fa',
- 'niv': u'\u220b',
- 'njcy': u'\u045a',
- 'nlArr': u'\u21cd',
- 'nlE': u'\u2266\u0338',
- 'nlarr': u'\u219a',
- 'nldr': u'\u2025',
- 'nle': u'\u2270',
- 'nleftarrow': u'\u219a',
- 'nleftrightarrow': u'\u21ae',
- 'nleq': u'\u2270',
- 'nleqq': u'\u2266\u0338',
- 'nleqslant': u'\u2a7d\u0338',
- 'nles': u'\u2a7d\u0338',
- 'nless': u'\u226e',
- 'nlsim': u'\u2274',
- 'nlt': u'\u226e',
- 'nltri': u'\u22ea',
- 'nltrie': u'\u22ec',
- 'nmid': u'\u2224',
- 'nopf': u'\U0001d55f',
- 'not': u'\xac',
- 'notin': u'\u2209',
- 'notinE': u'\u22f9\u0338',
- 'notindot': u'\u22f5\u0338',
- 'notinva': u'\u2209',
- 'notinvb': u'\u22f7',
- 'notinvc': u'\u22f6',
- 'notni': u'\u220c',
- 'notniva': u'\u220c',
- 'notnivb': u'\u22fe',
- 'notnivc': u'\u22fd',
- 'npar': u'\u2226',
- 'nparallel': u'\u2226',
- 'nparsl': u'\u2afd\u20e5',
- 'npart': u'\u2202\u0338',
- 'npolint': u'\u2a14',
- 'npr': u'\u2280',
- 'nprcue': u'\u22e0',
- 'npre': u'\u2aaf\u0338',
- 'nprec': u'\u2280',
- 'npreceq': u'\u2aaf\u0338',
- 'nrArr': u'\u21cf',
- 'nrarr': u'\u219b',
- 'nrarrc': u'\u2933\u0338',
- 'nrarrw': u'\u219d\u0338',
- 'nrightarrow': u'\u219b',
- 'nrtri': u'\u22eb',
- 'nrtrie': u'\u22ed',
- 'nsc': u'\u2281',
- 'nsccue': u'\u22e1',
- 'nsce': u'\u2ab0\u0338',
- 'nscr': u'\U0001d4c3',
- 'nshortmid': u'\u2224',
- 'nshortparallel': u'\u2226',
- 'nsim': u'\u2241',
- 'nsime': u'\u2244',
- 'nsimeq': u'\u2244',
- 'nsmid': u'\u2224',
- 'nspar': u'\u2226',
- 'nsqsube': u'\u22e2',
- 'nsqsupe': u'\u22e3',
- 'nsub': u'\u2284',
- 'nsubE': u'\u2ac5\u0338',
- 'nsube': u'\u2288',
- 'nsubset': u'\u2282\u20d2',
- 'nsubseteq': u'\u2288',
- 'nsubseteqq': u'\u2ac5\u0338',
- 'nsucc': u'\u2281',
- 'nsucceq': u'\u2ab0\u0338',
- 'nsup': u'\u2285',
- 'nsupE': u'\u2ac6\u0338',
- 'nsupe': u'\u2289',
- 'nsupset': u'\u2283\u20d2',
- 'nsupseteq': u'\u2289',
- 'nsupseteqq': u'\u2ac6\u0338',
- 'ntgl': u'\u2279',
- 'ntilde': u'\xf1',
- 'ntlg': u'\u2278',
- 'ntriangleleft': u'\u22ea',
- 'ntrianglelefteq': u'\u22ec',
- 'ntriangleright': u'\u22eb',
- 'ntrianglerighteq': u'\u22ed',
- 'nu': u'\u03bd',
- 'num': u'#',
- 'numero': u'\u2116',
- 'numsp': u'\u2007',
- 'nvDash': u'\u22ad',
- 'nvHarr': u'\u2904',
- 'nvap': u'\u224d\u20d2',
- 'nvdash': u'\u22ac',
- 'nvge': u'\u2265\u20d2',
- 'nvgt': u'>\u20d2',
- 'nvinfin': u'\u29de',
- 'nvlArr': u'\u2902',
- 'nvle': u'\u2264\u20d2',
- 'nvlt': u'<\u20d2',
- 'nvltrie': u'\u22b4\u20d2',
- 'nvrArr': u'\u2903',
- 'nvrtrie': u'\u22b5\u20d2',
- 'nvsim': u'\u223c\u20d2',
- 'nwArr': u'\u21d6',
- 'nwarhk': u'\u2923',
- 'nwarr': u'\u2196',
- 'nwarrow': u'\u2196',
- 'nwnear': u'\u2927',
- 'oS': u'\u24c8',
- 'oacute': u'\xf3',
- 'oast': u'\u229b',
- 'ocir': u'\u229a',
- 'ocirc': u'\xf4',
- 'ocy': u'\u043e',
- 'odash': u'\u229d',
- 'odblac': u'\u0151',
- 'odiv': u'\u2a38',
- 'odot': u'\u2299',
- 'odsold': u'\u29bc',
- 'oelig': u'\u0153',
- 'ofcir': u'\u29bf',
- 'ofr': u'\U0001d52c',
- 'ogon': u'\u02db',
- 'ograve': u'\xf2',
- 'ogt': u'\u29c1',
- 'ohbar': u'\u29b5',
- 'ohm': u'\u03a9',
- 'oint': u'\u222e',
- 'olarr': u'\u21ba',
- 'olcir': u'\u29be',
- 'olcross': u'\u29bb',
- 'oline': u'\u203e',
- 'olt': u'\u29c0',
- 'omacr': u'\u014d',
- 'omega': u'\u03c9',
- 'omicron': u'\u03bf',
- 'omid': u'\u29b6',
- 'ominus': u'\u2296',
- 'oopf': u'\U0001d560',
- 'opar': u'\u29b7',
- 'operp': u'\u29b9',
- 'oplus': u'\u2295',
- 'or': u'\u2228',
- 'orarr': u'\u21bb',
- 'ord': u'\u2a5d',
- 'order': u'\u2134',
- 'orderof': u'\u2134',
- 'ordf': u'\xaa',
- 'ordm': u'\xba',
- 'origof': u'\u22b6',
- 'oror': u'\u2a56',
- 'orslope': u'\u2a57',
- 'orv': u'\u2a5b',
- 'oscr': u'\u2134',
- 'oslash': u'\xf8',
- 'osol': u'\u2298',
- 'otilde': u'\xf5',
- 'otimes': u'\u2297',
- 'otimesas': u'\u2a36',
- 'ouml': u'\xf6',
- 'ovbar': u'\u233d',
- 'par': u'\u2225',
- 'para': u'\xb6',
- 'parallel': u'\u2225',
- 'parsim': u'\u2af3',
- 'parsl': u'\u2afd',
- 'part': u'\u2202',
- 'pcy': u'\u043f',
- 'percnt': u'%',
- 'period': u'.',
- 'permil': u'\u2030',
- 'perp': u'\u22a5',
- 'pertenk': u'\u2031',
- 'pfr': u'\U0001d52d',
- 'phi': u'\u03c6',
- 'phiv': u'\u03d5',
- 'phmmat': u'\u2133',
- 'phone': u'\u260e',
- 'pi': u'\u03c0',
- 'pitchfork': u'\u22d4',
- 'piv': u'\u03d6',
- 'planck': u'\u210f',
- 'planckh': u'\u210e',
- 'plankv': u'\u210f',
- 'plus': u'+',
- 'plusacir': u'\u2a23',
- 'plusb': u'\u229e',
- 'pluscir': u'\u2a22',
- 'plusdo': u'\u2214',
- 'plusdu': u'\u2a25',
- 'pluse': u'\u2a72',
- 'plusmn': u'\xb1',
- 'plussim': u'\u2a26',
- 'plustwo': u'\u2a27',
- 'pm': u'\xb1',
- 'pointint': u'\u2a15',
- 'popf': u'\U0001d561',
- 'pound': u'\xa3',
- 'pr': u'\u227a',
- 'prE': u'\u2ab3',
- 'prap': u'\u2ab7',
- 'prcue': u'\u227c',
- 'pre': u'\u2aaf',
- 'prec': u'\u227a',
- 'precapprox': u'\u2ab7',
- 'preccurlyeq': u'\u227c',
- 'preceq': u'\u2aaf',
- 'precnapprox': u'\u2ab9',
- 'precneqq': u'\u2ab5',
- 'precnsim': u'\u22e8',
- 'precsim': u'\u227e',
- 'prime': u'\u2032',
- 'primes': u'\u2119',
- 'prnE': u'\u2ab5',
- 'prnap': u'\u2ab9',
- 'prnsim': u'\u22e8',
- 'prod': u'\u220f',
- 'profalar': u'\u232e',
- 'profline': u'\u2312',
- 'profsurf': u'\u2313',
- 'prop': u'\u221d',
- 'propto': u'\u221d',
- 'prsim': u'\u227e',
- 'prurel': u'\u22b0',
- 'pscr': u'\U0001d4c5',
- 'psi': u'\u03c8',
- 'puncsp': u'\u2008',
- 'qfr': u'\U0001d52e',
- 'qint': u'\u2a0c',
- 'qopf': u'\U0001d562',
- 'qprime': u'\u2057',
- 'qscr': u'\U0001d4c6',
- 'quaternions': u'\u210d',
- 'quatint': u'\u2a16',
- 'quest': u'?',
- 'questeq': u'\u225f',
- 'quot': u'"',
- 'rAarr': u'\u21db',
- 'rArr': u'\u21d2',
- 'rAtail': u'\u291c',
- 'rBarr': u'\u290f',
- 'rHar': u'\u2964',
- 'race': u'\u223d\u0331',
- 'racute': u'\u0155',
- 'radic': u'\u221a',
- 'raemptyv': u'\u29b3',
- 'rang': u'\u27e9',
- 'rangd': u'\u2992',
- 'range': u'\u29a5',
- 'rangle': u'\u27e9',
- 'raquo': u'\xbb',
- 'rarr': u'\u2192',
- 'rarrap': u'\u2975',
- 'rarrb': u'\u21e5',
- 'rarrbfs': u'\u2920',
- 'rarrc': u'\u2933',
- 'rarrfs': u'\u291e',
- 'rarrhk': u'\u21aa',
- 'rarrlp': u'\u21ac',
- 'rarrpl': u'\u2945',
- 'rarrsim': u'\u2974',
- 'rarrtl': u'\u21a3',
- 'rarrw': u'\u219d',
- 'ratail': u'\u291a',
- 'ratio': u'\u2236',
- 'rationals': u'\u211a',
- 'rbarr': u'\u290d',
- 'rbbrk': u'\u2773',
- 'rbrace': u'}',
- 'rbrack': u']',
- 'rbrke': u'\u298c',
- 'rbrksld': u'\u298e',
- 'rbrkslu': u'\u2990',
- 'rcaron': u'\u0159',
- 'rcedil': u'\u0157',
- 'rceil': u'\u2309',
- 'rcub': u'}',
- 'rcy': u'\u0440',
- 'rdca': u'\u2937',
- 'rdldhar': u'\u2969',
- 'rdquo': u'\u201d',
- 'rdquor': u'\u201d',
- 'rdsh': u'\u21b3',
- 'real': u'\u211c',
- 'realine': u'\u211b',
- 'realpart': u'\u211c',
- 'reals': u'\u211d',
- 'rect': u'\u25ad',
- 'reg': u'\xae',
- 'rfisht': u'\u297d',
- 'rfloor': u'\u230b',
- 'rfr': u'\U0001d52f',
- 'rhard': u'\u21c1',
- 'rharu': u'\u21c0',
- 'rharul': u'\u296c',
- 'rho': u'\u03c1',
- 'rhov': u'\u03f1',
- 'rightarrow': u'\u2192',
- 'rightarrowtail': u'\u21a3',
- 'rightharpoondown': u'\u21c1',
- 'rightharpoonup': u'\u21c0',
- 'rightleftarrows': u'\u21c4',
- 'rightleftharpoons': u'\u21cc',
- 'rightrightarrows': u'\u21c9',
- 'rightsquigarrow': u'\u219d',
- 'rightthreetimes': u'\u22cc',
- 'ring': u'\u02da',
- 'risingdotseq': u'\u2253',
- 'rlarr': u'\u21c4',
- 'rlhar': u'\u21cc',
- 'rlm': u'\u200f',
- 'rmoust': u'\u23b1',
- 'rmoustache': u'\u23b1',
- 'rnmid': u'\u2aee',
- 'roang': u'\u27ed',
- 'roarr': u'\u21fe',
- 'robrk': u'\u27e7',
- 'ropar': u'\u2986',
- 'ropf': u'\U0001d563',
- 'roplus': u'\u2a2e',
- 'rotimes': u'\u2a35',
- 'rpar': u')',
- 'rpargt': u'\u2994',
- 'rppolint': u'\u2a12',
- 'rrarr': u'\u21c9',
- 'rsaquo': u'\u203a',
- 'rscr': u'\U0001d4c7',
- 'rsh': u'\u21b1',
- 'rsqb': u']',
- 'rsquo': u'\u2019',
- 'rsquor': u'\u2019',
- 'rthree': u'\u22cc',
- 'rtimes': u'\u22ca',
- 'rtri': u'\u25b9',
- 'rtrie': u'\u22b5',
- 'rtrif': u'\u25b8',
- 'rtriltri': u'\u29ce',
- 'ruluhar': u'\u2968',
- 'rx': u'\u211e',
- 'sacute': u'\u015b',
- 'sbquo': u'\u201a',
- 'sc': u'\u227b',
- 'scE': u'\u2ab4',
- 'scap': u'\u2ab8',
- 'scaron': u'\u0161',
- 'sccue': u'\u227d',
- 'sce': u'\u2ab0',
- 'scedil': u'\u015f',
- 'scirc': u'\u015d',
- 'scnE': u'\u2ab6',
- 'scnap': u'\u2aba',
- 'scnsim': u'\u22e9',
- 'scpolint': u'\u2a13',
- 'scsim': u'\u227f',
- 'scy': u'\u0441',
- 'sdot': u'\u22c5',
- 'sdotb': u'\u22a1',
- 'sdote': u'\u2a66',
- 'seArr': u'\u21d8',
- 'searhk': u'\u2925',
- 'searr': u'\u2198',
- 'searrow': u'\u2198',
- 'sect': u'\xa7',
- 'semi': u';',
- 'seswar': u'\u2929',
- 'setminus': u'\u2216',
- 'setmn': u'\u2216',
- 'sext': u'\u2736',
- 'sfr': u'\U0001d530',
- 'sfrown': u'\u2322',
- 'sharp': u'\u266f',
- 'shchcy': u'\u0449',
- 'shcy': u'\u0448',
- 'shortmid': u'\u2223',
- 'shortparallel': u'\u2225',
- 'shy': u'\xad',
- 'sigma': u'\u03c3',
- 'sigmaf': u'\u03c2',
- 'sigmav': u'\u03c2',
- 'sim': u'\u223c',
- 'simdot': u'\u2a6a',
- 'sime': u'\u2243',
- 'simeq': u'\u2243',
- 'simg': u'\u2a9e',
- 'simgE': u'\u2aa0',
- 'siml': u'\u2a9d',
- 'simlE': u'\u2a9f',
- 'simne': u'\u2246',
- 'simplus': u'\u2a24',
- 'simrarr': u'\u2972',
- 'slarr': u'\u2190',
- 'smallsetminus': u'\u2216',
- 'smashp': u'\u2a33',
- 'smeparsl': u'\u29e4',
- 'smid': u'\u2223',
- 'smile': u'\u2323',
- 'smt': u'\u2aaa',
- 'smte': u'\u2aac',
- 'smtes': u'\u2aac\ufe00',
- 'softcy': u'\u044c',
- 'sol': u'/',
- 'solb': u'\u29c4',
- 'solbar': u'\u233f',
- 'sopf': u'\U0001d564',
- 'spades': u'\u2660',
- 'spadesuit': u'\u2660',
- 'spar': u'\u2225',
- 'sqcap': u'\u2293',
- 'sqcaps': u'\u2293\ufe00',
- 'sqcup': u'\u2294',
- 'sqcups': u'\u2294\ufe00',
- 'sqsub': u'\u228f',
- 'sqsube': u'\u2291',
- 'sqsubset': u'\u228f',
- 'sqsubseteq': u'\u2291',
- 'sqsup': u'\u2290',
- 'sqsupe': u'\u2292',
- 'sqsupset': u'\u2290',
- 'sqsupseteq': u'\u2292',
- 'squ': u'\u25a1',
- 'square': u'\u25a1',
- 'squarf': u'\u25aa',
- 'squf': u'\u25aa',
- 'srarr': u'\u2192',
- 'sscr': u'\U0001d4c8',
- 'ssetmn': u'\u2216',
- 'ssmile': u'\u2323',
- 'sstarf': u'\u22c6',
- 'star': u'\u2606',
- 'starf': u'\u2605',
- 'straightepsilon': u'\u03f5',
- 'straightphi': u'\u03d5',
- 'strns': u'\xaf',
- 'sub': u'\u2282',
- 'subE': u'\u2ac5',
- 'subdot': u'\u2abd',
- 'sube': u'\u2286',
- 'subedot': u'\u2ac3',
- 'submult': u'\u2ac1',
- 'subnE': u'\u2acb',
- 'subne': u'\u228a',
- 'subplus': u'\u2abf',
- 'subrarr': u'\u2979',
- 'subset': u'\u2282',
- 'subseteq': u'\u2286',
- 'subseteqq': u'\u2ac5',
- 'subsetneq': u'\u228a',
- 'subsetneqq': u'\u2acb',
- 'subsim': u'\u2ac7',
- 'subsub': u'\u2ad5',
- 'subsup': u'\u2ad3',
- 'succ': u'\u227b',
- 'succapprox': u'\u2ab8',
- 'succcurlyeq': u'\u227d',
- 'succeq': u'\u2ab0',
- 'succnapprox': u'\u2aba',
- 'succneqq': u'\u2ab6',
- 'succnsim': u'\u22e9',
- 'succsim': u'\u227f',
- 'sum': u'\u2211',
- 'sung': u'\u266a',
- 'sup': u'\u2283',
- 'sup1': u'\xb9',
- 'sup2': u'\xb2',
- 'sup3': u'\xb3',
- 'supE': u'\u2ac6',
- 'supdot': u'\u2abe',
- 'supdsub': u'\u2ad8',
- 'supe': u'\u2287',
- 'supedot': u'\u2ac4',
- 'suphsol': u'\u27c9',
- 'suphsub': u'\u2ad7',
- 'suplarr': u'\u297b',
- 'supmult': u'\u2ac2',
- 'supnE': u'\u2acc',
- 'supne': u'\u228b',
- 'supplus': u'\u2ac0',
- 'supset': u'\u2283',
- 'supseteq': u'\u2287',
- 'supseteqq': u'\u2ac6',
- 'supsetneq': u'\u228b',
- 'supsetneqq': u'\u2acc',
- 'supsim': u'\u2ac8',
- 'supsub': u'\u2ad4',
- 'supsup': u'\u2ad6',
- 'swArr': u'\u21d9',
- 'swarhk': u'\u2926',
- 'swarr': u'\u2199',
- 'swarrow': u'\u2199',
- 'swnwar': u'\u292a',
- 'szlig': u'\xdf',
- 'target': u'\u2316',
- 'tau': u'\u03c4',
- 'tbrk': u'\u23b4',
- 'tcaron': u'\u0165',
- 'tcedil': u'\u0163',
- 'tcy': u'\u0442',
- 'tdot': u'\u20db',
- 'telrec': u'\u2315',
- 'tfr': u'\U0001d531',
- 'there4': u'\u2234',
- 'therefore': u'\u2234',
- 'theta': u'\u03b8',
- 'thetasym': u'\u03d1',
- 'thetav': u'\u03d1',
- 'thickapprox': u'\u2248',
- 'thicksim': u'\u223c',
- 'thinsp': u'\u2009',
- 'thkap': u'\u2248',
- 'thksim': u'\u223c',
- 'thorn': u'\xfe',
- 'tilde': u'\u02dc',
- 'times': u'\xd7',
- 'timesb': u'\u22a0',
- 'timesbar': u'\u2a31',
- 'timesd': u'\u2a30',
- 'tint': u'\u222d',
- 'toea': u'\u2928',
- 'top': u'\u22a4',
- 'topbot': u'\u2336',
- 'topcir': u'\u2af1',
- 'topf': u'\U0001d565',
- 'topfork': u'\u2ada',
- 'tosa': u'\u2929',
- 'tprime': u'\u2034',
- 'trade': u'\u2122',
- 'triangle': u'\u25b5',
- 'triangledown': u'\u25bf',
- 'triangleleft': u'\u25c3',
- 'trianglelefteq': u'\u22b4',
- 'triangleq': u'\u225c',
- 'triangleright': u'\u25b9',
- 'trianglerighteq': u'\u22b5',
- 'tridot': u'\u25ec',
- 'trie': u'\u225c',
- 'triminus': u'\u2a3a',
- 'triplus': u'\u2a39',
- 'trisb': u'\u29cd',
- 'tritime': u'\u2a3b',
- 'trpezium': u'\u23e2',
- 'tscr': u'\U0001d4c9',
- 'tscy': u'\u0446',
- 'tshcy': u'\u045b',
- 'tstrok': u'\u0167',
- 'twixt': u'\u226c',
- 'twoheadleftarrow': u'\u219e',
- 'twoheadrightarrow': u'\u21a0',
- 'uArr': u'\u21d1',
- 'uHar': u'\u2963',
- 'uacute': u'\xfa',
- 'uarr': u'\u2191',
- 'ubrcy': u'\u045e',
- 'ubreve': u'\u016d',
- 'ucirc': u'\xfb',
- 'ucy': u'\u0443',
- 'udarr': u'\u21c5',
- 'udblac': u'\u0171',
- 'udhar': u'\u296e',
- 'ufisht': u'\u297e',
- 'ufr': u'\U0001d532',
- 'ugrave': u'\xf9',
- 'uharl': u'\u21bf',
- 'uharr': u'\u21be',
- 'uhblk': u'\u2580',
- 'ulcorn': u'\u231c',
- 'ulcorner': u'\u231c',
- 'ulcrop': u'\u230f',
- 'ultri': u'\u25f8',
- 'umacr': u'\u016b',
- 'uml': u'\xa8',
- 'uogon': u'\u0173',
- 'uopf': u'\U0001d566',
- 'uparrow': u'\u2191',
- 'updownarrow': u'\u2195',
- 'upharpoonleft': u'\u21bf',
- 'upharpoonright': u'\u21be',
- 'uplus': u'\u228e',
- 'upsi': u'\u03c5',
- 'upsih': u'\u03d2',
- 'upsilon': u'\u03c5',
- 'upuparrows': u'\u21c8',
- 'urcorn': u'\u231d',
- 'urcorner': u'\u231d',
- 'urcrop': u'\u230e',
- 'uring': u'\u016f',
- 'urtri': u'\u25f9',
- 'uscr': u'\U0001d4ca',
- 'utdot': u'\u22f0',
- 'utilde': u'\u0169',
- 'utri': u'\u25b5',
- 'utrif': u'\u25b4',
- 'uuarr': u'\u21c8',
- 'uuml': u'\xfc',
- 'uwangle': u'\u29a7',
- 'vArr': u'\u21d5',
- 'vBar': u'\u2ae8',
- 'vBarv': u'\u2ae9',
- 'vDash': u'\u22a8',
- 'vangrt': u'\u299c',
- 'varepsilon': u'\u03f5',
- 'varkappa': u'\u03f0',
- 'varnothing': u'\u2205',
- 'varphi': u'\u03d5',
- 'varpi': u'\u03d6',
- 'varpropto': u'\u221d',
- 'varr': u'\u2195',
- 'varrho': u'\u03f1',
- 'varsigma': u'\u03c2',
- 'varsubsetneq': u'\u228a\ufe00',
- 'varsubsetneqq': u'\u2acb\ufe00',
- 'varsupsetneq': u'\u228b\ufe00',
- 'varsupsetneqq': u'\u2acc\ufe00',
- 'vartheta': u'\u03d1',
- 'vartriangleleft': u'\u22b2',
- 'vartriangleright': u'\u22b3',
- 'vcy': u'\u0432',
- 'vdash': u'\u22a2',
- 'vee': u'\u2228',
- 'veebar': u'\u22bb',
- 'veeeq': u'\u225a',
- 'vellip': u'\u22ee',
- 'verbar': u'|',
- 'vert': u'|',
- 'vfr': u'\U0001d533',
- 'vltri': u'\u22b2',
- 'vnsub': u'\u2282\u20d2',
- 'vnsup': u'\u2283\u20d2',
- 'vopf': u'\U0001d567',
- 'vprop': u'\u221d',
- 'vrtri': u'\u22b3',
- 'vscr': u'\U0001d4cb',
- 'vsubnE': u'\u2acb\ufe00',
- 'vsubne': u'\u228a\ufe00',
- 'vsupnE': u'\u2acc\ufe00',
- 'vsupne': u'\u228b\ufe00',
- 'vzigzag': u'\u299a',
- 'wcirc': u'\u0175',
- 'wedbar': u'\u2a5f',
- 'wedge': u'\u2227',
- 'wedgeq': u'\u2259',
- 'weierp': u'\u2118',
- 'wfr': u'\U0001d534',
- 'wopf': u'\U0001d568',
- 'wp': u'\u2118',
- 'wr': u'\u2240',
- 'wreath': u'\u2240',
- 'wscr': u'\U0001d4cc',
- 'xcap': u'\u22c2',
- 'xcirc': u'\u25ef',
- 'xcup': u'\u22c3',
- 'xdtri': u'\u25bd',
- 'xfr': u'\U0001d535',
- 'xhArr': u'\u27fa',
- 'xharr': u'\u27f7',
- 'xi': u'\u03be',
- 'xlArr': u'\u27f8',
- 'xlarr': u'\u27f5',
- 'xmap': u'\u27fc',
- 'xnis': u'\u22fb',
- 'xodot': u'\u2a00',
- 'xopf': u'\U0001d569',
- 'xoplus': u'\u2a01',
- 'xotime': u'\u2a02',
- 'xrArr': u'\u27f9',
- 'xrarr': u'\u27f6',
- 'xscr': u'\U0001d4cd',
- 'xsqcup': u'\u2a06',
- 'xuplus': u'\u2a04',
- 'xutri': u'\u25b3',
- 'xvee': u'\u22c1',
- 'xwedge': u'\u22c0',
- 'yacute': u'\xfd',
- 'yacy': u'\u044f',
- 'ycirc': u'\u0177',
- 'ycy': u'\u044b',
- 'yen': u'\xa5',
- 'yfr': u'\U0001d536',
- 'yicy': u'\u0457',
- 'yopf': u'\U0001d56a',
- 'yscr': u'\U0001d4ce',
- 'yucy': u'\u044e',
- 'yuml': u'\xff',
- 'zacute': u'\u017a',
- 'zcaron': u'\u017e',
- 'zcy': u'\u0437',
- 'zdot': u'\u017c',
- 'zeetrf': u'\u2128',
- 'zeta': u'\u03b6',
- 'zfr': u'\U0001d537',
- 'zhcy': u'\u0436',
- 'zigrarr': u'\u21dd',
- 'zopf': u'\U0001d56b',
- 'zscr': u'\U0001d4cf',
- 'zwj': u'\u200d',
- 'zwnj': u'\u200c'}
diff --git a/src/html5lib/__init__.py b/src/html5lib/__init__.py
index 433e0f6735..0a43c066b6 100644
--- a/src/html5lib/__init__.py
+++ b/src/html5lib/__init__.py
@@ -1,4 +1,4 @@
-""" 
+"""
 HTML parsing library based on the WHATWG "HTML5"
 specification. The parser is designed to be compatible with existing
 HTML found in the wild and implements well-defined error recovery that
@@ -8,10 +8,16 @@ Example usage:
 
 import html5lib
 f = open("my_document.html")
-tree = html5lib.parse(f) 
+tree = html5lib.parse(f)
 """
-__version__ = "0.90"
-from html5parser import HTMLParser, parse, parseFragment
-from treebuilders import getTreeBuilder
-from treewalkers import getTreeWalker
-from serializer import serialize
+
+from __future__ import absolute_import, division, unicode_literals
+
+from .html5parser import HTMLParser, parse, parseFragment
+from .treebuilders import getTreeBuilder
+from .treewalkers import getTreeWalker
+from .serializer import serialize
+
+__all__ = ["HTMLParser", "parse", "parseFragment", "getTreeBuilder",
+           "getTreeWalker", "serialize"]
+__version__ = "0.999-dev"
diff --git a/src/html5lib/constants.py b/src/html5lib/constants.py
index 4157bcfcea..e7089846d5 100644
--- a/src/html5lib/constants.py
+++ b/src/html5lib/constants.py
@@ -1,287 +1,305 @@
-import string, gettext
-_ = gettext.gettext
+from __future__ import absolute_import, division, unicode_literals
 
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import Set as set
-    from sets import ImmutableSet as frozenset
+import string
+import gettext
+_ = gettext.gettext
 
 EOF = None
 
 E = {
-    "null-character": 
-       _(u"Null character in input stream, replaced with U+FFFD."),
-    "invalid-character": 
-       _(u"Invalid codepoint in stream."),
+    "null-character":
+        _("Null character in input stream, replaced with U+FFFD."),
+    "invalid-codepoint":
+        _("Invalid codepoint in stream."),
     "incorrectly-placed-solidus":
-       _(u"Solidus (/) incorrectly placed in tag."),
+        _("Solidus (/) incorrectly placed in tag."),
     "incorrect-cr-newline-entity":
-       _(u"Incorrect CR newline entity, replaced with LF."),
+        _("Incorrect CR newline entity, replaced with LF."),
     "illegal-windows-1252-entity":
-       _(u"Entity used with illegal number (windows-1252 reference)."),
+        _("Entity used with illegal number (windows-1252 reference)."),
     "cant-convert-numeric-entity":
-       _(u"Numeric entity couldn't be converted to character "
-         u"(codepoint U+%(charAsInt)08x)."),
+        _("Numeric entity couldn't be converted to character "
+          "(codepoint U+%(charAsInt)08x)."),
     "illegal-codepoint-for-numeric-entity":
-       _(u"Numeric entity represents an illegal codepoint: "
-         u"U+%(charAsInt)08x."),
+        _("Numeric entity represents an illegal codepoint: "
+          "U+%(charAsInt)08x."),
     "numeric-entity-without-semicolon":
-       _(u"Numeric entity didn't end with ';'."),
+        _("Numeric entity didn't end with ';'."),
     "expected-numeric-entity-but-got-eof":
-       _(u"Numeric entity expected. Got end of file instead."),
+        _("Numeric entity expected. Got end of file instead."),
     "expected-numeric-entity":
-       _(u"Numeric entity expected but none found."),
+        _("Numeric entity expected but none found."),
     "named-entity-without-semicolon":
-       _(u"Named entity didn't end with ';'."),
+        _("Named entity didn't end with ';'."),
     "expected-named-entity":
-       _(u"Named entity expected. Got none."),
+        _("Named entity expected. Got none."),
     "attributes-in-end-tag":
-       _(u"End tag contains unexpected attributes."),
+        _("End tag contains unexpected attributes."),
+    'self-closing-flag-on-end-tag':
+        _("End tag contains unexpected self-closing flag."),
     "expected-tag-name-but-got-right-bracket":
-       _(u"Expected tag name. Got '>' instead."),
+        _("Expected tag name. Got '>' instead."),
     "expected-tag-name-but-got-question-mark":
-       _(u"Expected tag name. Got '?' instead. (HTML doesn't "
-         u"support processing instructions.)"),
+        _("Expected tag name. Got '?' instead. (HTML doesn't "
+          "support processing instructions.)"),
     "expected-tag-name":
-       _(u"Expected tag name. Got something else instead"),
+        _("Expected tag name. Got something else instead"),
     "expected-closing-tag-but-got-right-bracket":
-       _(u"Expected closing tag. Got '>' instead. Ignoring '</>'."),
+        _("Expected closing tag. Got '>' instead. Ignoring '</>'."),
     "expected-closing-tag-but-got-eof":
-       _(u"Expected closing tag. Unexpected end of file."),
+        _("Expected closing tag. Unexpected end of file."),
     "expected-closing-tag-but-got-char":
-       _(u"Expected closing tag. Unexpected character '%(data)s' found."),
+        _("Expected closing tag. Unexpected character '%(data)s' found."),
     "eof-in-tag-name":
-       _(u"Unexpected end of file in the tag name."),
+        _("Unexpected end of file in the tag name."),
     "expected-attribute-name-but-got-eof":
-       _(u"Unexpected end of file. Expected attribute name instead."),
+        _("Unexpected end of file. Expected attribute name instead."),
     "eof-in-attribute-name":
-       _(u"Unexpected end of file in attribute name."),
+        _("Unexpected end of file in attribute name."),
     "invalid-character-in-attribute-name":
-        _(u"Invalid chracter in attribute name"),
+        _("Invalid character in attribute name"),
     "duplicate-attribute":
-       _(u"Dropped duplicate attribute on tag."),
+        _("Dropped duplicate attribute on tag."),
     "expected-end-of-tag-name-but-got-eof":
-       _(u"Unexpected end of file. Expected = or end of tag."),
+        _("Unexpected end of file. Expected = or end of tag."),
     "expected-attribute-value-but-got-eof":
-       _(u"Unexpected end of file. Expected attribute value."),
+        _("Unexpected end of file. Expected attribute value."),
     "expected-attribute-value-but-got-right-bracket":
-       _(u"Expected attribute value. Got '>' instead."),
+        _("Expected attribute value. Got '>' instead."),
+    'equals-in-unquoted-attribute-value':
+        _("Unexpected = in unquoted attribute"),
+    'unexpected-character-in-unquoted-attribute-value':
+        _("Unexpected character in unquoted attribute"),
+    "invalid-character-after-attribute-name":
+        _("Unexpected character after attribute name."),
+    "unexpected-character-after-attribute-value":
+        _("Unexpected character after attribute value."),
     "eof-in-attribute-value-double-quote":
-       _(u"Unexpected end of file in attribute value (\")."),
+        _("Unexpected end of file in attribute value (\")."),
     "eof-in-attribute-value-single-quote":
-       _(u"Unexpected end of file in attribute value (')."),
+        _("Unexpected end of file in attribute value (')."),
     "eof-in-attribute-value-no-quotes":
-       _(u"Unexpected end of file in attribute value."),
+        _("Unexpected end of file in attribute value."),
     "unexpected-EOF-after-solidus-in-tag":
-        _(u"Unexpected end of file in tag. Expected >"),
-    "unexpected-character-after-soldius-in-tag":
-        _(u"Unexpected character after / in tag. Expected >"),
+        _("Unexpected end of file in tag. Expected >"),
+    "unexpected-character-after-solidus-in-tag":
+        _("Unexpected character after / in tag. Expected >"),
     "expected-dashes-or-doctype":
-       _(u"Expected '--' or 'DOCTYPE'. Not found."),
+        _("Expected '--' or 'DOCTYPE'. Not found."),
+    "unexpected-bang-after-double-dash-in-comment":
+        _("Unexpected ! after -- in comment"),
+    "unexpected-space-after-double-dash-in-comment":
+        _("Unexpected space after -- in comment"),
     "incorrect-comment":
-       _(u"Incorrect comment."),
+        _("Incorrect comment."),
     "eof-in-comment":
-       _(u"Unexpected end of file in comment."),
+        _("Unexpected end of file in comment."),
     "eof-in-comment-end-dash":
-       _(u"Unexpected end of file in comment (-)"),
+        _("Unexpected end of file in comment (-)"),
     "unexpected-dash-after-double-dash-in-comment":
-       _(u"Unexpected '-' after '--' found in comment."),
+        _("Unexpected '-' after '--' found in comment."),
     "eof-in-comment-double-dash":
-       _(u"Unexpected end of file in comment (--)."),
+        _("Unexpected end of file in comment (--)."),
+    "eof-in-comment-end-space-state":
+        _("Unexpected end of file in comment."),
+    "eof-in-comment-end-bang-state":
+        _("Unexpected end of file in comment."),
     "unexpected-char-in-comment":
-       _(u"Unexpected character in comment found."),
+        _("Unexpected character in comment found."),
     "need-space-after-doctype":
-       _(u"No space after literal string 'DOCTYPE'."),
+        _("No space after literal string 'DOCTYPE'."),
     "expected-doctype-name-but-got-right-bracket":
-       _(u"Unexpected > character. Expected DOCTYPE name."),
+        _("Unexpected > character. Expected DOCTYPE name."),
     "expected-doctype-name-but-got-eof":
-       _(u"Unexpected end of file. Expected DOCTYPE name."),
+        _("Unexpected end of file. Expected DOCTYPE name."),
     "eof-in-doctype-name":
-       _(u"Unexpected end of file in DOCTYPE name."),
+        _("Unexpected end of file in DOCTYPE name."),
     "eof-in-doctype":
-       _(u"Unexpected end of file in DOCTYPE."),
+        _("Unexpected end of file in DOCTYPE."),
     "expected-space-or-right-bracket-in-doctype":
-       _(u"Expected space or '>'. Got '%(data)s'"),
+        _("Expected space or '>'. Got '%(data)s'"),
     "unexpected-end-of-doctype":
-       _(u"Unexpected end of DOCTYPE."),
+        _("Unexpected end of DOCTYPE."),
     "unexpected-char-in-doctype":
-       _(u"Unexpected character in DOCTYPE."),
+        _("Unexpected character in DOCTYPE."),
     "eof-in-innerhtml":
-       _(u"XXX innerHTML EOF"),
+        _("XXX innerHTML EOF"),
     "unexpected-doctype":
-       _(u"Unexpected DOCTYPE. Ignored."),
+        _("Unexpected DOCTYPE. Ignored."),
     "non-html-root":
-       _(u"html needs to be the first start tag."),
+        _("html needs to be the first start tag."),
     "expected-doctype-but-got-eof":
-       _(u"Unexpected End of file. Expected DOCTYPE."),
+        _("Unexpected End of file. Expected DOCTYPE."),
     "unknown-doctype":
-       _(u"Erroneous DOCTYPE."),
+        _("Erroneous DOCTYPE."),
     "expected-doctype-but-got-chars":
-       _(u"Unexpected non-space characters. Expected DOCTYPE."),
+        _("Unexpected non-space characters. Expected DOCTYPE."),
     "expected-doctype-but-got-start-tag":
-       _(u"Unexpected start tag (%(name)s). Expected DOCTYPE."),
+        _("Unexpected start tag (%(name)s). Expected DOCTYPE."),
     "expected-doctype-but-got-end-tag":
-       _(u"Unexpected end tag (%(name)s). Expected DOCTYPE."),
+        _("Unexpected end tag (%(name)s). Expected DOCTYPE."),
     "end-tag-after-implied-root":
-       _(u"Unexpected end tag (%(name)s) after the (implied) root element."),
+        _("Unexpected end tag (%(name)s) after the (implied) root element."),
     "expected-named-closing-tag-but-got-eof":
-       _(u"Unexpected end of file. Expected end tag (%(name)s)."),
+        _("Unexpected end of file. Expected end tag (%(name)s)."),
     "two-heads-are-not-better-than-one":
-       _(u"Unexpected start tag head in existing head. Ignored."),
+        _("Unexpected start tag head in existing head. Ignored."),
     "unexpected-end-tag":
-       _(u"Unexpected end tag (%(name)s). Ignored."),
+        _("Unexpected end tag (%(name)s). Ignored."),
     "unexpected-start-tag-out-of-my-head":
-       _(u"Unexpected start tag (%(name)s) that can be in head. Moved."),
+        _("Unexpected start tag (%(name)s) that can be in head. Moved."),
     "unexpected-start-tag":
-       _(u"Unexpected start tag (%(name)s)."),
+        _("Unexpected start tag (%(name)s)."),
     "missing-end-tag":
-       _(u"Missing end tag (%(name)s)."),
+        _("Missing end tag (%(name)s)."),
     "missing-end-tags":
-       _(u"Missing end tags (%(name)s)."),
+        _("Missing end tags (%(name)s)."),
     "unexpected-start-tag-implies-end-tag":
-       _(u"Unexpected start tag (%(startName)s) "
-         u"implies end tag (%(endName)s)."),
+        _("Unexpected start tag (%(startName)s) "
+          "implies end tag (%(endName)s)."),
     "unexpected-start-tag-treated-as":
-       _(u"Unexpected start tag (%(originalName)s). Treated as %(newName)s."),
+        _("Unexpected start tag (%(originalName)s). Treated as %(newName)s."),
     "deprecated-tag":
-       _(u"Unexpected start tag %(name)s. Don't use it!"),
+        _("Unexpected start tag %(name)s. Don't use it!"),
     "unexpected-start-tag-ignored":
-       _(u"Unexpected start tag %(name)s. Ignored."),
+        _("Unexpected start tag %(name)s. Ignored."),
     "expected-one-end-tag-but-got-another":
-       _(u"Unexpected end tag (%(gotName)s). "
-         u"Missing end tag (%(expectedName)s)."),
+        _("Unexpected end tag (%(gotName)s). "
+          "Missing end tag (%(expectedName)s)."),
     "end-tag-too-early":
-       _(u"End tag (%(name)s) seen too early. Expected other end tag."),
+        _("End tag (%(name)s) seen too early. Expected other end tag."),
     "end-tag-too-early-named":
-       _(u"Unexpected end tag (%(gotName)s). Expected end tag (%(expectedName)s)."),
+        _("Unexpected end tag (%(gotName)s). Expected end tag (%(expectedName)s)."),
     "end-tag-too-early-ignored":
-       _(u"End tag (%(name)s) seen too early. Ignored."),
+        _("End tag (%(name)s) seen too early. Ignored."),
     "adoption-agency-1.1":
-       _(u"End tag (%(name)s) violates step 1, "
-         u"paragraph 1 of the adoption agency algorithm."),
+        _("End tag (%(name)s) violates step 1, "
+          "paragraph 1 of the adoption agency algorithm."),
     "adoption-agency-1.2":
-       _(u"End tag (%(name)s) violates step 1, "
-         u"paragraph 2 of the adoption agency algorithm."),
+        _("End tag (%(name)s) violates step 1, "
+          "paragraph 2 of the adoption agency algorithm."),
     "adoption-agency-1.3":
-       _(u"End tag (%(name)s) violates step 1, "
-         u"paragraph 3 of the adoption agency algorithm."),
+        _("End tag (%(name)s) violates step 1, "
+          "paragraph 3 of the adoption agency algorithm."),
+    "adoption-agency-4.4":
+        _("End tag (%(name)s) violates step 4, "
+          "paragraph 4 of the adoption agency algorithm."),
     "unexpected-end-tag-treated-as":
-       _(u"Unexpected end tag (%(originalName)s). Treated as %(newName)s."),
+        _("Unexpected end tag (%(originalName)s). Treated as %(newName)s."),
     "no-end-tag":
-       _(u"This element (%(name)s) has no end tag."),
+        _("This element (%(name)s) has no end tag."),
     "unexpected-implied-end-tag-in-table":
-       _(u"Unexpected implied end tag (%(name)s) in the table phase."),
+        _("Unexpected implied end tag (%(name)s) in the table phase."),
     "unexpected-implied-end-tag-in-table-body":
-       _(u"Unexpected implied end tag (%(name)s) in the table body phase."),
+        _("Unexpected implied end tag (%(name)s) in the table body phase."),
     "unexpected-char-implies-table-voodoo":
-       _(u"Unexpected non-space characters in "
-         u"table context caused voodoo mode."),
+        _("Unexpected non-space characters in "
+          "table context caused voodoo mode."),
     "unexpected-hidden-input-in-table":
-       _(u"Unexpected input with type hidden in table context."),
+        _("Unexpected input with type hidden in table context."),
     "unexpected-form-in-table":
-       _(u"Unexpected form in table context."),
+        _("Unexpected form in table context."),
     "unexpected-start-tag-implies-table-voodoo":
-       _(u"Unexpected start tag (%(name)s) in "
-         u"table context caused voodoo mode."),
+        _("Unexpected start tag (%(name)s) in "
+          "table context caused voodoo mode."),
     "unexpected-end-tag-implies-table-voodoo":
-       _(u"Unexpected end tag (%(name)s) in "
-         u"table context caused voodoo mode."),
+        _("Unexpected end tag (%(name)s) in "
+          "table context caused voodoo mode."),
     "unexpected-cell-in-table-body":
-       _(u"Unexpected table cell start tag (%(name)s) "
-         u"in the table body phase."),
+        _("Unexpected table cell start tag (%(name)s) "
+          "in the table body phase."),
     "unexpected-cell-end-tag":
-       _(u"Got table cell end tag (%(name)s) "
-         u"while required end tags are missing."),
+        _("Got table cell end tag (%(name)s) "
+          "while required end tags are missing."),
     "unexpected-end-tag-in-table-body":
-       _(u"Unexpected end tag (%(name)s) in the table body phase. Ignored."),
+        _("Unexpected end tag (%(name)s) in the table body phase. Ignored."),
     "unexpected-implied-end-tag-in-table-row":
-       _(u"Unexpected implied end tag (%(name)s) in the table row phase."),
+        _("Unexpected implied end tag (%(name)s) in the table row phase."),
     "unexpected-end-tag-in-table-row":
-       _(u"Unexpected end tag (%(name)s) in the table row phase. Ignored."),
+        _("Unexpected end tag (%(name)s) in the table row phase. Ignored."),
     "unexpected-select-in-select":
-       _(u"Unexpected select start tag in the select phase "
-         u"treated as select end tag."),
+        _("Unexpected select start tag in the select phase "
+          "treated as select end tag."),
     "unexpected-input-in-select":
-       _(u"Unexpected input start tag in the select phase."),
+        _("Unexpected input start tag in the select phase."),
     "unexpected-start-tag-in-select":
-       _(u"Unexpected start tag token (%(name)s in the select phase. "
-         u"Ignored."),
+        _("Unexpected start tag token (%(name)s in the select phase. "
+          "Ignored."),
     "unexpected-end-tag-in-select":
-       _(u"Unexpected end tag (%(name)s) in the select phase. Ignored."),
+        _("Unexpected end tag (%(name)s) in the select phase. Ignored."),
     "unexpected-table-element-start-tag-in-select-in-table":
-       _(u"Unexpected table element start tag (%(name)s) in the select in table phase."),
+        _("Unexpected table element start tag (%(name)s) in the select in table phase."),
     "unexpected-table-element-end-tag-in-select-in-table":
-       _(u"Unexpected table element end tag (%(name)s) in the select in table phase."),
+        _("Unexpected table element end tag (%(name)s) in the select in table phase."),
     "unexpected-char-after-body":
-       _(u"Unexpected non-space characters in the after body phase."),
+        _("Unexpected non-space characters in the after body phase."),
     "unexpected-start-tag-after-body":
-       _(u"Unexpected start tag token (%(name)s)"
-         u" in the after body phase."),
+        _("Unexpected start tag token (%(name)s)"
+          " in the after body phase."),
     "unexpected-end-tag-after-body":
-       _(u"Unexpected end tag token (%(name)s)"
-         u" in the after body phase."),
+        _("Unexpected end tag token (%(name)s)"
+          " in the after body phase."),
     "unexpected-char-in-frameset":
-       _(u"Unepxected characters in the frameset phase. Characters ignored."),
+        _("Unexpected characters in the frameset phase. Characters ignored."),
     "unexpected-start-tag-in-frameset":
-       _(u"Unexpected start tag token (%(name)s)"
-         u" in the frameset phase. Ignored."),
+        _("Unexpected start tag token (%(name)s)"
+          " in the frameset phase. Ignored."),
     "unexpected-frameset-in-frameset-innerhtml":
-       _(u"Unexpected end tag token (frameset) "
-         u"in the frameset phase (innerHTML)."),
+        _("Unexpected end tag token (frameset) "
+          "in the frameset phase (innerHTML)."),
     "unexpected-end-tag-in-frameset":
-       _(u"Unexpected end tag token (%(name)s)"
-         u" in the frameset phase. Ignored."),
+        _("Unexpected end tag token (%(name)s)"
+          " in the frameset phase. Ignored."),
     "unexpected-char-after-frameset":
-       _(u"Unexpected non-space characters in the "
-         u"after frameset phase. Ignored."),
+        _("Unexpected non-space characters in the "
+          "after frameset phase. Ignored."),
     "unexpected-start-tag-after-frameset":
-       _(u"Unexpected start tag (%(name)s)"
-         u" in the after frameset phase. Ignored."),
+        _("Unexpected start tag (%(name)s)"
+          " in the after frameset phase. Ignored."),
     "unexpected-end-tag-after-frameset":
-       _(u"Unexpected end tag (%(name)s)"
-         u" in the after frameset phase. Ignored."),
+        _("Unexpected end tag (%(name)s)"
+          " in the after frameset phase. Ignored."),
     "unexpected-end-tag-after-body-innerhtml":
-       _(u"Unexpected end tag after body(innerHtml)"),
+        _("Unexpected end tag after body(innerHtml)"),
     "expected-eof-but-got-char":
-       _(u"Unexpected non-space characters. Expected end of file."),
+        _("Unexpected non-space characters. Expected end of file."),
     "expected-eof-but-got-start-tag":
-       _(u"Unexpected start tag (%(name)s)"
-         u". Expected end of file."),
+        _("Unexpected start tag (%(name)s)"
+          ". Expected end of file."),
     "expected-eof-but-got-end-tag":
-       _(u"Unexpected end tag (%(name)s)"
-         u". Expected end of file."),
+        _("Unexpected end tag (%(name)s)"
+          ". Expected end of file."),
     "eof-in-table":
-       _(u"Unexpected end of file. Expected table content."),
+        _("Unexpected end of file. Expected table content."),
     "eof-in-select":
-       _(u"Unexpected end of file. Expected select content."),
+        _("Unexpected end of file. Expected select content."),
     "eof-in-frameset":
-       _(u"Unexpected end of file. Expected frameset content."),
+        _("Unexpected end of file. Expected frameset content."),
     "eof-in-script-in-script":
-       _(u"Unexpected end of file. Expected script content."),
+        _("Unexpected end of file. Expected script content."),
+    "eof-in-foreign-lands":
+        _("Unexpected end of file. Expected foreign content"),
     "non-void-element-with-trailing-solidus":
-       _(u"Trailing solidus not allowed on element %(name)s"),
+        _("Trailing solidus not allowed on element %(name)s"),
     "unexpected-html-element-in-foreign-content":
-       _(u"Element %(name)s not allowed in a non-html context"),
+        _("Element %(name)s not allowed in a non-html context"),
     "unexpected-end-tag-before-html":
-        _(u"Unexpected end tag (%(name)s) before html."),
+        _("Unexpected end tag (%(name)s) before html."),
     "XXX-undefined-error":
-        (u"Undefined error (this sucks and should be fixed)"),
+        _("Undefined error (this sucks and should be fixed)"),
 }
 
 namespaces = {
-    "html":"http://www.w3.org/1999/xhtml",
-    "mathml":"http://www.w3.org/1998/Math/MathML",
-    "svg":"http://www.w3.org/2000/svg",
-    "xlink":"http://www.w3.org/1999/xlink",
-    "xml":"http://www.w3.org/XML/1998/namespace",
-    "xmlns":"http://www.w3.org/2000/xmlns/"
+    "html": "http://www.w3.org/1999/xhtml",
+    "mathml": "http://www.w3.org/1998/Math/MathML",
+    "svg": "http://www.w3.org/2000/svg",
+    "xlink": "http://www.w3.org/1999/xlink",
+    "xml": "http://www.w3.org/XML/1998/namespace",
+    "xmlns": "http://www.w3.org/2000/xmlns/"
 }
 
 scopingElements = frozenset((
     (namespaces["html"], "applet"),
-    (namespaces["html"], "button"),
     (namespaces["html"], "caption"),
     (namespaces["html"], "html"),
     (namespaces["html"], "marquee"),
@@ -289,7 +307,15 @@ scopingElements = frozenset((
     (namespaces["html"], "table"),
     (namespaces["html"], "td"),
     (namespaces["html"], "th"),
-    (namespaces["svg"], "foreignObject")
+    (namespaces["mathml"], "mi"),
+    (namespaces["mathml"], "mo"),
+    (namespaces["mathml"], "mn"),
+    (namespaces["mathml"], "ms"),
+    (namespaces["mathml"], "mtext"),
+    (namespaces["mathml"], "annotation-xml"),
+    (namespaces["svg"], "foreignObject"),
+    (namespaces["svg"], "desc"),
+    (namespaces["svg"], "title"),
 ))
 
 formattingElements = frozenset((
@@ -311,6 +337,7 @@ formattingElements = frozenset((
 
 specialElements = frozenset((
     (namespaces["html"], "address"),
+    (namespaces["html"], "applet"),
     (namespaces["html"], "area"),
     (namespaces["html"], "article"),
     (namespaces["html"], "aside"),
@@ -320,20 +347,19 @@ specialElements = frozenset((
     (namespaces["html"], "blockquote"),
     (namespaces["html"], "body"),
     (namespaces["html"], "br"),
+    (namespaces["html"], "button"),
+    (namespaces["html"], "caption"),
     (namespaces["html"], "center"),
     (namespaces["html"], "col"),
     (namespaces["html"], "colgroup"),
     (namespaces["html"], "command"),
-    (namespaces["html"], "datagrid"),
     (namespaces["html"], "dd"),
     (namespaces["html"], "details"),
-    (namespaces["html"], "dialog"),
     (namespaces["html"], "dir"),
     (namespaces["html"], "div"),
     (namespaces["html"], "dl"),
     (namespaces["html"], "dt"),
     (namespaces["html"], "embed"),
-    (namespaces["html"], "event-source"),
     (namespaces["html"], "fieldset"),
     (namespaces["html"], "figure"),
     (namespaces["html"], "footer"),
@@ -349,25 +375,26 @@ specialElements = frozenset((
     (namespaces["html"], "head"),
     (namespaces["html"], "header"),
     (namespaces["html"], "hr"),
+    (namespaces["html"], "html"),
     (namespaces["html"], "iframe"),
     # Note that image is commented out in the spec as "this isn't an
     # element that can end up on the stack, so it doesn't matter,"
-    (namespaces["html"], "image"), 
+    (namespaces["html"], "image"),
     (namespaces["html"], "img"),
     (namespaces["html"], "input"),
     (namespaces["html"], "isindex"),
     (namespaces["html"], "li"),
     (namespaces["html"], "link"),
     (namespaces["html"], "listing"),
+    (namespaces["html"], "marquee"),
     (namespaces["html"], "menu"),
     (namespaces["html"], "meta"),
     (namespaces["html"], "nav"),
     (namespaces["html"], "noembed"),
     (namespaces["html"], "noframes"),
     (namespaces["html"], "noscript"),
+    (namespaces["html"], "object"),
     (namespaces["html"], "ol"),
-    (namespaces["html"], "optgroup"),
-    (namespaces["html"], "option"),
     (namespaces["html"], "p"),
     (namespaces["html"], "param"),
     (namespaces["html"], "plaintext"),
@@ -375,24 +402,61 @@ specialElements = frozenset((
     (namespaces["html"], "script"),
     (namespaces["html"], "section"),
     (namespaces["html"], "select"),
-    (namespaces["html"], "spacer"),
     (namespaces["html"], "style"),
+    (namespaces["html"], "table"),
     (namespaces["html"], "tbody"),
+    (namespaces["html"], "td"),
     (namespaces["html"], "textarea"),
     (namespaces["html"], "tfoot"),
+    (namespaces["html"], "th"),
     (namespaces["html"], "thead"),
     (namespaces["html"], "title"),
     (namespaces["html"], "tr"),
     (namespaces["html"], "ul"),
-    (namespaces["html"], "wbr")
+    (namespaces["html"], "wbr"),
+    (namespaces["html"], "xmp"),
+    (namespaces["svg"], "foreignObject")
 ))
 
+htmlIntegrationPointElements = frozenset((
+    (namespaces["mathml"], "annotaion-xml"),
+    (namespaces["svg"], "foreignObject"),
+    (namespaces["svg"], "desc"),
+    (namespaces["svg"], "title")
+))
+
+mathmlTextIntegrationPointElements = frozenset((
+    (namespaces["mathml"], "mi"),
+    (namespaces["mathml"], "mo"),
+    (namespaces["mathml"], "mn"),
+    (namespaces["mathml"], "ms"),
+    (namespaces["mathml"], "mtext")
+))
+
+adjustForeignAttributes = {
+    "xlink:actuate": ("xlink", "actuate", namespaces["xlink"]),
+    "xlink:arcrole": ("xlink", "arcrole", namespaces["xlink"]),
+    "xlink:href": ("xlink", "href", namespaces["xlink"]),
+    "xlink:role": ("xlink", "role", namespaces["xlink"]),
+    "xlink:show": ("xlink", "show", namespaces["xlink"]),
+    "xlink:title": ("xlink", "title", namespaces["xlink"]),
+    "xlink:type": ("xlink", "type", namespaces["xlink"]),
+    "xml:base": ("xml", "base", namespaces["xml"]),
+    "xml:lang": ("xml", "lang", namespaces["xml"]),
+    "xml:space": ("xml", "space", namespaces["xml"]),
+    "xmlns": (None, "xmlns", namespaces["xmlns"]),
+    "xmlns:xlink": ("xmlns", "xlink", namespaces["xmlns"])
+}
+
+unadjustForeignAttributes = dict([((ns, local), qname) for qname, (prefix, local, ns) in
+                                  adjustForeignAttributes.items()])
+
 spaceCharacters = frozenset((
-    u"\t",
-    u"\n",
-    u"\u000C",
-    u" ",
-    u"\r"
+    "\t",
+    "\n",
+    "\u000C",
+    " ",
+    "\r"
 ))
 
 tableInsertModeElements = frozenset((
@@ -409,8 +473,8 @@ asciiLetters = frozenset(string.ascii_letters)
 digits = frozenset(string.digits)
 hexDigits = frozenset(string.hexdigits)
 
-asciiUpper2Lower = dict([(ord(c),ord(c.lower()))
-    for c in string.ascii_uppercase])
+asciiUpper2Lower = dict([(ord(c), ord(c.lower()))
+                         for c in string.ascii_uppercase])
 
 # Heading elements need to be ordered
 headingElements = (
@@ -436,7 +500,8 @@ voidElements = frozenset((
     "area",
     "col",
     "input",
-    "source"
+    "source",
+    "track"
 ))
 
 cdataElements = frozenset(('title', 'textarea'))
@@ -455,12 +520,13 @@ booleanAttributes = {
     "": frozenset(("irrelevant",)),
     "style": frozenset(("scoped",)),
     "img": frozenset(("ismap",)),
-    "audio": frozenset(("autoplay","controls")),
-    "video": frozenset(("autoplay","controls")),
+    "audio": frozenset(("autoplay", "controls")),
+    "video": frozenset(("autoplay", "controls")),
     "script": frozenset(("defer", "async")),
     "details": frozenset(("open",)),
     "datagrid": frozenset(("multiple", "disabled")),
     "command": frozenset(("hidden", "disabled", "checked", "default")),
+    "hr": frozenset(("noshade")),
     "menu": frozenset(("autosubmit",)),
     "fieldset": frozenset(("disabled", "readonly")),
     "option": frozenset(("disabled", "readonly", "selected")),
@@ -474,445 +540,2312 @@ booleanAttributes = {
 # entitiesWindows1252 has to be _ordered_ and needs to have an index. It
 # therefore can't be a frozenset.
 entitiesWindows1252 = (
-    8364,  # 0x80  0x20AC  EURO SIGN
-    65533, # 0x81          UNDEFINED
-    8218,  # 0x82  0x201A  SINGLE LOW-9 QUOTATION MARK
-    402,   # 0x83  0x0192  LATIN SMALL LETTER F WITH HOOK
-    8222,  # 0x84  0x201E  DOUBLE LOW-9 QUOTATION MARK
-    8230,  # 0x85  0x2026  HORIZONTAL ELLIPSIS
-    8224,  # 0x86  0x2020  DAGGER
-    8225,  # 0x87  0x2021  DOUBLE DAGGER
-    710,   # 0x88  0x02C6  MODIFIER LETTER CIRCUMFLEX ACCENT
-    8240,  # 0x89  0x2030  PER MILLE SIGN
-    352,   # 0x8A  0x0160  LATIN CAPITAL LETTER S WITH CARON
-    8249,  # 0x8B  0x2039  SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-    338,   # 0x8C  0x0152  LATIN CAPITAL LIGATURE OE
-    65533, # 0x8D          UNDEFINED
-    381,   # 0x8E  0x017D  LATIN CAPITAL LETTER Z WITH CARON
-    65533, # 0x8F          UNDEFINED
-    65533, # 0x90          UNDEFINED
-    8216,  # 0x91  0x2018  LEFT SINGLE QUOTATION MARK
-    8217,  # 0x92  0x2019  RIGHT SINGLE QUOTATION MARK
-    8220,  # 0x93  0x201C  LEFT DOUBLE QUOTATION MARK
-    8221,  # 0x94  0x201D  RIGHT DOUBLE QUOTATION MARK
-    8226,  # 0x95  0x2022  BULLET
-    8211,  # 0x96  0x2013  EN DASH
-    8212,  # 0x97  0x2014  EM DASH
-    732,   # 0x98  0x02DC  SMALL TILDE
-    8482,  # 0x99  0x2122  TRADE MARK SIGN
-    353,   # 0x9A  0x0161  LATIN SMALL LETTER S WITH CARON
-    8250,  # 0x9B  0x203A  SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-    339,   # 0x9C  0x0153  LATIN SMALL LIGATURE OE
-    65533, # 0x9D          UNDEFINED
-    382,   # 0x9E  0x017E  LATIN SMALL LETTER Z WITH CARON
-    376    # 0x9F  0x0178  LATIN CAPITAL LETTER Y WITH DIAERESIS
+    8364,   # 0x80  0x20AC  EURO SIGN
+    65533,  # 0x81          UNDEFINED
+    8218,   # 0x82  0x201A  SINGLE LOW-9 QUOTATION MARK
+    402,    # 0x83  0x0192  LATIN SMALL LETTER F WITH HOOK
+    8222,   # 0x84  0x201E  DOUBLE LOW-9 QUOTATION MARK
+    8230,   # 0x85  0x2026  HORIZONTAL ELLIPSIS
+    8224,   # 0x86  0x2020  DAGGER
+    8225,   # 0x87  0x2021  DOUBLE DAGGER
+    710,    # 0x88  0x02C6  MODIFIER LETTER CIRCUMFLEX ACCENT
+    8240,   # 0x89  0x2030  PER MILLE SIGN
+    352,    # 0x8A  0x0160  LATIN CAPITAL LETTER S WITH CARON
+    8249,   # 0x8B  0x2039  SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+    338,    # 0x8C  0x0152  LATIN CAPITAL LIGATURE OE
+    65533,  # 0x8D          UNDEFINED
+    381,    # 0x8E  0x017D  LATIN CAPITAL LETTER Z WITH CARON
+    65533,  # 0x8F          UNDEFINED
+    65533,  # 0x90          UNDEFINED
+    8216,   # 0x91  0x2018  LEFT SINGLE QUOTATION MARK
+    8217,   # 0x92  0x2019  RIGHT SINGLE QUOTATION MARK
+    8220,   # 0x93  0x201C  LEFT DOUBLE QUOTATION MARK
+    8221,   # 0x94  0x201D  RIGHT DOUBLE QUOTATION MARK
+    8226,   # 0x95  0x2022  BULLET
+    8211,   # 0x96  0x2013  EN DASH
+    8212,   # 0x97  0x2014  EM DASH
+    732,    # 0x98  0x02DC  SMALL TILDE
+    8482,   # 0x99  0x2122  TRADE MARK SIGN
+    353,    # 0x9A  0x0161  LATIN SMALL LETTER S WITH CARON
+    8250,   # 0x9B  0x203A  SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    339,    # 0x9C  0x0153  LATIN SMALL LIGATURE OE
+    65533,  # 0x9D          UNDEFINED
+    382,    # 0x9E  0x017E  LATIN SMALL LETTER Z WITH CARON
+    376     # 0x9F  0x0178  LATIN CAPITAL LETTER Y WITH DIAERESIS
 )
 
+xmlEntities = frozenset(('lt;', 'gt;', 'amp;', 'apos;', 'quot;'))
+
 entities = {
-    "AElig;": u"\u00C6",
-    "AElig": u"\u00C6",
-    "AMP;": u"\u0026",
-    "AMP": u"\u0026",
-    "Aacute;": u"\u00C1",
-    "Aacute": u"\u00C1",
-    "Acirc;": u"\u00C2",
-    "Acirc": u"\u00C2",
-    "Agrave;": u"\u00C0",
-    "Agrave": u"\u00C0",
-    "Alpha;": u"\u0391",
-    "Aring;": u"\u00C5",
-    "Aring": u"\u00C5",
-    "Atilde;": u"\u00C3",
-    "Atilde": u"\u00C3",
-    "Auml;": u"\u00C4",
-    "Auml": u"\u00C4",
-    "Beta;": u"\u0392",
-    "COPY;": u"\u00A9",
-    "COPY": u"\u00A9",
-    "Ccedil;": u"\u00C7",
-    "Ccedil": u"\u00C7",
-    "Chi;": u"\u03A7",
-    "Dagger;": u"\u2021",
-    "Delta;": u"\u0394",
-    "ETH;": u"\u00D0",
-    "ETH": u"\u00D0",
-    "Eacute;": u"\u00C9",
-    "Eacute": u"\u00C9",
-    "Ecirc;": u"\u00CA",
-    "Ecirc": u"\u00CA",
-    "Egrave;": u"\u00C8",
-    "Egrave": u"\u00C8",
-    "Epsilon;": u"\u0395",
-    "Eta;": u"\u0397",
-    "Euml;": u"\u00CB",
-    "Euml": u"\u00CB",
-    "GT;": u"\u003E",
-    "GT": u"\u003E",
-    "Gamma;": u"\u0393",
-    "Iacute;": u"\u00CD",
-    "Iacute": u"\u00CD",
-    "Icirc;": u"\u00CE",
-    "Icirc": u"\u00CE",
-    "Igrave;": u"\u00CC",
-    "Igrave": u"\u00CC",
-    "Iota;": u"\u0399",
-    "Iuml;": u"\u00CF",
-    "Iuml": u"\u00CF",
-    "Kappa;": u"\u039A",
-    "LT;": u"\u003C",
-    "LT": u"\u003C",
-    "Lambda;": u"\u039B",
-    "Mu;": u"\u039C",
-    "Ntilde;": u"\u00D1",
-    "Ntilde": u"\u00D1",
-    "Nu;": u"\u039D",
-    "OElig;": u"\u0152",
-    "Oacute;": u"\u00D3",
-    "Oacute": u"\u00D3",
-    "Ocirc;": u"\u00D4",
-    "Ocirc": u"\u00D4",
-    "Ograve;": u"\u00D2",
-    "Ograve": u"\u00D2",
-    "Omega;": u"\u03A9",
-    "Omicron;": u"\u039F",
-    "Oslash;": u"\u00D8",
-    "Oslash": u"\u00D8",
-    "Otilde;": u"\u00D5",
-    "Otilde": u"\u00D5",
-    "Ouml;": u"\u00D6",
-    "Ouml": u"\u00D6",
-    "Phi;": u"\u03A6",
-    "Pi;": u"\u03A0",
-    "Prime;": u"\u2033",
-    "Psi;": u"\u03A8",
-    "QUOT;": u"\u0022",
-    "QUOT": u"\u0022",
-    "REG;": u"\u00AE",
-    "REG": u"\u00AE",
-    "Rho;": u"\u03A1",
-    "Scaron;": u"\u0160",
-    "Sigma;": u"\u03A3",
-    "THORN;": u"\u00DE",
-    "THORN": u"\u00DE",
-    "TRADE;": u"\u2122",
-    "Tau;": u"\u03A4",
-    "Theta;": u"\u0398",
-    "Uacute;": u"\u00DA",
-    "Uacute": u"\u00DA",
-    "Ucirc;": u"\u00DB",
-    "Ucirc": u"\u00DB",
-    "Ugrave;": u"\u00D9",
-    "Ugrave": u"\u00D9",
-    "Upsilon;": u"\u03A5",
-    "Uuml;": u"\u00DC",
-    "Uuml": u"\u00DC",
-    "Xi;": u"\u039E",
-    "Yacute;": u"\u00DD",
-    "Yacute": u"\u00DD",
-    "Yuml;": u"\u0178",
-    "Zeta;": u"\u0396",
-    "aacute;": u"\u00E1",
-    "aacute": u"\u00E1",
-    "acirc;": u"\u00E2",
-    "acirc": u"\u00E2",
-    "acute;": u"\u00B4",
-    "acute": u"\u00B4",
-    "aelig;": u"\u00E6",
-    "aelig": u"\u00E6",
-    "agrave;": u"\u00E0",
-    "agrave": u"\u00E0",
-    "alefsym;": u"\u2135",
-    "alpha;": u"\u03B1",
-    "amp;": u"\u0026",
-    "amp": u"\u0026",
-    "and;": u"\u2227",
-    "ang;": u"\u2220",
-    "apos;": u"\u0027",
-    "aring;": u"\u00E5",
-    "aring": u"\u00E5",
-    "asymp;": u"\u2248",
-    "atilde;": u"\u00E3",
-    "atilde": u"\u00E3",
-    "auml;": u"\u00E4",
-    "auml": u"\u00E4",
-    "bdquo;": u"\u201E",
-    "beta;": u"\u03B2",
-    "brvbar;": u"\u00A6",
-    "brvbar": u"\u00A6",
-    "bull;": u"\u2022",
-    "cap;": u"\u2229",
-    "ccedil;": u"\u00E7",
-    "ccedil": u"\u00E7",
-    "cedil;": u"\u00B8",
-    "cedil": u"\u00B8",
-    "cent;": u"\u00A2",
-    "cent": u"\u00A2",
-    "chi;": u"\u03C7",
-    "circ;": u"\u02C6",
-    "clubs;": u"\u2663",
-    "cong;": u"\u2245",
-    "copy;": u"\u00A9",
-    "copy": u"\u00A9",
-    "crarr;": u"\u21B5",
-    "cup;": u"\u222A",
-    "curren;": u"\u00A4",
-    "curren": u"\u00A4",
-    "dArr;": u"\u21D3",
-    "dagger;": u"\u2020",
-    "darr;": u"\u2193",
-    "deg;": u"\u00B0",
-    "deg": u"\u00B0",
-    "delta;": u"\u03B4",
-    "diams;": u"\u2666",
-    "divide;": u"\u00F7",
-    "divide": u"\u00F7",
-    "eacute;": u"\u00E9",
-    "eacute": u"\u00E9",
-    "ecirc;": u"\u00EA",
-    "ecirc": u"\u00EA",
-    "egrave;": u"\u00E8",
-    "egrave": u"\u00E8",
-    "empty;": u"\u2205",
-    "emsp;": u"\u2003",
-    "ensp;": u"\u2002",
-    "epsilon;": u"\u03B5",
-    "equiv;": u"\u2261",
-    "eta;": u"\u03B7",
-    "eth;": u"\u00F0",
-    "eth": u"\u00F0",
-    "euml;": u"\u00EB",
-    "euml": u"\u00EB",
-    "euro;": u"\u20AC",
-    "exist;": u"\u2203",
-    "fnof;": u"\u0192",
-    "forall;": u"\u2200",
-    "frac12;": u"\u00BD",
-    "frac12": u"\u00BD",
-    "frac14;": u"\u00BC",
-    "frac14": u"\u00BC",
-    "frac34;": u"\u00BE",
-    "frac34": u"\u00BE",
-    "frasl;": u"\u2044",
-    "gamma;": u"\u03B3",
-    "ge;": u"\u2265",
-    "gt;": u"\u003E",
-    "gt": u"\u003E",
-    "hArr;": u"\u21D4",
-    "harr;": u"\u2194",
-    "hearts;": u"\u2665",
-    "hellip;": u"\u2026",
-    "iacute;": u"\u00ED",
-    "iacute": u"\u00ED",
-    "icirc;": u"\u00EE",
-    "icirc": u"\u00EE",
-    "iexcl;": u"\u00A1",
-    "iexcl": u"\u00A1",
-    "igrave;": u"\u00EC",
-    "igrave": u"\u00EC",
-    "image;": u"\u2111",
-    "infin;": u"\u221E",
-    "int;": u"\u222B",
-    "iota;": u"\u03B9",
-    "iquest;": u"\u00BF",
-    "iquest": u"\u00BF",
-    "isin;": u"\u2208",
-    "iuml;": u"\u00EF",
-    "iuml": u"\u00EF",
-    "kappa;": u"\u03BA",
-    "lArr;": u"\u21D0",
-    "lambda;": u"\u03BB",
-    "lang;": u"\u27E8",
-    "laquo;": u"\u00AB",
-    "laquo": u"\u00AB",
-    "larr;": u"\u2190",
-    "lceil;": u"\u2308",
-    "ldquo;": u"\u201C",
-    "le;": u"\u2264",
-    "lfloor;": u"\u230A",
-    "lowast;": u"\u2217",
-    "loz;": u"\u25CA",
-    "lrm;": u"\u200E",
-    "lsaquo;": u"\u2039",
-    "lsquo;": u"\u2018",
-    "lt;": u"\u003C",
-    "lt": u"\u003C",
-    "macr;": u"\u00AF",
-    "macr": u"\u00AF",
-    "mdash;": u"\u2014",
-    "micro;": u"\u00B5",
-    "micro": u"\u00B5",
-    "middot;": u"\u00B7",
-    "middot": u"\u00B7",
-    "minus;": u"\u2212",
-    "mu;": u"\u03BC",
-    "nabla;": u"\u2207",
-    "nbsp;": u"\u00A0",
-    "nbsp": u"\u00A0",
-    "ndash;": u"\u2013",
-    "ne;": u"\u2260",
-    "ni;": u"\u220B",
-    "not;": u"\u00AC",
-    "not": u"\u00AC",
-    "notin;": u"\u2209",
-    "nsub;": u"\u2284",
-    "ntilde;": u"\u00F1",
-    "ntilde": u"\u00F1",
-    "nu;": u"\u03BD",
-    "oacute;": u"\u00F3",
-    "oacute": u"\u00F3",
-    "ocirc;": u"\u00F4",
-    "ocirc": u"\u00F4",
-    "oelig;": u"\u0153",
-    "ograve;": u"\u00F2",
-    "ograve": u"\u00F2",
-    "oline;": u"\u203E",
-    "omega;": u"\u03C9",
-    "omicron;": u"\u03BF",
-    "oplus;": u"\u2295",
-    "or;": u"\u2228",
-    "ordf;": u"\u00AA",
-    "ordf": u"\u00AA",
-    "ordm;": u"\u00BA",
-    "ordm": u"\u00BA",
-    "oslash;": u"\u00F8",
-    "oslash": u"\u00F8",
-    "otilde;": u"\u00F5",
-    "otilde": u"\u00F5",
-    "otimes;": u"\u2297",
-    "ouml;": u"\u00F6",
-    "ouml": u"\u00F6",
-    "para;": u"\u00B6",
-    "para": u"\u00B6",
-    "part;": u"\u2202",
-    "permil;": u"\u2030",
-    "perp;": u"\u22A5",
-    "phi;": u"\u03C6",
-    "pi;": u"\u03C0",
-    "piv;": u"\u03D6",
-    "plusmn;": u"\u00B1",
-    "plusmn": u"\u00B1",
-    "pound;": u"\u00A3",
-    "pound": u"\u00A3",
-    "prime;": u"\u2032",
-    "prod;": u"\u220F",
-    "prop;": u"\u221D",
-    "psi;": u"\u03C8",
-    "quot;": u"\u0022",
-    "quot": u"\u0022",
-    "rArr;": u"\u21D2",
-    "radic;": u"\u221A",
-    "rang;": u"\u27E9",
-    "raquo;": u"\u00BB",
-    "raquo": u"\u00BB",
-    "rarr;": u"\u2192",
-    "rceil;": u"\u2309",
-    "rdquo;": u"\u201D",
-    "real;": u"\u211C",
-    "reg;": u"\u00AE",
-    "reg": u"\u00AE",
-    "rfloor;": u"\u230B",
-    "rho;": u"\u03C1",
-    "rlm;": u"\u200F",
-    "rsaquo;": u"\u203A",
-    "rsquo;": u"\u2019",
-    "sbquo;": u"\u201A",
-    "scaron;": u"\u0161",
-    "sdot;": u"\u22C5",
-    "sect;": u"\u00A7",
-    "sect": u"\u00A7",
-    "shy;": u"\u00AD",
-    "shy": u"\u00AD",
-    "sigma;": u"\u03C3",
-    "sigmaf;": u"\u03C2",
-    "sim;": u"\u223C",
-    "spades;": u"\u2660",
-    "sub;": u"\u2282",
-    "sube;": u"\u2286",
-    "sum;": u"\u2211",
-    "sup1;": u"\u00B9",
-    "sup1": u"\u00B9",
-    "sup2;": u"\u00B2",
-    "sup2": u"\u00B2",
-    "sup3;": u"\u00B3",
-    "sup3": u"\u00B3",
-    "sup;": u"\u2283",
-    "supe;": u"\u2287",
-    "szlig;": u"\u00DF",
-    "szlig": u"\u00DF",
-    "tau;": u"\u03C4",
-    "there4;": u"\u2234",
-    "theta;": u"\u03B8",
-    "thetasym;": u"\u03D1",
-    "thinsp;": u"\u2009",
-    "thorn;": u"\u00FE",
-    "thorn": u"\u00FE",
-    "tilde;": u"\u02DC",
-    "times;": u"\u00D7",
-    "times": u"\u00D7",
-    "trade;": u"\u2122",
-    "uArr;": u"\u21D1",
-    "uacute;": u"\u00FA",
-    "uacute": u"\u00FA",
-    "uarr;": u"\u2191",
-    "ucirc;": u"\u00FB",
-    "ucirc": u"\u00FB",
-    "ugrave;": u"\u00F9",
-    "ugrave": u"\u00F9",
-    "uml;": u"\u00A8",
-    "uml": u"\u00A8",
-    "upsih;": u"\u03D2",
-    "upsilon;": u"\u03C5",
-    "uuml;": u"\u00FC",
-    "uuml": u"\u00FC",
-    "weierp;": u"\u2118",
-    "xi;": u"\u03BE",
-    "yacute;": u"\u00FD",
-    "yacute": u"\u00FD",
-    "yen;": u"\u00A5",
-    "yen": u"\u00A5",
-    "yuml;": u"\u00FF",
-    "yuml": u"\u00FF",
-    "zeta;": u"\u03B6",
-    "zwj;": u"\u200D",
-    "zwnj;": u"\u200C"
+    "AElig": "\xc6",
+    "AElig;": "\xc6",
+    "AMP": "&",
+    "AMP;": "&",
+    "Aacute": "\xc1",
+    "Aacute;": "\xc1",
+    "Abreve;": "\u0102",
+    "Acirc": "\xc2",
+    "Acirc;": "\xc2",
+    "Acy;": "\u0410",
+    "Afr;": "\U0001d504",
+    "Agrave": "\xc0",
+    "Agrave;": "\xc0",
+    "Alpha;": "\u0391",
+    "Amacr;": "\u0100",
+    "And;": "\u2a53",
+    "Aogon;": "\u0104",
+    "Aopf;": "\U0001d538",
+    "ApplyFunction;": "\u2061",
+    "Aring": "\xc5",
+    "Aring;": "\xc5",
+    "Ascr;": "\U0001d49c",
+    "Assign;": "\u2254",
+    "Atilde": "\xc3",
+    "Atilde;": "\xc3",
+    "Auml": "\xc4",
+    "Auml;": "\xc4",
+    "Backslash;": "\u2216",
+    "Barv;": "\u2ae7",
+    "Barwed;": "\u2306",
+    "Bcy;": "\u0411",
+    "Because;": "\u2235",
+    "Bernoullis;": "\u212c",
+    "Beta;": "\u0392",
+    "Bfr;": "\U0001d505",
+    "Bopf;": "\U0001d539",
+    "Breve;": "\u02d8",
+    "Bscr;": "\u212c",
+    "Bumpeq;": "\u224e",
+    "CHcy;": "\u0427",
+    "COPY": "\xa9",
+    "COPY;": "\xa9",
+    "Cacute;": "\u0106",
+    "Cap;": "\u22d2",
+    "CapitalDifferentialD;": "\u2145",
+    "Cayleys;": "\u212d",
+    "Ccaron;": "\u010c",
+    "Ccedil": "\xc7",
+    "Ccedil;": "\xc7",
+    "Ccirc;": "\u0108",
+    "Cconint;": "\u2230",
+    "Cdot;": "\u010a",
+    "Cedilla;": "\xb8",
+    "CenterDot;": "\xb7",
+    "Cfr;": "\u212d",
+    "Chi;": "\u03a7",
+    "CircleDot;": "\u2299",
+    "CircleMinus;": "\u2296",
+    "CirclePlus;": "\u2295",
+    "CircleTimes;": "\u2297",
+    "ClockwiseContourIntegral;": "\u2232",
+    "CloseCurlyDoubleQuote;": "\u201d",
+    "CloseCurlyQuote;": "\u2019",
+    "Colon;": "\u2237",
+    "Colone;": "\u2a74",
+    "Congruent;": "\u2261",
+    "Conint;": "\u222f",
+    "ContourIntegral;": "\u222e",
+    "Copf;": "\u2102",
+    "Coproduct;": "\u2210",
+    "CounterClockwiseContourIntegral;": "\u2233",
+    "Cross;": "\u2a2f",
+    "Cscr;": "\U0001d49e",
+    "Cup;": "\u22d3",
+    "CupCap;": "\u224d",
+    "DD;": "\u2145",
+    "DDotrahd;": "\u2911",
+    "DJcy;": "\u0402",
+    "DScy;": "\u0405",
+    "DZcy;": "\u040f",
+    "Dagger;": "\u2021",
+    "Darr;": "\u21a1",
+    "Dashv;": "\u2ae4",
+    "Dcaron;": "\u010e",
+    "Dcy;": "\u0414",
+    "Del;": "\u2207",
+    "Delta;": "\u0394",
+    "Dfr;": "\U0001d507",
+    "DiacriticalAcute;": "\xb4",
+    "DiacriticalDot;": "\u02d9",
+    "DiacriticalDoubleAcute;": "\u02dd",
+    "DiacriticalGrave;": "`",
+    "DiacriticalTilde;": "\u02dc",
+    "Diamond;": "\u22c4",
+    "DifferentialD;": "\u2146",
+    "Dopf;": "\U0001d53b",
+    "Dot;": "\xa8",
+    "DotDot;": "\u20dc",
+    "DotEqual;": "\u2250",
+    "DoubleContourIntegral;": "\u222f",
+    "DoubleDot;": "\xa8",
+    "DoubleDownArrow;": "\u21d3",
+    "DoubleLeftArrow;": "\u21d0",
+    "DoubleLeftRightArrow;": "\u21d4",
+    "DoubleLeftTee;": "\u2ae4",
+    "DoubleLongLeftArrow;": "\u27f8",
+    "DoubleLongLeftRightArrow;": "\u27fa",
+    "DoubleLongRightArrow;": "\u27f9",
+    "DoubleRightArrow;": "\u21d2",
+    "DoubleRightTee;": "\u22a8",
+    "DoubleUpArrow;": "\u21d1",
+    "DoubleUpDownArrow;": "\u21d5",
+    "DoubleVerticalBar;": "\u2225",
+    "DownArrow;": "\u2193",
+    "DownArrowBar;": "\u2913",
+    "DownArrowUpArrow;": "\u21f5",
+    "DownBreve;": "\u0311",
+    "DownLeftRightVector;": "\u2950",
+    "DownLeftTeeVector;": "\u295e",
+    "DownLeftVector;": "\u21bd",
+    "DownLeftVectorBar;": "\u2956",
+    "DownRightTeeVector;": "\u295f",
+    "DownRightVector;": "\u21c1",
+    "DownRightVectorBar;": "\u2957",
+    "DownTee;": "\u22a4",
+    "DownTeeArrow;": "\u21a7",
+    "Downarrow;": "\u21d3",
+    "Dscr;": "\U0001d49f",
+    "Dstrok;": "\u0110",
+    "ENG;": "\u014a",
+    "ETH": "\xd0",
+    "ETH;": "\xd0",
+    "Eacute": "\xc9",
+    "Eacute;": "\xc9",
+    "Ecaron;": "\u011a",
+    "Ecirc": "\xca",
+    "Ecirc;": "\xca",
+    "Ecy;": "\u042d",
+    "Edot;": "\u0116",
+    "Efr;": "\U0001d508",
+    "Egrave": "\xc8",
+    "Egrave;": "\xc8",
+    "Element;": "\u2208",
+    "Emacr;": "\u0112",
+    "EmptySmallSquare;": "\u25fb",
+    "EmptyVerySmallSquare;": "\u25ab",
+    "Eogon;": "\u0118",
+    "Eopf;": "\U0001d53c",
+    "Epsilon;": "\u0395",
+    "Equal;": "\u2a75",
+    "EqualTilde;": "\u2242",
+    "Equilibrium;": "\u21cc",
+    "Escr;": "\u2130",
+    "Esim;": "\u2a73",
+    "Eta;": "\u0397",
+    "Euml": "\xcb",
+    "Euml;": "\xcb",
+    "Exists;": "\u2203",
+    "ExponentialE;": "\u2147",
+    "Fcy;": "\u0424",
+    "Ffr;": "\U0001d509",
+    "FilledSmallSquare;": "\u25fc",
+    "FilledVerySmallSquare;": "\u25aa",
+    "Fopf;": "\U0001d53d",
+    "ForAll;": "\u2200",
+    "Fouriertrf;": "\u2131",
+    "Fscr;": "\u2131",
+    "GJcy;": "\u0403",
+    "GT": ">",
+    "GT;": ">",
+    "Gamma;": "\u0393",
+    "Gammad;": "\u03dc",
+    "Gbreve;": "\u011e",
+    "Gcedil;": "\u0122",
+    "Gcirc;": "\u011c",
+    "Gcy;": "\u0413",
+    "Gdot;": "\u0120",
+    "Gfr;": "\U0001d50a",
+    "Gg;": "\u22d9",
+    "Gopf;": "\U0001d53e",
+    "GreaterEqual;": "\u2265",
+    "GreaterEqualLess;": "\u22db",
+    "GreaterFullEqual;": "\u2267",
+    "GreaterGreater;": "\u2aa2",
+    "GreaterLess;": "\u2277",
+    "GreaterSlantEqual;": "\u2a7e",
+    "GreaterTilde;": "\u2273",
+    "Gscr;": "\U0001d4a2",
+    "Gt;": "\u226b",
+    "HARDcy;": "\u042a",
+    "Hacek;": "\u02c7",
+    "Hat;": "^",
+    "Hcirc;": "\u0124",
+    "Hfr;": "\u210c",
+    "HilbertSpace;": "\u210b",
+    "Hopf;": "\u210d",
+    "HorizontalLine;": "\u2500",
+    "Hscr;": "\u210b",
+    "Hstrok;": "\u0126",
+    "HumpDownHump;": "\u224e",
+    "HumpEqual;": "\u224f",
+    "IEcy;": "\u0415",
+    "IJlig;": "\u0132",
+    "IOcy;": "\u0401",
+    "Iacute": "\xcd",
+    "Iacute;": "\xcd",
+    "Icirc": "\xce",
+    "Icirc;": "\xce",
+    "Icy;": "\u0418",
+    "Idot;": "\u0130",
+    "Ifr;": "\u2111",
+    "Igrave": "\xcc",
+    "Igrave;": "\xcc",
+    "Im;": "\u2111",
+    "Imacr;": "\u012a",
+    "ImaginaryI;": "\u2148",
+    "Implies;": "\u21d2",
+    "Int;": "\u222c",
+    "Integral;": "\u222b",
+    "Intersection;": "\u22c2",
+    "InvisibleComma;": "\u2063",
+    "InvisibleTimes;": "\u2062",
+    "Iogon;": "\u012e",
+    "Iopf;": "\U0001d540",
+    "Iota;": "\u0399",
+    "Iscr;": "\u2110",
+    "Itilde;": "\u0128",
+    "Iukcy;": "\u0406",
+    "Iuml": "\xcf",
+    "Iuml;": "\xcf",
+    "Jcirc;": "\u0134",
+    "Jcy;": "\u0419",
+    "Jfr;": "\U0001d50d",
+    "Jopf;": "\U0001d541",
+    "Jscr;": "\U0001d4a5",
+    "Jsercy;": "\u0408",
+    "Jukcy;": "\u0404",
+    "KHcy;": "\u0425",
+    "KJcy;": "\u040c",
+    "Kappa;": "\u039a",
+    "Kcedil;": "\u0136",
+    "Kcy;": "\u041a",
+    "Kfr;": "\U0001d50e",
+    "Kopf;": "\U0001d542",
+    "Kscr;": "\U0001d4a6",
+    "LJcy;": "\u0409",
+    "LT": "<",
+    "LT;": "<",
+    "Lacute;": "\u0139",
+    "Lambda;": "\u039b",
+    "Lang;": "\u27ea",
+    "Laplacetrf;": "\u2112",
+    "Larr;": "\u219e",
+    "Lcaron;": "\u013d",
+    "Lcedil;": "\u013b",
+    "Lcy;": "\u041b",
+    "LeftAngleBracket;": "\u27e8",
+    "LeftArrow;": "\u2190",
+    "LeftArrowBar;": "\u21e4",
+    "LeftArrowRightArrow;": "\u21c6",
+    "LeftCeiling;": "\u2308",
+    "LeftDoubleBracket;": "\u27e6",
+    "LeftDownTeeVector;": "\u2961",
+    "LeftDownVector;": "\u21c3",
+    "LeftDownVectorBar;": "\u2959",
+    "LeftFloor;": "\u230a",
+    "LeftRightArrow;": "\u2194",
+    "LeftRightVector;": "\u294e",
+    "LeftTee;": "\u22a3",
+    "LeftTeeArrow;": "\u21a4",
+    "LeftTeeVector;": "\u295a",
+    "LeftTriangle;": "\u22b2",
+    "LeftTriangleBar;": "\u29cf",
+    "LeftTriangleEqual;": "\u22b4",
+    "LeftUpDownVector;": "\u2951",
+    "LeftUpTeeVector;": "\u2960",
+    "LeftUpVector;": "\u21bf",
+    "LeftUpVectorBar;": "\u2958",
+    "LeftVector;": "\u21bc",
+    "LeftVectorBar;": "\u2952",
+    "Leftarrow;": "\u21d0",
+    "Leftrightarrow;": "\u21d4",
+    "LessEqualGreater;": "\u22da",
+    "LessFullEqual;": "\u2266",
+    "LessGreater;": "\u2276",
+    "LessLess;": "\u2aa1",
+    "LessSlantEqual;": "\u2a7d",
+    "LessTilde;": "\u2272",
+    "Lfr;": "\U0001d50f",
+    "Ll;": "\u22d8",
+    "Lleftarrow;": "\u21da",
+    "Lmidot;": "\u013f",
+    "LongLeftArrow;": "\u27f5",
+    "LongLeftRightArrow;": "\u27f7",
+    "LongRightArrow;": "\u27f6",
+    "Longleftarrow;": "\u27f8",
+    "Longleftrightarrow;": "\u27fa",
+    "Longrightarrow;": "\u27f9",
+    "Lopf;": "\U0001d543",
+    "LowerLeftArrow;": "\u2199",
+    "LowerRightArrow;": "\u2198",
+    "Lscr;": "\u2112",
+    "Lsh;": "\u21b0",
+    "Lstrok;": "\u0141",
+    "Lt;": "\u226a",
+    "Map;": "\u2905",
+    "Mcy;": "\u041c",
+    "MediumSpace;": "\u205f",
+    "Mellintrf;": "\u2133",
+    "Mfr;": "\U0001d510",
+    "MinusPlus;": "\u2213",
+    "Mopf;": "\U0001d544",
+    "Mscr;": "\u2133",
+    "Mu;": "\u039c",
+    "NJcy;": "\u040a",
+    "Nacute;": "\u0143",
+    "Ncaron;": "\u0147",
+    "Ncedil;": "\u0145",
+    "Ncy;": "\u041d",
+    "NegativeMediumSpace;": "\u200b",
+    "NegativeThickSpace;": "\u200b",
+    "NegativeThinSpace;": "\u200b",
+    "NegativeVeryThinSpace;": "\u200b",
+    "NestedGreaterGreater;": "\u226b",
+    "NestedLessLess;": "\u226a",
+    "NewLine;": "\n",
+    "Nfr;": "\U0001d511",
+    "NoBreak;": "\u2060",
+    "NonBreakingSpace;": "\xa0",
+    "Nopf;": "\u2115",
+    "Not;": "\u2aec",
+    "NotCongruent;": "\u2262",
+    "NotCupCap;": "\u226d",
+    "NotDoubleVerticalBar;": "\u2226",
+    "NotElement;": "\u2209",
+    "NotEqual;": "\u2260",
+    "NotEqualTilde;": "\u2242\u0338",
+    "NotExists;": "\u2204",
+    "NotGreater;": "\u226f",
+    "NotGreaterEqual;": "\u2271",
+    "NotGreaterFullEqual;": "\u2267\u0338",
+    "NotGreaterGreater;": "\u226b\u0338",
+    "NotGreaterLess;": "\u2279",
+    "NotGreaterSlantEqual;": "\u2a7e\u0338",
+    "NotGreaterTilde;": "\u2275",
+    "NotHumpDownHump;": "\u224e\u0338",
+    "NotHumpEqual;": "\u224f\u0338",
+    "NotLeftTriangle;": "\u22ea",
+    "NotLeftTriangleBar;": "\u29cf\u0338",
+    "NotLeftTriangleEqual;": "\u22ec",
+    "NotLess;": "\u226e",
+    "NotLessEqual;": "\u2270",
+    "NotLessGreater;": "\u2278",
+    "NotLessLess;": "\u226a\u0338",
+    "NotLessSlantEqual;": "\u2a7d\u0338",
+    "NotLessTilde;": "\u2274",
+    "NotNestedGreaterGreater;": "\u2aa2\u0338",
+    "NotNestedLessLess;": "\u2aa1\u0338",
+    "NotPrecedes;": "\u2280",
+    "NotPrecedesEqual;": "\u2aaf\u0338",
+    "NotPrecedesSlantEqual;": "\u22e0",
+    "NotReverseElement;": "\u220c",
+    "NotRightTriangle;": "\u22eb",
+    "NotRightTriangleBar;": "\u29d0\u0338",
+    "NotRightTriangleEqual;": "\u22ed",
+    "NotSquareSubset;": "\u228f\u0338",
+    "NotSquareSubsetEqual;": "\u22e2",
+    "NotSquareSuperset;": "\u2290\u0338",
+    "NotSquareSupersetEqual;": "\u22e3",
+    "NotSubset;": "\u2282\u20d2",
+    "NotSubsetEqual;": "\u2288",
+    "NotSucceeds;": "\u2281",
+    "NotSucceedsEqual;": "\u2ab0\u0338",
+    "NotSucceedsSlantEqual;": "\u22e1",
+    "NotSucceedsTilde;": "\u227f\u0338",
+    "NotSuperset;": "\u2283\u20d2",
+    "NotSupersetEqual;": "\u2289",
+    "NotTilde;": "\u2241",
+    "NotTildeEqual;": "\u2244",
+    "NotTildeFullEqual;": "\u2247",
+    "NotTildeTilde;": "\u2249",
+    "NotVerticalBar;": "\u2224",
+    "Nscr;": "\U0001d4a9",
+    "Ntilde": "\xd1",
+    "Ntilde;": "\xd1",
+    "Nu;": "\u039d",
+    "OElig;": "\u0152",
+    "Oacute": "\xd3",
+    "Oacute;": "\xd3",
+    "Ocirc": "\xd4",
+    "Ocirc;": "\xd4",
+    "Ocy;": "\u041e",
+    "Odblac;": "\u0150",
+    "Ofr;": "\U0001d512",
+    "Ograve": "\xd2",
+    "Ograve;": "\xd2",
+    "Omacr;": "\u014c",
+    "Omega;": "\u03a9",
+    "Omicron;": "\u039f",
+    "Oopf;": "\U0001d546",
+    "OpenCurlyDoubleQuote;": "\u201c",
+    "OpenCurlyQuote;": "\u2018",
+    "Or;": "\u2a54",
+    "Oscr;": "\U0001d4aa",
+    "Oslash": "\xd8",
+    "Oslash;": "\xd8",
+    "Otilde": "\xd5",
+    "Otilde;": "\xd5",
+    "Otimes;": "\u2a37",
+    "Ouml": "\xd6",
+    "Ouml;": "\xd6",
+    "OverBar;": "\u203e",
+    "OverBrace;": "\u23de",
+    "OverBracket;": "\u23b4",
+    "OverParenthesis;": "\u23dc",
+    "PartialD;": "\u2202",
+    "Pcy;": "\u041f",
+    "Pfr;": "\U0001d513",
+    "Phi;": "\u03a6",
+    "Pi;": "\u03a0",
+    "PlusMinus;": "\xb1",
+    "Poincareplane;": "\u210c",
+    "Popf;": "\u2119",
+    "Pr;": "\u2abb",
+    "Precedes;": "\u227a",
+    "PrecedesEqual;": "\u2aaf",
+    "PrecedesSlantEqual;": "\u227c",
+    "PrecedesTilde;": "\u227e",
+    "Prime;": "\u2033",
+    "Product;": "\u220f",
+    "Proportion;": "\u2237",
+    "Proportional;": "\u221d",
+    "Pscr;": "\U0001d4ab",
+    "Psi;": "\u03a8",
+    "QUOT": "\"",
+    "QUOT;": "\"",
+    "Qfr;": "\U0001d514",
+    "Qopf;": "\u211a",
+    "Qscr;": "\U0001d4ac",
+    "RBarr;": "\u2910",
+    "REG": "\xae",
+    "REG;": "\xae",
+    "Racute;": "\u0154",
+    "Rang;": "\u27eb",
+    "Rarr;": "\u21a0",
+    "Rarrtl;": "\u2916",
+    "Rcaron;": "\u0158",
+    "Rcedil;": "\u0156",
+    "Rcy;": "\u0420",
+    "Re;": "\u211c",
+    "ReverseElement;": "\u220b",
+    "ReverseEquilibrium;": "\u21cb",
+    "ReverseUpEquilibrium;": "\u296f",
+    "Rfr;": "\u211c",
+    "Rho;": "\u03a1",
+    "RightAngleBracket;": "\u27e9",
+    "RightArrow;": "\u2192",
+    "RightArrowBar;": "\u21e5",
+    "RightArrowLeftArrow;": "\u21c4",
+    "RightCeiling;": "\u2309",
+    "RightDoubleBracket;": "\u27e7",
+    "RightDownTeeVector;": "\u295d",
+    "RightDownVector;": "\u21c2",
+    "RightDownVectorBar;": "\u2955",
+    "RightFloor;": "\u230b",
+    "RightTee;": "\u22a2",
+    "RightTeeArrow;": "\u21a6",
+    "RightTeeVector;": "\u295b",
+    "RightTriangle;": "\u22b3",
+    "RightTriangleBar;": "\u29d0",
+    "RightTriangleEqual;": "\u22b5",
+    "RightUpDownVector;": "\u294f",
+    "RightUpTeeVector;": "\u295c",
+    "RightUpVector;": "\u21be",
+    "RightUpVectorBar;": "\u2954",
+    "RightVector;": "\u21c0",
+    "RightVectorBar;": "\u2953",
+    "Rightarrow;": "\u21d2",
+    "Ropf;": "\u211d",
+    "RoundImplies;": "\u2970",
+    "Rrightarrow;": "\u21db",
+    "Rscr;": "\u211b",
+    "Rsh;": "\u21b1",
+    "RuleDelayed;": "\u29f4",
+    "SHCHcy;": "\u0429",
+    "SHcy;": "\u0428",
+    "SOFTcy;": "\u042c",
+    "Sacute;": "\u015a",
+    "Sc;": "\u2abc",
+    "Scaron;": "\u0160",
+    "Scedil;": "\u015e",
+    "Scirc;": "\u015c",
+    "Scy;": "\u0421",
+    "Sfr;": "\U0001d516",
+    "ShortDownArrow;": "\u2193",
+    "ShortLeftArrow;": "\u2190",
+    "ShortRightArrow;": "\u2192",
+    "ShortUpArrow;": "\u2191",
+    "Sigma;": "\u03a3",
+    "SmallCircle;": "\u2218",
+    "Sopf;": "\U0001d54a",
+    "Sqrt;": "\u221a",
+    "Square;": "\u25a1",
+    "SquareIntersection;": "\u2293",
+    "SquareSubset;": "\u228f",
+    "SquareSubsetEqual;": "\u2291",
+    "SquareSuperset;": "\u2290",
+    "SquareSupersetEqual;": "\u2292",
+    "SquareUnion;": "\u2294",
+    "Sscr;": "\U0001d4ae",
+    "Star;": "\u22c6",
+    "Sub;": "\u22d0",
+    "Subset;": "\u22d0",
+    "SubsetEqual;": "\u2286",
+    "Succeeds;": "\u227b",
+    "SucceedsEqual;": "\u2ab0",
+    "SucceedsSlantEqual;": "\u227d",
+    "SucceedsTilde;": "\u227f",
+    "SuchThat;": "\u220b",
+    "Sum;": "\u2211",
+    "Sup;": "\u22d1",
+    "Superset;": "\u2283",
+    "SupersetEqual;": "\u2287",
+    "Supset;": "\u22d1",
+    "THORN": "\xde",
+    "THORN;": "\xde",
+    "TRADE;": "\u2122",
+    "TSHcy;": "\u040b",
+    "TScy;": "\u0426",
+    "Tab;": "\t",
+    "Tau;": "\u03a4",
+    "Tcaron;": "\u0164",
+    "Tcedil;": "\u0162",
+    "Tcy;": "\u0422",
+    "Tfr;": "\U0001d517",
+    "Therefore;": "\u2234",
+    "Theta;": "\u0398",
+    "ThickSpace;": "\u205f\u200a",
+    "ThinSpace;": "\u2009",
+    "Tilde;": "\u223c",
+    "TildeEqual;": "\u2243",
+    "TildeFullEqual;": "\u2245",
+    "TildeTilde;": "\u2248",
+    "Topf;": "\U0001d54b",
+    "TripleDot;": "\u20db",
+    "Tscr;": "\U0001d4af",
+    "Tstrok;": "\u0166",
+    "Uacute": "\xda",
+    "Uacute;": "\xda",
+    "Uarr;": "\u219f",
+    "Uarrocir;": "\u2949",
+    "Ubrcy;": "\u040e",
+    "Ubreve;": "\u016c",
+    "Ucirc": "\xdb",
+    "Ucirc;": "\xdb",
+    "Ucy;": "\u0423",
+    "Udblac;": "\u0170",
+    "Ufr;": "\U0001d518",
+    "Ugrave": "\xd9",
+    "Ugrave;": "\xd9",
+    "Umacr;": "\u016a",
+    "UnderBar;": "_",
+    "UnderBrace;": "\u23df",
+    "UnderBracket;": "\u23b5",
+    "UnderParenthesis;": "\u23dd",
+    "Union;": "\u22c3",
+    "UnionPlus;": "\u228e",
+    "Uogon;": "\u0172",
+    "Uopf;": "\U0001d54c",
+    "UpArrow;": "\u2191",
+    "UpArrowBar;": "\u2912",
+    "UpArrowDownArrow;": "\u21c5",
+    "UpDownArrow;": "\u2195",
+    "UpEquilibrium;": "\u296e",
+    "UpTee;": "\u22a5",
+    "UpTeeArrow;": "\u21a5",
+    "Uparrow;": "\u21d1",
+    "Updownarrow;": "\u21d5",
+    "UpperLeftArrow;": "\u2196",
+    "UpperRightArrow;": "\u2197",
+    "Upsi;": "\u03d2",
+    "Upsilon;": "\u03a5",
+    "Uring;": "\u016e",
+    "Uscr;": "\U0001d4b0",
+    "Utilde;": "\u0168",
+    "Uuml": "\xdc",
+    "Uuml;": "\xdc",
+    "VDash;": "\u22ab",
+    "Vbar;": "\u2aeb",
+    "Vcy;": "\u0412",
+    "Vdash;": "\u22a9",
+    "Vdashl;": "\u2ae6",
+    "Vee;": "\u22c1",
+    "Verbar;": "\u2016",
+    "Vert;": "\u2016",
+    "VerticalBar;": "\u2223",
+    "VerticalLine;": "|",
+    "VerticalSeparator;": "\u2758",
+    "VerticalTilde;": "\u2240",
+    "VeryThinSpace;": "\u200a",
+    "Vfr;": "\U0001d519",
+    "Vopf;": "\U0001d54d",
+    "Vscr;": "\U0001d4b1",
+    "Vvdash;": "\u22aa",
+    "Wcirc;": "\u0174",
+    "Wedge;": "\u22c0",
+    "Wfr;": "\U0001d51a",
+    "Wopf;": "\U0001d54e",
+    "Wscr;": "\U0001d4b2",
+    "Xfr;": "\U0001d51b",
+    "Xi;": "\u039e",
+    "Xopf;": "\U0001d54f",
+    "Xscr;": "\U0001d4b3",
+    "YAcy;": "\u042f",
+    "YIcy;": "\u0407",
+    "YUcy;": "\u042e",
+    "Yacute": "\xdd",
+    "Yacute;": "\xdd",
+    "Ycirc;": "\u0176",
+    "Ycy;": "\u042b",
+    "Yfr;": "\U0001d51c",
+    "Yopf;": "\U0001d550",
+    "Yscr;": "\U0001d4b4",
+    "Yuml;": "\u0178",
+    "ZHcy;": "\u0416",
+    "Zacute;": "\u0179",
+    "Zcaron;": "\u017d",
+    "Zcy;": "\u0417",
+    "Zdot;": "\u017b",
+    "ZeroWidthSpace;": "\u200b",
+    "Zeta;": "\u0396",
+    "Zfr;": "\u2128",
+    "Zopf;": "\u2124",
+    "Zscr;": "\U0001d4b5",
+    "aacute": "\xe1",
+    "aacute;": "\xe1",
+    "abreve;": "\u0103",
+    "ac;": "\u223e",
+    "acE;": "\u223e\u0333",
+    "acd;": "\u223f",
+    "acirc": "\xe2",
+    "acirc;": "\xe2",
+    "acute": "\xb4",
+    "acute;": "\xb4",
+    "acy;": "\u0430",
+    "aelig": "\xe6",
+    "aelig;": "\xe6",
+    "af;": "\u2061",
+    "afr;": "\U0001d51e",
+    "agrave": "\xe0",
+    "agrave;": "\xe0",
+    "alefsym;": "\u2135",
+    "aleph;": "\u2135",
+    "alpha;": "\u03b1",
+    "amacr;": "\u0101",
+    "amalg;": "\u2a3f",
+    "amp": "&",
+    "amp;": "&",
+    "and;": "\u2227",
+    "andand;": "\u2a55",
+    "andd;": "\u2a5c",
+    "andslope;": "\u2a58",
+    "andv;": "\u2a5a",
+    "ang;": "\u2220",
+    "ange;": "\u29a4",
+    "angle;": "\u2220",
+    "angmsd;": "\u2221",
+    "angmsdaa;": "\u29a8",
+    "angmsdab;": "\u29a9",
+    "angmsdac;": "\u29aa",
+    "angmsdad;": "\u29ab",
+    "angmsdae;": "\u29ac",
+    "angmsdaf;": "\u29ad",
+    "angmsdag;": "\u29ae",
+    "angmsdah;": "\u29af",
+    "angrt;": "\u221f",
+    "angrtvb;": "\u22be",
+    "angrtvbd;": "\u299d",
+    "angsph;": "\u2222",
+    "angst;": "\xc5",
+    "angzarr;": "\u237c",
+    "aogon;": "\u0105",
+    "aopf;": "\U0001d552",
+    "ap;": "\u2248",
+    "apE;": "\u2a70",
+    "apacir;": "\u2a6f",
+    "ape;": "\u224a",
+    "apid;": "\u224b",
+    "apos;": "'",
+    "approx;": "\u2248",
+    "approxeq;": "\u224a",
+    "aring": "\xe5",
+    "aring;": "\xe5",
+    "ascr;": "\U0001d4b6",
+    "ast;": "*",
+    "asymp;": "\u2248",
+    "asympeq;": "\u224d",
+    "atilde": "\xe3",
+    "atilde;": "\xe3",
+    "auml": "\xe4",
+    "auml;": "\xe4",
+    "awconint;": "\u2233",
+    "awint;": "\u2a11",
+    "bNot;": "\u2aed",
+    "backcong;": "\u224c",
+    "backepsilon;": "\u03f6",
+    "backprime;": "\u2035",
+    "backsim;": "\u223d",
+    "backsimeq;": "\u22cd",
+    "barvee;": "\u22bd",
+    "barwed;": "\u2305",
+    "barwedge;": "\u2305",
+    "bbrk;": "\u23b5",
+    "bbrktbrk;": "\u23b6",
+    "bcong;": "\u224c",
+    "bcy;": "\u0431",
+    "bdquo;": "\u201e",
+    "becaus;": "\u2235",
+    "because;": "\u2235",
+    "bemptyv;": "\u29b0",
+    "bepsi;": "\u03f6",
+    "bernou;": "\u212c",
+    "beta;": "\u03b2",
+    "beth;": "\u2136",
+    "between;": "\u226c",
+    "bfr;": "\U0001d51f",
+    "bigcap;": "\u22c2",
+    "bigcirc;": "\u25ef",
+    "bigcup;": "\u22c3",
+    "bigodot;": "\u2a00",
+    "bigoplus;": "\u2a01",
+    "bigotimes;": "\u2a02",
+    "bigsqcup;": "\u2a06",
+    "bigstar;": "\u2605",
+    "bigtriangledown;": "\u25bd",
+    "bigtriangleup;": "\u25b3",
+    "biguplus;": "\u2a04",
+    "bigvee;": "\u22c1",
+    "bigwedge;": "\u22c0",
+    "bkarow;": "\u290d",
+    "blacklozenge;": "\u29eb",
+    "blacksquare;": "\u25aa",
+    "blacktriangle;": "\u25b4",
+    "blacktriangledown;": "\u25be",
+    "blacktriangleleft;": "\u25c2",
+    "blacktriangleright;": "\u25b8",
+    "blank;": "\u2423",
+    "blk12;": "\u2592",
+    "blk14;": "\u2591",
+    "blk34;": "\u2593",
+    "block;": "\u2588",
+    "bne;": "=\u20e5",
+    "bnequiv;": "\u2261\u20e5",
+    "bnot;": "\u2310",
+    "bopf;": "\U0001d553",
+    "bot;": "\u22a5",
+    "bottom;": "\u22a5",
+    "bowtie;": "\u22c8",
+    "boxDL;": "\u2557",
+    "boxDR;": "\u2554",
+    "boxDl;": "\u2556",
+    "boxDr;": "\u2553",
+    "boxH;": "\u2550",
+    "boxHD;": "\u2566",
+    "boxHU;": "\u2569",
+    "boxHd;": "\u2564",
+    "boxHu;": "\u2567",
+    "boxUL;": "\u255d",
+    "boxUR;": "\u255a",
+    "boxUl;": "\u255c",
+    "boxUr;": "\u2559",
+    "boxV;": "\u2551",
+    "boxVH;": "\u256c",
+    "boxVL;": "\u2563",
+    "boxVR;": "\u2560",
+    "boxVh;": "\u256b",
+    "boxVl;": "\u2562",
+    "boxVr;": "\u255f",
+    "boxbox;": "\u29c9",
+    "boxdL;": "\u2555",
+    "boxdR;": "\u2552",
+    "boxdl;": "\u2510",
+    "boxdr;": "\u250c",
+    "boxh;": "\u2500",
+    "boxhD;": "\u2565",
+    "boxhU;": "\u2568",
+    "boxhd;": "\u252c",
+    "boxhu;": "\u2534",
+    "boxminus;": "\u229f",
+    "boxplus;": "\u229e",
+    "boxtimes;": "\u22a0",
+    "boxuL;": "\u255b",
+    "boxuR;": "\u2558",
+    "boxul;": "\u2518",
+    "boxur;": "\u2514",
+    "boxv;": "\u2502",
+    "boxvH;": "\u256a",
+    "boxvL;": "\u2561",
+    "boxvR;": "\u255e",
+    "boxvh;": "\u253c",
+    "boxvl;": "\u2524",
+    "boxvr;": "\u251c",
+    "bprime;": "\u2035",
+    "breve;": "\u02d8",
+    "brvbar": "\xa6",
+    "brvbar;": "\xa6",
+    "bscr;": "\U0001d4b7",
+    "bsemi;": "\u204f",
+    "bsim;": "\u223d",
+    "bsime;": "\u22cd",
+    "bsol;": "\\",
+    "bsolb;": "\u29c5",
+    "bsolhsub;": "\u27c8",
+    "bull;": "\u2022",
+    "bullet;": "\u2022",
+    "bump;": "\u224e",
+    "bumpE;": "\u2aae",
+    "bumpe;": "\u224f",
+    "bumpeq;": "\u224f",
+    "cacute;": "\u0107",
+    "cap;": "\u2229",
+    "capand;": "\u2a44",
+    "capbrcup;": "\u2a49",
+    "capcap;": "\u2a4b",
+    "capcup;": "\u2a47",
+    "capdot;": "\u2a40",
+    "caps;": "\u2229\ufe00",
+    "caret;": "\u2041",
+    "caron;": "\u02c7",
+    "ccaps;": "\u2a4d",
+    "ccaron;": "\u010d",
+    "ccedil": "\xe7",
+    "ccedil;": "\xe7",
+    "ccirc;": "\u0109",
+    "ccups;": "\u2a4c",
+    "ccupssm;": "\u2a50",
+    "cdot;": "\u010b",
+    "cedil": "\xb8",
+    "cedil;": "\xb8",
+    "cemptyv;": "\u29b2",
+    "cent": "\xa2",
+    "cent;": "\xa2",
+    "centerdot;": "\xb7",
+    "cfr;": "\U0001d520",
+    "chcy;": "\u0447",
+    "check;": "\u2713",
+    "checkmark;": "\u2713",
+    "chi;": "\u03c7",
+    "cir;": "\u25cb",
+    "cirE;": "\u29c3",
+    "circ;": "\u02c6",
+    "circeq;": "\u2257",
+    "circlearrowleft;": "\u21ba",
+    "circlearrowright;": "\u21bb",
+    "circledR;": "\xae",
+    "circledS;": "\u24c8",
+    "circledast;": "\u229b",
+    "circledcirc;": "\u229a",
+    "circleddash;": "\u229d",
+    "cire;": "\u2257",
+    "cirfnint;": "\u2a10",
+    "cirmid;": "\u2aef",
+    "cirscir;": "\u29c2",
+    "clubs;": "\u2663",
+    "clubsuit;": "\u2663",
+    "colon;": ":",
+    "colone;": "\u2254",
+    "coloneq;": "\u2254",
+    "comma;": ",",
+    "commat;": "@",
+    "comp;": "\u2201",
+    "compfn;": "\u2218",
+    "complement;": "\u2201",
+    "complexes;": "\u2102",
+    "cong;": "\u2245",
+    "congdot;": "\u2a6d",
+    "conint;": "\u222e",
+    "copf;": "\U0001d554",
+    "coprod;": "\u2210",
+    "copy": "\xa9",
+    "copy;": "\xa9",
+    "copysr;": "\u2117",
+    "crarr;": "\u21b5",
+    "cross;": "\u2717",
+    "cscr;": "\U0001d4b8",
+    "csub;": "\u2acf",
+    "csube;": "\u2ad1",
+    "csup;": "\u2ad0",
+    "csupe;": "\u2ad2",
+    "ctdot;": "\u22ef",
+    "cudarrl;": "\u2938",
+    "cudarrr;": "\u2935",
+    "cuepr;": "\u22de",
+    "cuesc;": "\u22df",
+    "cularr;": "\u21b6",
+    "cularrp;": "\u293d",
+    "cup;": "\u222a",
+    "cupbrcap;": "\u2a48",
+    "cupcap;": "\u2a46",
+    "cupcup;": "\u2a4a",
+    "cupdot;": "\u228d",
+    "cupor;": "\u2a45",
+    "cups;": "\u222a\ufe00",
+    "curarr;": "\u21b7",
+    "curarrm;": "\u293c",
+    "curlyeqprec;": "\u22de",
+    "curlyeqsucc;": "\u22df",
+    "curlyvee;": "\u22ce",
+    "curlywedge;": "\u22cf",
+    "curren": "\xa4",
+    "curren;": "\xa4",
+    "curvearrowleft;": "\u21b6",
+    "curvearrowright;": "\u21b7",
+    "cuvee;": "\u22ce",
+    "cuwed;": "\u22cf",
+    "cwconint;": "\u2232",
+    "cwint;": "\u2231",
+    "cylcty;": "\u232d",
+    "dArr;": "\u21d3",
+    "dHar;": "\u2965",
+    "dagger;": "\u2020",
+    "daleth;": "\u2138",
+    "darr;": "\u2193",
+    "dash;": "\u2010",
+    "dashv;": "\u22a3",
+    "dbkarow;": "\u290f",
+    "dblac;": "\u02dd",
+    "dcaron;": "\u010f",
+    "dcy;": "\u0434",
+    "dd;": "\u2146",
+    "ddagger;": "\u2021",
+    "ddarr;": "\u21ca",
+    "ddotseq;": "\u2a77",
+    "deg": "\xb0",
+    "deg;": "\xb0",
+    "delta;": "\u03b4",
+    "demptyv;": "\u29b1",
+    "dfisht;": "\u297f",
+    "dfr;": "\U0001d521",
+    "dharl;": "\u21c3",
+    "dharr;": "\u21c2",
+    "diam;": "\u22c4",
+    "diamond;": "\u22c4",
+    "diamondsuit;": "\u2666",
+    "diams;": "\u2666",
+    "die;": "\xa8",
+    "digamma;": "\u03dd",
+    "disin;": "\u22f2",
+    "div;": "\xf7",
+    "divide": "\xf7",
+    "divide;": "\xf7",
+    "divideontimes;": "\u22c7",
+    "divonx;": "\u22c7",
+    "djcy;": "\u0452",
+    "dlcorn;": "\u231e",
+    "dlcrop;": "\u230d",
+    "dollar;": "$",
+    "dopf;": "\U0001d555",
+    "dot;": "\u02d9",
+    "doteq;": "\u2250",
+    "doteqdot;": "\u2251",
+    "dotminus;": "\u2238",
+    "dotplus;": "\u2214",
+    "dotsquare;": "\u22a1",
+    "doublebarwedge;": "\u2306",
+    "downarrow;": "\u2193",
+    "downdownarrows;": "\u21ca",
+    "downharpoonleft;": "\u21c3",
+    "downharpoonright;": "\u21c2",
+    "drbkarow;": "\u2910",
+    "drcorn;": "\u231f",
+    "drcrop;": "\u230c",
+    "dscr;": "\U0001d4b9",
+    "dscy;": "\u0455",
+    "dsol;": "\u29f6",
+    "dstrok;": "\u0111",
+    "dtdot;": "\u22f1",
+    "dtri;": "\u25bf",
+    "dtrif;": "\u25be",
+    "duarr;": "\u21f5",
+    "duhar;": "\u296f",
+    "dwangle;": "\u29a6",
+    "dzcy;": "\u045f",
+    "dzigrarr;": "\u27ff",
+    "eDDot;": "\u2a77",
+    "eDot;": "\u2251",
+    "eacute": "\xe9",
+    "eacute;": "\xe9",
+    "easter;": "\u2a6e",
+    "ecaron;": "\u011b",
+    "ecir;": "\u2256",
+    "ecirc": "\xea",
+    "ecirc;": "\xea",
+    "ecolon;": "\u2255",
+    "ecy;": "\u044d",
+    "edot;": "\u0117",
+    "ee;": "\u2147",
+    "efDot;": "\u2252",
+    "efr;": "\U0001d522",
+    "eg;": "\u2a9a",
+    "egrave": "\xe8",
+    "egrave;": "\xe8",
+    "egs;": "\u2a96",
+    "egsdot;": "\u2a98",
+    "el;": "\u2a99",
+    "elinters;": "\u23e7",
+    "ell;": "\u2113",
+    "els;": "\u2a95",
+    "elsdot;": "\u2a97",
+    "emacr;": "\u0113",
+    "empty;": "\u2205",
+    "emptyset;": "\u2205",
+    "emptyv;": "\u2205",
+    "emsp13;": "\u2004",
+    "emsp14;": "\u2005",
+    "emsp;": "\u2003",
+    "eng;": "\u014b",
+    "ensp;": "\u2002",
+    "eogon;": "\u0119",
+    "eopf;": "\U0001d556",
+    "epar;": "\u22d5",
+    "eparsl;": "\u29e3",
+    "eplus;": "\u2a71",
+    "epsi;": "\u03b5",
+    "epsilon;": "\u03b5",
+    "epsiv;": "\u03f5",
+    "eqcirc;": "\u2256",
+    "eqcolon;": "\u2255",
+    "eqsim;": "\u2242",
+    "eqslantgtr;": "\u2a96",
+    "eqslantless;": "\u2a95",
+    "equals;": "=",
+    "equest;": "\u225f",
+    "equiv;": "\u2261",
+    "equivDD;": "\u2a78",
+    "eqvparsl;": "\u29e5",
+    "erDot;": "\u2253",
+    "erarr;": "\u2971",
+    "escr;": "\u212f",
+    "esdot;": "\u2250",
+    "esim;": "\u2242",
+    "eta;": "\u03b7",
+    "eth": "\xf0",
+    "eth;": "\xf0",
+    "euml": "\xeb",
+    "euml;": "\xeb",
+    "euro;": "\u20ac",
+    "excl;": "!",
+    "exist;": "\u2203",
+    "expectation;": "\u2130",
+    "exponentiale;": "\u2147",
+    "fallingdotseq;": "\u2252",
+    "fcy;": "\u0444",
+    "female;": "\u2640",
+    "ffilig;": "\ufb03",
+    "fflig;": "\ufb00",
+    "ffllig;": "\ufb04",
+    "ffr;": "\U0001d523",
+    "filig;": "\ufb01",
+    "fjlig;": "fj",
+    "flat;": "\u266d",
+    "fllig;": "\ufb02",
+    "fltns;": "\u25b1",
+    "fnof;": "\u0192",
+    "fopf;": "\U0001d557",
+    "forall;": "\u2200",
+    "fork;": "\u22d4",
+    "forkv;": "\u2ad9",
+    "fpartint;": "\u2a0d",
+    "frac12": "\xbd",
+    "frac12;": "\xbd",
+    "frac13;": "\u2153",
+    "frac14": "\xbc",
+    "frac14;": "\xbc",
+    "frac15;": "\u2155",
+    "frac16;": "\u2159",
+    "frac18;": "\u215b",
+    "frac23;": "\u2154",
+    "frac25;": "\u2156",
+    "frac34": "\xbe",
+    "frac34;": "\xbe",
+    "frac35;": "\u2157",
+    "frac38;": "\u215c",
+    "frac45;": "\u2158",
+    "frac56;": "\u215a",
+    "frac58;": "\u215d",
+    "frac78;": "\u215e",
+    "frasl;": "\u2044",
+    "frown;": "\u2322",
+    "fscr;": "\U0001d4bb",
+    "gE;": "\u2267",
+    "gEl;": "\u2a8c",
+    "gacute;": "\u01f5",
+    "gamma;": "\u03b3",
+    "gammad;": "\u03dd",
+    "gap;": "\u2a86",
+    "gbreve;": "\u011f",
+    "gcirc;": "\u011d",
+    "gcy;": "\u0433",
+    "gdot;": "\u0121",
+    "ge;": "\u2265",
+    "gel;": "\u22db",
+    "geq;": "\u2265",
+    "geqq;": "\u2267",
+    "geqslant;": "\u2a7e",
+    "ges;": "\u2a7e",
+    "gescc;": "\u2aa9",
+    "gesdot;": "\u2a80",
+    "gesdoto;": "\u2a82",
+    "gesdotol;": "\u2a84",
+    "gesl;": "\u22db\ufe00",
+    "gesles;": "\u2a94",
+    "gfr;": "\U0001d524",
+    "gg;": "\u226b",
+    "ggg;": "\u22d9",
+    "gimel;": "\u2137",
+    "gjcy;": "\u0453",
+    "gl;": "\u2277",
+    "glE;": "\u2a92",
+    "gla;": "\u2aa5",
+    "glj;": "\u2aa4",
+    "gnE;": "\u2269",
+    "gnap;": "\u2a8a",
+    "gnapprox;": "\u2a8a",
+    "gne;": "\u2a88",
+    "gneq;": "\u2a88",
+    "gneqq;": "\u2269",
+    "gnsim;": "\u22e7",
+    "gopf;": "\U0001d558",
+    "grave;": "`",
+    "gscr;": "\u210a",
+    "gsim;": "\u2273",
+    "gsime;": "\u2a8e",
+    "gsiml;": "\u2a90",
+    "gt": ">",
+    "gt;": ">",
+    "gtcc;": "\u2aa7",
+    "gtcir;": "\u2a7a",
+    "gtdot;": "\u22d7",
+    "gtlPar;": "\u2995",
+    "gtquest;": "\u2a7c",
+    "gtrapprox;": "\u2a86",
+    "gtrarr;": "\u2978",
+    "gtrdot;": "\u22d7",
+    "gtreqless;": "\u22db",
+    "gtreqqless;": "\u2a8c",
+    "gtrless;": "\u2277",
+    "gtrsim;": "\u2273",
+    "gvertneqq;": "\u2269\ufe00",
+    "gvnE;": "\u2269\ufe00",
+    "hArr;": "\u21d4",
+    "hairsp;": "\u200a",
+    "half;": "\xbd",
+    "hamilt;": "\u210b",
+    "hardcy;": "\u044a",
+    "harr;": "\u2194",
+    "harrcir;": "\u2948",
+    "harrw;": "\u21ad",
+    "hbar;": "\u210f",
+    "hcirc;": "\u0125",
+    "hearts;": "\u2665",
+    "heartsuit;": "\u2665",
+    "hellip;": "\u2026",
+    "hercon;": "\u22b9",
+    "hfr;": "\U0001d525",
+    "hksearow;": "\u2925",
+    "hkswarow;": "\u2926",
+    "hoarr;": "\u21ff",
+    "homtht;": "\u223b",
+    "hookleftarrow;": "\u21a9",
+    "hookrightarrow;": "\u21aa",
+    "hopf;": "\U0001d559",
+    "horbar;": "\u2015",
+    "hscr;": "\U0001d4bd",
+    "hslash;": "\u210f",
+    "hstrok;": "\u0127",
+    "hybull;": "\u2043",
+    "hyphen;": "\u2010",
+    "iacute": "\xed",
+    "iacute;": "\xed",
+    "ic;": "\u2063",
+    "icirc": "\xee",
+    "icirc;": "\xee",
+    "icy;": "\u0438",
+    "iecy;": "\u0435",
+    "iexcl": "\xa1",
+    "iexcl;": "\xa1",
+    "iff;": "\u21d4",
+    "ifr;": "\U0001d526",
+    "igrave": "\xec",
+    "igrave;": "\xec",
+    "ii;": "\u2148",
+    "iiiint;": "\u2a0c",
+    "iiint;": "\u222d",
+    "iinfin;": "\u29dc",
+    "iiota;": "\u2129",
+    "ijlig;": "\u0133",
+    "imacr;": "\u012b",
+    "image;": "\u2111",
+    "imagline;": "\u2110",
+    "imagpart;": "\u2111",
+    "imath;": "\u0131",
+    "imof;": "\u22b7",
+    "imped;": "\u01b5",
+    "in;": "\u2208",
+    "incare;": "\u2105",
+    "infin;": "\u221e",
+    "infintie;": "\u29dd",
+    "inodot;": "\u0131",
+    "int;": "\u222b",
+    "intcal;": "\u22ba",
+    "integers;": "\u2124",
+    "intercal;": "\u22ba",
+    "intlarhk;": "\u2a17",
+    "intprod;": "\u2a3c",
+    "iocy;": "\u0451",
+    "iogon;": "\u012f",
+    "iopf;": "\U0001d55a",
+    "iota;": "\u03b9",
+    "iprod;": "\u2a3c",
+    "iquest": "\xbf",
+    "iquest;": "\xbf",
+    "iscr;": "\U0001d4be",
+    "isin;": "\u2208",
+    "isinE;": "\u22f9",
+    "isindot;": "\u22f5",
+    "isins;": "\u22f4",
+    "isinsv;": "\u22f3",
+    "isinv;": "\u2208",
+    "it;": "\u2062",
+    "itilde;": "\u0129",
+    "iukcy;": "\u0456",
+    "iuml": "\xef",
+    "iuml;": "\xef",
+    "jcirc;": "\u0135",
+    "jcy;": "\u0439",
+    "jfr;": "\U0001d527",
+    "jmath;": "\u0237",
+    "jopf;": "\U0001d55b",
+    "jscr;": "\U0001d4bf",
+    "jsercy;": "\u0458",
+    "jukcy;": "\u0454",
+    "kappa;": "\u03ba",
+    "kappav;": "\u03f0",
+    "kcedil;": "\u0137",
+    "kcy;": "\u043a",
+    "kfr;": "\U0001d528",
+    "kgreen;": "\u0138",
+    "khcy;": "\u0445",
+    "kjcy;": "\u045c",
+    "kopf;": "\U0001d55c",
+    "kscr;": "\U0001d4c0",
+    "lAarr;": "\u21da",
+    "lArr;": "\u21d0",
+    "lAtail;": "\u291b",
+    "lBarr;": "\u290e",
+    "lE;": "\u2266",
+    "lEg;": "\u2a8b",
+    "lHar;": "\u2962",
+    "lacute;": "\u013a",
+    "laemptyv;": "\u29b4",
+    "lagran;": "\u2112",
+    "lambda;": "\u03bb",
+    "lang;": "\u27e8",
+    "langd;": "\u2991",
+    "langle;": "\u27e8",
+    "lap;": "\u2a85",
+    "laquo": "\xab",
+    "laquo;": "\xab",
+    "larr;": "\u2190",
+    "larrb;": "\u21e4",
+    "larrbfs;": "\u291f",
+    "larrfs;": "\u291d",
+    "larrhk;": "\u21a9",
+    "larrlp;": "\u21ab",
+    "larrpl;": "\u2939",
+    "larrsim;": "\u2973",
+    "larrtl;": "\u21a2",
+    "lat;": "\u2aab",
+    "latail;": "\u2919",
+    "late;": "\u2aad",
+    "lates;": "\u2aad\ufe00",
+    "lbarr;": "\u290c",
+    "lbbrk;": "\u2772",
+    "lbrace;": "{",
+    "lbrack;": "[",
+    "lbrke;": "\u298b",
+    "lbrksld;": "\u298f",
+    "lbrkslu;": "\u298d",
+    "lcaron;": "\u013e",
+    "lcedil;": "\u013c",
+    "lceil;": "\u2308",
+    "lcub;": "{",
+    "lcy;": "\u043b",
+    "ldca;": "\u2936",
+    "ldquo;": "\u201c",
+    "ldquor;": "\u201e",
+    "ldrdhar;": "\u2967",
+    "ldrushar;": "\u294b",
+    "ldsh;": "\u21b2",
+    "le;": "\u2264",
+    "leftarrow;": "\u2190",
+    "leftarrowtail;": "\u21a2",
+    "leftharpoondown;": "\u21bd",
+    "leftharpoonup;": "\u21bc",
+    "leftleftarrows;": "\u21c7",
+    "leftrightarrow;": "\u2194",
+    "leftrightarrows;": "\u21c6",
+    "leftrightharpoons;": "\u21cb",
+    "leftrightsquigarrow;": "\u21ad",
+    "leftthreetimes;": "\u22cb",
+    "leg;": "\u22da",
+    "leq;": "\u2264",
+    "leqq;": "\u2266",
+    "leqslant;": "\u2a7d",
+    "les;": "\u2a7d",
+    "lescc;": "\u2aa8",
+    "lesdot;": "\u2a7f",
+    "lesdoto;": "\u2a81",
+    "lesdotor;": "\u2a83",
+    "lesg;": "\u22da\ufe00",
+    "lesges;": "\u2a93",
+    "lessapprox;": "\u2a85",
+    "lessdot;": "\u22d6",
+    "lesseqgtr;": "\u22da",
+    "lesseqqgtr;": "\u2a8b",
+    "lessgtr;": "\u2276",
+    "lesssim;": "\u2272",
+    "lfisht;": "\u297c",
+    "lfloor;": "\u230a",
+    "lfr;": "\U0001d529",
+    "lg;": "\u2276",
+    "lgE;": "\u2a91",
+    "lhard;": "\u21bd",
+    "lharu;": "\u21bc",
+    "lharul;": "\u296a",
+    "lhblk;": "\u2584",
+    "ljcy;": "\u0459",
+    "ll;": "\u226a",
+    "llarr;": "\u21c7",
+    "llcorner;": "\u231e",
+    "llhard;": "\u296b",
+    "lltri;": "\u25fa",
+    "lmidot;": "\u0140",
+    "lmoust;": "\u23b0",
+    "lmoustache;": "\u23b0",
+    "lnE;": "\u2268",
+    "lnap;": "\u2a89",
+    "lnapprox;": "\u2a89",
+    "lne;": "\u2a87",
+    "lneq;": "\u2a87",
+    "lneqq;": "\u2268",
+    "lnsim;": "\u22e6",
+    "loang;": "\u27ec",
+    "loarr;": "\u21fd",
+    "lobrk;": "\u27e6",
+    "longleftarrow;": "\u27f5",
+    "longleftrightarrow;": "\u27f7",
+    "longmapsto;": "\u27fc",
+    "longrightarrow;": "\u27f6",
+    "looparrowleft;": "\u21ab",
+    "looparrowright;": "\u21ac",
+    "lopar;": "\u2985",
+    "lopf;": "\U0001d55d",
+    "loplus;": "\u2a2d",
+    "lotimes;": "\u2a34",
+    "lowast;": "\u2217",
+    "lowbar;": "_",
+    "loz;": "\u25ca",
+    "lozenge;": "\u25ca",
+    "lozf;": "\u29eb",
+    "lpar;": "(",
+    "lparlt;": "\u2993",
+    "lrarr;": "\u21c6",
+    "lrcorner;": "\u231f",
+    "lrhar;": "\u21cb",
+    "lrhard;": "\u296d",
+    "lrm;": "\u200e",
+    "lrtri;": "\u22bf",
+    "lsaquo;": "\u2039",
+    "lscr;": "\U0001d4c1",
+    "lsh;": "\u21b0",
+    "lsim;": "\u2272",
+    "lsime;": "\u2a8d",
+    "lsimg;": "\u2a8f",
+    "lsqb;": "[",
+    "lsquo;": "\u2018",
+    "lsquor;": "\u201a",
+    "lstrok;": "\u0142",
+    "lt": "<",
+    "lt;": "<",
+    "ltcc;": "\u2aa6",
+    "ltcir;": "\u2a79",
+    "ltdot;": "\u22d6",
+    "lthree;": "\u22cb",
+    "ltimes;": "\u22c9",
+    "ltlarr;": "\u2976",
+    "ltquest;": "\u2a7b",
+    "ltrPar;": "\u2996",
+    "ltri;": "\u25c3",
+    "ltrie;": "\u22b4",
+    "ltrif;": "\u25c2",
+    "lurdshar;": "\u294a",
+    "luruhar;": "\u2966",
+    "lvertneqq;": "\u2268\ufe00",
+    "lvnE;": "\u2268\ufe00",
+    "mDDot;": "\u223a",
+    "macr": "\xaf",
+    "macr;": "\xaf",
+    "male;": "\u2642",
+    "malt;": "\u2720",
+    "maltese;": "\u2720",
+    "map;": "\u21a6",
+    "mapsto;": "\u21a6",
+    "mapstodown;": "\u21a7",
+    "mapstoleft;": "\u21a4",
+    "mapstoup;": "\u21a5",
+    "marker;": "\u25ae",
+    "mcomma;": "\u2a29",
+    "mcy;": "\u043c",
+    "mdash;": "\u2014",
+    "measuredangle;": "\u2221",
+    "mfr;": "\U0001d52a",
+    "mho;": "\u2127",
+    "micro": "\xb5",
+    "micro;": "\xb5",
+    "mid;": "\u2223",
+    "midast;": "*",
+    "midcir;": "\u2af0",
+    "middot": "\xb7",
+    "middot;": "\xb7",
+    "minus;": "\u2212",
+    "minusb;": "\u229f",
+    "minusd;": "\u2238",
+    "minusdu;": "\u2a2a",
+    "mlcp;": "\u2adb",
+    "mldr;": "\u2026",
+    "mnplus;": "\u2213",
+    "models;": "\u22a7",
+    "mopf;": "\U0001d55e",
+    "mp;": "\u2213",
+    "mscr;": "\U0001d4c2",
+    "mstpos;": "\u223e",
+    "mu;": "\u03bc",
+    "multimap;": "\u22b8",
+    "mumap;": "\u22b8",
+    "nGg;": "\u22d9\u0338",
+    "nGt;": "\u226b\u20d2",
+    "nGtv;": "\u226b\u0338",
+    "nLeftarrow;": "\u21cd",
+    "nLeftrightarrow;": "\u21ce",
+    "nLl;": "\u22d8\u0338",
+    "nLt;": "\u226a\u20d2",
+    "nLtv;": "\u226a\u0338",
+    "nRightarrow;": "\u21cf",
+    "nVDash;": "\u22af",
+    "nVdash;": "\u22ae",
+    "nabla;": "\u2207",
+    "nacute;": "\u0144",
+    "nang;": "\u2220\u20d2",
+    "nap;": "\u2249",
+    "napE;": "\u2a70\u0338",
+    "napid;": "\u224b\u0338",
+    "napos;": "\u0149",
+    "napprox;": "\u2249",
+    "natur;": "\u266e",
+    "natural;": "\u266e",
+    "naturals;": "\u2115",
+    "nbsp": "\xa0",
+    "nbsp;": "\xa0",
+    "nbump;": "\u224e\u0338",
+    "nbumpe;": "\u224f\u0338",
+    "ncap;": "\u2a43",
+    "ncaron;": "\u0148",
+    "ncedil;": "\u0146",
+    "ncong;": "\u2247",
+    "ncongdot;": "\u2a6d\u0338",
+    "ncup;": "\u2a42",
+    "ncy;": "\u043d",
+    "ndash;": "\u2013",
+    "ne;": "\u2260",
+    "neArr;": "\u21d7",
+    "nearhk;": "\u2924",
+    "nearr;": "\u2197",
+    "nearrow;": "\u2197",
+    "nedot;": "\u2250\u0338",
+    "nequiv;": "\u2262",
+    "nesear;": "\u2928",
+    "nesim;": "\u2242\u0338",
+    "nexist;": "\u2204",
+    "nexists;": "\u2204",
+    "nfr;": "\U0001d52b",
+    "ngE;": "\u2267\u0338",
+    "nge;": "\u2271",
+    "ngeq;": "\u2271",
+    "ngeqq;": "\u2267\u0338",
+    "ngeqslant;": "\u2a7e\u0338",
+    "nges;": "\u2a7e\u0338",
+    "ngsim;": "\u2275",
+    "ngt;": "\u226f",
+    "ngtr;": "\u226f",
+    "nhArr;": "\u21ce",
+    "nharr;": "\u21ae",
+    "nhpar;": "\u2af2",
+    "ni;": "\u220b",
+    "nis;": "\u22fc",
+    "nisd;": "\u22fa",
+    "niv;": "\u220b",
+    "njcy;": "\u045a",
+    "nlArr;": "\u21cd",
+    "nlE;": "\u2266\u0338",
+    "nlarr;": "\u219a",
+    "nldr;": "\u2025",
+    "nle;": "\u2270",
+    "nleftarrow;": "\u219a",
+    "nleftrightarrow;": "\u21ae",
+    "nleq;": "\u2270",
+    "nleqq;": "\u2266\u0338",
+    "nleqslant;": "\u2a7d\u0338",
+    "nles;": "\u2a7d\u0338",
+    "nless;": "\u226e",
+    "nlsim;": "\u2274",
+    "nlt;": "\u226e",
+    "nltri;": "\u22ea",
+    "nltrie;": "\u22ec",
+    "nmid;": "\u2224",
+    "nopf;": "\U0001d55f",
+    "not": "\xac",
+    "not;": "\xac",
+    "notin;": "\u2209",
+    "notinE;": "\u22f9\u0338",
+    "notindot;": "\u22f5\u0338",
+    "notinva;": "\u2209",
+    "notinvb;": "\u22f7",
+    "notinvc;": "\u22f6",
+    "notni;": "\u220c",
+    "notniva;": "\u220c",
+    "notnivb;": "\u22fe",
+    "notnivc;": "\u22fd",
+    "npar;": "\u2226",
+    "nparallel;": "\u2226",
+    "nparsl;": "\u2afd\u20e5",
+    "npart;": "\u2202\u0338",
+    "npolint;": "\u2a14",
+    "npr;": "\u2280",
+    "nprcue;": "\u22e0",
+    "npre;": "\u2aaf\u0338",
+    "nprec;": "\u2280",
+    "npreceq;": "\u2aaf\u0338",
+    "nrArr;": "\u21cf",
+    "nrarr;": "\u219b",
+    "nrarrc;": "\u2933\u0338",
+    "nrarrw;": "\u219d\u0338",
+    "nrightarrow;": "\u219b",
+    "nrtri;": "\u22eb",
+    "nrtrie;": "\u22ed",
+    "nsc;": "\u2281",
+    "nsccue;": "\u22e1",
+    "nsce;": "\u2ab0\u0338",
+    "nscr;": "\U0001d4c3",
+    "nshortmid;": "\u2224",
+    "nshortparallel;": "\u2226",
+    "nsim;": "\u2241",
+    "nsime;": "\u2244",
+    "nsimeq;": "\u2244",
+    "nsmid;": "\u2224",
+    "nspar;": "\u2226",
+    "nsqsube;": "\u22e2",
+    "nsqsupe;": "\u22e3",
+    "nsub;": "\u2284",
+    "nsubE;": "\u2ac5\u0338",
+    "nsube;": "\u2288",
+    "nsubset;": "\u2282\u20d2",
+    "nsubseteq;": "\u2288",
+    "nsubseteqq;": "\u2ac5\u0338",
+    "nsucc;": "\u2281",
+    "nsucceq;": "\u2ab0\u0338",
+    "nsup;": "\u2285",
+    "nsupE;": "\u2ac6\u0338",
+    "nsupe;": "\u2289",
+    "nsupset;": "\u2283\u20d2",
+    "nsupseteq;": "\u2289",
+    "nsupseteqq;": "\u2ac6\u0338",
+    "ntgl;": "\u2279",
+    "ntilde": "\xf1",
+    "ntilde;": "\xf1",
+    "ntlg;": "\u2278",
+    "ntriangleleft;": "\u22ea",
+    "ntrianglelefteq;": "\u22ec",
+    "ntriangleright;": "\u22eb",
+    "ntrianglerighteq;": "\u22ed",
+    "nu;": "\u03bd",
+    "num;": "#",
+    "numero;": "\u2116",
+    "numsp;": "\u2007",
+    "nvDash;": "\u22ad",
+    "nvHarr;": "\u2904",
+    "nvap;": "\u224d\u20d2",
+    "nvdash;": "\u22ac",
+    "nvge;": "\u2265\u20d2",
+    "nvgt;": ">\u20d2",
+    "nvinfin;": "\u29de",
+    "nvlArr;": "\u2902",
+    "nvle;": "\u2264\u20d2",
+    "nvlt;": "<\u20d2",
+    "nvltrie;": "\u22b4\u20d2",
+    "nvrArr;": "\u2903",
+    "nvrtrie;": "\u22b5\u20d2",
+    "nvsim;": "\u223c\u20d2",
+    "nwArr;": "\u21d6",
+    "nwarhk;": "\u2923",
+    "nwarr;": "\u2196",
+    "nwarrow;": "\u2196",
+    "nwnear;": "\u2927",
+    "oS;": "\u24c8",
+    "oacute": "\xf3",
+    "oacute;": "\xf3",
+    "oast;": "\u229b",
+    "ocir;": "\u229a",
+    "ocirc": "\xf4",
+    "ocirc;": "\xf4",
+    "ocy;": "\u043e",
+    "odash;": "\u229d",
+    "odblac;": "\u0151",
+    "odiv;": "\u2a38",
+    "odot;": "\u2299",
+    "odsold;": "\u29bc",
+    "oelig;": "\u0153",
+    "ofcir;": "\u29bf",
+    "ofr;": "\U0001d52c",
+    "ogon;": "\u02db",
+    "ograve": "\xf2",
+    "ograve;": "\xf2",
+    "ogt;": "\u29c1",
+    "ohbar;": "\u29b5",
+    "ohm;": "\u03a9",
+    "oint;": "\u222e",
+    "olarr;": "\u21ba",
+    "olcir;": "\u29be",
+    "olcross;": "\u29bb",
+    "oline;": "\u203e",
+    "olt;": "\u29c0",
+    "omacr;": "\u014d",
+    "omega;": "\u03c9",
+    "omicron;": "\u03bf",
+    "omid;": "\u29b6",
+    "ominus;": "\u2296",
+    "oopf;": "\U0001d560",
+    "opar;": "\u29b7",
+    "operp;": "\u29b9",
+    "oplus;": "\u2295",
+    "or;": "\u2228",
+    "orarr;": "\u21bb",
+    "ord;": "\u2a5d",
+    "order;": "\u2134",
+    "orderof;": "\u2134",
+    "ordf": "\xaa",
+    "ordf;": "\xaa",
+    "ordm": "\xba",
+    "ordm;": "\xba",
+    "origof;": "\u22b6",
+    "oror;": "\u2a56",
+    "orslope;": "\u2a57",
+    "orv;": "\u2a5b",
+    "oscr;": "\u2134",
+    "oslash": "\xf8",
+    "oslash;": "\xf8",
+    "osol;": "\u2298",
+    "otilde": "\xf5",
+    "otilde;": "\xf5",
+    "otimes;": "\u2297",
+    "otimesas;": "\u2a36",
+    "ouml": "\xf6",
+    "ouml;": "\xf6",
+    "ovbar;": "\u233d",
+    "par;": "\u2225",
+    "para": "\xb6",
+    "para;": "\xb6",
+    "parallel;": "\u2225",
+    "parsim;": "\u2af3",
+    "parsl;": "\u2afd",
+    "part;": "\u2202",
+    "pcy;": "\u043f",
+    "percnt;": "%",
+    "period;": ".",
+    "permil;": "\u2030",
+    "perp;": "\u22a5",
+    "pertenk;": "\u2031",
+    "pfr;": "\U0001d52d",
+    "phi;": "\u03c6",
+    "phiv;": "\u03d5",
+    "phmmat;": "\u2133",
+    "phone;": "\u260e",
+    "pi;": "\u03c0",
+    "pitchfork;": "\u22d4",
+    "piv;": "\u03d6",
+    "planck;": "\u210f",
+    "planckh;": "\u210e",
+    "plankv;": "\u210f",
+    "plus;": "+",
+    "plusacir;": "\u2a23",
+    "plusb;": "\u229e",
+    "pluscir;": "\u2a22",
+    "plusdo;": "\u2214",
+    "plusdu;": "\u2a25",
+    "pluse;": "\u2a72",
+    "plusmn": "\xb1",
+    "plusmn;": "\xb1",
+    "plussim;": "\u2a26",
+    "plustwo;": "\u2a27",
+    "pm;": "\xb1",
+    "pointint;": "\u2a15",
+    "popf;": "\U0001d561",
+    "pound": "\xa3",
+    "pound;": "\xa3",
+    "pr;": "\u227a",
+    "prE;": "\u2ab3",
+    "prap;": "\u2ab7",
+    "prcue;": "\u227c",
+    "pre;": "\u2aaf",
+    "prec;": "\u227a",
+    "precapprox;": "\u2ab7",
+    "preccurlyeq;": "\u227c",
+    "preceq;": "\u2aaf",
+    "precnapprox;": "\u2ab9",
+    "precneqq;": "\u2ab5",
+    "precnsim;": "\u22e8",
+    "precsim;": "\u227e",
+    "prime;": "\u2032",
+    "primes;": "\u2119",
+    "prnE;": "\u2ab5",
+    "prnap;": "\u2ab9",
+    "prnsim;": "\u22e8",
+    "prod;": "\u220f",
+    "profalar;": "\u232e",
+    "profline;": "\u2312",
+    "profsurf;": "\u2313",
+    "prop;": "\u221d",
+    "propto;": "\u221d",
+    "prsim;": "\u227e",
+    "prurel;": "\u22b0",
+    "pscr;": "\U0001d4c5",
+    "psi;": "\u03c8",
+    "puncsp;": "\u2008",
+    "qfr;": "\U0001d52e",
+    "qint;": "\u2a0c",
+    "qopf;": "\U0001d562",
+    "qprime;": "\u2057",
+    "qscr;": "\U0001d4c6",
+    "quaternions;": "\u210d",
+    "quatint;": "\u2a16",
+    "quest;": "?",
+    "questeq;": "\u225f",
+    "quot": "\"",
+    "quot;": "\"",
+    "rAarr;": "\u21db",
+    "rArr;": "\u21d2",
+    "rAtail;": "\u291c",
+    "rBarr;": "\u290f",
+    "rHar;": "\u2964",
+    "race;": "\u223d\u0331",
+    "racute;": "\u0155",
+    "radic;": "\u221a",
+    "raemptyv;": "\u29b3",
+    "rang;": "\u27e9",
+    "rangd;": "\u2992",
+    "range;": "\u29a5",
+    "rangle;": "\u27e9",
+    "raquo": "\xbb",
+    "raquo;": "\xbb",
+    "rarr;": "\u2192",
+    "rarrap;": "\u2975",
+    "rarrb;": "\u21e5",
+    "rarrbfs;": "\u2920",
+    "rarrc;": "\u2933",
+    "rarrfs;": "\u291e",
+    "rarrhk;": "\u21aa",
+    "rarrlp;": "\u21ac",
+    "rarrpl;": "\u2945",
+    "rarrsim;": "\u2974",
+    "rarrtl;": "\u21a3",
+    "rarrw;": "\u219d",
+    "ratail;": "\u291a",
+    "ratio;": "\u2236",
+    "rationals;": "\u211a",
+    "rbarr;": "\u290d",
+    "rbbrk;": "\u2773",
+    "rbrace;": "}",
+    "rbrack;": "]",
+    "rbrke;": "\u298c",
+    "rbrksld;": "\u298e",
+    "rbrkslu;": "\u2990",
+    "rcaron;": "\u0159",
+    "rcedil;": "\u0157",
+    "rceil;": "\u2309",
+    "rcub;": "}",
+    "rcy;": "\u0440",
+    "rdca;": "\u2937",
+    "rdldhar;": "\u2969",
+    "rdquo;": "\u201d",
+    "rdquor;": "\u201d",
+    "rdsh;": "\u21b3",
+    "real;": "\u211c",
+    "realine;": "\u211b",
+    "realpart;": "\u211c",
+    "reals;": "\u211d",
+    "rect;": "\u25ad",
+    "reg": "\xae",
+    "reg;": "\xae",
+    "rfisht;": "\u297d",
+    "rfloor;": "\u230b",
+    "rfr;": "\U0001d52f",
+    "rhard;": "\u21c1",
+    "rharu;": "\u21c0",
+    "rharul;": "\u296c",
+    "rho;": "\u03c1",
+    "rhov;": "\u03f1",
+    "rightarrow;": "\u2192",
+    "rightarrowtail;": "\u21a3",
+    "rightharpoondown;": "\u21c1",
+    "rightharpoonup;": "\u21c0",
+    "rightleftarrows;": "\u21c4",
+    "rightleftharpoons;": "\u21cc",
+    "rightrightarrows;": "\u21c9",
+    "rightsquigarrow;": "\u219d",
+    "rightthreetimes;": "\u22cc",
+    "ring;": "\u02da",
+    "risingdotseq;": "\u2253",
+    "rlarr;": "\u21c4",
+    "rlhar;": "\u21cc",
+    "rlm;": "\u200f",
+    "rmoust;": "\u23b1",
+    "rmoustache;": "\u23b1",
+    "rnmid;": "\u2aee",
+    "roang;": "\u27ed",
+    "roarr;": "\u21fe",
+    "robrk;": "\u27e7",
+    "ropar;": "\u2986",
+    "ropf;": "\U0001d563",
+    "roplus;": "\u2a2e",
+    "rotimes;": "\u2a35",
+    "rpar;": ")",
+    "rpargt;": "\u2994",
+    "rppolint;": "\u2a12",
+    "rrarr;": "\u21c9",
+    "rsaquo;": "\u203a",
+    "rscr;": "\U0001d4c7",
+    "rsh;": "\u21b1",
+    "rsqb;": "]",
+    "rsquo;": "\u2019",
+    "rsquor;": "\u2019",
+    "rthree;": "\u22cc",
+    "rtimes;": "\u22ca",
+    "rtri;": "\u25b9",
+    "rtrie;": "\u22b5",
+    "rtrif;": "\u25b8",
+    "rtriltri;": "\u29ce",
+    "ruluhar;": "\u2968",
+    "rx;": "\u211e",
+    "sacute;": "\u015b",
+    "sbquo;": "\u201a",
+    "sc;": "\u227b",
+    "scE;": "\u2ab4",
+    "scap;": "\u2ab8",
+    "scaron;": "\u0161",
+    "sccue;": "\u227d",
+    "sce;": "\u2ab0",
+    "scedil;": "\u015f",
+    "scirc;": "\u015d",
+    "scnE;": "\u2ab6",
+    "scnap;": "\u2aba",
+    "scnsim;": "\u22e9",
+    "scpolint;": "\u2a13",
+    "scsim;": "\u227f",
+    "scy;": "\u0441",
+    "sdot;": "\u22c5",
+    "sdotb;": "\u22a1",
+    "sdote;": "\u2a66",
+    "seArr;": "\u21d8",
+    "searhk;": "\u2925",
+    "searr;": "\u2198",
+    "searrow;": "\u2198",
+    "sect": "\xa7",
+    "sect;": "\xa7",
+    "semi;": ";",
+    "seswar;": "\u2929",
+    "setminus;": "\u2216",
+    "setmn;": "\u2216",
+    "sext;": "\u2736",
+    "sfr;": "\U0001d530",
+    "sfrown;": "\u2322",
+    "sharp;": "\u266f",
+    "shchcy;": "\u0449",
+    "shcy;": "\u0448",
+    "shortmid;": "\u2223",
+    "shortparallel;": "\u2225",
+    "shy": "\xad",
+    "shy;": "\xad",
+    "sigma;": "\u03c3",
+    "sigmaf;": "\u03c2",
+    "sigmav;": "\u03c2",
+    "sim;": "\u223c",
+    "simdot;": "\u2a6a",
+    "sime;": "\u2243",
+    "simeq;": "\u2243",
+    "simg;": "\u2a9e",
+    "simgE;": "\u2aa0",
+    "siml;": "\u2a9d",
+    "simlE;": "\u2a9f",
+    "simne;": "\u2246",
+    "simplus;": "\u2a24",
+    "simrarr;": "\u2972",
+    "slarr;": "\u2190",
+    "smallsetminus;": "\u2216",
+    "smashp;": "\u2a33",
+    "smeparsl;": "\u29e4",
+    "smid;": "\u2223",
+    "smile;": "\u2323",
+    "smt;": "\u2aaa",
+    "smte;": "\u2aac",
+    "smtes;": "\u2aac\ufe00",
+    "softcy;": "\u044c",
+    "sol;": "/",
+    "solb;": "\u29c4",
+    "solbar;": "\u233f",
+    "sopf;": "\U0001d564",
+    "spades;": "\u2660",
+    "spadesuit;": "\u2660",
+    "spar;": "\u2225",
+    "sqcap;": "\u2293",
+    "sqcaps;": "\u2293\ufe00",
+    "sqcup;": "\u2294",
+    "sqcups;": "\u2294\ufe00",
+    "sqsub;": "\u228f",
+    "sqsube;": "\u2291",
+    "sqsubset;": "\u228f",
+    "sqsubseteq;": "\u2291",
+    "sqsup;": "\u2290",
+    "sqsupe;": "\u2292",
+    "sqsupset;": "\u2290",
+    "sqsupseteq;": "\u2292",
+    "squ;": "\u25a1",
+    "square;": "\u25a1",
+    "squarf;": "\u25aa",
+    "squf;": "\u25aa",
+    "srarr;": "\u2192",
+    "sscr;": "\U0001d4c8",
+    "ssetmn;": "\u2216",
+    "ssmile;": "\u2323",
+    "sstarf;": "\u22c6",
+    "star;": "\u2606",
+    "starf;": "\u2605",
+    "straightepsilon;": "\u03f5",
+    "straightphi;": "\u03d5",
+    "strns;": "\xaf",
+    "sub;": "\u2282",
+    "subE;": "\u2ac5",
+    "subdot;": "\u2abd",
+    "sube;": "\u2286",
+    "subedot;": "\u2ac3",
+    "submult;": "\u2ac1",
+    "subnE;": "\u2acb",
+    "subne;": "\u228a",
+    "subplus;": "\u2abf",
+    "subrarr;": "\u2979",
+    "subset;": "\u2282",
+    "subseteq;": "\u2286",
+    "subseteqq;": "\u2ac5",
+    "subsetneq;": "\u228a",
+    "subsetneqq;": "\u2acb",
+    "subsim;": "\u2ac7",
+    "subsub;": "\u2ad5",
+    "subsup;": "\u2ad3",
+    "succ;": "\u227b",
+    "succapprox;": "\u2ab8",
+    "succcurlyeq;": "\u227d",
+    "succeq;": "\u2ab0",
+    "succnapprox;": "\u2aba",
+    "succneqq;": "\u2ab6",
+    "succnsim;": "\u22e9",
+    "succsim;": "\u227f",
+    "sum;": "\u2211",
+    "sung;": "\u266a",
+    "sup1": "\xb9",
+    "sup1;": "\xb9",
+    "sup2": "\xb2",
+    "sup2;": "\xb2",
+    "sup3": "\xb3",
+    "sup3;": "\xb3",
+    "sup;": "\u2283",
+    "supE;": "\u2ac6",
+    "supdot;": "\u2abe",
+    "supdsub;": "\u2ad8",
+    "supe;": "\u2287",
+    "supedot;": "\u2ac4",
+    "suphsol;": "\u27c9",
+    "suphsub;": "\u2ad7",
+    "suplarr;": "\u297b",
+    "supmult;": "\u2ac2",
+    "supnE;": "\u2acc",
+    "supne;": "\u228b",
+    "supplus;": "\u2ac0",
+    "supset;": "\u2283",
+    "supseteq;": "\u2287",
+    "supseteqq;": "\u2ac6",
+    "supsetneq;": "\u228b",
+    "supsetneqq;": "\u2acc",
+    "supsim;": "\u2ac8",
+    "supsub;": "\u2ad4",
+    "supsup;": "\u2ad6",
+    "swArr;": "\u21d9",
+    "swarhk;": "\u2926",
+    "swarr;": "\u2199",
+    "swarrow;": "\u2199",
+    "swnwar;": "\u292a",
+    "szlig": "\xdf",
+    "szlig;": "\xdf",
+    "target;": "\u2316",
+    "tau;": "\u03c4",
+    "tbrk;": "\u23b4",
+    "tcaron;": "\u0165",
+    "tcedil;": "\u0163",
+    "tcy;": "\u0442",
+    "tdot;": "\u20db",
+    "telrec;": "\u2315",
+    "tfr;": "\U0001d531",
+    "there4;": "\u2234",
+    "therefore;": "\u2234",
+    "theta;": "\u03b8",
+    "thetasym;": "\u03d1",
+    "thetav;": "\u03d1",
+    "thickapprox;": "\u2248",
+    "thicksim;": "\u223c",
+    "thinsp;": "\u2009",
+    "thkap;": "\u2248",
+    "thksim;": "\u223c",
+    "thorn": "\xfe",
+    "thorn;": "\xfe",
+    "tilde;": "\u02dc",
+    "times": "\xd7",
+    "times;": "\xd7",
+    "timesb;": "\u22a0",
+    "timesbar;": "\u2a31",
+    "timesd;": "\u2a30",
+    "tint;": "\u222d",
+    "toea;": "\u2928",
+    "top;": "\u22a4",
+    "topbot;": "\u2336",
+    "topcir;": "\u2af1",
+    "topf;": "\U0001d565",
+    "topfork;": "\u2ada",
+    "tosa;": "\u2929",
+    "tprime;": "\u2034",
+    "trade;": "\u2122",
+    "triangle;": "\u25b5",
+    "triangledown;": "\u25bf",
+    "triangleleft;": "\u25c3",
+    "trianglelefteq;": "\u22b4",
+    "triangleq;": "\u225c",
+    "triangleright;": "\u25b9",
+    "trianglerighteq;": "\u22b5",
+    "tridot;": "\u25ec",
+    "trie;": "\u225c",
+    "triminus;": "\u2a3a",
+    "triplus;": "\u2a39",
+    "trisb;": "\u29cd",
+    "tritime;": "\u2a3b",
+    "trpezium;": "\u23e2",
+    "tscr;": "\U0001d4c9",
+    "tscy;": "\u0446",
+    "tshcy;": "\u045b",
+    "tstrok;": "\u0167",
+    "twixt;": "\u226c",
+    "twoheadleftarrow;": "\u219e",
+    "twoheadrightarrow;": "\u21a0",
+    "uArr;": "\u21d1",
+    "uHar;": "\u2963",
+    "uacute": "\xfa",
+    "uacute;": "\xfa",
+    "uarr;": "\u2191",
+    "ubrcy;": "\u045e",
+    "ubreve;": "\u016d",
+    "ucirc": "\xfb",
+    "ucirc;": "\xfb",
+    "ucy;": "\u0443",
+    "udarr;": "\u21c5",
+    "udblac;": "\u0171",
+    "udhar;": "\u296e",
+    "ufisht;": "\u297e",
+    "ufr;": "\U0001d532",
+    "ugrave": "\xf9",
+    "ugrave;": "\xf9",
+    "uharl;": "\u21bf",
+    "uharr;": "\u21be",
+    "uhblk;": "\u2580",
+    "ulcorn;": "\u231c",
+    "ulcorner;": "\u231c",
+    "ulcrop;": "\u230f",
+    "ultri;": "\u25f8",
+    "umacr;": "\u016b",
+    "uml": "\xa8",
+    "uml;": "\xa8",
+    "uogon;": "\u0173",
+    "uopf;": "\U0001d566",
+    "uparrow;": "\u2191",
+    "updownarrow;": "\u2195",
+    "upharpoonleft;": "\u21bf",
+    "upharpoonright;": "\u21be",
+    "uplus;": "\u228e",
+    "upsi;": "\u03c5",
+    "upsih;": "\u03d2",
+    "upsilon;": "\u03c5",
+    "upuparrows;": "\u21c8",
+    "urcorn;": "\u231d",
+    "urcorner;": "\u231d",
+    "urcrop;": "\u230e",
+    "uring;": "\u016f",
+    "urtri;": "\u25f9",
+    "uscr;": "\U0001d4ca",
+    "utdot;": "\u22f0",
+    "utilde;": "\u0169",
+    "utri;": "\u25b5",
+    "utrif;": "\u25b4",
+    "uuarr;": "\u21c8",
+    "uuml": "\xfc",
+    "uuml;": "\xfc",
+    "uwangle;": "\u29a7",
+    "vArr;": "\u21d5",
+    "vBar;": "\u2ae8",
+    "vBarv;": "\u2ae9",
+    "vDash;": "\u22a8",
+    "vangrt;": "\u299c",
+    "varepsilon;": "\u03f5",
+    "varkappa;": "\u03f0",
+    "varnothing;": "\u2205",
+    "varphi;": "\u03d5",
+    "varpi;": "\u03d6",
+    "varpropto;": "\u221d",
+    "varr;": "\u2195",
+    "varrho;": "\u03f1",
+    "varsigma;": "\u03c2",
+    "varsubsetneq;": "\u228a\ufe00",
+    "varsubsetneqq;": "\u2acb\ufe00",
+    "varsupsetneq;": "\u228b\ufe00",
+    "varsupsetneqq;": "\u2acc\ufe00",
+    "vartheta;": "\u03d1",
+    "vartriangleleft;": "\u22b2",
+    "vartriangleright;": "\u22b3",
+    "vcy;": "\u0432",
+    "vdash;": "\u22a2",
+    "vee;": "\u2228",
+    "veebar;": "\u22bb",
+    "veeeq;": "\u225a",
+    "vellip;": "\u22ee",
+    "verbar;": "|",
+    "vert;": "|",
+    "vfr;": "\U0001d533",
+    "vltri;": "\u22b2",
+    "vnsub;": "\u2282\u20d2",
+    "vnsup;": "\u2283\u20d2",
+    "vopf;": "\U0001d567",
+    "vprop;": "\u221d",
+    "vrtri;": "\u22b3",
+    "vscr;": "\U0001d4cb",
+    "vsubnE;": "\u2acb\ufe00",
+    "vsubne;": "\u228a\ufe00",
+    "vsupnE;": "\u2acc\ufe00",
+    "vsupne;": "\u228b\ufe00",
+    "vzigzag;": "\u299a",
+    "wcirc;": "\u0175",
+    "wedbar;": "\u2a5f",
+    "wedge;": "\u2227",
+    "wedgeq;": "\u2259",
+    "weierp;": "\u2118",
+    "wfr;": "\U0001d534",
+    "wopf;": "\U0001d568",
+    "wp;": "\u2118",
+    "wr;": "\u2240",
+    "wreath;": "\u2240",
+    "wscr;": "\U0001d4cc",
+    "xcap;": "\u22c2",
+    "xcirc;": "\u25ef",
+    "xcup;": "\u22c3",
+    "xdtri;": "\u25bd",
+    "xfr;": "\U0001d535",
+    "xhArr;": "\u27fa",
+    "xharr;": "\u27f7",
+    "xi;": "\u03be",
+    "xlArr;": "\u27f8",
+    "xlarr;": "\u27f5",
+    "xmap;": "\u27fc",
+    "xnis;": "\u22fb",
+    "xodot;": "\u2a00",
+    "xopf;": "\U0001d569",
+    "xoplus;": "\u2a01",
+    "xotime;": "\u2a02",
+    "xrArr;": "\u27f9",
+    "xrarr;": "\u27f6",
+    "xscr;": "\U0001d4cd",
+    "xsqcup;": "\u2a06",
+    "xuplus;": "\u2a04",
+    "xutri;": "\u25b3",
+    "xvee;": "\u22c1",
+    "xwedge;": "\u22c0",
+    "yacute": "\xfd",
+    "yacute;": "\xfd",
+    "yacy;": "\u044f",
+    "ycirc;": "\u0177",
+    "ycy;": "\u044b",
+    "yen": "\xa5",
+    "yen;": "\xa5",
+    "yfr;": "\U0001d536",
+    "yicy;": "\u0457",
+    "yopf;": "\U0001d56a",
+    "yscr;": "\U0001d4ce",
+    "yucy;": "\u044e",
+    "yuml": "\xff",
+    "yuml;": "\xff",
+    "zacute;": "\u017a",
+    "zcaron;": "\u017e",
+    "zcy;": "\u0437",
+    "zdot;": "\u017c",
+    "zeetrf;": "\u2128",
+    "zeta;": "\u03b6",
+    "zfr;": "\U0001d537",
+    "zhcy;": "\u0436",
+    "zigrarr;": "\u21dd",
+    "zopf;": "\U0001d56b",
+    "zscr;": "\U0001d4cf",
+    "zwj;": "\u200d",
+    "zwnj;": "\u200c",
 }
 
 replacementCharacters = {
-    0x0:u"\uFFFD",
-    0x0d:u"\u000A",
-    0x80:u"\u20AC",
-    0x81:u"\u0081",
-    0x81:u"\u0081",
-    0x82:u"\u201A",
-    0x83:u"\u0192",
-    0x84:u"\u201E",
-    0x85:u"\u2026",
-    0x86:u"\u2020",
-    0x87:u"\u2021",
-    0x88:u"\u02C6",
-    0x89:u"\u2030",
-    0x8A:u"\u0160",
-    0x8B:u"\u2039",
-    0x8C:u"\u0152",
-    0x8D:u"\u008D",
-    0x8E:u"\u017D",
-    0x8F:u"\u008F",
-    0x90:u"\u0090",
-    0x91:u"\u2018",
-    0x92:u"\u2019",
-    0x93:u"\u201C",
-    0x94:u"\u201D",
-    0x95:u"\u2022",
-    0x96:u"\u2013",
-    0x97:u"\u2014",
-    0x98:u"\u02DC",
-    0x99:u"\u2122",
-    0x9A:u"\u0161",
-    0x9B:u"\u203A",
-    0x9C:u"\u0153",
-    0x9D:u"\u009D",
-    0x9E:u"\u017E",
-    0x9F:u"\u0178",
+    0x0: "\uFFFD",
+    0x0d: "\u000D",
+    0x80: "\u20AC",
+    0x81: "\u0081",
+    0x81: "\u0081",
+    0x82: "\u201A",
+    0x83: "\u0192",
+    0x84: "\u201E",
+    0x85: "\u2026",
+    0x86: "\u2020",
+    0x87: "\u2021",
+    0x88: "\u02C6",
+    0x89: "\u2030",
+    0x8A: "\u0160",
+    0x8B: "\u2039",
+    0x8C: "\u0152",
+    0x8D: "\u008D",
+    0x8E: "\u017D",
+    0x8F: "\u008F",
+    0x90: "\u0090",
+    0x91: "\u2018",
+    0x92: "\u2019",
+    0x93: "\u201C",
+    0x94: "\u201D",
+    0x95: "\u2022",
+    0x96: "\u2013",
+    0x97: "\u2014",
+    0x98: "\u02DC",
+    0x99: "\u2122",
+    0x9A: "\u0161",
+    0x9B: "\u203A",
+    0x9C: "\u0153",
+    0x9D: "\u009D",
+    0x9E: "\u017E",
+    0x9F: "\u0178",
 }
 
 encodings = {
@@ -1145,25 +3078,27 @@ encodings = {
     'x-x-big5': 'big5'}
 
 tokenTypes = {
-    "Doctype":0,
-    "Characters":1,
-    "SpaceCharacters":2,
-    "StartTag":3,
-    "EndTag":4,
-    "EmptyTag":5,
-    "Comment":6,
-    "ParseError":7
+    "Doctype": 0,
+    "Characters": 1,
+    "SpaceCharacters": 2,
+    "StartTag": 3,
+    "EndTag": 4,
+    "EmptyTag": 5,
+    "Comment": 6,
+    "ParseError": 7
 }
 
-tagTokenTypes = frozenset((tokenTypes["StartTag"], tokenTypes["EndTag"], 
+tagTokenTypes = frozenset((tokenTypes["StartTag"], tokenTypes["EndTag"],
                            tokenTypes["EmptyTag"]))
 
 
-prefixes = dict([(v,k) for k,v in namespaces.iteritems()])
+prefixes = dict([(v, k) for k, v in namespaces.items()])
 prefixes["http://www.w3.org/1998/Math/MathML"] = "math"
 
+
 class DataLossWarning(UserWarning):
     pass
 
+
 class ReparseException(Exception):
     pass
diff --git a/src/html5lib/filters/_base.py b/src/html5lib/filters/_base.py
index bca94ada40..c7dbaed0fa 100644
--- a/src/html5lib/filters/_base.py
+++ b/src/html5lib/filters/_base.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 
 class Filter(object):
     def __init__(self, source):
diff --git a/src/html5lib/filters/alphabeticalattributes.py b/src/html5lib/filters/alphabeticalattributes.py
new file mode 100644
index 0000000000..fed6996c1d
--- /dev/null
+++ b/src/html5lib/filters/alphabeticalattributes.py
@@ -0,0 +1,20 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from . import _base
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
+
+
+class Filter(_base.Filter):
+    def __iter__(self):
+        for token in _base.Filter.__iter__(self):
+            if token["type"] in ("StartTag", "EmptyTag"):
+                attrs = OrderedDict()
+                for name, value in sorted(token["data"].items(),
+                                          key=lambda x: x[0]):
+                    attrs[name] = value
+                token["data"] = attrs
+            yield token
diff --git a/src/html5lib/filters/formfiller.py b/src/html5lib/filters/formfiller.py
deleted file mode 100644
index 940017149b..0000000000
--- a/src/html5lib/filters/formfiller.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# The goal is to finally have a form filler where you pass data for
-# each form, using the algorithm for "Seeding a form with initial values"
-# See http://www.whatwg.org/specs/web-forms/current-work/#seeding
-#
-
-import _base
-
-from html5lib.constants import spaceCharacters
-spaceCharacters = u"".join(spaceCharacters)
-
-class SimpleFilter(_base.Filter):
-    def __init__(self, source, fieldStorage):
-        _base.Filter.__init__(self, source)
-        self.fieldStorage = fieldStorage
-
-    def __iter__(self):
-        field_indices = {}
-        state = None
-        field_name = None
-        for token in _base.Filter.__iter__(self):
-            type = token["type"]
-            if type in ("StartTag", "EmptyTag"):
-                name = token["name"].lower()
-                if name == "input":
-                    field_name = None
-                    field_type = None
-                    input_value_index = -1
-                    input_checked_index = -1
-                    for i,(n,v) in enumerate(token["data"]):
-                        n = n.lower()
-                        if n == u"name":
-                            field_name = v.strip(spaceCharacters)
-                        elif n == u"type":
-                            field_type = v.strip(spaceCharacters)
-                        elif n == u"checked":
-                            input_checked_index = i
-                        elif n == u"value":
-                            input_value_index = i
-
-                    value_list = self.fieldStorage.getlist(field_name)
-                    field_index = field_indices.setdefault(field_name, 0)
-                    if field_index < len(value_list):
-                        value = value_list[field_index]
-                    else:
-                        value = ""
-
-                    if field_type in (u"checkbox", u"radio"):
-                        if value_list:
-                            if token["data"][input_value_index][1] == value:
-                                if input_checked_index < 0:
-                                    token["data"].append((u"checked", u""))
-                                field_indices[field_name] = field_index + 1
-                            elif input_checked_index >= 0:
-                                del token["data"][input_checked_index]
-
-                    elif field_type not in (u"button", u"submit", u"reset"):
-                        if input_value_index >= 0:
-                            token["data"][input_value_index] = (u"value", value)
-                        else:
-                            token["data"].append((u"value", value))
-                        field_indices[field_name] = field_index + 1
-
-                    field_type = None
-                    field_name = None
-
-                elif name == "textarea":
-                    field_type = "textarea"
-                    field_name = dict((token["data"])[::-1])["name"]
-
-                elif name == "select":
-                    field_type = "select"
-                    attributes = dict(token["data"][::-1])
-                    field_name = attributes.get("name")
-                    is_select_multiple = "multiple" in attributes
-                    is_selected_option_found = False
-
-                elif field_type == "select" and field_name and name == "option":
-                    option_selected_index = -1
-                    option_value = None
-                    for i,(n,v) in enumerate(token["data"]):
-                        n = n.lower()
-                        if n == "selected":
-                            option_selected_index = i
-                        elif n == "value":
-                            option_value = v.strip(spaceCharacters)
-                    if option_value is None:
-                        raise NotImplementedError("<option>s without a value= attribute")
-                    else:
-                        value_list = self.fieldStorage.getlist(field_name)
-                        if value_list:
-                            field_index = field_indices.setdefault(field_name, 0)
-                            if field_index < len(value_list):
-                                value = value_list[field_index]
-                            else:
-                                value = ""
-                            if (is_select_multiple or not is_selected_option_found) and option_value == value:
-                                if option_selected_index < 0:
-                                    token["data"].append((u"selected", u""))
-                                field_indices[field_name] = field_index + 1
-                                is_selected_option_found = True
-                            elif option_selected_index >= 0:
-                                del token["data"][option_selected_index]
-
-            elif field_type is not None and field_name and type == "EndTag":
-                name = token["name"].lower()
-                if name == field_type:
-                    if name == "textarea":
-                        value_list = self.fieldStorage.getlist(field_name)
-                        if value_list:
-                            field_index = field_indices.setdefault(field_name, 0)
-                            if field_index < len(value_list):
-                                value = value_list[field_index]
-                            else:
-                                value = ""
-                            yield {"type": "Characters", "data": value}
-                            field_indices[field_name] = field_index + 1
-
-                    field_name = None
-
-                elif name == "option" and field_type == "select":
-                    pass # TODO: part of "option without value= attribute" processing
-
-            elif field_type == "textarea":
-                continue # ignore token
-
-            yield token
diff --git a/src/html5lib/filters/inject_meta_charset.py b/src/html5lib/filters/inject_meta_charset.py
index 35a2d95f21..ca33b70b53 100644
--- a/src/html5lib/filters/inject_meta_charset.py
+++ b/src/html5lib/filters/inject_meta_charset.py
@@ -1,4 +1,7 @@
-import _base
+from __future__ import absolute_import, division, unicode_literals
+
+from . import _base
+
 
 class Filter(_base.Filter):
     def __init__(self, source, encoding):
@@ -18,29 +21,28 @@ class Filter(_base.Filter):
 
             elif type == "EmptyTag":
                 if token["name"].lower() == "meta":
-                   # replace charset with actual encoding
-                   has_http_equiv_content_type = False
-                   content_index = -1
-                   for i,(name,value) in enumerate(token["data"]):
-                       if name.lower() == 'charset':
-                          token["data"][i] = (u'charset', self.encoding)
-                          meta_found = True
-                          break
-                       elif name == 'http-equiv' and value.lower() == 'content-type':
-                           has_http_equiv_content_type = True
-                       elif name == 'content':
-                           content_index = i
-                   else:
-                       if has_http_equiv_content_type and content_index >= 0:
-                           token["data"][content_index] = (u'content', u'text/html; charset=%s' % self.encoding)
-                           meta_found = True
+                    # replace charset with actual encoding
+                    has_http_equiv_content_type = False
+                    for (namespace, name), value in token["data"].items():
+                        if namespace is not None:
+                            continue
+                        elif name.lower() == 'charset':
+                            token["data"][(namespace, name)] = self.encoding
+                            meta_found = True
+                            break
+                        elif name == 'http-equiv' and value.lower() == 'content-type':
+                            has_http_equiv_content_type = True
+                    else:
+                        if has_http_equiv_content_type and (None, "content") in token["data"]:
+                            token["data"][(None, "content")] = 'text/html; charset=%s' % self.encoding
+                            meta_found = True
 
                 elif token["name"].lower() == "head" and not meta_found:
                     # insert meta into empty head
                     yield {"type": "StartTag", "name": "head",
                            "data": token["data"]}
                     yield {"type": "EmptyTag", "name": "meta",
-                           "data": [["charset", self.encoding]]}
+                           "data": {(None, "charset"): self.encoding}}
                     yield {"type": "EndTag", "name": "head"}
                     meta_found = True
                     continue
@@ -51,7 +53,7 @@ class Filter(_base.Filter):
                     yield pending.pop(0)
                     if not meta_found:
                         yield {"type": "EmptyTag", "name": "meta",
-                               "data": [["charset", self.encoding]]}
+                               "data": {(None, "charset"): self.encoding}}
                     while pending:
                         yield pending.pop(0)
                     meta_found = True
diff --git a/src/html5lib/filters/lint.py b/src/html5lib/filters/lint.py
index ea5c619f15..7cc99a4ba7 100644
--- a/src/html5lib/filters/lint.py
+++ b/src/html5lib/filters/lint.py
@@ -1,13 +1,18 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from gettext import gettext
 _ = gettext
 
-import _base
-from html5lib.constants import cdataElements, rcdataElements, voidElements
+from . import _base
+from ..constants import cdataElements, rcdataElements, voidElements
 
-from html5lib.constants import spaceCharacters
-spaceCharacters = u"".join(spaceCharacters)
+from ..constants import spaceCharacters
+spaceCharacters = "".join(spaceCharacters)
+
+
+class LintError(Exception):
+    pass
 
-class LintError(Exception): pass
 
 class Filter(_base.Filter):
     def __iter__(self):
@@ -18,24 +23,24 @@ class Filter(_base.Filter):
             if type in ("StartTag", "EmptyTag"):
                 name = token["name"]
                 if contentModelFlag != "PCDATA":
-                    raise LintError(_("StartTag not in PCDATA content model flag: %s") % name)
-                if not isinstance(name, unicode):
-                    raise LintError(_(u"Tag name is not a string: %r") % name)
+                    raise LintError(_("StartTag not in PCDATA content model flag: %(tag)s") % {"tag": name})
+                if not isinstance(name, str):
+                    raise LintError(_("Tag name is not a string: %(tag)r") % {"tag": name})
                 if not name:
-                    raise LintError(_(u"Empty tag name"))
+                    raise LintError(_("Empty tag name"))
                 if type == "StartTag" and name in voidElements:
-                    raise LintError(_(u"Void element reported as StartTag token: %s") % name)
+                    raise LintError(_("Void element reported as StartTag token: %(tag)s") % {"tag": name})
                 elif type == "EmptyTag" and name not in voidElements:
-                    raise LintError(_(u"Non-void element reported as EmptyTag token: %s") % token["name"])
+                    raise LintError(_("Non-void element reported as EmptyTag token: %(tag)s") % {"tag": token["name"]})
                 if type == "StartTag":
                     open_elements.append(name)
                 for name, value in token["data"]:
-                    if not isinstance(name, unicode):
-                        raise LintError(_("Attribute name is not a string: %r") % name)
+                    if not isinstance(name, str):
+                        raise LintError(_("Attribute name is not a string: %(name)r") % {"name": name})
                     if not name:
-                        raise LintError(_(u"Empty attribute name"))
-                    if not isinstance(value, unicode):
-                        raise LintError(_("Attribute value is not a string: %r") % value)
+                        raise LintError(_("Empty attribute name"))
+                    if not isinstance(value, str):
+                        raise LintError(_("Attribute value is not a string: %(value)r") % {"value": value})
                 if name in cdataElements:
                     contentModelFlag = "CDATA"
                 elif name in rcdataElements:
@@ -45,15 +50,15 @@ class Filter(_base.Filter):
 
             elif type == "EndTag":
                 name = token["name"]
-                if not isinstance(name, unicode):
-                    raise LintError(_(u"Tag name is not a string: %r") % name)
+                if not isinstance(name, str):
+                    raise LintError(_("Tag name is not a string: %(tag)r") % {"tag": name})
                 if not name:
-                    raise LintError(_(u"Empty tag name"))
+                    raise LintError(_("Empty tag name"))
                 if name in voidElements:
-                    raise LintError(_(u"Void element reported as EndTag token: %s") % name)
+                    raise LintError(_("Void element reported as EndTag token: %(tag)s") % {"tag": name})
                 start_name = open_elements.pop()
                 if start_name != name:
-                    raise LintError(_(u"EndTag (%s) does not match StartTag (%s)") % (name, start_name))
+                    raise LintError(_("EndTag (%(end)s) does not match StartTag (%(start)s)") % {"end": name, "start": start_name})
                 contentModelFlag = "PCDATA"
 
             elif type == "Comment":
@@ -62,27 +67,27 @@ class Filter(_base.Filter):
 
             elif type in ("Characters", "SpaceCharacters"):
                 data = token["data"]
-                if not isinstance(data, unicode):
-                    raise LintError(_("Attribute name is not a string: %r") % data)
+                if not isinstance(data, str):
+                    raise LintError(_("Attribute name is not a string: %(name)r") % {"name": data})
                 if not data:
-                    raise LintError(_(u"%s token with empty data") % type)
+                    raise LintError(_("%(type)s token with empty data") % {"type": type})
                 if type == "SpaceCharacters":
                     data = data.strip(spaceCharacters)
                     if data:
-                        raise LintError(_(u"Non-space character(s) found in SpaceCharacters token: ") % data)
+                        raise LintError(_("Non-space character(s) found in SpaceCharacters token: %(token)r") % {"token": data})
 
             elif type == "Doctype":
                 name = token["name"]
                 if contentModelFlag != "PCDATA":
-                    raise LintError(_("Doctype not in PCDATA content model flag: %s") % name)
-                if not isinstance(name, unicode):
-                    raise LintError(_(u"Tag name is not a string: %r") % name)
+                    raise LintError(_("Doctype not in PCDATA content model flag: %(name)s") % {"name": name})
+                if not isinstance(name, str):
+                    raise LintError(_("Tag name is not a string: %(tag)r") % {"tag": name})
                 # XXX: what to do with token["data"] ?
 
             elif type in ("ParseError", "SerializeError"):
                 pass
 
             else:
-                raise LintError(_(u"Unknown token type: %s") % type)
+                raise LintError(_("Unknown token type: %(type)s") % {"type": type})
 
             yield token
diff --git a/src/html5lib/filters/optionaltags.py b/src/html5lib/filters/optionaltags.py
index a77aa72c4b..fefe0b3097 100644
--- a/src/html5lib/filters/optionaltags.py
+++ b/src/html5lib/filters/optionaltags.py
@@ -1,4 +1,7 @@
-import _base
+from __future__ import absolute_import, division, unicode_literals
+
+from . import _base
+
 
 class Filter(_base.Filter):
     def slider(self):
@@ -14,8 +17,8 @@ class Filter(_base.Filter):
         for previous, token, next in self.slider():
             type = token["type"]
             if type == "StartTag":
-                if (token["data"] or 
-                    not self.is_optional_start(token["name"], previous, next)):
+                if (token["data"] or
+                        not self.is_optional_start(token["name"], previous, next)):
                     yield token
             elif type == "EndTag":
                 if not self.is_optional_end(token["name"], next):
@@ -73,7 +76,7 @@ class Filter(_base.Filter):
                 # omit the thead and tfoot elements' end tag when they are
                 # immediately followed by a tbody element. See is_optional_end.
                 if previous and previous['type'] == 'EndTag' and \
-                  previous['name'] in ('tbody','thead','tfoot'):
+                        previous['name'] in ('tbody', 'thead', 'tfoot'):
                     return False
                 return next["name"] == 'tr'
             else:
@@ -121,10 +124,10 @@ class Filter(_base.Filter):
             # there is no more content in the parent element.
             if type in ("StartTag", "EmptyTag"):
                 return next["name"] in ('address', 'article', 'aside',
-                                        'blockquote', 'datagrid', 'dialog', 
+                                        'blockquote', 'datagrid', 'dialog',
                                         'dir', 'div', 'dl', 'fieldset', 'footer',
                                         'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-                                        'header', 'hr', 'menu', 'nav', 'ol', 
+                                        'header', 'hr', 'menu', 'nav', 'ol',
                                         'p', 'pre', 'section', 'table', 'ul')
             else:
                 return type == "EndTag" or type is None
diff --git a/src/html5lib/filters/sanitizer.py b/src/html5lib/filters/sanitizer.py
index 00235278a1..b206b54e7a 100644
--- a/src/html5lib/filters/sanitizer.py
+++ b/src/html5lib/filters/sanitizer.py
@@ -1,8 +1,12 @@
-import _base
-from html5lib.sanitizer import HTMLSanitizerMixin
+from __future__ import absolute_import, division, unicode_literals
+
+from . import _base
+from ..sanitizer import HTMLSanitizerMixin
+
 
 class Filter(_base.Filter, HTMLSanitizerMixin):
     def __iter__(self):
         for token in _base.Filter.__iter__(self):
             token = self.sanitize_token(token)
-            if token: yield token
+            if token:
+                yield token
diff --git a/src/html5lib/filters/whitespace.py b/src/html5lib/filters/whitespace.py
index 74d6f4d810..dfc60eebd3 100644
--- a/src/html5lib/filters/whitespace.py
+++ b/src/html5lib/filters/whitespace.py
@@ -1,16 +1,13 @@
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import ImmutableSet as frozenset
+from __future__ import absolute_import, division, unicode_literals
 
 import re
 
-import _base
-from html5lib.constants import rcdataElements, spaceCharacters
-spaceCharacters = u"".join(spaceCharacters)
+from . import _base
+from ..constants import rcdataElements, spaceCharacters
+spaceCharacters = "".join(spaceCharacters)
+
+SPACES_REGEX = re.compile("[%s]+" % spaceCharacters)
 
-SPACES_REGEX = re.compile(u"[%s]+" % spaceCharacters)
 
 class Filter(_base.Filter):
 
@@ -21,7 +18,7 @@ class Filter(_base.Filter):
         for token in _base.Filter.__iter__(self):
             type = token["type"]
             if type == "StartTag" \
-              and (preserve or token["name"] in self.spacePreserveElements):
+                    and (preserve or token["name"] in self.spacePreserveElements):
                 preserve += 1
 
             elif type == "EndTag" and preserve:
@@ -29,13 +26,13 @@ class Filter(_base.Filter):
 
             elif not preserve and type == "SpaceCharacters" and token["data"]:
                 # Test on token["data"] above to not introduce spaces where there were not
-                token["data"] = u" "
+                token["data"] = " "
 
             elif not preserve and type == "Characters":
                 token["data"] = collapse_spaces(token["data"])
 
             yield token
 
+
 def collapse_spaces(text):
     return SPACES_REGEX.sub(' ', text)
-
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
index c0855362da..b0f14f3935 100644
--- a/src/html5lib/html5parser.py
+++ b/src/html5lib/html5parser.py
@@ -1,62 +1,65 @@
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import Set as set
-    from sets import ImmutableSet as frozenset
+from __future__ import absolute_import, division, unicode_literals
+from six import with_metaclass
 
-try:
-    any
-except:
-    # Implement 'any' for python 2.4 and previous
-    def any(iterable):
-        for element in iterable:
-            if element:
-                return True
-        return False
+import types
 
-import sys
+from . import inputstream
+from . import tokenizer
 
-import inputstream
-import tokenizer
+from . import treebuilders
+from .treebuilders._base import Marker
 
-import treebuilders
-from treebuilders._base import Marker
-from treebuilders import simpletree
+from . import utils
+from . import constants
+from .constants import spaceCharacters, asciiUpper2Lower
+from .constants import specialElements
+from .constants import headingElements
+from .constants import cdataElements, rcdataElements
+from .constants import tokenTypes, ReparseException, namespaces
+from .constants import htmlIntegrationPointElements, mathmlTextIntegrationPointElements
+from .constants import adjustForeignAttributes as adjustForeignAttributesMap
 
-import utils
-from constants import spaceCharacters, asciiUpper2Lower
-from constants import scopingElements, formattingElements, specialElements
-from constants import headingElements, tableInsertModeElements
-from constants import cdataElements, rcdataElements, voidElements
-from constants import tokenTypes, ReparseException, namespaces
 
-def parse(doc, treebuilder="simpletree", encoding=None, 
+def parse(doc, treebuilder="etree", encoding=None,
           namespaceHTMLElements=True):
+    """Parse a string or file-like object into a tree"""
     tb = treebuilders.getTreeBuilder(treebuilder)
     p = HTMLParser(tb, namespaceHTMLElements=namespaceHTMLElements)
     return p.parse(doc, encoding=encoding)
 
-def parseFragment(doc, container="div", treebuilder="simpletree", encoding=None, 
+
+def parseFragment(doc, container="div", treebuilder="etree", encoding=None,
                   namespaceHTMLElements=True):
     tb = treebuilders.getTreeBuilder(treebuilder)
     p = HTMLParser(tb, namespaceHTMLElements=namespaceHTMLElements)
     return p.parseFragment(doc, container=container, encoding=encoding)
 
+
+def method_decorator_metaclass(function):
+    class Decorated(type):
+        def __new__(meta, classname, bases, classDict):
+            for attributeName, attribute in classDict.items():
+                if isinstance(attribute, types.FunctionType):
+                    attribute = function(attribute)
+
+                classDict[attributeName] = attribute
+            return type.__new__(meta, classname, bases, classDict)
+    return Decorated
+
+
 class HTMLParser(object):
     """HTML parser. Generates a tree structure from a stream of (possibly
         malformed) HTML"""
 
-    def __init__(self, tree = simpletree.TreeBuilder,
-                 tokenizer = tokenizer.HTMLTokenizer, strict = False,
-                 namespaceHTMLElements = True):
+    def __init__(self, tree=None, tokenizer=tokenizer.HTMLTokenizer,
+                 strict=False, namespaceHTMLElements=True, debug=False):
         """
         strict - raise an exception when a parse error is encountered
 
         tree - a treebuilder class controlling the type of tree that will be
         returned. Built in treebuilders can be accessed through
         html5lib.treebuilders.getTreeBuilder(treeType)
-        
+
         tokenizer - a class that provides a stream of tokens to the treebuilder.
         This may be replaced for e.g. a sanitizer which converts some tags to
         text
@@ -65,36 +68,14 @@ class HTMLParser(object):
         # Raise an exception on the first error encountered
         self.strict = strict
 
+        if tree is None:
+            tree = treebuilders.getTreeBuilder("etree")
         self.tree = tree(namespaceHTMLElements)
         self.tokenizer_class = tokenizer
         self.errors = []
 
-        self.phases = {
-            "initial": InitialPhase(self, self.tree),
-            "beforeHtml": BeforeHtmlPhase(self, self.tree),
-            "beforeHead": BeforeHeadPhase(self, self.tree),
-            "inHead": InHeadPhase(self, self.tree),
-            # XXX "inHeadNoscript": InHeadNoScriptPhase(self, self.tree),
-            "afterHead": AfterHeadPhase(self, self.tree),
-            "inBody": InBodyPhase(self, self.tree),
-            "text": TextPhase(self, self.tree),
-            "inTable": InTablePhase(self, self.tree),
-            "inTableText": InTableTextPhase(self, self.tree),
-            "inCaption": InCaptionPhase(self, self.tree),
-            "inColumnGroup": InColumnGroupPhase(self, self.tree),
-            "inTableBody": InTableBodyPhase(self, self.tree),
-            "inRow": InRowPhase(self, self.tree),
-            "inCell": InCellPhase(self, self.tree),
-            "inSelect": InSelectPhase(self, self.tree),
-            "inSelectInTable": InSelectInTablePhase(self, self.tree),
-            "inForeignContent": InForeignContentPhase(self, self.tree),
-            "afterBody": AfterBodyPhase(self, self.tree),
-            "inFrameset": InFramesetPhase(self, self.tree),
-            "afterFrameset": AfterFramesetPhase(self, self.tree),
-            "afterAfterBody": AfterAfterBodyPhase(self, self.tree),
-            "afterAfterFrameset": AfterAfterFramesetPhase(self, self.tree),
-            # XXX after after frameset
-        }
+        self.phases = dict([(name, cls(self, self.tree)) for name, cls in
+                            getPhases(debug).items()])
 
     def _parse(self, stream, innerHTML=False, container="div",
                encoding=None, parseMeta=True, useChardet=True, **kwargs):
@@ -103,20 +84,22 @@ class HTMLParser(object):
         self.container = container
         self.tokenizer = self.tokenizer_class(stream, encoding=encoding,
                                               parseMeta=parseMeta,
-                                              useChardet=useChardet, **kwargs)
+                                              useChardet=useChardet,
+                                              parser=self, **kwargs)
         self.reset()
 
         while True:
             try:
                 self.mainLoop()
                 break
-            except ReparseException, e:
+            except ReparseException:
                 self.reset()
 
     def reset(self):
         self.tree.reset()
         self.firstStartTag = False
         self.errors = []
+        self.log = []  # only used with debug mode
         # "quirks" / "limited quirks" / "no quirks"
         self.compatMode = "no quirks"
 
@@ -141,57 +124,87 @@ class HTMLParser(object):
             self.phase = self.phases["initial"]
 
         self.lastPhase = None
-        self.secondaryPhase = None
 
         self.beforeRCDataPhase = None
 
         self.framesetOK = True
-        
-    def mainLoop(self):
-        (CharactersToken, 
-         SpaceCharactersToken, 
-         StartTagToken,
-         EndTagToken, 
-         CommentToken,
-         DoctypeToken) = (tokenTypes["Characters"],
-                          tokenTypes["SpaceCharacters"],
-                          tokenTypes["StartTag"],
-                          tokenTypes["EndTag"],
-                          tokenTypes["Comment"],
-                          tokenTypes["Doctype"])
 
+    def isHTMLIntegrationPoint(self, element):
+        if (element.name == "annotation-xml" and
+                element.namespace == namespaces["mathml"]):
+            return ("encoding" in element.attributes and
+                    element.attributes["encoding"].translate(
+                        asciiUpper2Lower) in
+                    ("text/html", "application/xhtml+xml"))
+        else:
+            return (element.namespace, element.name) in htmlIntegrationPointElements
+
+    def isMathMLTextIntegrationPoint(self, element):
+        return (element.namespace, element.name) in mathmlTextIntegrationPointElements
+
+    def mainLoop(self):
         CharactersToken = tokenTypes["Characters"]
         SpaceCharactersToken = tokenTypes["SpaceCharacters"]
         StartTagToken = tokenTypes["StartTag"]
         EndTagToken = tokenTypes["EndTag"]
         CommentToken = tokenTypes["Comment"]
         DoctypeToken = tokenTypes["Doctype"]
-        
-        
+        ParseErrorToken = tokenTypes["ParseError"]
+
         for token in self.normalizedTokens():
-            type = token["type"]
-            if type == CharactersToken:
-                self.phase.processCharacters(token)
-            elif type == SpaceCharactersToken:
-                self.phase.processSpaceCharacters(token)
-            elif type == StartTagToken:
-                self.selfClosingAcknowledged = False
-                self.phase.processStartTag(token)
-                if (token["selfClosing"]
-                    and not self.selfClosingAcknowledged):
-                    self.parseError("non-void-element-with-trailing-solidus",
-                                    {"name":token["name"]})
-            elif type == EndTagToken:
-                self.phase.processEndTag(token)
-            elif type == CommentToken:
-                self.phase.processComment(token)
-            elif type == DoctypeToken:
-                self.phase.processDoctype(token)
-            else:
-                self.parseError(token["data"], token.get("datavars", {}))
+            new_token = token
+            while new_token is not None:
+                currentNode = self.tree.openElements[-1] if self.tree.openElements else None
+                currentNodeNamespace = currentNode.namespace if currentNode else None
+                currentNodeName = currentNode.name if currentNode else None
+
+                type = new_token["type"]
+
+                if type == ParseErrorToken:
+                    self.parseError(new_token["data"], new_token.get("datavars", {}))
+                    new_token = None
+                else:
+                    if (len(self.tree.openElements) == 0 or
+                        currentNodeNamespace == self.tree.defaultNamespace or
+                        (self.isMathMLTextIntegrationPoint(currentNode) and
+                         ((type == StartTagToken and
+                           token["name"] not in frozenset(["mglyph", "malignmark"])) or
+                          type in (CharactersToken, SpaceCharactersToken))) or
+                        (currentNodeNamespace == namespaces["mathml"] and
+                         currentNodeName == "annotation-xml" and
+                         token["name"] == "svg") or
+                        (self.isHTMLIntegrationPoint(currentNode) and
+                         type in (StartTagToken, CharactersToken, SpaceCharactersToken))):
+                        phase = self.phase
+                    else:
+                        phase = self.phases["inForeignContent"]
+
+                    if type == CharactersToken:
+                        new_token = phase.processCharacters(new_token)
+                    elif type == SpaceCharactersToken:
+                        new_token = phase.processSpaceCharacters(new_token)
+                    elif type == StartTagToken:
+                        new_token = phase.processStartTag(new_token)
+                    elif type == EndTagToken:
+                        new_token = phase.processEndTag(new_token)
+                    elif type == CommentToken:
+                        new_token = phase.processComment(new_token)
+                    elif type == DoctypeToken:
+                        new_token = phase.processDoctype(new_token)
+
+            if (type == StartTagToken and token["selfClosing"]
+                    and not token["selfClosingAcknowledged"]):
+                self.parseError("non-void-element-with-trailing-solidus",
+                                {"name": token["name"]})
 
         # When the loop finishes it's EOF
-        self.phase.processEOF()
+        reprocess = True
+        phases = []
+        while reprocess:
+            phases.append(self.phase)
+            reprocess = self.phase.processEOF()
+            if reprocess:
+                assert self.phase not in phases
 
     def normalizedTokens(self):
         for token in self.tokenizer:
@@ -207,14 +220,14 @@ class HTMLParser(object):
         regardless of any BOM or later declaration (such as in a meta
         element)
         """
-        self._parse(stream, innerHTML=False, encoding=encoding, 
+        self._parse(stream, innerHTML=False, encoding=encoding,
                     parseMeta=parseMeta, useChardet=useChardet)
         return self.tree.getDocument()
-    
+
     def parseFragment(self, stream, container="div", encoding=None,
                       parseMeta=False, useChardet=True):
         """Parse a HTML fragment into a well-formed tree fragment
-        
+
         container - name of the element we're setting the innerHTML property
         if set to None, default to 'div'
 
@@ -243,162 +256,147 @@ class HTMLParser(object):
         return token
 
     def adjustMathMLAttributes(self, token):
-        replacements = {"definitionurl":"definitionURL"}
-        for k,v in replacements.iteritems():
+        replacements = {"definitionurl": "definitionURL"}
+        for k, v in replacements.items():
             if k in token["data"]:
                 token["data"][v] = token["data"][k]
                 del token["data"][k]
 
     def adjustSVGAttributes(self, token):
         replacements = {
-            "attributename" : "attributeName",
-            "attributetype" : "attributeType",
-            "basefrequency" : "baseFrequency",
-            "baseprofile" : "baseProfile",
-            "calcmode" : "calcMode",
-            "clippathunits" : "clipPathUnits",
-            "contentscripttype" : "contentScriptType",
-            "contentstyletype" : "contentStyleType",
-            "diffuseconstant" : "diffuseConstant",
-            "edgemode" : "edgeMode",
-            "externalresourcesrequired" : "externalResourcesRequired",
-            "filterres" : "filterRes",
-            "filterunits" : "filterUnits",
-            "glyphref" : "glyphRef",
-            "gradienttransform" : "gradientTransform",
-            "gradientunits" : "gradientUnits",
-            "kernelmatrix" : "kernelMatrix",
-            "kernelunitlength" : "kernelUnitLength",
-            "keypoints" : "keyPoints",
-            "keysplines" : "keySplines",
-            "keytimes" : "keyTimes",
-            "lengthadjust" : "lengthAdjust",
-            "limitingconeangle" : "limitingConeAngle",
-            "markerheight" : "markerHeight",
-            "markerunits" : "markerUnits",
-            "markerwidth" : "markerWidth",
-            "maskcontentunits" : "maskContentUnits",
-            "maskunits" : "maskUnits",
-            "numoctaves" : "numOctaves",
-            "pathlength" : "pathLength",
-            "patterncontentunits" : "patternContentUnits",
-            "patterntransform" : "patternTransform",
-            "patternunits" : "patternUnits",
-            "pointsatx" : "pointsAtX",
-            "pointsaty" : "pointsAtY",
-            "pointsatz" : "pointsAtZ",
-            "preservealpha" : "preserveAlpha",
-            "preserveaspectratio" : "preserveAspectRatio",
-            "primitiveunits" : "primitiveUnits",
-            "refx" : "refX",
-            "refy" : "refY",
-            "repeatcount" : "repeatCount",
-            "repeatdur" : "repeatDur",
-            "requiredextensions" : "requiredExtensions",
-            "requiredfeatures" : "requiredFeatures",
-            "specularconstant" : "specularConstant",
-            "specularexponent" : "specularExponent",
-            "spreadmethod" : "spreadMethod",
-            "startoffset" : "startOffset",
-            "stddeviation" : "stdDeviation",
-            "stitchtiles" : "stitchTiles",
-            "surfacescale" : "surfaceScale",
-            "systemlanguage" : "systemLanguage",
-            "tablevalues" : "tableValues",
-            "targetx" : "targetX",
-            "targety" : "targetY",
-            "textlength" : "textLength",
-            "viewbox" : "viewBox",
-            "viewtarget" : "viewTarget",
-            "xchannelselector" : "xChannelSelector",
-            "ychannelselector" : "yChannelSelector",
-            "zoomandpan" : "zoomAndPan"
-            }
-        for originalName in token["data"].keys():
+            "attributename": "attributeName",
+            "attributetype": "attributeType",
+            "basefrequency": "baseFrequency",
+            "baseprofile": "baseProfile",
+            "calcmode": "calcMode",
+            "clippathunits": "clipPathUnits",
+            "contentscripttype": "contentScriptType",
+            "contentstyletype": "contentStyleType",
+            "diffuseconstant": "diffuseConstant",
+            "edgemode": "edgeMode",
+            "externalresourcesrequired": "externalResourcesRequired",
+            "filterres": "filterRes",
+            "filterunits": "filterUnits",
+            "glyphref": "glyphRef",
+            "gradienttransform": "gradientTransform",
+            "gradientunits": "gradientUnits",
+            "kernelmatrix": "kernelMatrix",
+            "kernelunitlength": "kernelUnitLength",
+            "keypoints": "keyPoints",
+            "keysplines": "keySplines",
+            "keytimes": "keyTimes",
+            "lengthadjust": "lengthAdjust",
+            "limitingconeangle": "limitingConeAngle",
+            "markerheight": "markerHeight",
+            "markerunits": "markerUnits",
+            "markerwidth": "markerWidth",
+            "maskcontentunits": "maskContentUnits",
+            "maskunits": "maskUnits",
+            "numoctaves": "numOctaves",
+            "pathlength": "pathLength",
+            "patterncontentunits": "patternContentUnits",
+            "patterntransform": "patternTransform",
+            "patternunits": "patternUnits",
+            "pointsatx": "pointsAtX",
+            "pointsaty": "pointsAtY",
+            "pointsatz": "pointsAtZ",
+            "preservealpha": "preserveAlpha",
+            "preserveaspectratio": "preserveAspectRatio",
+            "primitiveunits": "primitiveUnits",
+            "refx": "refX",
+            "refy": "refY",
+            "repeatcount": "repeatCount",
+            "repeatdur": "repeatDur",
+            "requiredextensions": "requiredExtensions",
+            "requiredfeatures": "requiredFeatures",
+            "specularconstant": "specularConstant",
+            "specularexponent": "specularExponent",
+            "spreadmethod": "spreadMethod",
+            "startoffset": "startOffset",
+            "stddeviation": "stdDeviation",
+            "stitchtiles": "stitchTiles",
+            "surfacescale": "surfaceScale",
+            "systemlanguage": "systemLanguage",
+            "tablevalues": "tableValues",
+            "targetx": "targetX",
+            "targety": "targetY",
+            "textlength": "textLength",
+            "viewbox": "viewBox",
+            "viewtarget": "viewTarget",
+            "xchannelselector": "xChannelSelector",
+            "ychannelselector": "yChannelSelector",
+            "zoomandpan": "zoomAndPan"
+        }
+        for originalName in list(token["data"].keys()):
             if originalName in replacements:
                 svgName = replacements[originalName]
                 token["data"][svgName] = token["data"][originalName]
                 del token["data"][originalName]
 
     def adjustForeignAttributes(self, token):
-        replacements = {
-            "xlink:actuate":("xlink", "actuate", namespaces["xlink"]),
-            "xlink:arcrole":("xlink", "arcrole", namespaces["xlink"]),
-            "xlink:href":("xlink", "href", namespaces["xlink"]),
-            "xlink:role":("xlink", "role", namespaces["xlink"]),
-            "xlink:show":("xlink", "show", namespaces["xlink"]),
-            "xlink:title":("xlink", "title", namespaces["xlink"]),
-            "xlink:type":("xlink", "type", namespaces["xlink"]),
-            "xml:base":("xml", "base", namespaces["xml"]),
-            "xml:lang":("xml", "lang", namespaces["xml"]),
-            "xml:space":("xml", "space", namespaces["xml"]),
-            "xmlns":(None, "xmlns", namespaces["xmlns"]),
-            "xmlns:xlink":("xmlns", "xlink", namespaces["xmlns"])
-            }
+        replacements = adjustForeignAttributesMap
 
-        for originalName in token["data"].iterkeys():
+        for originalName in token["data"].keys():
             if originalName in replacements:
                 foreignName = replacements[originalName]
                 token["data"][foreignName] = token["data"][originalName]
                 del token["data"][originalName]
 
+    def reparseTokenNormal(self, token):
+        self.parser.phase()
+
     def resetInsertionMode(self):
         # The name of this method is mostly historical. (It's also used in the
         # specification.)
         last = False
         newModes = {
-            "select":"inSelect",
-            "td":"inCell",
-            "th":"inCell",
-            "tr":"inRow",
-            "tbody":"inTableBody",
-            "thead":"inTableBody",
-            "tfoot":"inTableBody",
-            "caption":"inCaption",
-            "colgroup":"inColumnGroup",
-            "table":"inTable",
-            "head":"inBody",
-            "body":"inBody",
-            "frameset":"inFrameset"
+            "select": "inSelect",
+            "td": "inCell",
+            "th": "inCell",
+            "tr": "inRow",
+            "tbody": "inTableBody",
+            "thead": "inTableBody",
+            "tfoot": "inTableBody",
+            "caption": "inCaption",
+            "colgroup": "inColumnGroup",
+            "table": "inTable",
+            "head": "inBody",
+            "body": "inBody",
+            "frameset": "inFrameset",
+            "html": "beforeHead"
         }
         for node in self.tree.openElements[::-1]:
             nodeName = node.name
+            new_phase = None
             if node == self.tree.openElements[0]:
+                assert self.innerHTML
                 last = True
-                if nodeName not in ['td', 'th']:
-                    # XXX
-                    assert self.innerHTML
-                    nodeName = self.innerHTML
+                nodeName = self.innerHTML
             # Check for conditions that should only happen in the innerHTML
             # case
-            if nodeName in ("select", "colgroup", "head", "frameset"):
-                # XXX
+            if nodeName in ("select", "colgroup", "head", "html"):
                 assert self.innerHTML
+
+            if not last and node.namespace != self.tree.defaultNamespace:
+                continue
+
             if nodeName in newModes:
-                self.phase = self.phases[newModes[nodeName]]
-                break
-            elif node.namespace in (namespaces["mathml"], namespaces["svg"]):
-                self.phase = self.phases["inForeignContent"]
-                self.secondaryPhase = self.phases["inBody"]
-                break
-            elif nodeName == "html":
-                if self.tree.headPointer is None:
-                    self.phase = self.phases["beforeHead"]
-                else:
-                   self.phase = self.phases["afterHead"]
+                new_phase = self.phases[newModes[nodeName]]
                 break
             elif last:
-                self.phase = self.phases["inBody"]
+                new_phase = self.phases["inBody"]
                 break
 
+        self.phase = new_phase
+
     def parseRCDataRawtext(self, token, contentType):
         """Generic RCDATA/RAWTEXT Parsing algorithm
         contentType - RCDATA or RAWTEXT
         """
         assert contentType in ("RAWTEXT", "RCDATA")
-        
-        element = self.tree.insertElement(token)
-        
+
+        self.tree.insertElement(token)
+
         if contentType == "RAWTEXT":
             self.tokenizer.state = self.tokenizer.rawtextState
         else:
@@ -408,2217 +406,2307 @@ class HTMLParser(object):
 
         self.phase = self.phases["text"]
 
-class Phase(object):
-    """Base class for helper object that implements each phase of processing
-    """
-    # Order should be (they can be omitted):
-    # * EOF
-    # * Comment
-    # * Doctype
-    # * SpaceCharacters
-    # * Characters
-    # * StartTag
-    #   - startTag* methods
-    # * EndTag
-    #   - endTag* methods
 
-    def __init__(self, parser, tree):
-        self.parser = parser
-        self.tree = tree
+def getPhases(debug):
+    def log(function):
+        """Logger that records which phase processes each token"""
+        type_names = dict((value, key) for key, value in
+                          constants.tokenTypes.items())
 
-    def processEOF(self):
-        raise NotImplementedError
+        def wrapped(self, *args, **kwargs):
+            if function.__name__.startswith("process") and len(args) > 0:
+                token = args[0]
+                try:
+                    info = {"type": type_names[token['type']]}
+                except:
+                    raise
+                if token['type'] in constants.tagTokenTypes:
+                    info["name"] = token['name']
 
-    def processComment(self, token):
-        # For most phases the following is correct. Where it's not it will be
-        # overridden.
-        self.tree.insertComment(token, self.tree.openElements[-1])
+                self.parser.log.append((self.parser.tokenizer.state.__name__,
+                                        self.parser.phase.__class__.__name__,
+                                        self.__class__.__name__,
+                                        function.__name__,
+                                        info))
+                return function(self, *args, **kwargs)
+            else:
+                return function(self, *args, **kwargs)
+        return wrapped
 
-    def processDoctype(self, token):
-        self.parser.parseError("unexpected-doctype")
-
-    def processCharacters(self, token):
-        self.tree.insertText(token["data"])
-
-    def processSpaceCharacters(self, token):
-        self.tree.insertText(token["data"])
-
-    def processStartTag(self, token):
-        self.startTagHandler[token["name"]](token)
-
-    def startTagHtml(self, token):
-        if self.parser.firstStartTag == False and token["name"] == "html":
-           self.parser.parseError("non-html-root")
-        # XXX Need a check here to see if the first start tag token emitted is
-        # this token... If it's not, invoke self.parser.parseError().
-        for attr, value in token["data"].iteritems():
-            if attr not in self.tree.openElements[0].attributes:
-                self.tree.openElements[0].attributes[attr] = value
-        self.parser.firstStartTag = False
-
-    def processEndTag(self, token):
-        self.endTagHandler[token["name"]](token)
-
-class InitialPhase(Phase):
-    def processSpaceCharacters(self, token):
-        pass
-    
-    def processComment(self, token):
-        self.tree.insertComment(token, self.tree.document)
-
-    def processDoctype(self, token):
-        name = token["name"]
-        publicId = token["publicId"]
-        systemId = token["systemId"]
-        correct = token["correct"]
-
-        if (name != "html" or publicId != None or
-            systemId != None and systemId != "about:legacy-compat"):
-            self.parser.parseError("unknown-doctype")
-        
-        if publicId is None:
-            publicId = ""
-            
-        self.tree.insertDoctype(token)
-
-        if publicId != "":
-            publicId = publicId.translate(asciiUpper2Lower)
-
-        if (not correct or token["name"] != "html"
-            or publicId.startswith( 
-            ("+//silmaril//dtd html pro v0r11 19970101//",
-             "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-             "-//as//dtd html 3.0 aswedit + extensions//",
-             "-//ietf//dtd html 2.0 level 1//",
-             "-//ietf//dtd html 2.0 level 2//",
-             "-//ietf//dtd html 2.0 strict level 1//",
-             "-//ietf//dtd html 2.0 strict level 2//",
-             "-//ietf//dtd html 2.0 strict//",
-             "-//ietf//dtd html 2.0//",
-             "-//ietf//dtd html 2.1e//",
-             "-//ietf//dtd html 3.0//",
-             "-//ietf//dtd html 3.2 final//",
-             "-//ietf//dtd html 3.2//",
-             "-//ietf//dtd html 3//",
-             "-//ietf//dtd html level 0//",
-             "-//ietf//dtd html level 1//",
-             "-//ietf//dtd html level 2//",
-             "-//ietf//dtd html level 3//",
-             "-//ietf//dtd html strict level 0//",
-             "-//ietf//dtd html strict level 1//",
-             "-//ietf//dtd html strict level 2//",
-             "-//ietf//dtd html strict level 3//",
-             "-//ietf//dtd html strict//",
-             "-//ietf//dtd html//",
-             "-//metrius//dtd metrius presentational//",
-             "-//microsoft//dtd internet explorer 2.0 html strict//",
-             "-//microsoft//dtd internet explorer 2.0 html//",
-             "-//microsoft//dtd internet explorer 2.0 tables//",
-             "-//microsoft//dtd internet explorer 3.0 html strict//",
-             "-//microsoft//dtd internet explorer 3.0 html//",
-             "-//microsoft//dtd internet explorer 3.0 tables//",
-             "-//netscape comm. corp.//dtd html//",
-             "-//netscape comm. corp.//dtd strict html//",
-             "-//o'reilly and associates//dtd html 2.0//",
-             "-//o'reilly and associates//dtd html extended 1.0//",
-             "-//o'reilly and associates//dtd html extended relaxed 1.0//",
-             "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
-             "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
-             "-//spyglass//dtd html 2.0 extended//",
-             "-//sq//dtd html 2.0 hotmetal + extensions//",
-             "-//sun microsystems corp.//dtd hotjava html//",
-             "-//sun microsystems corp.//dtd hotjava strict html//",
-             "-//w3c//dtd html 3 1995-03-24//",
-             "-//w3c//dtd html 3.2 draft//",
-             "-//w3c//dtd html 3.2 final//",
-             "-//w3c//dtd html 3.2//",
-             "-//w3c//dtd html 3.2s draft//",
-             "-//w3c//dtd html 4.0 frameset//",
-             "-//w3c//dtd html 4.0 transitional//",
-             "-//w3c//dtd html experimental 19960712//",
-             "-//w3c//dtd html experimental 970421//",
-             "-//w3c//dtd w3 html//",
-             "-//w3o//dtd w3 html 3.0//",
-             "-//webtechs//dtd mozilla html 2.0//",
-             "-//webtechs//dtd mozilla html//"))
-            or publicId in
-                ("-//w3o//dtd w3 html strict 3.0//en//",
-                 "-/w3c/dtd html 4.0 transitional/en",
-                 "html")
-            or publicId.startswith(
-                ("-//w3c//dtd html 4.01 frameset//",
-                 "-//w3c//dtd html 4.01 transitional//")) and 
-                systemId == None
-            or systemId and systemId.lower() == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
-            self.parser.compatMode = "quirks"
-        elif (publicId.startswith(
-                ("-//w3c//dtd xhtml 1.0 frameset//",
-                 "-//w3c//dtd xhtml 1.0 transitional//"))
-              or publicId.startswith(
-                  ("-//w3c//dtd html 4.01 frameset//",
-                   "-//w3c//dtd html 4.01 transitional//")) and 
-                  systemId != None):
-            self.parser.compatMode = "limited quirks"
-
-        self.parser.phase = self.parser.phases["beforeHtml"]
-    
-    def anythingElse(self):
-        self.parser.compatMode = "quirks"
-        self.parser.phase = self.parser.phases["beforeHtml"]
-
-    def processCharacters(self, token):
-        self.parser.parseError("expected-doctype-but-got-chars")
-        self.anythingElse()
-        self.parser.phase.processCharacters(token)
-
-    def processStartTag(self, token):
-        self.parser.parseError("expected-doctype-but-got-start-tag",
-          {"name": token["name"]})
-        self.anythingElse()
-        self.parser.phase.processStartTag(token)
-
-    def processEndTag(self, token):
-        self.parser.parseError("expected-doctype-but-got-end-tag",
-          {"name": token["name"]})
-        self.anythingElse()
-        self.parser.phase.processEndTag(token)
-        
-    def processEOF(self):
-        self.parser.parseError("expected-doctype-but-got-eof")
-        self.anythingElse()
-        self.parser.phase.processEOF()
-
-
-class BeforeHtmlPhase(Phase):
-    # helper methods
-    def insertHtmlElement(self):
-        self.tree.insertRoot(impliedTagToken("html", "StartTag"))
-        self.parser.phase = self.parser.phases["beforeHead"]
-
-    # other
-    def processEOF(self):
-        self.insertHtmlElement()
-        self.parser.phase.processEOF()
-
-    def processComment(self, token):
-        self.tree.insertComment(token, self.tree.document)
-
-    def processSpaceCharacters(self, token):
-        pass
-
-    def processCharacters(self, token):
-        self.insertHtmlElement()
-        self.parser.phase.processCharacters(token)
-
-    def processStartTag(self, token):
-        if token["name"] == "html":
-            self.parser.firstStartTag = True
-        self.insertHtmlElement()
-        self.parser.phase.processStartTag(token)
-
-    def processEndTag(self, token):
-        if token["name"] not in ("head", "body", "html", "br"):
-            self.parser.parseError("unexpected-end-tag-before-html",
-              {"name": token["name"]})
+    def getMetaclass(use_metaclass, metaclass_func):
+        if use_metaclass:
+            return method_decorator_metaclass(metaclass_func)
         else:
-            self.insertHtmlElement()
-            self.parser.phase.processEndTag(token)
+            return type
 
+    class Phase(with_metaclass(getMetaclass(debug, log))):
+        """Base class for helper object that implements each phase of processing
+        """
 
-class BeforeHeadPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
+        def __init__(self, parser, tree):
+            self.parser = parser
+            self.tree = tree
 
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("head", self.startTagHead)
-        ])
-        self.startTagHandler.default = self.startTagOther
+        def processEOF(self):
+            raise NotImplementedError
 
-        self.endTagHandler = utils.MethodDispatcher([
-            (("head", "body", "html", "br"), self.endTagImplyHead)
-        ])
-        self.endTagHandler.default = self.endTagOther
+        def processComment(self, token):
+            # For most phases the following is correct. Where it's not it will be
+            # overridden.
+            self.tree.insertComment(token, self.tree.openElements[-1])
 
-    def processEOF(self):
-        self.startTagHead(impliedTagToken("head", "StartTag"))
-        self.parser.phase.processEOF()
+        def processDoctype(self, token):
+            self.parser.parseError("unexpected-doctype")
 
-    def processSpaceCharacters(self, token):
-        pass
+        def processCharacters(self, token):
+            self.tree.insertText(token["data"])
 
-    def processCharacters(self, token):
-        self.startTagHead(impliedTagToken("head", "StartTag"))
-        self.parser.phase.processCharacters(token)
+        def processSpaceCharacters(self, token):
+            self.tree.insertText(token["data"])
 
-    def startTagHtml(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
+        def processStartTag(self, token):
+            return self.startTagHandler[token["name"]](token)
 
-    def startTagHead(self, token):
-        self.tree.insertElement(token)
-        self.tree.headPointer = self.tree.openElements[-1]
-        self.parser.phase = self.parser.phases["inHead"]
+        def startTagHtml(self, token):
+            if not self.parser.firstStartTag and token["name"] == "html":
+                self.parser.parseError("non-html-root")
+            # XXX Need a check here to see if the first start tag token emitted is
+            # this token... If it's not, invoke self.parser.parseError().
+            for attr, value in token["data"].items():
+                if attr not in self.tree.openElements[0].attributes:
+                    self.tree.openElements[0].attributes[attr] = value
+            self.parser.firstStartTag = False
 
-    def startTagOther(self, token):
-        self.startTagHead(impliedTagToken("head", "StartTag"))
-        self.parser.phase.processStartTag(token)
+        def processEndTag(self, token):
+            return self.endTagHandler[token["name"]](token)
 
-    def endTagImplyHead(self, token):
-        self.startTagHead(impliedTagToken("head", "StartTag"))
-        self.parser.phase.processEndTag(token)
-
-    def endTagOther(self, token):
-        self.parser.parseError("end-tag-after-implied-root",
-          {"name": token["name"]})
-
-class InHeadPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler =  utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("title", self.startTagTitle),
-            (("noscript", "noframes", "style"), self.startTagNoScriptNoFramesStyle),
-            ("script", self.startTagScript),
-            (("base", "link", "command"), 
-             self.startTagBaseLinkCommand),
-            ("meta", self.startTagMeta),
-            ("head", self.startTagHead)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self. endTagHandler = utils.MethodDispatcher([
-            ("head", self.endTagHead),
-            (("br", "html", "body"), self.endTagHtmlBodyBr)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    # helper
-    def appendToHead(self, element):
-        if self.tree.headPointer is not None:
-            self.tree.headPointer.appendChild(element)
-        else:
-            assert self.parser.innerHTML
-            self.tree.openElementsw[-1].appendChild(element)
-
-    # the real thing
-    def processEOF (self):
-        self.anythingElse()
-        self.parser.phase.processEOF()
-
-    def processCharacters(self, token):
-        self.anythingElse()
-        self.parser.phase.processCharacters(token)
-
-    def startTagHtml(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
-
-    def startTagHead(self, token):
-        self.parser.parseError("two-heads-are-not-better-than-one")
-
-    def startTagBaseLinkCommand(self, token):
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
-        token["selfClosingAcknowledged"] = True
-
-    def startTagMeta(self, token):
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
-        token["selfClosingAcknowledged"] = True
-
-        attributes = token["data"]
-        if self.parser.tokenizer.stream.charEncoding[1] == "tentative":
-            if "charset" in attributes:
-                self.parser.tokenizer.stream.changeEncoding(attributes["charset"])
-            elif "content" in attributes:
-                # Encoding it as UTF-8 here is a hack, as really we should pass
-                # the abstract Unicode string, and just use the
-                # ContentAttrParser on that, but using UTF-8 allows all chars
-                # to be encoded and as a ASCII-superset works.
-                data = inputstream.EncodingBytes(attributes["content"].encode("utf-8"))
-                parser = inputstream.ContentAttrParser(data)
-                codec = parser.parse()
-                self.parser.tokenizer.stream.changeEncoding(codec)
-
-    def startTagTitle(self, token):
-        self.parser.parseRCDataRawtext(token, "RCDATA")
-
-    def startTagNoScriptNoFramesStyle(self, token):
-        #Need to decide whether to implement the scripting-disabled case
-        self.parser.parseRCDataRawtext(token, "RAWTEXT")
-
-    def startTagScript(self, token):
-        self.tree.insertElement(token)
-        self.parser.tokenizer.state = self.parser.tokenizer.scriptDataState
-        self.parser.originalPhase = self.parser.phase
-        self.parser.phase = self.parser.phases["text"]
-
-    def startTagOther(self, token):
-        self.anythingElse()
-        self.parser.phase.processStartTag(token)
-
-    def endTagHead(self, token):
-        node = self.parser.tree.openElements.pop()
-        assert node.name == "head", "Expected head got %s"%node.name
-        self.parser.phase = self.parser.phases["afterHead"]
-
-    def endTagHtmlBodyBr(self, token):
-        self.anythingElse()
-        self.parser.phase.processEndTag(token)
-
-    def endTagOther(self, token):
-        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-    def anythingElse(self):
-        self.endTagHead(impliedTagToken("head"))
-        
-
-# XXX If we implement a parser for which scripting is disabled we need to
-# implement this phase.
-#
-# class InHeadNoScriptPhase(Phase):
-
-class AfterHeadPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("body", self.startTagBody),
-            ("frameset", self.startTagFrameset),
-            (("base", "link", "meta", "noframes", "script", "style", "title"),
-              self.startTagFromHead),
-            ("head", self.startTagHead)
-        ])
-        self.startTagHandler.default = self.startTagOther
-        self.endTagHandler = utils.MethodDispatcher([(("body", "html", "br"), 
-                                                      self.endTagHtmlBodyBr)])
-        self.endTagHandler.default = self.endTagOther
-
-    def processEOF(self):
-        self.anythingElse()
-        self.parser.phase.processEOF()
-
-    def processCharacters(self, token):
-        self.anythingElse()
-        self.parser.phase.processCharacters(token)
-
-    def startTagBody(self, token):
-        self.parser.framesetOK = False
-        self.tree.insertElement(token)
-        self.parser.phase = self.parser.phases["inBody"]
-
-    def startTagFrameset(self, token):
-        self.tree.insertElement(token)
-        self.parser.phase = self.parser.phases["inFrameset"]
-
-    def startTagFromHead(self, token):
-        self.parser.parseError("unexpected-start-tag-out-of-my-head",
-          {"name": token["name"]})
-        self.tree.openElements.append(self.tree.headPointer)
-        self.parser.phases["inHead"].processStartTag(token)
-        for node in self.tree.openElements[::-1]:
-            if node.name == "head":
-                self.tree.openElements.remove(node)
-                break
-
-    def startTagHead(self, token):
-        self.parser.parseError("unexpected-start-tag", {"name":token["name"]})
-
-    def startTagOther(self, token):
-        self.anythingElse()
-        self.parser.phase.processStartTag(token)
-
-    def endTagHtmlBodyBr(self, token):
-        self.anythingElse()
-        self.parser.phase.processEndTag(token)
-
-    def endTagOther(self, token):
-        self.parser.parseError("unexpected-end-tag", {"name":token["name"]})
-
-    def anythingElse(self):
-        self.tree.insertElement(impliedTagToken("body", "StartTag"))
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.framesetOK = True
-
-
-class InBodyPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#parsing-main-inbody
-    # the really-really-really-very crazy mode
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        #Keep a ref to this for special handling of whitespace in <pre>
-        self.processSpaceCharactersNonPre = self.processSpaceCharacters
-
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            (("base", "command", "link", "meta", "noframes", "script", "style", 
-              "title"), self.startTagProcessInHead),
-            ("body", self.startTagBody),
-            ("frameset", self.startTagFrameset),
-            (("address", "article", "aside", "blockquote", "center", "datagrid",
-              "details", "dir", "div", "dl", "fieldset", "figure",
-              "footer", "header", "hgroup", "menu", "nav", "ol", "p",
-              "section", "ul"),
-              self.startTagCloseP),
-            (("pre", "listing"), self.startTagPreListing),
-            ("form", self.startTagForm),
-            (("li", "dd", "dt"), self.startTagListItem),
-            ("plaintext",self.startTagPlaintext),
-            (headingElements, self.startTagHeading),
-            ("a", self.startTagA),
-            (("b", "big", "code", "em", "font", "i", "s", "small", "strike", 
-              "strong", "tt", "u"),self.startTagFormatting),
-            ("nobr", self.startTagNobr),
-            ("button", self.startTagButton),
-            (("applet", "marquee", "object"), self.startTagAppletMarqueeObject),
-            ("xmp", self.startTagXmp),
-            ("table", self.startTagTable),
-            (("area", "basefont", "bgsound", "br", "embed", "img", "input",
-              "keygen", "spacer", "wbr"), self.startTagVoidFormatting),
-            (("param", "source"), self.startTagParamSource),
-            ("hr", self.startTagHr),
-            ("image", self.startTagImage),
-            ("isindex", self.startTagIsIndex),
-            ("textarea", self.startTagTextarea),
-            ("iframe", self.startTagIFrame),
-            (("noembed", "noframes", "noscript"), self.startTagRawtext),
-            ("select", self.startTagSelect),
-            (("rp", "rt"), self.startTagRpRt),
-            (("option", "optgroup"), self.startTagOpt),
-            (("math"), self.startTagMath),
-            (("svg"), self.startTagSvg),
-            (("caption", "col", "colgroup", "frame", "head",
-              "tbody", "td", "tfoot", "th", "thead",
-              "tr"), self.startTagMisplaced)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            ("body",self.endTagBody),
-            ("html",self.endTagHtml),
-            (("address", "article", "aside", "blockquote", "center", "datagrid",
-              "details", "dir", "div", "dl", "fieldset", "figure",
-              "footer", "header", "hgroup", "listing", "menu", "nav", "ol", "pre", 
-              "section", "ul"), self.endTagBlock),
-            ("form", self.endTagForm),
-            ("p",self.endTagP),
-            (("dd", "dt", "li"), self.endTagListItem),
-            (headingElements, self.endTagHeading),
-            (("a", "b", "big", "code", "em", "font", "i", "nobr", "s", "small",
-              "strike", "strong", "tt", "u"), self.endTagFormatting),
-            (("applet", "button", "marquee", "object"), self.endTagAppletButtonMarqueeObject),
-            ("br", self.endTagBr),
-            ])
-        self.endTagHandler.default = self.endTagOther
-
-    # helper
-    def addFormattingElement(self, token):
-        self.tree.insertElement(token)
-        self.tree.activeFormattingElements.append(
-            self.tree.openElements[-1])
-
-    # the real deal
-    def processEOF(self):
-        allowed_elements = frozenset(("dd", "dt", "li", "p", "tbody", "td",
-                                      "tfoot", "th", "thead", "tr", "body",
-                                      "html"))
-        for node in self.tree.openElements[::-1]:
-            if node.name not in allowed_elements:
-                self.parser.parseError("expected-closing-tag-but-got-eof")
-                break
-        #Stop parsing
-    
-    def processSpaceCharactersDropNewline(self, token):
-        # Sometimes (start of <pre>, <listing>, and <textarea> blocks) we
-        # want to drop leading newlines
-        data = token["data"]
-        self.processSpaceCharacters = self.processSpaceCharactersNonPre
-        if (data.startswith("\n") and
-            self.tree.openElements[-1].name in ("pre", "listing", "textarea")
-            and not self.tree.openElements[-1].hasContent()):
-            data = data[1:]
-        if data:
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertText(data)
-
-    def processCharacters(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.tree.insertText(token["data"])
-        self.parser.framesetOK = False
-
-    def processSpaceCharacters(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.tree.insertText(token["data"])
-
-    def startTagProcessInHead(self, token):
-        self.parser.phases["inHead"].processStartTag(token)
-
-    def startTagBody(self, token):
-        self.parser.parseError("unexpected-start-tag", {"name": "body"})
-        if (len(self.tree.openElements) == 1
-            or self.tree.openElements[1].name != "body"):
-            assert self.parser.innerHTML
-        else:
-            for attr, value in token["data"].iteritems():
-                if attr not in self.tree.openElements[1].attributes:
-                    self.tree.openElements[1].attributes[attr] = value
-
-    def startTagFrameset(self, token):
-        self.parser.parseError("unexpected-start-tag", {"name": "frameset"})
-        if (len(self.tree.openElements) == 1 or self.tree.openElements[1].name != "body"):
-            assert self.parser.innerHTML
-        elif not self.parser.framesetOK:
+    class InitialPhase(Phase):
+        def processSpaceCharacters(self, token):
             pass
-        else:
-            if self.tree.openElements[1].parent:
-                self.tree.openElements[1].parent.removeChild(self.tree.openElements[1])
-            while self.tree.openElements[-1].name != "html":
-                self.tree.openElements.pop()
+
+        def processComment(self, token):
+            self.tree.insertComment(token, self.tree.document)
+
+        def processDoctype(self, token):
+            name = token["name"]
+            publicId = token["publicId"]
+            systemId = token["systemId"]
+            correct = token["correct"]
+
+            if (name != "html" or publicId is not None or
+                    systemId is not None and systemId != "about:legacy-compat"):
+                self.parser.parseError("unknown-doctype")
+
+            if publicId is None:
+                publicId = ""
+
+            self.tree.insertDoctype(token)
+
+            if publicId != "":
+                publicId = publicId.translate(asciiUpper2Lower)
+
+            if (not correct or token["name"] != "html"
+                or publicId.startswith(
+                    ("+//silmaril//dtd html pro v0r11 19970101//",
+                     "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
+                     "-//as//dtd html 3.0 aswedit + extensions//",
+                     "-//ietf//dtd html 2.0 level 1//",
+                     "-//ietf//dtd html 2.0 level 2//",
+                     "-//ietf//dtd html 2.0 strict level 1//",
+                     "-//ietf//dtd html 2.0 strict level 2//",
+                     "-//ietf//dtd html 2.0 strict//",
+                     "-//ietf//dtd html 2.0//",
+                     "-//ietf//dtd html 2.1e//",
+                     "-//ietf//dtd html 3.0//",
+                     "-//ietf//dtd html 3.2 final//",
+                     "-//ietf//dtd html 3.2//",
+                     "-//ietf//dtd html 3//",
+                     "-//ietf//dtd html level 0//",
+                     "-//ietf//dtd html level 1//",
+                     "-//ietf//dtd html level 2//",
+                     "-//ietf//dtd html level 3//",
+                     "-//ietf//dtd html strict level 0//",
+                     "-//ietf//dtd html strict level 1//",
+                     "-//ietf//dtd html strict level 2//",
+                     "-//ietf//dtd html strict level 3//",
+                     "-//ietf//dtd html strict//",
+                     "-//ietf//dtd html//",
+                     "-//metrius//dtd metrius presentational//",
+                     "-//microsoft//dtd internet explorer 2.0 html strict//",
+                     "-//microsoft//dtd internet explorer 2.0 html//",
+                     "-//microsoft//dtd internet explorer 2.0 tables//",
+                     "-//microsoft//dtd internet explorer 3.0 html strict//",
+                     "-//microsoft//dtd internet explorer 3.0 html//",
+                     "-//microsoft//dtd internet explorer 3.0 tables//",
+                     "-//netscape comm. corp.//dtd html//",
+                     "-//netscape comm. corp.//dtd strict html//",
+                     "-//o'reilly and associates//dtd html 2.0//",
+                     "-//o'reilly and associates//dtd html extended 1.0//",
+                     "-//o'reilly and associates//dtd html extended relaxed 1.0//",
+                     "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
+                     "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
+                     "-//spyglass//dtd html 2.0 extended//",
+                     "-//sq//dtd html 2.0 hotmetal + extensions//",
+                     "-//sun microsystems corp.//dtd hotjava html//",
+                     "-//sun microsystems corp.//dtd hotjava strict html//",
+                     "-//w3c//dtd html 3 1995-03-24//",
+                     "-//w3c//dtd html 3.2 draft//",
+                     "-//w3c//dtd html 3.2 final//",
+                     "-//w3c//dtd html 3.2//",
+                     "-//w3c//dtd html 3.2s draft//",
+                     "-//w3c//dtd html 4.0 frameset//",
+                     "-//w3c//dtd html 4.0 transitional//",
+                     "-//w3c//dtd html experimental 19960712//",
+                     "-//w3c//dtd html experimental 970421//",
+                     "-//w3c//dtd w3 html//",
+                     "-//w3o//dtd w3 html 3.0//",
+                     "-//webtechs//dtd mozilla html 2.0//",
+                     "-//webtechs//dtd mozilla html//"))
+                or publicId in
+                    ("-//w3o//dtd w3 html strict 3.0//en//",
+                     "-/w3c/dtd html 4.0 transitional/en",
+                     "html")
+                or publicId.startswith(
+                    ("-//w3c//dtd html 4.01 frameset//",
+                     "-//w3c//dtd html 4.01 transitional//")) and
+                    systemId is None
+                    or systemId and systemId.lower() == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
+                self.parser.compatMode = "quirks"
+            elif (publicId.startswith(
+                    ("-//w3c//dtd xhtml 1.0 frameset//",
+                     "-//w3c//dtd xhtml 1.0 transitional//"))
+                  or publicId.startswith(
+                      ("-//w3c//dtd html 4.01 frameset//",
+                       "-//w3c//dtd html 4.01 transitional//")) and
+                  systemId is not None):
+                self.parser.compatMode = "limited quirks"
+
+            self.parser.phase = self.parser.phases["beforeHtml"]
+
+        def anythingElse(self):
+            self.parser.compatMode = "quirks"
+            self.parser.phase = self.parser.phases["beforeHtml"]
+
+        def processCharacters(self, token):
+            self.parser.parseError("expected-doctype-but-got-chars")
+            self.anythingElse()
+            return token
+
+        def processStartTag(self, token):
+            self.parser.parseError("expected-doctype-but-got-start-tag",
+                                   {"name": token["name"]})
+            self.anythingElse()
+            return token
+
+        def processEndTag(self, token):
+            self.parser.parseError("expected-doctype-but-got-end-tag",
+                                   {"name": token["name"]})
+            self.anythingElse()
+            return token
+
+        def processEOF(self):
+            self.parser.parseError("expected-doctype-but-got-eof")
+            self.anythingElse()
+            return True
+
+    class BeforeHtmlPhase(Phase):
+        # helper methods
+        def insertHtmlElement(self):
+            self.tree.insertRoot(impliedTagToken("html", "StartTag"))
+            self.parser.phase = self.parser.phases["beforeHead"]
+
+        # other
+        def processEOF(self):
+            self.insertHtmlElement()
+            return True
+
+        def processComment(self, token):
+            self.tree.insertComment(token, self.tree.document)
+
+        def processSpaceCharacters(self, token):
+            pass
+
+        def processCharacters(self, token):
+            self.insertHtmlElement()
+            return token
+
+        def processStartTag(self, token):
+            if token["name"] == "html":
+                self.parser.firstStartTag = True
+            self.insertHtmlElement()
+            return token
+
+        def processEndTag(self, token):
+            if token["name"] not in ("head", "body", "html", "br"):
+                self.parser.parseError("unexpected-end-tag-before-html",
+                                       {"name": token["name"]})
+            else:
+                self.insertHtmlElement()
+                return token
+
+    class BeforeHeadPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("head", self.startTagHead)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("head", "body", "html", "br"), self.endTagImplyHead)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        def processEOF(self):
+            self.startTagHead(impliedTagToken("head", "StartTag"))
+            return True
+
+        def processSpaceCharacters(self, token):
+            pass
+
+        def processCharacters(self, token):
+            self.startTagHead(impliedTagToken("head", "StartTag"))
+            return token
+
+        def startTagHtml(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def startTagHead(self, token):
+            self.tree.insertElement(token)
+            self.tree.headPointer = self.tree.openElements[-1]
+            self.parser.phase = self.parser.phases["inHead"]
+
+        def startTagOther(self, token):
+            self.startTagHead(impliedTagToken("head", "StartTag"))
+            return token
+
+        def endTagImplyHead(self, token):
+            self.startTagHead(impliedTagToken("head", "StartTag"))
+            return token
+
+        def endTagOther(self, token):
+            self.parser.parseError("end-tag-after-implied-root",
+                                   {"name": token["name"]})
+
+    class InHeadPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("title", self.startTagTitle),
+                (("noscript", "noframes", "style"), self.startTagNoScriptNoFramesStyle),
+                ("script", self.startTagScript),
+                (("base", "basefont", "bgsound", "command", "link"),
+                 self.startTagBaseLinkCommand),
+                ("meta", self.startTagMeta),
+                ("head", self.startTagHead)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self. endTagHandler = utils.MethodDispatcher([
+                ("head", self.endTagHead),
+                (("br", "html", "body"), self.endTagHtmlBodyBr)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        # the real thing
+        def processEOF(self):
+            self.anythingElse()
+            return True
+
+        def processCharacters(self, token):
+            self.anythingElse()
+            return token
+
+        def startTagHtml(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def startTagHead(self, token):
+            self.parser.parseError("two-heads-are-not-better-than-one")
+
+        def startTagBaseLinkCommand(self, token):
+            self.tree.insertElement(token)
+            self.tree.openElements.pop()
+            token["selfClosingAcknowledged"] = True
+
+        def startTagMeta(self, token):
+            self.tree.insertElement(token)
+            self.tree.openElements.pop()
+            token["selfClosingAcknowledged"] = True
+
+            attributes = token["data"]
+            if self.parser.tokenizer.stream.charEncoding[1] == "tentative":
+                if "charset" in attributes:
+                    self.parser.tokenizer.stream.changeEncoding(attributes["charset"])
+                elif ("content" in attributes and
+                      "http-equiv" in attributes and
+                      attributes["http-equiv"].lower() == "content-type"):
+                    # Encoding it as UTF-8 here is a hack, as really we should pass
+                    # the abstract Unicode string, and just use the
+                    # ContentAttrParser on that, but using UTF-8 allows all chars
+                    # to be encoded and as a ASCII-superset works.
+                    data = inputstream.EncodingBytes(attributes["content"].encode("utf-8"))
+                    parser = inputstream.ContentAttrParser(data)
+                    codec = parser.parse()
+                    self.parser.tokenizer.stream.changeEncoding(codec)
+
+        def startTagTitle(self, token):
+            self.parser.parseRCDataRawtext(token, "RCDATA")
+
+        def startTagNoScriptNoFramesStyle(self, token):
+            # Need to decide whether to implement the scripting-disabled case
+            self.parser.parseRCDataRawtext(token, "RAWTEXT")
+
+        def startTagScript(self, token):
+            self.tree.insertElement(token)
+            self.parser.tokenizer.state = self.parser.tokenizer.scriptDataState
+            self.parser.originalPhase = self.parser.phase
+            self.parser.phase = self.parser.phases["text"]
+
+        def startTagOther(self, token):
+            self.anythingElse()
+            return token
+
+        def endTagHead(self, token):
+            node = self.parser.tree.openElements.pop()
+            assert node.name == "head", "Expected head got %s" % node.name
+            self.parser.phase = self.parser.phases["afterHead"]
+
+        def endTagHtmlBodyBr(self, token):
+            self.anythingElse()
+            return token
+
+        def endTagOther(self, token):
+            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+
+        def anythingElse(self):
+            self.endTagHead(impliedTagToken("head"))
+
+    # XXX If we implement a parser for which scripting is disabled we need to
+    # implement this phase.
+    #
+    # class InHeadNoScriptPhase(Phase):
+    class AfterHeadPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("body", self.startTagBody),
+                ("frameset", self.startTagFrameset),
+                (("base", "basefont", "bgsound", "link", "meta", "noframes", "script",
+                  "style", "title"),
+                 self.startTagFromHead),
+                ("head", self.startTagHead)
+            ])
+            self.startTagHandler.default = self.startTagOther
+            self.endTagHandler = utils.MethodDispatcher([(("body", "html", "br"),
+                                                          self.endTagHtmlBodyBr)])
+            self.endTagHandler.default = self.endTagOther
+
+        def processEOF(self):
+            self.anythingElse()
+            return True
+
+        def processCharacters(self, token):
+            self.anythingElse()
+            return token
+
+        def startTagHtml(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def startTagBody(self, token):
+            self.parser.framesetOK = False
+            self.tree.insertElement(token)
+            self.parser.phase = self.parser.phases["inBody"]
+
+        def startTagFrameset(self, token):
             self.tree.insertElement(token)
             self.parser.phase = self.parser.phases["inFrameset"]
 
-    def startTagCloseP(self, token):
-        if self.tree.elementInScope("p"):
-            self.endTagP(impliedTagToken("p"))
-        self.tree.insertElement(token)
-    
-    def startTagPreListing(self, token):
-        if self.tree.elementInScope("p"):
-            self.endTagP(impliedTagToken("p"))
-        self.tree.insertElement(token)
-        self.parser.framesetOK = False
-        self.processSpaceCharacters = self.processSpaceCharactersDropNewline
+        def startTagFromHead(self, token):
+            self.parser.parseError("unexpected-start-tag-out-of-my-head",
+                                   {"name": token["name"]})
+            self.tree.openElements.append(self.tree.headPointer)
+            self.parser.phases["inHead"].processStartTag(token)
+            for node in self.tree.openElements[::-1]:
+                if node.name == "head":
+                    self.tree.openElements.remove(node)
+                    break
 
-    def startTagForm(self, token):
-        if self.tree.formPointer:
-            self.parser.parseError(u"unexpected-start-tag", {"name": "form"})
-        else:
-            if self.tree.elementInScope("p"):
-                self.endTagP("p")
-            self.tree.insertElement(token)
-            self.tree.formPointer = self.tree.openElements[-1]
-
-    def startTagListItem(self, token):
-        self.parser.framesetOK = False
-
-        stopNamesMap = {"li":["li"],
-                        "dt":["dt", "dd"],
-                        "dd":["dt", "dd"]}
-        stopNames = stopNamesMap[token["name"]]
-        for node in reversed(self.tree.openElements):
-            if node.name in stopNames:
-                self.parser.phase.processEndTag(
-                    impliedTagToken(node.name, "EndTag"))
-                break
-            if (node.nameTuple in (scopingElements | specialElements) and
-                node.name not in ("address", "div", "p")):
-                break
-            
-        if self.tree.elementInScope("p"):
-            self.parser.phase.processEndTag(
-                impliedTagToken("p", "EndTag"))
-
-        self.tree.insertElement(token)
-
-    def startTagPlaintext(self, token):
-        if self.tree.elementInScope("p"):
-            self.endTagP(impliedTagToken("p"))
-        self.tree.insertElement(token)
-        self.parser.tokenizer.state = self.parser.tokenizer.plaintextState
-
-    def startTagHeading(self, token):
-        if self.tree.elementInScope("p"):
-            self.endTagP(impliedTagToken("p"))
-        if self.tree.openElements[-1].name in headingElements:
+        def startTagHead(self, token):
             self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
-            self.tree.openElements.pop()
-        self.tree.insertElement(token)
 
-    def startTagA(self, token):
-        afeAElement = self.tree.elementInActiveFormattingElements("a")
-        if afeAElement:
-            self.parser.parseError("unexpected-start-tag-implies-end-tag",
-              {"startName": "a", "endName": "a"})
-            self.endTagFormatting(impliedTagToken("a"))
-            if afeAElement in self.tree.openElements:
-                self.tree.openElements.remove(afeAElement)
-            if afeAElement in self.tree.activeFormattingElements:
-                self.tree.activeFormattingElements.remove(afeAElement)
-        self.tree.reconstructActiveFormattingElements()
-        self.addFormattingElement(token)
+        def startTagOther(self, token):
+            self.anythingElse()
+            return token
 
-    def startTagFormatting(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.addFormattingElement(token)
+        def endTagHtmlBodyBr(self, token):
+            self.anythingElse()
+            return token
 
-    def startTagNobr(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        if self.tree.elementInScope("nobr"):
-            self.parser.parseError("unexpected-start-tag-implies-end-tag",
-              {"startName": "nobr", "endName": "nobr"})
-            self.processEndTag(impliedTagToken("nobr"))
-            # XXX Need tests that trigger the following
+        def endTagOther(self, token):
+            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+
+        def anythingElse(self):
+            self.tree.insertElement(impliedTagToken("body", "StartTag"))
+            self.parser.phase = self.parser.phases["inBody"]
+            self.parser.framesetOK = True
+
+    class InBodyPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#parsing-main-inbody
+        # the really-really-really-very crazy mode
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            # Keep a ref to this for special handling of whitespace in <pre>
+            self.processSpaceCharactersNonPre = self.processSpaceCharacters
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("base", "basefont", "bgsound", "command", "link", "meta",
+                  "noframes", "script", "style", "title"),
+                 self.startTagProcessInHead),
+                ("body", self.startTagBody),
+                ("frameset", self.startTagFrameset),
+                (("address", "article", "aside", "blockquote", "center", "details",
+                  "details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
+                  "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p",
+                  "section", "summary", "ul"),
+                 self.startTagCloseP),
+                (headingElements, self.startTagHeading),
+                (("pre", "listing"), self.startTagPreListing),
+                ("form", self.startTagForm),
+                (("li", "dd", "dt"), self.startTagListItem),
+                ("plaintext", self.startTagPlaintext),
+                ("a", self.startTagA),
+                (("b", "big", "code", "em", "font", "i", "s", "small", "strike",
+                  "strong", "tt", "u"), self.startTagFormatting),
+                ("nobr", self.startTagNobr),
+                ("button", self.startTagButton),
+                (("applet", "marquee", "object"), self.startTagAppletMarqueeObject),
+                ("xmp", self.startTagXmp),
+                ("table", self.startTagTable),
+                (("area", "br", "embed", "img", "keygen", "wbr"),
+                 self.startTagVoidFormatting),
+                (("param", "source", "track"), self.startTagParamSource),
+                ("input", self.startTagInput),
+                ("hr", self.startTagHr),
+                ("image", self.startTagImage),
+                ("isindex", self.startTagIsIndex),
+                ("textarea", self.startTagTextarea),
+                ("iframe", self.startTagIFrame),
+                (("noembed", "noframes", "noscript"), self.startTagRawtext),
+                ("select", self.startTagSelect),
+                (("rp", "rt"), self.startTagRpRt),
+                (("option", "optgroup"), self.startTagOpt),
+                (("math"), self.startTagMath),
+                (("svg"), self.startTagSvg),
+                (("caption", "col", "colgroup", "frame", "head",
+                  "tbody", "td", "tfoot", "th", "thead",
+                  "tr"), self.startTagMisplaced)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("body", self.endTagBody),
+                ("html", self.endTagHtml),
+                (("address", "article", "aside", "blockquote", "button", "center",
+                  "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure",
+                  "footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol", "pre",
+                  "section", "summary", "ul"), self.endTagBlock),
+                ("form", self.endTagForm),
+                ("p", self.endTagP),
+                (("dd", "dt", "li"), self.endTagListItem),
+                (headingElements, self.endTagHeading),
+                (("a", "b", "big", "code", "em", "font", "i", "nobr", "s", "small",
+                  "strike", "strong", "tt", "u"), self.endTagFormatting),
+                (("applet", "marquee", "object"), self.endTagAppletMarqueeObject),
+                ("br", self.endTagBr),
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        def isMatchingFormattingElement(self, node1, node2):
+            if node1.name != node2.name or node1.namespace != node2.namespace:
+                return False
+            elif len(node1.attributes) != len(node2.attributes):
+                return False
+            else:
+                attributes1 = sorted(node1.attributes.items())
+                attributes2 = sorted(node2.attributes.items())
+                for attr1, attr2 in zip(attributes1, attributes2):
+                    if attr1 != attr2:
+                        return False
+            return True
+
+        # helper
+        def addFormattingElement(self, token):
+            self.tree.insertElement(token)
+            element = self.tree.openElements[-1]
+
+            matchingElements = []
+            for node in self.tree.activeFormattingElements[::-1]:
+                if node is Marker:
+                    break
+                elif self.isMatchingFormattingElement(node, element):
+                    matchingElements.append(node)
+
+            assert len(matchingElements) <= 3
+            if len(matchingElements) == 3:
+                self.tree.activeFormattingElements.remove(matchingElements[-1])
+            self.tree.activeFormattingElements.append(element)
+
+        # the real deal
+        def processEOF(self):
+            allowed_elements = frozenset(("dd", "dt", "li", "p", "tbody", "td",
+                                          "tfoot", "th", "thead", "tr", "body",
+                                          "html"))
+            for node in self.tree.openElements[::-1]:
+                if node.name not in allowed_elements:
+                    self.parser.parseError("expected-closing-tag-but-got-eof")
+                    break
+            # Stop parsing
+
+        def processSpaceCharactersDropNewline(self, token):
+            # Sometimes (start of <pre>, <listing>, and <textarea> blocks) we
+            # want to drop leading newlines
+            data = token["data"]
+            self.processSpaceCharacters = self.processSpaceCharactersNonPre
+            if (data.startswith("\n") and
+                self.tree.openElements[-1].name in ("pre", "listing", "textarea")
+                    and not self.tree.openElements[-1].hasContent()):
+                data = data[1:]
+            if data:
+                self.tree.reconstructActiveFormattingElements()
+                self.tree.insertText(data)
+
+        def processCharacters(self, token):
+            if token["data"] == "\u0000":
+                # The tokenizer should always emit null on its own
+                return
             self.tree.reconstructActiveFormattingElements()
-        self.addFormattingElement(token)
+            self.tree.insertText(token["data"])
+            # This must be bad for performance
+            if (self.parser.framesetOK and
+                any([char not in spaceCharacters
+                     for char in token["data"]])):
+                self.parser.framesetOK = False
 
-    def startTagButton(self, token):
-        if self.tree.elementInScope("button"):
-            self.parser.parseError("unexpected-start-tag-implies-end-tag",
-              {"startName": "button", "endName": "button"})
-            self.processEndTag(impliedTagToken("button"))
-            self.parser.phase.processStartTag(token)
-        else:
+        def processSpaceCharacters(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            self.tree.insertText(token["data"])
+
+        def startTagProcessInHead(self, token):
+            return self.parser.phases["inHead"].processStartTag(token)
+
+        def startTagBody(self, token):
+            self.parser.parseError("unexpected-start-tag", {"name": "body"})
+            if (len(self.tree.openElements) == 1
+                    or self.tree.openElements[1].name != "body"):
+                assert self.parser.innerHTML
+            else:
+                self.parser.framesetOK = False
+                for attr, value in token["data"].items():
+                    if attr not in self.tree.openElements[1].attributes:
+                        self.tree.openElements[1].attributes[attr] = value
+
+        def startTagFrameset(self, token):
+            self.parser.parseError("unexpected-start-tag", {"name": "frameset"})
+            if (len(self.tree.openElements) == 1 or self.tree.openElements[1].name != "body"):
+                assert self.parser.innerHTML
+            elif not self.parser.framesetOK:
+                pass
+            else:
+                if self.tree.openElements[1].parent:
+                    self.tree.openElements[1].parent.removeChild(self.tree.openElements[1])
+                while self.tree.openElements[-1].name != "html":
+                    self.tree.openElements.pop()
+                self.tree.insertElement(token)
+                self.parser.phase = self.parser.phases["inFrameset"]
+
+        def startTagCloseP(self, token):
+            if self.tree.elementInScope("p", variant="button"):
+                self.endTagP(impliedTagToken("p"))
+            self.tree.insertElement(token)
+
+        def startTagPreListing(self, token):
+            if self.tree.elementInScope("p", variant="button"):
+                self.endTagP(impliedTagToken("p"))
+            self.tree.insertElement(token)
+            self.parser.framesetOK = False
+            self.processSpaceCharacters = self.processSpaceCharactersDropNewline
+
+        def startTagForm(self, token):
+            if self.tree.formPointer:
+                self.parser.parseError("unexpected-start-tag", {"name": "form"})
+            else:
+                if self.tree.elementInScope("p", variant="button"):
+                    self.endTagP(impliedTagToken("p"))
+                self.tree.insertElement(token)
+                self.tree.formPointer = self.tree.openElements[-1]
+
+        def startTagListItem(self, token):
+            self.parser.framesetOK = False
+
+            stopNamesMap = {"li": ["li"],
+                            "dt": ["dt", "dd"],
+                            "dd": ["dt", "dd"]}
+            stopNames = stopNamesMap[token["name"]]
+            for node in reversed(self.tree.openElements):
+                if node.name in stopNames:
+                    self.parser.phase.processEndTag(
+                        impliedTagToken(node.name, "EndTag"))
+                    break
+                if (node.nameTuple in specialElements and
+                        node.name not in ("address", "div", "p")):
+                    break
+
+            if self.tree.elementInScope("p", variant="button"):
+                self.parser.phase.processEndTag(
+                    impliedTagToken("p", "EndTag"))
+
+            self.tree.insertElement(token)
+
+        def startTagPlaintext(self, token):
+            if self.tree.elementInScope("p", variant="button"):
+                self.endTagP(impliedTagToken("p"))
+            self.tree.insertElement(token)
+            self.parser.tokenizer.state = self.parser.tokenizer.plaintextState
+
+        def startTagHeading(self, token):
+            if self.tree.elementInScope("p", variant="button"):
+                self.endTagP(impliedTagToken("p"))
+            if self.tree.openElements[-1].name in headingElements:
+                self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
+                self.tree.openElements.pop()
+            self.tree.insertElement(token)
+
+        def startTagA(self, token):
+            afeAElement = self.tree.elementInActiveFormattingElements("a")
+            if afeAElement:
+                self.parser.parseError("unexpected-start-tag-implies-end-tag",
+                                       {"startName": "a", "endName": "a"})
+                self.endTagFormatting(impliedTagToken("a"))
+                if afeAElement in self.tree.openElements:
+                    self.tree.openElements.remove(afeAElement)
+                if afeAElement in self.tree.activeFormattingElements:
+                    self.tree.activeFormattingElements.remove(afeAElement)
+            self.tree.reconstructActiveFormattingElements()
+            self.addFormattingElement(token)
+
+        def startTagFormatting(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            self.addFormattingElement(token)
+
+        def startTagNobr(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            if self.tree.elementInScope("nobr"):
+                self.parser.parseError("unexpected-start-tag-implies-end-tag",
+                                       {"startName": "nobr", "endName": "nobr"})
+                self.processEndTag(impliedTagToken("nobr"))
+                # XXX Need tests that trigger the following
+                self.tree.reconstructActiveFormattingElements()
+            self.addFormattingElement(token)
+
+        def startTagButton(self, token):
+            if self.tree.elementInScope("button"):
+                self.parser.parseError("unexpected-start-tag-implies-end-tag",
+                                       {"startName": "button", "endName": "button"})
+                self.processEndTag(impliedTagToken("button"))
+                return token
+            else:
+                self.tree.reconstructActiveFormattingElements()
+                self.tree.insertElement(token)
+                self.parser.framesetOK = False
+
+        def startTagAppletMarqueeObject(self, token):
             self.tree.reconstructActiveFormattingElements()
             self.tree.insertElement(token)
             self.tree.activeFormattingElements.append(Marker)
             self.parser.framesetOK = False
 
-    def startTagAppletMarqueeObject(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.tree.insertElement(token)
-        self.tree.activeFormattingElements.append(Marker)
-        self.parser.framesetOK = False
+        def startTagXmp(self, token):
+            if self.tree.elementInScope("p", variant="button"):
+                self.endTagP(impliedTagToken("p"))
+            self.tree.reconstructActiveFormattingElements()
+            self.parser.framesetOK = False
+            self.parser.parseRCDataRawtext(token, "RAWTEXT")
 
-    def startTagXmp(self, token):
-        if self.tree.elementInScope("p"):
-            self.endTagP(impliedTagToken("p"))
-        self.tree.reconstructActiveFormattingElements()
-        self.parser.framesetOK = False
-        self.parser.parseRCDataRawtext(token, "RAWTEXT")
-
-    def startTagTable(self, token):
-        if self.parser.compatMode != "quirks":
-            if self.tree.elementInScope("p"):
-                self.processEndTag(impliedTagToken("p"))
-        self.tree.insertElement(token)
-        self.parser.framesetOK = False
-        self.parser.phase = self.parser.phases["inTable"]
-
-    def startTagVoidFormatting(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
-        token["selfClosingAcknowledged"] = True
-        self.parser.framesetOK = False
-
-    def startTagParamSource(self, token):
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
-        token["selfClosingAcknowledged"] = True
-
-    def startTagHr(self, token):
-        if self.tree.elementInScope("p"):
-            self.endTagP(impliedTagToken("p"))
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
-        token["selfClosingAcknowledged"] = True
-        self.parser.framesetOK = False
-
-    def startTagImage(self, token):
-        # No really...
-        self.parser.parseError("unexpected-start-tag-treated-as",
-          {"originalName": "image", "newName": "img"})
-        self.processStartTag(impliedTagToken("img", "StartTag",
-                                             attributes=token["data"],
-                                             selfClosing=token["selfClosing"]))
-
-    def startTagIsIndex(self, token):
-        self.parser.parseError("deprecated-tag", {"name": "isindex"})
-        if self.tree.formPointer:
-            return
-        form_attrs = {}
-        if "action" in token["data"]:
-            form_attrs["action"] = token["data"]["action"]
-        self.processStartTag(impliedTagToken("form", "StartTag",
-                                             attributes=form_attrs))
-        self.processStartTag(impliedTagToken("hr", "StartTag"))
-        self.processStartTag(impliedTagToken("label", "StartTag"))
-        # XXX Localization ...
-        if "prompt" in token["data"]:
-            prompt = token["data"]["prompt"]
-        else:
-            prompt = "This is a searchable index. Insert your search keywords here: "
-        self.processCharacters(
-            {"type":tokenTypes["Characters"], "data":prompt})
-        attributes = token["data"].copy()
-        if "action" in attributes:
-            del attributes["action"]
-        if "prompt" in attributes:
-            del attributes["prompt"]
-        attributes["name"] = "isindex"
-        self.processStartTag(impliedTagToken("input", "StartTag", 
-                                             attributes = attributes,
-                                             selfClosing = 
-                                             token["selfClosing"]))
-        self.processEndTag(impliedTagToken("label"))
-        self.processStartTag(impliedTagToken("hr", "StartTag"))
-        self.processEndTag(impliedTagToken("form"))
-
-    def startTagTextarea(self, token):
-        self.tree.insertElement(token)
-        self.parser.tokenizer.state = self.parser.tokenizer.rcdataState
-        self.processSpaceCharacters = self.processSpaceCharactersDropNewline
-        self.parser.framesetOK = False
-
-    def startTagIFrame(self, token):
-        self.parser.framesetOK = False
-        self.startTagRawtext(token)
-
-    def startTagRawtext(self, token):
-        """iframe, noembed noframes, noscript(if scripting enabled)"""
-        self.parser.parseRCDataRawtext(token, "RAWTEXT")
-
-    def startTagOpt(self, token):
-        if self.tree.elementInScope("option"):
-            self.parser.phase.processEndTag(impliedTagToken("option"))
-        self.tree.reconstructActiveFormattingElements()
-        self.parser.tree.insertElement(token)
-
-    def startTagSelect(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.tree.insertElement(token)
-        self.parser.framesetOK = False
-        if self.parser.phase in (self.parser.phases["inTable"],
-                                 self.parser.phases["inCaption"],
-                                 self.parser.phases["inColumnGroup"],
-                                 self.parser.phases["inTableBody"], 
-                                 self.parser.phases["inRow"],
-                                 self.parser.phases["inCell"]):
-            self.parser.phase = self.parser.phases["inSelectInTable"]
-        else:
-            self.parser.phase = self.parser.phases["inSelect"]
-
-    def startTagRpRt(self, token):
-        if self.tree.elementInScope("ruby"):
-            self.tree.generateImpliedEndTags()
-            if self.tree.openElements[-1].name != "ruby":
-                self.parser.parseError()
-                while self.tree.openElements[-1].name != "ruby":
-                    self.tree.openElements.pop()
-        self.tree.insertElement(token)
-
-    def startTagMath(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.parser.adjustMathMLAttributes(token)
-        self.parser.adjustForeignAttributes(token)
-        token["namespace"] = namespaces["mathml"]
-        self.tree.insertElement(token)
-        #Need to get the parse error right for the case where the token 
-        #has a namespace not equal to the xmlns attribute
-        if self.parser.phase != self.parser.phases["inForeignContent"]:
-            self.parser.secondaryPhase = self.parser.phase
-        self.parser.phase = self.parser.phases["inForeignContent"]
-        if token["selfClosing"]:
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-
-    def startTagSvg(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.parser.adjustSVGAttributes(token)
-        self.parser.adjustForeignAttributes(token)
-        token["namespace"] = namespaces["svg"]
-        self.tree.insertElement(token)
-        #Need to get the parse error right for the case where the token 
-        #has a namespace not equal to the xmlns attribute
-        if self.parser.phase != self.parser.phases["inForeignContent"]:
-            self.parser.secondaryPhase = self.parser.phase
-        self.parser.phase = self.parser.phases["inForeignContent"]
-        if token["selfClosing"]:
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-
-    def startTagMisplaced(self, token):
-        """ Elements that should be children of other elements that have a
-        different insertion mode; here they are ignored
-        "caption", "col", "colgroup", "frame", "frameset", "head",
-        "option", "optgroup", "tbody", "td", "tfoot", "th", "thead",
-        "tr", "noscript"
-        """
-        self.parser.parseError("unexpected-start-tag-ignored", {"name": token["name"]})
-
-    def startTagOther(self, token):
-        self.tree.reconstructActiveFormattingElements()
-        self.tree.insertElement(token)
-
-    def endTagP(self, token):
-        if not self.tree.elementInScope("p"):
-            self.startTagCloseP(impliedTagToken("p", "StartTag"))
-            self.parser.parseError("unexpected-end-tag", {"name": "p"})
-            self.endTagP(impliedTagToken("p", "EndTag"))
-        else:
-            self.tree.generateImpliedEndTags("p")
-            if self.tree.openElements[-1].name != "p":
-                self.parser.parseError("unexpected-end-tag", {"name": "p"})
-            node = self.tree.openElements.pop()
-            while node.name != "p":
-                node = self.tree.openElements.pop()
-
-    def endTagBody(self, token):
-        if not self.tree.elementInScope("body"):
-            self.parser.parseError()
-            return
-        elif self.tree.openElements[-1].name != "body":
-            for node in self.tree.openElements[2:]:
-                if node.name not in frozenset(("dd", "dt", "li", "optgroup",
-                                               "option", "p", "rp", "rt",
-                                               "tbody", "td", "tfoot",
-                                               "th", "thead", "tr", "body",
-                                               "html")):
-                    #Not sure this is the correct name for the parse error
-                    self.parser.parseError(
-                        "expected-one-end-tag-but-got-another",
-                        {"expectedName": "body", "gotName": node.name})
-                    break
-        self.parser.phase = self.parser.phases["afterBody"]
-
-    def endTagHtml(self, token):
-        #We repeat the test for the body end tag token being ignored here
-        if self.tree.elementInScope("body"):
-            self.endTagBody(impliedTagToken("body"))
-            self.parser.phase.processEndTag(token)
-
-    def endTagBlock(self, token):
-        #Put us back in the right whitespace handling mode
-        if token["name"] == "pre":
-            self.processSpaceCharacters = self.processSpaceCharactersNonPre
-        inScope = self.tree.elementInScope(token["name"])
-        if inScope:
-            self.tree.generateImpliedEndTags()
-        if self.tree.openElements[-1].name != token["name"]:
-             self.parser.parseError("end-tag-too-early", {"name": token["name"]})
-        if inScope:
-            node = self.tree.openElements.pop()
-            while node.name != token["name"]:
-                node = self.tree.openElements.pop()
-
-    def endTagForm(self, token):
-        node = self.tree.formPointer
-        self.tree.formPointer = None
-        if node is None or not self.tree.elementInScope(node):
-            self.parser.parseError("unexpected-end-tag",
-                                   {"name":"form"})
-        else:
-            self.tree.generateImpliedEndTags()
-            if self.tree.openElements[-1].name != node:
-                self.parser.parseError("end-tag-too-early-ignored",
-                                       {"name": "form"})
-                self.tree.openElements.remove(node)
-
-    def endTagListItem(self, token):
-        if token["name"] == "li":
-            variant = "list"
-        else:
-            variant = None
-        if not self.tree.elementInScope(token["name"], variant=variant):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-        else:
-            self.tree.generateImpliedEndTags(exclude = token["name"])
-            if self.tree.openElements[-1].name != token["name"]:
-                self.parser.parseError(
-                    "end-tag-too-early",
-                    {"name": token["name"]})
-            node = self.tree.openElements.pop()
-            while node.name != token["name"]:
-                node = self.tree.openElements.pop()
-
-    def endTagHeading(self, token):
-        for item in headingElements:
-            if self.tree.elementInScope(item):
-                self.tree.generateImpliedEndTags()
-                break
-        if self.tree.openElements[-1].name != token["name"]:
-            self.parser.parseError("end-tag-too-early", {"name": token["name"]})
-
-        for item in headingElements:
-            if self.tree.elementInScope(item):
-                item = self.tree.openElements.pop()
-                while item.name not in headingElements:
-                    item = self.tree.openElements.pop()
-                break
-
-    def endTagFormatting(self, token):
-        """The much-feared adoption agency algorithm"""
-        # http://www.whatwg.org/specs/web-apps/current-work/#adoptionAgency
-        # XXX Better parseError messages appreciated.
-        name = token["name"]
-        while True:
-            # Step 1 paragraph 1
-            formattingElement = self.tree.elementInActiveFormattingElements(
-                token["name"])
-            if not formattingElement or (formattingElement in 
-                                        self.tree.openElements and
-                                        not self.tree.elementInScope(
-                    formattingElement.name)):
-                self.parser.parseError("adoption-agency-1.1", {"name": token["name"]})
-                return
-
-            # Step 1 paragraph 2
-            elif formattingElement not in self.tree.openElements:
-                self.parser.parseError("adoption-agency-1.2", {"name": token["name"]})
-                self.tree.activeFormattingElements.remove(formattingElement)
-                return
-
-            # Step 1 paragraph 3
-            if formattingElement != self.tree.openElements[-1]:
-                self.parser.parseError("adoption-agency-1.3", {"name": token["name"]})
-
-            # Step 2
-            # Start of the adoption agency algorithm proper
-            afeIndex = self.tree.openElements.index(formattingElement)
-            furthestBlock = None
-            for element in self.tree.openElements[afeIndex:]:
-                if (element.nameTuple in
-                    specialElements | scopingElements):
-                    furthestBlock = element
-                    break
-
-            # Step 3
-            if furthestBlock is None:
-                element = self.tree.openElements.pop()
-                while element != formattingElement:
-                    element = self.tree.openElements.pop()
-                self.tree.activeFormattingElements.remove(element)
-                return
-            commonAncestor = self.tree.openElements[afeIndex-1]
-
-            # Step 5
-            #if furthestBlock.parent:
-            #    furthestBlock.parent.removeChild(furthestBlock)
-
-            # Step 5
-            # The bookmark is supposed to help us identify where to reinsert
-            # nodes in step 12. We have to ensure that we reinsert nodes after
-            # the node before the active formatting element. Note the bookmark
-            # can move in step 7.4
-            bookmark = self.tree.activeFormattingElements.index(formattingElement)
-
-            # Step 6
-            lastNode = node = furthestBlock
-            while True:
-                # AT replace this with a function and recursion?
-                # Node is element before node in open elements
-                node = self.tree.openElements[
-                    self.tree.openElements.index(node)-1]
-                while node not in self.tree.activeFormattingElements:
-                    tmpNode = node
-                    node = self.tree.openElements[
-                        self.tree.openElements.index(node)-1]
-                    self.tree.openElements.remove(tmpNode)
-                # Step 6.3
-                if node == formattingElement:
-                    break
-                # Step 6.4
-                if lastNode == furthestBlock:
-                    bookmark = (self.tree.activeFormattingElements.index(node)
-                                + 1)
-                # Step 6.5
-                #cite = node.parent
-                #if node.hasContent():
-                clone = node.cloneNode()
-                # Replace node with clone
-                self.tree.activeFormattingElements[
-                    self.tree.activeFormattingElements.index(node)] = clone
-                self.tree.openElements[
-                    self.tree.openElements.index(node)] = clone
-                node = clone
-                
-                # Step 6.6
-                # Remove lastNode from its parents, if any
-                if lastNode.parent:
-                    lastNode.parent.removeChild(lastNode)
-                node.appendChild(lastNode)
-                # Step 7.7
-                lastNode = node
-                # End of inner loop 
-
-            # Step 7
-            # Foster parent lastNode if commonAncestor is a
-            # table, tbody, tfoot, thead, or tr we need to foster parent the 
-            # lastNode
-            if lastNode.parent:
-                lastNode.parent.removeChild(lastNode)
-            commonAncestor.appendChild(lastNode)
-
-            # Step 8
-            clone = formattingElement.cloneNode()
-
-            # Step 9
-            furthestBlock.reparentChildren(clone)
-
-            # Step 10
-            furthestBlock.appendChild(clone)
-
-            # Step 11
-            self.tree.activeFormattingElements.remove(formattingElement)
-            self.tree.activeFormattingElements.insert(bookmark, clone)
-
-            # Step 12
-            self.tree.openElements.remove(formattingElement)
-            self.tree.openElements.insert(
-              self.tree.openElements.index(furthestBlock) + 1, clone)
-
-    def endTagAppletButtonMarqueeObject(self, token):
-        if self.tree.elementInScope(token["name"]):
-            self.tree.generateImpliedEndTags()
-        if self.tree.openElements[-1].name != token["name"]:
-            self.parser.parseError("end-tag-too-early", {"name": token["name"]})
-
-        if self.tree.elementInScope(token["name"]):
-            element = self.tree.openElements.pop()
-            while element.name != token["name"]:
-                element = self.tree.openElements.pop()
-            self.tree.clearActiveFormattingElements()
-
-    def endTagBr(self, token):
-        self.parser.parseError("unexpected-end-tag-treated-as",
-          {"originalName": "br", "newName": "br element"})
-        self.tree.reconstructActiveFormattingElements()
-        self.tree.insertElement(impliedTagToken("br", "StartTag"))
-        self.tree.openElements.pop()
-
-    def endTagOther(self, token):
-        for node in self.tree.openElements[::-1]:
-            if node.name == token["name"]:
-                self.tree.generateImpliedEndTags()
-                if self.tree.openElements[-1].name != token["name"]:
-                    self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-                while self.tree.openElements.pop() != node:
-                    pass
-                break
-            else:
-                if (node.nameTuple in
-                    specialElements | scopingElements):
-                    self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-                    break
-
-class TextPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-        self.startTagHandler = utils.MethodDispatcher([])
-        self.startTagHandler.default = self.startTagOther
-        self.endTagHandler = utils.MethodDispatcher([
-                ("script", self.endTagScript)])
-        self.endTagHandler.default = self.endTagOther
-
-    def processCharacters(self, token):
-        self.tree.insertText(token["data"])
-    
-    def processEOF(self):
-        self.parser.parseError("expected-named-closing-tag-but-got-eof", 
-                               self.tree.openElements[-1].name)
-        self.tree.openElements.pop()
-        self.parser.phase = self.parser.originalPhase
-        self.parser.phase.processEOF()
-
-    def startTagOther(self, token):
-        assert False, "Tried to process start tag %s in RCDATA/RAWTEXT mode"%name
-
-    def endTagScript(self, token):
-        node = self.tree.openElements.pop()
-        assert node.name == "script"
-        self.parser.phase = self.parser.originalPhase
-        #The rest of this method is all stuff that only happens if
-        #document.write works
-    
-    def endTagOther(self, token):
-        node = self.tree.openElements.pop()
-        self.parser.phase = self.parser.originalPhase
-
-class InTablePhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-table
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("caption", self.startTagCaption),
-            ("colgroup", self.startTagColgroup),
-            ("col", self.startTagCol),
-            (("tbody", "tfoot", "thead"), self.startTagRowGroup),
-            (("td", "th", "tr"), self.startTagImplyTbody),
-            ("table", self.startTagTable),
-            (("style", "script"), self.startTagStyleScript),
-            ("input", self.startTagInput),
-            ("form", self.startTagForm)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            ("table", self.endTagTable),
-            (("body", "caption", "col", "colgroup", "html", "tbody", "td",
-              "tfoot", "th", "thead", "tr"), self.endTagIgnore)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    # helper methods
-    def clearStackToTableContext(self):
-        # "clear the stack back to a table context"
-        while self.tree.openElements[-1].name not in ("table", "html"):
-            #self.parser.parseError("unexpected-implied-end-tag-in-table",
-            #  {"name":  self.tree.openElements[-1].name})
-            self.tree.openElements.pop()
-        # When the current node is <html> it's an innerHTML case
-
-    def getCurrentTable(self):
-        i = -1
-        while -i <= len(self.tree.openElements) and self.tree.openElements[i].name != "table":
-             i -= 1
-        if -i > len(self.tree.openElements):
-            return self.tree.openElements[0]
-        else:
-            return self.tree.openElements[i]
-
-    # processing methods
-    def processEOF(self):
-        if self.tree.openElements[-1].name != "html":
-            self.parser.parseError("eof-in-table")
-        else:
-            assert self.parser.innerHTML
-        #Stop parsing
-
-    def processSpaceCharacters(self, token):
-        originalPhase = self.parser.phase
-        self.parser.phase = self.parser.phases["inTableText"]
-        self.parser.phase.originalPhase = originalPhase
-        self.parser.phase.characterTokens.append(token)
-
-    def processCharacters(self, token):
-        #If we get here there must be at least one non-whitespace character
-        # Do the table magic!
-        self.tree.insertFromTable = True
-        self.parser.phases["inBody"].processCharacters(token)
-        self.tree.insertFromTable = False
-
-    def startTagCaption(self, token):
-        self.clearStackToTableContext()
-        self.tree.activeFormattingElements.append(Marker)
-        self.tree.insertElement(token)
-        self.parser.phase = self.parser.phases["inCaption"]
-
-    def startTagColgroup(self, token):
-        self.clearStackToTableContext()
-        self.tree.insertElement(token)
-        self.parser.phase = self.parser.phases["inColumnGroup"]
-
-    def startTagCol(self, token):
-        self.startTagColgroup(impliedTagToken("colgroup", "StartTag"))
-        self.parser.phase.processStartTag(token)
-
-    def startTagRowGroup(self, token):
-        self.clearStackToTableContext()
-        self.tree.insertElement(token)
-        self.parser.phase = self.parser.phases["inTableBody"]
-
-    def startTagImplyTbody(self, token):
-        self.startTagRowGroup(impliedTagToken("tbody", "StartTag"))
-        self.parser.phase.processStartTag(token)
-
-    def startTagTable(self, token):
-        self.parser.parseError("unexpected-start-tag-implies-end-tag",
-          {"startName": "table", "endName": "table"})
-        self.parser.phase.processEndTag(impliedTagToken("table"))
-        if not self.parser.innerHTML:
-            self.parser.phase.processStartTag(token)
-
-    def startTagStyleScript(self, token):
-        self.parser.phases["inHead"].processStartTag(token)
-
-    def startTagInput(self, token):
-        if ("type" in token["data"] and 
-            token["data"]["type"].translate(asciiUpper2Lower) == "hidden"):
-            self.parser.parseError("unexpected-hidden-input-in-table")
+        def startTagTable(self, token):
+            if self.parser.compatMode != "quirks":
+                if self.tree.elementInScope("p", variant="button"):
+                    self.processEndTag(impliedTagToken("p"))
             self.tree.insertElement(token)
-            # XXX associate with form
-            self.tree.openElements.pop()
-        else:
-            self.startTagOther(token)
-
-    def startTagForm(self, token):
-        self.parser.parseError("unexpected-form-in-table")
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
-
-    def startTagOther(self, token):
-        self.parser.parseError("unexpected-start-tag-implies-table-voodoo", {"name": token["name"]})
-        if "tainted" not in self.getCurrentTable()._flags:
-            self.getCurrentTable()._flags.append("tainted")
-        # Do the table magic!
-        self.tree.insertFromTable = True
-        self.parser.phases["inBody"].processStartTag(token)
-        self.tree.insertFromTable = False
-
-    def endTagTable(self, token):
-        if self.tree.elementInScope("table", variant="table"):
-            self.tree.generateImpliedEndTags()
-            if self.tree.openElements[-1].name != "table":
-                self.parser.parseError("end-tag-too-early-named",
-                  {"gotName": "table",
-                   "expectedName": self.tree.openElements[-1].name})
-            while self.tree.openElements[-1].name != "table":
-                self.tree.openElements.pop()
-            self.tree.openElements.pop()
-            self.parser.resetInsertionMode()
-        else:
-            # innerHTML case
-            assert self.parser.innerHTML
-            self.parser.parseError()
-
-    def endTagIgnore(self, token):
-        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-    def endTagOther(self, token):
-        self.parser.parseError("unexpected-end-tag-implies-table-voodoo", {"name": token["name"]})
-        if "tainted" not in self.getCurrentTable()._flags:
-            self.getCurrentTable()._flags.append("tainted")
-        # Do the table magic!
-        self.tree.insertFromTable = True
-        self.parser.phases["inBody"].processEndTag(token)
-        self.tree.insertFromTable = False
-
-class InTableTextPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-        self.originalPhase = None
-        self.characterTokens = []
-
-    def flushCharacters(self):
-        data = "".join([item["data"] for item in self.characterTokens])
-        if any([item not in spaceCharacters for item in data]):
-            token = {"type":tokenTypes["Characters"], "data":data}
-            self.originalPhase.processCharacters(token)
-        elif data:
-            self.tree.insertText(data)
-        self.characterTokens = []
-
-    def processComment(self, token):
-        self.flushCharacters()
-        self.phase = self.originalPhase
-        self.phase.processComment(token)
-
-    def processEOF(self):
-        self.flushCharacters()
-        self.phase = self.originalPhase
-        self.phase.processEOF()
-
-    def processCharacters(self, token):
-        self.characterTokens.append(token)
-
-    def processSpaceCharacters(self, token):
-        #pretty sure we should never reach here
-        self.characterTokens.append(token)
-#        assert False
-
-    def processStartTag(self, token):        
-        self.flushCharacters()
-        self.phase = self.originalPhase
-        self.phase.processStartTag(token)
-
-    def processEndTag(self, token):
-        self.flushCharacters()
-        self.phase = self.originalPhase
-        self.phase.processEndTag(token)
-    
-
-class InCaptionPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-caption
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), self.startTagTableElement)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            ("caption", self.endTagCaption),
-            ("table", self.endTagTable),
-            (("body", "col", "colgroup", "html", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), self.endTagIgnore)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    def ignoreEndTagCaption(self):
-        return not self.tree.elementInScope("caption", variant="table")
-
-    def processEOF(self):
-        self.parser.phases["inBody"].processEOF()
-
-    def processCharacters(self, token):
-        self.parser.phases["inBody"].processCharacters(token)
-
-    def startTagTableElement(self, token):
-        self.parser.parseError()
-        #XXX Have to duplicate logic here to find out if the tag is ignored
-        ignoreEndTag = self.ignoreEndTagCaption()
-        self.parser.phase.processEndTag(impliedTagToken("caption"))
-        if not ignoreEndTag:
-            self.parser.phase.processStartTag(token)
-
-    def startTagOther(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
-
-    def endTagCaption(self, token):
-        if not self.ignoreEndTagCaption():
-            # AT this code is quite similar to endTagTable in "InTable"
-            self.tree.generateImpliedEndTags()
-            if self.tree.openElements[-1].name != "caption":
-                self.parser.parseError("expected-one-end-tag-but-got-another",
-                  {"gotName": "caption",
-                   "expectedName": self.tree.openElements[-1].name})
-            while self.tree.openElements[-1].name != "caption":
-                self.tree.openElements.pop()
-            self.tree.openElements.pop()
-            self.tree.clearActiveFormattingElements()
-            self.parser.phase = self.parser.phases["inTable"]
-        else:
-            # innerHTML case
-            assert self.parser.innerHTML
-            self.parser.parseError()
-
-    def endTagTable(self, token):
-        self.parser.parseError()
-        ignoreEndTag = self.ignoreEndTagCaption()
-        self.parser.phase.processEndTag(impliedTagToken("caption"))
-        if not ignoreEndTag:
-            self.parser.phase.processEndTag(token)
-
-    def endTagIgnore(self, token):
-        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-    def endTagOther(self, token):
-        self.parser.phases["inBody"].processEndTag(token)
-
-
-class InColumnGroupPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-column
-
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("col", self.startTagCol)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            ("colgroup", self.endTagColgroup),
-            ("col", self.endTagCol)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    def ignoreEndTagColgroup(self):
-        return self.tree.openElements[-1].name == "html"
-
-    def processEOF(self):
-        if self.tree.openElements[-1].name == "html":
-            assert self.parser.innerHTML
-            return
-        else:
-            ignoreEndTag = self.ignoreEndTagColgroup()
-            self.endTagColgroup("colgroup")
-            if not ignoreEndTag:
-                self.parser.phase.processEOF()
-
-    def processCharacters(self, token):
-        ignoreEndTag = self.ignoreEndTagColgroup()
-        self.endTagColgroup(impliedTagToken("colgroup"))
-        if not ignoreEndTag:
-            self.parser.phase.processCharacters(token)
-
-    def startTagCol(self, token):
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
-
-    def startTagOther(self, token):
-        ignoreEndTag = self.ignoreEndTagColgroup()
-        self.endTagColgroup("colgroup")
-        if not ignoreEndTag:
-            self.parser.phase.processStartTag(token)
-
-    def endTagColgroup(self, token):
-        if self.ignoreEndTagColgroup():
-            # innerHTML case
-            assert self.parser.innerHTML
-            self.parser.parseError()
-        else:
-            self.tree.openElements.pop()
+            self.parser.framesetOK = False
             self.parser.phase = self.parser.phases["inTable"]
 
-    def endTagCol(self, token):
-        self.parser.parseError("no-end-tag", {"name": "col"})
-
-    def endTagOther(self, token):
-        ignoreEndTag = self.ignoreEndTagColgroup()
-        self.endTagColgroup("colgroup")
-        if not ignoreEndTag:
-            self.parser.phase.processEndTag(token)
-
-
-class InTableBodyPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-table0
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("tr", self.startTagTr),
-            (("td", "th"), self.startTagTableCell),
-            (("caption", "col", "colgroup", "tbody", "tfoot", "thead"),
-             self.startTagTableOther)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            (("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
-            ("table", self.endTagTable),
-            (("body", "caption", "col", "colgroup", "html", "td", "th",
-              "tr"), self.endTagIgnore)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    # helper methods
-    def clearStackToTableBodyContext(self):
-        while self.tree.openElements[-1].name not in ("tbody", "tfoot",
-          "thead", "html"):
-            #self.parser.parseError("unexpected-implied-end-tag-in-table",
-            #  {"name": self.tree.openElements[-1].name})
+        def startTagVoidFormatting(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            self.tree.insertElement(token)
             self.tree.openElements.pop()
-        if self.tree.openElements[-1].name == "html":
-            assert self.parser.innerHTML
+            token["selfClosingAcknowledged"] = True
+            self.parser.framesetOK = False
 
-    # the rest
-    def processEOF(self):
-        self.parser.phases["inTable"].processEOF()
-    
-    def processSpaceCharacters(self, token):
-        self.parser.phases["inTable"].processSpaceCharacters(token)
+        def startTagInput(self, token):
+            framesetOK = self.parser.framesetOK
+            self.startTagVoidFormatting(token)
+            if ("type" in token["data"] and
+                    token["data"]["type"].translate(asciiUpper2Lower) == "hidden"):
+                # input type=hidden doesn't change framesetOK
+                self.parser.framesetOK = framesetOK
 
-    def processCharacters(self, token):
-        self.parser.phases["inTable"].processCharacters(token)
-
-    def startTagTr(self, token):
-        self.clearStackToTableBodyContext()
-        self.tree.insertElement(token)
-        self.parser.phase = self.parser.phases["inRow"]
-
-    def startTagTableCell(self, token):
-        self.parser.parseError("unexpected-cell-in-table-body", 
-                               {"name": token["name"]})
-        self.startTagTr(impliedTagToken("tr", "StartTag"))
-        self.parser.phase.processStartTag(token)
-
-    def startTagTableOther(self, token):
-        # XXX AT Any ideas on how to share this with endTagTable?
-        if (self.tree.elementInScope("tbody", variant="table") or
-            self.tree.elementInScope("thead", variant="table") or
-            self.tree.elementInScope("tfoot", variant="table")):
-            self.clearStackToTableBodyContext()
-            self.endTagTableRowGroup(
-                impliedTagToken(self.tree.openElements[-1].name))
-            self.parser.phase.processStartTag(token)
-        else:
-            # innerHTML case
-            self.parser.parseError()
-
-    def startTagOther(self, token):
-        self.parser.phases["inTable"].processStartTag(token)
-
-    def endTagTableRowGroup(self, token):
-        if self.tree.elementInScope(token["name"], variant="table"):
-            self.clearStackToTableBodyContext()
+        def startTagParamSource(self, token):
+            self.tree.insertElement(token)
             self.tree.openElements.pop()
-            self.parser.phase = self.parser.phases["inTable"]
-        else:
-            self.parser.parseError("unexpected-end-tag-in-table-body",
-              {"name": token["name"]})
+            token["selfClosingAcknowledged"] = True
 
-    def endTagTable(self, token):
-        if (self.tree.elementInScope("tbody", variant="table") or
-            self.tree.elementInScope("thead", variant="table") or
-            self.tree.elementInScope("tfoot", variant="table")):
-            self.clearStackToTableBodyContext()
-            self.endTagTableRowGroup(
-                impliedTagToken(self.tree.openElements[-1].name))
-            self.parser.phase.processEndTag(token)
-        else:
-            # innerHTML case
-            self.parser.parseError()
-
-    def endTagIgnore(self, token):
-        self.parser.parseError("unexpected-end-tag-in-table-body",
-          {"name": token["name"]})
-
-    def endTagOther(self, token):
-        self.parser.phases["inTable"].processEndTag(token)
-
-
-class InRowPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-row
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            (("td", "th"), self.startTagTableCell),
-            (("caption", "col", "colgroup", "tbody", "tfoot", "thead",
-              "tr"), self.startTagTableOther)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            ("tr", self.endTagTr),
-            ("table", self.endTagTable),
-            (("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
-            (("body", "caption", "col", "colgroup", "html", "td", "th"),
-              self.endTagIgnore)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    # helper methods (XXX unify this with other table helper methods)
-    def clearStackToTableRowContext(self):
-        while self.tree.openElements[-1].name not in ("tr", "html"):
-            self.parser.parseError("unexpected-implied-end-tag-in-table-row",
-              {"name": self.tree.openElements[-1].name})
+        def startTagHr(self, token):
+            if self.tree.elementInScope("p", variant="button"):
+                self.endTagP(impliedTagToken("p"))
+            self.tree.insertElement(token)
             self.tree.openElements.pop()
+            token["selfClosingAcknowledged"] = True
+            self.parser.framesetOK = False
 
-    def ignoreEndTagTr(self):
-        return not self.tree.elementInScope("tr", variant="table")
+        def startTagImage(self, token):
+            # No really...
+            self.parser.parseError("unexpected-start-tag-treated-as",
+                                   {"originalName": "image", "newName": "img"})
+            self.processStartTag(impliedTagToken("img", "StartTag",
+                                                 attributes=token["data"],
+                                                 selfClosing=token["selfClosing"]))
 
-    # the rest
-    def processEOF(self):
-        self.parser.phases["inTable"].processEOF()
-    
-    def processSpaceCharacters(self, token):
-        self.parser.phases["inTable"].processSpaceCharacters(token)        
-
-    def processCharacters(self, token):
-        self.parser.phases["inTable"].processCharacters(token)
-
-    def startTagTableCell(self, token):
-        self.clearStackToTableRowContext()
-        self.tree.insertElement(token)
-        self.parser.phase = self.parser.phases["inCell"]
-        self.tree.activeFormattingElements.append(Marker)
-
-    def startTagTableOther(self, token):
-        ignoreEndTag = self.ignoreEndTagTr()
-        self.endTagTr("tr")
-        # XXX how are we sure it's always ignored in the innerHTML case?
-        if not ignoreEndTag:
-            self.parser.phase.processStartTag(token)
-
-    def startTagOther(self, token):
-        self.parser.phases["inTable"].processStartTag(token)
-
-    def endTagTr(self, token):
-        if not self.ignoreEndTagTr():
-            self.clearStackToTableRowContext()
-            self.tree.openElements.pop()
-            self.parser.phase = self.parser.phases["inTableBody"]
-        else:
-            # innerHTML case
-            assert self.parser.innerHTML
-            self.parser.parseError()
-
-    def endTagTable(self, token):
-        ignoreEndTag = self.ignoreEndTagTr()
-        self.endTagTr("tr")
-        # Reprocess the current tag if the tr end tag was not ignored
-        # XXX how are we sure it's always ignored in the innerHTML case?
-        if not ignoreEndTag:
-            self.parser.phase.processEndTag(token)
-
-    def endTagTableRowGroup(self, token):
-        if self.tree.elementInScope(token["name"], variant="table"):
-            self.endTagTr("tr")
-            self.parser.phase.processEndTag(token)
-        else:
-            # innerHTML case
-            self.parser.parseError()
-
-    def endTagIgnore(self, token):
-        self.parser.parseError("unexpected-end-tag-in-table-row",
-            {"name": token["name"]})
-
-    def endTagOther(self, token):
-        self.parser.phases["inTable"].processEndTag(token)
-
-class InCellPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-cell
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), self.startTagTableOther)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            (("td", "th"), self.endTagTableCell),
-            (("body", "caption", "col", "colgroup", "html"), self.endTagIgnore),
-            (("table", "tbody", "tfoot", "thead", "tr"), self.endTagImply)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    # helper
-    def closeCell(self):
-        if self.tree.elementInScope("td", variant="table"):
-            self.endTagTableCell(impliedTagToken("td"))
-        elif self.tree.elementInScope("th", variant="table"):
-            self.endTagTableCell(impliedTagToken("th"))
-
-    # the rest
-    def processEOF(self):
-        self.parser.phases["inBody"].processEOF()
-        
-    def processCharacters(self, token):
-        self.parser.phases["inBody"].processCharacters(token)
-
-    def startTagTableOther(self, token):
-        if (self.tree.elementInScope("td", variant="table") or
-            self.tree.elementInScope("th", variant="table")):
-            self.closeCell()
-            self.parser.phase.processStartTag(token)
-        else:
-            # innerHTML case
-            self.parser.parseError()
-
-    def startTagOther(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
-        # Optimize this for subsequent invocations. Can't do this initially
-        # because self.phases doesn't really exist at that point.
-        self.startTagHandler.default =\
-          self.parser.phases["inBody"].processStartTag
-
-    def endTagTableCell(self, token):
-        if self.tree.elementInScope(token["name"], variant="table"):
-            self.tree.generateImpliedEndTags(token["name"])
-            if self.tree.openElements[-1].name != token["name"]:
-                self.parser.parseError("unexpected-cell-end-tag",
-                  {"name": token["name"]})
-                while True:
-                    node = self.tree.openElements.pop()
-                    if node.name == token["name"]:
-                        break
+        def startTagIsIndex(self, token):
+            self.parser.parseError("deprecated-tag", {"name": "isindex"})
+            if self.tree.formPointer:
+                return
+            form_attrs = {}
+            if "action" in token["data"]:
+                form_attrs["action"] = token["data"]["action"]
+            self.processStartTag(impliedTagToken("form", "StartTag",
+                                                 attributes=form_attrs))
+            self.processStartTag(impliedTagToken("hr", "StartTag"))
+            self.processStartTag(impliedTagToken("label", "StartTag"))
+            # XXX Localization ...
+            if "prompt" in token["data"]:
+                prompt = token["data"]["prompt"]
             else:
-                self.tree.openElements.pop()
-            self.tree.clearActiveFormattingElements()
-            self.parser.phase = self.parser.phases["inRow"]
-        else:
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+                prompt = "This is a searchable index. Enter search keywords: "
+            self.processCharacters(
+                {"type": tokenTypes["Characters"], "data": prompt})
+            attributes = token["data"].copy()
+            if "action" in attributes:
+                del attributes["action"]
+            if "prompt" in attributes:
+                del attributes["prompt"]
+            attributes["name"] = "isindex"
+            self.processStartTag(impliedTagToken("input", "StartTag",
+                                                 attributes=attributes,
+                                                 selfClosing=
+                                                 token["selfClosing"]))
+            self.processEndTag(impliedTagToken("label"))
+            self.processStartTag(impliedTagToken("hr", "StartTag"))
+            self.processEndTag(impliedTagToken("form"))
 
-    def endTagIgnore(self, token):
-        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+        def startTagTextarea(self, token):
+            self.tree.insertElement(token)
+            self.parser.tokenizer.state = self.parser.tokenizer.rcdataState
+            self.processSpaceCharacters = self.processSpaceCharactersDropNewline
+            self.parser.framesetOK = False
 
-    def endTagImply(self, token):
-        if self.tree.elementInScope(token["name"], variant="table"):
-            self.closeCell()
-            self.parser.phase.processEndTag(token)
-        else:
-            # sometimes innerHTML case
-            self.parser.parseError()
+        def startTagIFrame(self, token):
+            self.parser.framesetOK = False
+            self.startTagRawtext(token)
 
-    def endTagOther(self, token):
-        self.parser.phases["inBody"].processEndTag(token)
-        # Optimize this for subsequent invocations. Can't do this initially
-        # because self.phases doesn't really exist at that point.
-        self.endTagHandler.default = self.parser.phases["inBody"].processEndTag
+        def startTagRawtext(self, token):
+            """iframe, noembed noframes, noscript(if scripting enabled)"""
+            self.parser.parseRCDataRawtext(token, "RAWTEXT")
 
+        def startTagOpt(self, token):
+            if self.tree.openElements[-1].name == "option":
+                self.parser.phase.processEndTag(impliedTagToken("option"))
+            self.tree.reconstructActiveFormattingElements()
+            self.parser.tree.insertElement(token)
 
-class InSelectPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
+        def startTagSelect(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            self.tree.insertElement(token)
+            self.parser.framesetOK = False
+            if self.parser.phase in (self.parser.phases["inTable"],
+                                     self.parser.phases["inCaption"],
+                                     self.parser.phases["inColumnGroup"],
+                                     self.parser.phases["inTableBody"],
+                                     self.parser.phases["inRow"],
+                                     self.parser.phases["inCell"]):
+                self.parser.phase = self.parser.phases["inSelectInTable"]
+            else:
+                self.parser.phase = self.parser.phases["inSelect"]
 
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("option", self.startTagOption),
-            ("optgroup", self.startTagOptgroup),
-            ("select", self.startTagSelect),
-            (("input", "keygen", "textarea"), self.startTagInput)
-        ])
-        self.startTagHandler.default = self.startTagOther
+        def startTagRpRt(self, token):
+            if self.tree.elementInScope("ruby"):
+                self.tree.generateImpliedEndTags()
+                if self.tree.openElements[-1].name != "ruby":
+                    self.parser.parseError()
+            self.tree.insertElement(token)
 
-        self.endTagHandler = utils.MethodDispatcher([
-            ("option", self.endTagOption),
-            ("optgroup", self.endTagOptgroup),
-            ("select", self.endTagSelect),
-            (("caption", "table", "tbody", "tfoot", "thead", "tr", "td",
-              "th"), self.endTagTableElements)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-select
-    def processEOF(self):
-        if self.tree.openElements[-1].name != "html":
-            self.parser.parseError("eof-in-select")
-        else:
-            assert self.parser.innerHTML
-
-    def processCharacters(self, token):
-        self.tree.insertText(token["data"])
-
-    def startTagOption(self, token):
-        # We need to imply </option> if <option> is the current node.
-        if self.tree.openElements[-1].name == "option":
-            self.tree.openElements.pop()
-        self.tree.insertElement(token)
-
-    def startTagOptgroup(self, token):
-        if self.tree.openElements[-1].name == "option":
-            self.tree.openElements.pop()
-        if self.tree.openElements[-1].name == "optgroup":
-            self.tree.openElements.pop()
-        self.tree.insertElement(token)
-
-    def startTagSelect(self, token):
-        self.parser.parseError("unexpected-select-in-select")
-        self.endTagSelect("select")
-
-    def startTagInput(self, token):
-        self.parser.parseError("unexpected-input-in-select")
-        if self.tree.elementInScope("select", variant="table"):
-            self.endTagSelect("select")
-            self.parser.phase.processStartTag(token)
-
-    def startTagOther(self, token):
-        self.parser.parseError("unexpected-start-tag-in-select",
-          {"name": token["name"]})
-
-    def endTagOption(self, token):
-        if self.tree.openElements[-1].name == "option":
-            self.tree.openElements.pop()
-        else:
-            self.parser.parseError("unexpected-end-tag-in-select",
-              {"name": "option"})
-
-    def endTagOptgroup(self, token):
-        # </optgroup> implicitly closes <option>
-        if (self.tree.openElements[-1].name == "option" and
-            self.tree.openElements[-2].name == "optgroup"):
-            self.tree.openElements.pop()
-        # It also closes </optgroup>
-        if self.tree.openElements[-1].name == "optgroup":
-            self.tree.openElements.pop()
-        # But nothing else
-        else:
-            self.parser.parseError("unexpected-end-tag-in-select",
-              {"name": "optgroup"})
-
-    def endTagSelect(self, token):
-        if self.tree.elementInScope("select", variant="table"):
-            node = self.tree.openElements.pop()
-            while node.name != "select":
-                node = self.tree.openElements.pop()
-            self.parser.resetInsertionMode()
-        else:
-            # innerHTML case
-            self.parser.parseError()
-
-    def endTagTableElements(self, token):
-        self.parser.parseError("unexpected-end-tag-in-select",
-          {"name": token["name"]})
-        if self.tree.elementInScope(token["name"], variant="table"):
-            self.endTagSelect("select")
-            self.parser.phase.processEndTag(token)
-
-    def endTagOther(self, token):
-        self.parser.parseError("unexpected-end-tag-in-select",
-          {"name": token["name"]})
-
-
-class InSelectInTablePhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler = utils.MethodDispatcher([
-            (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
-             self.startTagTable)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
-             self.endTagTable)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    def processEOF(self):
-        self.parser.phases["inSelect"].processEOF()
-
-    def processCharacters(self, token):
-        self.parser.phases["inSelect"].processCharacters(token)
-    
-    def startTagTable(self, token):
-        self.parser.parseError("unexpected-table-element-start-tag-in-select-in-table", {"name": token["name"]})
-        self.endTagOther(impliedTagToken("select"))
-        self.parser.phase.processStartTag(token)
-
-    def startTagOther(self, token):
-        self.parser.phases["inSelect"].processStartTag(token)
-
-    def endTagTable(self, token):
-        self.parser.parseError("unexpected-table-element-end-tag-in-select-in-table", {"name": token["name"]})
-        if self.tree.elementInScope(token["name"], variant="table"):
-            self.endTagOther(impliedTagToken("select"))
-            self.parser.phase.processEndTag(token)
-
-    def endTagOther(self, token):
-        self.parser.phases["inSelect"].processEndTag(token)
-
-
-class InForeignContentPhase(Phase):
-    breakoutElements = frozenset(["b", "big", "blockquote", "body", "br", 
-                                  "center", "code", "dd", "div", "dl", "dt",
-                                  "em", "embed", "font", "h1", "h2", "h3", 
-                                  "h4", "h5", "h6", "head", "hr", "i", "img",
-                                  "li", "listing", "menu", "meta", "nobr", 
-                                  "ol", "p", "pre", "ruby", "s",  "small", 
-                                  "span", "strong", "strike",  "sub", "sup", 
-                                  "table", "tt", "u", "ul", "var"])
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-    def nonHTMLElementInScope(self):
-        for element in self.tree.openElements[::-1]:
-            if element.namespace == self.tree.defaultNamespace:
-                return self.tree.elementInScope(element)
-        assert False
-        for item in self.tree.openElements[::-1]:
-            if item.namespace == self.tree.defaultNamespace:
-                return True
-            elif item.nameTuple in scopingElements:
-                return False
-        return False
-
-    def adjustSVGTagNames(self, token):
-        replacements = {"altglyph":"altGlyph",
-                        "altglyphdef":"altGlyphDef",
-                        "altglyphitem":"altGlyphItem",
-                        "animatecolor":"animateColor",
-                        "animatemotion":"animateMotion",
-                        "animatetransform":"animateTransform",
-                        "clippath":"clipPath",
-                        "feblend":"feBlend",
-                        "fecolormatrix":"feColorMatrix",
-                        "fecomponenttransfer":"feComponentTransfer",
-                        "fecomposite":"feComposite",
-                        "feconvolvematrix":"feConvolveMatrix",
-                        "fediffuselighting":"feDiffuseLighting",
-                        "fedisplacementmap":"feDisplacementMap",
-                        "fedistantlight":"feDistantLight",
-                        "feflood":"feFlood",
-                        "fefunca":"feFuncA",
-                        "fefuncb":"feFuncB",
-                        "fefuncg":"feFuncG",
-                        "fefuncr":"feFuncR",
-                        "fegaussianblur":"feGaussianBlur",
-                        "feimage":"feImage",
-                        "femerge":"feMerge",
-                        "femergenode":"feMergeNode",
-                        "femorphology":"feMorphology",
-                        "feoffset":"feOffset",
-                        "fepointlight":"fePointLight",
-                        "fespecularlighting":"feSpecularLighting",
-                        "fespotlight":"feSpotLight",
-                        "fetile":"feTile",
-                        "feturbulence":"feTurbulence",
-                        "foreignobject":"foreignObject",
-                        "glyphref":"glyphRef",
-                        "lineargradient":"linearGradient",
-                        "radialgradient":"radialGradient",
-                        "textpath":"textPath"}
-
-        if token["name"] in replacements:
-            token["name"] = replacements[token["name"]]
-
-    def processCharacters(self, token):
-        self.parser.framesetOK = False
-        Phase.processCharacters(self, token)
-
-    def processEOF(self):
-        pass
-
-    def processStartTag(self, token):
-        currentNode = self.tree.openElements[-1]
-        if (currentNode.namespace == self.tree.defaultNamespace or
-            (currentNode.namespace == namespaces["mathml"] and 
-             token["name"] not in frozenset(["mglyph", "malignmark"]) and
-             currentNode.name in frozenset(["mi", "mo", "mn", 
-                                            "ms", "mtext"])) or
-            (currentNode.namespace == namespaces["mathml"] and
-             currentNode.name == "annotation-xml" and
-             token["name"] == "svg") or
-            (currentNode.namespace == namespaces["svg"] and 
-             currentNode.name in frozenset(["foreignObject", 
-                                            "desc", "title"])
-             )):
-            assert self.parser.secondaryPhase != self
-            self.parser.secondaryPhase.processStartTag(token)
-            if self.parser.phase == self and self.nonHTMLElementInScope():
-                self.parser.phase = self.parser.secondaryPhase
-        elif token["name"] in self.breakoutElements:
-            self.parser.parseError("unexpected-html-element-in-foreign-content",
-                                   token["name"])
-            while (self.tree.openElements[-1].namespace !=
-                   self.tree.defaultNamespace):
-                self.tree.openElements.pop()
-            self.parser.phase = self.parser.secondaryPhase
-            self.parser.phase.processStartTag(token)
-        else:
-            if currentNode.namespace == namespaces["mathml"]:
-                self.parser.adjustMathMLAttributes(token)
-            elif currentNode.namespace == namespaces["svg"]:
-                self.adjustSVGTagNames(token)
-                self.parser.adjustSVGAttributes(token)
+        def startTagMath(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            self.parser.adjustMathMLAttributes(token)
             self.parser.adjustForeignAttributes(token)
-            token["namespace"] = currentNode.namespace
+            token["namespace"] = namespaces["mathml"]
             self.tree.insertElement(token)
+            # Need to get the parse error right for the case where the token
+            # has a namespace not equal to the xmlns attribute
             if token["selfClosing"]:
                 self.tree.openElements.pop()
                 token["selfClosingAcknowledged"] = True
 
-    def processEndTag(self, token):
-        self.adjustSVGTagNames(token)
-        self.parser.secondaryPhase.processEndTag(token)
-        if self.parser.phase == self and self.nonHTMLElementInScope():
-            self.parser.phase = self.parser.secondaryPhase
+        def startTagSvg(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            self.parser.adjustSVGAttributes(token)
+            self.parser.adjustForeignAttributes(token)
+            token["namespace"] = namespaces["svg"]
+            self.tree.insertElement(token)
+            # Need to get the parse error right for the case where the token
+            # has a namespace not equal to the xmlns attribute
+            if token["selfClosing"]:
+                self.tree.openElements.pop()
+                token["selfClosingAcknowledged"] = True
 
-class AfterBodyPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
+        def startTagMisplaced(self, token):
+            """ Elements that should be children of other elements that have a
+            different insertion mode; here they are ignored
+            "caption", "col", "colgroup", "frame", "frameset", "head",
+            "option", "optgroup", "tbody", "td", "tfoot", "th", "thead",
+            "tr", "noscript"
+            """
+            self.parser.parseError("unexpected-start-tag-ignored", {"name": token["name"]})
 
-        self.startTagHandler = utils.MethodDispatcher([
-                ("html", self.startTagHtml)
-                ])
-        self.startTagHandler.default = self.startTagOther
+        def startTagOther(self, token):
+            self.tree.reconstructActiveFormattingElements()
+            self.tree.insertElement(token)
 
-        self.endTagHandler = utils.MethodDispatcher([("html", self.endTagHtml)])
-        self.endTagHandler.default = self.endTagOther
+        def endTagP(self, token):
+            if not self.tree.elementInScope("p", variant="button"):
+                self.startTagCloseP(impliedTagToken("p", "StartTag"))
+                self.parser.parseError("unexpected-end-tag", {"name": "p"})
+                self.endTagP(impliedTagToken("p", "EndTag"))
+            else:
+                self.tree.generateImpliedEndTags("p")
+                if self.tree.openElements[-1].name != "p":
+                    self.parser.parseError("unexpected-end-tag", {"name": "p"})
+                node = self.tree.openElements.pop()
+                while node.name != "p":
+                    node = self.tree.openElements.pop()
 
-    def processEOF(self):
-        #Stop parsing
-        pass
-    
-    def processComment(self, token):
-        # This is needed because data is to be appended to the <html> element
-        # here and not to whatever is currently open.
-        self.tree.insertComment(token, self.tree.openElements[0])
+        def endTagBody(self, token):
+            if not self.tree.elementInScope("body"):
+                self.parser.parseError()
+                return
+            elif self.tree.openElements[-1].name != "body":
+                for node in self.tree.openElements[2:]:
+                    if node.name not in frozenset(("dd", "dt", "li", "optgroup",
+                                                   "option", "p", "rp", "rt",
+                                                   "tbody", "td", "tfoot",
+                                                   "th", "thead", "tr", "body",
+                                                   "html")):
+                        # Not sure this is the correct name for the parse error
+                        self.parser.parseError(
+                            "expected-one-end-tag-but-got-another",
+                            {"expectedName": "body", "gotName": node.name})
+                        break
+            self.parser.phase = self.parser.phases["afterBody"]
 
-    def processCharacters(self, token):
-        self.parser.parseError("unexpected-char-after-body")
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processCharacters(token)
+        def endTagHtml(self, token):
+            # We repeat the test for the body end tag token being ignored here
+            if self.tree.elementInScope("body"):
+                self.endTagBody(impliedTagToken("body"))
+                return token
 
-    def startTagHtml(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
+        def endTagBlock(self, token):
+            # Put us back in the right whitespace handling mode
+            if token["name"] == "pre":
+                self.processSpaceCharacters = self.processSpaceCharactersNonPre
+            inScope = self.tree.elementInScope(token["name"])
+            if inScope:
+                self.tree.generateImpliedEndTags()
+            if self.tree.openElements[-1].name != token["name"]:
+                self.parser.parseError("end-tag-too-early", {"name": token["name"]})
+            if inScope:
+                node = self.tree.openElements.pop()
+                while node.name != token["name"]:
+                    node = self.tree.openElements.pop()
 
-    def startTagOther(self, token):
-        self.parser.parseError("unexpected-start-tag-after-body",
-          {"name": token["name"]})
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processStartTag(token)
+        def endTagForm(self, token):
+            node = self.tree.formPointer
+            self.tree.formPointer = None
+            if node is None or not self.tree.elementInScope(node):
+                self.parser.parseError("unexpected-end-tag",
+                                       {"name": "form"})
+            else:
+                self.tree.generateImpliedEndTags()
+                if self.tree.openElements[-1] != node:
+                    self.parser.parseError("end-tag-too-early-ignored",
+                                           {"name": "form"})
+                self.tree.openElements.remove(node)
 
-    def endTagHtml(self,name):
-        if self.parser.innerHTML:
-            self.parser.parseError("unexpected-end-tag-after-body-innerhtml")
-        else:
-            self.parser.phase = self.parser.phases["afterAfterBody"]
+        def endTagListItem(self, token):
+            if token["name"] == "li":
+                variant = "list"
+            else:
+                variant = None
+            if not self.tree.elementInScope(token["name"], variant=variant):
+                self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+            else:
+                self.tree.generateImpliedEndTags(exclude=token["name"])
+                if self.tree.openElements[-1].name != token["name"]:
+                    self.parser.parseError(
+                        "end-tag-too-early",
+                        {"name": token["name"]})
+                node = self.tree.openElements.pop()
+                while node.name != token["name"]:
+                    node = self.tree.openElements.pop()
 
-    def endTagOther(self, token):
-        self.parser.parseError("unexpected-end-tag-after-body",
-          {"name": token["name"]})
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processEndTag(token)
+        def endTagHeading(self, token):
+            for item in headingElements:
+                if self.tree.elementInScope(item):
+                    self.tree.generateImpliedEndTags()
+                    break
+            if self.tree.openElements[-1].name != token["name"]:
+                self.parser.parseError("end-tag-too-early", {"name": token["name"]})
 
-class InFramesetPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#in-frameset
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
+            for item in headingElements:
+                if self.tree.elementInScope(item):
+                    item = self.tree.openElements.pop()
+                    while item.name not in headingElements:
+                        item = self.tree.openElements.pop()
+                    break
 
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("frameset", self.startTagFrameset),
-            ("frame", self.startTagFrame),
-            ("noframes", self.startTagNoframes)
-        ])
-        self.startTagHandler.default = self.startTagOther
+        def endTagFormatting(self, token):
+            """The much-feared adoption agency algorithm"""
+            # http://svn.whatwg.org/webapps/complete.html#adoptionAgency revision 7867
+            # XXX Better parseError messages appreciated.
 
-        self.endTagHandler = utils.MethodDispatcher([
-            ("frameset", self.endTagFrameset),
-            ("noframes", self.endTagNoframes)
-        ])
-        self.endTagHandler.default = self.endTagOther
+            # Step 1
+            outerLoopCounter = 0
 
-    def processEOF(self):
-        if self.tree.openElements[-1].name != "html":
-            self.parser.parseError("eof-in-frameset")
-        else:
-            assert self.parser.innerHTML
+            # Step 2
+            while outerLoopCounter < 8:
 
-    def processCharacters(self, token):
-        self.parser.parseError("unexpected-char-in-frameset")
+                # Step 3
+                outerLoopCounter += 1
 
-    def startTagFrameset(self, token):
-        self.tree.insertElement(token)
+                # Step 4:
 
-    def startTagFrame(self, token):
-        self.tree.insertElement(token)
-        self.tree.openElements.pop()
+                # Let the formatting element be the last element in
+                # the list of active formatting elements that:
+                # - is between the end of the list and the last scope
+                # marker in the list, if any, or the start of the list
+                # otherwise, and
+                # - has the same tag name as the token.
+                formattingElement = self.tree.elementInActiveFormattingElements(
+                    token["name"])
+                if (not formattingElement or
+                    (formattingElement in self.tree.openElements and
+                     not self.tree.elementInScope(formattingElement.name))):
+                    # If there is no such node, then abort these steps
+                    # and instead act as described in the "any other
+                    # end tag" entry below.
+                    self.endTagOther(token)
+                    return
 
-    def startTagNoframes(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
+                # Otherwise, if there is such a node, but that node is
+                # not in the stack of open elements, then this is a
+                # parse error; remove the element from the list, and
+                # abort these steps.
+                elif formattingElement not in self.tree.openElements:
+                    self.parser.parseError("adoption-agency-1.2", {"name": token["name"]})
+                    self.tree.activeFormattingElements.remove(formattingElement)
+                    return
 
-    def startTagOther(self, token):
-        self.parser.parseError("unexpected-start-tag-in-frameset",
-          {"name": token["name"]})
+                # Otherwise, if there is such a node, and that node is
+                # also in the stack of open elements, but the element
+                # is not in scope, then this is a parse error; ignore
+                # the token, and abort these steps.
+                elif not self.tree.elementInScope(formattingElement.name):
+                    self.parser.parseError("adoption-agency-4.4", {"name": token["name"]})
+                    return
 
-    def endTagFrameset(self, token):
-        if self.tree.openElements[-1].name == "html":
-            # innerHTML case
-            self.parser.parseError("unexpected-frameset-in-frameset-innerhtml")
-        else:
+                # Otherwise, there is a formatting element and that
+                # element is in the stack and is in scope. If the
+                # element is not the current node, this is a parse
+                # error. In any case, proceed with the algorithm as
+                # written in the following steps.
+                else:
+                    if formattingElement != self.tree.openElements[-1]:
+                        self.parser.parseError("adoption-agency-1.3", {"name": token["name"]})
+
+                # Step 5:
+
+                # Let the furthest block be the topmost node in the
+                # stack of open elements that is lower in the stack
+                # than the formatting element, and is an element in
+                # the special category. There might not be one.
+                afeIndex = self.tree.openElements.index(formattingElement)
+                furthestBlock = None
+                for element in self.tree.openElements[afeIndex:]:
+                    if element.nameTuple in specialElements:
+                        furthestBlock = element
+                        break
+
+                # Step 6:
+
+                # If there is no furthest block, then the UA must
+                # first pop all the nodes from the bottom of the stack
+                # of open elements, from the current node up to and
+                # including the formatting element, then remove the
+                # formatting element from the list of active
+                # formatting elements, and finally abort these steps.
+                if furthestBlock is None:
+                    element = self.tree.openElements.pop()
+                    while element != formattingElement:
+                        element = self.tree.openElements.pop()
+                    self.tree.activeFormattingElements.remove(element)
+                    return
+
+                # Step 7
+                commonAncestor = self.tree.openElements[afeIndex - 1]
+
+                # Step 8:
+                # The bookmark is supposed to help us identify where to reinsert
+                # nodes in step 15. We have to ensure that we reinsert nodes after
+                # the node before the active formatting element. Note the bookmark
+                # can move in step 9.7
+                bookmark = self.tree.activeFormattingElements.index(formattingElement)
+
+                # Step 9
+                lastNode = node = furthestBlock
+                innerLoopCounter = 0
+
+                index = self.tree.openElements.index(node)
+                while innerLoopCounter < 3:
+                    innerLoopCounter += 1
+                    # Node is element before node in open elements
+                    index -= 1
+                    node = self.tree.openElements[index]
+                    if node not in self.tree.activeFormattingElements:
+                        self.tree.openElements.remove(node)
+                        continue
+                    # Step 9.6
+                    if node == formattingElement:
+                        break
+                    # Step 9.7
+                    if lastNode == furthestBlock:
+                        bookmark = self.tree.activeFormattingElements.index(node) + 1
+                    # Step 9.8
+                    clone = node.cloneNode()
+                    # Replace node with clone
+                    self.tree.activeFormattingElements[
+                        self.tree.activeFormattingElements.index(node)] = clone
+                    self.tree.openElements[
+                        self.tree.openElements.index(node)] = clone
+                    node = clone
+                    # Step 9.9
+                    # Remove lastNode from its parents, if any
+                    if lastNode.parent:
+                        lastNode.parent.removeChild(lastNode)
+                    node.appendChild(lastNode)
+                    # Step 9.10
+                    lastNode = node
+
+                # Step 10
+                # Foster parent lastNode if commonAncestor is a
+                # table, tbody, tfoot, thead, or tr we need to foster
+                # parent the lastNode
+                if lastNode.parent:
+                    lastNode.parent.removeChild(lastNode)
+
+                if commonAncestor.name in frozenset(("table", "tbody", "tfoot", "thead", "tr")):
+                    parent, insertBefore = self.tree.getTableMisnestedNodePosition()
+                    parent.insertBefore(lastNode, insertBefore)
+                else:
+                    commonAncestor.appendChild(lastNode)
+
+                # Step 11
+                clone = formattingElement.cloneNode()
+
+                # Step 12
+                furthestBlock.reparentChildren(clone)
+
+                # Step 13
+                furthestBlock.appendChild(clone)
+
+                # Step 14
+                self.tree.activeFormattingElements.remove(formattingElement)
+                self.tree.activeFormattingElements.insert(bookmark, clone)
+
+                # Step 15
+                self.tree.openElements.remove(formattingElement)
+                self.tree.openElements.insert(
+                    self.tree.openElements.index(furthestBlock) + 1, clone)
+
+        def endTagAppletMarqueeObject(self, token):
+            if self.tree.elementInScope(token["name"]):
+                self.tree.generateImpliedEndTags()
+            if self.tree.openElements[-1].name != token["name"]:
+                self.parser.parseError("end-tag-too-early", {"name": token["name"]})
+
+            if self.tree.elementInScope(token["name"]):
+                element = self.tree.openElements.pop()
+                while element.name != token["name"]:
+                    element = self.tree.openElements.pop()
+                self.tree.clearActiveFormattingElements()
+
+        def endTagBr(self, token):
+            self.parser.parseError("unexpected-end-tag-treated-as",
+                                   {"originalName": "br", "newName": "br element"})
+            self.tree.reconstructActiveFormattingElements()
+            self.tree.insertElement(impliedTagToken("br", "StartTag"))
             self.tree.openElements.pop()
-        if (not self.parser.innerHTML and
-            self.tree.openElements[-1].name != "frameset"):
-            # If we're not in innerHTML mode and the the current node is not a
-            # "frameset" element (anymore) then switch.
-            self.parser.phase = self.parser.phases["afterFrameset"]
 
-    def endTagNoframes(self, token):
-        self.parser.phases["inBody"].processEndTag(token)
+        def endTagOther(self, token):
+            for node in self.tree.openElements[::-1]:
+                if node.name == token["name"]:
+                    self.tree.generateImpliedEndTags(exclude=token["name"])
+                    if self.tree.openElements[-1].name != token["name"]:
+                        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+                    while self.tree.openElements.pop() != node:
+                        pass
+                    break
+                else:
+                    if node.nameTuple in specialElements:
+                        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+                        break
 
-    def endTagOther(self, token):
-        self.parser.parseError("unexpected-end-tag-in-frameset",
-          {"name": token["name"]})
+    class TextPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([])
+            self.startTagHandler.default = self.startTagOther
+            self.endTagHandler = utils.MethodDispatcher([
+                ("script", self.endTagScript)])
+            self.endTagHandler.default = self.endTagOther
+
+        def processCharacters(self, token):
+            self.tree.insertText(token["data"])
+
+        def processEOF(self):
+            self.parser.parseError("expected-named-closing-tag-but-got-eof",
+                                   {"name": self.tree.openElements[-1].name})
+            self.tree.openElements.pop()
+            self.parser.phase = self.parser.originalPhase
+            return True
+
+        def startTagOther(self, token):
+            assert False, "Tried to process start tag %s in RCDATA/RAWTEXT mode" % token['name']
+
+        def endTagScript(self, token):
+            node = self.tree.openElements.pop()
+            assert node.name == "script"
+            self.parser.phase = self.parser.originalPhase
+            # The rest of this method is all stuff that only happens if
+            # document.write works
+
+        def endTagOther(self, token):
+            self.tree.openElements.pop()
+            self.parser.phase = self.parser.originalPhase
+
+    class InTablePhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-table
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("caption", self.startTagCaption),
+                ("colgroup", self.startTagColgroup),
+                ("col", self.startTagCol),
+                (("tbody", "tfoot", "thead"), self.startTagRowGroup),
+                (("td", "th", "tr"), self.startTagImplyTbody),
+                ("table", self.startTagTable),
+                (("style", "script"), self.startTagStyleScript),
+                ("input", self.startTagInput),
+                ("form", self.startTagForm)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("table", self.endTagTable),
+                (("body", "caption", "col", "colgroup", "html", "tbody", "td",
+                  "tfoot", "th", "thead", "tr"), self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        # helper methods
+        def clearStackToTableContext(self):
+            # "clear the stack back to a table context"
+            while self.tree.openElements[-1].name not in ("table", "html"):
+                # self.parser.parseError("unexpected-implied-end-tag-in-table",
+                #  {"name":  self.tree.openElements[-1].name})
+                self.tree.openElements.pop()
+            # When the current node is <html> it's an innerHTML case
+
+        # processing methods
+        def processEOF(self):
+            if self.tree.openElements[-1].name != "html":
+                self.parser.parseError("eof-in-table")
+            else:
+                assert self.parser.innerHTML
+            # Stop parsing
+
+        def processSpaceCharacters(self, token):
+            originalPhase = self.parser.phase
+            self.parser.phase = self.parser.phases["inTableText"]
+            self.parser.phase.originalPhase = originalPhase
+            self.parser.phase.processSpaceCharacters(token)
+
+        def processCharacters(self, token):
+            originalPhase = self.parser.phase
+            self.parser.phase = self.parser.phases["inTableText"]
+            self.parser.phase.originalPhase = originalPhase
+            self.parser.phase.processCharacters(token)
+
+        def insertText(self, token):
+            # If we get here there must be at least one non-whitespace character
+            # Do the table magic!
+            self.tree.insertFromTable = True
+            self.parser.phases["inBody"].processCharacters(token)
+            self.tree.insertFromTable = False
+
+        def startTagCaption(self, token):
+            self.clearStackToTableContext()
+            self.tree.activeFormattingElements.append(Marker)
+            self.tree.insertElement(token)
+            self.parser.phase = self.parser.phases["inCaption"]
+
+        def startTagColgroup(self, token):
+            self.clearStackToTableContext()
+            self.tree.insertElement(token)
+            self.parser.phase = self.parser.phases["inColumnGroup"]
+
+        def startTagCol(self, token):
+            self.startTagColgroup(impliedTagToken("colgroup", "StartTag"))
+            return token
+
+        def startTagRowGroup(self, token):
+            self.clearStackToTableContext()
+            self.tree.insertElement(token)
+            self.parser.phase = self.parser.phases["inTableBody"]
+
+        def startTagImplyTbody(self, token):
+            self.startTagRowGroup(impliedTagToken("tbody", "StartTag"))
+            return token
+
+        def startTagTable(self, token):
+            self.parser.parseError("unexpected-start-tag-implies-end-tag",
+                                   {"startName": "table", "endName": "table"})
+            self.parser.phase.processEndTag(impliedTagToken("table"))
+            if not self.parser.innerHTML:
+                return token
+
+        def startTagStyleScript(self, token):
+            return self.parser.phases["inHead"].processStartTag(token)
+
+        def startTagInput(self, token):
+            if ("type" in token["data"] and
+                    token["data"]["type"].translate(asciiUpper2Lower) == "hidden"):
+                self.parser.parseError("unexpected-hidden-input-in-table")
+                self.tree.insertElement(token)
+                # XXX associate with form
+                self.tree.openElements.pop()
+            else:
+                self.startTagOther(token)
+
+        def startTagForm(self, token):
+            self.parser.parseError("unexpected-form-in-table")
+            if self.tree.formPointer is None:
+                self.tree.insertElement(token)
+                self.tree.formPointer = self.tree.openElements[-1]
+                self.tree.openElements.pop()
+
+        def startTagOther(self, token):
+            self.parser.parseError("unexpected-start-tag-implies-table-voodoo", {"name": token["name"]})
+            # Do the table magic!
+            self.tree.insertFromTable = True
+            self.parser.phases["inBody"].processStartTag(token)
+            self.tree.insertFromTable = False
+
+        def endTagTable(self, token):
+            if self.tree.elementInScope("table", variant="table"):
+                self.tree.generateImpliedEndTags()
+                if self.tree.openElements[-1].name != "table":
+                    self.parser.parseError("end-tag-too-early-named",
+                                           {"gotName": "table",
+                                            "expectedName": self.tree.openElements[-1].name})
+                while self.tree.openElements[-1].name != "table":
+                    self.tree.openElements.pop()
+                self.tree.openElements.pop()
+                self.parser.resetInsertionMode()
+            else:
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+
+        def endTagIgnore(self, token):
+            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+
+        def endTagOther(self, token):
+            self.parser.parseError("unexpected-end-tag-implies-table-voodoo", {"name": token["name"]})
+            # Do the table magic!
+            self.tree.insertFromTable = True
+            self.parser.phases["inBody"].processEndTag(token)
+            self.tree.insertFromTable = False
+
+    class InTableTextPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.originalPhase = None
+            self.characterTokens = []
+
+        def flushCharacters(self):
+            data = "".join([item["data"] for item in self.characterTokens])
+            if any([item not in spaceCharacters for item in data]):
+                token = {"type": tokenTypes["Characters"], "data": data}
+                self.parser.phases["inTable"].insertText(token)
+            elif data:
+                self.tree.insertText(data)
+            self.characterTokens = []
+
+        def processComment(self, token):
+            self.flushCharacters()
+            self.parser.phase = self.originalPhase
+            return token
+
+        def processEOF(self):
+            self.flushCharacters()
+            self.parser.phase = self.originalPhase
+            return True
+
+        def processCharacters(self, token):
+            if token["data"] == "\u0000":
+                return
+            self.characterTokens.append(token)
+
+        def processSpaceCharacters(self, token):
+            # pretty sure we should never reach here
+            self.characterTokens.append(token)
+    #        assert False
+
+        def processStartTag(self, token):
+            self.flushCharacters()
+            self.parser.phase = self.originalPhase
+            return token
+
+        def processEndTag(self, token):
+            self.flushCharacters()
+            self.parser.phase = self.originalPhase
+            return token
+
+    class InCaptionPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-caption
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
+                  "thead", "tr"), self.startTagTableElement)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("caption", self.endTagCaption),
+                ("table", self.endTagTable),
+                (("body", "col", "colgroup", "html", "tbody", "td", "tfoot", "th",
+                  "thead", "tr"), self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        def ignoreEndTagCaption(self):
+            return not self.tree.elementInScope("caption", variant="table")
+
+        def processEOF(self):
+            self.parser.phases["inBody"].processEOF()
+
+        def processCharacters(self, token):
+            return self.parser.phases["inBody"].processCharacters(token)
+
+        def startTagTableElement(self, token):
+            self.parser.parseError()
+            # XXX Have to duplicate logic here to find out if the tag is ignored
+            ignoreEndTag = self.ignoreEndTagCaption()
+            self.parser.phase.processEndTag(impliedTagToken("caption"))
+            if not ignoreEndTag:
+                return token
+
+        def startTagOther(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def endTagCaption(self, token):
+            if not self.ignoreEndTagCaption():
+                # AT this code is quite similar to endTagTable in "InTable"
+                self.tree.generateImpliedEndTags()
+                if self.tree.openElements[-1].name != "caption":
+                    self.parser.parseError("expected-one-end-tag-but-got-another",
+                                           {"gotName": "caption",
+                                            "expectedName": self.tree.openElements[-1].name})
+                while self.tree.openElements[-1].name != "caption":
+                    self.tree.openElements.pop()
+                self.tree.openElements.pop()
+                self.tree.clearActiveFormattingElements()
+                self.parser.phase = self.parser.phases["inTable"]
+            else:
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+
+        def endTagTable(self, token):
+            self.parser.parseError()
+            ignoreEndTag = self.ignoreEndTagCaption()
+            self.parser.phase.processEndTag(impliedTagToken("caption"))
+            if not ignoreEndTag:
+                return token
+
+        def endTagIgnore(self, token):
+            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+
+        def endTagOther(self, token):
+            return self.parser.phases["inBody"].processEndTag(token)
+
+    class InColumnGroupPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-column
+
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("col", self.startTagCol)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("colgroup", self.endTagColgroup),
+                ("col", self.endTagCol)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        def ignoreEndTagColgroup(self):
+            return self.tree.openElements[-1].name == "html"
+
+        def processEOF(self):
+            if self.tree.openElements[-1].name == "html":
+                assert self.parser.innerHTML
+                return
+            else:
+                ignoreEndTag = self.ignoreEndTagColgroup()
+                self.endTagColgroup(impliedTagToken("colgroup"))
+                if not ignoreEndTag:
+                    return True
+
+        def processCharacters(self, token):
+            ignoreEndTag = self.ignoreEndTagColgroup()
+            self.endTagColgroup(impliedTagToken("colgroup"))
+            if not ignoreEndTag:
+                return token
+
+        def startTagCol(self, token):
+            self.tree.insertElement(token)
+            self.tree.openElements.pop()
+
+        def startTagOther(self, token):
+            ignoreEndTag = self.ignoreEndTagColgroup()
+            self.endTagColgroup(impliedTagToken("colgroup"))
+            if not ignoreEndTag:
+                return token
+
+        def endTagColgroup(self, token):
+            if self.ignoreEndTagColgroup():
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+            else:
+                self.tree.openElements.pop()
+                self.parser.phase = self.parser.phases["inTable"]
+
+        def endTagCol(self, token):
+            self.parser.parseError("no-end-tag", {"name": "col"})
+
+        def endTagOther(self, token):
+            ignoreEndTag = self.ignoreEndTagColgroup()
+            self.endTagColgroup(impliedTagToken("colgroup"))
+            if not ignoreEndTag:
+                return token
+
+    class InTableBodyPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-table0
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("tr", self.startTagTr),
+                (("td", "th"), self.startTagTableCell),
+                (("caption", "col", "colgroup", "tbody", "tfoot", "thead"),
+                 self.startTagTableOther)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
+                ("table", self.endTagTable),
+                (("body", "caption", "col", "colgroup", "html", "td", "th",
+                  "tr"), self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        # helper methods
+        def clearStackToTableBodyContext(self):
+            while self.tree.openElements[-1].name not in ("tbody", "tfoot",
+                                                          "thead", "html"):
+                # self.parser.parseError("unexpected-implied-end-tag-in-table",
+                #  {"name": self.tree.openElements[-1].name})
+                self.tree.openElements.pop()
+            if self.tree.openElements[-1].name == "html":
+                assert self.parser.innerHTML
+
+        # the rest
+        def processEOF(self):
+            self.parser.phases["inTable"].processEOF()
+
+        def processSpaceCharacters(self, token):
+            return self.parser.phases["inTable"].processSpaceCharacters(token)
+
+        def processCharacters(self, token):
+            return self.parser.phases["inTable"].processCharacters(token)
+
+        def startTagTr(self, token):
+            self.clearStackToTableBodyContext()
+            self.tree.insertElement(token)
+            self.parser.phase = self.parser.phases["inRow"]
+
+        def startTagTableCell(self, token):
+            self.parser.parseError("unexpected-cell-in-table-body",
+                                   {"name": token["name"]})
+            self.startTagTr(impliedTagToken("tr", "StartTag"))
+            return token
+
+        def startTagTableOther(self, token):
+            # XXX AT Any ideas on how to share this with endTagTable?
+            if (self.tree.elementInScope("tbody", variant="table") or
+                self.tree.elementInScope("thead", variant="table") or
+                    self.tree.elementInScope("tfoot", variant="table")):
+                self.clearStackToTableBodyContext()
+                self.endTagTableRowGroup(
+                    impliedTagToken(self.tree.openElements[-1].name))
+                return token
+            else:
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+
+        def startTagOther(self, token):
+            return self.parser.phases["inTable"].processStartTag(token)
+
+        def endTagTableRowGroup(self, token):
+            if self.tree.elementInScope(token["name"], variant="table"):
+                self.clearStackToTableBodyContext()
+                self.tree.openElements.pop()
+                self.parser.phase = self.parser.phases["inTable"]
+            else:
+                self.parser.parseError("unexpected-end-tag-in-table-body",
+                                       {"name": token["name"]})
+
+        def endTagTable(self, token):
+            if (self.tree.elementInScope("tbody", variant="table") or
+                self.tree.elementInScope("thead", variant="table") or
+                    self.tree.elementInScope("tfoot", variant="table")):
+                self.clearStackToTableBodyContext()
+                self.endTagTableRowGroup(
+                    impliedTagToken(self.tree.openElements[-1].name))
+                return token
+            else:
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+
+        def endTagIgnore(self, token):
+            self.parser.parseError("unexpected-end-tag-in-table-body",
+                                   {"name": token["name"]})
+
+        def endTagOther(self, token):
+            return self.parser.phases["inTable"].processEndTag(token)
+
+    class InRowPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-row
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("td", "th"), self.startTagTableCell),
+                (("caption", "col", "colgroup", "tbody", "tfoot", "thead",
+                  "tr"), self.startTagTableOther)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("tr", self.endTagTr),
+                ("table", self.endTagTable),
+                (("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
+                (("body", "caption", "col", "colgroup", "html", "td", "th"),
+                 self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        # helper methods (XXX unify this with other table helper methods)
+        def clearStackToTableRowContext(self):
+            while self.tree.openElements[-1].name not in ("tr", "html"):
+                self.parser.parseError("unexpected-implied-end-tag-in-table-row",
+                                       {"name": self.tree.openElements[-1].name})
+                self.tree.openElements.pop()
+
+        def ignoreEndTagTr(self):
+            return not self.tree.elementInScope("tr", variant="table")
+
+        # the rest
+        def processEOF(self):
+            self.parser.phases["inTable"].processEOF()
+
+        def processSpaceCharacters(self, token):
+            return self.parser.phases["inTable"].processSpaceCharacters(token)
+
+        def processCharacters(self, token):
+            return self.parser.phases["inTable"].processCharacters(token)
+
+        def startTagTableCell(self, token):
+            self.clearStackToTableRowContext()
+            self.tree.insertElement(token)
+            self.parser.phase = self.parser.phases["inCell"]
+            self.tree.activeFormattingElements.append(Marker)
+
+        def startTagTableOther(self, token):
+            ignoreEndTag = self.ignoreEndTagTr()
+            self.endTagTr(impliedTagToken("tr"))
+            # XXX how are we sure it's always ignored in the innerHTML case?
+            if not ignoreEndTag:
+                return token
+
+        def startTagOther(self, token):
+            return self.parser.phases["inTable"].processStartTag(token)
+
+        def endTagTr(self, token):
+            if not self.ignoreEndTagTr():
+                self.clearStackToTableRowContext()
+                self.tree.openElements.pop()
+                self.parser.phase = self.parser.phases["inTableBody"]
+            else:
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+
+        def endTagTable(self, token):
+            ignoreEndTag = self.ignoreEndTagTr()
+            self.endTagTr(impliedTagToken("tr"))
+            # Reprocess the current tag if the tr end tag was not ignored
+            # XXX how are we sure it's always ignored in the innerHTML case?
+            if not ignoreEndTag:
+                return token
+
+        def endTagTableRowGroup(self, token):
+            if self.tree.elementInScope(token["name"], variant="table"):
+                self.endTagTr(impliedTagToken("tr"))
+                return token
+            else:
+                self.parser.parseError()
+
+        def endTagIgnore(self, token):
+            self.parser.parseError("unexpected-end-tag-in-table-row",
+                                   {"name": token["name"]})
+
+        def endTagOther(self, token):
+            return self.parser.phases["inTable"].processEndTag(token)
+
+    class InCellPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-cell
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
+                  "thead", "tr"), self.startTagTableOther)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("td", "th"), self.endTagTableCell),
+                (("body", "caption", "col", "colgroup", "html"), self.endTagIgnore),
+                (("table", "tbody", "tfoot", "thead", "tr"), self.endTagImply)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        # helper
+        def closeCell(self):
+            if self.tree.elementInScope("td", variant="table"):
+                self.endTagTableCell(impliedTagToken("td"))
+            elif self.tree.elementInScope("th", variant="table"):
+                self.endTagTableCell(impliedTagToken("th"))
+
+        # the rest
+        def processEOF(self):
+            self.parser.phases["inBody"].processEOF()
+
+        def processCharacters(self, token):
+            return self.parser.phases["inBody"].processCharacters(token)
+
+        def startTagTableOther(self, token):
+            if (self.tree.elementInScope("td", variant="table") or
+                    self.tree.elementInScope("th", variant="table")):
+                self.closeCell()
+                return token
+            else:
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+
+        def startTagOther(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def endTagTableCell(self, token):
+            if self.tree.elementInScope(token["name"], variant="table"):
+                self.tree.generateImpliedEndTags(token["name"])
+                if self.tree.openElements[-1].name != token["name"]:
+                    self.parser.parseError("unexpected-cell-end-tag",
+                                           {"name": token["name"]})
+                    while True:
+                        node = self.tree.openElements.pop()
+                        if node.name == token["name"]:
+                            break
+                else:
+                    self.tree.openElements.pop()
+                self.tree.clearActiveFormattingElements()
+                self.parser.phase = self.parser.phases["inRow"]
+            else:
+                self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+
+        def endTagIgnore(self, token):
+            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+
+        def endTagImply(self, token):
+            if self.tree.elementInScope(token["name"], variant="table"):
+                self.closeCell()
+                return token
+            else:
+                # sometimes innerHTML case
+                self.parser.parseError()
+
+        def endTagOther(self, token):
+            return self.parser.phases["inBody"].processEndTag(token)
+
+    class InSelectPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("option", self.startTagOption),
+                ("optgroup", self.startTagOptgroup),
+                ("select", self.startTagSelect),
+                (("input", "keygen", "textarea"), self.startTagInput),
+                ("script", self.startTagScript)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("option", self.endTagOption),
+                ("optgroup", self.endTagOptgroup),
+                ("select", self.endTagSelect)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-select
+        def processEOF(self):
+            if self.tree.openElements[-1].name != "html":
+                self.parser.parseError("eof-in-select")
+            else:
+                assert self.parser.innerHTML
+
+        def processCharacters(self, token):
+            if token["data"] == "\u0000":
+                return
+            self.tree.insertText(token["data"])
+
+        def startTagOption(self, token):
+            # We need to imply </option> if <option> is the current node.
+            if self.tree.openElements[-1].name == "option":
+                self.tree.openElements.pop()
+            self.tree.insertElement(token)
+
+        def startTagOptgroup(self, token):
+            if self.tree.openElements[-1].name == "option":
+                self.tree.openElements.pop()
+            if self.tree.openElements[-1].name == "optgroup":
+                self.tree.openElements.pop()
+            self.tree.insertElement(token)
+
+        def startTagSelect(self, token):
+            self.parser.parseError("unexpected-select-in-select")
+            self.endTagSelect(impliedTagToken("select"))
+
+        def startTagInput(self, token):
+            self.parser.parseError("unexpected-input-in-select")
+            if self.tree.elementInScope("select", variant="select"):
+                self.endTagSelect(impliedTagToken("select"))
+                return token
+            else:
+                assert self.parser.innerHTML
+
+        def startTagScript(self, token):
+            return self.parser.phases["inHead"].processStartTag(token)
+
+        def startTagOther(self, token):
+            self.parser.parseError("unexpected-start-tag-in-select",
+                                   {"name": token["name"]})
+
+        def endTagOption(self, token):
+            if self.tree.openElements[-1].name == "option":
+                self.tree.openElements.pop()
+            else:
+                self.parser.parseError("unexpected-end-tag-in-select",
+                                       {"name": "option"})
+
+        def endTagOptgroup(self, token):
+            # </optgroup> implicitly closes <option>
+            if (self.tree.openElements[-1].name == "option" and
+                    self.tree.openElements[-2].name == "optgroup"):
+                self.tree.openElements.pop()
+            # It also closes </optgroup>
+            if self.tree.openElements[-1].name == "optgroup":
+                self.tree.openElements.pop()
+            # But nothing else
+            else:
+                self.parser.parseError("unexpected-end-tag-in-select",
+                                       {"name": "optgroup"})
+
+        def endTagSelect(self, token):
+            if self.tree.elementInScope("select", variant="select"):
+                node = self.tree.openElements.pop()
+                while node.name != "select":
+                    node = self.tree.openElements.pop()
+                self.parser.resetInsertionMode()
+            else:
+                # innerHTML case
+                assert self.parser.innerHTML
+                self.parser.parseError()
+
+        def endTagOther(self, token):
+            self.parser.parseError("unexpected-end-tag-in-select",
+                                   {"name": token["name"]})
+
+    class InSelectInTablePhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
+                 self.startTagTable)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
+                 self.endTagTable)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        def processEOF(self):
+            self.parser.phases["inSelect"].processEOF()
+
+        def processCharacters(self, token):
+            return self.parser.phases["inSelect"].processCharacters(token)
+
+        def startTagTable(self, token):
+            self.parser.parseError("unexpected-table-element-start-tag-in-select-in-table", {"name": token["name"]})
+            self.endTagOther(impliedTagToken("select"))
+            return token
+
+        def startTagOther(self, token):
+            return self.parser.phases["inSelect"].processStartTag(token)
+
+        def endTagTable(self, token):
+            self.parser.parseError("unexpected-table-element-end-tag-in-select-in-table", {"name": token["name"]})
+            if self.tree.elementInScope(token["name"], variant="table"):
+                self.endTagOther(impliedTagToken("select"))
+                return token
+
+        def endTagOther(self, token):
+            return self.parser.phases["inSelect"].processEndTag(token)
+
+    class InForeignContentPhase(Phase):
+        breakoutElements = frozenset(["b", "big", "blockquote", "body", "br",
+                                      "center", "code", "dd", "div", "dl", "dt",
+                                      "em", "embed", "h1", "h2", "h3",
+                                      "h4", "h5", "h6", "head", "hr", "i", "img",
+                                      "li", "listing", "menu", "meta", "nobr",
+                                      "ol", "p", "pre", "ruby", "s", "small",
+                                      "span", "strong", "strike", "sub", "sup",
+                                      "table", "tt", "u", "ul", "var"])
+
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+        def adjustSVGTagNames(self, token):
+            replacements = {"altglyph": "altGlyph",
+                            "altglyphdef": "altGlyphDef",
+                            "altglyphitem": "altGlyphItem",
+                            "animatecolor": "animateColor",
+                            "animatemotion": "animateMotion",
+                            "animatetransform": "animateTransform",
+                            "clippath": "clipPath",
+                            "feblend": "feBlend",
+                            "fecolormatrix": "feColorMatrix",
+                            "fecomponenttransfer": "feComponentTransfer",
+                            "fecomposite": "feComposite",
+                            "feconvolvematrix": "feConvolveMatrix",
+                            "fediffuselighting": "feDiffuseLighting",
+                            "fedisplacementmap": "feDisplacementMap",
+                            "fedistantlight": "feDistantLight",
+                            "feflood": "feFlood",
+                            "fefunca": "feFuncA",
+                            "fefuncb": "feFuncB",
+                            "fefuncg": "feFuncG",
+                            "fefuncr": "feFuncR",
+                            "fegaussianblur": "feGaussianBlur",
+                            "feimage": "feImage",
+                            "femerge": "feMerge",
+                            "femergenode": "feMergeNode",
+                            "femorphology": "feMorphology",
+                            "feoffset": "feOffset",
+                            "fepointlight": "fePointLight",
+                            "fespecularlighting": "feSpecularLighting",
+                            "fespotlight": "feSpotLight",
+                            "fetile": "feTile",
+                            "feturbulence": "feTurbulence",
+                            "foreignobject": "foreignObject",
+                            "glyphref": "glyphRef",
+                            "lineargradient": "linearGradient",
+                            "radialgradient": "radialGradient",
+                            "textpath": "textPath"}
+
+            if token["name"] in replacements:
+                token["name"] = replacements[token["name"]]
+
+        def processCharacters(self, token):
+            if token["data"] == "\u0000":
+                token["data"] = "\uFFFD"
+            elif (self.parser.framesetOK and
+                  any(char not in spaceCharacters for char in token["data"])):
+                self.parser.framesetOK = False
+            Phase.processCharacters(self, token)
+
+        def processStartTag(self, token):
+            currentNode = self.tree.openElements[-1]
+            if (token["name"] in self.breakoutElements or
+                (token["name"] == "font" and
+                 set(token["data"].keys()) & set(["color", "face", "size"]))):
+                self.parser.parseError("unexpected-html-element-in-foreign-content",
+                                       {"name": token["name"]})
+                while (self.tree.openElements[-1].namespace !=
+                       self.tree.defaultNamespace and
+                       not self.parser.isHTMLIntegrationPoint(self.tree.openElements[-1]) and
+                       not self.parser.isMathMLTextIntegrationPoint(self.tree.openElements[-1])):
+                    self.tree.openElements.pop()
+                return token
+
+            else:
+                if currentNode.namespace == namespaces["mathml"]:
+                    self.parser.adjustMathMLAttributes(token)
+                elif currentNode.namespace == namespaces["svg"]:
+                    self.adjustSVGTagNames(token)
+                    self.parser.adjustSVGAttributes(token)
+                self.parser.adjustForeignAttributes(token)
+                token["namespace"] = currentNode.namespace
+                self.tree.insertElement(token)
+                if token["selfClosing"]:
+                    self.tree.openElements.pop()
+                    token["selfClosingAcknowledged"] = True
+
+        def processEndTag(self, token):
+            nodeIndex = len(self.tree.openElements) - 1
+            node = self.tree.openElements[-1]
+            if node.name != token["name"]:
+                self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+
+            while True:
+                if node.name.translate(asciiUpper2Lower) == token["name"]:
+                    # XXX this isn't in the spec but it seems necessary
+                    if self.parser.phase == self.parser.phases["inTableText"]:
+                        self.parser.phase.flushCharacters()
+                        self.parser.phase = self.parser.phase.originalPhase
+                    while self.tree.openElements.pop() != node:
+                        assert self.tree.openElements
+                    new_token = None
+                    break
+                nodeIndex -= 1
+
+                node = self.tree.openElements[nodeIndex]
+                if node.namespace != self.tree.defaultNamespace:
+                    continue
+                else:
+                    new_token = self.parser.phase.processEndTag(token)
+                    break
+            return new_token
+
+    class AfterBodyPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([("html", self.endTagHtml)])
+            self.endTagHandler.default = self.endTagOther
+
+        def processEOF(self):
+            # Stop parsing
+            pass
+
+        def processComment(self, token):
+            # This is needed because data is to be appended to the <html> element
+            # here and not to whatever is currently open.
+            self.tree.insertComment(token, self.tree.openElements[0])
+
+        def processCharacters(self, token):
+            self.parser.parseError("unexpected-char-after-body")
+            self.parser.phase = self.parser.phases["inBody"]
+            return token
+
+        def startTagHtml(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def startTagOther(self, token):
+            self.parser.parseError("unexpected-start-tag-after-body",
+                                   {"name": token["name"]})
+            self.parser.phase = self.parser.phases["inBody"]
+            return token
+
+        def endTagHtml(self, name):
+            if self.parser.innerHTML:
+                self.parser.parseError("unexpected-end-tag-after-body-innerhtml")
+            else:
+                self.parser.phase = self.parser.phases["afterAfterBody"]
+
+        def endTagOther(self, token):
+            self.parser.parseError("unexpected-end-tag-after-body",
+                                   {"name": token["name"]})
+            self.parser.phase = self.parser.phases["inBody"]
+            return token
+
+    class InFramesetPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#in-frameset
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("frameset", self.startTagFrameset),
+                ("frame", self.startTagFrame),
+                ("noframes", self.startTagNoframes)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("frameset", self.endTagFrameset)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        def processEOF(self):
+            if self.tree.openElements[-1].name != "html":
+                self.parser.parseError("eof-in-frameset")
+            else:
+                assert self.parser.innerHTML
+
+        def processCharacters(self, token):
+            self.parser.parseError("unexpected-char-in-frameset")
+
+        def startTagFrameset(self, token):
+            self.tree.insertElement(token)
+
+        def startTagFrame(self, token):
+            self.tree.insertElement(token)
+            self.tree.openElements.pop()
+
+        def startTagNoframes(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def startTagOther(self, token):
+            self.parser.parseError("unexpected-start-tag-in-frameset",
+                                   {"name": token["name"]})
+
+        def endTagFrameset(self, token):
+            if self.tree.openElements[-1].name == "html":
+                # innerHTML case
+                self.parser.parseError("unexpected-frameset-in-frameset-innerhtml")
+            else:
+                self.tree.openElements.pop()
+            if (not self.parser.innerHTML and
+                    self.tree.openElements[-1].name != "frameset"):
+                # If we're not in innerHTML mode and the the current node is not a
+                # "frameset" element (anymore) then switch.
+                self.parser.phase = self.parser.phases["afterFrameset"]
+
+        def endTagOther(self, token):
+            self.parser.parseError("unexpected-end-tag-in-frameset",
+                                   {"name": token["name"]})
+
+    class AfterFramesetPhase(Phase):
+        # http://www.whatwg.org/specs/web-apps/current-work/#after3
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("noframes", self.startTagNoframes)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("html", self.endTagHtml)
+            ])
+            self.endTagHandler.default = self.endTagOther
+
+        def processEOF(self):
+            # Stop parsing
+            pass
+
+        def processCharacters(self, token):
+            self.parser.parseError("unexpected-char-after-frameset")
+
+        def startTagNoframes(self, token):
+            return self.parser.phases["inHead"].processStartTag(token)
+
+        def startTagOther(self, token):
+            self.parser.parseError("unexpected-start-tag-after-frameset",
+                                   {"name": token["name"]})
+
+        def endTagHtml(self, token):
+            self.parser.phase = self.parser.phases["afterAfterFrameset"]
+
+        def endTagOther(self, token):
+            self.parser.parseError("unexpected-end-tag-after-frameset",
+                                   {"name": token["name"]})
+
+    class AfterAfterBodyPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+        def processEOF(self):
+            pass
+
+        def processComment(self, token):
+            self.tree.insertComment(token, self.tree.document)
+
+        def processSpaceCharacters(self, token):
+            return self.parser.phases["inBody"].processSpaceCharacters(token)
+
+        def processCharacters(self, token):
+            self.parser.parseError("expected-eof-but-got-char")
+            self.parser.phase = self.parser.phases["inBody"]
+            return token
+
+        def startTagHtml(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def startTagOther(self, token):
+            self.parser.parseError("expected-eof-but-got-start-tag",
+                                   {"name": token["name"]})
+            self.parser.phase = self.parser.phases["inBody"]
+            return token
+
+        def processEndTag(self, token):
+            self.parser.parseError("expected-eof-but-got-end-tag",
+                                   {"name": token["name"]})
+            self.parser.phase = self.parser.phases["inBody"]
+            return token
+
+    class AfterAfterFramesetPhase(Phase):
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("noframes", self.startTagNoFrames)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+        def processEOF(self):
+            pass
+
+        def processComment(self, token):
+            self.tree.insertComment(token, self.tree.document)
+
+        def processSpaceCharacters(self, token):
+            return self.parser.phases["inBody"].processSpaceCharacters(token)
+
+        def processCharacters(self, token):
+            self.parser.parseError("expected-eof-but-got-char")
+
+        def startTagHtml(self, token):
+            return self.parser.phases["inBody"].processStartTag(token)
+
+        def startTagNoFrames(self, token):
+            return self.parser.phases["inHead"].processStartTag(token)
+
+        def startTagOther(self, token):
+            self.parser.parseError("expected-eof-but-got-start-tag",
+                                   {"name": token["name"]})
+
+        def processEndTag(self, token):
+            self.parser.parseError("expected-eof-but-got-end-tag",
+                                   {"name": token["name"]})
+
+    return {
+        "initial": InitialPhase,
+        "beforeHtml": BeforeHtmlPhase,
+        "beforeHead": BeforeHeadPhase,
+        "inHead": InHeadPhase,
+        # XXX "inHeadNoscript": InHeadNoScriptPhase,
+        "afterHead": AfterHeadPhase,
+        "inBody": InBodyPhase,
+        "text": TextPhase,
+        "inTable": InTablePhase,
+        "inTableText": InTableTextPhase,
+        "inCaption": InCaptionPhase,
+        "inColumnGroup": InColumnGroupPhase,
+        "inTableBody": InTableBodyPhase,
+        "inRow": InRowPhase,
+        "inCell": InCellPhase,
+        "inSelect": InSelectPhase,
+        "inSelectInTable": InSelectInTablePhase,
+        "inForeignContent": InForeignContentPhase,
+        "afterBody": AfterBodyPhase,
+        "inFrameset": InFramesetPhase,
+        "afterFrameset": AfterFramesetPhase,
+        "afterAfterBody": AfterAfterBodyPhase,
+        "afterAfterFrameset": AfterAfterFramesetPhase,
+        # XXX after after frameset
+    }
 
 
-class AfterFramesetPhase(Phase):
-    # http://www.whatwg.org/specs/web-apps/current-work/#after3
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("noframes", self.startTagNoframes)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-        self.endTagHandler = utils.MethodDispatcher([
-            ("html", self.endTagHtml)
-        ])
-        self.endTagHandler.default = self.endTagOther
-
-    def processEOF(self):
-        #Stop parsing
-        pass
-
-    def processCharacters(self, token):
-        self.parser.parseError("unexpected-char-after-frameset")
-
-    def startTagNoframes(self, token):
-        self.parser.phases["inHead"].processStartTag(token)
-
-    def startTagOther(self, token):
-        self.parser.parseError("unexpected-start-tag-after-frameset",
-          {"name": token["name"]})
-
-    def endTagHtml(self, token):
-        self.parser.phase = self.parser.phases["afterAfterFrameset"]
-
-    def endTagOther(self, token):
-        self.parser.parseError("unexpected-end-tag-after-frameset",
-          {"name": token["name"]})
-
-
-class AfterAfterBodyPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-    def processEOF(self):
-        pass
-
-    def processComment(self, token):
-        self.tree.insertComment(token, self.tree.document)
-
-    def processSpaceCharacters(self, token):
-        self.parser.phases["inBody"].processSpaceCharacters(token)
-
-    def processCharacters(self, token):
-        self.parser.parseError("expected-eof-but-got-char")
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processCharacters(token)
-
-    def startTagHtml(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
-
-    def startTagOther(self, token):
-        self.parser.parseError("expected-eof-but-got-start-tag",
-          {"name": token["name"]})
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processStartTag(token)
-
-    def processEndTag(self, token):
-        self.parser.parseError("expected-eof-but-got-end-tag",
-          {"name": token["name"]})
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processEndTag(token)
-
-class AfterAfterFramesetPhase(Phase):
-    def __init__(self, parser, tree):
-        Phase.__init__(self, parser, tree)
-
-        self.startTagHandler = utils.MethodDispatcher([
-            ("html", self.startTagHtml),
-            ("noframes", self.startTagNoFrames)
-        ])
-        self.startTagHandler.default = self.startTagOther
-
-    def processEOF(self):
-        pass
-
-    def processComment(self, token):
-        self.tree.insertComment(token, self.tree.document)
-
-    def processSpaceCharacters(self, token):
-        self.parser.phases["inBody"].processSpaceCharacters(token)
-
-    def processCharacters(self, token):
-        self.parser.parseError("expected-eof-but-got-char")
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processCharacters(token)
-
-    def startTagHtml(self, token):
-        self.parser.phases["inBody"].processStartTag(token)
-
-    def startTagNoFrames(self, token):
-        self.parser.phases["inHead"].processStartTag(token)
-
-    def startTagOther(self, token):
-        self.parser.parseError("expected-eof-but-got-start-tag",
-          {"name": token["name"]})
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processStartTag(token)
-
-    def processEndTag(self, token):
-        self.parser.parseError("expected-eof-but-got-end-tag",
-          {"name": token["name"]})
-        self.parser.phase = self.parser.phases["inBody"]
-        self.parser.phase.processEndTag(token)
-
-def impliedTagToken(name, type="EndTag", attributes = None, 
-                    selfClosing = False):
+def impliedTagToken(name, type="EndTag", attributes=None,
+                    selfClosing=False):
     if attributes is None:
         attributes = {}
-    return {"type":tokenTypes[type], "name":name, "data":attributes,
-            "selfClosing":selfClosing}
+    return {"type": tokenTypes[type], "name": name, "data": attributes,
+            "selfClosing": selfClosing}
+
 
 class ParseError(Exception):
     """Error in parsed document"""
diff --git a/src/html5lib/ihatexml.py b/src/html5lib/ihatexml.py
index dd78563908..0fc79308ef 100644
--- a/src/html5lib/ihatexml.py
+++ b/src/html5lib/ihatexml.py
@@ -1,25 +1,105 @@
-import re
+from __future__ import absolute_import, division, unicode_literals
 
-baseChar = """[#x0041-#x005A] | [#x0061-#x007A] | [#x00C0-#x00D6] | [#x00D8-#x00F6] | [#x00F8-#x00FF] | [#x0100-#x0131] | [#x0134-#x013E] | [#x0141-#x0148] | [#x014A-#x017E] | [#x0180-#x01C3] | [#x01CD-#x01F0] | [#x01F4-#x01F5] | [#x01FA-#x0217] | [#x0250-#x02A8] | [#x02BB-#x02C1] | #x0386 | [#x0388-#x038A] | #x038C | [#x038E-#x03A1] | [#x03A3-#x03CE] | [#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 | [#x03E2-#x03F3] | [#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] | [#x045E-#x0481] | [#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] | [#x04D0-#x04EB] | [#x04EE-#x04F5] | [#x04F8-#x04F9] | [#x0531-#x0556] | #x0559 | [#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] | [#x0621-#x063A] | [#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] | [#x06C0-#x06CE] | [#x06D0-#x06D3] | #x06D5 | [#x06E5-#x06E6] | [#x0905-#x0939] | #x093D | [#x0958-#x0961] | [#x0985-#x098C] | [#x098F-#x0990] | [#x0993-#x09A8] | [#x09AA-#x09B0] | #x09B2 | [#x09B6-#x09B9] | [#x09DC-#x09DD] | [#x09DF-#x09E1] | [#x09F0-#x09F1] | [#x0A05-#x0A0A] | [#x0A0F-#x0A10] | [#x0A13-#x0A28] | [#x0A2A-#x0A30] | [#x0A32-#x0A33] | [#x0A35-#x0A36] | [#x0A38-#x0A39] | [#x0A59-#x0A5C] | #x0A5E | [#x0A72-#x0A74] | [#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] | [#x0A93-#x0AA8] | [#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] | #x0ABD | #x0AE0 | [#x0B05-#x0B0C] | [#x0B0F-#x0B10] | [#x0B13-#x0B28] | [#x0B2A-#x0B30] | [#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D | [#x0B5C-#x0B5D] | [#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] | [#x0B92-#x0B95] | [#x0B99-#x0B9A] | #x0B9C | [#x0B9E-#x0B9F] | [#x0BA3-#x0BA4] | [#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] | [#x0C05-#x0C0C] | [#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] | [#x0C35-#x0C39] | [#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] | [#x0C92-#x0CA8] | [#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE | [#x0CE0-#x0CE1] | [#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] | [#x0D2A-#x0D39] | [#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 | [#x0E32-#x0E33] | [#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 | [#x0E87-#x0E88] | #x0E8A | #x0E8D | [#x0E94-#x0E97] | [#x0E99-#x0E9F] | [#x0EA1-#x0EA3] | #x0EA5 | #x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] | #x0EB0 | [#x0EB2-#x0EB3] | #x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] | [#x0F49-#x0F69] | [#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 | [#x1102-#x1103] | [#x1105-#x1107] | #x1109 | [#x110B-#x110C] | [#x110E-#x1112] | #x113C | #x113E | #x1140 | #x114C | #x114E | #x1150 | [#x1154-#x1155] | #x1159 | [#x115F-#x1161] | #x1163 | #x1165 | #x1167 | #x1169 | [#x116D-#x116E] | [#x1172-#x1173] | #x1175 | #x119E | #x11A8 | #x11AB | [#x11AE-#x11AF] | [#x11B7-#x11B8] | #x11BA | [#x11BC-#x11C2] | #x11EB | #x11F0 | #x11F9 | [#x1E00-#x1E9B] | [#x1EA0-#x1EF9] | [#x1F00-#x1F15] | [#x1F18-#x1F1D] | [#x1F20-#x1F45] | [#x1F48-#x1F4D] | [#x1F50-#x1F57] | #x1F59 | #x1F5B | #x1F5D | [#x1F5F-#x1F7D] | [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE | [#x1FC2-#x1FC4] | [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] | [#x1FE0-#x1FEC] | [#x1FF2-#x1FF4] | [#x1FF6-#x1FFC] | #x2126 | [#x212A-#x212B] | #x212E | [#x2180-#x2182] | [#x3041-#x3094] | [#x30A1-#x30FA] | [#x3105-#x312C] | [#xAC00-#xD7A3]"""
+import re
+import warnings
+
+from .constants import DataLossWarning
+
+baseChar = """
+[#x0041-#x005A] | [#x0061-#x007A] | [#x00C0-#x00D6] | [#x00D8-#x00F6] |
+[#x00F8-#x00FF] | [#x0100-#x0131] | [#x0134-#x013E] | [#x0141-#x0148] |
+[#x014A-#x017E] | [#x0180-#x01C3] | [#x01CD-#x01F0] | [#x01F4-#x01F5] |
+[#x01FA-#x0217] | [#x0250-#x02A8] | [#x02BB-#x02C1] | #x0386 |
+[#x0388-#x038A] | #x038C | [#x038E-#x03A1] | [#x03A3-#x03CE] |
+[#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 | [#x03E2-#x03F3] |
+[#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] | [#x045E-#x0481] |
+[#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] | [#x04D0-#x04EB] |
+[#x04EE-#x04F5] | [#x04F8-#x04F9] | [#x0531-#x0556] | #x0559 |
+[#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] | [#x0621-#x063A] |
+[#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] | [#x06C0-#x06CE] |
+[#x06D0-#x06D3] | #x06D5 | [#x06E5-#x06E6] | [#x0905-#x0939] | #x093D |
+[#x0958-#x0961] | [#x0985-#x098C] | [#x098F-#x0990] | [#x0993-#x09A8] |
+[#x09AA-#x09B0] | #x09B2 | [#x09B6-#x09B9] | [#x09DC-#x09DD] |
+[#x09DF-#x09E1] | [#x09F0-#x09F1] | [#x0A05-#x0A0A] | [#x0A0F-#x0A10] |
+[#x0A13-#x0A28] | [#x0A2A-#x0A30] | [#x0A32-#x0A33] | [#x0A35-#x0A36] |
+[#x0A38-#x0A39] | [#x0A59-#x0A5C] | #x0A5E | [#x0A72-#x0A74] |
+[#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] | [#x0A93-#x0AA8] |
+[#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] | #x0ABD | #x0AE0 |
+[#x0B05-#x0B0C] | [#x0B0F-#x0B10] | [#x0B13-#x0B28] | [#x0B2A-#x0B30] |
+[#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D | [#x0B5C-#x0B5D] |
+[#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] | [#x0B92-#x0B95] |
+[#x0B99-#x0B9A] | #x0B9C | [#x0B9E-#x0B9F] | [#x0BA3-#x0BA4] |
+[#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] | [#x0C05-#x0C0C] |
+[#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] | [#x0C35-#x0C39] |
+[#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] | [#x0C92-#x0CA8] |
+[#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE | [#x0CE0-#x0CE1] |
+[#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] | [#x0D2A-#x0D39] |
+[#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 | [#x0E32-#x0E33] |
+[#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 | [#x0E87-#x0E88] | #x0E8A |
+#x0E8D | [#x0E94-#x0E97] | [#x0E99-#x0E9F] | [#x0EA1-#x0EA3] | #x0EA5 |
+#x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] | #x0EB0 | [#x0EB2-#x0EB3] |
+#x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] | [#x0F49-#x0F69] |
+[#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 | [#x1102-#x1103] |
+[#x1105-#x1107] | #x1109 | [#x110B-#x110C] | [#x110E-#x1112] | #x113C |
+#x113E | #x1140 | #x114C | #x114E | #x1150 | [#x1154-#x1155] | #x1159 |
+[#x115F-#x1161] | #x1163 | #x1165 | #x1167 | #x1169 | [#x116D-#x116E] |
+[#x1172-#x1173] | #x1175 | #x119E | #x11A8 | #x11AB | [#x11AE-#x11AF] |
+[#x11B7-#x11B8] | #x11BA | [#x11BC-#x11C2] | #x11EB | #x11F0 | #x11F9 |
+[#x1E00-#x1E9B] | [#x1EA0-#x1EF9] | [#x1F00-#x1F15] | [#x1F18-#x1F1D] |
+[#x1F20-#x1F45] | [#x1F48-#x1F4D] | [#x1F50-#x1F57] | #x1F59 | #x1F5B |
+#x1F5D | [#x1F5F-#x1F7D] | [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE |
+[#x1FC2-#x1FC4] | [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] |
+[#x1FE0-#x1FEC] | [#x1FF2-#x1FF4] | [#x1FF6-#x1FFC] | #x2126 |
+[#x212A-#x212B] | #x212E | [#x2180-#x2182] | [#x3041-#x3094] |
+[#x30A1-#x30FA] | [#x3105-#x312C] | [#xAC00-#xD7A3]"""
 
 ideographic = """[#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029]"""
 
-combiningCharacter = """[#x0300-#x0345] | [#x0360-#x0361] | [#x0483-#x0486] | [#x0591-#x05A1] | [#x05A3-#x05B9] | [#x05BB-#x05BD] | #x05BF | [#x05C1-#x05C2] | #x05C4 | [#x064B-#x0652] | #x0670 | [#x06D6-#x06DC] | [#x06DD-#x06DF] | [#x06E0-#x06E4] | [#x06E7-#x06E8] | [#x06EA-#x06ED] | [#x0901-#x0903] | #x093C | [#x093E-#x094C] | #x094D | [#x0951-#x0954] | [#x0962-#x0963] | [#x0981-#x0983] | #x09BC | #x09BE | #x09BF | [#x09C0-#x09C4] | [#x09C7-#x09C8] | [#x09CB-#x09CD] | #x09D7 | [#x09E2-#x09E3] | #x0A02 | #x0A3C | #x0A3E | #x0A3F | [#x0A40-#x0A42] | [#x0A47-#x0A48] | [#x0A4B-#x0A4D] | [#x0A70-#x0A71] | [#x0A81-#x0A83] | #x0ABC | [#x0ABE-#x0AC5] | [#x0AC7-#x0AC9] | [#x0ACB-#x0ACD] | [#x0B01-#x0B03] | #x0B3C | [#x0B3E-#x0B43] | [#x0B47-#x0B48] | [#x0B4B-#x0B4D] | [#x0B56-#x0B57] | [#x0B82-#x0B83] | [#x0BBE-#x0BC2] | [#x0BC6-#x0BC8] | [#x0BCA-#x0BCD] | #x0BD7 | [#x0C01-#x0C03] | [#x0C3E-#x0C44] | [#x0C46-#x0C48] | [#x0C4A-#x0C4D] | [#x0C55-#x0C56] | [#x0C82-#x0C83] | [#x0CBE-#x0CC4] | [#x0CC6-#x0CC8] | [#x0CCA-#x0CCD] | [#x0CD5-#x0CD6] | [#x0D02-#x0D03] | [#x0D3E-#x0D43] | [#x0D46-#x0D48] | [#x0D4A-#x0D4D] | #x0D57 | #x0E31 | [#x0E34-#x0E3A] | [#x0E47-#x0E4E] | #x0EB1 | [#x0EB4-#x0EB9] | [#x0EBB-#x0EBC] | [#x0EC8-#x0ECD] | [#x0F18-#x0F19] | #x0F35 | #x0F37 | #x0F39 | #x0F3E | #x0F3F | [#x0F71-#x0F84] | [#x0F86-#x0F8B] | [#x0F90-#x0F95] | #x0F97 | [#x0F99-#x0FAD] | [#x0FB1-#x0FB7] | #x0FB9 | [#x20D0-#x20DC] | #x20E1 | [#x302A-#x302F] | #x3099 | #x309A"""
+combiningCharacter = """
+[#x0300-#x0345] | [#x0360-#x0361] | [#x0483-#x0486] | [#x0591-#x05A1] |
+[#x05A3-#x05B9] | [#x05BB-#x05BD] | #x05BF | [#x05C1-#x05C2] | #x05C4 |
+[#x064B-#x0652] | #x0670 | [#x06D6-#x06DC] | [#x06DD-#x06DF] |
+[#x06E0-#x06E4] | [#x06E7-#x06E8] | [#x06EA-#x06ED] | [#x0901-#x0903] |
+#x093C | [#x093E-#x094C] | #x094D | [#x0951-#x0954] | [#x0962-#x0963] |
+[#x0981-#x0983] | #x09BC | #x09BE | #x09BF | [#x09C0-#x09C4] |
+[#x09C7-#x09C8] | [#x09CB-#x09CD] | #x09D7 | [#x09E2-#x09E3] | #x0A02 |
+#x0A3C | #x0A3E | #x0A3F | [#x0A40-#x0A42] | [#x0A47-#x0A48] |
+[#x0A4B-#x0A4D] | [#x0A70-#x0A71] | [#x0A81-#x0A83] | #x0ABC |
+[#x0ABE-#x0AC5] | [#x0AC7-#x0AC9] | [#x0ACB-#x0ACD] | [#x0B01-#x0B03] |
+#x0B3C | [#x0B3E-#x0B43] | [#x0B47-#x0B48] | [#x0B4B-#x0B4D] |
+[#x0B56-#x0B57] | [#x0B82-#x0B83] | [#x0BBE-#x0BC2] | [#x0BC6-#x0BC8] |
+[#x0BCA-#x0BCD] | #x0BD7 | [#x0C01-#x0C03] | [#x0C3E-#x0C44] |
+[#x0C46-#x0C48] | [#x0C4A-#x0C4D] | [#x0C55-#x0C56] | [#x0C82-#x0C83] |
+[#x0CBE-#x0CC4] | [#x0CC6-#x0CC8] | [#x0CCA-#x0CCD] | [#x0CD5-#x0CD6] |
+[#x0D02-#x0D03] | [#x0D3E-#x0D43] | [#x0D46-#x0D48] | [#x0D4A-#x0D4D] |
+#x0D57 | #x0E31 | [#x0E34-#x0E3A] | [#x0E47-#x0E4E] | #x0EB1 |
+[#x0EB4-#x0EB9] | [#x0EBB-#x0EBC] | [#x0EC8-#x0ECD] | [#x0F18-#x0F19] |
+#x0F35 | #x0F37 | #x0F39 | #x0F3E | #x0F3F | [#x0F71-#x0F84] |
+[#x0F86-#x0F8B] | [#x0F90-#x0F95] | #x0F97 | [#x0F99-#x0FAD] |
+[#x0FB1-#x0FB7] | #x0FB9 | [#x20D0-#x20DC] | #x20E1 | [#x302A-#x302F] |
+#x3099 | #x309A"""
 
-digit = """[#x0030-#x0039] | [#x0660-#x0669] | [#x06F0-#x06F9] | [#x0966-#x096F] | [#x09E6-#x09EF] | [#x0A66-#x0A6F] | [#x0AE6-#x0AEF] | [#x0B66-#x0B6F] | [#x0BE7-#x0BEF] | [#x0C66-#x0C6F] | [#x0CE6-#x0CEF] | [#x0D66-#x0D6F] | [#x0E50-#x0E59] | [#x0ED0-#x0ED9] | [#x0F20-#x0F29]"""
+digit = """
+[#x0030-#x0039] | [#x0660-#x0669] | [#x06F0-#x06F9] | [#x0966-#x096F] |
+[#x09E6-#x09EF] | [#x0A66-#x0A6F] | [#x0AE6-#x0AEF] | [#x0B66-#x0B6F] |
+[#x0BE7-#x0BEF] | [#x0C66-#x0C6F] | [#x0CE6-#x0CEF] | [#x0D66-#x0D6F] |
+[#x0E50-#x0E59] | [#x0ED0-#x0ED9] | [#x0F20-#x0F29]"""
 
-extender = """#x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 | #x0E46 | #x0EC6 | #x3005 | [#x3031-#x3035] | [#x309D-#x309E] | [#x30FC-#x30FE]"""
+extender = """
+#x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 | #x0E46 | #x0EC6 | #x3005 |
+#[#x3031-#x3035] | [#x309D-#x309E] | [#x30FC-#x30FE]"""
 
 letter = " | ".join([baseChar, ideographic])
 
-#Without the 
-name = " | ".join([letter, digit, ".", "-", "_", combiningCharacter, 
-                       extender])
+# Without the
+name = " | ".join([letter, digit, ".", "-", "_", combiningCharacter,
+                   extender])
 nameFirst = " | ".join([letter, "_"])
 
 reChar = re.compile(r"#x([\d|A-F]{4,4})")
 reCharRange = re.compile(r"\[#x([\d|A-F]{4,4})-#x([\d|A-F]{4,4})\]")
 
+
 def charStringToList(chars):
     charRanges = [item.strip() for item in chars.split(" | ")]
     rv = []
@@ -30,16 +110,17 @@ def charStringToList(chars):
             if match is not None:
                 rv.append([hexToInt(item) for item in match.groups()])
                 if len(rv[-1]) == 1:
-                    rv[-1] = rv[-1]*2
+                    rv[-1] = rv[-1] * 2
                 foundMatch = True
                 break
         if not foundMatch:
             assert len(item) == 1
-            
+
             rv.append([ord(item)] * 2)
     rv = normaliseCharList(rv)
     return rv
 
+
 def normaliseCharList(charList):
     charList = sorted(charList)
     for item in charList:
@@ -49,61 +130,69 @@ def normaliseCharList(charList):
     while i < len(charList):
         j = 1
         rv.append(charList[i])
-        while i + j < len(charList) and charList[i+j][0] <= rv[-1][1] + 1:
-            rv[-1][1] = charList[i+j][1]
+        while i + j < len(charList) and charList[i + j][0] <= rv[-1][1] + 1:
+            rv[-1][1] = charList[i + j][1]
             j += 1
         i += j
     return rv
 
-#We don't really support characters above the BMP :(
+# We don't really support characters above the BMP :(
 max_unicode = int("FFFF", 16)
-    
+
+
 def missingRanges(charList):
     rv = []
     if charList[0] != 0:
         rv.append([0, charList[0][0] - 1])
     for i, item in enumerate(charList[:-1]):
-        rv.append([item[1]+1, charList[i+1][0] - 1])
+        rv.append([item[1] + 1, charList[i + 1][0] - 1])
     if charList[-1][1] != max_unicode:
         rv.append([charList[-1][1] + 1, max_unicode])
     return rv
 
+
 def listToRegexpStr(charList):
     rv = []
     for item in charList:
         if item[0] == item[1]:
-           rv.append(escapeRegexp(unichr(item[0])))
+            rv.append(escapeRegexp(chr(item[0])))
         else:
-            rv.append(escapeRegexp(unichr(item[0])) + "-" +
-                      escapeRegexp(unichr(item[1])))
-    return "[%s]"%"".join(rv)
+            rv.append(escapeRegexp(chr(item[0])) + "-" +
+                      escapeRegexp(chr(item[1])))
+    return "[%s]" % "".join(rv)
+
 
 def hexToInt(hex_str):
     return int(hex_str, 16)
 
+
 def escapeRegexp(string):
     specialCharacters = (".", "^", "$", "*", "+", "?", "{", "}",
-                          "[", "]", "|", "(", ")", "-")
+                         "[", "]", "|", "(", ")", "-")
     for char in specialCharacters:
         string = string.replace(char, "\\" + char)
-        if char in string:
-            print string
 
     return string
 
-#output from the above
-nonXmlNameBMPRegexp = re.compile(u'[\x00-,/:-@\\[-\\^`\\{-\xb6\xb8-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u02cf\u02d2-\u02ff\u0346-\u035f\u0362-\u0385\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482\u0487-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u0590\u05a2\u05ba\u05be\u05c0\u05c3\u05c5-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u063f\u0653-\u065f\u066a-\u066f\u06b8-\u06b9\u06bf\u06cf\u06d4\u06e9\u06ee-\u06ef\u06fa-\u0900\u0904\u093a-\u093b\u094e-\u0950\u0955-\u0957\u0964-\u0965\u0970-\u0980\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09bb\u09bd\u09c5-\u09c6\u09c9-\u09ca\u09ce-\u09d6\u09d8-\u09db\u09de\u09e4-\u09e5\u09f2-\u0a01\u0a03-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a3b\u0a3d\u0a43-\u0a46\u0a49-\u0a4a\u0a4e-\u0a58\u0a5d\u0a5f-\u0a65\u0a75-\u0a80\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abb\u0ac6\u0aca\u0ace-\u0adf\u0ae1-\u0ae5\u0af0-\u0b00\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3b\u0b44-\u0b46\u0b49-\u0b4a\u0b4e-\u0b55\u0b58-\u0b5b\u0b5e\u0b62-\u0b65\u0b70-\u0b81\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0bbd\u0bc3-\u0bc5\u0bc9\u0bce-\u0bd6\u0bd8-\u0be6\u0bf0-\u0c00\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c3d\u0c45\u0c49\u0c4e-\u0c54\u0c57-\u0c5f\u0c62-\u0c65\u0c70-\u0c81\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cbd\u0cc5\u0cc9\u0cce-\u0cd4\u0cd7-\u0cdd\u0cdf\u0ce2-\u0ce5\u0cf0-\u0d01\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d3d\u0d44-\u0d45\u0d49\u0d4e-\u0d56\u0d58-\u0d5f\u0d62-\u0d65\u0d70-\u0e00\u0e2f\u0e3b-\u0e3f\u0e4f\u0e5a-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eba\u0ebe-\u0ebf\u0ec5\u0ec7\u0ece-\u0ecf\u0eda-\u0f17\u0f1a-\u0f1f\u0f2a-\u0f34\u0f36\u0f38\u0f3a-\u0f3d\u0f48\u0f6a-\u0f70\u0f85\u0f8c-\u0f8f\u0f96\u0f98\u0fae-\u0fb0\u0fb8\u0fba-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u20cf\u20dd-\u20e0\u20e2-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3004\u3006\u3008-\u3020\u3030\u3036-\u3040\u3095-\u3098\u309b-\u309c\u309f-\u30a0\u30fb\u30ff-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')
+# output from the above
+nonXmlNameBMPRegexp = re.compile('[\x00-,/:-@\\[-\\^`\\{-\xb6\xb8-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u02cf\u02d2-\u02ff\u0346-\u035f\u0362-\u0385\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482\u0487-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u0590\u05a2\u05ba\u05be\u05c0\u05c3\u05c5-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u063f\u0653-\u065f\u066a-\u066f\u06b8-\u06b9\u06bf\u06cf\u06d4\u06e9\u06ee-\u06ef\u06fa-\u0900\u0904\u093a-\u093b\u094e-\u0950\u0955-\u0957\u0964-\u0965\u0970-\u0980\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09bb\u09bd\u09c5-\u09c6\u09c9-\u09ca\u09ce-\u09d6\u09d8-\u09db\u09de\u09e4-\u09e5\u09f2-\u0a01\u0a03-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a3b\u0a3d\u0a43-\u0a46\u0a49-\u0a4a\u0a4e-\u0a58\u0a5d\u0a5f-\u0a65\u0a75-\u0a80\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abb\u0ac6\u0aca\u0ace-\u0adf\u0ae1-\u0ae5\u0af0-\u0b00\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3b\u0b44-\u0b46\u0b49-\u0b4a\u0b4e-\u0b55\u0b58-\u0b5b\u0b5e\u0b62-\u0b65\u0b70-\u0b81\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0bbd\u0bc3-\u0bc5\u0bc9\u0bce-\u0bd6\u0bd8-\u0be6\u0bf0-\u0c00\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c3d\u0c45\u0c49\u0c4e-\u0c54\u0c57-\u0c5f\u0c62-\u0c65\u0c70-\u0c81\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cbd\u0cc5\u0cc9\u0cce-\u0cd4\u0cd7-\u0cdd\u0cdf\u0ce2-\u0ce5\u0cf0-\u0d01\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d3d\u0d44-\u0d45\u0d49\u0d4e-\u0d56\u0d58-\u0d5f\u0d62-\u0d65\u0d70-\u0e00\u0e2f\u0e3b-\u0e3f\u0e4f\u0e5a-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eba\u0ebe-\u0ebf\u0ec5\u0ec7\u0ece-\u0ecf\u0eda-\u0f17\u0f1a-\u0f1f\u0f2a-\u0f34\u0f36\u0f38\u0f3a-\u0f3d\u0f48\u0f6a-\u0f70\u0f85\u0f8c-\u0f8f\u0f96\u0f98\u0fae-\u0fb0\u0fb8\u0fba-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u20cf\u20dd-\u20e0\u20e2-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3004\u3006\u3008-\u3020\u3030\u3036-\u3040\u3095-\u3098\u309b-\u309c\u309f-\u30a0\u30fb\u30ff-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')
+
+nonXmlNameFirstBMPRegexp = re.compile('[\x00-@\\[-\\^`\\{-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u0385\u0387\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u0640\u064b-\u0670\u06b8-\u06b9\u06bf\u06cf\u06d4\u06d6-\u06e4\u06e7-\u0904\u093a-\u093c\u093e-\u0957\u0962-\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09db\u09de\u09e2-\u09ef\u09f2-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a58\u0a5d\u0a5f-\u0a71\u0a75-\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abc\u0abe-\u0adf\u0ae1-\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3c\u0b3e-\u0b5b\u0b5e\u0b62-\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c5f\u0c62-\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cdd\u0cdf\u0ce2-\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d5f\u0d62-\u0e00\u0e2f\u0e31\u0e34-\u0e3f\u0e46-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eb1\u0eb4-\u0ebc\u0ebe-\u0ebf\u0ec5-\u0f3f\u0f48\u0f6a-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3006\u3008-\u3020\u302a-\u3040\u3095-\u30a0\u30fb-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')
+
+# Simpler things
+nonPubidCharRegexp = re.compile("[^\x20\x0D\x0Aa-zA-Z0-9\-\'()+,./:=?;!*#@$_%]")
 
-nonXmlNameFirstBMPRegexp = re.compile(u'[\x00-@\\[-\\^`\\{-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u0385\u0387\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u0640\u064b-\u0670\u06b8-\u06b9\u06bf\u06cf\u06d4\u06d6-\u06e4\u06e7-\u0904\u093a-\u093c\u093e-\u0957\u0962-\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09db\u09de\u09e2-\u09ef\u09f2-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a58\u0a5d\u0a5f-\u0a71\u0a75-\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abc\u0abe-\u0adf\u0ae1-\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3c\u0b3e-\u0b5b\u0b5e\u0b62-\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c5f\u0c62-\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cdd\u0cdf\u0ce2-\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d5f\u0d62-\u0e00\u0e2f\u0e31\u0e34-\u0e3f\u0e46-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eb1\u0eb4-\u0ebc\u0ebe-\u0ebf\u0ec5-\u0f3f\u0f48\u0f6a-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3006\u3008-\u3020\u302a-\u3040\u3095-\u30a0\u30fb-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')
 
 class InfosetFilter(object):
     replacementRegexp = re.compile(r"U[\dA-F]{5,5}")
-    def __init__(self, replaceChars = None,  
-                 dropXmlnsLocalName = False, 
-                 dropXmlnsAttrNs = False,
-                 preventDoubleDashComments = False,
-                 preventDashAtCommentEnd = False,
-                 replaceFormFeedCharacters = True):
+
+    def __init__(self, replaceChars=None,
+                 dropXmlnsLocalName=False,
+                 dropXmlnsAttrNs=False,
+                 preventDoubleDashComments=False,
+                 preventDashAtCommentEnd=False,
+                 replaceFormFeedCharacters=True,
+                 preventSingleQuotePubid=False):
 
         self.dropXmlnsLocalName = dropXmlnsLocalName
         self.dropXmlnsAttrNs = dropXmlnsAttrNs
@@ -113,14 +202,17 @@ class InfosetFilter(object):
 
         self.replaceFormFeedCharacters = replaceFormFeedCharacters
 
+        self.preventSingleQuotePubid = preventSingleQuotePubid
+
         self.replaceCache = {}
 
     def coerceAttribute(self, name, namespace=None):
         if self.dropXmlnsLocalName and name.startswith("xmlns:"):
-            #Need a datalosswarning here
+            warnings.warn("Attributes cannot begin with xmlns", DataLossWarning)
             return None
-        elif (self.dropXmlnsAttrNs and 
+        elif (self.dropXmlnsAttrNs and
               namespace == "http://www.w3.org/2000/xmlns/"):
+            warnings.warn("Attributes cannot be in the xml namespace", DataLossWarning)
             return None
         else:
             return self.toXmlName(name)
@@ -131,20 +223,35 @@ class InfosetFilter(object):
     def coerceComment(self, data):
         if self.preventDoubleDashComments:
             while "--" in data:
+                warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
                 data = data.replace("--", "- -")
         return data
-    
+
     def coerceCharacters(self, data):
         if self.replaceFormFeedCharacters:
+            for i in range(data.count("\x0C")):
+                warnings.warn("Text cannot contain U+000C", DataLossWarning)
             data = data.replace("\x0C", " ")
-        #Other non-xml characters
+        # Other non-xml characters
         return data
 
+    def coercePubid(self, data):
+        dataOutput = data
+        for char in nonPubidCharRegexp.findall(data):
+            warnings.warn("Coercing non-XML pubid", DataLossWarning)
+            replacement = self.getReplacementCharacter(char)
+            dataOutput = dataOutput.replace(char, replacement)
+        if self.preventSingleQuotePubid and dataOutput.find("'") >= 0:
+            warnings.warn("Pubid cannot contain single quote", DataLossWarning)
+            dataOutput = dataOutput.replace("'", self.getReplacementCharacter("'"))
+        return dataOutput
+
     def toXmlName(self, name):
         nameFirst = name[0]
         nameRest = name[1:]
         m = nonXmlNameFirstBMPRegexp.match(nameFirst)
         if m:
+            warnings.warn("Coercing non-XML name", DataLossWarning)
             nameFirstOutput = self.getReplacementCharacter(nameFirst)
         else:
             nameFirstOutput = nameFirst
@@ -152,10 +259,11 @@ class InfosetFilter(object):
         nameRestOutput = nameRest
         replaceChars = set(nonXmlNameBMPRegexp.findall(nameRest))
         for char in replaceChars:
+            warnings.warn("Coercing non-XML name", DataLossWarning)
             replacement = self.getReplacementCharacter(char)
             nameRestOutput = nameRestOutput.replace(char, replacement)
         return nameFirstOutput + nameRestOutput
-    
+
     def getReplacementCharacter(self, char):
         if char in self.replaceCache:
             replacement = self.replaceCache[char]
@@ -169,9 +277,9 @@ class InfosetFilter(object):
         return name
 
     def escapeChar(self, char):
-        replacement = "U" + hex(ord(char))[2:].upper().rjust(5, "0")
+        replacement = "U%05X" % ord(char)
         self.replaceCache[char] = replacement
         return replacement
 
     def unescapeChar(self, charcode):
-        return unichr(int(charcode[1:], 16))
+        return chr(int(charcode[1:], 16))
diff --git a/src/html5lib/inputstream.py b/src/html5lib/inputstream.py
index 8e2a3896ce..004bdd4ad9 100644
--- a/src/html5lib/inputstream.py
+++ b/src/html5lib/inputstream.py
@@ -1,18 +1,33 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+
 import codecs
 import re
-import types
-import sys
 
-from constants import EOF, spaceCharacters, asciiLetters, asciiUppercase
-from constants import encodings, ReparseException
+from .constants import EOF, spaceCharacters, asciiLetters, asciiUppercase
+from .constants import encodings, ReparseException
+from . import utils
 
-#Non-unicode versions of constants for use in the pre-parser
-spaceCharactersBytes = frozenset([str(item) for item in spaceCharacters])
-asciiLettersBytes = frozenset([str(item) for item in asciiLetters])
-asciiUppercaseBytes = frozenset([str(item) for item in asciiUppercase])
-spacesAngleBrackets = spaceCharactersBytes | frozenset([">", "<"])
+from io import StringIO
 
-invalid_unicode_re = re.compile(u"[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uD800-\uDFFF\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]")
+try:
+    from io import BytesIO
+except ImportError:
+    BytesIO = StringIO
+
+try:
+    from io import BufferedIOBase
+except ImportError:
+    class BufferedIOBase(object):
+        pass
+
+# Non-unicode versions of constants for use in the pre-parser
+spaceCharactersBytes = frozenset([item.encode("ascii") for item in spaceCharacters])
+asciiLettersBytes = frozenset([item.encode("ascii") for item in asciiLetters])
+asciiUppercaseBytes = frozenset([item.encode("ascii") for item in asciiUppercase])
+spacesAngleBrackets = spaceCharactersBytes | frozenset([b">", b"<"])
+
+invalid_unicode_re = re.compile("[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uD800-\uDFFF\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]")
 
 non_bmp_invalid_codepoints = set([0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
                                   0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF,
@@ -22,22 +37,23 @@ non_bmp_invalid_codepoints = set([0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
                                   0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF,
                                   0x10FFFE, 0x10FFFF])
 
-ascii_punctuation_re = re.compile(ur"[\u0009-\u000D\u0020-\u002F\u003A-\u0040\u005B-\u0060\u007B-\u007E]")
+ascii_punctuation_re = re.compile("[\u0009-\u000D\u0020-\u002F\u003A-\u0040\u005B-\u0060\u007B-\u007E]")
 
 # Cache for charsUntil()
 charsUntilRegEx = {}
-        
-class BufferedStream:
+
+
+class BufferedStream(object):
     """Buffering for streams that do not have buffering of their own
 
-    The buffer is implemented as a list of chunks on the assumption that 
+    The buffer is implemented as a list of chunks on the assumption that
     joining many strings will be slow since it is O(n**2)
     """
-    
+
     def __init__(self, stream):
         self.stream = stream
         self.buffer = []
-        self.position = [-1,0] #chunk number, offset
+        self.position = [-1, 0]  # chunk number, offset
 
     def tell(self):
         pos = 0
@@ -47,11 +63,11 @@ class BufferedStream:
         return pos
 
     def seek(self, pos):
-        assert pos < self._bufferedBytes()
+        assert pos <= self._bufferedBytes()
         offset = pos
         i = 0
         while len(self.buffer[i]) < offset:
-            offset -= pos
+            offset -= len(self.buffer[i])
             i += 1
         self.position = [i, offset]
 
@@ -63,7 +79,7 @@ class BufferedStream:
             return self._readStream(bytes)
         else:
             return self._readFromBuffer(bytes)
-    
+
     def _bufferedBytes(self):
         return sum([len(item) for item in self.buffer])
 
@@ -82,7 +98,7 @@ class BufferedStream:
         while bufferIndex < len(self.buffer) and remainingBytes != 0:
             assert remainingBytes > 0
             bufferedData = self.buffer[bufferIndex]
-            
+
             if remainingBytes <= len(bufferedData) - bufferOffset:
                 bytesToRead = remainingBytes
                 self.position = [bufferIndex, bufferOffset + bytesToRead]
@@ -90,20 +106,33 @@ class BufferedStream:
                 bytesToRead = len(bufferedData) - bufferOffset
                 self.position = [bufferIndex, len(bufferedData)]
                 bufferIndex += 1
-            data = rv.append(bufferedData[bufferOffset: 
-                                          bufferOffset + bytesToRead])
+            rv.append(bufferedData[bufferOffset:bufferOffset + bytesToRead])
             remainingBytes -= bytesToRead
 
             bufferOffset = 0
 
         if remainingBytes:
             rv.append(self._readStream(remainingBytes))
-        
-        return "".join(rv)
-        
+
+        return b"".join(rv)
 
 
-class HTMLInputStream:
+def HTMLInputStream(source, encoding=None, parseMeta=True, chardet=True):
+    if hasattr(source, "read"):
+        isUnicode = isinstance(source.read(0), text_type)
+    else:
+        isUnicode = isinstance(source, text_type)
+
+    if isUnicode:
+        if encoding is not None:
+            raise TypeError("Cannot explicitly set an encoding with a unicode string")
+
+        return HTMLUnicodeInputStream(source)
+    else:
+        return HTMLBinaryInputStream(source, encoding, parseMeta, chardet)
+
+
+class HTMLUnicodeInputStream(object):
     """Provides a unicode stream of characters to the HTMLTokenizer.
 
     This class takes care of character encoding and removing or replacing
@@ -113,7 +142,7 @@ class HTMLInputStream:
 
     _defaultChunkSize = 10240
 
-    def __init__(self, source, encoding=None, parseMeta=True, chardet=True):
+    def __init__(self, source):
         """Initialises the HTMLInputStream.
 
         HTMLInputStream(source, [encoding]) -> Normalized stream from source
@@ -125,47 +154,29 @@ class HTMLInputStream:
         the encoding.  If specified, that encoding will be used,
         regardless of any BOM or later declaration (such as in a meta
         element)
-        
+
         parseMeta - Look for a <meta> element containing encoding information
 
         """
 
-        #Craziness
-        if len(u"\U0010FFFF") == 1:
+        # Craziness
+        if len("\U0010FFFF") == 1:
             self.reportCharacterErrors = self.characterErrorsUCS4
+            self.replaceCharactersRegexp = re.compile("[\uD800-\uDFFF]")
         else:
             self.reportCharacterErrors = self.characterErrorsUCS2
+            self.replaceCharactersRegexp = re.compile("([\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF])")
 
         # List of where new lines occur
         self.newLines = [0]
 
-        self.charEncoding = (codecName(encoding), "certain")
-
-        # Raw Stream - for unicode objects this will encode to utf-8 and set
-        #              self.charEncoding as appropriate
-        self.rawStream = self.openStream(source)
-
-        # Encoding Information
-        #Number of bytes to use when looking for a meta element with
-        #encoding information
-        self.numBytesMeta = 512
-        #Number of bytes to use when using detecting encoding using chardet
-        self.numBytesChardet = 100
-        #Encoding to use if no other information can be found
-        self.defaultEncoding = "windows-1252"
-        
-        #Detect encoding iff no explicit "transport level" encoding is supplied
-        if (self.charEncoding[0] is None):
-            self.charEncoding = self.detectEncoding(parseMeta, chardet)
-
+        self.charEncoding = ("utf-8", "certain")
+        self.dataStream = self.openStream(source)
 
         self.reset()
 
     def reset(self):
-        self.dataStream = codecs.getreader(self.charEncoding[0])(self.rawStream,
-                                                                 'replace')
-
-        self.chunk = u""
+        self.chunk = ""
         self.chunkSize = 0
         self.chunkOffset = 0
         self.errors = []
@@ -174,9 +185,9 @@ class HTMLInputStream:
         self.prevNumLines = 0
         # number of columns in the last line of the previous chunk
         self.prevNumCols = 0
-        
-        #Flag to indicate we may have a CR LF broken across a data chunk
-        self._lastChunkEndsWithCR = False
+
+        # Deal with CR LF and surrogates split over chunk boundaries
+        self._bufferedCharacter = None
 
     def openStream(self, source):
         """Produces a file object from source.
@@ -188,122 +199,15 @@ class HTMLInputStream:
         if hasattr(source, 'read'):
             stream = source
         else:
-            # Otherwise treat source as a string and convert to a file object
-            if isinstance(source, unicode):
-                source = source.encode('utf-8')
-                self.charEncoding = ("utf-8", "certain")
-            import cStringIO
-            stream = cStringIO.StringIO(str(source))
-
-        if (not(hasattr(stream, "tell") and hasattr(stream, "seek")) or
-            stream is sys.stdin):
-            stream = BufferedStream(stream)
+            stream = StringIO(source)
 
         return stream
 
-    def detectEncoding(self, parseMeta=True, chardet=True):
-        #First look for a BOM
-        #This will also read past the BOM if present
-        encoding = self.detectBOM()
-        confidence = "certain"
-        #If there is no BOM need to look for meta elements with encoding 
-        #information
-        if encoding is None and parseMeta:
-            encoding = self.detectEncodingMeta()
-            confidence = "tentative"
-        #Guess with chardet, if avaliable
-        if encoding is None and chardet:
-            confidence = "tentative"
-            try:
-                from chardet.universaldetector import UniversalDetector
-                buffers = []
-                detector = UniversalDetector()
-                while not detector.done:
-                    buffer = self.rawStream.read(self.numBytesChardet)
-                    if not buffer:
-                        break
-                    buffers.append(buffer)
-                    detector.feed(buffer)
-                detector.close()
-                encoding = detector.result['encoding']
-                self.rawStream.seek(0)
-            except ImportError:
-                pass
-        # If all else fails use the default encoding
-        if encoding is None:
-            confidence="tentative"
-            encoding = self.defaultEncoding
-        
-        #Substitute for equivalent encodings:
-        encodingSub = {"iso-8859-1":"windows-1252"}
-
-        if encoding.lower() in encodingSub:
-            encoding = encodingSub[encoding.lower()]
-
-        return encoding, confidence
-
-    def changeEncoding(self, newEncoding):
-        newEncoding = codecName(newEncoding)
-        if newEncoding in ("utf-16", "utf-16-be", "utf-16-le"):
-            newEncoding = "utf-8"
-        if newEncoding is None:
-            return
-        elif newEncoding == self.charEncoding[0]:
-            self.charEncoding = (self.charEncoding[0], "certain")
-        else:
-            self.rawStream.seek(0)
-            self.reset()
-            self.charEncoding = (newEncoding, "certain")
-            raise ReparseException, "Encoding changed from %s to %s"%(self.charEncoding[0], newEncoding)
-            
-    def detectBOM(self):
-        """Attempts to detect at BOM at the start of the stream. If
-        an encoding can be determined from the BOM return the name of the
-        encoding otherwise return None"""
-        bomDict = {
-            codecs.BOM_UTF8: 'utf-8',
-            codecs.BOM_UTF16_LE: 'utf-16-le', codecs.BOM_UTF16_BE: 'utf-16-be',
-            codecs.BOM_UTF32_LE: 'utf-32-le', codecs.BOM_UTF32_BE: 'utf-32-be'
-        }
-
-        # Go to beginning of file and read in 4 bytes
-        string = self.rawStream.read(4)
-
-        # Try detecting the BOM using bytes from the string
-        encoding = bomDict.get(string[:3])         # UTF-8
-        seek = 3
-        if not encoding:
-            # Need to detect UTF-32 before UTF-16
-            encoding = bomDict.get(string)         # UTF-32
-            seek = 4
-            if not encoding:
-                encoding = bomDict.get(string[:2]) # UTF-16
-                seek = 2
-
-        # Set the read position past the BOM if one was found, otherwise
-        # set it to the start of the stream
-        self.rawStream.seek(encoding and seek or 0)
-
-        return encoding
-
-    def detectEncodingMeta(self):
-        """Report the encoding declared by the meta element
-        """
-        buffer = self.rawStream.read(self.numBytesMeta)
-        parser = EncodingParser(buffer)
-        self.rawStream.seek(0)
-        encoding = parser.getEncoding()
-        
-        if encoding in ("utf-16", "utf-16-be", "utf-16-le"):
-            encoding = "utf-8"
-
-        return encoding
-
     def _position(self, offset):
         chunk = self.chunk
-        nLines = chunk.count(u'\n', 0, offset)
+        nLines = chunk.count('\n', 0, offset)
         positionLine = self.prevNumLines + nLines
-        lastLinePos = chunk.rfind(u'\n', 0, offset)
+        lastLinePos = chunk.rfind('\n', 0, offset)
         if lastLinePos == -1:
             positionColumn = self.prevNumCols + offset
         else:
@@ -313,7 +217,7 @@ class HTMLInputStream:
     def position(self):
         """Returns (line, col) of the current position in the stream."""
         line, col = self._position(self.chunkOffset)
-        return (line+1, col)
+        return (line + 1, col)
 
     def char(self):
         """ Read one character from the stream or queue if available. Return
@@ -336,27 +240,34 @@ class HTMLInputStream:
 
         self.prevNumLines, self.prevNumCols = self._position(self.chunkSize)
 
-        self.chunk = u""
+        self.chunk = ""
         self.chunkSize = 0
         self.chunkOffset = 0
 
         data = self.dataStream.read(chunkSize)
 
-        if not data:
+        # Deal with CR LF and surrogates broken across chunks
+        if self._bufferedCharacter:
+            data = self._bufferedCharacter + data
+            self._bufferedCharacter = None
+        elif not data:
+            # We have no more data, bye-bye stream
             return False
-        
+
+        if len(data) > 1:
+            lastv = ord(data[-1])
+            if lastv == 0x0D or 0xD800 <= lastv <= 0xDBFF:
+                self._bufferedCharacter = data[-1]
+                data = data[:-1]
+
         self.reportCharacterErrors(data)
 
-        data = data.replace(u"\u0000", u"\ufffd")
-        #Check for CR LF broken across chunks
-        if (self._lastChunkEndsWithCR and data[0] == u"\n"):
-            data = data[1:]
-            # Stop if the chunk is now empty
-            if not data:
-                return False
-        self._lastChunkEndsWithCR = data[-1] == u"\r"
-        data = data.replace(u"\r\n", u"\n")
-        data = data.replace(u"\r", u"\n")
+        # Replace invalid characters
+        # Note U+0000 is dealt with in the tokenizer
+        data = self.replaceCharactersRegexp.sub("\ufffd", data)
+
+        data = data.replace("\r\n", "\n")
+        data = data.replace("\r", "\n")
 
         self.chunk = data
         self.chunkSize = len(data)
@@ -364,32 +275,22 @@ class HTMLInputStream:
         return True
 
     def characterErrorsUCS4(self, data):
-        for i in xrange(data.count(u"\u0000")):
-            self.errors.append("null-character")
-        for i in xrange(len(invalid_unicode_re.findall(data))):
+        for i in range(len(invalid_unicode_re.findall(data))):
             self.errors.append("invalid-codepoint")
 
     def characterErrorsUCS2(self, data):
-        #Someone picked the wrong compile option
-        #You lose
-        for i in xrange(data.count(u"\u0000")):
-            self.errors.append("null-character")
+        # Someone picked the wrong compile option
+        # You lose
         skip = False
-        import sys
         for match in invalid_unicode_re.finditer(data):
             if skip:
                 continue
             codepoint = ord(match.group())
             pos = match.start()
-            #Pretty sure there should be endianness issues here
-            if (codepoint >= 0xD800 and codepoint <= 0xDBFF and
-                pos < len(data) - 1 and
-                ord(data[pos + 1]) >= 0xDC00 and
-                ord(data[pos + 1]) <= 0xDFFF):
-                #We have a surrogate pair!
-                #From a perl manpage
-                char_val = (0x10000 + (codepoint - 0xD800) * 0x400 + 
-                            (ord(data[pos + 1]) - 0xDC00))
+            # Pretty sure there should be endianness issues here
+            if utils.isSurrogatePair(data[pos:pos + 2]):
+                # We have a surrogate pair!
+                char_val = utils.surrogatePairToCodepoint(data[pos:pos + 2])
                 if char_val in non_bmp_invalid_codepoints:
                     self.errors.append("invalid-codepoint")
                 skip = True
@@ -399,10 +300,8 @@ class HTMLInputStream:
             else:
                 skip = False
                 self.errors.append("invalid-codepoint")
-        #This is still wrong if it is possible for a surrogate pair to break a
-        #chunk boundary
 
-    def charsUntil(self, characters, opposite = False):
+    def charsUntil(self, characters, opposite=False):
         """ Returns a string of characters from the stream up to but not
         including any character in 'characters' or EOF. 'characters' must be
         a container that supports the 'in' method and iteration over its
@@ -414,12 +313,12 @@ class HTMLInputStream:
             chars = charsUntilRegEx[(characters, opposite)]
         except KeyError:
             if __debug__:
-                for c in characters: 
+                for c in characters:
                     assert(ord(c) < 128)
-            regex = u"".join([u"\\x%02x" % ord(c) for c in characters])
+            regex = "".join(["\\x%02x" % ord(c) for c in characters])
             if not opposite:
-                regex = u"^%s" % regex
-            chars = charsUntilRegEx[(characters, opposite)] = re.compile(u"[%s]+" % regex)
+                regex = "^%s" % regex
+            chars = charsUntilRegEx[(characters, opposite)] = re.compile("[%s]+" % regex)
 
         rv = []
 
@@ -446,27 +345,12 @@ class HTMLInputStream:
                 # Reached EOF
                 break
 
-        r = u"".join(rv)
-        return r
-
-    def charsUntilEOF(self):
-        """ Returns a string of characters from the stream up to EOF."""
-
-        rv = []
-
-        while True:
-            rv.append(self.chunk[self.chunkOffset:])
-            if not self.readChunk():
-                # Reached EOF
-                break
-
-        r = u"".join(rv)
+        r = "".join(rv)
         return r
 
     def unget(self, char):
         # Only one character is allowed to be ungotten at once - it must
         # be consumed again before any further call to unget
-
         if char is not None:
             if self.chunkOffset == 0:
                 # unget is called quite rarely, so it's a good idea to do
@@ -480,26 +364,210 @@ class HTMLInputStream:
                 self.chunkOffset -= 1
                 assert self.chunk[self.chunkOffset] == char
 
-class EncodingBytes(str):
+
+class HTMLBinaryInputStream(HTMLUnicodeInputStream):
+    """Provides a unicode stream of characters to the HTMLTokenizer.
+
+    This class takes care of character encoding and removing or replacing
+    incorrect byte-sequences and also provides column and line tracking.
+
+    """
+
+    def __init__(self, source, encoding=None, parseMeta=True, chardet=True):
+        """Initialises the HTMLInputStream.
+
+        HTMLInputStream(source, [encoding]) -> Normalized stream from source
+        for use by html5lib.
+
+        source can be either a file-object, local filename or a string.
+
+        The optional encoding parameter must be a string that indicates
+        the encoding.  If specified, that encoding will be used,
+        regardless of any BOM or later declaration (such as in a meta
+        element)
+
+        parseMeta - Look for a <meta> element containing encoding information
+
+        """
+        # Raw Stream - for unicode objects this will encode to utf-8 and set
+        #              self.charEncoding as appropriate
+        self.rawStream = self.openStream(source)
+
+        HTMLUnicodeInputStream.__init__(self, self.rawStream)
+
+        self.charEncoding = (codecName(encoding), "certain")
+
+        # Encoding Information
+        # Number of bytes to use when looking for a meta element with
+        # encoding information
+        self.numBytesMeta = 512
+        # Number of bytes to use when using detecting encoding using chardet
+        self.numBytesChardet = 100
+        # Encoding to use if no other information can be found
+        self.defaultEncoding = "windows-1252"
+
+        # Detect encoding iff no explicit "transport level" encoding is supplied
+        if (self.charEncoding[0] is None):
+            self.charEncoding = self.detectEncoding(parseMeta, chardet)
+
+        # Call superclass
+        self.reset()
+
+    def reset(self):
+        self.dataStream = codecs.getreader(self.charEncoding[0])(self.rawStream,
+                                                                 'replace')
+        HTMLUnicodeInputStream.reset(self)
+
+    def openStream(self, source):
+        """Produces a file object from source.
+
+        source can be either a file object, local filename or a string.
+
+        """
+        # Already a file object
+        if hasattr(source, 'read'):
+            stream = source
+        else:
+            stream = BytesIO(source)
+
+        try:
+            stream.seek(stream.tell())
+        except:
+            stream = BufferedStream(stream)
+
+        return stream
+
+    def detectEncoding(self, parseMeta=True, chardet=True):
+        # First look for a BOM
+        # This will also read past the BOM if present
+        encoding = self.detectBOM()
+        confidence = "certain"
+        # If there is no BOM need to look for meta elements with encoding
+        # information
+        if encoding is None and parseMeta:
+            encoding = self.detectEncodingMeta()
+            confidence = "tentative"
+        # Guess with chardet, if avaliable
+        if encoding is None and chardet:
+            confidence = "tentative"
+            try:
+                try:
+                    from charade.universaldetector import UniversalDetector
+                except ImportError:
+                    from chardet.universaldetector import UniversalDetector
+                buffers = []
+                detector = UniversalDetector()
+                while not detector.done:
+                    buffer = self.rawStream.read(self.numBytesChardet)
+                    assert isinstance(buffer, bytes)
+                    if not buffer:
+                        break
+                    buffers.append(buffer)
+                    detector.feed(buffer)
+                detector.close()
+                encoding = detector.result['encoding']
+                self.rawStream.seek(0)
+            except ImportError:
+                pass
+        # If all else fails use the default encoding
+        if encoding is None:
+            confidence = "tentative"
+            encoding = self.defaultEncoding
+
+        # Substitute for equivalent encodings:
+        encodingSub = {"iso-8859-1": "windows-1252"}
+
+        if encoding.lower() in encodingSub:
+            encoding = encodingSub[encoding.lower()]
+
+        return encoding, confidence
+
+    def changeEncoding(self, newEncoding):
+        assert self.charEncoding[1] != "certain"
+        newEncoding = codecName(newEncoding)
+        if newEncoding in ("utf-16", "utf-16-be", "utf-16-le"):
+            newEncoding = "utf-8"
+        if newEncoding is None:
+            return
+        elif newEncoding == self.charEncoding[0]:
+            self.charEncoding = (self.charEncoding[0], "certain")
+        else:
+            self.rawStream.seek(0)
+            self.reset()
+            self.charEncoding = (newEncoding, "certain")
+            raise ReparseException("Encoding changed from %s to %s" % (self.charEncoding[0], newEncoding))
+
+    def detectBOM(self):
+        """Attempts to detect at BOM at the start of the stream. If
+        an encoding can be determined from the BOM return the name of the
+        encoding otherwise return None"""
+        bomDict = {
+            codecs.BOM_UTF8: 'utf-8',
+            codecs.BOM_UTF16_LE: 'utf-16-le', codecs.BOM_UTF16_BE: 'utf-16-be',
+            codecs.BOM_UTF32_LE: 'utf-32-le', codecs.BOM_UTF32_BE: 'utf-32-be'
+        }
+
+        # Go to beginning of file and read in 4 bytes
+        string = self.rawStream.read(4)
+        assert isinstance(string, bytes)
+
+        # Try detecting the BOM using bytes from the string
+        encoding = bomDict.get(string[:3])         # UTF-8
+        seek = 3
+        if not encoding:
+            # Need to detect UTF-32 before UTF-16
+            encoding = bomDict.get(string)         # UTF-32
+            seek = 4
+            if not encoding:
+                encoding = bomDict.get(string[:2])  # UTF-16
+                seek = 2
+
+        # Set the read position past the BOM if one was found, otherwise
+        # set it to the start of the stream
+        self.rawStream.seek(encoding and seek or 0)
+
+        return encoding
+
+    def detectEncodingMeta(self):
+        """Report the encoding declared by the meta element
+        """
+        buffer = self.rawStream.read(self.numBytesMeta)
+        assert isinstance(buffer, bytes)
+        parser = EncodingParser(buffer)
+        self.rawStream.seek(0)
+        encoding = parser.getEncoding()
+
+        if encoding in ("utf-16", "utf-16-be", "utf-16-le"):
+            encoding = "utf-8"
+
+        return encoding
+
+
+class EncodingBytes(bytes):
     """String-like object with an associated position and various extra methods
     If the position is ever greater than the string length then an exception is
     raised"""
     def __new__(self, value):
-        return str.__new__(self, value.lower())
+        assert isinstance(value, bytes)
+        return bytes.__new__(self, value.lower())
 
     def __init__(self, value):
-        self._position=-1
-    
+        self._position = -1
+
     def __iter__(self):
         return self
-    
-    def next(self):
+
+    def __next__(self):
         p = self._position = self._position + 1
         if p >= len(self):
             raise StopIteration
         elif p < 0:
             raise TypeError
-        return self[p]
+        return self[p:p + 1]
+
+    def next(self):
+        # Py2 compat
+        return self.__next__()
 
     def previous(self):
         p = self._position
@@ -508,13 +576,13 @@ class EncodingBytes(str):
         elif p < 0:
             raise TypeError
         self._position = p = p - 1
-        return self[p]
-    
+        return self[p:p + 1]
+
     def setPosition(self, position):
         if self._position >= len(self):
             raise StopIteration
         self._position = position
-    
+
     def getPosition(self):
         if self._position >= len(self):
             raise StopIteration
@@ -522,19 +590,19 @@ class EncodingBytes(str):
             return self._position
         else:
             return None
-    
+
     position = property(getPosition, setPosition)
 
     def getCurrentByte(self):
-        return self[self.position]
-    
+        return self[self.position:self.position + 1]
+
     currentByte = property(getCurrentByte)
 
     def skip(self, chars=spaceCharactersBytes):
         """Skip past a list of characters"""
         p = self.position               # use property for the error-checking
         while p < len(self):
-            c = self[p]
+            c = self[p:p + 1]
             if c not in chars:
                 self._position = p
                 return c
@@ -545,7 +613,7 @@ class EncodingBytes(str):
     def skipUntil(self, chars):
         p = self.position
         while p < len(self):
-            c = self[p]
+            c = self[p:p + 1]
             if c in chars:
                 self._position = p
                 return c
@@ -554,16 +622,16 @@ class EncodingBytes(str):
         return None
 
     def matchBytes(self, bytes):
-        """Look for a sequence of bytes at the start of a string. If the bytes 
-        are found return True and advance the position to the byte after the 
+        """Look for a sequence of bytes at the start of a string. If the bytes
+        are found return True and advance the position to the byte after the
         match. Otherwise return False and leave the position alone"""
         p = self.position
-        data = self[p:p+len(bytes)]
+        data = self[p:p + len(bytes)]
         rv = data.startswith(bytes)
         if rv:
             self.position += len(bytes)
         return rv
-    
+
     def jumpTo(self, bytes):
         """Look for the next sequence of bytes matching a given sequence. If
         a match is found advance the position to the last byte of the match"""
@@ -572,11 +640,12 @@ class EncodingBytes(str):
             # XXX: This is ugly, but I can't see a nicer way to fix this.
             if self._position == -1:
                 self._position = 0
-            self._position += (newPosition + len(bytes)-1)
+            self._position += (newPosition + len(bytes) - 1)
             return True
         else:
             raise StopIteration
 
+
 class EncodingParser(object):
     """Mini parser for detecting character encoding from meta elements"""
 
@@ -587,147 +656,158 @@ class EncodingParser(object):
 
     def getEncoding(self):
         methodDispatch = (
-            ("<!--",self.handleComment),
-            ("<meta",self.handleMeta),
-            ("</",self.handlePossibleEndTag),
-            ("<!",self.handleOther),
-            ("<?",self.handleOther),
-            ("<",self.handlePossibleStartTag))
+            (b"<!--", self.handleComment),
+            (b"<meta", self.handleMeta),
+            (b"</", self.handlePossibleEndTag),
+            (b"<!", self.handleOther),
+            (b"<?", self.handleOther),
+            (b"<", self.handlePossibleStartTag))
         for byte in self.data:
             keepParsing = True
             for key, method in methodDispatch:
                 if self.data.matchBytes(key):
                     try:
-                        keepParsing = method()    
+                        keepParsing = method()
                         break
                     except StopIteration:
-                        keepParsing=False
+                        keepParsing = False
                         break
             if not keepParsing:
                 break
-        
+
         return self.encoding
 
     def handleComment(self):
         """Skip over comments"""
-        return self.data.jumpTo("-->")
+        return self.data.jumpTo(b"-->")
 
     def handleMeta(self):
         if self.data.currentByte not in spaceCharactersBytes:
-            #if we have <meta not followed by a space so just keep going
+            # if we have <meta not followed by a space so just keep going
             return True
-        #We have a valid meta element we want to search for attributes
+        # We have a valid meta element we want to search for attributes
+        hasPragma = False
+        pendingEncoding = None
         while True:
-            #Try to find the next attribute after the current position
+            # Try to find the next attribute after the current position
             attr = self.getAttribute()
             if attr is None:
                 return True
             else:
-                if attr[0] == "charset":
+                if attr[0] == b"http-equiv":
+                    hasPragma = attr[1] == b"content-type"
+                    if hasPragma and pendingEncoding is not None:
+                        self.encoding = pendingEncoding
+                        return False
+                elif attr[0] == b"charset":
                     tentativeEncoding = attr[1]
                     codec = codecName(tentativeEncoding)
                     if codec is not None:
                         self.encoding = codec
                         return False
-                elif attr[0] == "content":
+                elif attr[0] == b"content":
                     contentParser = ContentAttrParser(EncodingBytes(attr[1]))
                     tentativeEncoding = contentParser.parse()
-                    codec = codecName(tentativeEncoding)
-                    if codec is not None:
-                        self.encoding = codec
-                        return False
+                    if tentativeEncoding is not None:
+                        codec = codecName(tentativeEncoding)
+                        if codec is not None:
+                            if hasPragma:
+                                self.encoding = codec
+                                return False
+                            else:
+                                pendingEncoding = codec
 
     def handlePossibleStartTag(self):
         return self.handlePossibleTag(False)
 
     def handlePossibleEndTag(self):
-        self.data.next()
+        next(self.data)
         return self.handlePossibleTag(True)
 
     def handlePossibleTag(self, endTag):
         data = self.data
         if data.currentByte not in asciiLettersBytes:
-            #If the next byte is not an ascii letter either ignore this
-            #fragment (possible start tag case) or treat it according to 
-            #handleOther
+            # If the next byte is not an ascii letter either ignore this
+            # fragment (possible start tag case) or treat it according to
+            # handleOther
             if endTag:
                 data.previous()
                 self.handleOther()
             return True
-        
+
         c = data.skipUntil(spacesAngleBrackets)
-        if c == "<":
-            #return to the first step in the overall "two step" algorithm
-            #reprocessing the < byte
+        if c == b"<":
+            # return to the first step in the overall "two step" algorithm
+            # reprocessing the < byte
             data.previous()
         else:
-            #Read all attributes
+            # Read all attributes
             attr = self.getAttribute()
             while attr is not None:
                 attr = self.getAttribute()
         return True
 
     def handleOther(self):
-        return self.data.jumpTo(">")
+        return self.data.jumpTo(b">")
 
     def getAttribute(self):
-        """Return a name,value pair for the next attribute in the stream, 
+        """Return a name,value pair for the next attribute in the stream,
         if one is found, or None"""
         data = self.data
         # Step 1 (skip chars)
-        c = data.skip(spaceCharactersBytes | frozenset("/"))
+        c = data.skip(spaceCharactersBytes | frozenset([b"/"]))
+        assert c is None or len(c) == 1
         # Step 2
-        if c in (">", None):
+        if c in (b">", None):
             return None
         # Step 3
         attrName = []
         attrValue = []
-        #Step 4 attribute name
+        # Step 4 attribute name
         while True:
-            if c == "=" and attrName:   
+            if c == b"=" and attrName:
                 break
             elif c in spaceCharactersBytes:
-                #Step 6!
+                # Step 6!
                 c = data.skip()
-                c = data.next()
                 break
-            elif c in ("/", ">"):
-                return "".join(attrName), ""
+            elif c in (b"/", b">"):
+                return b"".join(attrName), b""
             elif c in asciiUppercaseBytes:
                 attrName.append(c.lower())
-            elif c == None:
+            elif c is None:
                 return None
             else:
                 attrName.append(c)
-            #Step 5
-            c = data.next()
-        #Step 7
-        if c != "=":
+            # Step 5
+            c = next(data)
+        # Step 7
+        if c != b"=":
             data.previous()
-            return "".join(attrName), ""
-        #Step 8
-        data.next()
-        #Step 9
+            return b"".join(attrName), b""
+        # Step 8
+        next(data)
+        # Step 9
         c = data.skip()
-        #Step 10
-        if c in ("'", '"'):
-            #10.1
+        # Step 10
+        if c in (b"'", b'"'):
+            # 10.1
             quoteChar = c
             while True:
-                #10.2
-                c = data.next()
-                #10.3
+                # 10.2
+                c = next(data)
+                # 10.3
                 if c == quoteChar:
-                    data.next()
-                    return "".join(attrName), "".join(attrValue)
-                #10.4
+                    next(data)
+                    return b"".join(attrName), b"".join(attrValue)
+                # 10.4
                 elif c in asciiUppercaseBytes:
                     attrValue.append(c.lower())
-                #10.5
+                # 10.5
                 else:
                     attrValue.append(c)
-        elif c == ">":
-            return "".join(attrName), ""
+        elif c == b">":
+            return b"".join(attrName), b""
         elif c in asciiUppercaseBytes:
             attrValue.append(c.lower())
         elif c is None:
@@ -736,9 +816,9 @@ class EncodingParser(object):
             attrValue.append(c)
         # Step 11
         while True:
-            c = data.next()
+            c = next(data)
             if c in spacesAngleBrackets:
-                return "".join(attrName), "".join(attrValue)
+                return b"".join(attrName), b"".join(attrValue)
             elif c in asciiUppercaseBytes:
                 attrValue.append(c.lower())
             elif c is None:
@@ -749,21 +829,23 @@ class EncodingParser(object):
 
 class ContentAttrParser(object):
     def __init__(self, data):
+        assert isinstance(data, bytes)
         self.data = data
+
     def parse(self):
         try:
-            #Check if the attr name is charset 
-            #otherwise return
-            self.data.jumpTo("charset")
+            # Check if the attr name is charset
+            # otherwise return
+            self.data.jumpTo(b"charset")
             self.data.position += 1
             self.data.skip()
-            if not self.data.currentByte == "=":
-                #If there is no = sign keep looking for attrs
+            if not self.data.currentByte == b"=":
+                # If there is no = sign keep looking for attrs
                 return None
             self.data.position += 1
             self.data.skip()
-            #Look for an encoding between matching quote marks
-            if self.data.currentByte in ('"', "'"):
+            # Look for an encoding between matching quote marks
+            if self.data.currentByte in (b'"', b"'"):
                 quoteMark = self.data.currentByte
                 self.data.position += 1
                 oldPosition = self.data.position
@@ -772,13 +854,13 @@ class ContentAttrParser(object):
                 else:
                     return None
             else:
-                #Unquoted value
+                # Unquoted value
                 oldPosition = self.data.position
                 try:
                     self.data.skipUntil(spaceCharactersBytes)
                     return self.data[oldPosition:self.data.position]
                 except StopIteration:
-                    #Return the whole remaining value
+                    # Return the whole remaining value
                     return self.data[oldPosition:]
         except StopIteration:
             return None
@@ -787,7 +869,12 @@ class ContentAttrParser(object):
 def codecName(encoding):
     """Return the python codec name corresponding to an encoding or None if the
     string doesn't correspond to a valid encoding."""
-    if (encoding is not None and type(encoding) in types.StringTypes):
+    if isinstance(encoding, bytes):
+        try:
+            encoding = encoding.decode("ascii")
+        except UnicodeDecodeError:
+            return None
+    if encoding:
         canonicalName = ascii_punctuation_re.sub("", encoding).lower()
         return encodings.get(canonicalName, None)
     else:
diff --git a/src/html5lib/sanitizer.py b/src/html5lib/sanitizer.py
index d0f994600b..71dc5212c1 100644
--- a/src/html5lib/sanitizer.py
+++ b/src/html5lib/sanitizer.py
@@ -1,125 +1,145 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import re
 from xml.sax.saxutils import escape, unescape
 
-from tokenizer import HTMLTokenizer
-from constants import tokenTypes
+from .tokenizer import HTMLTokenizer
+from .constants import tokenTypes
+
 
 class HTMLSanitizerMixin(object):
     """ sanitization of XHTML+MathML+SVG and of inline style attributes."""
 
-    acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b',
-        'big', 'blockquote', 'br', 'button', 'caption', 'center', 'cite',
-        'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
-        'em', 'fieldset', 'font', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-        'hr', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'map',
-        'menu', 'ol', 'optgroup', 'option', 'p', 'pre', 'q', 's', 'samp',
-        'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
-        'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u',
-        'ul', 'var']
-      
+    acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area',
+                           'article', 'aside', 'audio', 'b', 'big', 'blockquote', 'br', 'button',
+                           'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
+                           'command', 'datagrid', 'datalist', 'dd', 'del', 'details', 'dfn',
+                           'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'event-source', 'fieldset',
+                           'figcaption', 'figure', 'footer', 'font', 'form', 'header', 'h1',
+                           'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'input', 'ins',
+                           'keygen', 'kbd', 'label', 'legend', 'li', 'm', 'map', 'menu', 'meter',
+                           'multicol', 'nav', 'nextid', 'ol', 'output', 'optgroup', 'option',
+                           'p', 'pre', 'progress', 'q', 's', 'samp', 'section', 'select',
+                           'small', 'sound', 'source', 'spacer', 'span', 'strike', 'strong',
+                           'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'time', 'tfoot',
+                           'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video']
+
     mathml_elements = ['maction', 'math', 'merror', 'mfrac', 'mi',
-        'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom',
-        'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle', 'msub',
-        'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
-        'munderover', 'none']
-      
+                       'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom',
+                       'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle', 'msub',
+                       'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
+                       'munderover', 'none']
+
     svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
-        'animateTransform', 'circle', 'defs', 'desc', 'ellipse', 'font-face',
-        'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern', 
-        'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph',
-        'mpath', 'path', 'polygon', 'polyline', 'radialGradient', 'rect',
-        'set', 'stop', 'svg', 'switch', 'text', 'title', 'tspan', 'use']
-        
+                    'animateTransform', 'clipPath', 'circle', 'defs', 'desc', 'ellipse',
+                    'font-face', 'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern',
+                    'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph',
+                    'mpath', 'path', 'polygon', 'polyline', 'radialGradient', 'rect',
+                    'set', 'stop', 'svg', 'switch', 'text', 'title', 'tspan', 'use']
+
     acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
-        'action', 'align', 'alt', 'axis', 'border', 'cellpadding',
-        'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class',
-        'clear', 'cols', 'colspan', 'color', 'compact', 'coords', 'datetime',
-        'dir', 'disabled', 'enctype', 'for', 'frame', 'headers', 'height',
-        'href', 'hreflang', 'hspace', 'id', 'ismap', 'label', 'lang',
-        'longdesc', 'maxlength', 'media', 'method', 'multiple', 'name',
-        'nohref', 'noshade', 'nowrap', 'prompt', 'readonly', 'rel', 'rev',
-        'rows', 'rowspan', 'rules', 'scope', 'selected', 'shape', 'size',
-        'span', 'src', 'start', 'style', 'summary', 'tabindex', 'target',
-        'title', 'type', 'usemap', 'valign', 'value', 'vspace', 'width',
-        'xml:lang']
+                             'action', 'align', 'alt', 'autocomplete', 'autofocus', 'axis',
+                             'background', 'balance', 'bgcolor', 'bgproperties', 'border',
+                             'bordercolor', 'bordercolordark', 'bordercolorlight', 'bottompadding',
+                             'cellpadding', 'cellspacing', 'ch', 'challenge', 'char', 'charoff',
+                             'choff', 'charset', 'checked', 'cite', 'class', 'clear', 'color',
+                             'cols', 'colspan', 'compact', 'contenteditable', 'controls', 'coords',
+                             'data', 'datafld', 'datapagesize', 'datasrc', 'datetime', 'default',
+                             'delay', 'dir', 'disabled', 'draggable', 'dynsrc', 'enctype', 'end',
+                             'face', 'for', 'form', 'frame', 'galleryimg', 'gutter', 'headers',
+                             'height', 'hidefocus', 'hidden', 'high', 'href', 'hreflang', 'hspace',
+                             'icon', 'id', 'inputmode', 'ismap', 'keytype', 'label', 'leftspacing',
+                             'lang', 'list', 'longdesc', 'loop', 'loopcount', 'loopend',
+                             'loopstart', 'low', 'lowsrc', 'max', 'maxlength', 'media', 'method',
+                             'min', 'multiple', 'name', 'nohref', 'noshade', 'nowrap', 'open',
+                             'optimum', 'pattern', 'ping', 'point-size', 'poster', 'pqg', 'preload',
+                             'prompt', 'radiogroup', 'readonly', 'rel', 'repeat-max', 'repeat-min',
+                             'replace', 'required', 'rev', 'rightspacing', 'rows', 'rowspan',
+                             'rules', 'scope', 'selected', 'shape', 'size', 'span', 'src', 'start',
+                             'step', 'style', 'summary', 'suppress', 'tabindex', 'target',
+                             'template', 'title', 'toppadding', 'type', 'unselectable', 'usemap',
+                             'urn', 'valign', 'value', 'variable', 'volume', 'vspace', 'vrml',
+                             'width', 'wrap', 'xml:lang']
 
     mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
-        'columnalign', 'columnlines', 'columnspacing', 'columnspan', 'depth',
-        'display', 'displaystyle', 'equalcolumns', 'equalrows', 'fence',
-        'fontstyle', 'fontweight', 'frame', 'height', 'linethickness', 'lspace',
-        'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant', 'maxsize',
-        'minsize', 'other', 'rowalign', 'rowalign', 'rowalign', 'rowlines',
-        'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
-        'separator', 'stretchy', 'width', 'width', 'xlink:href', 'xlink:show',
-        'xlink:type', 'xmlns', 'xmlns:xlink']
-  
-    svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
-         'arabic-form', 'ascent', 'attributeName', 'attributeType',
-         'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
-         'class', 'color', 'color-rendering', 'content', 'cx', 'cy', 'd', 'dx',
-         'dy', 'descent', 'display', 'dur', 'end', 'fill', 'fill-opacity',
-         'fill-rule', 'font-family', 'font-size', 'font-stretch', 'font-style',
-         'font-variant', 'font-weight', 'from', 'fx', 'fy', 'g1', 'g2',
-         'glyph-name', 'gradientUnits', 'hanging', 'height', 'horiz-adv-x',
-         'horiz-origin-x', 'id', 'ideographic', 'k', 'keyPoints',
-         'keySplines', 'keyTimes', 'lang', 'marker-end', 'marker-mid',
-         'marker-start', 'markerHeight', 'markerUnits', 'markerWidth',
-         'mathematical', 'max', 'min', 'name', 'offset', 'opacity', 'orient',
-         'origin', 'overline-position', 'overline-thickness', 'panose-1',
-         'path', 'pathLength', 'points', 'preserveAspectRatio', 'r', 'refX',
-         'refY', 'repeatCount', 'repeatDur', 'requiredExtensions',
-         'requiredFeatures', 'restart', 'rotate', 'rx', 'ry', 'slope',
-         'stemh', 'stemv', 'stop-color', 'stop-opacity',
-         'strikethrough-position', 'strikethrough-thickness', 'stroke',
-         'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
-         'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity',
-         'stroke-width', 'systemLanguage', 'target', 'text-anchor', 'to',
-         'transform', 'type', 'u1', 'u2', 'underline-position',
-         'underline-thickness', 'unicode', 'unicode-range', 'units-per-em',
-         'values', 'version', 'viewBox', 'visibility', 'width', 'widths', 'x',
-         'x-height', 'x1', 'x2', 'xlink:actuate', 'xlink:arcrole',
-         'xlink:href', 'xlink:role', 'xlink:show', 'xlink:title',
-         'xlink:type', 'xml:base', 'xml:lang', 'xml:space', 'xmlns',
-         'xmlns:xlink', 'y', 'y1', 'y2', 'zoomAndPan']
+                         'columnalign', 'columnlines', 'columnspacing', 'columnspan', 'depth',
+                         'display', 'displaystyle', 'equalcolumns', 'equalrows', 'fence',
+                         'fontstyle', 'fontweight', 'frame', 'height', 'linethickness', 'lspace',
+                         'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant', 'maxsize',
+                         'minsize', 'other', 'rowalign', 'rowalign', 'rowalign', 'rowlines',
+                         'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
+                         'separator', 'stretchy', 'width', 'width', 'xlink:href', 'xlink:show',
+                         'xlink:type', 'xmlns', 'xmlns:xlink']
 
-    attr_val_is_uri = ['href', 'src', 'cite', 'action', 'longdesc',
-         'xlink:href', 'xml:base']
+    svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
+                      'arabic-form', 'ascent', 'attributeName', 'attributeType',
+                      'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
+                      'class', 'clip-path', 'color', 'color-rendering', 'content', 'cx',
+                      'cy', 'd', 'dx', 'dy', 'descent', 'display', 'dur', 'end', 'fill',
+                      'fill-opacity', 'fill-rule', 'font-family', 'font-size',
+                      'font-stretch', 'font-style', 'font-variant', 'font-weight', 'from',
+                      'fx', 'fy', 'g1', 'g2', 'glyph-name', 'gradientUnits', 'hanging',
+                      'height', 'horiz-adv-x', 'horiz-origin-x', 'id', 'ideographic', 'k',
+                      'keyPoints', 'keySplines', 'keyTimes', 'lang', 'marker-end',
+                      'marker-mid', 'marker-start', 'markerHeight', 'markerUnits',
+                      'markerWidth', 'mathematical', 'max', 'min', 'name', 'offset',
+                      'opacity', 'orient', 'origin', 'overline-position',
+                      'overline-thickness', 'panose-1', 'path', 'pathLength', 'points',
+                      'preserveAspectRatio', 'r', 'refX', 'refY', 'repeatCount',
+                      'repeatDur', 'requiredExtensions', 'requiredFeatures', 'restart',
+                      'rotate', 'rx', 'ry', 'slope', 'stemh', 'stemv', 'stop-color',
+                      'stop-opacity', 'strikethrough-position', 'strikethrough-thickness',
+                      'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
+                      'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity',
+                      'stroke-width', 'systemLanguage', 'target', 'text-anchor', 'to',
+                      'transform', 'type', 'u1', 'u2', 'underline-position',
+                      'underline-thickness', 'unicode', 'unicode-range', 'units-per-em',
+                      'values', 'version', 'viewBox', 'visibility', 'width', 'widths', 'x',
+                      'x-height', 'x1', 'x2', 'xlink:actuate', 'xlink:arcrole',
+                      'xlink:href', 'xlink:role', 'xlink:show', 'xlink:title', 'xlink:type',
+                      'xml:base', 'xml:lang', 'xml:space', 'xmlns', 'xmlns:xlink', 'y',
+                      'y1', 'y2', 'zoomAndPan']
+
+    attr_val_is_uri = ['href', 'src', 'cite', 'action', 'longdesc', 'poster',
+                       'xlink:href', 'xml:base']
 
     svg_attr_val_allows_ref = ['clip-path', 'color-profile', 'cursor', 'fill',
-      'filter', 'marker', 'marker-start', 'marker-mid', 'marker-end', 'mask', 'stroke']
+                               'filter', 'marker', 'marker-start', 'marker-mid', 'marker-end',
+                               'mask', 'stroke']
+
+    svg_allow_local_href = ['altGlyph', 'animate', 'animateColor',
+                            'animateMotion', 'animateTransform', 'cursor', 'feImage', 'filter',
+                            'linearGradient', 'pattern', 'radialGradient', 'textpath', 'tref',
+                            'set', 'use']
 
-    svg_allow_local_href = ['altGlyph', 'animate', 'animateColor', 'animateMotion',
-      'animateTransform', 'cursor', 'feImage', 'filter', 'linearGradient', 'pattern',
-      'radialGradient', 'textpath', 'tref', 'set', 'use']
-  
     acceptable_css_properties = ['azimuth', 'background-color',
-        'border-bottom-color', 'border-collapse', 'border-color',
-        'border-left-color', 'border-right-color', 'border-top-color', 'clear',
-        'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
-        'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight',
-        'height', 'letter-spacing', 'line-height', 'overflow', 'pause',
-        'pause-after', 'pause-before', 'pitch', 'pitch-range', 'richness',
-        'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
-        'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
-        'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
-        'white-space', 'width']
-  
+                                 'border-bottom-color', 'border-collapse', 'border-color',
+                                 'border-left-color', 'border-right-color', 'border-top-color', 'clear',
+                                 'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
+                                 'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight',
+                                 'height', 'letter-spacing', 'line-height', 'overflow', 'pause',
+                                 'pause-after', 'pause-before', 'pitch', 'pitch-range', 'richness',
+                                 'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
+                                 'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
+                                 'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
+                                 'white-space', 'width']
+
     acceptable_css_keywords = ['auto', 'aqua', 'black', 'block', 'blue',
-        'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
-        'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
-        'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
-        'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
-        'transparent', 'underline', 'white', 'yellow']
-  
-    acceptable_svg_properties = [ 'fill', 'fill-opacity', 'fill-rule',
-        'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
-        'stroke-opacity']
-  
-    acceptable_protocols = [ 'ed2k', 'ftp', 'http', 'https', 'irc',
-        'mailto', 'news', 'gopher', 'nntp', 'telnet', 'webcal',
-        'xmpp', 'callto', 'feed', 'urn', 'aim', 'rsync', 'tag',
-        'ssh', 'sftp', 'rtsp', 'afs' ]
-  
+                               'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
+                               'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
+                               'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
+                               'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
+                               'transparent', 'underline', 'white', 'yellow']
+
+    acceptable_svg_properties = ['fill', 'fill-opacity', 'fill-rule',
+                                 'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
+                                 'stroke-opacity']
+
+    acceptable_protocols = ['ed2k', 'ftp', 'http', 'https', 'irc',
+                            'mailto', 'news', 'gopher', 'nntp', 'telnet', 'webcal',
+                            'xmpp', 'callto', 'feed', 'urn', 'aim', 'rsync', 'tag',
+                            'ssh', 'sftp', 'rtsp', 'afs']
+
     # subclasses may define their own versions of these constants
     allowed_elements = acceptable_elements + mathml_elements + svg_elements
     allowed_attributes = acceptable_attributes + mathml_attributes + svg_attributes
@@ -140,88 +160,109 @@ class HTMLSanitizerMixin(object):
     #   sanitize_html('<a href="javascript: sucker();">Click here for $100</a>')
     #    => <a>Click here for $100</a>
     def sanitize_token(self, token):
-        if token["type"] in (tokenTypes["StartTag"], tokenTypes["EndTag"], 
-                             tokenTypes["EmptyTag"]):
+
+        # accommodate filters which use token_type differently
+        token_type = token["type"]
+        if token_type in list(tokenTypes.keys()):
+            token_type = tokenTypes[token_type]
+
+        if token_type in (tokenTypes["StartTag"], tokenTypes["EndTag"],
+                          tokenTypes["EmptyTag"]):
             if token["name"] in self.allowed_elements:
-                if token.has_key("data"):
-                    attrs = dict([(name,val) for name,val in
-                                  token["data"][::-1] 
-                                  if name in self.allowed_attributes])
-                    for attr in self.attr_val_is_uri:
-                        if not attrs.has_key(attr):
-                            continue
-                        val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
-                                               unescape(attrs[attr])).lower()
-                        #remove replacement characters from unescaped characters
-                        val_unescaped = val_unescaped.replace(u"\ufffd", "")
-                        if (re.match("^[a-z0-9][-+.a-z0-9]*:",val_unescaped) and
-                            (val_unescaped.split(':')[0] not in 
-                             self.allowed_protocols)):
-                            del attrs[attr]
-                    for attr in self.svg_attr_val_allows_ref:
-                        if attr in attrs:
-                            attrs[attr] = re.sub(r'url\s*\(\s*[^#\s][^)]+?\)',
-                                                 ' ',
-                                                 unescape(attrs[attr]))
-                    if (token["name"] in self.svg_allow_local_href and
-                        'xlink:href' in attrs and re.search('^\s*[^#\s].*',
-                                                            attrs['xlink:href'])):
-                        del attrs['xlink:href']
-                    if attrs.has_key('style'):
-                        attrs['style'] = self.sanitize_css(attrs['style'])
-                    token["data"] = [[name,val] for name,val in attrs.items()]
-                return token
+                return self.allowed_token(token, token_type)
             else:
-                if token["type"] == tokenTypes["EndTag"]:
-                    token["data"] = "</%s>" % token["name"]
-                elif token["data"]:
-                    attrs = ''.join([' %s="%s"' % (k,escape(v)) for k,v in token["data"]])
-                    token["data"] = "<%s%s>" % (token["name"],attrs)
-                else:
-                    token["data"] = "<%s>" % token["name"]
-                if token["selfClosing"]:
-                    token["data"]=token["data"][:-1] + "/>"
-                token["type"] = tokenTypes["Characters"]
-                del token["name"]
-                return token
-        elif token["type"] == tokenTypes["Comment"]:
+                return self.disallowed_token(token, token_type)
+        elif token_type == tokenTypes["Comment"]:
             pass
         else:
             return token
 
+    def allowed_token(self, token, token_type):
+        if "data" in token:
+            attrs = dict([(name, val) for name, val in
+                          token["data"][::-1]
+                          if name in self.allowed_attributes])
+            for attr in self.attr_val_is_uri:
+                if attr not in attrs:
+                    continue
+                val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
+                                       unescape(attrs[attr])).lower()
+                # remove replacement characters from unescaped characters
+                val_unescaped = val_unescaped.replace("\ufffd", "")
+                if (re.match("^[a-z0-9][-+.a-z0-9]*:", val_unescaped) and
+                    (val_unescaped.split(':')[0] not in
+                     self.allowed_protocols)):
+                    del attrs[attr]
+            for attr in self.svg_attr_val_allows_ref:
+                if attr in attrs:
+                    attrs[attr] = re.sub(r'url\s*\(\s*[^#\s][^)]+?\)',
+                                         ' ',
+                                         unescape(attrs[attr]))
+            if (token["name"] in self.svg_allow_local_href and
+                'xlink:href' in attrs and re.search('^\s*[^#\s].*',
+                                                    attrs['xlink:href'])):
+                del attrs['xlink:href']
+            if 'style' in attrs:
+                attrs['style'] = self.sanitize_css(attrs['style'])
+            token["data"] = [[name, val] for name, val in list(attrs.items())]
+        return token
+
+    def disallowed_token(self, token, token_type):
+        if token_type == tokenTypes["EndTag"]:
+            token["data"] = "</%s>" % token["name"]
+        elif token["data"]:
+            attrs = ''.join([' %s="%s"' % (k, escape(v)) for k, v in token["data"]])
+            token["data"] = "<%s%s>" % (token["name"], attrs)
+        else:
+            token["data"] = "<%s>" % token["name"]
+        if token.get("selfClosing"):
+            token["data"] = token["data"][:-1] + "/>"
+
+        if token["type"] in list(tokenTypes.keys()):
+            token["type"] = "Characters"
+        else:
+            token["type"] = tokenTypes["Characters"]
+
+        del token["name"]
+        return token
+
     def sanitize_css(self, style):
         # disallow urls
-        style=re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ',style)
+        style = re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
 
         # gauntlet
-        if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style): return ''
-        if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style): return ''
+        if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
+            return ''
+        if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
+            return ''
 
         clean = []
-        for prop,value in re.findall("([-\w]+)\s*:\s*([^:;]*)",style):
-          if not value: continue
-          if prop.lower() in self.allowed_css_properties:
-              clean.append(prop + ': ' + value + ';')
-          elif prop.split('-')[0].lower() in ['background','border','margin',
-                                              'padding']:
-              for keyword in value.split():
-                  if not keyword in self.acceptable_css_keywords and \
-                      not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$",keyword):
-                      break
-              else:
-                  clean.append(prop + ': ' + value + ';')
-          elif prop.lower() in self.allowed_svg_properties:
-              clean.append(prop + ': ' + value + ';')
+        for prop, value in re.findall("([-\w]+)\s*:\s*([^:;]*)", style):
+            if not value:
+                continue
+            if prop.lower() in self.allowed_css_properties:
+                clean.append(prop + ': ' + value + ';')
+            elif prop.split('-')[0].lower() in ['background', 'border', 'margin',
+                                                'padding']:
+                for keyword in value.split():
+                    if not keyword in self.acceptable_css_keywords and \
+                            not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):
+                        break
+                else:
+                    clean.append(prop + ': ' + value + ';')
+            elif prop.lower() in self.allowed_svg_properties:
+                clean.append(prop + ': ' + value + ';')
 
         return ' '.join(clean)
 
+
 class HTMLSanitizer(HTMLTokenizer, HTMLSanitizerMixin):
     def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
-                 lowercaseElementName=False, lowercaseAttrName=False):
-        #Change case matching defaults as we only output lowercase html anyway
-        #This solution doesn't seem ideal...
+                 lowercaseElementName=False, lowercaseAttrName=False, parser=None):
+        # Change case matching defaults as we only output lowercase html anyway
+        # This solution doesn't seem ideal...
         HTMLTokenizer.__init__(self, stream, encoding, parseMeta, useChardet,
-                               lowercaseElementName, lowercaseAttrName)
+                               lowercaseElementName, lowercaseAttrName, parser=parser)
 
     def __iter__(self):
         for token in HTMLTokenizer.__iter__(self):
diff --git a/src/html5lib/serializer/__init__.py b/src/html5lib/serializer/__init__.py
index 1b746655d6..8380839a6d 100644
--- a/src/html5lib/serializer/__init__.py
+++ b/src/html5lib/serializer/__init__.py
@@ -1,17 +1,16 @@
+from __future__ import absolute_import, division, unicode_literals
 
-from html5lib import treewalkers
+from .. import treewalkers
 
-from htmlserializer import HTMLSerializer
-from xhtmlserializer import XHTMLSerializer
+from .htmlserializer import HTMLSerializer
 
-def serialize(input, tree="simpletree", format="html", encoding=None,
+
+def serialize(input, tree="etree", format="html", encoding=None,
               **serializer_opts):
     # XXX: Should we cache this?
-    walker = treewalkers.getTreeWalker(tree) 
+    walker = treewalkers.getTreeWalker(tree)
     if format == "html":
         s = HTMLSerializer(**serializer_opts)
-    elif format == "xhtml":
-        s = XHTMLSerializer(**serializer_opts)
     else:
-        raise ValueError, "type must be either html or xhtml"
+        raise ValueError("type must be html")
     return s.render(walker(input), encoding)
diff --git a/src/html5lib/serializer/htmlserializer.py b/src/html5lib/serializer/htmlserializer.py
index a95072a897..412a5a2209 100644
--- a/src/html5lib/serializer/htmlserializer.py
+++ b/src/html5lib/serializer/htmlserializer.py
@@ -1,18 +1,20 @@
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import ImmutableSet as frozenset
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
 
 import gettext
 _ = gettext.gettext
 
-from html5lib.constants import voidElements, booleanAttributes, spaceCharacters
-from html5lib.constants import rcdataElements
+try:
+    from functools import reduce
+except ImportError:
+    pass
 
+from ..constants import voidElements, booleanAttributes, spaceCharacters
+from ..constants import rcdataElements, entities, xmlEntities
+from .. import utils
 from xml.sax.saxutils import escape
 
-spaceCharacters = u"".join(spaceCharacters)
+spaceCharacters = "".join(spaceCharacters)
 
 try:
     from codecs import register_error, xmlcharrefreplace_errors
@@ -21,27 +23,48 @@ except ImportError:
 else:
     unicode_encode_errors = "htmlentityreplace"
 
-    from html5lib.constants import entities
-
     encode_entity_map = {}
-    for k, v in entities.items():
-        if v != "&" and encode_entity_map.get(v) != k.lower():
-            # prefer &lt; over &LT; and similarly for &amp;, &gt;, etc.
-            encode_entity_map[v] = k
+    is_ucs4 = len("\U0010FFFF") == 1
+    for k, v in list(entities.items()):
+        # skip multi-character entities
+        if ((is_ucs4 and len(v) > 1) or
+                (not is_ucs4 and len(v) > 2)):
+            continue
+        if v != "&":
+            if len(v) == 2:
+                v = utils.surrogatePairToCodepoint(v)
+            else:
+                v = ord(v)
+            if not v in encode_entity_map or k.islower():
+                # prefer &lt; over &LT; and similarly for &amp;, &gt;, etc.
+                encode_entity_map[v] = k
 
     def htmlentityreplace_errors(exc):
         if isinstance(exc, (UnicodeEncodeError, UnicodeTranslateError)):
             res = []
-            for c in exc.object[exc.start:exc.end]:
-                e = encode_entity_map.get(c)
+            codepoints = []
+            skip = False
+            for i, c in enumerate(exc.object[exc.start:exc.end]):
+                if skip:
+                    skip = False
+                    continue
+                index = i + exc.start
+                if utils.isSurrogatePair(exc.object[index:min([exc.end, index + 2])]):
+                    codepoint = utils.surrogatePairToCodepoint(exc.object[index:index + 2])
+                    skip = True
+                else:
+                    codepoint = ord(c)
+                codepoints.append(codepoint)
+            for cp in codepoints:
+                e = encode_entity_map.get(cp)
                 if e:
                     res.append("&")
                     res.append(e)
                     if not e.endswith(";"):
                         res.append(";")
                 else:
-                    res.append(c.encode(exc.encoding, "xmlcharrefreplace"))
-            return (u"".join(res), exc.end)
+                    res.append("&#x%s;" % (hex(cp)[2:]))
+            return ("".join(res), exc.end)
         else:
             return xmlcharrefreplace_errors(exc)
 
@@ -49,125 +72,185 @@ else:
 
     del register_error
 
-def encode(text, encoding):
-    return text.encode(encoding, unicode_encode_errors)
 
 class HTMLSerializer(object):
 
+    # attribute quoting options
     quote_attr_values = False
     quote_char = '"'
     use_best_quote_char = True
-    minimize_boolean_attributes = True
 
+    # tag syntax options
+    omit_optional_tags = True
+    minimize_boolean_attributes = True
     use_trailing_solidus = False
     space_before_trailing_solidus = True
+
+    # escaping options
     escape_lt_in_attrs = False
     escape_rcdata = False
+    resolve_entities = True
 
+    # miscellaneous options
+    alphabetical_attributes = False
     inject_meta_charset = True
     strip_whitespace = False
     sanitize = False
-    omit_optional_tags = True
 
     options = ("quote_attr_values", "quote_char", "use_best_quote_char",
-          "minimize_boolean_attributes", "use_trailing_solidus",
-          "space_before_trailing_solidus", "omit_optional_tags",
-          "strip_whitespace", "inject_meta_charset", "escape_lt_in_attrs",
-          "escape_rcdata", 'use_trailing_solidus', "sanitize")
+               "omit_optional_tags", "minimize_boolean_attributes",
+               "use_trailing_solidus", "space_before_trailing_solidus",
+               "escape_lt_in_attrs", "escape_rcdata", "resolve_entities",
+               "alphabetical_attributes", "inject_meta_charset",
+               "strip_whitespace", "sanitize")
 
     def __init__(self, **kwargs):
-        if kwargs.has_key('quote_char'):
+        """Initialize HTMLSerializer.
+
+        Keyword options (default given first unless specified) include:
+
+        inject_meta_charset=True|False
+          Whether it insert a meta element to define the character set of the
+          document.
+        quote_attr_values=True|False
+          Whether to quote attribute values that don't require quoting
+          per HTML5 parsing rules.
+        quote_char=u'"'|u"'"
+          Use given quote character for attribute quoting. Default is to
+          use double quote unless attribute value contains a double quote,
+          in which case single quotes are used instead.
+        escape_lt_in_attrs=False|True
+          Whether to escape < in attribute values.
+        escape_rcdata=False|True
+          Whether to escape characters that need to be escaped within normal
+          elements within rcdata elements such as style.
+        resolve_entities=True|False
+          Whether to resolve named character entities that appear in the
+          source tree. The XML predefined entities &lt; &gt; &amp; &quot; &apos;
+          are unaffected by this setting.
+        strip_whitespace=False|True
+          Whether to remove semantically meaningless whitespace. (This
+          compresses all whitespace to a single space except within pre.)
+        minimize_boolean_attributes=True|False
+          Shortens boolean attributes to give just the attribute value,
+          for example <input disabled="disabled"> becomes <input disabled>.
+        use_trailing_solidus=False|True
+          Includes a close-tag slash at the end of the start tag of void
+          elements (empty elements whose end tag is forbidden). E.g. <hr/>.
+        space_before_trailing_solidus=True|False
+          Places a space immediately before the closing slash in a tag
+          using a trailing solidus. E.g. <hr />. Requires use_trailing_solidus.
+        sanitize=False|True
+          Strip all unsafe or unknown constructs from output.
+          See `html5lib user documentation`_
+        omit_optional_tags=True|False
+          Omit start/end tags that are optional.
+        alphabetical_attributes=False|True
+          Reorder attributes to be in alphabetical order.
+
+        .. _html5lib user documentation: http://code.google.com/p/html5lib/wiki/UserDocumentation
+        """
+        if 'quote_char' in kwargs:
             self.use_best_quote_char = False
         for attr in self.options:
             setattr(self, attr, kwargs.get(attr, getattr(self, attr)))
         self.errors = []
         self.strict = False
 
+    def encode(self, string):
+        assert(isinstance(string, text_type))
+        if self.encoding:
+            return string.encode(self.encoding, unicode_encode_errors)
+        else:
+            return string
+
+    def encodeStrict(self, string):
+        assert(isinstance(string, text_type))
+        if self.encoding:
+            return string.encode(self.encoding, "strict")
+        else:
+            return string
+
     def serialize(self, treewalker, encoding=None):
+        self.encoding = encoding
         in_cdata = False
         self.errors = []
+
         if encoding and self.inject_meta_charset:
-            from html5lib.filters.inject_meta_charset import Filter
+            from ..filters.inject_meta_charset import Filter
             treewalker = Filter(treewalker, encoding)
-        # XXX: WhitespaceFilter should be used before OptionalTagFilter
+        # WhitespaceFilter should be used before OptionalTagFilter
         # for maximum efficiently of this latter filter
         if self.strip_whitespace:
-            from html5lib.filters.whitespace import Filter
+            from ..filters.whitespace import Filter
             treewalker = Filter(treewalker)
         if self.sanitize:
-            from html5lib.filters.sanitizer import Filter
+            from ..filters.sanitizer import Filter
             treewalker = Filter(treewalker)
         if self.omit_optional_tags:
-            from html5lib.filters.optionaltags import Filter
+            from ..filters.optionaltags import Filter
             treewalker = Filter(treewalker)
+        # Alphabetical attributes must be last, as other filters
+        # could add attributes and alter the order
+        if self.alphabetical_attributes:
+            from ..filters.alphabeticalattributes import Filter
+            treewalker = Filter(treewalker)
+
         for token in treewalker:
             type = token["type"]
             if type == "Doctype":
-                doctype = u"<!DOCTYPE %s" % token["name"]
-                
+                doctype = "<!DOCTYPE %s" % token["name"]
+
                 if token["publicId"]:
-                    doctype += u' PUBLIC "%s"' % token["publicId"]
+                    doctype += ' PUBLIC "%s"' % token["publicId"]
                 elif token["systemId"]:
-                    doctype += u" SYSTEM"
-                if token["systemId"]:                
-                    if token["systemId"].find(u'"') >= 0:
-                        if token["systemId"].find(u"'") >= 0:
+                    doctype += " SYSTEM"
+                if token["systemId"]:
+                    if token["systemId"].find('"') >= 0:
+                        if token["systemId"].find("'") >= 0:
                             self.serializeError(_("System identifer contains both single and double quote characters"))
-                        quote_char = u"'"
+                        quote_char = "'"
                     else:
-                        quote_char = u'"'
-                    doctype += u" %s%s%s" % (quote_char, token["systemId"], quote_char)
-                
-                doctype += u">"
-                
-                if encoding:
-                    yield doctype.encode(encoding)
-                else:
-                    yield doctype
+                        quote_char = '"'
+                    doctype += " %s%s%s" % (quote_char, token["systemId"], quote_char)
+
+                doctype += ">"
+                yield self.encodeStrict(doctype)
 
             elif type in ("Characters", "SpaceCharacters"):
                 if type == "SpaceCharacters" or in_cdata:
                     if in_cdata and token["data"].find("</") >= 0:
                         self.serializeError(_("Unexpected </ in CDATA"))
-                    if encoding:
-                        yield token["data"].encode(encoding, "strict")
-                    else:
-                        yield token["data"]
-                elif encoding:
-                    yield encode(escape(token["data"]), encoding)
+                    yield self.encode(token["data"])
                 else:
-                    yield escape(token["data"])
+                    yield self.encode(escape(token["data"]))
 
             elif type in ("StartTag", "EmptyTag"):
                 name = token["name"]
+                yield self.encodeStrict("<%s" % name)
                 if name in rcdataElements and not self.escape_rcdata:
                     in_cdata = True
                 elif in_cdata:
                     self.serializeError(_("Unexpected child element of a CDATA element"))
-                attrs = token["data"]
-                if hasattr(attrs, "items"):
-                    attrs = attrs.items()
-                attrs.sort()
-                attributes = []
-                for k,v in attrs:
-                    if encoding:
-                        k = k.encode(encoding, "strict")
-                    attributes.append(' ')
+                for (attr_namespace, attr_name), attr_value in token["data"].items():
+                    # TODO: Add namespace support here
+                    k = attr_name
+                    v = attr_value
+                    yield self.encodeStrict(' ')
 
-                    attributes.append(k)
+                    yield self.encodeStrict(k)
                     if not self.minimize_boolean_attributes or \
-                      (k not in booleanAttributes.get(name, tuple()) \
-                      and k not in booleanAttributes.get("", tuple())):
-                        attributes.append("=")
+                        (k not in booleanAttributes.get(name, tuple())
+                         and k not in booleanAttributes.get("", tuple())):
+                        yield self.encodeStrict("=")
                         if self.quote_attr_values or not v:
                             quote_attr = True
                         else:
-                            quote_attr = reduce(lambda x,y: x or (y in v),
-                                spaceCharacters + ">\"'=", False)
+                            quote_attr = reduce(lambda x, y: x or (y in v),
+                                                spaceCharacters + ">\"'=", False)
                         v = v.replace("&", "&amp;")
-                        if self.escape_lt_in_attrs: v = v.replace("<", "&lt;")
-                        if encoding:
-                            v = encode(v, encoding)
+                        if self.escape_lt_in_attrs:
+                            v = v.replace("<", "&lt;")
                         if quote_attr:
                             quote_char = self.quote_char
                             if self.use_best_quote_char:
@@ -179,20 +262,17 @@ class HTMLSerializer(object):
                                 v = v.replace("'", "&#39;")
                             else:
                                 v = v.replace('"', "&quot;")
-                            attributes.append(quote_char)
-                            attributes.append(v)
-                            attributes.append(quote_char)
+                            yield self.encodeStrict(quote_char)
+                            yield self.encode(v)
+                            yield self.encodeStrict(quote_char)
                         else:
-                            attributes.append(v)
+                            yield self.encode(v)
                 if name in voidElements and self.use_trailing_solidus:
                     if self.space_before_trailing_solidus:
-                        attributes.append(" /")
+                        yield self.encodeStrict(" /")
                     else:
-                        attributes.append("/")
-                if encoding:
-                    yield "<%s%s>" % (name.encode(encoding, "strict"), "".join(attributes))
-                else:
-                    yield u"<%s%s>" % (name, u"".join(attributes))
+                        yield self.encodeStrict("/")
+                yield self.encode(">")
 
             elif type == "EndTag":
                 name = token["name"]
@@ -200,28 +280,33 @@ class HTMLSerializer(object):
                     in_cdata = False
                 elif in_cdata:
                     self.serializeError(_("Unexpected child element of a CDATA element"))
-                end_tag = u"</%s>" % name
-                if encoding:
-                    end_tag = end_tag.encode(encoding, "strict")
-                yield end_tag
+                yield self.encodeStrict("</%s>" % name)
 
             elif type == "Comment":
                 data = token["data"]
                 if data.find("--") >= 0:
                     self.serializeError(_("Comment contains --"))
-                comment = u"<!--%s-->" % token["data"]
-                if encoding:
-                    comment = comment.encode(encoding, unicode_encode_errors)
-                yield comment
+                yield self.encodeStrict("<!--%s-->" % token["data"])
+
+            elif type == "Entity":
+                name = token["name"]
+                key = name + ";"
+                if not key in entities:
+                    self.serializeError(_("Entity %s not recognized" % name))
+                if self.resolve_entities and key not in xmlEntities:
+                    data = entities[key]
+                else:
+                    data = "&%s;" % name
+                yield self.encodeStrict(data)
 
             else:
                 self.serializeError(token["data"])
 
     def render(self, treewalker, encoding=None):
         if encoding:
-            return "".join(list(self.serialize(treewalker, encoding)))
+            return b"".join(list(self.serialize(treewalker, encoding)))
         else:
-            return u"".join(list(self.serialize(treewalker)))
+            return "".join(list(self.serialize(treewalker)))
 
     def serializeError(self, data="XXX ERROR MESSAGE NEEDED"):
         # XXX The idea is to make data mandatory.
@@ -229,6 +314,7 @@ class HTMLSerializer(object):
         if self.strict:
             raise SerializeError
 
+
 def SerializeError(Exception):
     """Error in serialized tree"""
     pass
diff --git a/src/html5lib/serializer/xhtmlserializer.py b/src/html5lib/serializer/xhtmlserializer.py
deleted file mode 100644
index 7fdce47ba9..0000000000
--- a/src/html5lib/serializer/xhtmlserializer.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from htmlserializer import HTMLSerializer
-
-class XHTMLSerializer(HTMLSerializer):
-    quote_attr_values = True
-    minimize_boolean_attributes = False
-    use_trailing_solidus = True
-    escape_lt_in_attrs = True
-    omit_optional_tags = False
-    escape_rcdata = True
diff --git a/src/html5lib/tokenizer.py b/src/html5lib/tokenizer.py
index d7c4b5f6c0..797745787a 100644
--- a/src/html5lib/tokenizer.py
+++ b/src/html5lib/tokenizer.py
@@ -1,29 +1,27 @@
+from __future__ import absolute_import, division, unicode_literals
+
 try:
-    frozenset
+    chr = unichr # flake8: noqa
 except NameError:
-    # Import from the sets module for python 2.3
-    from sets import Set as set
-    from sets import ImmutableSet as frozenset
-try:
-    from collections import deque
-except ImportError:
-    from utils import deque
-    
-from constants import spaceCharacters
-from constants import entitiesWindows1252, entities
-from constants import asciiLowercase, asciiLetters, asciiUpper2Lower
-from constants import digits, hexDigits, EOF
-from constants import tokenTypes, tagTokenTypes
-from constants import replacementCharacters
+    pass
 
-from inputstream import HTMLInputStream
+from collections import deque
 
-# Group entities by their first character, for faster lookups
-entitiesByFirstChar = {}
-for e in entities:
-    entitiesByFirstChar.setdefault(e[0], []).append(e)
+from .constants import spaceCharacters
+from .constants import entities
+from .constants import asciiLetters, asciiUpper2Lower
+from .constants import digits, hexDigits, EOF
+from .constants import tokenTypes, tagTokenTypes
+from .constants import replacementCharacters
 
-class HTMLTokenizer:
+from .inputstream import HTMLInputStream
+
+from .trie import Trie
+
+entitiesTrie = Trie(entities)
+
+
+class HTMLTokenizer(object):
     """ This class takes care of tokenizing HTML.
 
     * self.currentToken
@@ -36,17 +34,16 @@ class HTMLTokenizer:
       Points to HTMLInputStream object.
     """
 
-    # XXX need to fix documentation
-
     def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
-                 lowercaseElementName=True, lowercaseAttrName=True):
+                 lowercaseElementName=True, lowercaseAttrName=True, parser=None):
 
         self.stream = HTMLInputStream(stream, encoding, parseMeta, useChardet)
-        
-        #Perform case conversions?
+        self.parser = parser
+
+        # Perform case conversions?
         self.lowercaseElementName = lowercaseElementName
         self.lowercaseAttrName = lowercaseAttrName
-        
+
         # Setup the initial tokenizer state
         self.escapeFlag = False
         self.lastFourChars = []
@@ -55,6 +52,7 @@ class HTMLTokenizer:
 
         # The current token being created
         self.currentToken = None
+        super(HTMLTokenizer, self).__init__()
 
     def __iter__(self):
         """ This is where the magic happens.
@@ -100,78 +98,79 @@ class HTMLTokenizer:
         if charAsInt in replacementCharacters:
             char = replacementCharacters[charAsInt]
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "illegal-codepoint-for-numeric-entity",
-              "datavars": {"charAsInt": charAsInt}})
-        elif ((0xD800 <= charAsInt <= 0xDFFF) or 
+                                    "illegal-codepoint-for-numeric-entity",
+                                    "datavars": {"charAsInt": charAsInt}})
+        elif ((0xD800 <= charAsInt <= 0xDFFF) or
               (charAsInt > 0x10FFFF)):
-            char = u"\uFFFD"
+            char = "\uFFFD"
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "illegal-codepoint-for-numeric-entity",
-              "datavars": {"charAsInt": charAsInt}})
+                                    "illegal-codepoint-for-numeric-entity",
+                                    "datavars": {"charAsInt": charAsInt}})
         else:
-            #Should speed up this check somehow (e.g. move the set to a constant)
-            if ((0x0001 <= charAsInt <= 0x0008) or 
-                (0x000E <= charAsInt <= 0x001F) or 
-                (0x007F  <= charAsInt <= 0x009F) or
-                (0xFDD0  <= charAsInt <= 0xFDEF) or 
-                charAsInt in frozenset([0x000B, 0xFFFE, 0xFFFF, 0x1FFFE, 
+            # Should speed up this check somehow (e.g. move the set to a constant)
+            if ((0x0001 <= charAsInt <= 0x0008) or
+                (0x000E <= charAsInt <= 0x001F) or
+                (0x007F <= charAsInt <= 0x009F) or
+                (0xFDD0 <= charAsInt <= 0xFDEF) or
+                charAsInt in frozenset([0x000B, 0xFFFE, 0xFFFF, 0x1FFFE,
                                         0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
-                                        0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 
+                                        0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE,
                                         0x5FFFF, 0x6FFFE, 0x6FFFF, 0x7FFFE,
                                         0x7FFFF, 0x8FFFE, 0x8FFFF, 0x9FFFE,
-                                        0x9FFFF, 0xAFFFE, 0xAFFFF, 0xBFFFE, 
-                                        0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE, 
-                                        0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE, 
+                                        0x9FFFF, 0xAFFFE, 0xAFFFF, 0xBFFFE,
+                                        0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE,
+                                        0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE,
                                         0xFFFFF, 0x10FFFE, 0x10FFFF])):
-                self.tokenQueue.append({"type": tokenTypes["ParseError"], 
+                self.tokenQueue.append({"type": tokenTypes["ParseError"],
                                         "data":
-                                            "illegal-codepoint-for-numeric-entity",
+                                        "illegal-codepoint-for-numeric-entity",
                                         "datavars": {"charAsInt": charAsInt}})
             try:
                 # Try/except needed as UCS-2 Python builds' unichar only works
                 # within the BMP.
-                char = unichr(charAsInt)
+                char = chr(charAsInt)
             except ValueError:
-                char = eval("u'\\U%08x'" % charAsInt)
+                v = charAsInt - 0x10000
+                char = chr(0xD800 | (v >> 10)) + chr(0xDC00 | (v & 0x3FF))
 
         # Discard the ; if present. Otherwise, put it back on the queue and
         # invoke parseError on parser.
-        if c != u";":
+        if c != ";":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "numeric-entity-without-semicolon"})
+                                    "numeric-entity-without-semicolon"})
             self.stream.unget(c)
 
         return char
 
     def consumeEntity(self, allowedChar=None, fromAttribute=False):
         # Initialise to the default output for when no entity is matched
-        output = u"&"
+        output = "&"
 
         charStack = [self.stream.char()]
-        if (charStack[0] in spaceCharacters or charStack[0] in (EOF, u"<", u"&") 
-            or (allowedChar is not None and allowedChar == charStack[0])):
+        if (charStack[0] in spaceCharacters or charStack[0] in (EOF, "<", "&")
+                or (allowedChar is not None and allowedChar == charStack[0])):
             self.stream.unget(charStack[0])
 
-        elif charStack[0] == u"#":
+        elif charStack[0] == "#":
             # Read the next character to see if it's hex or decimal
             hex = False
             charStack.append(self.stream.char())
-            if charStack[-1] in (u"x", u"X"):
+            if charStack[-1] in ("x", "X"):
                 hex = True
                 charStack.append(self.stream.char())
 
             # charStack[-1] should be the first digit
             if (hex and charStack[-1] in hexDigits) \
-             or (not hex and charStack[-1] in digits):
+                    or (not hex and charStack[-1] in digits):
                 # At least one digit found, so consume the whole number
                 self.stream.unget(charStack[-1])
                 output = self.consumeNumberEntity(hex)
             else:
                 # No digits found
                 self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                    "data": "expected-numeric-entity"})
+                                        "data": "expected-numeric-entity"})
                 self.stream.unget(charStack.pop())
-                output = u"&" + u"".join(charStack)
+                output = "&" + "".join(charStack)
 
         else:
             # At this point in the process might have named entity. Entities
@@ -179,50 +178,49 @@ class HTMLTokenizer:
             #
             # Consume characters and compare to these to a substring of the
             # entity names in the list until the substring no longer matches.
-            filteredEntityList = entitiesByFirstChar.get(charStack[0], [])
-
-            def entitiesStartingWith(name):
-                return [e for e in filteredEntityList if e.startswith(name)]
-
-            while charStack[-1] is not EOF and\
-              entitiesStartingWith("".join(charStack)):
+            while (charStack[-1] is not EOF):
+                if not entitiesTrie.has_keys_with_prefix("".join(charStack)):
+                    break
                 charStack.append(self.stream.char())
 
             # At this point we have a string that starts with some characters
             # that may match an entity
-            entityName = None
-
             # Try to find the longest entity the string will match to take care
             # of &noti for instance.
-            for entityLength in xrange(len(charStack)-1, 1, -1):
-                possibleEntityName = "".join(charStack[:entityLength])
-                if possibleEntityName in entities:
-                    entityName = possibleEntityName
-                    break
+            try:
+                entityName = entitiesTrie.longest_prefix("".join(charStack[:-1]))
+                entityLength = len(entityName)
+            except KeyError:
+                entityName = None
 
             if entityName is not None:
                 if entityName[-1] != ";":
                     self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                      "named-entity-without-semicolon"})
-                if entityName[-1] != ";" and fromAttribute and \
-                  (charStack[entityLength] in asciiLetters
-                  or charStack[entityLength] in digits):
+                                            "named-entity-without-semicolon"})
+                if (entityName[-1] != ";" and fromAttribute and
+                    (charStack[entityLength] in asciiLetters or
+                     charStack[entityLength] in digits or
+                     charStack[entityLength] == "=")):
                     self.stream.unget(charStack.pop())
-                    output = u"&" + u"".join(charStack)
+                    output = "&" + "".join(charStack)
                 else:
                     output = entities[entityName]
                     self.stream.unget(charStack.pop())
-                    output += u"".join(charStack[entityLength:])
+                    output += "".join(charStack[entityLength:])
             else:
                 self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                  "expected-named-entity"})
+                                        "expected-named-entity"})
                 self.stream.unget(charStack.pop())
-                output = u"&" + u"".join(charStack)
+                output = "&" + "".join(charStack)
 
         if fromAttribute:
             self.currentToken["data"][-1][1] += output
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": output})
+            if output in spaceCharacters:
+                tokenType = "SpaceCharacters"
+            else:
+                tokenType = "Characters"
+            self.tokenQueue.append({"type": tokenTypes[tokenType], "data": output})
 
     def processEntityInAttribute(self, allowedChar):
         """This method replaces the need for "entityInAttributeValueState".
@@ -241,23 +239,26 @@ class HTMLTokenizer:
                 token["name"] = token["name"].translate(asciiUpper2Lower)
             if token["type"] == tokenTypes["EndTag"]:
                 if token["data"]:
-                    self.tokenQueue.append({"type":tokenTypes["ParseError"],
-                                            "data":"attributes-in-end-tag"})
+                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                            "data": "attributes-in-end-tag"})
                 if token["selfClosing"]:
-                    self.tokenQueue.append({"type":tokenTypes["ParseError"],
-                                            "data":"self-closing-flag-on-end-tag"})
+                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                            "data": "self-closing-flag-on-end-tag"})
         self.tokenQueue.append(token)
         self.state = self.dataState
 
-
     # Below are the various tokenizer states worked out.
-
     def dataState(self):
         data = self.stream.char()
         if data == "&":
             self.state = self.entityDataState
         elif data == "<":
             self.state = self.tagOpenState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\u0000"})
         elif data is EOF:
             # Tokenization ends.
             return False
@@ -266,21 +267,21 @@ class HTMLTokenizer:
             # state". At that point spaceCharacters are important so they are
             # emitted separately.
             self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
-              data + self.stream.charsUntil(spaceCharacters, True)})
+                                    data + self.stream.charsUntil(spaceCharacters, True)})
             # No need to update lastFourChars here, since the first space will
             # have already been appended to lastFourChars and will have broken
             # any <!-- or --> sequences
         else:
-            chars = self.stream.charsUntil((u"&", u"<"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": 
-              data + chars})
+            chars = self.stream.charsUntil(("&", "<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
         return True
 
     def entityDataState(self):
         self.consumeEntity()
         self.state = self.dataState
         return True
-    
+
     def rcdataState(self):
         data = self.stream.char()
         if data == "&":
@@ -290,93 +291,113 @@ class HTMLTokenizer:
         elif data == EOF:
             # Tokenization ends.
             return False
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
         elif data in spaceCharacters:
             # Directly after emitting a token you switch back to the "data
             # state". At that point spaceCharacters are important so they are
             # emitted separately.
             self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
-              data + self.stream.charsUntil(spaceCharacters, True)})
+                                    data + self.stream.charsUntil(spaceCharacters, True)})
             # No need to update lastFourChars here, since the first space will
             # have already been appended to lastFourChars and will have broken
             # any <!-- or --> sequences
         else:
-            chars = self.stream.charsUntil((u"&", u"<"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": 
-              data + chars})
+            chars = self.stream.charsUntil(("&", "<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
         return True
 
     def characterReferenceInRcdata(self):
         self.consumeEntity()
         self.state = self.rcdataState
         return True
-    
+
     def rawtextState(self):
         data = self.stream.char()
         if data == "<":
             self.state = self.rawtextLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
         elif data == EOF:
             # Tokenization ends.
             return False
         else:
-            chars = self.stream.charsUntil((u"<"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": 
-              data + chars})
+            chars = self.stream.charsUntil(("<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
         return True
-    
+
     def scriptDataState(self):
         data = self.stream.char()
         if data == "<":
             self.state = self.scriptDataLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
         elif data == EOF:
             # Tokenization ends.
             return False
         else:
-            chars = self.stream.charsUntil((u"<"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": 
-              data + chars})
+            chars = self.stream.charsUntil(("<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
         return True
-    
+
     def plaintextState(self):
         data = self.stream.char()
         if data == EOF:
             # Tokenization ends.
             return False
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": 
-              data + self.stream.charsUntilEOF()})
-            return True
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + self.stream.charsUntil("\u0000")})
+        return True
 
     def tagOpenState(self):
         data = self.stream.char()
-        if data == u"!":
+        if data == "!":
             self.state = self.markupDeclarationOpenState
-        elif data == u"/":
+        elif data == "/":
             self.state = self.closeTagOpenState
         elif data in asciiLetters:
-            self.currentToken = {"type": tokenTypes["StartTag"], 
+            self.currentToken = {"type": tokenTypes["StartTag"],
                                  "name": data, "data": [],
                                  "selfClosing": False,
                                  "selfClosingAcknowledged": False}
             self.state = self.tagNameState
-        elif data == u">":
+        elif data == ">":
             # XXX In theory it could be something besides a tag name. But
             # do we really care?
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-tag-name-but-got-right-bracket"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<>"})
+                                    "expected-tag-name-but-got-right-bracket"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<>"})
             self.state = self.dataState
-        elif data == u"?":
+        elif data == "?":
             # XXX In theory it could be something besides a tag name. But
             # do we really care?
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-tag-name-but-got-question-mark"})
+                                    "expected-tag-name-but-got-question-mark"})
             self.stream.unget(data)
             self.state = self.bogusCommentState
         else:
             # XXX
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-tag-name"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+                                    "expected-tag-name"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.stream.unget(data)
             self.state = self.dataState
         return True
@@ -385,22 +406,22 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data in asciiLetters:
             self.currentToken = {"type": tokenTypes["EndTag"], "name": data,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.tagNameState
-        elif data == u">":
+        elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-closing-tag-but-got-right-bracket"})
+                                    "expected-closing-tag-but-got-right-bracket"})
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-closing-tag-but-got-eof"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"</"})
+                                    "expected-closing-tag-but-got-eof"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
             self.state = self.dataState
         else:
             # XXX data can be _'_...
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-closing-tag-but-got-char",
-              "datavars": {"data": data}})
+                                    "expected-closing-tag-but-got-char",
+                                    "datavars": {"data": data}})
             self.stream.unget(data)
             self.state = self.bogusCommentState
         return True
@@ -409,292 +430,313 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data in spaceCharacters:
             self.state = self.beforeAttributeNameState
-        elif data == u">":
+        elif data == ">":
             self.emitCurrentToken()
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-tag-name"})
+                                    "eof-in-tag-name"})
             self.state = self.dataState
-        elif data == u"/":
+        elif data == "/":
             self.state = self.selfClosingStartTagState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["name"] += "\uFFFD"
         else:
             self.currentToken["name"] += data
             # (Don't use charsUntil here, because tag names are
             # very short and it's faster to not do anything fancy)
         return True
-    
+
     def rcdataLessThanSignState(self):
         data = self.stream.char()
         if data == "/":
             self.temporaryBuffer = ""
             self.state = self.rcdataEndTagOpenState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.stream.unget(data)
             self.state = self.rcdataState
         return True
-    
+
     def rcdataEndTagOpenState(self):
         data = self.stream.char()
         if data in asciiLetters:
             self.temporaryBuffer += data
             self.state = self.rcdataEndTagNameState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"</"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
             self.stream.unget(data)
             self.state = self.rcdataState
         return True
-    
+
     def rcdataEndTagNameState(self):
         appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
         data = self.stream.char()
         if data in spaceCharacters and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.beforeAttributeNameState
         elif data == "/" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.selfClosingStartTagState
         elif data == ">" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.emitCurrentToken()
             self.state = self.dataState
         elif data in asciiLetters:
             self.temporaryBuffer += data
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": u"</" + self.temporaryBuffer})
+                                    "data": "</" + self.temporaryBuffer})
             self.stream.unget(data)
             self.state = self.rcdataState
         return True
-    
+
     def rawtextLessThanSignState(self):
         data = self.stream.char()
         if data == "/":
             self.temporaryBuffer = ""
             self.state = self.rawtextEndTagOpenState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.stream.unget(data)
             self.state = self.rawtextState
         return True
-    
+
     def rawtextEndTagOpenState(self):
         data = self.stream.char()
         if data in asciiLetters:
             self.temporaryBuffer += data
             self.state = self.rawtextEndTagNameState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"</"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
             self.stream.unget(data)
             self.state = self.rawtextState
         return True
-    
+
     def rawtextEndTagNameState(self):
         appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
         data = self.stream.char()
         if data in spaceCharacters and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.beforeAttributeNameState
         elif data == "/" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.selfClosingStartTagState
         elif data == ">" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.emitCurrentToken()
             self.state = self.dataState
         elif data in asciiLetters:
             self.temporaryBuffer += data
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": u"</" + self.temporaryBuffer})
+                                    "data": "</" + self.temporaryBuffer})
             self.stream.unget(data)
             self.state = self.rawtextState
         return True
-    
+
     def scriptDataLessThanSignState(self):
         data = self.stream.char()
         if data == "/":
             self.temporaryBuffer = ""
             self.state = self.scriptDataEndTagOpenState
         elif data == "!":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<!"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<!"})
             self.state = self.scriptDataEscapeStartState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.stream.unget(data)
             self.state = self.scriptDataState
         return True
-    
+
     def scriptDataEndTagOpenState(self):
         data = self.stream.char()
         if data in asciiLetters:
             self.temporaryBuffer += data
             self.state = self.scriptDataEndTagNameState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"</"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
             self.stream.unget(data)
             self.state = self.scriptDataState
         return True
-    
+
     def scriptDataEndTagNameState(self):
         appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
         data = self.stream.char()
         if data in spaceCharacters and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.beforeAttributeNameState
         elif data == "/" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.selfClosingStartTagState
         elif data == ">" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.emitCurrentToken()
             self.state = self.dataState
         elif data in asciiLetters:
             self.temporaryBuffer += data
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": u"</" + self.temporaryBuffer})
+                                    "data": "</" + self.temporaryBuffer})
             self.stream.unget(data)
             self.state = self.scriptDataState
         return True
-    
+
     def scriptDataEscapeStartState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
             self.state = self.scriptDataEscapeStartDashState
         else:
             self.stream.unget(data)
             self.state = self.scriptDataState
         return True
-    
+
     def scriptDataEscapeStartDashState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
             self.state = self.scriptDataEscapedDashDashState
         else:
             self.stream.unget(data)
             self.state = self.scriptDataState
         return True
-    
+
     def scriptDataEscapedState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
             self.state = self.scriptDataEscapedDashState
         elif data == "<":
             self.state = self.scriptDataEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
         elif data == EOF:
             self.state = self.dataState
         else:
-            chars = self.stream.charsUntil((u"<-"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": 
-              data + chars})
+            chars = self.stream.charsUntil(("<", "-", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
         return True
-    
+
     def scriptDataEscapedDashState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
             self.state = self.scriptDataEscapedDashDashState
         elif data == "<":
             self.state = self.scriptDataEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataEscapedState
         elif data == EOF:
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
             self.state = self.scriptDataEscapedState
         return True
-    
+
     def scriptDataEscapedDashDashState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
         elif data == "<":
             self.state = self.scriptDataEscapedLessThanSignState
         elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u">"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
             self.state = self.scriptDataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataEscapedState
         elif data == EOF:
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
             self.state = self.scriptDataEscapedState
         return True
-    
+
     def scriptDataEscapedLessThanSignState(self):
         data = self.stream.char()
         if data == "/":
             self.temporaryBuffer = ""
             self.state = self.scriptDataEscapedEndTagOpenState
         elif data in asciiLetters:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<" + data})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<" + data})
             self.temporaryBuffer = data
             self.state = self.scriptDataDoubleEscapeStartState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.stream.unget(data)
             self.state = self.scriptDataEscapedState
         return True
-    
+
     def scriptDataEscapedEndTagOpenState(self):
         data = self.stream.char()
         if data in asciiLetters:
             self.temporaryBuffer = data
             self.state = self.scriptDataEscapedEndTagNameState
         else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"</"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
             self.stream.unget(data)
             self.state = self.scriptDataEscapedState
         return True
-    
+
     def scriptDataEscapedEndTagNameState(self):
         appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
         data = self.stream.char()
         if data in spaceCharacters and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.beforeAttributeNameState
         elif data == "/" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.state = self.selfClosingStartTagState
         elif data == ">" and appropriate:
             self.currentToken = {"type": tokenTypes["EndTag"],
                                  "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing":False}
+                                 "data": [], "selfClosing": False}
             self.emitCurrentToken()
             self.state = self.dataState
         elif data in asciiLetters:
             self.temporaryBuffer += data
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": u"</" + self.temporaryBuffer})
+                                    "data": "</" + self.temporaryBuffer})
             self.stream.unget(data)
             self.state = self.scriptDataEscapedState
         return True
-    
+
     def scriptDataDoubleEscapeStartState(self):
         data = self.stream.char()
         if data in (spaceCharacters | frozenset(("/", ">"))):
@@ -710,70 +752,87 @@ class HTMLTokenizer:
             self.stream.unget(data)
             self.state = self.scriptDataEscapedState
         return True
-    
+
     def scriptDataDoubleEscapedState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
             self.state = self.scriptDataDoubleEscapedDashState
         elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.state = self.scriptDataDoubleEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
         elif data == EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-script-in-script"})
+                                    "eof-in-script-in-script"})
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
         return True
-    
+
     def scriptDataDoubleEscapedDashState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
             self.state = self.scriptDataDoubleEscapedDashDashState
         elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.state = self.scriptDataDoubleEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataDoubleEscapedState
         elif data == EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-script-in-script"})
+                                    "eof-in-script-in-script"})
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
             self.state = self.scriptDataDoubleEscapedState
         return True
-    
-    def scriptDataDoubleEscapedDashState(self):
+
+    def scriptDataDoubleEscapedDashDashState(self):
         data = self.stream.char()
         if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"-"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
         elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
             self.state = self.scriptDataDoubleEscapedLessThanSignState
         elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u">"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
             self.state = self.scriptDataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataDoubleEscapedState
         elif data == EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-script-in-script"})
+                                    "eof-in-script-in-script"})
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
             self.state = self.scriptDataDoubleEscapedState
         return True
-    
+
     def scriptDataDoubleEscapedLessThanSignState(self):
         data = self.stream.char()
         if data == "/":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"/"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "/"})
             self.temporaryBuffer = ""
             self.state = self.scriptDataDoubleEscapeEndState
         else:
             self.stream.unget(data)
             self.state = self.scriptDataDoubleEscapedState
         return True
-    
+
     def scriptDataDoubleEscapeEndState(self):
         data = self.stream.char()
         if data in (spaceCharacters | frozenset(("/", ">"))):
@@ -797,18 +856,23 @@ class HTMLTokenizer:
         elif data in asciiLetters:
             self.currentToken["data"].append([data, ""])
             self.state = self.attributeNameState
-        elif data == u">":
+        elif data == ">":
             self.emitCurrentToken()
-        elif data == u"/":
+        elif data == "/":
             self.state = self.selfClosingStartTagState
-        elif data in (u"'", u'"', u"=", u"<"):
+        elif data in ("'", '"', "=", "<"):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "invalid-character-in-attribute-name"})
+                                    "invalid-character-in-attribute-name"})
             self.currentToken["data"].append([data, ""])
             self.state = self.attributeNameState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"].append(["\uFFFD", ""])
+            self.state = self.attributeNameState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-attribute-name-but-got-eof"})
+                                    "expected-attribute-name-but-got-eof"})
             self.state = self.dataState
         else:
             self.currentToken["data"].append([data, ""])
@@ -819,31 +883,36 @@ class HTMLTokenizer:
         data = self.stream.char()
         leavingThisState = True
         emitToken = False
-        if data == u"=":
+        if data == "=":
             self.state = self.beforeAttributeValueState
         elif data in asciiLetters:
             self.currentToken["data"][-1][0] += data +\
-              self.stream.charsUntil(asciiLetters, True)
+                self.stream.charsUntil(asciiLetters, True)
             leavingThisState = False
-        elif data == u">":
+        elif data == ">":
             # XXX If we emit here the attributes are converted to a dict
             # without being checked and when the code below runs we error
             # because data is a dict not a list
             emitToken = True
         elif data in spaceCharacters:
             self.state = self.afterAttributeNameState
-        elif data == u"/":
+        elif data == "/":
             self.state = self.selfClosingStartTagState
-        elif data in (u"'", u'"', u"<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "invalid-character-in-attribute-name"})
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][0] += "\uFFFD"
+            leavingThisState = False
+        elif data in ("'", '"', "<"):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data":
+                                    "invalid-character-in-attribute-name"})
             self.currentToken["data"][-1][0] += data
             leavingThisState = False
         elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-name"})
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "eof-in-attribute-name"})
             self.state = self.dataState
-            emitToken = True
         else:
             self.currentToken["data"][-1][0] += data
             leavingThisState = False
@@ -858,7 +927,7 @@ class HTMLTokenizer:
             for name, value in self.currentToken["data"][:-1]:
                 if self.currentToken["data"][-1][0] == name:
                     self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                      "duplicate-attribute"})
+                                            "duplicate-attribute"})
                     break
             # XXX Fix for above XXX
             if emitToken:
@@ -869,24 +938,29 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data in spaceCharacters:
             self.stream.charsUntil(spaceCharacters, True)
-        elif data == u"=":
+        elif data == "=":
             self.state = self.beforeAttributeValueState
-        elif data == u">":
+        elif data == ">":
             self.emitCurrentToken()
         elif data in asciiLetters:
             self.currentToken["data"].append([data, ""])
             self.state = self.attributeNameState
-        elif data == u"/":
+        elif data == "/":
             self.state = self.selfClosingStartTagState
-        elif data in (u"'", u'"', u"<"):
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"].append(["\uFFFD", ""])
+            self.state = self.attributeNameState
+        elif data in ("'", '"', "<"):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "invalid-character-after-attribute-name"})
+                                    "invalid-character-after-attribute-name"})
             self.currentToken["data"].append([data, ""])
             self.state = self.attributeNameState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-end-of-tag-but-got-eof"})
-            self.emitCurrentToken()
+                                    "expected-end-of-tag-but-got-eof"})
+            self.state = self.dataState
         else:
             self.currentToken["data"].append([data, ""])
             self.state = self.attributeNameState
@@ -896,26 +970,31 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data in spaceCharacters:
             self.stream.charsUntil(spaceCharacters, True)
-        elif data == u"\"":
+        elif data == "\"":
             self.state = self.attributeValueDoubleQuotedState
-        elif data == u"&":
+        elif data == "&":
             self.state = self.attributeValueUnQuotedState
-            self.stream.unget(data);
-        elif data == u"'":
+            self.stream.unget(data)
+        elif data == "'":
             self.state = self.attributeValueSingleQuotedState
-        elif data == u">":
+        elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-attribute-value-but-got-right-bracket"})
+                                    "expected-attribute-value-but-got-right-bracket"})
             self.emitCurrentToken()
-        elif data in (u"=", u"<", u"`"):
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
+            self.state = self.attributeValueUnQuotedState
+        elif data in ("=", "<", "`"):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "equals-in-unquoted-attribute-value"})
+                                    "equals-in-unquoted-attribute-value"})
             self.currentToken["data"][-1][1] += data
             self.state = self.attributeValueUnQuotedState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-attribute-value-but-got-eof"})
-            self.emitCurrentToken()
+                                    "expected-attribute-value-but-got-eof"})
+            self.state = self.dataState
         else:
             self.currentToken["data"][-1][1] += data
             self.state = self.attributeValueUnQuotedState
@@ -925,70 +1004,81 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data == "\"":
             self.state = self.afterAttributeValueState
-        elif data == u"&":
-            self.processEntityInAttribute(u'"')
+        elif data == "&":
+            self.processEntityInAttribute('"')
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-value-double-quote"})
-            self.emitCurrentToken()
+                                    "eof-in-attribute-value-double-quote"})
+            self.state = self.dataState
         else:
             self.currentToken["data"][-1][1] += data +\
-              self.stream.charsUntil(("\"", u"&"))
+                self.stream.charsUntil(("\"", "&", "\u0000"))
         return True
 
     def attributeValueSingleQuotedState(self):
         data = self.stream.char()
         if data == "'":
             self.state = self.afterAttributeValueState
-        elif data == u"&":
-            self.processEntityInAttribute(u"'")
+        elif data == "&":
+            self.processEntityInAttribute("'")
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-value-single-quote"})
-            self.emitCurrentToken()
+                                    "eof-in-attribute-value-single-quote"})
+            self.state = self.dataState
         else:
             self.currentToken["data"][-1][1] += data +\
-              self.stream.charsUntil(("'", u"&"))
+                self.stream.charsUntil(("'", "&", "\u0000"))
         return True
 
     def attributeValueUnQuotedState(self):
         data = self.stream.char()
         if data in spaceCharacters:
             self.state = self.beforeAttributeNameState
-        elif data == u"&":
+        elif data == "&":
             self.processEntityInAttribute(">")
-        elif data == u">":
+        elif data == ">":
             self.emitCurrentToken()
-        elif data in (u'"', u"'", u"=", u"<", u"`"):
+        elif data in ('"', "'", "=", "<", "`"):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-character-in-unquoted-attribute-value"})
+                                    "unexpected-character-in-unquoted-attribute-value"})
             self.currentToken["data"][-1][1] += data
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-value-no-quotes"})
-            self.emitCurrentToken()
+                                    "eof-in-attribute-value-no-quotes"})
+            self.state = self.dataState
         else:
             self.currentToken["data"][-1][1] += data + self.stream.charsUntil(
-              frozenset((u"&", u">", u'"', u"'", u"=", u"<", u"`")) | spaceCharacters)
+                frozenset(("&", ">", '"', "'", "=", "<", "`", "\u0000")) | spaceCharacters)
         return True
 
     def afterAttributeValueState(self):
         data = self.stream.char()
         if data in spaceCharacters:
             self.state = self.beforeAttributeNameState
-        elif data == u">":
+        elif data == ">":
             self.emitCurrentToken()
-        elif data == u"/":
+        elif data == "/":
             self.state = self.selfClosingStartTagState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-EOF-after-attribute-value"})
-            self.emitCurrentToken()
+                                    "unexpected-EOF-after-attribute-value"})
             self.stream.unget(data)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-character-after-attribute-value"})
+                                    "unexpected-character-after-attribute-value"})
             self.stream.unget(data)
             self.state = self.beforeAttributeNameState
         return True
@@ -999,14 +1089,14 @@ class HTMLTokenizer:
             self.currentToken["selfClosing"] = True
             self.emitCurrentToken()
         elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], 
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
                                     "data":
-                                        "unexpected-EOF-after-solidus-in-tag"})
+                                    "unexpected-EOF-after-solidus-in-tag"})
             self.stream.unget(data)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-character-after-soldius-in-tag"})
+                                    "unexpected-character-after-solidus-in-tag"})
             self.stream.unget(data)
             self.state = self.beforeAttributeNameState
         return True
@@ -1015,20 +1105,10 @@ class HTMLTokenizer:
         # Make a new comment token and give it as value all the characters
         # until the first > or EOF (charsUntil checks for EOF automatically)
         # and emit it.
+        data = self.stream.charsUntil(">")
+        data = data.replace("\u0000", "\uFFFD")
         self.tokenQueue.append(
-          {"type": tokenTypes["Comment"], "data": self.stream.charsUntil(u">")})
-
-        # Eat the character directly after the bogus comment which is either a
-        # ">" or an EOF.
-        self.stream.char()
-        self.state = self.dataState
-        return True
-
-    def bogusCommentContinuationState(self):
-        # Like bogusCommentState, but the caller must create the comment token
-        # and this state just adds more characters to it
-        self.currentToken["data"] += self.stream.charsUntil(u">")
-        self.tokenQueue.append(self.currentToken)
+            {"type": tokenTypes["Comment"], "data": data})
 
         # Eat the character directly after the bogus comment which is either a
         # ">" or an EOF.
@@ -1038,174 +1118,183 @@ class HTMLTokenizer:
 
     def markupDeclarationOpenState(self):
         charStack = [self.stream.char()]
-        if charStack[-1] == u"-":
+        if charStack[-1] == "-":
             charStack.append(self.stream.char())
-            if charStack[-1] == u"-":
-                self.currentToken = {"type": tokenTypes["Comment"], "data": u""}
+            if charStack[-1] == "-":
+                self.currentToken = {"type": tokenTypes["Comment"], "data": ""}
                 self.state = self.commentStartState
                 return True
-        elif charStack[-1] in (u'd', u'D'):
+        elif charStack[-1] in ('d', 'D'):
             matched = True
-            for expected in ((u'o', u'O'), (u'c', u'C'), (u't', u'T'),
-                             (u'y', u'Y'), (u'p', u'P'), (u'e', u'E')):
+            for expected in (('o', 'O'), ('c', 'C'), ('t', 'T'),
+                             ('y', 'Y'), ('p', 'P'), ('e', 'E')):
                 charStack.append(self.stream.char())
                 if charStack[-1] not in expected:
                     matched = False
                     break
             if matched:
                 self.currentToken = {"type": tokenTypes["Doctype"],
-                                     "name": u"",
-                                     "publicId": None, "systemId": None, 
+                                     "name": "",
+                                     "publicId": None, "systemId": None,
                                      "correct": True}
                 self.state = self.doctypeState
                 return True
+        elif (charStack[-1] == "[" and
+              self.parser is not None and
+              self.parser.tree.openElements and
+              self.parser.tree.openElements[-1].namespace != self.parser.tree.defaultNamespace):
+            matched = True
+            for expected in ["C", "D", "A", "T", "A", "["]:
+                charStack.append(self.stream.char())
+                if charStack[-1] != expected:
+                    matched = False
+                    break
+            if matched:
+                self.state = self.cdataSectionState
+                return True
 
         self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-          "expected-dashes-or-doctype"})
-        # charStack[:-2] consists of 'safe' characters ('-', 'd', 'o', etc)
-        # so they can be copied directly into the bogus comment data, and only
-        # the last character might be '>' or EOF and needs to be ungetted
-        self.stream.unget(charStack.pop())
-        self.currentToken = {"type": tokenTypes["Comment"], 
-                             "data": u"".join(charStack)}
-        self.state = self.bogusCommentContinuationState
+                                "expected-dashes-or-doctype"})
+
+        while charStack:
+            self.stream.unget(charStack.pop())
+        self.state = self.bogusCommentState
         return True
 
     def commentStartState(self):
         data = self.stream.char()
         if data == "-":
             self.state = self.commentStartDashState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "\uFFFD"
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "incorrect-comment"})
+                                    "incorrect-comment"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment"})
+                                    "eof-in-comment"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
-            self.currentToken["data"] += data + self.stream.charsUntil(u"-")
+            self.currentToken["data"] += data
             self.state = self.commentState
         return True
-    
+
     def commentStartDashState(self):
         data = self.stream.char()
         if data == "-":
             self.state = self.commentEndState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "-\uFFFD"
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "incorrect-comment"})
+                                    "incorrect-comment"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment"})
+                                    "eof-in-comment"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
-            self.currentToken["data"] += "-" + data + self.stream.charsUntil(u"-")
+            self.currentToken["data"] += "-" + data
             self.state = self.commentState
         return True
 
-    
     def commentState(self):
         data = self.stream.char()
-        if data == u"-":
+        if data == "-":
             self.state = self.commentEndDashState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "\uFFFD"
         elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment"})
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "eof-in-comment"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
-            self.currentToken["data"] += data + self.stream.charsUntil(u"-")
+            self.currentToken["data"] += data + \
+                self.stream.charsUntil(("-", "\u0000"))
         return True
 
     def commentEndDashState(self):
         data = self.stream.char()
-        if data == u"-":
+        if data == "-":
             self.state = self.commentEndState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "-\uFFFD"
+            self.state = self.commentState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-end-dash"})
+                                    "eof-in-comment-end-dash"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
-            self.currentToken["data"] += u"-" + data +\
-              self.stream.charsUntil(u"-")
-            # Consume the next character which is either a "-" or an EOF as
-            # well so if there's a "-" directly after the "-" we go nicely to
-            # the "comment end state" without emitting a ParseError() there.
-            self.stream.char()
+            self.currentToken["data"] += "-" + data
+            self.state = self.commentState
         return True
 
     def commentEndState(self):
         data = self.stream.char()
-        if data == u">":
+        if data == ">":
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
-        elif data == u"-":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-             "unexpected-dash-after-double-dash-in-comment"})
-            self.currentToken["data"] += data
-        elif data in spaceCharacters:
-            self.currentToken["data"] += "--" + data
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-space-after-double-dash-in-comment"})
-            self.state = self.commentEndSpaceState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "--\uFFFD"
+            self.state = self.commentState
         elif data == "!":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-bang-after-double-dash-in-comment"})
+                                    "unexpected-bang-after-double-dash-in-comment"})
             self.state = self.commentEndBangState
+        elif data == "-":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-dash-after-double-dash-in-comment"})
+            self.currentToken["data"] += data
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-double-dash"})
+                                    "eof-in-comment-double-dash"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
             # XXX
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-comment"})
-            self.currentToken["data"] += u"--" + data
+                                    "unexpected-char-in-comment"})
+            self.currentToken["data"] += "--" + data
             self.state = self.commentState
         return True
 
     def commentEndBangState(self):
         data = self.stream.char()
-        if data == u">":
+        if data == ">":
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
-        elif data == u"-":
+        elif data == "-":
             self.currentToken["data"] += "--!"
             self.state = self.commentEndDashState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-end-bang-state"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += u"--!" + data
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "--!\uFFFD"
             self.state = self.commentState
-        return True
-
-    def commentEndSpaceState(self):
-        data = self.stream.char()
-        if data == u">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == u"-":
-            self.state = self.commentEndDashState
-        elif data in spaceCharacters:
-            self.currentToken["data"] += data
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-end-space-state"})
+                                    "eof-in-comment-end-bang-state"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
-            self.currentToken["data"] += data
+            self.currentToken["data"] += "--!" + data
             self.state = self.commentState
         return True
 
@@ -1215,13 +1304,13 @@ class HTMLTokenizer:
             self.state = self.beforeDoctypeNameState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-doctype-name-but-got-eof"})
+                                    "expected-doctype-name-but-got-eof"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "need-space-after-doctype"})
+                                    "need-space-after-doctype"})
             self.stream.unget(data)
             self.state = self.beforeDoctypeNameState
         return True
@@ -1230,15 +1319,20 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data in spaceCharacters:
             pass
-        elif data == u">":
+        elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-doctype-name-but-got-right-bracket"})
+                                    "expected-doctype-name-but-got-right-bracket"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["name"] = "\uFFFD"
+            self.state = self.doctypeNameState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-doctype-name-but-got-eof"})
+                                    "expected-doctype-name-but-got-eof"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
@@ -1252,13 +1346,18 @@ class HTMLTokenizer:
         if data in spaceCharacters:
             self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
             self.state = self.afterDoctypeNameState
-        elif data == u">":
+        elif data == ">":
             self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["name"] += "\uFFFD"
+            self.state = self.doctypeNameState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype-name"})
+                                    "eof-in-doctype-name"})
             self.currentToken["correct"] = False
             self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
             self.tokenQueue.append(self.currentToken)
@@ -1271,21 +1370,21 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data in spaceCharacters:
             pass
-        elif data == u">":
+        elif data == ">":
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.currentToken["correct"] = False
             self.stream.unget(data)
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
-            if data in (u"p", u"P"):
+            if data in ("p", "P"):
                 matched = True
-                for expected in ((u"u", u"U"), (u"b", u"B"), (u"l", u"L"),
-                                 (u"i", u"I"), (u"c", u"C")):
+                for expected in (("u", "U"), ("b", "B"), ("l", "L"),
+                                 ("i", "I"), ("c", "C")):
                     data = self.stream.char()
                     if data not in expected:
                         matched = False
@@ -1293,10 +1392,10 @@ class HTMLTokenizer:
                 if matched:
                     self.state = self.afterDoctypePublicKeywordState
                     return True
-            elif data in (u"s", u"S"):
+            elif data in ("s", "S"):
                 matched = True
-                for expected in ((u"y", u"Y"), (u"s", u"S"), (u"t", u"T"),
-                                 (u"e", u"E"), (u"m", u"M")):
+                for expected in (("y", "Y"), ("s", "S"), ("t", "T"),
+                                 ("e", "E"), ("m", "M")):
                     data = self.stream.char()
                     if data not in expected:
                         matched = False
@@ -1311,25 +1410,25 @@ class HTMLTokenizer:
             # and needs to be ungetted
             self.stream.unget(data)
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                "expected-space-or-right-bracket-in-doctype", "datavars":
-                {"data": data}})
+                                    "expected-space-or-right-bracket-in-doctype", "datavars":
+                                    {"data": data}})
             self.currentToken["correct"] = False
             self.state = self.bogusDoctypeState
 
         return True
-    
+
     def afterDoctypePublicKeywordState(self):
         data = self.stream.char()
         if data in spaceCharacters:
             self.state = self.beforeDoctypePublicIdentifierState
         elif data in ("'", '"'):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.stream.unget(data)
             self.state = self.beforeDoctypePublicIdentifierState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
@@ -1343,26 +1442,26 @@ class HTMLTokenizer:
         if data in spaceCharacters:
             pass
         elif data == "\"":
-            self.currentToken["publicId"] = u""
+            self.currentToken["publicId"] = ""
             self.state = self.doctypePublicIdentifierDoubleQuotedState
         elif data == "'":
-            self.currentToken["publicId"] = u""
+            self.currentToken["publicId"] = ""
             self.state = self.doctypePublicIdentifierSingleQuotedState
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
+                                    "unexpected-end-of-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.currentToken["correct"] = False
             self.state = self.bogusDoctypeState
         return True
@@ -1371,15 +1470,19 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data == "\"":
             self.state = self.afterDoctypePublicIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["publicId"] += "\uFFFD"
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
+                                    "unexpected-end-of-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
@@ -1391,15 +1494,19 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data == "'":
             self.state = self.afterDoctypePublicIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["publicId"] += "\uFFFD"
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
+                                    "unexpected-end-of-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
@@ -1416,27 +1523,27 @@ class HTMLTokenizer:
             self.state = self.dataState
         elif data == '"':
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
-            self.currentToken["systemId"] = u""
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["systemId"] = ""
             self.state = self.doctypeSystemIdentifierDoubleQuotedState
         elif data == "'":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
-            self.currentToken["systemId"] = u""
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["systemId"] = ""
             self.state = self.doctypeSystemIdentifierSingleQuotedState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.currentToken["correct"] = False
             self.state = self.bogusDoctypeState
         return True
-    
+
     def betweenDoctypePublicAndSystemIdentifiersState(self):
         data = self.stream.char()
         if data in spaceCharacters:
@@ -1445,36 +1552,36 @@ class HTMLTokenizer:
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data == '"':
-            self.currentToken["systemId"] = u""
+            self.currentToken["systemId"] = ""
             self.state = self.doctypeSystemIdentifierDoubleQuotedState
         elif data == "'":
-            self.currentToken["systemId"] = u""
+            self.currentToken["systemId"] = ""
             self.state = self.doctypeSystemIdentifierSingleQuotedState
         elif data == EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.currentToken["correct"] = False
             self.state = self.bogusDoctypeState
         return True
-    
+
     def afterDoctypeSystemKeywordState(self):
         data = self.stream.char()
         if data in spaceCharacters:
             self.state = self.beforeDoctypeSystemIdentifierState
         elif data in ("'", '"'):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.stream.unget(data)
             self.state = self.beforeDoctypeSystemIdentifierState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
@@ -1482,32 +1589,32 @@ class HTMLTokenizer:
             self.stream.unget(data)
             self.state = self.beforeDoctypeSystemIdentifierState
         return True
-    
+
     def beforeDoctypeSystemIdentifierState(self):
         data = self.stream.char()
         if data in spaceCharacters:
             pass
         elif data == "\"":
-            self.currentToken["systemId"] = u""
+            self.currentToken["systemId"] = ""
             self.state = self.doctypeSystemIdentifierDoubleQuotedState
         elif data == "'":
-            self.currentToken["systemId"] = u""
+            self.currentToken["systemId"] = ""
             self.state = self.doctypeSystemIdentifierSingleQuotedState
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.currentToken["correct"] = False
             self.state = self.bogusDoctypeState
         return True
@@ -1516,15 +1623,19 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data == "\"":
             self.state = self.afterDoctypeSystemIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["systemId"] += "\uFFFD"
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
+                                    "unexpected-end-of-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
@@ -1536,15 +1647,19 @@ class HTMLTokenizer:
         data = self.stream.char()
         if data == "'":
             self.state = self.afterDoctypeSystemIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["systemId"] += "\uFFFD"
         elif data == ">":
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
+                                    "unexpected-end-of-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
@@ -1561,19 +1676,19 @@ class HTMLTokenizer:
             self.state = self.dataState
         elif data is EOF:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
+                                    "eof-in-doctype"})
             self.currentToken["correct"] = False
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         else:
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
+                                    "unexpected-char-in-doctype"})
             self.state = self.bogusDoctypeState
         return True
 
     def bogusDoctypeState(self):
         data = self.stream.char()
-        if data == u">":
+        if data == ">":
             self.tokenQueue.append(self.currentToken)
             self.state = self.dataState
         elif data is EOF:
@@ -1584,3 +1699,33 @@ class HTMLTokenizer:
         else:
             pass
         return True
+
+    def cdataSectionState(self):
+        data = []
+        while True:
+            data.append(self.stream.charsUntil("]"))
+            data.append(self.stream.charsUntil(">"))
+            char = self.stream.char()
+            if char == EOF:
+                break
+            else:
+                assert char == ">"
+                if data[-1][-2:] == "]]":
+                    data[-1] = data[-1][:-2]
+                    break
+                else:
+                    data.append(char)
+
+        data = "".join(data)
+        # Deal with null here rather than in the parser
+        nullCount = data.count("\u0000")
+        if nullCount > 0:
+            for i in range(nullCount):
+                self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                        "data": "invalid-codepoint"})
+            data = data.replace("\u0000", "\uFFFD")
+        if data:
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": data})
+        self.state = self.dataState
+        return True
diff --git a/src/html5lib/tokenizer_old.py b/src/html5lib/tokenizer_old.py
deleted file mode 100644
index 2d5262ca2a..0000000000
--- a/src/html5lib/tokenizer_old.py
+++ /dev/null
@@ -1,1212 +0,0 @@
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import Set as set
-    from sets import ImmutableSet as frozenset
-try:
-    from collections import deque
-except ImportError:
-    from utils import deque
-    
-from constants import contentModelFlags, spaceCharacters
-from constants import entitiesWindows1252, entities
-from constants import asciiLowercase, asciiLetters, asciiUpper2Lower
-from constants import digits, hexDigits, EOF
-from constants import tokenTypes, tagTokenTypes
-
-from inputstream import HTMLInputStream
-
-# Group entities by their first character, for faster lookups
-entitiesByFirstChar = {}
-for e in entities:
-    entitiesByFirstChar.setdefault(e[0], []).append(e)
-
-class HTMLTokenizer:
-    """ This class takes care of tokenizing HTML.
-
-    * self.currentToken
-      Holds the token that is currently being processed.
-
-    * self.state
-      Holds a reference to the method to be invoked... XXX
-
-    * self.states
-      Holds a mapping between states and methods that implement the state.
-
-    * self.stream
-      Points to HTMLInputStream object.
-    """
-
-    # XXX need to fix documentation
-
-    def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
-                 lowercaseElementName=True, lowercaseAttrName=True):
-        self.stream = HTMLInputStream(stream, encoding, parseMeta, useChardet)
-        
-        #Perform case conversions?
-        self.lowercaseElementName = lowercaseElementName
-        self.lowercaseAttrName = lowercaseAttrName
-        
-        self.states = {
-            "data":self.dataState,
-            "entityData":self.entityDataState,
-            "tagOpen":self.tagOpenState,
-            "closeTagOpen":self.closeTagOpenState,
-            "tagName":self.tagNameState,
-            "beforeAttributeName":self.beforeAttributeNameState,
-            "attributeName":self.attributeNameState,
-            "afterAttributeName":self.afterAttributeNameState,
-            "beforeAttributeValue":self.beforeAttributeValueState,
-            "attributeValueDoubleQuoted":self.attributeValueDoubleQuotedState,
-            "attributeValueSingleQuoted":self.attributeValueSingleQuotedState,
-            "attributeValueUnQuoted":self.attributeValueUnQuotedState,
-            "afterAttributeValue":self.afterAttributeValueState,
-            "selfClosingStartTag":self.selfClosingStartTagState,
-            "bogusComment":self.bogusCommentState,
-            "bogusCommentContinuation":self.bogusCommentContinuationState,
-            "markupDeclarationOpen":self.markupDeclarationOpenState,
-            "commentStart":self.commentStartState,
-            "commentStartDash":self.commentStartDashState,
-            "comment":self.commentState,
-            "commentEndDash":self.commentEndDashState,
-            "commentEnd":self.commentEndState,
-            "commentEndBang":self.commentEndBangState,
-            "commentEndSpace":self.commentEndSpaceState,
-            "doctype":self.doctypeState,
-            "beforeDoctypeName":self.beforeDoctypeNameState,
-            "doctypeName":self.doctypeNameState,
-            "afterDoctypeName":self.afterDoctypeNameState,
-            "beforeDoctypePublicIdentifier":self.beforeDoctypePublicIdentifierState,
-            "doctypePublicIdentifierDoubleQuoted":self.doctypePublicIdentifierDoubleQuotedState,
-            "doctypePublicIdentifierSingleQuoted":self.doctypePublicIdentifierSingleQuotedState,
-            "afterDoctypePublicIdentifier":self.afterDoctypePublicIdentifierState,
-            "beforeDoctypeSystemIdentifier":self.beforeDoctypeSystemIdentifierState,
-            "doctypeSystemIdentifierDoubleQuoted":self.doctypeSystemIdentifierDoubleQuotedState,
-            "doctypeSystemIdentifierSingleQuoted":self.doctypeSystemIdentifierSingleQuotedState,
-            "afterDoctypeSystemIdentifier":self.afterDoctypeSystemIdentifierState,
-            "bogusDoctype":self.bogusDoctypeState
-        }
-
-        # Setup the initial tokenizer state
-        self.contentModelFlag = contentModelFlags["PCDATA"]
-        self.escapeFlag = False
-        self.lastFourChars = []
-        self.state = self.dataState
-        self.escape = False
-
-        # The current token being created
-        self.currentToken = None
-
-    def __iter__(self):
-        """ This is where the magic happens.
-
-        We do our usually processing through the states and when we have a token
-        to return we yield the token which pauses processing until the next token
-        is requested.
-        """
-        self.tokenQueue = deque([])
-        # Start processing. When EOF is reached self.state will return False
-        # instead of True and the loop will terminate.
-        while self.state():
-            while self.stream.errors:
-                yield {"type": tokenTypes["ParseError"], "data": self.stream.errors.pop(0)}
-            while self.tokenQueue:
-                yield self.tokenQueue.popleft()
-
-    def consumeNumberEntity(self, isHex):
-        """This function returns either U+FFFD or the character based on the
-        decimal or hexadecimal representation. It also discards ";" if present.
-        If not present self.tokenQueue.append({"type": tokenTypes["ParseError"]}) is invoked.
-        """
-
-        allowed = digits
-        radix = 10
-        if isHex:
-            allowed = hexDigits
-            radix = 16
-
-        charStack = []
-
-        # Consume all the characters that are in range while making sure we
-        # don't hit an EOF.
-        c = self.stream.char()
-        while c in allowed and c is not EOF:
-            charStack.append(c)
-            c = self.stream.char()
-
-        # Convert the set of characters consumed to an int.
-        charAsInt = int("".join(charStack), radix)
-
-        if charAsInt == 13:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "incorrect-cr-newline-entity"})
-            charAsInt = 10
-        elif 127 < charAsInt < 160:
-            # If the integer is between 127 and 160 (so 128 and bigger and 159
-            # and smaller) we need to do the "windows trick".
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "illegal-windows-1252-entity"})
-
-            charAsInt = entitiesWindows1252[charAsInt - 128]
-
-        # Certain characters get replaced with U+FFFD
-        if ((charAsInt <= 0x0008) or (charAsInt == 0x000B) or (0x000E <= charAsInt <= 0x001F)
-         or (0x007F <= charAsInt <= 0x009F)
-         or (0xD800 <= charAsInt <= 0xDFFF) or (0xFDD0 <= charAsInt <= 0xFDEF)
-         or (charAsInt & 0xFFFE == 0xFFFE) # catch all U+?FFFE and U+?FFFF, where ? is 0..10
-         or (0x10FFFF < charAsInt)):
-            char = u"\uFFFD"
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "illegal-codepoint-for-numeric-entity",
-              "datavars": {"charAsInt": charAsInt}})
-        else:
-            try:
-                # XXX We should have a separate function that does "int" to
-                # "unicodestring" conversion since this doesn't always work
-                # according to hsivonen. Also, unichr has a limitation of 65535
-                char = unichr(charAsInt)
-            except:
-                try:
-                    char = eval("u'\\U%08x'" % charAsInt)
-                except:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                      "cant-convert-numeric-entity",
-                      "datavars": {"charAsInt": charAsInt}})
-
-        # Discard the ; if present. Otherwise, put it back on the queue and
-        # invoke parseError on parser.
-        if c != u";":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "numeric-entity-without-semicolon"})
-            self.stream.unget(c)
-
-        return char
-
-    def consumeEntity(self, allowedChar=None, fromAttribute=False):
-        # Initialise to the default output for when no entity is matched
-        output = u"&"
-
-        charStack = [self.stream.char()]
-        if charStack[0] in spaceCharacters or charStack[0] in (EOF, u"<", u"&") \
-         or (allowedChar is not None and allowedChar == charStack[0]):
-            self.stream.unget(charStack[0])
-
-        elif charStack[0] == u"#":
-            # Read the next character to see if it's hex or decimal
-            hex = False
-            charStack.append(self.stream.char())
-            if charStack[-1] in (u"x", u"X"):
-                hex = True
-                charStack.append(self.stream.char())
-
-            # charStack[-1] should be the first digit
-            if (hex and charStack[-1] in hexDigits) \
-             or (not hex and charStack[-1] in digits):
-                # At least one digit found, so consume the whole number
-                self.stream.unget(charStack[-1])
-                output = self.consumeNumberEntity(hex)
-            else:
-                # No digits found
-                self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                    "data": "expected-numeric-entity"})
-                self.stream.unget(charStack.pop())
-                output = u"&" + u"".join(charStack)
-
-        else:
-            # At this point in the process might have named entity. Entities
-            # are stored in the global variable "entities".
-            #
-            # Consume characters and compare to these to a substring of the
-            # entity names in the list until the substring no longer matches.
-            filteredEntityList = entitiesByFirstChar.get(charStack[0], [])
-
-            def entitiesStartingWith(name):
-                return [e for e in filteredEntityList if e.startswith(name)]
-
-            while charStack[-1] is not EOF and\
-              entitiesStartingWith("".join(charStack)):
-                charStack.append(self.stream.char())
-
-            # At this point we have a string that starts with some characters
-            # that may match an entity
-            entityName = None
-
-            # Try to find the longest entity the string will match to take care
-            # of &noti for instance.
-            for entityLength in xrange(len(charStack)-1, 1, -1):
-                possibleEntityName = "".join(charStack[:entityLength])
-                if possibleEntityName in entities:
-                    entityName = possibleEntityName
-                    break
-
-            if entityName is not None:
-                if entityName[-1] != ";":
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                      "named-entity-without-semicolon"})
-                if entityName[-1] != ";" and fromAttribute and \
-                  (charStack[entityLength] in asciiLetters
-                  or charStack[entityLength] in digits):
-                    self.stream.unget(charStack.pop())
-                    output = u"&" + u"".join(charStack)
-                else:
-                    output = entities[entityName]
-                    self.stream.unget(charStack.pop())
-                    output += u"".join(charStack[entityLength:])
-            else:
-                self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                  "expected-named-entity"})
-                self.stream.unget(charStack.pop())
-                output = u"&" + u"".join(charStack)
-
-        if fromAttribute:
-            self.currentToken["data"][-1][1] += output
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": output})
-
-    def processEntityInAttribute(self, allowedChar):
-        """This method replaces the need for "entityInAttributeValueState".
-        """
-        self.consumeEntity(allowedChar=allowedChar, fromAttribute=True)
-
-    def emitCurrentToken(self):
-        """This method is a generic handler for emitting the tags. It also sets
-        the state to "data" because that's what's needed after a token has been
-        emitted.
-        """
-        token = self.currentToken
-        # Add token to the queue to be yielded
-        if (token["type"] in tagTokenTypes):
-            if self.lowercaseElementName:
-                token["name"] = token["name"].translate(asciiUpper2Lower)
-            if token["type"] == tokenTypes["EndTag"]:
-                if token["data"]:
-                    self.tokenQueue.append({"type":tokenTypes["ParseError"],
-                                            "data":"attributes-in-end-tag"})
-                if token["selfClosing"]:
-                    self.tokenQueue.append({"type":tokenTypes["ParseError"],
-                                            "data":"self-closing-flag-on-end-tag"})
-        self.tokenQueue.append(token)
-        self.state = self.dataState
-
-
-    # Below are the various tokenizer states worked out.
-
-    def dataState(self):
-        #XXX - consider splitting this state based on the content model flag
-        data = self.stream.char()
-
-        # Keep a charbuffer to handle the escapeFlag
-        if (self.contentModelFlag in
-            (contentModelFlags["CDATA"], contentModelFlags["RCDATA"])):
-            if len(self.lastFourChars) == 4:
-                self.lastFourChars.pop(0)
-            self.lastFourChars.append(data)
-
-        # The rest of the logic
-        if (data == "&" and self.contentModelFlag in
-            (contentModelFlags["PCDATA"], contentModelFlags["RCDATA"]) and 
-            not self.escapeFlag):
-            self.state = self.states["entityData"]
-        elif (data == "-" and self.contentModelFlag in
-              (contentModelFlags["CDATA"], contentModelFlags["RCDATA"]) and 
-              not self.escapeFlag and "".join(self.lastFourChars) == "<!--"):
-            self.escapeFlag = True
-            self.tokenQueue.append({"type": tokenTypes["Characters"], 
-                                    "data":data})
-        elif (data == "<" and (self.contentModelFlag == 
-                               contentModelFlags["PCDATA"]
-                               or (self.contentModelFlag in
-                                   (contentModelFlags["CDATA"],
-                                    contentModelFlags["RCDATA"]) and
-                                   self.escapeFlag == False))):
-            self.state = self.states["tagOpen"]
-        elif (data == ">" and self.contentModelFlag in
-              (contentModelFlags["CDATA"], contentModelFlags["RCDATA"]) and
-              self.escapeFlag and "".join(self.lastFourChars)[1:] == "-->"):
-            self.escapeFlag = False
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":data})
-        elif data is EOF:
-            # Tokenization ends.
-            return False
-        elif data in spaceCharacters:
-            # Directly after emitting a token you switch back to the "data
-            # state". At that point spaceCharacters are important so they are
-            # emitted separately.
-            self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
-              data + self.stream.charsUntil(spaceCharacters, True)})
-            # No need to update lastFourChars here, since the first space will
-            # have already been appended to lastFourChars and will have broken
-            # any <!-- or --> sequences
-        else:
-            if (self.contentModelFlag in
-                (contentModelFlags["CDATA"], contentModelFlags["RCDATA"])):
-                chars = self.stream.charsUntil((u"&", u"<", u">", u"-"))
-                self.lastFourChars += chars[-4:]
-                self.lastFourChars = self.lastFourChars[-4:]
-            else:
-                chars = self.stream.charsUntil((u"&", u"<"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": 
-              data + chars})
-        return True
-
-    def entityDataState(self):
-        self.consumeEntity()
-        self.state = self.states["data"]
-        return True
-
-    def tagOpenState(self):
-        data = self.stream.char()
-        if self.contentModelFlag == contentModelFlags["PCDATA"]:
-            if data == u"!":
-                self.state = self.states["markupDeclarationOpen"]
-            elif data == u"/":
-                self.state = self.states["closeTagOpen"]
-            elif data in asciiLetters:
-                self.currentToken = {"type": tokenTypes["StartTag"], 
-                                     "name": data, "data": [],
-                                     "selfClosing": False,
-                                     "selfClosingAcknowledged": False}
-                self.state = self.states["tagName"]
-            elif data == u">":
-                # XXX In theory it could be something besides a tag name. But
-                # do we really care?
-                self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                  "expected-tag-name-but-got-right-bracket"})
-                self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<>"})
-                self.state = self.states["data"]
-            elif data == u"?":
-                # XXX In theory it could be something besides a tag name. But
-                # do we really care?
-                self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                  "expected-tag-name-but-got-question-mark"})
-                self.stream.unget(data)
-                self.state = self.states["bogusComment"]
-            else:
-                # XXX
-                self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                  "expected-tag-name"})
-                self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
-                self.stream.unget(data)
-                self.state = self.states["data"]
-        else:
-            # We know the content model flag is set to either RCDATA or CDATA
-            # now because this state can never be entered with the PLAINTEXT
-            # flag.
-            if data == u"/":
-                self.state = self.states["closeTagOpen"]
-            else:
-                self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"<"})
-                self.stream.unget(data)
-                self.state = self.states["data"]
-        return True
-
-    def closeTagOpenState(self):
-        if (self.contentModelFlag in (contentModelFlags["RCDATA"],
-            contentModelFlags["CDATA"])):
-
-            charStack = []
-            if self.currentToken:
-                # So far we know that "</" has been consumed. We now need to know
-                # whether the next few characters match the name of last emitted
-                # start tag which also happens to be the currentToken.
-                matched = True
-                for expected in self.currentToken["name"].lower():
-                    charStack.append(self.stream.char())
-                    if charStack[-1] not in (expected, expected.upper()):
-                        matched = False
-                        break
-
-                # If the tag name prefix matched, we also need to check the
-                # subsequent character
-                if matched:
-                    charStack.append(self.stream.char())
-                    if charStack[-1] in (spaceCharacters | frozenset((u">", u"/", EOF))):
-                        self.contentModelFlag = contentModelFlags["PCDATA"]
-                        # Unget the last character, so it can be re-processed
-                        # in the next state
-                        self.stream.unget(charStack.pop())
-                        # The remaining characters in charStack are the tag name
-                        self.currentToken = {"type": tokenTypes["EndTag"],
-                                             "name": u"".join(charStack), 
-                                             "data": [],
-                                             "selfClosing":False}
-                        self.state = self.states["tagName"]
-                        return True
-
-                # Didn't find the end tag. The last character in charStack could be
-                # anything, so it has to be re-processed in the data state
-                self.stream.unget(charStack.pop())
-
-            # The remaining characters are a prefix of the tag name, so they're
-            # just letters and digits, so they can be output as character
-            # tokens immediately
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"</" + u"".join(charStack)})
-            self.state = self.states["data"]
-            return True
-
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.currentToken = {"type": tokenTypes["EndTag"], "name": data,
-                                 "data": [], "selfClosing":False}
-            self.state = self.states["tagName"]
-        elif data == u">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-closing-tag-but-got-right-bracket"})
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-closing-tag-but-got-eof"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": u"</"})
-            self.state = self.states["data"]
-        else:
-            # XXX data can be _'_...
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-closing-tag-but-got-char",
-              "datavars": {"data": data}})
-            self.stream.unget(data)
-            self.state = self.states["bogusComment"]
-        return True
-
-    def tagNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.states["beforeAttributeName"]
-        elif data == u">":
-            self.emitCurrentToken()
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-tag-name"})
-            self.state = self.states["data"]
-        elif data == u"/":
-            self.state = self.states["selfClosingStartTag"]
-        else:
-            self.currentToken["name"] += data
-            # (Don't use charsUntil here, because tag names are
-            # very short and it's faster to not do anything fancy)
-        return True
-
-    def beforeAttributeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data in asciiLetters:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.states["attributeName"]
-        elif data == u">":
-            self.emitCurrentToken()
-        elif data == u"/":
-            self.state = self.states["selfClosingStartTag"]
-        elif data == u"'" or data == u'"' or data == u"=":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "invalid-character-in-attribute-name"})
-            self.currentToken["data"].append([data, ""])
-            self.state = self.states["attributeName"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-attribute-name-but-got-eof"})
-            self.state = self.states["data"]
-        else:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.states["attributeName"]
-        return True
-
-    def attributeNameState(self):
-        data = self.stream.char()
-        leavingThisState = True
-        emitToken = False
-        if data == u"=":
-            self.state = self.states["beforeAttributeValue"]
-        elif data in asciiLetters:
-            self.currentToken["data"][-1][0] += data +\
-              self.stream.charsUntil(asciiLetters, True)
-            leavingThisState = False
-        elif data == u">":
-            # XXX If we emit here the attributes are converted to a dict
-            # without being checked and when the code below runs we error
-            # because data is a dict not a list
-            emitToken = True
-        elif data in spaceCharacters:
-            self.state = self.states["afterAttributeName"]
-        elif data == u"/":
-            self.state = self.states["selfClosingStartTag"]
-        elif data == u"'" or data == u'"':
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "invalid-character-in-attribute-name"})
-            self.currentToken["data"][-1][0] += data
-            leavingThisState = False
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-name"})
-            self.state = self.states["data"]
-            emitToken = True
-        else:
-            self.currentToken["data"][-1][0] += data
-            leavingThisState = False
-
-        if leavingThisState:
-            # Attributes are not dropped at this stage. That happens when the
-            # start tag token is emitted so values can still be safely appended
-            # to attributes, but we do want to report the parse error in time.
-            if self.lowercaseAttrName:
-                self.currentToken["data"][-1][0] = (
-                    self.currentToken["data"][-1][0].translate(asciiUpper2Lower))
-            for name, value in self.currentToken["data"][:-1]:
-                if self.currentToken["data"][-1][0] == name:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                      "duplicate-attribute"})
-                    break
-            # XXX Fix for above XXX
-            if emitToken:
-                self.emitCurrentToken()
-        return True
-
-    def afterAttributeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data == u"=":
-            self.state = self.states["beforeAttributeValue"]
-        elif data == u">":
-            self.emitCurrentToken()
-        elif data in asciiLetters:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.states["attributeName"]
-        elif data == u"/":
-            self.state = self.states["selfClosingStartTag"]
-        elif data == u"'" or data == u'"':
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "invalid-character-after-attribute-name"})
-            self.currentToken["data"].append([data, ""])
-            self.state = self.states["attributeName"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-end-of-tag-but-got-eof"})
-            self.emitCurrentToken()
-        else:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.states["attributeName"]
-        return True
-
-    def beforeAttributeValueState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data == u"\"":
-            self.state = self.states["attributeValueDoubleQuoted"]
-        elif data == u"&":
-            self.state = self.states["attributeValueUnQuoted"]
-            self.stream.unget(data);
-        elif data == u"'":
-            self.state = self.states["attributeValueSingleQuoted"]
-        elif data == u">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-attribute-value-but-got-right-bracket"})
-            self.emitCurrentToken()
-        elif data == u"=":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "equals-in-unquoted-attribute-value"})
-            self.currentToken["data"][-1][1] += data
-            self.state = self.states["attributeValueUnQuoted"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-attribute-value-but-got-eof"})
-            self.emitCurrentToken()
-        else:
-            self.currentToken["data"][-1][1] += data
-            self.state = self.states["attributeValueUnQuoted"]
-        return True
-
-    def attributeValueDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.states["afterAttributeValue"]
-        elif data == u"&":
-            self.processEntityInAttribute(u'"')
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-value-double-quote"})
-            self.emitCurrentToken()
-        else:
-            self.currentToken["data"][-1][1] += data +\
-              self.stream.charsUntil(("\"", u"&"))
-        return True
-
-    def attributeValueSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.states["afterAttributeValue"]
-        elif data == u"&":
-            self.processEntityInAttribute(u"'")
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-value-single-quote"})
-            self.emitCurrentToken()
-        else:
-            self.currentToken["data"][-1][1] += data +\
-              self.stream.charsUntil(("'", u"&"))
-        return True
-
-    def attributeValueUnQuotedState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.states["beforeAttributeName"]
-        elif data == u"&":
-            self.processEntityInAttribute(None)
-        elif data == u">":
-            self.emitCurrentToken()
-        elif data in (u'"', u"'", u"=", u"<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-character-in-unquoted-attribute-value"})
-            self.currentToken["data"][-1][1] += data
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-attribute-value-no-quotes"})
-            self.emitCurrentToken()
-        else:
-            self.currentToken["data"][-1][1] += data + self.stream.charsUntil( \
-              frozenset(("&", ">", "<", "=", "'", '"')) | spaceCharacters)
-        return True
-
-    def afterAttributeValueState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.states["beforeAttributeName"]
-        elif data == u">":
-            self.emitCurrentToken()
-        elif data == u"/":
-            self.state = self.states["selfClosingStartTag"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-EOF-after-attribute-value"})
-            self.emitCurrentToken()
-            self.stream.unget(data)
-            self.state = self.states["data"]
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-character-after-attribute-value"})
-            self.stream.unget(data)
-            self.state = self.states["beforeAttributeName"]
-        return True
-
-    def selfClosingStartTagState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.currentToken["selfClosing"] = True
-            self.emitCurrentToken()
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], 
-                                    "data":
-                                        "unexpected-EOF-after-solidus-in-tag"})
-            self.stream.unget(data)
-            self.state = self.states["data"]
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-character-after-soldius-in-tag"})
-            self.stream.unget(data)
-            self.state = self.states["beforeAttributeName"]
-        return True
-
-    def bogusCommentState(self):
-        # Make a new comment token and give it as value all the characters
-        # until the first > or EOF (charsUntil checks for EOF automatically)
-        # and emit it.
-        self.tokenQueue.append(
-          {"type": tokenTypes["Comment"], "data": self.stream.charsUntil(u">")})
-
-        # Eat the character directly after the bogus comment which is either a
-        # ">" or an EOF.
-        self.stream.char()
-        self.state = self.states["data"]
-        return True
-
-    def bogusCommentContinuationState(self):
-        # Like bogusCommentState, but the caller must create the comment token
-        # and this state just adds more characters to it
-        self.currentToken["data"] += self.stream.charsUntil(u">")
-        self.tokenQueue.append(self.currentToken)
-
-        # Eat the character directly after the bogus comment which is either a
-        # ">" or an EOF.
-        self.stream.char()
-        self.state = self.states["data"]
-        return True
-
-    def markupDeclarationOpenState(self):
-        charStack = [self.stream.char()]
-        if charStack[-1] == u"-":
-            charStack.append(self.stream.char())
-            if charStack[-1] == u"-":
-                self.currentToken = {"type": tokenTypes["Comment"], "data": u""}
-                self.state = self.states["commentStart"]
-                return True
-        elif charStack[-1] in (u'd', u'D'):
-            matched = True
-            for expected in ((u'o', u'O'), (u'c', u'C'), (u't', u'T'),
-                             (u'y', u'Y'), (u'p', u'P'), (u'e', u'E')):
-                charStack.append(self.stream.char())
-                if charStack[-1] not in expected:
-                    matched = False
-                    break
-            if matched:
-                self.currentToken = {"type": tokenTypes["Doctype"],
-                                     "name": u"",
-                                     "publicId": None, "systemId": None, 
-                                     "correct": True}
-                self.state = self.states["doctype"]
-                return True
-
-        self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-          "expected-dashes-or-doctype"})
-        # charStack[:-2] consists of 'safe' characters ('-', 'd', 'o', etc)
-        # so they can be copied directly into the bogus comment data, and only
-        # the last character might be '>' or EOF and needs to be ungetted
-        self.stream.unget(charStack.pop())
-        self.currentToken = {"type": tokenTypes["Comment"], 
-                             "data": u"".join(charStack)}
-        self.state = self.states["bogusCommentContinuation"]
-        return True
-
-    def commentStartState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.states["commentStartDash"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "incorrect-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["data"] += data + self.stream.charsUntil(u"-")
-            self.state = self.states["comment"]
-        return True
-    
-    def commentStartDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.states["commentEnd"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "incorrect-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["data"] += "-" + data + self.stream.charsUntil(u"-")
-            self.state = self.states["comment"]
-        return True
-
-    
-    def commentState(self):
-        data = self.stream.char()
-        if data == u"-":
-            self.state = self.states["commentEndDash"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["data"] += data + self.stream.charsUntil(u"-")
-        return True
-
-    def commentEndDashState(self):
-        data = self.stream.char()
-        if data == u"-":
-            self.state = self.states["commentEnd"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-end-dash"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["data"] += u"-" + data +\
-              self.stream.charsUntil(u"-")
-            # Consume the next character which is either a "-" or an EOF as
-            # well so if there's a "-" directly after the "-" we go nicely to
-            # the "comment end state" without emitting a ParseError() there.
-            self.stream.char()
-        return True
-
-    def commentEndState(self):
-        data = self.stream.char()
-        if data == u">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data == u"-":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-             "unexpected-dash-after-double-dash-in-comment"})
-            self.currentToken["data"] += data
-        elif data in spaceCharacters:
-            self.currentToken["data"] += "--" + data
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-space-after-double-dash-in-comment"})
-            self.state = self.states["commentEndSpace"]
-        elif data == "!":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-bang-after-double-dash-in-comment"})
-            self.state = self.states["commentEndBang"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-double-dash"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            # XXX
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-comment"})
-            self.currentToken["data"] += u"--" + data
-            self.state = self.states["comment"]
-        return True
-
-    def commentEndBangState(self):
-        data = self.stream.char()
-        if data == u">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data == u"-":
-            self.currentToken["data"] += "--!"
-            self.state = self.states["commentEndDash"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-end-bang-state"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["data"] += u"--!" + data
-            self.state = self.states["comment"]
-        return True
-
-    def commentEndSpaceState(self):
-        data = self.stream.char()
-        if data == u">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data == u"-":
-            self.state = self.states["commentEndDash"]
-        elif data in spaceCharacters:
-            self.currentToken["data"] += data
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-comment-end-space-state"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["data"] += data
-            self.state = self.states["comment"]
-        return True
-
-    def doctypeState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.states["beforeDoctypeName"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-doctype-name-but-got-eof"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "need-space-after-doctype"})
-            self.stream.unget(data)
-            self.state = self.states["beforeDoctypeName"]
-        return True
-
-    def beforeDoctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == u">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-doctype-name-but-got-right-bracket"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "expected-doctype-name-but-got-eof"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["name"] = data
-            self.state = self.states["doctypeName"]
-        return True
-
-    def doctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.state = self.states["afterDoctypeName"]
-        elif data == u">":
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype-name"})
-            self.currentToken["correct"] = False
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["name"] += data
-        return True
-
-    def afterDoctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == u">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.currentToken["correct"] = False
-            self.stream.unget(data)
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            if data in (u"p", u"P"):
-                matched = True
-                for expected in ((u"u", u"U"), (u"b", u"B"), (u"l", u"L"),
-                                 (u"i", u"I"), (u"c", u"C")):
-                    data = self.stream.char()
-                    if data not in expected:
-                        matched = False
-                        break
-                if matched:
-                    self.state = self.states["beforeDoctypePublicIdentifier"]
-                    return True
-            elif data in (u"s", u"S"):
-                matched = True
-                for expected in ((u"y", u"Y"), (u"s", u"S"), (u"t", u"T"),
-                                 (u"e", u"E"), (u"m", u"M")):
-                    data = self.stream.char()
-                    if data not in expected:
-                        matched = False
-                        break
-                if matched:
-                    self.state = self.states["beforeDoctypeSystemIdentifier"]
-                    return True
-
-            # All the characters read before the current 'data' will be
-            # [a-zA-Z], so they're garbage in the bogus doctype and can be
-            # discarded; only the latest character might be '>' or EOF
-            # and needs to be ungetted
-            self.stream.unget(data)
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                "expected-space-or-right-bracket-in-doctype", "datavars":
-                {"data": data}})
-            self.currentToken["correct"] = False
-            self.state = self.states["bogusDoctype"]
-
-        return True
-
-    def beforeDoctypePublicIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == "\"":
-            self.currentToken["publicId"] = u""
-            self.state = self.states["doctypePublicIdentifierDoubleQuoted"]
-        elif data == "'":
-            self.currentToken["publicId"] = u""
-            self.state = self.states["doctypePublicIdentifierSingleQuoted"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.states["bogusDoctype"]
-        return True
-
-    def doctypePublicIdentifierDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.states["afterDoctypePublicIdentifier"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["publicId"] += data
-        return True
-
-    def doctypePublicIdentifierSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.states["afterDoctypePublicIdentifier"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["publicId"] += data
-        return True
-
-    def afterDoctypePublicIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == "\"":
-            self.currentToken["systemId"] = u""
-            self.state = self.states["doctypeSystemIdentifierDoubleQuoted"]
-        elif data == "'":
-            self.currentToken["systemId"] = u""
-            self.state = self.states["doctypeSystemIdentifierSingleQuoted"]
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.states["bogusDoctype"]
-        return True
-    
-    def beforeDoctypeSystemIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == "\"":
-            self.currentToken["systemId"] = u""
-            self.state = self.states["doctypeSystemIdentifierDoubleQuoted"]
-        elif data == "'":
-            self.currentToken["systemId"] = u""
-            self.state = self.states["doctypeSystemIdentifierSingleQuoted"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.states["bogusDoctype"]
-        return True
-
-    def doctypeSystemIdentifierDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.states["afterDoctypeSystemIdentifier"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["systemId"] += data
-        return True
-
-    def doctypeSystemIdentifierSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.states["afterDoctypeSystemIdentifier"]
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.currentToken["systemId"] += data
-        return True
-
-    def afterDoctypeSystemIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-              "unexpected-char-in-doctype"})
-            self.state = self.states["bogusDoctype"]
-        return True
-
-    def bogusDoctypeState(self):
-        data = self.stream.char()
-        if data == u">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        elif data is EOF:
-            # XXX EMIT
-            self.stream.unget(data)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.states["data"]
-        else:
-            pass
-        return True
diff --git a/src/html5lib/treeadapters/__init__.py b/src/html5lib/treeadapters/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/html5lib/treeadapters/sax.py b/src/html5lib/treeadapters/sax.py
new file mode 100644
index 0000000000..ad47df9564
--- /dev/null
+++ b/src/html5lib/treeadapters/sax.py
@@ -0,0 +1,44 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from xml.sax.xmlreader import AttributesNSImpl
+
+from ..constants import adjustForeignAttributes, unadjustForeignAttributes
+
+prefix_mapping = {}
+for prefix, localName, namespace in adjustForeignAttributes.values():
+    if prefix is not None:
+        prefix_mapping[prefix] = namespace
+
+
+def to_sax(walker, handler):
+    """Call SAX-like content handler based on treewalker walker"""
+    handler.startDocument()
+    for prefix, namespace in prefix_mapping.items():
+        handler.startPrefixMapping(prefix, namespace)
+
+    for token in walker:
+        type = token["type"]
+        if type == "Doctype":
+            continue
+        elif type in ("StartTag", "EmptyTag"):
+            attrs = AttributesNSImpl(token["data"],
+                                     unadjustForeignAttributes)
+            handler.startElementNS((token["namespace"], token["name"]),
+                                   token["name"],
+                                   attrs)
+            if type == "EmptyTag":
+                handler.endElementNS((token["namespace"], token["name"]),
+                                     token["name"])
+        elif type == "EndTag":
+            handler.endElementNS((token["namespace"], token["name"]),
+                                 token["name"])
+        elif type in ("Characters", "SpaceCharacters"):
+            handler.characters(token["data"])
+        elif type == "Comment":
+            pass
+        else:
+            assert False, "Unknown token type"
+
+    for prefix, namespace in prefix_mapping.items():
+        handler.endPrefixMapping(prefix)
+    handler.endDocument()
diff --git a/src/html5lib/treebuilders/__init__.py b/src/html5lib/treebuilders/__init__.py
index 403ffa5177..6a6b2a4c45 100644
--- a/src/html5lib/treebuilders/__init__.py
+++ b/src/html5lib/treebuilders/__init__.py
@@ -7,7 +7,7 @@ implement several things:
 1) A set of classes for various types of elements: Document, Doctype,
 Comment, Element. These must implement the interface of
 _base.treebuilders.Node (although comment nodes have a different
-signature for their constructor, see treebuilders.simpletree.Comment)
+signature for their constructor, see treebuilders.etree.Comment)
 Textual content may also be implemented as another node type, or not, as
 your tree implementation requires.
 
@@ -24,69 +24,53 @@ getDocument - Returns the root node of the complete document tree
 testSerializer method on your treebuilder which accepts a node and
 returns a string containing Node and its children serialized according
 to the format used in the unittests
-
-The supplied simpletree module provides a python-only implementation
-of a full treebuilder and is a useful reference for the semantics of
-the various methods.
 """
 
+from __future__ import absolute_import, division, unicode_literals
+
+from ..utils import default_etree
+
 treeBuilderCache = {}
 
+
 def getTreeBuilder(treeType, implementation=None, **kwargs):
     """Get a TreeBuilder class for various types of tree with built-in support
-    
+
     treeType - the name of the tree type required (case-insensitive). Supported
-               values are "simpletree", "dom", "etree" and "beautifulsoup"
-               
-               "simpletree" - a built-in DOM-ish tree type with support for some
-                              more pythonic idioms.
-                "dom" - A generic builder for DOM implementations, defaulting to
-                        a xml.dom.minidom based implementation for the sake of
-                        backwards compatibility (as releases up until 0.10 had a
-                        builder called "dom" that was a minidom implemenation).
-                "etree" - A generic builder for tree implementations exposing an
-                          elementtree-like interface (known to work with
-                          ElementTree, cElementTree and lxml.etree).
-                "beautifulsoup" - Beautiful soup (if installed)
-               
+               values are:
+
+               "dom" - A generic builder for DOM implementations, defaulting to
+                       a xml.dom.minidom based implementation.
+               "etree" - A generic builder for tree implementations exposing an
+                         ElementTree-like interface, defaulting to
+                         xml.etree.cElementTree if available and
+                         xml.etree.ElementTree if not.
+               "lxml" - A etree-based builder for lxml.etree, handling
+                        limitations of lxml's implementation.
+
     implementation - (Currently applies to the "etree" and "dom" tree types). A
                       module implementing the tree type e.g.
-                      xml.etree.ElementTree or lxml.etree."""
-    
+                      xml.etree.ElementTree or xml.etree.cElementTree."""
+
     treeType = treeType.lower()
     if treeType not in treeBuilderCache:
         if treeType == "dom":
-            import dom
-            # XXX: Keep backwards compatibility by using minidom if no implementation is given
-            if implementation == None:
+            from . import dom
+            # Come up with a sane default (pref. from the stdlib)
+            if implementation is None:
                 from xml.dom import minidom
                 implementation = minidom
-            # XXX: NEVER cache here, caching is done in the dom submodule
+            # NEVER cache here, caching is done in the dom submodule
             return dom.getDomModule(implementation, **kwargs).TreeBuilder
-        elif treeType == "simpletree":
-            import simpletree
-            treeBuilderCache[treeType] = simpletree.TreeBuilder
-        elif treeType == "beautifulsoup":
-            import soup
-            treeBuilderCache[treeType] = soup.TreeBuilder
         elif treeType == "lxml":
-            import etree_lxml
+            from . import etree_lxml
             treeBuilderCache[treeType] = etree_lxml.TreeBuilder
         elif treeType == "etree":
-            # Come up with a sane default
-            if implementation == None:
-                try:
-                    import xml.etree.cElementTree as ET
-                except ImportError:
-                    try:
-                        import xml.etree.ElementTree as ET
-                    except ImportError:
-                        try:
-                            import cElementTree as ET
-                        except ImportError:
-                            import elementtree.ElementTree as ET
-                implementation = ET
-            import etree
-            # XXX: NEVER cache here, caching is done in the etree submodule
+            from . import etree
+            if implementation is None:
+                implementation = default_etree
+            # NEVER cache here, caching is done in the etree submodule
             return etree.getETreeModule(implementation, **kwargs).TreeBuilder
+        else:
+            raise ValueError("""Unrecognised treebuilder "%s" """ % treeType)
     return treeBuilderCache.get(treeType)
diff --git a/src/html5lib/treebuilders/_base.py b/src/html5lib/treebuilders/_base.py
index 6ea58434e8..8b97cc11a2 100644
--- a/src/html5lib/treebuilders/_base.py
+++ b/src/html5lib/treebuilders/_base.py
@@ -1,25 +1,34 @@
-from html5lib.constants import scopingElements, tableInsertModeElements, namespaces
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import Set as set
-    from sets import ImmutableSet as frozenset
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
 
-# The scope markers are inserted when entering buttons, object elements,
+from ..constants import scopingElements, tableInsertModeElements, namespaces
+
+# The scope markers are inserted when entering object elements,
 # marquees, table cells, and table captions, and are used to prevent formatting
-# from "leaking" into tables, buttons, object elements, and marquees.
+# from "leaking" into tables, object elements, and marquees.
 Marker = None
 
+listElementsMap = {
+    None: (frozenset(scopingElements), False),
+    "button": (frozenset(scopingElements | set([(namespaces["html"], "button")])), False),
+    "list": (frozenset(scopingElements | set([(namespaces["html"], "ol"),
+                                              (namespaces["html"], "ul")])), False),
+    "table": (frozenset([(namespaces["html"], "html"),
+                         (namespaces["html"], "table")]), False),
+    "select": (frozenset([(namespaces["html"], "optgroup"),
+                          (namespaces["html"], "option")]), True)
+}
+
+
 class Node(object):
     def __init__(self, name):
         """Node representing an item in the tree.
         name - The tag name associated with the node
         parent - The parent of the current node (or None for the document node)
-        value - The value of the current node (applies to text nodes and 
+        value - The value of the current node (applies to text nodes and
         comments
         attributes - a dict holding name, value pairs for attributes of the node
-        childNodes - a list of child nodes of the current node. This must 
+        childNodes - a list of child nodes of the current node. This must
         include all elements but not necessarily other node types
         _flags - A list of miscellaneous flags that can be set on the node
         """
@@ -30,14 +39,14 @@ class Node(object):
         self.childNodes = []
         self._flags = []
 
-    def __unicode__(self):
-        attributesStr =  " ".join(["%s=\"%s\""%(name, value) 
-                                   for name, value in 
-                                   self.attributes.iteritems()])
+    def __str__(self):
+        attributesStr = " ".join(["%s=\"%s\"" % (name, value)
+                                  for name, value in
+                                  self.attributes.items()])
         if attributesStr:
-            return "<%s %s>"%(self.name,attributesStr)
+            return "<%s %s>" % (self.name, attributesStr)
         else:
-            return "<%s>"%(self.name)
+            return "<%s>" % (self.name)
 
     def __repr__(self):
         return "<%s>" % (self.name)
@@ -48,14 +57,14 @@ class Node(object):
         raise NotImplementedError
 
     def insertText(self, data, insertBefore=None):
-        """Insert data as text in the current node, positioned before the 
+        """Insert data as text in the current node, positioned before the
         start of node insertBefore or to the end of the node's text.
         """
         raise NotImplementedError
 
     def insertBefore(self, node, refNode):
-        """Insert node as a child of the current node, before refNode in the 
-        list of child nodes. Raises ValueError if refNode is not a child of 
+        """Insert node as a child of the current node, before refNode in the
+        list of child nodes. Raises ValueError if refNode is not a child of
         the current node"""
         raise NotImplementedError
 
@@ -65,11 +74,11 @@ class Node(object):
         raise NotImplementedError
 
     def reparentChildren(self, newParent):
-        """Move all the children of the current node to newParent. 
-        This is needed so that trees that don't store text as nodes move the 
+        """Move all the children of the current node to newParent.
+        This is needed so that trees that don't store text as nodes move the
         text in the correct way
         """
-        #XXX - should this method be made more general?
+        # XXX - should this method be made more general?
         for child in self.childNodes:
             newParent.appendChild(child)
         self.childNodes = []
@@ -80,12 +89,36 @@ class Node(object):
         """
         raise NotImplementedError
 
-
     def hasContent(self):
         """Return true if the node has children or text, false otherwise
         """
         raise NotImplementedError
 
+
+class ActiveFormattingElements(list):
+    def append(self, node):
+        equalCount = 0
+        if node != Marker:
+            for element in self[::-1]:
+                if element == Marker:
+                    break
+                if self.nodesEqual(element, node):
+                    equalCount += 1
+                if equalCount == 3:
+                    self.remove(element)
+                    break
+        list.append(self, node)
+
+    def nodesEqual(self, node1, node2):
+        if not node1.nameTuple == node2.nameTuple:
+            return False
+
+        if not node1.attributes == node2.attributes:
+            return False
+
+        return True
+
+
 class TreeBuilder(object):
     """Base treebuilder implementation
     documentClass - the class to use for the bottommost node of a document
@@ -94,19 +127,19 @@ class TreeBuilder(object):
     doctypeClass - the class to use for doctypes
     """
 
-    #Document class
+    # Document class
     documentClass = None
 
-    #The class to use for creating a node
+    # The class to use for creating a node
     elementClass = None
 
-    #The class to use for creating comments
+    # The class to use for creating comments
     commentClass = None
 
-    #The class to use for creating doctypes
+    # The class to use for creating doctypes
     doctypeClass = None
-    
-    #Fragment class
+
+    # Fragment class
     fragmentClass = None
 
     def __init__(self, namespaceHTMLElements):
@@ -115,12 +148,12 @@ class TreeBuilder(object):
         else:
             self.defaultNamespace = None
         self.reset()
-    
+
     def reset(self):
         self.openElements = []
-        self.activeFormattingElements = []
+        self.activeFormattingElements = ActiveFormattingElements()
 
-        #XXX - rename these to headElement, formElement
+        # XXX - rename these to headElement, formElement
         self.headPointer = None
         self.formPointer = None
 
@@ -129,23 +162,21 @@ class TreeBuilder(object):
         self.document = self.documentClass()
 
     def elementInScope(self, target, variant=None):
-        # Exit early when possible.
-        listElementsMap = {
-            None:scopingElements,
-            "list":scopingElements | set([(namespaces["html"], "ol"),
-                                          (namespaces["html"], "ul")]),
-            "table":set([(namespaces["html"], "html"),
-                         (namespaces["html"], "table")])
-            }
-        listElements = listElementsMap[variant]
+
+        # If we pass a node in we match that. if we pass a string
+        # match any node with that name
+        exactNode = hasattr(target, "nameTuple")
+
+        listElements, invert = listElementsMap[variant]
 
         for node in reversed(self.openElements):
-            if node.name == target:
+            if (node.name == target and not exactNode or
+                    node == target and exactNode):
                 return True
-            elif node.nameTuple in listElements:
+            elif (invert ^ (node.nameTuple in listElements)):
                 return False
 
-        assert False # We should never reach this point
+        assert False  # We should never reach this point
 
     def reconstructActiveFormattingElements(self):
         # Within this algorithm the order of steps described in the
@@ -165,7 +196,7 @@ class TreeBuilder(object):
         # Step 6
         while entry != Marker and entry not in self.openElements:
             if i == 0:
-                #This will be reset to 0 below
+                # This will be reset to 0 below
                 i = -1
                 break
             i -= 1
@@ -178,13 +209,13 @@ class TreeBuilder(object):
 
             # Step 8
             entry = self.activeFormattingElements[i]
-            clone = entry.cloneNode() #Mainly to get a new copy of the attributes
+            clone = entry.cloneNode()  # Mainly to get a new copy of the attributes
 
             # Step 9
-            element = self.insertElement({"type":"StartTag", 
-                                          "name":clone.name, 
-                                          "namespace":clone.namespace, 
-                                          "data":clone.attributes})
+            element = self.insertElement({"type": "StartTag",
+                                          "name": clone.name,
+                                          "namespace": clone.namespace,
+                                          "data": clone.attributes})
 
             # Step 10
             self.activeFormattingElements[i] = element
@@ -229,7 +260,7 @@ class TreeBuilder(object):
         if parent is None:
             parent = self.openElements[-1]
         parent.appendChild(self.commentClass(token["data"]))
-                           
+
     def createElement(self, token):
         """Create an element but don't insert it anywhere"""
         name = token["name"]
@@ -251,9 +282,10 @@ class TreeBuilder(object):
             self.insertElement = self.insertElementNormal
 
     insertFromTable = property(_getInsertFromTable, _setInsertFromTable)
-        
+
     def insertElementNormal(self, token):
         name = token["name"]
+        assert isinstance(name, text_type), "Element %s not unicode" % name
         namespace = token.get("namespace", self.defaultNamespace)
         element = self.elementClass(name, namespace)
         element.attributes = token["data"]
@@ -262,13 +294,13 @@ class TreeBuilder(object):
         return element
 
     def insertElementTable(self, token):
-        """Create an element and insert it into the tree""" 
+        """Create an element and insert it into the tree"""
         element = self.createElement(token)
         if self.openElements[-1].name not in tableInsertModeElements:
             return self.insertElementNormal(token)
         else:
-            #We should be in the InTable mode. This means we want to do
-            #special magic element rearranging
+            # We should be in the InTable mode. This means we want to do
+            # special magic element rearranging
             parent, insertBefore = self.getTableMisnestedNodePosition()
             if insertBefore is None:
                 parent.appendChild(element)
@@ -283,7 +315,7 @@ class TreeBuilder(object):
             parent = self.openElements[-1]
 
         if (not self.insertFromTable or (self.insertFromTable and
-                                         self.openElements[-1].name 
+                                         self.openElements[-1].name
                                          not in tableInsertModeElements)):
             parent.insertText(data)
         else:
@@ -291,14 +323,14 @@ class TreeBuilder(object):
             # special magic element rearranging
             parent, insertBefore = self.getTableMisnestedNodePosition()
             parent.insertText(data, insertBefore)
-            
+
     def getTableMisnestedNodePosition(self):
         """Get the foster parent element, and sibling to insert before
         (or None) when inserting a misnested table node"""
         # The foster parent element is the one which comes before the most
         # recently opened table element
         # XXX - this is really inelegant
-        lastTable=None
+        lastTable = None
         fosterParent = None
         insertBefore = None
         for elm in self.openElements[::-1]:
@@ -321,8 +353,8 @@ class TreeBuilder(object):
     def generateImpliedEndTags(self, exclude=None):
         name = self.openElements[-1].name
         # XXX td, th and tr are not actually needed
-        if (name in frozenset(("dd", "dt", "li", "p", "td", "th", "tr"))
-            and name != exclude):
+        if (name in frozenset(("dd", "dt", "li", "option", "optgroup", "p", "rp", "rt"))
+                and name != exclude):
             self.openElements.pop()
             # XXX This is not entirely what the specification says. We should
             # investigate it more closely.
@@ -331,10 +363,10 @@ class TreeBuilder(object):
     def getDocument(self):
         "Return the final tree"
         return self.document
-    
+
     def getFragment(self):
         "Return the final fragment"
-        #assert self.innerHTML
+        # assert self.innerHTML
         fragment = self.fragmentClass()
         self.openElements[0].reparentChildren(fragment)
         return fragment
diff --git a/src/html5lib/treebuilders/dom.py b/src/html5lib/treebuilders/dom.py
index c094e1f09b..61e5ed79ed 100644
--- a/src/html5lib/treebuilders/dom.py
+++ b/src/html5lib/treebuilders/dom.py
@@ -1,40 +1,38 @@
+from __future__ import absolute_import, division, unicode_literals
 
-from xml.dom import minidom, Node, XML_NAMESPACE, XMLNS_NAMESPACE
-import new
-import re
+
+from xml.dom import minidom, Node
 import weakref
 
-import _base
-from html5lib import constants, ihatexml
-from html5lib.constants import namespaces
+from . import _base
+from .. import constants
+from ..constants import namespaces
+from ..utils import moduleFactoryFactory
 
-moduleCache = {}
-
-def getDomModule(DomImplementation):
-    name = "_" + DomImplementation.__name__+"builder"
-    if name in moduleCache:
-        return moduleCache[name]
-    else:
-        mod = new.module(name)
-        objs = getDomBuilder(DomImplementation)
-        mod.__dict__.update(objs)
-        moduleCache[name] = mod    
-        return mod
 
 def getDomBuilder(DomImplementation):
     Dom = DomImplementation
-    class AttrList:
+
+    class AttrList(object):
         def __init__(self, element):
             self.element = element
+
         def __iter__(self):
-            return self.element.attributes.items().__iter__()
+            return list(self.element.attributes.items()).__iter__()
+
         def __setitem__(self, name, value):
             self.element.setAttribute(name, value)
+
+        def __len__(self):
+            return len(list(self.element.attributes.items()))
+
         def items(self):
             return [(item[0], item[1]) for item in
-                     self.element.attributes.items()]
+                    list(self.element.attributes.items())]
+
         def keys(self):
-            return self.element.attributes.keys()
+            return list(self.element.attributes.keys())
+
         def __getitem__(self, name):
             return self.element.getAttribute(name)
 
@@ -43,68 +41,68 @@ def getDomBuilder(DomImplementation):
                 raise NotImplementedError
             else:
                 return self.element.hasAttribute(name)
-    
+
     class NodeBuilder(_base.Node):
         def __init__(self, element):
             _base.Node.__init__(self, element.nodeName)
             self.element = element
 
-        namespace = property(lambda self:hasattr(self.element, "namespaceURI")
+        namespace = property(lambda self: hasattr(self.element, "namespaceURI")
                              and self.element.namespaceURI or None)
 
         def appendChild(self, node):
             node.parent = self
             self.element.appendChild(node.element)
-    
+
         def insertText(self, data, insertBefore=None):
             text = self.element.ownerDocument.createTextNode(data)
             if insertBefore:
                 self.element.insertBefore(text, insertBefore.element)
             else:
                 self.element.appendChild(text)
-    
+
         def insertBefore(self, node, refNode):
             self.element.insertBefore(node.element, refNode.element)
             node.parent = self
-    
+
         def removeChild(self, node):
             if node.element.parentNode == self.element:
                 self.element.removeChild(node.element)
             node.parent = None
-    
+
         def reparentChildren(self, newParent):
             while self.element.hasChildNodes():
                 child = self.element.firstChild
                 self.element.removeChild(child)
                 newParent.element.appendChild(child)
             self.childNodes = []
-    
+
         def getAttributes(self):
             return AttrList(self.element)
-    
+
         def setAttributes(self, attributes):
             if attributes:
-                for name, value in attributes.items():
+                for name, value in list(attributes.items()):
                     if isinstance(name, tuple):
                         if name[0] is not None:
                             qualifiedName = (name[0] + ":" + name[1])
                         else:
                             qualifiedName = name[1]
-                        self.element.setAttributeNS(name[2], qualifiedName, 
+                        self.element.setAttributeNS(name[2], qualifiedName,
                                                     value)
                     else:
                         self.element.setAttribute(
                             name, value)
         attributes = property(getAttributes, setAttributes)
-    
+
         def cloneNode(self):
             return NodeBuilder(self.element.cloneNode(False))
-    
+
         def hasContent(self):
             return self.element.hasChildNodes()
 
         def getNameTuple(self):
-            if self.namespace == None:
+            if self.namespace is None:
                 return namespaces["html"], self.name
             else:
                 return self.namespace, self.name
@@ -113,9 +111,9 @@ def getDomBuilder(DomImplementation):
 
     class TreeBuilder(_base.TreeBuilder):
         def documentClass(self):
-            self.dom = Dom.getDOMImplementation().createDocument(None,None,None)
+            self.dom = Dom.getDOMImplementation().createDocument(None, None, None)
             return weakref.proxy(self)
-    
+
         def insertDoctype(self, token):
             name = token["name"]
             publicId = token["publicId"]
@@ -126,7 +124,7 @@ def getDomBuilder(DomImplementation):
             self.document.appendChild(NodeBuilder(doctype))
             if Dom == minidom:
                 doctype.ownerDocument = self.dom
-    
+
         def elementClass(self, name, namespace=None):
             if namespace is None and self.defaultNamespace is None:
                 node = self.dom.createElement(name)
@@ -134,153 +132,96 @@ def getDomBuilder(DomImplementation):
                 node = self.dom.createElementNS(namespace, name)
 
             return NodeBuilder(node)
-            
+
         def commentClass(self, data):
             return NodeBuilder(self.dom.createComment(data))
-        
+
         def fragmentClass(self):
             return NodeBuilder(self.dom.createDocumentFragment())
-    
+
         def appendChild(self, node):
             self.dom.appendChild(node.element)
-    
+
         def testSerializer(self, element):
             return testSerializer(element)
-    
+
         def getDocument(self):
             return self.dom
-        
+
         def getFragment(self):
             return _base.TreeBuilder.getFragment(self).element
-    
+
         def insertText(self, data, parent=None):
-            data=data
-            if parent <> self:
+            data = data
+            if parent != self:
                 _base.TreeBuilder.insertText(self, data, parent)
             else:
                 # HACK: allow text nodes as children of the document node
                 if hasattr(self.dom, '_child_node_types'):
                     if not Node.TEXT_NODE in self.dom._child_node_types:
-                        self.dom._child_node_types=list(self.dom._child_node_types)
+                        self.dom._child_node_types = list(self.dom._child_node_types)
                         self.dom._child_node_types.append(Node.TEXT_NODE)
                 self.dom.appendChild(self.dom.createTextNode(data))
-    
+
+        implementation = DomImplementation
         name = None
-    
+
     def testSerializer(element):
         element.normalize()
         rv = []
+
         def serializeElement(element, indent=0):
             if element.nodeType == Node.DOCUMENT_TYPE_NODE:
                 if element.name:
                     if element.publicId or element.systemId:
                         publicId = element.publicId or ""
                         systemId = element.systemId or ""
-                        rv.append( """|%s<!DOCTYPE %s "%s" "%s">"""%(
-                                ' '*indent, element.name, publicId, systemId))
+                        rv.append("""|%s<!DOCTYPE %s "%s" "%s">""" %
+                                  (' ' * indent, element.name, publicId, systemId))
                     else:
-                        rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
+                        rv.append("|%s<!DOCTYPE %s>" % (' ' * indent, element.name))
                 else:
-                    rv.append("|%s<!DOCTYPE >"%(' '*indent,))
+                    rv.append("|%s<!DOCTYPE >" % (' ' * indent,))
             elif element.nodeType == Node.DOCUMENT_NODE:
                 rv.append("#document")
             elif element.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
                 rv.append("#document-fragment")
             elif element.nodeType == Node.COMMENT_NODE:
-                rv.append("|%s<!-- %s -->"%(' '*indent, element.nodeValue))
+                rv.append("|%s<!-- %s -->" % (' ' * indent, element.nodeValue))
             elif element.nodeType == Node.TEXT_NODE:
-                rv.append("|%s\"%s\"" %(' '*indent, element.nodeValue))
+                rv.append("|%s\"%s\"" % (' ' * indent, element.nodeValue))
             else:
                 if (hasattr(element, "namespaceURI") and
-                    element.namespaceURI != None):
-                    name = "%s %s"%(constants.prefixes[element.namespaceURI],
-                                    element.nodeName)
+                        element.namespaceURI is not None):
+                    name = "%s %s" % (constants.prefixes[element.namespaceURI],
+                                      element.nodeName)
                 else:
                     name = element.nodeName
-                rv.append("|%s<%s>"%(' '*indent, name))
+                rv.append("|%s<%s>" % (' ' * indent, name))
                 if element.hasAttributes():
-                    i = 0
-                    attr = element.attributes.item(i)
-                    while attr:
+                    attributes = []
+                    for i in range(len(element.attributes)):
+                        attr = element.attributes.item(i)
                         name = attr.nodeName
                         value = attr.value
                         ns = attr.namespaceURI
                         if ns:
-                            name = "%s %s"%(constants.prefixes[ns], attr.localName)
+                            name = "%s %s" % (constants.prefixes[ns], attr.localName)
                         else:
                             name = attr.nodeName
-                        i += 1
-                        attr = element.attributes.item(i)
+                        attributes.append((name, value))
 
-                        rv.append('|%s%s="%s"' % (' '*(indent+2), name, value))
+                    for name, value in sorted(attributes):
+                        rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
             indent += 2
             for child in element.childNodes:
                 serializeElement(child, indent)
         serializeElement(element, 0)
-    
+
         return "\n".join(rv)
-    
-    def dom2sax(node, handler, nsmap={'xml':XML_NAMESPACE}):
-      if node.nodeType == Node.ELEMENT_NODE:
-        if not nsmap:
-          handler.startElement(node.nodeName, node.attributes)
-          for child in node.childNodes: dom2sax(child, handler, nsmap)
-          handler.endElement(node.nodeName)
-        else:
-          attributes = dict(node.attributes.itemsNS()) 
-    
-          # gather namespace declarations
-          prefixes = []
-          for attrname in node.attributes.keys():
-            attr = node.getAttributeNode(attrname)
-            if (attr.namespaceURI == XMLNS_NAMESPACE or
-               (attr.namespaceURI == None and attr.nodeName.startswith('xmlns'))):
-              prefix = (attr.nodeName != 'xmlns' and attr.nodeName or None)
-              handler.startPrefixMapping(prefix, attr.nodeValue)
-              prefixes.append(prefix)
-              nsmap = nsmap.copy()
-              nsmap[prefix] = attr.nodeValue
-              del attributes[(attr.namespaceURI, attr.nodeName)]
-    
-          # apply namespace declarations
-          for attrname in node.attributes.keys():
-            attr = node.getAttributeNode(attrname)
-            if attr.namespaceURI == None and ':' in attr.nodeName:
-              prefix = attr.nodeName.split(':')[0]
-              if nsmap.has_key(prefix):
-                del attributes[(attr.namespaceURI, attr.nodeName)]
-                attributes[(nsmap[prefix],attr.nodeName)]=attr.nodeValue
-    
-          # SAX events
-          ns = node.namespaceURI or nsmap.get(None,None)
-          handler.startElementNS((ns,node.nodeName), node.nodeName, attributes)
-          for child in node.childNodes: dom2sax(child, handler, nsmap)
-          handler.endElementNS((ns, node.nodeName), node.nodeName)
-          for prefix in prefixes: handler.endPrefixMapping(prefix)
-    
-      elif node.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]:
-        handler.characters(node.nodeValue)
-    
-      elif node.nodeType == Node.DOCUMENT_NODE:
-        handler.startDocument()
-        for child in node.childNodes: dom2sax(child, handler, nsmap)
-        handler.endDocument()
-    
-      elif node.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
-        for child in node.childNodes: dom2sax(child, handler, nsmap)
-    
-      else:
-        # ATTRIBUTE_NODE
-        # ENTITY_NODE
-        # PROCESSING_INSTRUCTION_NODE
-        # COMMENT_NODE
-        # DOCUMENT_TYPE_NODE
-        # NOTATION_NODE
-        pass
-        
+
     return locals()
 
-# Keep backwards compatibility with things that directly load 
-# classes/functions from this module
-for key, value in getDomModule(minidom).__dict__.items():
-	globals()[key] = value
+
+# The actual means to get a module!
+getDomModule = moduleFactoryFactory(getDomBuilder)
diff --git a/src/html5lib/treebuilders/etree.py b/src/html5lib/treebuilders/etree.py
index 47efface96..2c8ed19f8f 100644
--- a/src/html5lib/treebuilders/etree.py
+++ b/src/html5lib/treebuilders/etree.py
@@ -1,28 +1,21 @@
-import new
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+
 import re
 
-import _base
-from html5lib import ihatexml
-from html5lib import constants
-from html5lib.constants import namespaces
+from . import _base
+from .. import ihatexml
+from .. import constants
+from ..constants import namespaces
+from ..utils import moduleFactoryFactory
 
 tag_regexp = re.compile("{([^}]*)}(.*)")
 
-moduleCache = {}
-
-def getETreeModule(ElementTreeImplementation, fullTree=False):
-    name = "_" + ElementTreeImplementation.__name__+"builder"
-    if name in moduleCache:
-        return moduleCache[name]
-    else:
-        mod = new.module("_" + ElementTreeImplementation.__name__+"builder")
-        objs = getETreeBuilder(ElementTreeImplementation, fullTree)
-        mod.__dict__.update(objs)
-        moduleCache[name] = mod    
-        return mod
 
 def getETreeBuilder(ElementTreeImplementation, fullTree=False):
     ElementTree = ElementTreeImplementation
+    ElementTreeCommentType = ElementTree.Comment("asd").tag
+
     class Element(_base.Node):
         def __init__(self, name, namespace=None):
             self._name = name
@@ -41,16 +34,16 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
             if namespace is None:
                 etree_tag = name
             else:
-                etree_tag = "{%s}%s"%(namespace, name)
+                etree_tag = "{%s}%s" % (namespace, name)
             return etree_tag
-    
+
         def _setName(self, name):
             self._name = name
             self._element.tag = self._getETreeTag(self._name, self._namespace)
-        
+
         def _getName(self):
             return self._name
-        
+
         name = property(_getName, _setName)
 
         def _setNamespace(self, namespace):
@@ -61,81 +54,82 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
             return self._namespace
 
         namespace = property(_getNamespace, _setNamespace)
-    
+
         def _getAttributes(self):
             return self._element.attrib
-    
+
         def _setAttributes(self, attributes):
-            #Delete existing attributes first
-            #XXX - there may be a better way to do this...
-            for key in self._element.attrib.keys():
+            # Delete existing attributes first
+            # XXX - there may be a better way to do this...
+            for key in list(self._element.attrib.keys()):
                 del self._element.attrib[key]
-            for key, value in attributes.iteritems():
+            for key, value in attributes.items():
                 if isinstance(key, tuple):
-                    name = "{%s}%s"%(key[2], key[1])
+                    name = "{%s}%s" % (key[2], key[1])
                 else:
                     name = key
                 self._element.set(name, value)
-    
+
         attributes = property(_getAttributes, _setAttributes)
-    
+
         def _getChildNodes(self):
-            return self._childNodes    
+            return self._childNodes
+
         def _setChildNodes(self, value):
             del self._element[:]
             self._childNodes = []
             for element in value:
                 self.insertChild(element)
-    
+
         childNodes = property(_getChildNodes, _setChildNodes)
-    
+
         def hasContent(self):
             """Return true if the node has children or text"""
-            return bool(self._element.text or self._element.getchildren())
-    
+            return bool(self._element.text or len(self._element))
+
         def appendChild(self, node):
             self._childNodes.append(node)
             self._element.append(node._element)
             node.parent = self
-    
+
         def insertBefore(self, node, refNode):
-            index = self._element.getchildren().index(refNode._element)
+            index = list(self._element).index(refNode._element)
             self._element.insert(index, node._element)
             node.parent = self
-    
+
         def removeChild(self, node):
             self._element.remove(node._element)
-            node.parent=None
-    
+            node.parent = None
+
         def insertText(self, data, insertBefore=None):
             if not(len(self._element)):
                 if not self._element.text:
                     self._element.text = ""
                 self._element.text += data
             elif insertBefore is None:
-                #Insert the text as the tail of the last child element
+                # Insert the text as the tail of the last child element
                 if not self._element[-1].tail:
                     self._element[-1].tail = ""
                 self._element[-1].tail += data
             else:
-                #Insert the text before the specified node
-                children = self._element.getchildren()
+                # Insert the text before the specified node
+                children = list(self._element)
                 index = children.index(insertBefore._element)
                 if index > 0:
-                    if not self._element[index-1].tail:
-                        self._element[index-1].tail = ""
-                    self._element[index-1].tail += data
+                    if not self._element[index - 1].tail:
+                        self._element[index - 1].tail = ""
+                    self._element[index - 1].tail += data
                 else:
                     if not self._element.text:
                         self._element.text = ""
                     self._element.text += data
-    
+
         def cloneNode(self):
-            element = Element(self.name, self.namespace)
-            for name, value in self.attributes.iteritems():
+            element = type(self)(self.name, self.namespace)
+            for name, value in self.attributes.items():
                 element.attributes[name] = value
             return element
-    
+
         def reparentChildren(self, newParent):
             if newParent.childNodes:
                 newParent.childNodes[-1]._element.tail += self._element.text
@@ -146,60 +140,60 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
                     newParent._element.text += self._element.text
             self._element.text = ""
             _base.Node.reparentChildren(self, newParent)
-    
+
     class Comment(Element):
         def __init__(self, data):
-            #Use the superclass constructor to set all properties on the 
-            #wrapper element
+            # Use the superclass constructor to set all properties on the
+            # wrapper element
             self._element = ElementTree.Comment(data)
             self.parent = None
             self._childNodes = []
             self._flags = []
-            
+
         def _getData(self):
             return self._element.text
-    
+
         def _setData(self, value):
             self._element.text = value
-    
+
         data = property(_getData, _setData)
-    
+
     class DocumentType(Element):
         def __init__(self, name, publicId, systemId):
-            Element.__init__(self, "<!DOCTYPE>") 
+            Element.__init__(self, "<!DOCTYPE>")
             self._element.text = name
             self.publicId = publicId
             self.systemId = systemId
 
         def _getPublicId(self):
-            return self._element.get(u"publicId", "")
+            return self._element.get("publicId", "")
 
         def _setPublicId(self, value):
             if value is not None:
-                self._element.set(u"publicId", value)
+                self._element.set("publicId", value)
 
         publicId = property(_getPublicId, _setPublicId)
-    
+
         def _getSystemId(self):
-            return self._element.get(u"systemId", "")
+            return self._element.get("systemId", "")
 
         def _setSystemId(self, value):
             if value is not None:
-                self._element.set(u"systemId", value)
+                self._element.set("systemId", value)
 
         systemId = property(_getSystemId, _setSystemId)
-    
+
     class Document(Element):
         def __init__(self):
-            Element.__init__(self, "<DOCUMENT_ROOT>") 
-    
+            Element.__init__(self, "DOCUMENT_ROOT")
+
     class DocumentFragment(Element):
         def __init__(self):
-            Element.__init__(self, "<DOCUMENT_FRAGMENT>")
-    
+            Element.__init__(self, "DOCUMENT_FRAGMENT")
+
     def testSerializer(element):
         rv = []
-        finalText = None
+
         def serializeElement(element, indent=0):
             if not(hasattr(element, "tag")):
                 element = element.getroot()
@@ -207,19 +201,23 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
                 if element.get("publicId") or element.get("systemId"):
                     publicId = element.get("publicId") or ""
                     systemId = element.get("systemId") or ""
-                    rv.append( """<!DOCTYPE %s "%s" "%s">"""%(
-                            element.text, publicId, systemId))
-                else:     
-                    rv.append("<!DOCTYPE %s>"%(element.text,))
-            elif element.tag == "<DOCUMENT_ROOT>":
+                    rv.append("""<!DOCTYPE %s "%s" "%s">""" %
+                              (element.text, publicId, systemId))
+                else:
+                    rv.append("<!DOCTYPE %s>" % (element.text,))
+            elif element.tag == "DOCUMENT_ROOT":
                 rv.append("#document")
-                if element.text:
-                    rv.append("|%s\"%s\""%(' '*(indent+2), element.text))
-                if element.tail:
-                    finalText = element.tail
-            elif type(element.tag) == type(ElementTree.Comment):
-                rv.append("|%s<!-- %s -->"%(' '*indent, element.text))
+                if element.text is not None:
+                    rv.append("|%s\"%s\"" % (' ' * (indent + 2), element.text))
+                if element.tail is not None:
+                    raise TypeError("Document node cannot have tail")
+                if hasattr(element, "attrib") and len(element.attrib):
+                    raise TypeError("Document node cannot have attributes")
+            elif element.tag == ElementTreeCommentType:
+                rv.append("|%s<!-- %s -->" % (' ' * indent, element.text))
             else:
+                assert isinstance(element.tag, text_type), \
+                    "Expected unicode, got %s, %s" % (type(element.tag), element.tag)
                 nsmatch = tag_regexp.match(element.tag)
 
                 if nsmatch is None:
@@ -227,103 +225,113 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
                 else:
                     ns, name = nsmatch.groups()
                     prefix = constants.prefixes[ns]
-                    name = "%s %s"%(prefix, name)
-                rv.append("|%s<%s>"%(' '*indent, name))
+                    name = "%s %s" % (prefix, name)
+                rv.append("|%s<%s>" % (' ' * indent, name))
 
                 if hasattr(element, "attrib"):
-                    for name, value in element.attrib.iteritems():
+                    attributes = []
+                    for name, value in element.attrib.items():
                         nsmatch = tag_regexp.match(name)
                         if nsmatch is not None:
                             ns, name = nsmatch.groups()
                             prefix = constants.prefixes[ns]
-                            name = "%s %s"%(prefix, name)
-                        rv.append('|%s%s="%s"' % (' '*(indent+2), name, value))
+                            attr_string = "%s %s" % (prefix, name)
+                        else:
+                            attr_string = name
+                        attributes.append((attr_string, value))
+
+                    for name, value in sorted(attributes):
+                        rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
                 if element.text:
-                    rv.append("|%s\"%s\"" %(' '*(indent+2), element.text))
+                    rv.append("|%s\"%s\"" % (' ' * (indent + 2), element.text))
             indent += 2
-            for child in element.getchildren():
+            for child in element:
                 serializeElement(child, indent)
             if element.tail:
-                rv.append("|%s\"%s\"" %(' '*(indent-2), element.tail))
+                rv.append("|%s\"%s\"" % (' ' * (indent - 2), element.tail))
         serializeElement(element, 0)
-    
-        if finalText is not None:
-            rv.append("|%s\"%s\""%(' '*2, finalText))
-    
+
         return "\n".join(rv)
-    
+
     def tostring(element):
         """Serialize an element and its child nodes to a string"""
         rv = []
-        finalText = None
         filter = ihatexml.InfosetFilter()
+
         def serializeElement(element):
-            if type(element) == type(ElementTree.ElementTree):
+            if isinstance(element, ElementTree.ElementTree):
                 element = element.getroot()
-            
+
             if element.tag == "<!DOCTYPE>":
                 if element.get("publicId") or element.get("systemId"):
                     publicId = element.get("publicId") or ""
                     systemId = element.get("systemId") or ""
-                    rv.append( """<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
-                            element.text, publicId, systemId))
-                else:     
-                    rv.append("<!DOCTYPE %s>"%(element.text,))
-            elif element.tag == "<DOCUMENT_ROOT>":
-                if element.text:
-                    rv.append(element.text)
-                if element.tail:
-                    finalText = element.tail
-    
-                for child in element.getchildren():
-                    serializeElement(child)
-    
-            elif type(element.tag) == type(ElementTree.Comment):
-                rv.append("<!--%s-->"%(element.text,))
-            else:
-                #This is assumed to be an ordinary element
-                if not element.attrib:
-                    rv.append("<%s>"%(filter.fromXmlName(element.tag),))
+                    rv.append("""<!DOCTYPE %s PUBLIC "%s" "%s">""" %
+                              (element.text, publicId, systemId))
                 else:
-                    attr = " ".join(["%s=\"%s\""%(
-                                filter.fromXmlName(name), value) 
-                                     for name, value in element.attrib.iteritems()])
-                    rv.append("<%s %s>"%(element.tag, attr))
+                    rv.append("<!DOCTYPE %s>" % (element.text,))
+            elif element.tag == "DOCUMENT_ROOT":
+                if element.text is not None:
+                    rv.append(element.text)
+                if element.tail is not None:
+                    raise TypeError("Document node cannot have tail")
+                if hasattr(element, "attrib") and len(element.attrib):
+                    raise TypeError("Document node cannot have attributes")
+
+                for child in element:
+                    serializeElement(child)
+
+            elif element.tag == ElementTreeCommentType:
+                rv.append("<!--%s-->" % (element.text,))
+            else:
+                # This is assumed to be an ordinary element
+                if not element.attrib:
+                    rv.append("<%s>" % (filter.fromXmlName(element.tag),))
+                else:
+                    attr = " ".join(["%s=\"%s\"" % (
+                        filter.fromXmlName(name), value)
+                        for name, value in element.attrib.items()])
+                    rv.append("<%s %s>" % (element.tag, attr))
                 if element.text:
                     rv.append(element.text)
-    
-                for child in element.getchildren():
+
+                for child in element:
                     serializeElement(child)
-    
-                rv.append("</%s>"%(element.tag,))
-    
+
+                rv.append("</%s>" % (element.tag,))
+
             if element.tail:
                 rv.append(element.tail)
-    
+
         serializeElement(element)
-    
-        if finalText is not None:
-            rv.append("%s\""%(' '*2, finalText))
-    
+
         return "".join(rv)
-    
+
     class TreeBuilder(_base.TreeBuilder):
         documentClass = Document
         doctypeClass = DocumentType
         elementClass = Element
         commentClass = Comment
         fragmentClass = DocumentFragment
-    
+        implementation = ElementTreeImplementation
+
         def testSerializer(self, element):
             return testSerializer(element)
-    
+
         def getDocument(self):
             if fullTree:
                 return self.document._element
             else:
-                return self.document._element.find("html")
-        
+                if self.defaultNamespace is not None:
+                    return self.document._element.find(
+                        "{%s}html" % self.defaultNamespace)
+                else:
+                    return self.document._element.find("html")
+
         def getFragment(self):
             return _base.TreeBuilder.getFragment(self)._element
-        
+
     return locals()
+
+
+getETreeModule = moduleFactoryFactory(getETreeBuilder)
diff --git a/src/html5lib/treebuilders/etree_lxml.py b/src/html5lib/treebuilders/etree_lxml.py
index 80a4005108..35d08efaa6 100644
--- a/src/html5lib/treebuilders/etree_lxml.py
+++ b/src/html5lib/treebuilders/etree_lxml.py
@@ -1,20 +1,3 @@
-import new
-import warnings
-import re
-
-import _base
-from html5lib.constants import DataLossWarning
-import html5lib.constants as constants
-import etree as etree_builders
-from html5lib import ihatexml
-
-try:
-    import lxml.etree as etree
-except ImportError:
-    pass
-
-fullTree = True
-
 """Module for supporting the lxml.etree library. The idea here is to use as much
 of the native library as possible, without using fragile hacks like custom element
 names that break between releases. The downside of this is that we cannot represent
@@ -26,12 +9,34 @@ Docypes with no name
 When any of these things occur, we emit a DataLossWarning
 """
 
+from __future__ import absolute_import, division, unicode_literals
+
+import warnings
+import re
+import sys
+
+from . import _base
+from ..constants import DataLossWarning
+from .. import constants
+from . import etree as etree_builders
+from .. import ihatexml
+
+import lxml.etree as etree
+
+
+fullTree = True
+tag_regexp = re.compile("{([^}]*)}(.*)")
+
+comment_type = etree.Comment("asd").tag
+
+
 class DocumentType(object):
     def __init__(self, name, publicId, systemId):
-        self.name = name         
+        self.name = name
         self.publicId = publicId
         self.systemId = systemId
 
+
 class Document(object):
     def __init__(self):
         self._elementTree = None
@@ -42,117 +47,126 @@ class Document(object):
 
     def _getChildNodes(self):
         return self._childNodes
-    
+
     childNodes = property(_getChildNodes)
 
+
 def testSerializer(element):
     rv = []
     finalText = None
-    filter = ihatexml.InfosetFilter()
+    infosetFilter = ihatexml.InfosetFilter()
+
     def serializeElement(element, indent=0):
         if not hasattr(element, "tag"):
-            if  hasattr(element, "getroot"):
-                #Full tree case
+            if hasattr(element, "getroot"):
+                # Full tree case
                 rv.append("#document")
                 if element.docinfo.internalDTD:
-                    if not (element.docinfo.public_id or 
+                    if not (element.docinfo.public_id or
                             element.docinfo.system_url):
-                        dtd_str = "<!DOCTYPE %s>"%element.docinfo.root_name
+                        dtd_str = "<!DOCTYPE %s>" % element.docinfo.root_name
                     else:
-                        dtd_str = """<!DOCTYPE %s "%s" "%s">"""%(
-                            element.docinfo.root_name, 
+                        dtd_str = """<!DOCTYPE %s "%s" "%s">""" % (
+                            element.docinfo.root_name,
                             element.docinfo.public_id,
                             element.docinfo.system_url)
-                    rv.append("|%s%s"%(' '*(indent+2), dtd_str))
+                    rv.append("|%s%s" % (' ' * (indent + 2), dtd_str))
                 next_element = element.getroot()
                 while next_element.getprevious() is not None:
                     next_element = next_element.getprevious()
                 while next_element is not None:
-                    serializeElement(next_element, indent+2)
+                    serializeElement(next_element, indent + 2)
                     next_element = next_element.getnext()
-            elif isinstance(element, basestring):
-                #Text in a fragment
-                rv.append("|%s\"%s\""%(' '*indent, element))
+            elif isinstance(element, str) or isinstance(element, bytes):
+                # Text in a fragment
+                assert isinstance(element, str) or sys.version_info.major == 2
+                rv.append("|%s\"%s\"" % (' ' * indent, element))
             else:
-                #Fragment case
+                # Fragment case
                 rv.append("#document-fragment")
                 for next_element in element:
-                    serializeElement(next_element, indent+2)
-        elif type(element.tag) == type(etree.Comment):
-            rv.append("|%s<!-- %s -->"%(' '*indent, element.text))
+                    serializeElement(next_element, indent + 2)
+        elif element.tag == comment_type:
+            rv.append("|%s<!-- %s -->" % (' ' * indent, element.text))
+            if hasattr(element, "tail") and element.tail:
+                rv.append("|%s\"%s\"" % (' ' * indent, element.tail))
         else:
+            assert isinstance(element, etree._Element)
             nsmatch = etree_builders.tag_regexp.match(element.tag)
             if nsmatch is not None:
                 ns = nsmatch.group(1)
                 tag = nsmatch.group(2)
                 prefix = constants.prefixes[ns]
-                rv.append("|%s<%s %s>"%(' '*indent, prefix,
-                                        filter.fromXmlName(tag)))
+                rv.append("|%s<%s %s>" % (' ' * indent, prefix,
+                                          infosetFilter.fromXmlName(tag)))
             else:
-                rv.append("|%s<%s>"%(' '*indent,
-                                     filter.fromXmlName(element.tag)))
+                rv.append("|%s<%s>" % (' ' * indent,
+                                       infosetFilter.fromXmlName(element.tag)))
 
             if hasattr(element, "attrib"):
-                for name, value in element.attrib.iteritems():
-                    nsmatch = etree_builders.tag_regexp.match(name)
-                    if nsmatch:
-                        ns = nsmatch.group(1)
-                        name = nsmatch.group(2)
+                attributes = []
+                for name, value in element.attrib.items():
+                    nsmatch = tag_regexp.match(name)
+                    if nsmatch is not None:
+                        ns, name = nsmatch.groups()
+                        name = infosetFilter.fromXmlName(name)
                         prefix = constants.prefixes[ns]
-                        rv.append('|%s%s %s="%s"' % (' '*(indent+2), 
-                                                  prefix,
-                                                  filter.fromXmlName(name),
-                                                  value))
-                    else:        
-                        rv.append('|%s%s="%s"' % (' '*(indent+2), 
-                                                  filter.fromXmlName(name),
-                                                  value))
+                        attr_string = "%s %s" % (prefix, name)
+                    else:
+                        attr_string = infosetFilter.fromXmlName(name)
+                    attributes.append((attr_string, value))
+
+                for name, value in sorted(attributes):
+                    rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
+
             if element.text:
-                rv.append("|%s\"%s\"" %(' '*(indent+2), element.text))
+                rv.append("|%s\"%s\"" % (' ' * (indent + 2), element.text))
             indent += 2
-            for child in element.getchildren():
+            for child in element:
                 serializeElement(child, indent)
-        if hasattr(element, "tail") and element.tail:
-            rv.append("|%s\"%s\"" %(' '*(indent-2), element.tail))
+            if hasattr(element, "tail") and element.tail:
+                rv.append("|%s\"%s\"" % (' ' * (indent - 2), element.tail))
     serializeElement(element, 0)
 
     if finalText is not None:
-        rv.append("|%s\"%s\""%(' '*2, finalText))
+        rv.append("|%s\"%s\"" % (' ' * 2, finalText))
 
     return "\n".join(rv)
 
+
 def tostring(element):
     """Serialize an element and its child nodes to a string"""
     rv = []
     finalText = None
+
     def serializeElement(element):
         if not hasattr(element, "tag"):
             if element.docinfo.internalDTD:
                 if element.docinfo.doctype:
                     dtd_str = element.docinfo.doctype
                 else:
-                    dtd_str = "<!DOCTYPE %s>"%element.docinfo.root_name
+                    dtd_str = "<!DOCTYPE %s>" % element.docinfo.root_name
                 rv.append(dtd_str)
             serializeElement(element.getroot())
-            
-        elif type(element.tag) == type(etree.Comment):
-            rv.append("<!--%s-->"%(element.text,))
-        
+
+        elif element.tag == comment_type:
+            rv.append("<!--%s-->" % (element.text,))
+
         else:
-            #This is assumed to be an ordinary element
+            # This is assumed to be an ordinary element
             if not element.attrib:
-                rv.append("<%s>"%(element.tag,))
+                rv.append("<%s>" % (element.tag,))
             else:
-                attr = " ".join(["%s=\"%s\""%(name, value) 
-                                 for name, value in element.attrib.iteritems()])
-                rv.append("<%s %s>"%(element.tag, attr))
+                attr = " ".join(["%s=\"%s\"" % (name, value)
+                                 for name, value in element.attrib.items()])
+                rv.append("<%s %s>" % (element.tag, attr))
             if element.text:
                 rv.append(element.text)
 
-            for child in element.getchildren():
+            for child in element:
                 serializeElement(child)
 
-            rv.append("</%s>"%(element.tag,))
+            rv.append("</%s>" % (element.tag,))
 
         if hasattr(element, "tail") and element.tail:
             rv.append(element.tail)
@@ -160,56 +174,57 @@ def tostring(element):
     serializeElement(element)
 
     if finalText is not None:
-        rv.append("%s\""%(' '*2, finalText))
+        rv.append("%s\"" % (' ' * 2, finalText))
 
     return "".join(rv)
-        
+
 
 class TreeBuilder(_base.TreeBuilder):
     documentClass = Document
     doctypeClass = DocumentType
     elementClass = None
     commentClass = None
-    fragmentClass = Document    
+    fragmentClass = Document
+    implementation = etree
 
-    def __init__(self, namespaceHTMLElements, fullTree = False):
+    def __init__(self, namespaceHTMLElements, fullTree=False):
         builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
-        filter = self.filter = ihatexml.InfosetFilter()
+        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter()
         self.namespaceHTMLElements = namespaceHTMLElements
 
         class Attributes(dict):
             def __init__(self, element, value={}):
                 self._element = element
                 dict.__init__(self, value)
-                for key, value in self.iteritems():
+                for key, value in self.items():
                     if isinstance(key, tuple):
-                        name = "{%s}%s"%(key[2], filter.coerceAttribute(key[1]))
+                        name = "{%s}%s" % (key[2], infosetFilter.coerceAttribute(key[1]))
                     else:
-                        name = filter.coerceAttribute(key)
+                        name = infosetFilter.coerceAttribute(key)
                     self._element._element.attrib[name] = value
 
             def __setitem__(self, key, value):
                 dict.__setitem__(self, key, value)
                 if isinstance(key, tuple):
-                    name = "{%s}%s"%(key[2], filter.coerceAttribute(key[1]))
+                    name = "{%s}%s" % (key[2], infosetFilter.coerceAttribute(key[1]))
                 else:
-                    name = filter.coerceAttribute(key)
+                    name = infosetFilter.coerceAttribute(key)
                 self._element._element.attrib[name] = value
 
         class Element(builder.Element):
             def __init__(self, name, namespace):
-                name = filter.coerceElement(name)
+                name = infosetFilter.coerceElement(name)
                 builder.Element.__init__(self, name, namespace=namespace)
                 self._attributes = Attributes(self)
 
             def _setName(self, name):
-                self._name = filter.coerceElement(name)
+                self._name = infosetFilter.coerceElement(name)
                 self._element.tag = self._getETreeTag(
                     self._name, self._namespace)
-        
+
             def _getName(self):
-                return filter.fromXmlName(self._name)
-        
+                return infosetFilter.fromXmlName(self._name)
+
             name = property(_getName, _setName)
 
             def _getAttributes(self):
@@ -217,24 +232,23 @@ class TreeBuilder(_base.TreeBuilder):
 
             def _setAttributes(self, attributes):
                 self._attributes = Attributes(self, attributes)
-    
+
             attributes = property(_getAttributes, _setAttributes)
 
             def insertText(self, data, insertBefore=None):
-                data = filter.coerceCharacters(data)
+                data = infosetFilter.coerceCharacters(data)
                 builder.Element.insertText(self, data, insertBefore)
 
             def appendChild(self, child):
                 builder.Element.appendChild(self, child)
-                
 
         class Comment(builder.Comment):
             def __init__(self, data):
-                data = filter.coerceComment(data)
+                data = infosetFilter.coerceComment(data)
                 builder.Comment.__init__(self, data)
 
             def _setData(self, data):
-                data = filter.coerceComment(data)
+                data = infosetFilter.coerceComment(data)
                 self._element.text = data
 
             def _getData(self):
@@ -244,9 +258,9 @@ class TreeBuilder(_base.TreeBuilder):
 
         self.elementClass = Element
         self.commentClass = builder.Comment
-        #self.fragmentClass = builder.DocumentFragment
+        # self.fragmentClass = builder.DocumentFragment
         _base.TreeBuilder.__init__(self, namespaceHTMLElements)
-    
+
     def reset(self):
         _base.TreeBuilder.reset(self)
         self.insertComment = self.insertCommentInitial
@@ -261,13 +275,13 @@ class TreeBuilder(_base.TreeBuilder):
             return self.document._elementTree
         else:
             return self.document._elementTree.getroot()
-    
+
     def getFragment(self):
         fragment = []
         element = self.openElements[0]._element
         if element.text:
             fragment.append(element.text)
-        fragment.extend(element.getchildren())
+        fragment.extend(list(element))
         if element.tail:
             fragment.append(element.tail)
         return fragment
@@ -277,59 +291,79 @@ class TreeBuilder(_base.TreeBuilder):
         publicId = token["publicId"]
         systemId = token["systemId"]
 
-        if not name or ihatexml.nonXmlNameBMPRegexp.search(name) or name[0] == '"':
-            warnings.warn("lxml cannot represent null or non-xml doctype", DataLossWarning)
+        if not name:
+            warnings.warn("lxml cannot represent empty doctype", DataLossWarning)
+            self.doctype = None
+        else:
+            coercedName = self.infosetFilter.coerceElement(name)
+            if coercedName != name:
+                warnings.warn("lxml cannot represent non-xml doctype", DataLossWarning)
+
+            doctype = self.doctypeClass(coercedName, publicId, systemId)
+            self.doctype = doctype
 
-        doctype = self.doctypeClass(name, publicId, systemId)
-        self.doctype = doctype
-    
     def insertCommentInitial(self, data, parent=None):
         self.initial_comments.append(data)
-    
+
+    def insertCommentMain(self, data, parent=None):
+        if (parent == self.document and
+                self.document._elementTree.getroot()[-1].tag == comment_type):
+                warnings.warn("lxml cannot represent adjacent comments beyond the root elements", DataLossWarning)
+        super(TreeBuilder, self).insertComment(data, parent)
+
     def insertRoot(self, token):
         """Create the document root"""
-        #Because of the way libxml2 works, it doesn't seem to be possible to
-        #alter information like the doctype after the tree has been parsed. 
-        #Therefore we need to use the built-in parser to create our iniial 
-        #tree, after which we can add elements like normal
+        # Because of the way libxml2 works, it doesn't seem to be possible to
+        # alter information like the doctype after the tree has been parsed.
+        # Therefore we need to use the built-in parser to create our iniial
+        # tree, after which we can add elements like normal
         docStr = ""
-        if self.doctype and self.doctype.name and not self.doctype.name.startswith('"'):
-            docStr += "<!DOCTYPE %s"%self.doctype.name
-            if (self.doctype.publicId is not None or 
-                self.doctype.systemId is not None):
-                docStr += ' PUBLIC "%s" "%s"'%(self.doctype.publicId or "",
-                                               self.doctype.systemId or "")
+        if self.doctype:
+            assert self.doctype.name
+            docStr += "<!DOCTYPE %s" % self.doctype.name
+            if (self.doctype.publicId is not None or
+                    self.doctype.systemId is not None):
+                docStr += (' PUBLIC "%s" ' %
+                           (self.infosetFilter.coercePubid(self.doctype.publicId or "")))
+                if self.doctype.systemId:
+                    sysid = self.doctype.systemId
+                    if sysid.find("'") >= 0 and sysid.find('"') >= 0:
+                        warnings.warn("DOCTYPE system cannot contain single and double quotes", DataLossWarning)
+                        sysid = sysid.replace("'", 'U00027')
+                    if sysid.find("'") >= 0:
+                        docStr += '"%s"' % sysid
+                    else:
+                        docStr += "'%s'" % sysid
+                else:
+                    docStr += "''"
             docStr += ">"
+            if self.doctype.name != token["name"]:
+                warnings.warn("lxml cannot represent doctype with a different name to the root element", DataLossWarning)
         docStr += "<THIS_SHOULD_NEVER_APPEAR_PUBLICLY/>"
-        
-        try:
-            root = etree.fromstring(docStr)
-        except etree.XMLSyntaxError:
-            print docStr
-            raise
-        
-        #Append the initial comments:
+        root = etree.fromstring(docStr)
+
+        # Append the initial comments:
         for comment_token in self.initial_comments:
             root.addprevious(etree.Comment(comment_token["data"]))
-        
-        #Create the root document and add the ElementTree to it
+
+        # Create the root document and add the ElementTree to it
         self.document = self.documentClass()
         self.document._elementTree = root.getroottree()
-        
+
         # Give the root element the right name
         name = token["name"]
         namespace = token.get("namespace", self.defaultNamespace)
         if namespace is None:
             etree_tag = name
         else:
-            etree_tag = "{%s}%s"%(namespace, name)
+            etree_tag = "{%s}%s" % (namespace, name)
         root.tag = etree_tag
-        
-        #Add the root element to the internal child/open data structures
+
+        # Add the root element to the internal child/open data structures
         root_element = self.elementClass(name, namespace)
         root_element._element = root
         self.document._childNodes.append(root_element)
         self.openElements.append(root_element)
-    
-        #Reset to the default insert comment function
-        self.insertComment = super(TreeBuilder, self).insertComment
+
+        # Reset to the default insert comment function
+        self.insertComment = self.insertCommentMain
diff --git a/src/html5lib/treebuilders/simpletree.py b/src/html5lib/treebuilders/simpletree.py
deleted file mode 100644
index ff6bfe4003..0000000000
--- a/src/html5lib/treebuilders/simpletree.py
+++ /dev/null
@@ -1,248 +0,0 @@
-import _base
-from html5lib.constants import voidElements, namespaces, prefixes
-from xml.sax.saxutils import escape
-
-# Really crappy basic implementation of a DOM-core like thing
-class Node(_base.Node):
-    type = -1
-    def __init__(self, name):
-        self.name = name
-        self.parent = None
-        self.value = None
-        self.childNodes = []
-        self._flags = []
-
-    def __iter__(self):
-        for node in self.childNodes:
-            yield node
-            for item in node:
-                yield item
-
-    def __unicode__(self):
-        return self.name
-
-    def toxml(self):
-        raise NotImplementedError
-
-    def printTree(self, indent=0):
-        tree = '\n|%s%s' % (' '* indent, unicode(self))
-        for child in self.childNodes:
-            tree += child.printTree(indent + 2)
-        return tree
-
-    def appendChild(self, node):
-        if (isinstance(node, TextNode) and self.childNodes and
-          isinstance(self.childNodes[-1], TextNode)):
-            self.childNodes[-1].value += node.value
-        else:
-            self.childNodes.append(node)
-        node.parent = self
-
-    def insertText(self, data, insertBefore=None):
-        if insertBefore is None:
-            self.appendChild(TextNode(data))
-        else:
-            self.insertBefore(TextNode(data), insertBefore)
-
-    def insertBefore(self, node, refNode):
-        index = self.childNodes.index(refNode)
-        if (isinstance(node, TextNode) and index > 0 and
-          isinstance(self.childNodes[index - 1], TextNode)):
-            self.childNodes[index - 1].value += node.value
-        else:
-            self.childNodes.insert(index, node)
-        node.parent = self
-
-    def removeChild(self, node):
-        try:
-            self.childNodes.remove(node)
-        except:
-            # XXX
-            raise
-        node.parent = None
-
-    def cloneNode(self):
-        raise NotImplementedError
-
-    def hasContent(self):
-        """Return true if the node has children or text"""
-        return bool(self.childNodes)
-
-    def getNameTuple(self):
-        if self.namespace == None:
-            return namespaces["html"], self.name
-        else:
-            return self.namespace, self.name
-
-    nameTuple = property(getNameTuple)
-
-class Document(Node):
-    type = 1
-    def __init__(self):
-        Node.__init__(self, None)
-
-    def __unicode__(self):
-        return "#document"
-
-    def appendChild(self, child):
-        Node.appendChild(self, child)
-
-    def toxml(self, encoding="utf=8"):
-        result = ""
-        for child in self.childNodes:
-            result += child.toxml()
-        return result.encode(encoding)
-
-    def hilite(self, encoding="utf-8"):
-        result = "<pre>"
-        for child in self.childNodes:
-            result += child.hilite()
-        return result.encode(encoding) + "</pre>"
-    
-    def printTree(self):
-        tree = unicode(self)
-        for child in self.childNodes:
-            tree += child.printTree(2)
-        return tree
-
-    def cloneNode(self):
-        return Document()
-
-class DocumentFragment(Document):
-    type = 2
-    def __unicode__(self):
-        return "#document-fragment"
-
-    def cloneNode(self):
-        return DocumentFragment()
-
-class DocumentType(Node):
-    type = 3
-    def __init__(self, name, publicId, systemId):
-        Node.__init__(self, name)
-        self.publicId = publicId
-        self.systemId = systemId
-
-    def __unicode__(self):
-        if self.publicId or self.systemId:
-            publicId = self.publicId or ""
-            systemId = self.systemId or ""
-            return """<!DOCTYPE %s "%s" "%s">"""%(
-                self.name, publicId, systemId)
-                            
-        else:
-            return u"<!DOCTYPE %s>" % self.name
-    
-
-    toxml = __unicode__
-    
-    def hilite(self):
-        return '<code class="markup doctype">&lt;!DOCTYPE %s></code>' % self.name
-
-    def cloneNode(self):
-        return DocumentType(self.name, self.publicId, self.systemId)
-
-class TextNode(Node):
-    type = 4
-    def __init__(self, value):
-        Node.__init__(self, None)
-        self.value = value
-
-    def __unicode__(self):
-        return u"\"%s\"" % self.value
-
-    def toxml(self):
-        return escape(self.value)
-    
-    hilite = toxml
-
-    def cloneNode(self):
-        return TextNode(self.value)
-
-class Element(Node):
-    type = 5
-    def __init__(self, name, namespace=None):
-        Node.__init__(self, name)
-        self.namespace = namespace
-        self.attributes = {}
-
-    def __unicode__(self):
-        if self.namespace == None:
-            return u"<%s>" % self.name
-        else:
-            return u"<%s %s>"%(prefixes[self.namespace], self.name)
-
-    def toxml(self):
-        result = '<' + self.name
-        if self.attributes:
-            for name,value in self.attributes.iteritems():
-                result += u' %s="%s"' % (name, escape(value,{'"':'&quot;'}))
-        if self.childNodes:
-            result += '>'
-            for child in self.childNodes:
-                result += child.toxml()
-            result += u'</%s>' % self.name
-        else:
-            result += u'/>'
-        return result
-    
-    def hilite(self):
-        result = '&lt;<code class="markup element-name">%s</code>' % self.name
-        if self.attributes:
-            for name, value in self.attributes.iteritems():
-                result += ' <code class="markup attribute-name">%s</code>=<code class="markup attribute-value">"%s"</code>' % (name, escape(value, {'"':'&quot;'}))
-        if self.childNodes:
-            result += ">"
-            for child in self.childNodes:
-                result += child.hilite()
-        elif self.name in voidElements:
-            return result + ">"
-        return result + '&lt;/<code class="markup element-name">%s</code>>' % self.name
-
-    def printTree(self, indent):
-        tree = '\n|%s%s' % (' '*indent, unicode(self))
-        indent += 2
-        if self.attributes:
-            for name, value in self.attributes.iteritems():
-                if isinstance(name, tuple):
-                    name = "%s %s"%(name[0], name[1])
-                tree += '\n|%s%s="%s"' % (' ' * indent, name, value)
-        for child in self.childNodes:
-            tree += child.printTree(indent)
-        return tree
-
-    def cloneNode(self):
-        newNode = Element(self.name)
-        if hasattr(self, 'namespace'):
-            newNode.namespace = self.namespace
-        for attr, value in self.attributes.iteritems():
-            newNode.attributes[attr] = value
-        return newNode
-
-class CommentNode(Node):
-    type = 6
-    def __init__(self, data):
-        Node.__init__(self, None)
-        self.data = data
-
-    def __unicode__(self):
-        return "<!-- %s -->" % self.data
-    
-    def toxml(self):
-        return "<!--%s-->" % self.data
-
-    def hilite(self):
-        return '<code class="markup comment">&lt;!--%s--></code>' % escape(self.data)
-
-    def cloneNode(self):
-        return CommentNode(self.data)
-
-class TreeBuilder(_base.TreeBuilder):
-    documentClass = Document
-    doctypeClass = DocumentType
-    elementClass = Element
-    commentClass = CommentNode
-    fragmentClass = DocumentFragment
-    
-    def testSerializer(self, node):
-        return node.printTree()
diff --git a/src/html5lib/treebuilders/soup.py b/src/html5lib/treebuilders/soup.py
deleted file mode 100644
index 807a998cd1..0000000000
--- a/src/html5lib/treebuilders/soup.py
+++ /dev/null
@@ -1,228 +0,0 @@
-import warnings
-
-warnings.warn("BeautifulSoup 3.x (as of 3.1) is not fully compatible with html5lib and support will be removed in the future", DeprecationWarning)
-
-from BeautifulSoup import BeautifulSoup, Tag, NavigableString, Comment, Declaration
-
-import _base
-from html5lib.constants import namespaces, DataLossWarning
-
-class AttrList(object):
-    def __init__(self, element):
-        self.element = element
-        self.attrs = dict(self.element.attrs)
-    def __iter__(self):
-        return self.attrs.items().__iter__()
-    def __setitem__(self, name, value):
-        "set attr", name, value
-        self.element[name] = value
-    def items(self):
-        return self.attrs.items()
-    def keys(self):
-        return self.attrs.keys()
-    def __getitem__(self, name):
-        return self.attrs[name]
-    def __contains__(self, name):
-        return name in self.attrs.keys()
-
-
-class Element(_base.Node):
-    def __init__(self, element, soup, namespace):
-        _base.Node.__init__(self, element.name)
-        self.element = element
-        self.soup = soup
-        self.namespace = namespace
-
-    def _nodeIndex(self, node, refNode):
-        # Finds a node by identity rather than equality
-        for index in range(len(self.element.contents)):
-            if id(self.element.contents[index]) == id(refNode.element):
-                return index
-        return None
-
-    def appendChild(self, node):
-        if (node.element.__class__ == NavigableString and self.element.contents
-            and self.element.contents[-1].__class__ == NavigableString):
-            # Concatenate new text onto old text node
-            # (TODO: This has O(n^2) performance, for input like "a</a>a</a>a</a>...")
-            newStr = NavigableString(self.element.contents[-1]+node.element)
-
-            # Remove the old text node
-            # (Can't simply use .extract() by itself, because it fails if
-            # an equal text node exists within the parent node)
-            oldElement = self.element.contents[-1]
-            del self.element.contents[-1]
-            oldElement.parent = None
-            oldElement.extract()
-
-            self.element.insert(len(self.element.contents), newStr)
-        else:
-            self.element.insert(len(self.element.contents), node.element)
-            node.parent = self
-
-    def getAttributes(self):
-        return AttrList(self.element)
-
-    def setAttributes(self, attributes):
-        if attributes:
-            for name, value in attributes.items():
-                self.element[name] =  value
-
-    attributes = property(getAttributes, setAttributes)
-    
-    def insertText(self, data, insertBefore=None):
-        text = TextNode(NavigableString(data), self.soup)
-        if insertBefore:
-            self.insertBefore(text, insertBefore)
-        else:
-            self.appendChild(text)
-
-    def insertBefore(self, node, refNode):
-        index = self._nodeIndex(node, refNode)
-        if (node.element.__class__ == NavigableString and self.element.contents
-            and self.element.contents[index-1].__class__ == NavigableString):
-            # (See comments in appendChild)
-            newStr = NavigableString(self.element.contents[index-1]+node.element)
-            oldNode = self.element.contents[index-1]
-            del self.element.contents[index-1]
-            oldNode.parent = None
-            oldNode.extract()
-
-            self.element.insert(index-1, newStr)
-        else:
-            self.element.insert(index, node.element)
-            node.parent = self
-
-    def removeChild(self, node):
-        index = self._nodeIndex(node.parent, node)
-        del node.parent.element.contents[index]
-        node.element.parent = None
-        node.element.extract()
-        node.parent = None
-
-    def reparentChildren(self, newParent):
-        while self.element.contents:
-            child = self.element.contents[0]
-            child.extract()
-            if isinstance(child, Tag):
-                newParent.appendChild(Element(child, self.soup, namespaces["html"]))
-            else:
-                newParent.appendChild(TextNode(child, self.soup))
-
-    def cloneNode(self):
-        node = Element(Tag(self.soup, self.element.name), self.soup, self.namespace)
-        for key,value in self.attributes:
-            node.attributes[key] = value
-        return node
-
-    def hasContent(self):
-        return self.element.contents
-
-    def getNameTuple(self):
-        if self.namespace == None:
-            return namespaces["html"], self.name
-        else:
-            return self.namespace, self.name
-
-    nameTuple = property(getNameTuple)
-
-class TextNode(Element):
-    def __init__(self, element, soup):
-        _base.Node.__init__(self, None)
-        self.element = element
-        self.soup = soup
-    
-    def cloneNode(self):
-        raise NotImplementedError
-
-class TreeBuilder(_base.TreeBuilder):
-    def __init__(self, namespaceHTMLElements):
-        if namespaceHTMLElements:
-            warnings.warn("BeautifulSoup cannot represent elements in any namespace", DataLossWarning)
-        _base.TreeBuilder.__init__(self, namespaceHTMLElements)
-        
-    def documentClass(self):
-        self.soup = BeautifulSoup("")
-        return Element(self.soup, self.soup, None)
-    
-    def insertDoctype(self, token):
-        name = token["name"]
-        publicId = token["publicId"]
-        systemId = token["systemId"]
-
-        if publicId:
-            self.soup.insert(0, Declaration("%s PUBLIC \"%s\" \"%s\""%(name, publicId, systemId or "")))
-        elif systemId:
-            self.soup.insert(0, Declaration("%s SYSTEM \"%s\""%
-                                            (name, systemId)))
-        else:
-            self.soup.insert(0, Declaration(name))
-    
-    def elementClass(self, name, namespace):
-        if namespace is not None:
-            warnings.warn("BeautifulSoup cannot represent elements in any namespace", DataLossWarning)
-        return Element(Tag(self.soup, name), self.soup, namespace)
-        
-    def commentClass(self, data):
-        return TextNode(Comment(data), self.soup)
-    
-    def fragmentClass(self):
-        self.soup = BeautifulSoup("")
-        self.soup.name = "[document_fragment]"
-        return Element(self.soup, self.soup, None) 
-
-    def appendChild(self, node):
-        self.soup.insert(len(self.soup.contents), node.element)
-
-    def testSerializer(self, element):
-        return testSerializer(element)
-
-    def getDocument(self):
-        return self.soup
-    
-    def getFragment(self):
-        return _base.TreeBuilder.getFragment(self).element
-    
-def testSerializer(element):
-    import re
-    rv = []
-    def serializeElement(element, indent=0):
-        if isinstance(element, Declaration):
-            doctype_regexp = r'(?P<name>[^\s]*)( PUBLIC "(?P<publicId>.*)" "(?P<systemId1>.*)"| SYSTEM "(?P<systemId2>.*)")?'
-            m = re.compile(doctype_regexp).match(element.string)
-            assert m is not None, "DOCTYPE did not match expected format"
-            name = m.group('name')
-            publicId = m.group('publicId')
-            if publicId is not None:
-                systemId = m.group('systemId1') or ""
-            else:
-                systemId = m.group('systemId2')
-
-            if publicId is not None or systemId is not None:
-                rv.append("""|%s<!DOCTYPE %s "%s" "%s">"""%
-                          (' '*indent, name, publicId or "", systemId or ""))
-            else:
-                rv.append("|%s<!DOCTYPE %s>"%(' '*indent, name))
-            
-        elif isinstance(element, BeautifulSoup):
-            if element.name == "[document_fragment]":
-                rv.append("#document-fragment")                
-            else:
-                rv.append("#document")
-
-        elif isinstance(element, Comment):
-            rv.append("|%s<!-- %s -->"%(' '*indent, element.string))
-        elif isinstance(element, unicode):
-            rv.append("|%s\"%s\"" %(' '*indent, element))
-        else:
-            rv.append("|%s<%s>"%(' '*indent, element.name))
-            if element.attrs:
-                for name, value in element.attrs:
-                    rv.append('|%s%s="%s"' % (' '*(indent+2), name, value))
-        indent += 2
-        if hasattr(element, "contents"):
-            for child in element.contents:
-                serializeElement(child, indent)
-    serializeElement(element, 0)
-
-    return "\n".join(rv)
diff --git a/src/html5lib/treewalkers/__init__.py b/src/html5lib/treewalkers/__init__.py
index 3a606a8b3c..18124e75f3 100644
--- a/src/html5lib/treewalkers/__init__.py
+++ b/src/html5lib/treewalkers/__init__.py
@@ -8,23 +8,27 @@ implements a 'serialize' method taking a tree as sole argument and
 returning an iterator generating tokens.
 """
 
+from __future__ import absolute_import, division, unicode_literals
+
+import sys
+
+from ..utils import default_etree
+
 treeWalkerCache = {}
 
+
 def getTreeWalker(treeType, implementation=None, **kwargs):
     """Get a TreeWalker class for various types of tree with built-in support
 
     treeType - the name of the tree type required (case-insensitive). Supported
-               values are "simpletree", "dom", "etree" and "beautifulsoup"
+               values are:
 
-               "simpletree" - a built-in DOM-ish tree type with support for some
-                              more pythonic idioms.
                 "dom" - The xml.dom.minidom DOM implementation
                 "pulldom" - The xml.dom.pulldom event stream
                 "etree" - A generic walker for tree implementations exposing an
                           elementtree-like interface (known to work with
                           ElementTree, cElementTree and lxml.etree).
                 "lxml" - Optimized walker for lxml.etree
-                "beautifulsoup" - Beautiful soup (if installed)
                 "genshi" - a Genshi stream
 
     implementation - (Currently applies to the "etree" tree type only). A module
@@ -33,20 +37,21 @@ def getTreeWalker(treeType, implementation=None, **kwargs):
 
     treeType = treeType.lower()
     if treeType not in treeWalkerCache:
-        if treeType in ("dom", "pulldom", "simpletree"):
-            mod = __import__(treeType, globals())
+        if treeType in ("dom", "pulldom"):
+            name = "%s.%s" % (__name__, treeType)
+            __import__(name)
+            mod = sys.modules[name]
             treeWalkerCache[treeType] = mod.TreeWalker
         elif treeType == "genshi":
-            import genshistream
+            from . import genshistream
             treeWalkerCache[treeType] = genshistream.TreeWalker
-        elif treeType == "beautifulsoup":
-            import soup
-            treeWalkerCache[treeType] = soup.TreeWalker
         elif treeType == "lxml":
-            import lxmletree
+            from . import lxmletree
             treeWalkerCache[treeType] = lxmletree.TreeWalker
         elif treeType == "etree":
-            import etree
+            from . import etree
+            if implementation is None:
+                implementation = default_etree
             # XXX: NEVER cache here, caching is done in the etree submodule
             return etree.getETreeModule(implementation, **kwargs).TreeWalker
     return treeWalkerCache.get(treeType)
diff --git a/src/html5lib/treewalkers/_base.py b/src/html5lib/treewalkers/_base.py
index 2c3b819d88..34252e50c0 100644
--- a/src/html5lib/treewalkers/_base.py
+++ b/src/html5lib/treewalkers/_base.py
@@ -1,8 +1,40 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type, string_types
+
 import gettext
 _ = gettext.gettext
 
-from html5lib.constants import voidElements, spaceCharacters
-spaceCharacters = u"".join(spaceCharacters)
+from xml.dom import Node
+
+DOCUMENT = Node.DOCUMENT_NODE
+DOCTYPE = Node.DOCUMENT_TYPE_NODE
+TEXT = Node.TEXT_NODE
+ELEMENT = Node.ELEMENT_NODE
+COMMENT = Node.COMMENT_NODE
+ENTITY = Node.ENTITY_NODE
+UNKNOWN = "<#UNKNOWN#>"
+
+from ..constants import voidElements, spaceCharacters
+spaceCharacters = "".join(spaceCharacters)
+
+
+def to_text(s, blank_if_none=True):
+    """Wrapper around six.text_type to convert None to empty string"""
+    if s is None:
+        if blank_if_none:
+            return ""
+        else:
+            return None
+    elif isinstance(s, text_type):
+        return s
+    else:
+        return text_type(s)
+
+
+def is_text_or_none(string):
+    """Wrapper around isinstance(string_types) or is None"""
+    return string is None or isinstance(string, string_types)
+
 
 class TreeWalker(object):
     def __init__(self, tree):
@@ -14,36 +46,50 @@ class TreeWalker(object):
     def error(self, msg):
         return {"type": "SerializeError", "data": msg}
 
-    def normalizeAttrs(self, attrs):
-        if not attrs:
-            attrs = []
-        elif hasattr(attrs, 'items'):
-            attrs = attrs.items()
-        return [(unicode(name),unicode(value)) for name,value in attrs]
-
     def emptyTag(self, namespace, name, attrs, hasChildren=False):
-        yield {"type": "EmptyTag", "name": unicode(name), 
-               "namespace":unicode(namespace),
-               "data": self.normalizeAttrs(attrs)}
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(name)
+        assert all((namespace is None or isinstance(namespace, string_types)) and
+                   isinstance(name, string_types) and
+                   isinstance(value, string_types)
+                   for (namespace, name), value in attrs.items())
+
+        yield {"type": "EmptyTag", "name": to_text(name, False),
+               "namespace": to_text(namespace),
+               "data": attrs}
         if hasChildren:
             yield self.error(_("Void element has children"))
 
     def startTag(self, namespace, name, attrs):
-        return {"type": "StartTag", 
-                "name": unicode(name),
-                "namespace":unicode(namespace),
-                "data": self.normalizeAttrs(attrs)}
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(name)
+        assert all((namespace is None or isinstance(namespace, string_types)) and
+                   isinstance(name, string_types) and
+                   isinstance(value, string_types)
+                   for (namespace, name), value in attrs.items())
+
+        return {"type": "StartTag",
+                "name": text_type(name),
+                "namespace": to_text(namespace),
+                "data": dict(((to_text(namespace, False), to_text(name)),
+                              to_text(value, False))
+                             for (namespace, name), value in attrs.items())}
 
     def endTag(self, namespace, name):
-        return {"type": "EndTag", 
-                "name": unicode(name),
-                "namespace":unicode(namespace),
-                "data": []}
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(namespace)
+
+        return {"type": "EndTag",
+                "name": to_text(name, False),
+                "namespace": to_text(namespace),
+                "data": {}}
 
     def text(self, data):
-        data = unicode(data)
+        assert isinstance(data, string_types), type(data)
+
+        data = to_text(data)
         middle = data.lstrip(spaceCharacters)
-        left = data[:len(data)-len(middle)]
+        left = data[:len(data) - len(middle)]
         if left:
             yield {"type": "SpaceCharacters", "data": left}
         data = middle
@@ -55,52 +101,40 @@ class TreeWalker(object):
             yield {"type": "SpaceCharacters", "data": right}
 
     def comment(self, data):
-        return {"type": "Comment", "data": unicode(data)}
+        assert isinstance(data, string_types), type(data)
+
+        return {"type": "Comment", "data": text_type(data)}
 
     def doctype(self, name, publicId=None, systemId=None, correct=True):
+        assert is_text_or_none(name), type(name)
+        assert is_text_or_none(publicId), type(publicId)
+        assert is_text_or_none(systemId), type(systemId)
+
         return {"type": "Doctype",
-                "name": name is not None and unicode(name) or u"",
-                "publicId": publicId,
-                "systemId": systemId,
-                "correct": correct}
+                "name": to_text(name),
+                "publicId": to_text(publicId),
+                "systemId": to_text(systemId),
+                "correct": to_text(correct)}
+
+    def entity(self, name):
+        assert isinstance(name, string_types), type(name)
+
+        return {"type": "Entity", "name": text_type(name)}
 
     def unknown(self, nodeType):
         return self.error(_("Unknown node type: ") + nodeType)
 
-class RecursiveTreeWalker(TreeWalker):
-    def walkChildren(self, node):
-        raise NodeImplementedError
-
-    def element(self, node, namespace, name, attrs, hasChildren):
-        if name in voidElements:
-            for token in self.emptyTag(namespace, name, attrs, hasChildren):
-                yield token
-        else:
-            yield self.startTag(name, attrs)
-            if hasChildren:
-                for token in self.walkChildren(node):
-                    yield token
-            yield self.endTag(name)
-
-from xml.dom import Node
-
-DOCUMENT = Node.DOCUMENT_NODE
-DOCTYPE = Node.DOCUMENT_TYPE_NODE
-TEXT = Node.TEXT_NODE
-ELEMENT = Node.ELEMENT_NODE
-COMMENT = Node.COMMENT_NODE
-UNKNOWN = "<#UNKNOWN#>"
 
 class NonRecursiveTreeWalker(TreeWalker):
     def getNodeDetails(self, node):
         raise NotImplementedError
-    
+
     def getFirstChild(self, node):
         raise NotImplementedError
-    
+
     def getNextSibling(self, node):
         raise NotImplementedError
-    
+
     def getParentNode(self, node):
         raise NotImplementedError
 
@@ -110,7 +144,6 @@ class NonRecursiveTreeWalker(TreeWalker):
             details = self.getNodeDetails(currentNode)
             type, details = details[0], details[1:]
             hasChildren = False
-            endTag = None
 
             if type == DOCTYPE:
                 yield self.doctype(*details)
@@ -122,28 +155,30 @@ class NonRecursiveTreeWalker(TreeWalker):
             elif type == ELEMENT:
                 namespace, name, attributes, hasChildren = details
                 if name in voidElements:
-                    for token in self.emptyTag(namespace, name, attributes, 
+                    for token in self.emptyTag(namespace, name, attributes,
                                                hasChildren):
                         yield token
                     hasChildren = False
                 else:
-                    endTag = name
                     yield self.startTag(namespace, name, attributes)
 
             elif type == COMMENT:
                 yield self.comment(details[0])
 
+            elif type == ENTITY:
+                yield self.entity(details[0])
+
             elif type == DOCUMENT:
                 hasChildren = True
 
             else:
                 yield self.unknown(details[0])
-            
+
             if hasChildren:
                 firstChild = self.getFirstChild(currentNode)
             else:
                 firstChild = None
-            
+
             if firstChild is not None:
                 currentNode = firstChild
             else:
diff --git a/src/html5lib/treewalkers/dom.py b/src/html5lib/treewalkers/dom.py
index 0adc77f0e8..a01287a944 100644
--- a/src/html5lib/treewalkers/dom.py
+++ b/src/html5lib/treewalkers/dom.py
@@ -1,10 +1,12 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from xml.dom import Node
 
 import gettext
 _ = gettext.gettext
 
-import _base
-from html5lib.constants import voidElements
+from . import _base
+
 
 class TreeWalker(_base.NonRecursiveTreeWalker):
     def getNodeDetails(self, node):
@@ -15,8 +17,15 @@ class TreeWalker(_base.NonRecursiveTreeWalker):
             return _base.TEXT, node.nodeValue
 
         elif node.nodeType == Node.ELEMENT_NODE:
-            return (_base.ELEMENT, node.namespaceURI, node.nodeName, 
-                    node.attributes.items(), node.hasChildNodes)
+            attrs = {}
+            for attr in list(node.attributes.keys()):
+                attr = node.getAttributeNode(attr)
+                if attr.namespaceURI:
+                    attrs[(attr.namespaceURI, attr.localName)] = attr.value
+                else:
+                    attrs[(None, attr.name)] = attr.value
+            return (_base.ELEMENT, node.namespaceURI, node.nodeName,
+                    attrs, node.hasChildNodes())
 
         elif node.nodeType == Node.COMMENT_NODE:
             return _base.COMMENT, node.nodeValue
diff --git a/src/html5lib/treewalkers/etree.py b/src/html5lib/treewalkers/etree.py
index 739d30756f..fd8a9cc9b5 100644
--- a/src/html5lib/treewalkers/etree.py
+++ b/src/html5lib/treewalkers/etree.py
@@ -1,30 +1,28 @@
+from __future__ import absolute_import, division, unicode_literals
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    try:
+        from ordereddict import OrderedDict
+    except ImportError:
+        OrderedDict = dict
 import gettext
 _ = gettext.gettext
 
-import new
-import copy
 import re
 
-import _base
-from html5lib.constants import voidElements
+from six import text_type
+
+from . import _base
+from ..utils import moduleFactoryFactory
 
 tag_regexp = re.compile("{([^}]*)}(.*)")
 
-moduleCache = {}
-
-def getETreeModule(ElementTreeImplementation):
-    name = "_" + ElementTreeImplementation.__name__+"builder"
-    if name in moduleCache:
-        return moduleCache[name]
-    else:
-        mod = new.module("_" + ElementTreeImplementation.__name__+"builder")
-        objs = getETreeBuilder(ElementTreeImplementation)
-        mod.__dict__.update(objs)
-        moduleCache[name] = mod
-        return mod
 
 def getETreeBuilder(ElementTreeImplementation):
     ElementTree = ElementTreeImplementation
+    ElementTreeCommentType = ElementTree.Comment("asd").tag
 
     class TreeWalker(_base.NonRecursiveTreeWalker):
         """Given the particular ElementTree representation, this implementation,
@@ -32,16 +30,16 @@ def getETreeBuilder(ElementTreeImplementation):
         content:
 
         1. The current element
-        
+
         2. The index of the element relative to its parent
-        
+
         3. A stack of ancestor elements
-        
+
         4. A flag "text", "tail" or None to indicate if the current node is a
            text node; either the text or tail of the current element (1)
         """
         def getNodeDetails(self, node):
-            if isinstance(node, tuple): # It might be the root Element
+            if isinstance(node, tuple):  # It might be the root Element
                 elt, key, parents, flag = node
                 if flag in ("text", "tail"):
                     return _base.TEXT, getattr(elt, flag)
@@ -51,33 +49,41 @@ def getETreeBuilder(ElementTreeImplementation):
             if not(hasattr(node, "tag")):
                 node = node.getroot()
 
-            if node.tag in ("<DOCUMENT_ROOT>", "<DOCUMENT_FRAGMENT>"):
+            if node.tag in ("DOCUMENT_ROOT", "DOCUMENT_FRAGMENT"):
                 return (_base.DOCUMENT,)
 
             elif node.tag == "<!DOCTYPE>":
-                return (_base.DOCTYPE, node.text, 
+                return (_base.DOCTYPE, node.text,
                         node.get("publicId"), node.get("systemId"))
 
-            elif type(node.tag) == type(ElementTree.Comment):
+            elif node.tag == ElementTreeCommentType:
                 return _base.COMMENT, node.text
 
             else:
-                #This is assumed to be an ordinary element
+                assert type(node.tag) == text_type, type(node.tag)
+                # This is assumed to be an ordinary element
                 match = tag_regexp.match(node.tag)
                 if match:
                     namespace, tag = match.groups()
                 else:
                     namespace = None
                     tag = node.tag
-                return (_base.ELEMENT, namespace, tag, 
-                        node.attrib.items(), len(node) or node.text)
-    
+                attrs = OrderedDict()
+                for name, value in list(node.attrib.items()):
+                    match = tag_regexp.match(name)
+                    if match:
+                        attrs[(match.group(1), match.group(2))] = value
+                    else:
+                        attrs[(None, name)] = value
+                return (_base.ELEMENT, namespace, tag,
+                        attrs, len(node) or node.text)
+
         def getFirstChild(self, node):
             if isinstance(node, tuple):
                 element, key, parents, flag = node
             else:
                 element, key, parents, flag = node, None, [], None
-                
+
             if flag in ("text", "tail"):
                 return None
             else:
@@ -88,13 +94,13 @@ def getETreeBuilder(ElementTreeImplementation):
                     return element[0], 0, parents, None
                 else:
                     return None
-        
+
         def getNextSibling(self, node):
             if isinstance(node, tuple):
                 element, key, parents, flag = node
             else:
                 return None
-                
+
             if flag == "text":
                 if len(element):
                     parents.append(element)
@@ -105,16 +111,16 @@ def getETreeBuilder(ElementTreeImplementation):
                 if element.tail and flag != "tail":
                     return element, key, parents, "tail"
                 elif key < len(parents[-1]) - 1:
-                    return parents[-1][key+1], key+1, parents, None
+                    return parents[-1][key + 1], key + 1, parents, None
                 else:
                     return None
-        
+
         def getParentNode(self, node):
             if isinstance(node, tuple):
                 element, key, parents, flag = node
             else:
                 return None
-            
+
             if flag == "text":
                 if not parents:
                     return element
@@ -128,3 +134,5 @@ def getETreeBuilder(ElementTreeImplementation):
                     return parent, list(parents[-1]).index(parent), parents, None
 
     return locals()
+
+getETreeModule = moduleFactoryFactory(getETreeBuilder)
diff --git a/src/html5lib/treewalkers/genshistream.py b/src/html5lib/treewalkers/genshistream.py
index ef71a83e31..f559c45d04 100644
--- a/src/html5lib/treewalkers/genshistream.py
+++ b/src/html5lib/treewalkers/genshistream.py
@@ -1,50 +1,49 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from genshi.core import QName
 from genshi.core import START, END, XML_NAMESPACE, DOCTYPE, TEXT
-from genshi.core  import  START_NS, END_NS, START_CDATA, END_CDATA, PI, COMMENT
-from genshi.output import NamespaceFlattener
+from genshi.core import START_NS, END_NS, START_CDATA, END_CDATA, PI, COMMENT
 
-import _base
+from . import _base
+
+from ..constants import voidElements, namespaces
 
-from html5lib.constants import voidElements
 
 class TreeWalker(_base.TreeWalker):
     def __iter__(self):
-        depth = 0
-        ignore_until = None
+        # Buffer the events so we can pass in the following one
         previous = None
         for event in self.tree:
             if previous is not None:
-                if previous[0] == START:
-                    depth += 1
-                if ignore_until <= depth:
-                    ignore_until = None
-                if ignore_until is None:
-                    for token in self.tokens(previous, event):
-                        yield token
-                        if token["type"] == "EmptyTag":
-                            ignore_until = depth
-                if previous[0] == END:
-                    depth -= 1
-            previous = event
-        if previous is not None:
-            if ignore_until is None or ignore_until <= depth:
-                for token in self.tokens(previous, None):
+                for token in self.tokens(previous, event):
                     yield token
-            elif ignore_until is not None:
-                raise ValueError("Illformed DOM event stream: void element without END_ELEMENT")
+            previous = event
+
+        # Don't forget the final event!
+        if previous is not None:
+            for token in self.tokens(previous, None):
+                yield token
 
     def tokens(self, event, next):
         kind, data, pos = event
         if kind == START:
-            tag, attrib = data
+            tag, attribs = data
             name = tag.localname
             namespace = tag.namespace
-            if tag in voidElements:
-                for token in self.emptyTag(namespace, name, list(attrib),
-                                           not next or next[0] != END 
+            converted_attribs = {}
+            for k, v in attribs:
+                if isinstance(k, QName):
+                    converted_attribs[(k.namespace, k.localname)] = v
+                else:
+                    converted_attribs[(None, k)] = v
+
+            if namespace == namespaces["html"] and name in voidElements:
+                for token in self.emptyTag(namespace, name, converted_attribs,
+                                           not next or next[0] != END
                                            or next[1] != tag):
                     yield token
             else:
-                yield self.startTag(namespace, name, list(attrib))
+                yield self.startTag(namespace, name, converted_attribs)
 
         elif kind == END:
             name = data.localname
@@ -62,8 +61,8 @@ class TreeWalker(_base.TreeWalker):
         elif kind == DOCTYPE:
             yield self.doctype(*data)
 
-        elif kind in (XML_NAMESPACE, DOCTYPE, START_NS, END_NS, \
-          START_CDATA, END_CDATA, PI):
+        elif kind in (XML_NAMESPACE, DOCTYPE, START_NS, END_NS,
+                      START_CDATA, END_CDATA, PI):
             pass
 
         else:
diff --git a/src/html5lib/treewalkers/lxmletree.py b/src/html5lib/treewalkers/lxmletree.py
index 9647594e0c..375cc2e883 100644
--- a/src/html5lib/treewalkers/lxmletree.py
+++ b/src/html5lib/treewalkers/lxmletree.py
@@ -1,22 +1,35 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+
 from lxml import etree
-from html5lib.treebuilders.etree import tag_regexp
+from ..treebuilders.etree import tag_regexp
 
 from gettext import gettext
 _ = gettext
 
-import _base
+from . import _base
+
+from .. import ihatexml
+
+
+def ensure_str(s):
+    if s is None:
+        return None
+    elif isinstance(s, text_type):
+        return s
+    else:
+        return s.decode("utf-8", "strict")
 
-from html5lib.constants import voidElements
-from html5lib import ihatexml
 
 class Root(object):
     def __init__(self, et):
         self.elementtree = et
         self.children = []
         if et.docinfo.internalDTD:
-            self.children.append(Doctype(self, et.docinfo.root_name, 
-                                         et.docinfo.public_id, 
-                                         et.docinfo.system_url))
+            self.children.append(Doctype(self,
+                                         ensure_str(et.docinfo.root_name),
+                                         ensure_str(et.docinfo.public_id),
+                                         ensure_str(et.docinfo.system_url)))
         root = et.getroot()
         node = root
 
@@ -28,7 +41,7 @@ class Root(object):
 
         self.text = None
         self.tail = None
-    
+
     def __getitem__(self, key):
         return self.children[key]
 
@@ -38,19 +51,21 @@ class Root(object):
     def __len__(self):
         return 1
 
+
 class Doctype(object):
     def __init__(self, root_node, name, public_id, system_id):
         self.root_node = root_node
         self.name = name
         self.public_id = public_id
         self.system_id = system_id
-        
+
         self.text = None
         self.tail = None
 
     def getnext(self):
         return self.root_node.children[1]
 
+
 class FragmentRoot(Root):
     def __init__(self, children):
         self.children = [FragmentWrapper(self, child) for child in children]
@@ -59,23 +74,27 @@ class FragmentRoot(Root):
     def getnext(self):
         return None
 
+
 class FragmentWrapper(object):
     def __init__(self, fragment_root, obj):
         self.root_node = fragment_root
         self.obj = obj
         if hasattr(self.obj, 'text'):
-            self.text = self.obj.text
+            self.text = ensure_str(self.obj.text)
         else:
             self.text = None
         if hasattr(self.obj, 'tail'):
-            self.tail = self.obj.tail
+            self.tail = ensure_str(self.obj.tail)
         else:
             self.tail = None
-        self.isstring = isinstance(obj, basestring)
-        
+        self.isstring = isinstance(obj, str) or isinstance(obj, bytes)
+        # Support for bytes here is Py2
+        if self.isstring:
+            self.obj = ensure_str(self.obj)
+
     def __getattr__(self, name):
         return getattr(self.obj, name)
-    
+
     def getnext(self):
         siblings = self.root_node.children
         idx = siblings.index(self)
@@ -87,7 +106,7 @@ class FragmentWrapper(object):
     def __getitem__(self, key):
         return self.obj[key]
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.obj)
 
     def getparent(self):
@@ -96,10 +115,13 @@ class FragmentWrapper(object):
     def __str__(self):
         return str(self.obj)
 
+    def __unicode__(self):
+        return str(self.obj)
+
     def __len__(self):
         return len(self.obj)
 
-        
+
 class TreeWalker(_base.NonRecursiveTreeWalker):
     def __init__(self, tree):
         if hasattr(tree, "getroot"):
@@ -108,11 +130,12 @@ class TreeWalker(_base.NonRecursiveTreeWalker):
             tree = FragmentRoot(tree)
         _base.NonRecursiveTreeWalker.__init__(self, tree)
         self.filter = ihatexml.InfosetFilter()
+
     def getNodeDetails(self, node):
-        if isinstance(node, tuple): # Text node
+        if isinstance(node, tuple):  # Text node
             node, key = node
             assert key in ("text", "tail"), _("Text nodes are text or tail, found %s") % key
-            return _base.TEXT, getattr(node, key)
+            return _base.TEXT, ensure_str(getattr(node, key))
 
         elif isinstance(node, Root):
             return (_base.DOCUMENT,)
@@ -121,23 +144,33 @@ class TreeWalker(_base.NonRecursiveTreeWalker):
             return _base.DOCTYPE, node.name, node.public_id, node.system_id
 
         elif isinstance(node, FragmentWrapper) and node.isstring:
-            return _base.TEXT, node
+            return _base.TEXT, node.obj
 
         elif node.tag == etree.Comment:
-            return _base.COMMENT, node.text
+            return _base.COMMENT, ensure_str(node.text)
+
+        elif node.tag == etree.Entity:
+            return _base.ENTITY, ensure_str(node.text)[1:-1]  # strip &;
 
         else:
-            #This is assumed to be an ordinary element
-            match = tag_regexp.match(node.tag)
+            # This is assumed to be an ordinary element
+            match = tag_regexp.match(ensure_str(node.tag))
             if match:
                 namespace, tag = match.groups()
             else:
                 namespace = None
-                tag = node.tag
-            return (_base.ELEMENT, namespace, self.filter.fromXmlName(tag), 
-                    [(self.filter.fromXmlName(name), value) for 
-                     name,value in node.attrib.iteritems()], 
-                     len(node) > 0 or node.text)
+                tag = ensure_str(node.tag)
+            attrs = {}
+            for name, value in list(node.attrib.items()):
+                name = ensure_str(name)
+                value = ensure_str(value)
+                match = tag_regexp.match(name)
+                if match:
+                    attrs[(match.group(1), match.group(2))] = value
+                else:
+                    attrs[(None, name)] = value
+            return (_base.ELEMENT, namespace, self.filter.fromXmlName(tag),
+                    attrs, len(node) > 0 or node.text)
 
     def getFirstChild(self, node):
         assert not isinstance(node, tuple), _("Text nodes have no children")
@@ -149,7 +182,7 @@ class TreeWalker(_base.NonRecursiveTreeWalker):
             return node[0]
 
     def getNextSibling(self, node):
-        if isinstance(node, tuple): # Text node
+        if isinstance(node, tuple):  # Text node
             node, key = node
             assert key in ("text", "tail"), _("Text nodes are text or tail, found %s") % key
             if key == "text":
@@ -159,13 +192,13 @@ class TreeWalker(_base.NonRecursiveTreeWalker):
                     return node[0]
                 else:
                     return None
-            else: # tail
+            else:  # tail
                 return node.getnext()
 
-        return node.tail and (node, "tail") or node.getnext()
+        return (node, "tail") if node.tail else node.getnext()
 
     def getParentNode(self, node):
-        if isinstance(node, tuple): # Text node
+        if isinstance(node, tuple):  # Text node
             node, key = node
             assert key in ("text", "tail"), _("Text nodes are text or tail, found %s") % key
             if key == "text":
diff --git a/src/html5lib/treewalkers/pulldom.py b/src/html5lib/treewalkers/pulldom.py
index 7354a0e4a6..0b0f515fec 100644
--- a/src/html5lib/treewalkers/pulldom.py
+++ b/src/html5lib/treewalkers/pulldom.py
@@ -1,9 +1,12 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from xml.dom.pulldom import START_ELEMENT, END_ELEMENT, \
     COMMENT, IGNORABLE_WHITESPACE, CHARACTERS
 
-import _base
+from . import _base
+
+from ..constants import voidElements
 
-from html5lib.constants import voidElements
 
 class TreeWalker(_base.TreeWalker):
     def __iter__(self):
@@ -11,7 +14,7 @@ class TreeWalker(_base.TreeWalker):
         previous = None
         for event in self.tree:
             if previous is not None and \
-              (ignore_until is None or previous[1] is ignore_until):
+                    (ignore_until is None or previous[1] is ignore_until):
                 if previous[1] is ignore_until:
                     ignore_until = None
                 for token in self.tokens(previous, event):
@@ -30,14 +33,18 @@ class TreeWalker(_base.TreeWalker):
         if type == START_ELEMENT:
             name = node.nodeName
             namespace = node.namespaceURI
+            attrs = {}
+            for attr in list(node.attributes.keys()):
+                attr = node.getAttributeNode(attr)
+                attrs[(attr.namespaceURI, attr.localName)] = attr.value
             if name in voidElements:
                 for token in self.emptyTag(namespace,
                                            name,
-                                           node.attributes.items(), 
+                                           attrs,
                                            not next or next[1] is not node):
                     yield token
             else:
-                yield self.startTag(namespace, name, node.attributes.items())
+                yield self.startTag(namespace, name, attrs)
 
         elif type == END_ELEMENT:
             name = node.nodeName
diff --git a/src/html5lib/treewalkers/simpletree.py b/src/html5lib/treewalkers/simpletree.py
deleted file mode 100644
index 42be2a2d25..0000000000
--- a/src/html5lib/treewalkers/simpletree.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import gettext
-_ = gettext.gettext
-
-import _base
-
-class TreeWalker(_base.NonRecursiveTreeWalker):
-    """Given that simpletree has no performant way of getting a node's
-    next sibling, this implementation returns "nodes" as tuples with the
-    following content:
-
-    1. The parent Node (Element, Document or DocumentFragment)
-
-    2. The child index of the current node in its parent's children list
-
-    3. A list used as a stack of all ancestors. It is a pair tuple whose
-       first item is a parent Node and second item is a child index.
-    """
-
-    def getNodeDetails(self, node):
-        if isinstance(node, tuple): # It might be the root Node
-            parent, idx, parents = node
-            node = parent.childNodes[idx]
-
-        # testing node.type allows us not to import treebuilders.simpletree
-        if node.type in (1, 2): # Document or DocumentFragment
-            return (_base.DOCUMENT,)
-
-        elif node.type == 3: # DocumentType
-            return _base.DOCTYPE, node.name, node.publicId, node.systemId
-
-        elif node.type == 4: # TextNode
-            return _base.TEXT, node.value
-
-        elif node.type == 5: # Element
-            return (_base.ELEMENT, node.namespace, node.name, 
-                    node.attributes.items(), node.hasContent())
-
-        elif node.type == 6: # CommentNode
-            return _base.COMMENT, node.data
-
-        else:
-            return _node.UNKNOWN, node.type
-
-    def getFirstChild(self, node):
-        if isinstance(node, tuple): # It might be the root Node
-            parent, idx, parents = node
-            parents.append((parent, idx))
-            node = parent.childNodes[idx]
-        else:
-            parents = []
-
-        assert node.hasContent(), "Node has no children"
-        return (node, 0, parents)
-
-    def getNextSibling(self, node):
-        assert isinstance(node, tuple), "Node is not a tuple: " + str(node)
-        parent, idx, parents = node
-        idx += 1
-        if len(parent.childNodes) > idx:
-            return (parent, idx, parents)
-        else:
-            return None
-
-    def getParentNode(self, node):
-        assert isinstance(node, tuple)
-        parent, idx, parents = node
-        if parents:
-            parent, idx = parents.pop()
-            return parent, idx, parents
-        else:
-            # HACK: We could return ``parent`` but None will stop the algorithm the same way
-            return None
diff --git a/src/html5lib/treewalkers/soup.py b/src/html5lib/treewalkers/soup.py
deleted file mode 100644
index f754e5e1c6..0000000000
--- a/src/html5lib/treewalkers/soup.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import re
-import gettext
-_ = gettext.gettext
-
-from BeautifulSoup import BeautifulSoup, Declaration, Comment, Tag
-from html5lib.constants import namespaces
-import _base
-
-class TreeWalker(_base.NonRecursiveTreeWalker):
-    doctype_regexp = re.compile(
-        r'(?P<name>[^\s]*)(\s*PUBLIC\s*"(?P<publicId>.*)"\s*"(?P<systemId1>.*)"|\s*SYSTEM\s*"(?P<systemId2>.*)")?')
-    def getNodeDetails(self, node):
-        if isinstance(node, BeautifulSoup): # Document or DocumentFragment
-            return (_base.DOCUMENT,)
-
-        elif isinstance(node, Declaration): # DocumentType
-            string = unicode(node.string)
-            #Slice needed to remove markup added during unicode conversion,
-            #but only in some versions of BeautifulSoup/Python
-            if string.startswith('<!') and string.endswith('>'):
-                string = string[2:-1]
-            m = self.doctype_regexp.match(string)
-            #This regexp approach seems wrong and fragile
-            #but beautiful soup stores the doctype as a single thing and we want the seperate bits
-            #It should work as long as the tree is created by html5lib itself but may be wrong if it's
-            #been modified at all
-            #We could just feed to it a html5lib tokenizer, I guess...
-            assert m is not None, "DOCTYPE did not match expected format"
-            name = m.group('name')
-            publicId = m.group('publicId')
-            if publicId is not None:
-                systemId = m.group('systemId1')
-            else:
-                systemId = m.group('systemId2')
-            return _base.DOCTYPE, name, publicId or "", systemId or ""
-
-        elif isinstance(node, Comment):
-            string = unicode(node.string)
-            if string.startswith('<!--') and string.endswith('-->'):
-                string = string[4:-3]
-            return _base.COMMENT, string
-
-        elif isinstance(node, unicode): # TextNode
-            return _base.TEXT, node
-
-        elif isinstance(node, Tag): # Element
-            return (_base.ELEMENT, namespaces["html"], node.name,
-                    dict(node.attrs).items(), node.contents)
-        else:
-            return _base.UNKNOWN, node.__class__.__name__
-
-    def getFirstChild(self, node):
-        return node.contents[0]
-
-    def getNextSibling(self, node):
-        return node.nextSibling
-
-    def getParentNode(self, node):
-        return node.parent
diff --git a/src/html5lib/trie/__init__.py b/src/html5lib/trie/__init__.py
new file mode 100644
index 0000000000..a8cca8a9ac
--- /dev/null
+++ b/src/html5lib/trie/__init__.py
@@ -0,0 +1,12 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from .py import Trie as PyTrie
+
+Trie = PyTrie
+
+try:
+    from .datrie import Trie as DATrie
+except ImportError:
+    pass
+else:
+    Trie = DATrie
diff --git a/src/html5lib/trie/_base.py b/src/html5lib/trie/_base.py
new file mode 100644
index 0000000000..724486b16e
--- /dev/null
+++ b/src/html5lib/trie/_base.py
@@ -0,0 +1,37 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from collections import Mapping
+
+
+class Trie(Mapping):
+    """Abstract base class for tries"""
+
+    def keys(self, prefix=None):
+        keys = super().keys()
+
+        if prefix is None:
+            return set(keys)
+
+        # Python 2.6: no set comprehensions
+        return set([x for x in keys if x.startswith(prefix)])
+
+    def has_keys_with_prefix(self, prefix):
+        for key in self.keys():
+            if key.startswith(prefix):
+                return True
+
+        return False
+
+    def longest_prefix(self, prefix):
+        if prefix in self:
+            return prefix
+
+        for i in range(1, len(prefix) + 1):
+            if prefix[:-i] in self:
+                return prefix[:-i]
+
+        raise KeyError(prefix)
+
+    def longest_prefix_item(self, prefix):
+        lprefix = self.longest_prefix(prefix)
+        return (lprefix, self[lprefix])
diff --git a/src/html5lib/trie/datrie.py b/src/html5lib/trie/datrie.py
new file mode 100644
index 0000000000..51f3d046a7
--- /dev/null
+++ b/src/html5lib/trie/datrie.py
@@ -0,0 +1,44 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from datrie import Trie as DATrie
+from six import text_type
+
+from ._base import Trie as ABCTrie
+
+
+class Trie(ABCTrie):
+    def __init__(self, data):
+        chars = set()
+        for key in data.keys():
+            if not isinstance(key, text_type):
+                raise TypeError("All keys must be strings")
+            for char in key:
+                chars.add(char)
+
+        self._data = DATrie("".join(chars))
+        for key, value in data.items():
+            self._data[key] = value
+
+    def __contains__(self, key):
+        return key in self._data
+
+    def __len__(self):
+        return len(self._data)
+
+    def __iter__(self):
+        raise NotImplementedError()
+
+    def __getitem__(self, key):
+        return self._data[key]
+
+    def keys(self, prefix=None):
+        return self._data.keys(prefix)
+
+    def has_keys_with_prefix(self, prefix):
+        return self._data.has_keys_with_prefix(prefix)
+
+    def longest_prefix(self, prefix):
+        return self._data.longest_prefix(prefix)
+
+    def longest_prefix_item(self, prefix):
+        return self._data.longest_prefix_item(prefix)
diff --git a/src/html5lib/trie/py.py b/src/html5lib/trie/py.py
new file mode 100644
index 0000000000..c2ba3da757
--- /dev/null
+++ b/src/html5lib/trie/py.py
@@ -0,0 +1,67 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+
+from bisect import bisect_left
+
+from ._base import Trie as ABCTrie
+
+
+class Trie(ABCTrie):
+    def __init__(self, data):
+        if not all(isinstance(x, text_type) for x in data.keys()):
+            raise TypeError("All keys must be strings")
+
+        self._data = data
+        self._keys = sorted(data.keys())
+        self._cachestr = ""
+        self._cachepoints = (0, len(data))
+
+    def __contains__(self, key):
+        return key in self._data
+
+    def __len__(self):
+        return len(self._data)
+
+    def __iter__(self):
+        return iter(self._data)
+
+    def __getitem__(self, key):
+        return self._data[key]
+
+    def keys(self, prefix=None):
+        if prefix is None or prefix == "" or not self._keys:
+            return set(self._keys)
+
+        if prefix.startswith(self._cachestr):
+            lo, hi = self._cachepoints
+            start = i = bisect_left(self._keys, prefix, lo, hi)
+        else:
+            start = i = bisect_left(self._keys, prefix)
+
+        keys = set()
+        if start == len(self._keys):
+            return keys
+
+        while self._keys[i].startswith(prefix):
+            keys.add(self._keys[i])
+            i += 1
+
+        self._cachestr = prefix
+        self._cachepoints = (start, i)
+
+        return keys
+
+    def has_keys_with_prefix(self, prefix):
+        if prefix in self._data:
+            return True
+
+        if prefix.startswith(self._cachestr):
+            lo, hi = self._cachepoints
+            i = bisect_left(self._keys, prefix, lo, hi)
+        else:
+            i = bisect_left(self._keys, prefix)
+
+        if i == len(self._keys):
+            return False
+
+        return self._keys[i].startswith(prefix)
diff --git a/src/html5lib/utils.py b/src/html5lib/utils.py
index 7c6c8ae840..2f41f4dfa6 100644
--- a/src/html5lib/utils.py
+++ b/src/html5lib/utils.py
@@ -1,9 +1,16 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from types import ModuleType
+
 try:
-    frozenset
-except NameError:
-    #Import from the sets module for python 2.3
-    from sets import Set as set
-    from sets import ImmutableSet as frozenset
+    import xml.etree.cElementTree as default_etree
+except ImportError:
+    import xml.etree.ElementTree as default_etree
+
+
+__all__ = ["default_etree", "MethodDispatcher", "isSurrogatePair",
+           "surrogatePairToCodepoint", "moduleFactoryFactory"]
+
 
 class MethodDispatcher(dict):
     """Dict with 2 special properties:
@@ -23,7 +30,7 @@ class MethodDispatcher(dict):
         # twice as fast. Please do careful performance testing before changing
         # anything here.
         _dictEntries = []
-        for name,value in items:
+        for name, value in items:
             if type(name) in (list, tuple, frozenset, set):
                 for item in name:
                     _dictEntries.append((item, value))
@@ -35,122 +42,41 @@ class MethodDispatcher(dict):
     def __getitem__(self, key):
         return dict.get(self, key, self.default)
 
-#Pure python implementation of deque taken from the ASPN Python Cookbook
-#Original code by Raymond Hettinger
 
-class deque(object):
+# Some utility functions to dal with weirdness around UCS2 vs UCS4
+# python builds
 
-    def __init__(self, iterable=(), maxsize=-1):
-        if not hasattr(self, 'data'):
-            self.left = self.right = 0
-            self.data = {}
-        self.maxsize = maxsize
-        self.extend(iterable)
+def isSurrogatePair(data):
+    return (len(data) == 2 and
+            ord(data[0]) >= 0xD800 and ord(data[0]) <= 0xDBFF and
+            ord(data[1]) >= 0xDC00 and ord(data[1]) <= 0xDFFF)
 
-    def append(self, x):
-        self.data[self.right] = x
-        self.right += 1
-        if self.maxsize != -1 and len(self) > self.maxsize:
-            self.popleft()
-        
-    def appendleft(self, x):
-        self.left -= 1        
-        self.data[self.left] = x
-        if self.maxsize != -1 and len(self) > self.maxsize:
-            self.pop()      
-        
-    def pop(self):
-        if self.left == self.right:
-            raise IndexError('cannot pop from empty deque')
-        self.right -= 1
-        elem = self.data[self.right]
-        del self.data[self.right]         
-        return elem
-    
-    def popleft(self):
-        if self.left == self.right:
-            raise IndexError('cannot pop from empty deque')
-        elem = self.data[self.left]
-        del self.data[self.left]
-        self.left += 1
-        return elem
 
-    def clear(self):
-        self.data.clear()
-        self.left = self.right = 0
+def surrogatePairToCodepoint(data):
+    char_val = (0x10000 + (ord(data[0]) - 0xD800) * 0x400 +
+                (ord(data[1]) - 0xDC00))
+    return char_val
 
-    def extend(self, iterable):
-        for elem in iterable:
-            self.append(elem)
+# Module Factory Factory (no, this isn't Java, I know)
+# Here to stop this being duplicated all over the place.
 
-    def extendleft(self, iterable):
-        for elem in iterable:
-            self.appendleft(elem)
 
-    def rotate(self, n=1):
-        if self:
-            n %= len(self)
-            for i in xrange(n):
-                self.appendleft(self.pop())
+def moduleFactoryFactory(factory):
+    moduleCache = {}
 
-    def __getitem__(self, i):
-        if i < 0:
-            i += len(self)
-        try:
-            return self.data[i + self.left]
-        except KeyError:
-            raise IndexError
+    def moduleFactory(baseModule, *args, **kwargs):
+        if isinstance(ModuleType.__name__, type("")):
+            name = "_%s_factory" % baseModule.__name__
+        else:
+            name = b"_%s_factory" % baseModule.__name__
 
-    def __setitem__(self, i, value):
-        if i < 0:
-            i += len(self)        
-        try:
-            self.data[i + self.left] = value
-        except KeyError:
-            raise IndexError
+        if name in moduleCache:
+            return moduleCache[name]
+        else:
+            mod = ModuleType(name)
+            objs = factory(baseModule, *args, **kwargs)
+            mod.__dict__.update(objs)
+            moduleCache[name] = mod
+            return mod
 
-    def __delitem__(self, i):
-        size = len(self)
-        if not (-size <= i < size):
-            raise IndexError
-        data = self.data
-        if i < 0:
-            i += size
-        for j in xrange(self.left+i, self.right-1):
-            data[j] = data[j+1]
-        self.pop()
-    
-    def __len__(self):
-        return self.right - self.left
-
-    def __cmp__(self, other):
-        if type(self) != type(other):
-            return cmp(type(self), type(other))
-        return cmp(list(self), list(other))
-            
-    def __repr__(self, _track=[]):
-        if id(self) in _track:
-            return '...'
-        _track.append(id(self))
-        r = 'deque(%r)' % (list(self),)
-        _track.remove(id(self))
-        return r
-    
-    def __getstate__(self):
-        return (tuple(self),)
-    
-    def __setstate__(self, s):
-        self.__init__(s[0])
-        
-    def __hash__(self):
-        raise TypeError
-    
-    def __copy__(self):
-        return self.__class__(self)
-    
-    def __deepcopy__(self, memo={}):
-        from copy import deepcopy
-        result = self.__class__()
-        memo[id(self)] = result
-        result.__init__(deepcopy(tuple(self), memo))
-        return result
\ No newline at end of file
+    return moduleFactory

From 966c5d572c5b656a4de0cb7847f89758c2e51f53 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 11:35:47 +0530
Subject: [PATCH 1061/1154] HTML 5 parsing: Fix handling of xml:lang attributes
 on all elements

xml:lang is now mapped to a plain lang on all elements, not just <html>
---
 src/calibre/ebooks/oeb/parse_utils.py         |  8 +++----
 .../ebooks/oeb/polish/tests/parsing.py        | 24 +++++++++++++++++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index df315df775..88d9a198c3 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -98,10 +98,6 @@ def html5_parse(data, max_nesting_depth=100):
             if depth > max_nesting_depth:
                 raise ValueError('html5lib resulted in a tree with nesting'
                         ' depth > %d'%max_nesting_depth)
-    # Set lang correctly
-    xl = data.attrib.pop('xmlU0003Alang', None)
-    if xl is not None and 'lang' not in data.attrib:
-        data.attrib['lang'] = xl
 
     # html5lib has the most inelegant handling of namespaces I have ever seen
     # Try to reconstitute destroyed namespace info
@@ -110,6 +106,10 @@ def html5_parse(data, max_nesting_depth=100):
     seen_namespaces = set()
     for elem in tuple(data.iter(tag=etree.Element)):
         elem.attrib.pop('xmlns', None)
+        # Set lang correctly
+        xl = elem.attrib.pop('xmlU0003Alang', None)
+        if xl is not None and 'lang' not in elem.attrib:
+            elem.attrib['lang'] = xl
         namespaces = {}
         for x in tuple(elem.attrib):
             if x.startswith('xmlnsU') or x.startswith(xmlns_declaration):
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 7b9bda7e21..cbe65947b8 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -71,11 +71,31 @@ def namespaces(test, parse_function):
     ae(len(xpath('//ns1:tag2[@ns1:id="test"]')), 1, err)
     ae(len(xpath('//ns2:tag3[@ns2:id="test"]')), 1, err)
 
-all_checks = (nonvoid_cdata_elements, namespaces)
+    markup = '<html xml:lang="en"><body><p lang="de"><p xml:lang="es"><p lang="en" xml:lang="de">'
+    root = parse_function(markup)
+    err = 'xml:lang not converted to lang, parsed markup:\n' + etree.tostring(root)
+    ae(len(root.xpath('//*[@lang="en"]')), 2, err)
+    ae(len(root.xpath('//*[@lang="de"]')), 1, err)
+    ae(len(root.xpath('//*[@lang="es"]')), 1, err)
+    ae(len(XPath('//*[@xml:lang]')(root)), 0, err)
+
+def space_characters(test, parse_function):
+    markup = '<html><p>\u000c</p>'
+    root = parse_function(markup)
+    err = 'form feed character not converted, parsed markup:\n' + etree.tostring(root)
+    test.assertNotIn('\u000c', root.xpath('//*[local-name()="p"]')[0].text, err)
+
+def case_insensitive_element_names(test, parse_function):
+    markup = '<HTML><P> </p>'
+    root = parse_function(markup)
+    err = 'case sensitive parsing, parsed markup:\n' + etree.tostring(root)
+    test.assertEqual(len(XPath('//h:p')(root)), 1, err)
+
+basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insensitive_element_names)
 
 class ParsingTests(BaseTest):
 
     def test_conversion_parser(self):
         ' Test parsing with the parser used for conversion '
-        for test in all_checks:
+        for test in basic_checks:
             test(self, html5_parse)

From ce29abef512045e37f57288ea1e9747a6e83104f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 11:35:47 +0530
Subject: [PATCH 1062/1154] HTML 5 parsing: Fix handling of xml:lang attributes
 on all elements

xml:lang is now mapped to a plain lang on all elements, not just <html>
---
 src/calibre/ebooks/oeb/parse_utils.py         |  8 +++----
 .../ebooks/oeb/polish/tests/parsing.py        | 24 +++++++++++++++++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index df315df775..88d9a198c3 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -98,10 +98,6 @@ def html5_parse(data, max_nesting_depth=100):
             if depth > max_nesting_depth:
                 raise ValueError('html5lib resulted in a tree with nesting'
                         ' depth > %d'%max_nesting_depth)
-    # Set lang correctly
-    xl = data.attrib.pop('xmlU0003Alang', None)
-    if xl is not None and 'lang' not in data.attrib:
-        data.attrib['lang'] = xl
 
     # html5lib has the most inelegant handling of namespaces I have ever seen
     # Try to reconstitute destroyed namespace info
@@ -110,6 +106,10 @@ def html5_parse(data, max_nesting_depth=100):
     seen_namespaces = set()
     for elem in tuple(data.iter(tag=etree.Element)):
         elem.attrib.pop('xmlns', None)
+        # Set lang correctly
+        xl = elem.attrib.pop('xmlU0003Alang', None)
+        if xl is not None and 'lang' not in elem.attrib:
+            elem.attrib['lang'] = xl
         namespaces = {}
         for x in tuple(elem.attrib):
             if x.startswith('xmlnsU') or x.startswith(xmlns_declaration):
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 7b9bda7e21..cbe65947b8 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -71,11 +71,31 @@ def namespaces(test, parse_function):
     ae(len(xpath('//ns1:tag2[@ns1:id="test"]')), 1, err)
     ae(len(xpath('//ns2:tag3[@ns2:id="test"]')), 1, err)
 
-all_checks = (nonvoid_cdata_elements, namespaces)
+    markup = '<html xml:lang="en"><body><p lang="de"><p xml:lang="es"><p lang="en" xml:lang="de">'
+    root = parse_function(markup)
+    err = 'xml:lang not converted to lang, parsed markup:\n' + etree.tostring(root)
+    ae(len(root.xpath('//*[@lang="en"]')), 2, err)
+    ae(len(root.xpath('//*[@lang="de"]')), 1, err)
+    ae(len(root.xpath('//*[@lang="es"]')), 1, err)
+    ae(len(XPath('//*[@xml:lang]')(root)), 0, err)
+
+def space_characters(test, parse_function):
+    markup = '<html><p>\u000c</p>'
+    root = parse_function(markup)
+    err = 'form feed character not converted, parsed markup:\n' + etree.tostring(root)
+    test.assertNotIn('\u000c', root.xpath('//*[local-name()="p"]')[0].text, err)
+
+def case_insensitive_element_names(test, parse_function):
+    markup = '<HTML><P> </p>'
+    root = parse_function(markup)
+    err = 'case sensitive parsing, parsed markup:\n' + etree.tostring(root)
+    test.assertEqual(len(XPath('//h:p')(root)), 1, err)
+
+basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insensitive_element_names)
 
 class ParsingTests(BaseTest):
 
     def test_conversion_parser(self):
         ' Test parsing with the parser used for conversion '
-        for test in all_checks:
+        for test in basic_checks:
             test(self, html5_parse)

From 2fef9eb3bae1016bc719482d1aea095ab7e55c88 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 11:37:34 +0530
Subject: [PATCH 1063/1154] ...

---
 src/calibre/ebooks/oeb/polish/tests/parsing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index cbe65947b8..014985e02d 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -96,6 +96,6 @@ basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insen
 class ParsingTests(BaseTest):
 
     def test_conversion_parser(self):
-        ' Test parsing with the parser used for conversion '
+        ' Test parsing with the HTML5 parser used for conversion '
         for test in basic_checks:
             test(self, html5_parse)

From 3f6c88f0ae04d33dead60f1e4533b3a51e0fb35a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 20:11:35 +0530
Subject: [PATCH 1064/1154] FB2 Input: Fix paras with both id and style

FB2 Input: Fix a regression that broke conversion of FB2 files with
paragraphs having both a style and an id attribute. Fixes #1243709 [xls:attribute error in FB2 files](https://bugs.launchpad.net/calibre/+bug/1243709)
---
 resources/templates/fb2.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/templates/fb2.xsl b/resources/templates/fb2.xsl
index 84fdd323bd..474c7c0045 100644
--- a/resources/templates/fb2.xsl
+++ b/resources/templates/fb2.xsl
@@ -223,14 +223,14 @@
     <xsl:template match="fb:p">
         <xsl:element name="div">
             <xsl:attribute name="class">paragraph</xsl:attribute>
+            <xsl:if test="@style">
+                <xsl:attribute name="style"><xsl:value-of select="@style"/></xsl:attribute>
+            </xsl:if>
             <xsl:if test="@id">
                 <xsl:element name="a">
                     <xsl:attribute name="name"><xsl:value-of select="@id"/></xsl:attribute>
                 </xsl:element>
             </xsl:if>
-            <xsl:if test="@style">
-                <xsl:attribute name="style"><xsl:value-of select="@style"/></xsl:attribute>
-            </xsl:if>
             <xsl:apply-templates/>
         </xsl:element>
     </xsl:template>

From c20db472ebf972583127dfee1d869e14cfd44b9b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 20:42:27 +0530
Subject: [PATCH 1065/1154] FB2 Input: Add support for note and cite back
 references

FB2 Input: Add support for note and cite back references. Link pairs of
type="note" and type="cite" now automatically generate the correct back
reference. Fixes #1243714 [Fb2 return link is lost when converted to mobi or epub](https://bugs.launchpad.net/calibre/+bug/1243714)
---
 resources/templates/fb2.xsl                   |  5 +++++
 .../ebooks/conversion/plugins/fb2_input.py    | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/resources/templates/fb2.xsl b/resources/templates/fb2.xsl
index 474c7c0045..83bb9c7f10 100644
--- a/resources/templates/fb2.xsl
+++ b/resources/templates/fb2.xsl
@@ -269,10 +269,15 @@
             </xsl:attribute>
             <xsl:choose>
                 <xsl:when test="(@type) = 'note'">
+                    <xsl:attribute name="link_note"></xsl:attribute>
                     <sup>
                         <xsl:apply-templates/>
                     </sup>
                 </xsl:when>
+                <xsl:when test="(@type) = 'cite' and @id">
+                    <xsl:attribute name="link_cite"><xsl:value-of select="@id"/></xsl:attribute>
+                    <xsl:apply-templates/>
+                </xsl:when>
                 <xsl:otherwise>
                     <xsl:apply-templates/>
                 </xsl:otherwise>
diff --git a/src/calibre/ebooks/conversion/plugins/fb2_input.py b/src/calibre/ebooks/conversion/plugins/fb2_input.py
index f47a63b15f..784b13cfc8 100644
--- a/src/calibre/ebooks/conversion/plugins/fb2_input.py
+++ b/src/calibre/ebooks/conversion/plugins/fb2_input.py
@@ -87,6 +87,25 @@ class FB2Input(InputFormatPlugin):
 
         transform = etree.XSLT(styledoc)
         result = transform(doc)
+
+        # Handle links of type note and cite
+        notes = {a.get('href')[1:]: a for a in result.xpath('//a[@link_note and @href]') if a.get('href').startswith('#')}
+        cites = {a.get('link_cite'): a for a in result.xpath('//a[@link_cite]') if not a.get('href', '')}
+        all_ids = {x for x in result.xpath('//*/@id')}
+        for cite, a in cites.iteritems():
+            note = notes.get(cite, None)
+            if note:
+                c = 1
+                while 'cite%d' % c in all_ids:
+                    c += 1
+                if not note.get('id', None):
+                    note.set('id', 'cite%d' % c)
+                    all_ids.add(note.get('id'))
+                a.set('href', '#%s' % note.get('id'))
+        for x in result.xpath('//*[@link_note or @link_cite]'):
+            x.attrib.pop('link_note', None)
+            x.attrib.pop('link_cite', None)
+
         for img in result.xpath('//img[@src]'):
             src = img.get('src')
             img.set('src', self.binary_map.get(src, src))

From 8e27841421516d8685d2af541bc4af3f425957d4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 23 Oct 2013 20:58:33 +0530
Subject: [PATCH 1066/1154] Start work on my own html5lib tree builder with
 proper (x)html->xhtml parsing and source line numbers

---
 src/calibre/ebooks/oeb/polish/parsing.py | 199 +++++++++++++++++++++++
 1 file changed, 199 insertions(+)
 create mode 100644 src/calibre/ebooks/oeb/polish/parsing.py

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
new file mode 100644
index 0000000000..3377931c73
--- /dev/null
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -0,0 +1,199 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import copy
+
+from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
+
+from html5lib.constants import namespaces
+from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
+from html5lib.ihatexml import InfosetFilter
+
+infoset_filter = InfosetFilter()
+coerce_comment = infoset_filter.coerceComment
+coerce_text = infoset_filter.coerceCharacters
+
+def create_lxml_context():
+    parser = XMLParser()
+    parser.set_element_class_lookup(ElementDefaultClassLookup(element=Element, comment=Comment))
+    return parser
+
+def ElementFactory(name, namespace=None, context=None):
+    context = context or create_lxml_context()
+    ns = namespace or namespaces['html']
+    return context.makeelement('{%s}%s' % (ns, name), nsmap={None:ns})
+
+def CommentFactory(text):
+    return Comment(coerce_comment(text))
+
+class Element(ElementBase):
+
+    ''' Implements the interface required by the html5lib tree builders (see
+    html5lib.treebuilders._base.Node) on top of the lxml ElementBase class '''
+
+    def __str__(self):
+        attrs = ''
+        if self.attrib:
+            attrs = ' ' + ' '.join('%s="%s"' % (k, v) for k, v in self.attrib.iteritems())
+        ns = self.tag.rpartition('}')[0][1:]
+        prefix = {v:k for k, v in self.nsmap.iteritems()}[ns] or ''
+        if prefix:
+            prefix += ':'
+        return '<%s%s%s (%s)>' % (prefix, self.name, attrs, hex(id(self)))
+    __repr__ = __str__
+
+    @dynamic_property
+    def name(self):
+        def fget(self):
+            return self.tag.rpartition('}')[2]
+        def fset(self, val):
+            self.tag = '%s}%s' % (self.tag.rpartition('}')[2], val)
+        return property(fget=fget, fset=fset)
+
+    @property
+    def namespace(self):
+        return self.nsmap[self.prefix]
+
+    @dynamic_property
+    def attributes(self):
+        def fget(self):
+            return self.attrib
+        def fset(self, val):
+            attrs = {('{%s}%s' % k) if isinstance(k, tuple) else k : v for k, v in val.iteritems()}
+            self.attrib.clear()
+            self.attrib.update(attrs)
+        return property(fget=fget, fset=fset)
+
+    @dynamic_property
+    def childNodes(self):
+        def fget(self):
+            return self
+        def fset(self, val):
+            self[:] = list(val)
+        return property(fget=fget, fset=fset)
+
+    @property
+    def parent(self):
+        return self.getparent()
+
+    def hasContent(self):
+        return bool(self.text or len(self))
+
+    appendChild = ElementBase.append
+    removeChild = ElementBase.remove
+
+    def cloneNode(self):
+        return self.makeelement(self.tag, nsmap=self.nsmap, attrib=self.attrib)
+
+    def insertBefore(self, node, ref_node):
+        self.insert(self.index(ref_node), node)
+
+    def insertText(self, data, insertBefore=None):
+        data = coerce_text(data)
+        if len(self) == 0:
+            self.text = (self.text or '') + data
+        elif insertBefore is None:
+            # Insert the text as the tail of the last child element
+            el = self[-1]
+            el.tail = (el.tail or '') + data
+        else:
+            # Insert the text before the specified node
+            index = self.index(insertBefore)
+            if index > 0:
+                el = self[index - 1]
+                el.tail = (el.tail or '') + data
+            else:
+                self.text = (self.text or '') + data
+
+    def reparentChildren(self, new_parent):
+        # Move self.text
+        if len(new_parent) > 0:
+            el = new_parent[-1]
+            el.tail = (el.tail or '') + self.text
+        else:
+            if self.text:
+                new_parent.text = (new_parent.text or '') + self.text
+        self.text = None
+        for child in self:
+            new_parent.append(child)
+
+class Comment(CommentBase):
+
+    @dynamic_property
+    def data(self):
+        def fget(self):
+            return self.text
+        def fset(self, val):
+            self.text = coerce_comment(val)
+        return property(fget=fget, fset=fset)
+
+    @property
+    def parent(self):
+        return self.getparent()
+
+    @property
+    def name(self):
+        return None
+
+    @property
+    def namespace(self):
+        return None
+
+    @property
+    def childNodes(self):
+        return []
+
+    @property
+    def attributes(self):
+        return {}
+
+    def hasContent(self):
+        return bool(self.text)
+
+    def no_op(self, *args, **kwargs):
+        pass
+
+    appendChild = no_op
+    removeChild = no_op
+    insertBefore = no_op
+    reparentChildren = no_op
+
+    def insertText(self, text, insertBefore=None):
+        self.text = (self.text or '') + coerce_comment(text)
+
+    def cloneNode(self):
+        return copy.copy(self)
+
+class Document(object):
+
+    def __init__(self):
+        self.root = None
+        self.doctype = None
+
+    def appendChild(self, child):
+        if isinstance(child, Element):
+            self.root = child
+        elif isinstance(child, DocType):
+            self.doctype = child
+
+class DocType(object):
+
+    def __init__(self, name, public_id, system_id):
+        self.text = self.name = name
+        self.public_id, self.system_id = public_id, system_id
+
+class TreeBuilder(BaseTreeBuilder):
+
+    elementClass = ElementFactory
+    commentClass = Comment
+    documentClass = Document
+    doctypeClass = DocType
+
+    def __init__(self):
+        BaseTreeBuilder.__init__(self, True)
+

From 79ab8184f40273b8788491f4dd9d1a126f056a5e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 08:45:34 +0530
Subject: [PATCH 1067/1154] Book details panel: Fix HTML in author names and
 identifiers not being escaped

Fixes #1243976 [Private bug](https://bugs.launchpad.net/calibre/+bug/1243976)
---
 src/calibre/gui2/book_details.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index 4e78edb638..d1045b2e4e 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -110,6 +110,8 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
     isdevice = not hasattr(mi, 'id')
     fm = getattr(mi, 'field_metadata', field_metadata)
     row = u'<td class="title">%s</td><td class="value">%s</td>'
+    p = prepare_string_for_xml
+    a = partial(prepare_string_for_xml, attribute=True)
 
     for field, display in get_field_list(fm):
         metadata = fm.get(field, None)
@@ -167,20 +169,19 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
         elif field == 'formats':
             if isdevice:
                 continue
-            p = partial(prepare_string_for_xml, attribute=True)
             path = ''
             if mi.path:
                 h, t = os.path.split(mi.path)
                 path = '/'.join((os.path.basename(h), t))
             data = ({
-                'fmt':x, 'path':p(path or ''), 'fname':p(mi.format_files.get(x, '')),
+                'fmt':x, 'path':a(path or ''), 'fname':a(mi.format_files.get(x, '')),
                 'ext':x.lower(), 'id':mi.id
             } for x in mi.formats)
             fmts = [u'<a title="{path}/{fname}.{ext}" href="format:{id}:{fmt}">{fmt}</a>'.format(**x) for x in data]
             ans.append((field, row % (name, u', '.join(fmts))))
         elif field == 'identifiers':
             urls = urls_from_identifiers(mi.identifiers)
-            links = [u'<a href="%s" title="%s:%s">%s</a>' % (url, id_typ, id_val, name)
+            links = [u'<a href="%s" title="%s:%s">%s</a>' % (a(url), a(id_typ), a(id_val), p(name))
                     for name, id_typ, id_val, url in urls]
             links = u', '.join(links)
             if links:
@@ -200,9 +201,9 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
                         vals['author_sort'] = aut.replace(' ', '+')
                     link = formatter.safe_format(
                             gprefs.get('default_author_link'), vals, '', vals)
+                aut = p(aut)
                 if link:
-                    link = prepare_string_for_xml(link)
-                    authors.append(u'<a calibre-data="authors" href="%s">%s</a>'%(link, aut))
+                    authors.append(u'<a calibre-data="authors" href="%s">%s</a>'%(a(link), aut))
                 else:
                     authors.append(aut)
             ans.append((field, row % (name, u' & '.join(authors))))
@@ -215,14 +216,14 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
             val = mi.format_field(field)[-1]
             if val is None:
                 continue
-            val = prepare_string_for_xml(val)
+            val = p(val)
             if metadata['datatype'] == 'series':
                 sidx = mi.get(field+'_index')
                 if sidx is None:
                     sidx = 1.0
                 val = _('Book %(sidx)s of <span class="series_name">%(series)s</span>')%dict(
                         sidx=fmt_sidx(sidx, use_roman=use_roman_numbers),
-                        series=prepare_string_for_xml(getattr(mi, field)))
+                        series=p(getattr(mi, field)))
             elif metadata['datatype'] == 'datetime':
                 aval = getattr(mi, field)
                 if is_date_undefined(aval):

From 446c8c9676e18c4df922ad1319018f9d1a4bd047 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 08:53:14 +0530
Subject: [PATCH 1068/1154] Disable javascript in the web view used to display
 book metadata

---
 src/calibre/gui2/book_details.py      | 2 ++
 src/calibre/gui2/dialogs/book_info.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index d1045b2e4e..7beef6e8ef 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -418,6 +418,8 @@ class BookInfo(QWebView):
 
     def __init__(self, vertical, parent=None):
         QWebView.__init__(self, parent)
+        s = self.settings()
+        s.setAttribute(s.JavascriptEnabled, False)
         self.vertical = vertical
         self.page().setLinkDelegationPolicy(self.page().DelegateAllLinks)
         self.linkClicked.connect(self.link_activated)
diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index 0abf7f0f91..ee9bc08dd6 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -50,6 +50,8 @@ class BookInfo(QDialog):
         self.details.sizeHint = self.details_size_hint
         self.details.page().setLinkDelegationPolicy(self.details.page().DelegateAllLinks)
         self.details.linkClicked.connect(self.link_clicked)
+        s = self.details.page().settings()
+        s.setAttribute(s.JavascriptEnabled, False)
         self.css = css()
         self.link_delegate = link_delegate
         self.details.setAttribute(Qt.WA_OpaquePaintEvent, False)

From 38e447e519a8488a8beb55f549d868a72d71f421 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 08:57:28 +0530
Subject: [PATCH 1069/1154] Nicer error msg when loading covers too large for
 RAM

---
 src/calibre/gui2/library/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 81ea3e4643..d804e52dfb 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -668,6 +668,9 @@ class BooksModel(QAbstractTableModel):  # {{{
             data = self.db.cover(row_number)
         except IndexError:  # Happens if database has not yet been refreshed
             pass
+        except MemoryError:
+            raise ValueError(_('The cover for the book %s is too large, cannot load it.'
+                             ' Resize or delete it.') % self.db.title(row_number))
 
         if not data:
             return self.default_image

From 15c87a19d54a062c4b230a89bf8561017d9a0f9c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 09:11:53 +0530
Subject: [PATCH 1070/1154] pep8

---
 src/calibre/gui2/complete2.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/complete2.py b/src/calibre/gui2/complete2.py
index debc9a6599..51e5ed4812 100644
--- a/src/calibre/gui2/complete2.py
+++ b/src/calibre/gui2/complete2.py
@@ -18,7 +18,7 @@ from calibre.gui2 import NONE
 from calibre.gui2.widgets import EnComboBox, LineEditECM
 from calibre.utils.config import tweaks
 
-class CompleteModel(QAbstractListModel): # {{{
+class CompleteModel(QAbstractListModel):  # {{{
 
     def __init__(self, parent=None):
         QAbstractListModel.__init__(self, parent)
@@ -65,7 +65,7 @@ class CompleteModel(QAbstractListModel): # {{{
                 return self.index(i)
 # }}}
 
-class Completer(QListView): # {{{
+class Completer(QListView):  # {{{
 
     item_selected = pyqtSignal(object)
     relayout_needed = pyqtSignal()
@@ -92,7 +92,8 @@ class Completer(QListView): # {{{
         QListView.hide(self)
 
     def item_chosen(self, index):
-        if not self.isVisible(): return
+        if not self.isVisible():
+            return
         self.hide()
         text = self.model().data(index, Qt.DisplayRole)
         self.item_selected.emit(unicode(text))
@@ -287,7 +288,8 @@ class LineEdit(QLineEdit, LineEditECM):
         self.mcompleter.popup()
 
     def text_edited(self, *args):
-        if self.no_popup: return
+        if self.no_popup:
+            return
         self.update_completions()
         select_first = len(self.mcompleter.model().current_prefix) > 0
         if not select_first:
@@ -370,13 +372,13 @@ class EditWithComplete(EnComboBox):
 
     @dynamic_property
     def all_items(self):
-        def fget(self): return self.lineEdit().all_items
-        def fset(self, val): self.lineEdit().all_items = val
+        def fget(self):
+            return self.lineEdit().all_items
+        def fset(self, val):
+            self.lineEdit().all_items = val
         return property(fget=fget, fset=fset)
 
-
     # }}}
-
     def text(self):
         return unicode(self.lineEdit().text())
 

From 7fc33c08f472f034c85e75abece639da8605f87f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 09:15:01 +0530
Subject: [PATCH 1071/1154] ...

---
 setup/installer/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/installer/__init__.py b/setup/installer/__init__.py
index 60946935e3..52af5f1f67 100644
--- a/setup/installer/__init__.py
+++ b/setup/installer/__init__.py
@@ -62,7 +62,7 @@ class Push(Command):
                 r'Owner@winxp:/cygdrive/c/Documents\ and\ Settings/Owner/calibre':'winxp',
                 'kovid@ox:calibre':None,
                 r'kovid@win7:/cygdrive/c/Users/kovid/calibre':'Windows 7',
-                'kovid@win7-64:calibre-src':None,
+                'kovid@win7-x64:calibre-src':'win7-x64',
                 }.iteritems():
             if vmname is None or is_vm_running(vmname):
                 rcmd = BASE_RSYNC + EXCLUDES + ['.', host]

From 849fd5dbebcb007ffb6cdf5e9ea7290bfdd13531 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 09:39:27 +0530
Subject: [PATCH 1072/1154] Fix OS X version detection on Mavericks

OS X: Fix system tray notifications causing crashes on some OS X 10.9
(Mavericks) systems (those that had Growl installed at some point).
See #1224491 (Calibre Crashes on Mac OS X Mavericks)
---
 src/calibre/constants.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 807bf5d74c..ad728b7712 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -52,7 +52,10 @@ def get_osx_version():
         from collections import namedtuple
         OSX = namedtuple('OSX', 'major minor tertiary')
         try:
-            _osx_ver = OSX(*(map(int, platform.mac_ver()[0].split('.'))))
+            ver = platform.mac_ver()[0].split('.')
+            if len(ver) == 2:
+                ver.append(0)
+            _osx_ver = OSX(*(map(int, ver)))
         except:
             _osx_ver = OSX(0, 0, 0)
     return _osx_ver

From 9211f72cd3b1cde693b25e26c47f1492c3d5689b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 09:52:26 +0530
Subject: [PATCH 1073/1154] OSX: Fix font size in completion popups too small
 on Mavericks (I hope)

Fixes #1243761 [In OS 10.9 pull-down menus are to small](https://bugs.launchpad.net/calibre/+bug/1243761)
---
 src/calibre/gui2/complete2.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/complete2.py b/src/calibre/gui2/complete2.py
index 51e5ed4812..3214cb5fff 100644
--- a/src/calibre/gui2/complete2.py
+++ b/src/calibre/gui2/complete2.py
@@ -11,8 +11,9 @@ import weakref
 
 import sip
 from PyQt4.Qt import (QLineEdit, QAbstractListModel, Qt, pyqtSignal, QObject,
-        QApplication, QListView, QPoint, QModelIndex)
+        QApplication, QListView, QPoint, QModelIndex, QFont, QFontInfo)
 
+from calibre.constants import isosx, get_osx_version
 from calibre.utils.icu import sort_key, primary_startswith
 from calibre.gui2 import NONE
 from calibre.gui2.widgets import EnComboBox, LineEditECM
@@ -165,6 +166,14 @@ class Completer(QListView):  # {{{
             self.setCurrentIndex(self.model().index(0))
 
         if not p.isVisible():
+            if isosx and get_osx_version() >= (10, 9, 0):
+                # On mavericks the popup menu seems to use a font smaller than
+                # the widgets font, see for example:
+                # https://bugs.launchpad.net/bugs/1243761
+                fp = QFontInfo(widget.font())
+                f = QFont()
+                f.setPixelSize(fp.pixelSize())
+                self.setFont(f)
             p.show()
 
     def eventFilter(self, obj, e):

From 78e8ba74a02e0f41261b777d28b40ab05e205452 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 11:35:49 +0530
Subject: [PATCH 1074/1154] Add the six module required by html5lib

---
 setup/installer/windows/freeze.py |   2 +
 src/calibre/test_build.py         |   6 +
 src/six.py                        | 577 ++++++++++++++++++++++++++++++
 3 files changed, 585 insertions(+)
 create mode 100644 src/six.py

diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
index f25a21cd71..d59c086f26 100644
--- a/setup/installer/windows/freeze.py
+++ b/setup/installer/windows/freeze.py
@@ -688,6 +688,8 @@ class Win32Freeze(Command, WixMixIn):
 
             for d in self.get_pth_dirs(self.j(sp, 'easy-install.pth')):
                 handled.add(self.b(d))
+                if os.path.basename(d).startswith('six-'):
+                    continue  # We prefer the version bundled with calibre
                 for x in os.listdir(d):
                     if x in {'EGG-INFO', 'site.py', 'site.pyc', 'site.pyo'}:
                         continue
diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
index 17bc829427..c0e99a5c43 100644
--- a/src/calibre/test_build.py
+++ b/src/calibre/test_build.py
@@ -15,6 +15,11 @@ Test a binary calibre build to ensure that all needed binary images/libraries ha
 import cStringIO
 from calibre.constants import plugins, iswindows
 
+def test_html5lib():
+    import html5lib.html5parser  # noqa
+    from html5lib import parse  # noqa
+    print ('html5lib OK!')
+
 def test_plugins():
     for name in plugins:
         mod, err = plugins[name]
@@ -113,6 +118,7 @@ def test():
     test_icu()
     test_woff()
     test_qt()
+    test_html5lib()
     if iswindows:
         test_winutil()
         test_wpd()
diff --git a/src/six.py b/src/six.py
new file mode 100644
index 0000000000..85898ec712
--- /dev/null
+++ b/src/six.py
@@ -0,0 +1,577 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+# Copyright (c) 2010-2013 Benjamin Peterson
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.4.1"
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+        del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result)
+        # This is a bit ugly, but it avoids running this again.
+        delattr(tp, self.name)
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+
+class _MovedItems(types.ModuleType):
+    """Lazy loading of moved objects"""
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("UserString", "UserString", "collections"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("winreg", "_winreg"),
+]
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+del attr
+
+moves = sys.modules[__name__ + ".moves"] = _MovedItems(__name__ + ".moves")
+
+
+
+class Module_six_moves_urllib_parse(types.ModuleType):
+    """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("quote", "urllib", "urllib.parse"),
+    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("urlencode", "urllib", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+    setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+sys.modules[__name__ + ".moves.urllib_parse"] = Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse")
+sys.modules[__name__ + ".moves.urllib.parse"] = Module_six_moves_urllib_parse(__name__ + ".moves.urllib.parse")
+
+
+class Module_six_moves_urllib_error(types.ModuleType):
+    """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+    MovedAttribute("URLError", "urllib2", "urllib.error"),
+    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+    setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+sys.modules[__name__ + ".moves.urllib_error"] = Module_six_moves_urllib_error(__name__ + ".moves.urllib_error")
+sys.modules[__name__ + ".moves.urllib.error"] = Module_six_moves_urllib_error(__name__ + ".moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(types.ModuleType):
+    """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+    MovedAttribute("urlopen", "urllib2", "urllib.request"),
+    MovedAttribute("install_opener", "urllib2", "urllib.request"),
+    MovedAttribute("build_opener", "urllib2", "urllib.request"),
+    MovedAttribute("pathname2url", "urllib", "urllib.request"),
+    MovedAttribute("url2pathname", "urllib", "urllib.request"),
+    MovedAttribute("getproxies", "urllib", "urllib.request"),
+    MovedAttribute("Request", "urllib2", "urllib.request"),
+    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+    MovedAttribute("URLopener", "urllib", "urllib.request"),
+    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+    setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+sys.modules[__name__ + ".moves.urllib_request"] = Module_six_moves_urllib_request(__name__ + ".moves.urllib_request")
+sys.modules[__name__ + ".moves.urllib.request"] = Module_six_moves_urllib_request(__name__ + ".moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(types.ModuleType):
+    """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+    MovedAttribute("addbase", "urllib", "urllib.response"),
+    MovedAttribute("addclosehook", "urllib", "urllib.response"),
+    MovedAttribute("addinfo", "urllib", "urllib.response"),
+    MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+    setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+sys.modules[__name__ + ".moves.urllib_response"] = Module_six_moves_urllib_response(__name__ + ".moves.urllib_response")
+sys.modules[__name__ + ".moves.urllib.response"] = Module_six_moves_urllib_response(__name__ + ".moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(types.ModuleType):
+    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+sys.modules[__name__ + ".moves.urllib_robotparser"] = Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib_robotparser")
+sys.modules[__name__ + ".moves.urllib.robotparser"] = Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+    parse = sys.modules[__name__ + ".moves.urllib_parse"]
+    error = sys.modules[__name__ + ".moves.urllib_error"]
+    request = sys.modules[__name__ + ".moves.urllib_request"]
+    response = sys.modules[__name__ + ".moves.urllib_response"]
+    robotparser = sys.modules[__name__ + ".moves.urllib_robotparser"]
+
+
+sys.modules[__name__ + ".moves.urllib"] = Module_six_moves_urllib(__name__ + ".moves.urllib")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_closure = "__closure__"
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
+
+    _iterkeys = "keys"
+    _itervalues = "values"
+    _iteritems = "items"
+    _iterlists = "lists"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_closure = "func_closure"
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
+
+    _iterkeys = "iterkeys"
+    _itervalues = "itervalues"
+    _iteritems = "iteritems"
+    _iterlists = "iterlists"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    create_bound_method = types.MethodType
+
+    Iterator = object
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    def create_bound_method(func, obj):
+        return types.MethodType(func, obj, obj.__class__)
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
+
+
+def iterkeys(d, **kw):
+    """Return an iterator over the keys of a dictionary."""
+    return iter(getattr(d, _iterkeys)(**kw))
+
+def itervalues(d, **kw):
+    """Return an iterator over the values of a dictionary."""
+    return iter(getattr(d, _itervalues)(**kw))
+
+def iteritems(d, **kw):
+    """Return an iterator over the (key, value) pairs of a dictionary."""
+    return iter(getattr(d, _iteritems)(**kw))
+
+def iterlists(d, **kw):
+    """Return an iterator over the (key, [values]) pairs of a dictionary."""
+    return iter(getattr(d, _iterlists)(**kw))
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+    def u(s):
+        return s
+    unichr = chr
+    if sys.version_info[1] <= 1:
+        def int2byte(i):
+            return bytes((i,))
+    else:
+        # This is about 2x faster than the implementation above on 3.2+
+        int2byte = operator.methodcaller("to_bytes", 1, "big")
+    byte2int = operator.itemgetter(0)
+    indexbytes = operator.getitem
+    iterbytes = iter
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+else:
+    def b(s):
+        return s
+    def u(s):
+        return unicode(s, "unicode_escape")
+    unichr = unichr
+    int2byte = chr
+    def byte2int(bs):
+        return ord(bs[0])
+    def indexbytes(buf, i):
+        return ord(buf[i])
+    def iterbytes(buf):
+        return (ord(byte) for byte in buf)
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+if PY3:
+    import builtins
+    exec_ = getattr(builtins, "exec")
+
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+
+    print_ = getattr(builtins, "print")
+    del builtins
+
+else:
+    def exec_(_code_, _globs_=None, _locs_=None):
+        """Execute code in a namespace."""
+        if _globs_ is None:
+            frame = sys._getframe(1)
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
+            del frame
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
+
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+    def print_(*args, **kwargs):
+        """The new-style print function."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+
+_add_doc(reraise, """Reraise an exception.""")
+
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    return meta("NewBase", bases, {})
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        for slots_var in orig_vars.get('__slots__', ()):
+            orig_vars.pop(slots_var)
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper

From 54508172a4999c43fa7f18b631d0c3480a1fb87a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 12:01:11 +0530
Subject: [PATCH 1075/1154] DOCX Input: Support linked images

DOCX Input: Support linked (as opposed to embedded) images, if the
linked image is found on the local computer. Fixes #1243597 [MS Word linked pictures don't get converted](https://bugs.launchpad.net/calibre/+bug/1243597)
---
 src/calibre/ebooks/docx/images.py | 36 ++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/docx/images.py b/src/calibre/ebooks/docx/images.py
index 4c0c8c8b6d..bda3eb0d32 100644
--- a/src/calibre/ebooks/docx/images.py
+++ b/src/calibre/ebooks/docx/images.py
@@ -10,10 +10,17 @@ import os
 
 from lxml.html.builder import IMG, HR
 
+from calibre.constants import iswindows
 from calibre.ebooks.docx.names import XPath, get, barename
 from calibre.utils.filenames import ascii_filename
 from calibre.utils.imghdr import what
 
+class LinkedImageNotFound(ValueError):
+
+    def __init__(self, fname):
+        ValueError.__init__(self, fname)
+        self.fname = fname
+
 def emu_to_pt(x):
     return x / 12700
 
@@ -107,7 +114,16 @@ class Images(object):
         fname = rid_map[rid]
         if fname in self.used:
             return self.used[fname]
-        raw = self.docx.read(fname)
+        if fname.startswith('file://'):
+            src = fname[len('file://'):]
+            if iswindows and src and src[0] == '/':
+                src = src[1:]
+            if not src or not os.path.exists(src):
+                raise LinkedImageNotFound(src)
+            with open(src, 'rb') as rawsrc:
+                raw = rawsrc.read()
+        else:
+            raw = self.docx.read(fname)
         base = base or ascii_filename(rid_map[rid].rpartition('/')[-1]).replace(' ', '_') or 'image'
         ext = what(None, raw) or base.rpartition('.')[-1] or 'jpeg'
         if ext == 'emf':
@@ -155,10 +171,16 @@ class Images(object):
             if name:
                 name = ascii_filename(name).replace(' ', '_')
             alt = pr.get('descr', None)
-            for a in XPath('descendant::a:blip[@r:embed]')(pic):
+            for a in XPath('descendant::a:blip[@r:embed or @r:link]')(pic):
                 rid = get(a, 'r:embed')
-                if rid in self.rid_map:
-                    src = self.generate_filename(rid, name)
+                if not rid:
+                    rid = get(a, 'r:link')
+                if rid and rid in self.rid_map:
+                    try:
+                        src = self.generate_filename(rid, name)
+                    except LinkedImageNotFound as err:
+                        self.log.warn('Linked image: %s not found, ignoring' % err.fname)
+                        continue
                     img = IMG(src='images/%s' % src)
                     img.set('alt', alt or 'Image')
                     if link is not None:
@@ -211,7 +233,11 @@ class Images(object):
         for imagedata in XPath('descendant::v:imagedata[@r:id]')(pict):
             rid = get(imagedata, 'r:id')
             if rid in self.rid_map:
-                src = self.generate_filename(rid)
+                try:
+                    src = self.generate_filename(rid)
+                except LinkedImageNotFound as err:
+                    self.log.warn('Linked image: %s not found, ignoring' % err.fname)
+                    continue
                 img = IMG(src='images/%s' % src, style="display:block")
                 alt = get(imagedata, 'o:title')
                 img.set('alt', alt or 'Image')

From 795ae4e84f323411a749b7ba77e818511509b4ad Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 12:37:36 +0530
Subject: [PATCH 1076/1154] Nicer duplicate list when automerging books on add

When automerging books during during an add, include the author as well
as the title in the report of merged books.
---
 src/calibre/gui2/actions/add.py | 18 +++++++++++++-----
 src/calibre/gui2/add.py         |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index c5a778f965..afdbb46260 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -7,6 +7,7 @@ __docformat__ = 'restructuredtext en'
 
 import os
 from functools import partial
+from collections import defaultdict
 
 from PyQt4.Qt import QPixmap, QTimer
 
@@ -19,7 +20,8 @@ from calibre.gui2.dialogs.progress import ProgressDialog
 from calibre.gui2.widgets import IMAGE_EXTENSIONS
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.utils.filenames import ascii_filename
-from calibre.constants import preferred_encoding, filesystem_encoding
+from calibre.utils.icu import sort_key
+from calibre.constants import filesystem_encoding
 from calibre.gui2.actions import InterfaceAction
 from calibre.gui2 import question_dialog
 from calibre.ebooks.metadata import MetaInformation
@@ -358,15 +360,21 @@ class AddAction(InterfaceAction):
             self.gui.tags_view.recount()
 
         if getattr(self._adder, 'merged_books', False):
-            books = u'\n'.join([x if isinstance(x, unicode) else
-                    x.decode(preferred_encoding, 'replace') for x in
-                    self._adder.merged_books])
+            merged = defaultdict(list)
+            for title, author in self._adder.merged_books:
+                merged[author].append(title)
+            lines = []
+            for author in sorted(merged, key=sort_key):
+                lines.append(author)
+                for title in sorted(merged[author], key=sort_key):
+                    lines.append('\t' + title)
+                lines.append('')
             info_dialog(self.gui, _('Merged some books'),
                 _('The following %d duplicate books were found and incoming '
                     'book formats were processed and merged into your '
                     'Calibre database according to your automerge '
                     'settings:')%len(self._adder.merged_books),
-                    det_msg=books, show=True)
+                    det_msg='\n'.join(lines), show=True)
 
         if getattr(self._adder, 'number_of_books_added', 0) > 0 or \
                 getattr(self._adder, 'merged_books', False):
diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py
index 826a369a14..d9e075b179 100644
--- a/src/calibre/gui2/add.py
+++ b/src/calibre/gui2/add.py
@@ -189,7 +189,7 @@ class DBAdder(QObject):  # {{{
             if prefs['add_formats_to_existing']:  # automerge is on
                 identical_book_list = self.db.find_identical_books(mi)
                 if identical_book_list:  # books with same author and nearly same title exist in db
-                    self.merged_books.add(mi.title)
+                    self.merged_books.add((mi.title, ' & '.join(mi.authors)))
                     seen_fmts = set([])
 
                     for identical_book in identical_book_list:

From 238be8d5c0e4549fb8b74513e87c53f3ed7065bb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 13:45:47 +0530
Subject: [PATCH 1077/1154] PDF Output: Fix rendering of translucent images

PDF Output: Fix rendering of semi-transparent images. All
semi-transparent images are now rendered using soft masks. Fixes #1243829 [Images in PDF conversion corrupted](https://bugs.launchpad.net/calibre/+bug/1243829)
---
 src/calibre/ebooks/pdf/render/serialize.py | 46 ++++++++++------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/calibre/ebooks/pdf/render/serialize.py b/src/calibre/ebooks/pdf/render/serialize.py
index 4630afca86..e38944820a 100644
--- a/src/calibre/ebooks/pdf/render/serialize.py
+++ b/src/calibre/ebooks/pdf/render/serialize.py
@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
 import hashlib
 from future_builtins import map
 
-from PyQt4.Qt import QBuffer, QByteArray, QImage, Qt, QColor, qRgba
+from PyQt4.Qt import QBuffer, QByteArray, QImage, Qt, QColor, qRgba, QPainter
 
 from calibre.constants import (__appname__, __version__)
 from calibre.ebooks.pdf.render.common import (
@@ -418,41 +418,35 @@ class PDFStream(object):
             data = image.constBits().asstring(bytes_per_line * h)
             return self.write_image(data, w, h, d, cache_key=cache_key)
 
-        ba = QByteArray()
-        buf = QBuffer(ba)
-        image.save(buf, 'jpeg', 94)
-        data = bytes(ba.data())
-        has_alpha = has_mask = False
-        soft_mask = mask = None
+        has_alpha = False
+        soft_mask = None
 
         if fmt == QImage.Format_ARGB32:
             tmask = image.constBits().asstring(4*w*h)[self.alpha_bit::4]
             sdata = bytearray(tmask)
             vals = set(sdata)
-            vals.discard(255)
-            has_mask = bool(vals)
-            vals.discard(0)
+            vals.discard(255)  # discard opaque pixels
             has_alpha = bool(vals)
+            if has_alpha:
+                # Blend image onto a white background as otherwise Qt will render
+                # transparent pixels as black
+                background = QImage(image.size(), QImage.Format_ARGB32_Premultiplied)
+                background.fill(Qt.white)
+                painter = QPainter(background)
+                painter.drawImage(0, 0, image)
+                painter.end()
+                image = background
+
+        ba = QByteArray()
+        buf = QBuffer(ba)
+        image.save(buf, 'jpeg', 94)
+        data = bytes(ba.data())
 
         if has_alpha:
             soft_mask = self.write_image(tmask, w, h, 8)
-        elif has_mask:
-            # dither the soft mask to 1bit and add it. This also helps PDF
-            # viewers without transparency support
-            bytes_per_line = (w + 7) >> 3
-            mdata = bytearray(0 for i in xrange(bytes_per_line * h))
-            spos = mpos = 0
-            for y in xrange(h):
-                for x in xrange(w):
-                    if sdata[spos]:
-                        mdata[mpos + x>>3] |= (0x80 >> (x&7))
-                    spos += 1
-                mpos += bytes_per_line
-            mdata = bytes(mdata)
-            mask = self.write_image(mdata, w, h, 1)
 
-        return self.write_image(data, w, h, 32, mask=mask, dct=True,
-                                    soft_mask=soft_mask, cache_key=cache_key)
+        return self.write_image(data, w, h, 32, dct=True,
+                                soft_mask=soft_mask, cache_key=cache_key)
 
     def add_pattern(self, pattern):
         if pattern.cache_key not in self.pattern_cache:

From b9bfb53fa2bfe17aa6fcf2400df6c11c950dcd45 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 14:15:37 +0530
Subject: [PATCH 1078/1154] Add a pointer to the launchpad bug tracker in the
 README

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 2e2130bb42..ad09fe71aa 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,10 @@ Development
 
 A [tarball of the source code](http://status.calibre-ebook.com/dist/src) for the 
 current calibre release.
+
+Bugs
+------
+
+Bug reports and feature requests should be made in the calibre bug tracker at [launchpad](https://bugs.launchpad.net/calibre).
+The GitHub bug tracker is only for people contributing code to calibre.
+

From 39701cdaa870407d1a09ea8ca242271a6b2e54a1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 24 Oct 2013 14:31:48 +0530
Subject: [PATCH 1079/1154] Conversion: When converting TXT set <title> in HTML
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TXT Input: Ensure that <title> in the generated HTML has a
meaningful value. Fixes #1236923 [txt → epub When I don't give a title, the <title> tag is set to unknown. It should default to the chapter name and chapter ID for each fragment. Or use the name of the converted file](https://bugs.launchpad.net/calibre/+bug/1236923)
---
 src/calibre/ebooks/conversion/plugins/txt_input.py | 9 +++++++++
 src/calibre/ebooks/metadata/txt.py                 | 9 ++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/txt_input.py b/src/calibre/ebooks/conversion/plugins/txt_input.py
index 4f73a067a6..5cab2a1a96 100644
--- a/src/calibre/ebooks/conversion/plugins/txt_input.py
+++ b/src/calibre/ebooks/conversion/plugins/txt_input.py
@@ -236,5 +236,14 @@ class TXTInput(InputFormatPlugin):
         from calibre.ebooks.oeb.transforms.metadata import meta_info_to_oeb_metadata
         mi = get_file_type_metadata(stream, file_ext)
         meta_info_to_oeb_metadata(mi, oeb.metadata, log)
+        self.html_postprocess_title = mi.title
 
         return oeb
+
+    def postprocess_book(self, oeb, opts, log):
+        for item in oeb.spine:
+            if hasattr(item.data, 'xpath'):
+                for title in item.data.xpath('//*[local-name()="title"]'):
+                    if title.text == _('Unknown'):
+                        title.text = self.html_postprocess_title
+
diff --git a/src/calibre/ebooks/metadata/txt.py b/src/calibre/ebooks/metadata/txt.py
index 70d3c72ae0..9140fb6f61 100644
--- a/src/calibre/ebooks/metadata/txt.py
+++ b/src/calibre/ebooks/metadata/txt.py
@@ -7,7 +7,7 @@ __copyright__ = '2009, John Schember <john@nachtimwald.com>'
 Read meta information from TXT files
 '''
 
-import re
+import re, os
 
 from calibre.ebooks.metadata import MetaInformation
 
@@ -15,7 +15,10 @@ def get_metadata(stream, extract_cover=True):
     '''
     Return metadata as a L{MetaInfo} object
     '''
-    mi = MetaInformation(_('Unknown'), [_('Unknown')])
+    name = getattr(stream, 'name', '').rpartition('.')[0]
+    if name:
+        name = os.path.basename(name)
+    mi = MetaInformation(name or _('Unknown'), [_('Unknown')])
     stream.seek(0)
 
     mdata = u''
@@ -29,7 +32,7 @@ def get_metadata(stream, extract_cover=True):
     mdata = mdata[:100]
 
     mo = re.search('(?u)^[ ]*(?P<title>.+)[ ]*(\n{3}|(\r\n){3}|\r{3})[ ]*(?P<author>.+)[ ]*(\n|\r\n|\r)$', mdata)
-    if mo != None:
+    if mo is not None:
         mi.title = mo.group('title')
         mi.authors = mo.group('author').split(',')
 

From f40c1895152ba78ae51d06b581b75e06ce2878fa Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Thu, 24 Oct 2013 06:55:59 -0600
Subject: [PATCH 1080/1154] Disable 'Connect to iTunes' when OS X >= 10.9

---
 src/calibre/gui2/actions/device.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py
index 364a0486b2..9be6765cff 100644
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@@ -12,7 +12,7 @@ from PyQt4.Qt import QToolButton, QMenu, pyqtSignal, QIcon, QTimer
 from calibre.gui2.actions import InterfaceAction
 from calibre.utils.smtp import config as email_config
 from calibre.utils.config import tweaks
-from calibre.constants import iswindows, isosx
+from calibre.constants import iswindows, isosx, get_osx_version
 from calibre.customize.ui import is_disabled
 from calibre.devices.bambook.driver import BAMBOOK
 from calibre.gui2.dialogs.smartdevice import SmartdeviceDialog
@@ -44,7 +44,8 @@ class ShareConnMenu(QMenu):  # {{{
         mitem.setEnabled(True)
         mitem.triggered.connect(lambda x : self.connect_to_itunes.emit())
         self.connect_to_itunes_action = mitem
-        if not (iswindows or isosx):
+        osxv = get_osx_version()
+        if not (iswindows or isosx) or (osxv.major == 10 and osxv.minor >= 9) or osxv.major > 10:
             mitem.setVisible(False)
         mitem = self.addAction(QIcon(I('devices/bambook.png')), _('Connect to Bambook'))
         mitem.setEnabled(True)

From 37e969502b0fbd9ff9db47c6dee2404e37605e26 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 08:33:51 +0530
Subject: [PATCH 1081/1154] Add debug output for 32bit calibre on 64bit windows

---
 src/calibre/debug.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 043d425c14..327e4024aa 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -150,6 +150,13 @@ def print_basic_debug_info(out=None):
     out(__appname__, get_version(), 'Portable' if isportable else '',
         'isfrozen:', isfrozen, 'is64bit:', is64bit)
     out(platform.platform(), platform.system(), platform.architecture())
+    if iswindows and not is64bit:
+        try:
+            import win32process
+            if win32process.IsWow64Process():
+                out('32bit process running on 64bit windows')
+        except:
+            pass
     out(platform.system_alias(platform.system(), platform.release(),
             platform.version()))
     out('Python', platform.python_version())

From 9ea3b6b3980230bb68836a2dc78a3b3b3458423b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 08:52:37 +0530
Subject: [PATCH 1082/1154] version 1.8

---
 Changelog.yaml           | 60 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 0d29ea91a2..da03033cb9 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,66 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.8.0
+  date: 2013-10-25
+
+  new features:
+    - title: "DOCX Input: Support linked (as opposed to embedded) images, if the linked image is found on the local computer."
+      tickets: [1243597]
+
+    - title: 'FB2 Input: Add support for note and cite back references. Link pairs of type="note" and type="cite" now automatically generate the correct back reference.'
+      tickets: [1243714]
+
+    - title: "When automerging books during during an add, include the author as well as the title in the report of merged books."
+
+    - title: "OS X Mavericks (10.9) breaks connecting to iTunes and iBooks on iOS devices. For more details see: http://www.mobileread.com/forums/showthread.php?t=215624"
+ 
+  bug fixes:
+    - title: "OS X: Fix system tray notifications causing crashes on some OS X 10.9 (Mavericks) systems (those that had Growl installed at some point)."
+      tickets: [1224491]
+
+    - title: "OSX: Fix font size in completion popups too small on Mavericks (I hope)"
+      tickets: [1243761]
+
+    - title: "PDF Output: Fix rendering of some semi-transparent images. All semi-transparent images are now rendered using soft masks."
+      tickets: [1243829]
+
+    - title: "MOBI Output: Fix text marked with white-space:pre-wrap causing the Kindle to break lines at arbitrary points inside words."
+      tickets: [1240235]
+
+    - title: "FB2 Input: Fix a regression that broke conversion of FB2 files with paragraphs having both a style and an id attribute."
+      tickets: [1243709]
+
+    - title: "TXT Input: Ensure that <title> in the generated HTML has a meaningful value."
+      tickets: [1236923]
+
+    - title: "Book details panel: Fix HTML in author names and identifiers not being escaped"
+      tickets: [1243976]
+
+    - title: "HTML 5 parsing: Fix handling of xml:lang attributes on all elements xml:lang is now mapped to a plain lang on all elements, not just <html>"
+
+    - title: "Update HTML 5 parser used in calibre (html5lib-python) to fix a few corner cases"
+
+    - title: "When bulk deleting formats, use a single temporary directory for the deleted files. This makes restoring them from the recycle bin a little cleaner. Also might fix the reported issue with the windows recycle bin choking on creating a large number of folders."
+
+    - title: "DOCX Input: Add support for hyperlink fields that have only anchors and not URLs"
+
+    - title: "DOCX Input: Fix handling of multiple block level bookmarks at the same location."
+      tickets: [1241451]
+
+    - title: "HTMLZ Output: Fix Htmlz does not apply inline css from <body>."
+      tickets: [1242261]
+
+    - title: "Fix the restore database operation failing on windows installs with long usernames (this would cause the path to the temporary folder used to restore the database to become too long)."
+
+    - title: "ODT Input: Various workarounds for broken ODT files generated my mk4ht"
+
+    - title: "Fix a bug with non-ascii text in the create catalog dialog"
+      ticket: [1241515]
+
+  improved recipes:
+    - A List Apart
+
 - version: 1.7.0
   date: 2013-10-18
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index ad728b7712..4056ab39b0 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 7, 0)
+numeric_version = (1, 8, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

From 1326dfe243e0f248ac8f33e46af19783c24a4ed5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 08:55:37 +0530
Subject: [PATCH 1083/1154] ...

---
 src/calibre/db/backend.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index 1b87da8548..259297ab20 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -317,8 +317,8 @@ class DB(object):
 
         if iswindows and len(self.library_path) + 4*self.PATH_LIMIT + 10 > 259:
             raise ValueError(_(
-                'Path to library (%s) too long. Must be less than'
-                ' %d characters.')%(self.library_path, 259-4*self.PATH_LIMIT-10))
+                'Path to library ({0}) too long. Must be less than'
+                ' {1} characters.').format(self.library_path, 259-4*self.PATH_LIMIT-10))
         exists = self._exists = os.path.exists(self.dbpath)
         if not exists:
             # Be more strict when creating new libraries as the old calculation

From a6567a7c036564aa7bcd572327ae81f53d04bf45 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 09:01:29 +0530
Subject: [PATCH 1084/1154] linux freeze: Handle six.py

---
 setup/installer/linux/freeze2.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index b2e809e7ff..6b9c101b7e 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -189,8 +189,11 @@ class LinuxFreeze(Command):
                 raise ValueError('%s does not exist in site-packages' % x)
 
         for x in os.listdir(self.SRC):
-            shutil.copytree(self.j(self.SRC, x), self.j(dest, x),
-                    ignore=ignore_in_lib)
+            if os.path.isdir(self.j(self.SRC, x)):
+                shutil.copytree(self.j(self.SRC, x), self.j(dest, x),
+                        ignore=ignore_in_lib)
+            else:
+                shutil.copy2(self.j(self.SRC, x), self.j(dest, x))
         for x in ('trac',):
             x = self.j(dest, 'calibre', x)
             if os.path.exists(x):

From 7460eaf760f0a442ff6eab100d7918ff4375d683 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Fri, 25 Oct 2013 10:01:13 +0200
Subject: [PATCH 1085/1154] Fix cache bug that prevented recognizing different
 formats of the same book as being on the device. Also add an option to
 disable the cache.

---
 .../devices/smart_device_app/driver.py        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 7ec8feae52..533e38ce77 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -310,6 +310,12 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
               'to resend metadata to the device, either by changing '
               'the metadata for the book (updating the last modification '
               'time) or resending the book itself.') + '</p>',
+        _('Use metadata cache') + ':::<p>' +
+            _('Setting this option allows calibre to keep a copy of metadata '
+              'on the device, speeding up device connections. Unsetting this '
+              'option disables keeping the copy, forcing the device to send '
+              'metadata to calibre on every connect. Unset this option if '
+              'you think that the cache might not be operating correctly.') + '</p>',
         ]
     EXTRA_CUSTOMIZATION_DEFAULT = [
                 False, '',
@@ -318,7 +324,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                 False, '',
                 '',    '',
                 True,  '',
-                True,   '75'
+                True,   '75',
+                True
     ]
     OPT_AUTOSTART               = 0
     OPT_PASSWORD                = 2
@@ -330,6 +337,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     OPT_FORCE_IP_ADDRESS        = 11
     OPT_OVERWRITE_BOOKS_UUID    = 12
     OPT_COMPRESSION_QUALITY     = 13
+    OPT_USE_METADATA_CACHE      = 14
 
     def __init__(self, path):
         self.sync_lock = threading.RLock()
@@ -972,6 +980,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             self._debug('Device can delete multiple books', self.client_can_delete_multiple)
             self.client_can_use_metadata_cache = result.get('canUseCachedMetadata', False)
             self._debug('Device can use cached metadata', self.client_can_use_metadata_cache)
+            if not self.settings().extra_customization[self.OPT_USE_METADATA_CACHE]:
+                self.client_can_use_metadata_cache = False
+                self._debug('metadata caching disabled by option')
 
             self.client_device_kind = result.get('deviceKind', '')
             self._debug('Client device kind', self.client_device_kind)
@@ -1135,19 +1146,19 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             will_use_cache = self.client_can_use_metadata_cache
 
             if will_use_cache:
-                books_on_device = {}
+                books_on_device = []
                 self._debug('caching. count=', count)
                 for i in range(0, count):
                     opcode, result = self._receive_from_client(print_debug_info=False)
-                    books_on_device[result.get('uuid')] = result
+                    books_on_device.append(result)
 
                 books_to_send = []
-                for u,v in books_on_device.iteritems():
-                    book = self._metadata_in_cache(u, v['extension'], v['last_modified'])
+                for r in books_on_device:
+                    book = self._metadata_in_cache(r['uuid'], r['extension'], r['last_modified'])
                     if book:
                         bl.add_book(book, replace_metadata=True)
                     else:
-                        books_to_send.append(v['priKey'])
+                        books_to_send.append(r['priKey'])
 
                 count = len(books_to_send)
                 self._debug('caching. Need count from device', count)

From 7360075e04e25e3bff31a22d86a1471597ee20c9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 15:59:30 +0530
Subject: [PATCH 1086/1154] Update Science Based News

---
 recipes/science_based_medicine.recipe | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/recipes/science_based_medicine.recipe b/recipes/science_based_medicine.recipe
index 7aa28cb170..352f42452f 100644
--- a/recipes/science_based_medicine.recipe
+++ b/recipes/science_based_medicine.recipe
@@ -1,8 +1,6 @@
 #!/usr/bin/env  python
 
-import re
 from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import Tag
 
 class SBM(BasicNewsRecipe):
     title                 = 'Science Based Medicine'
@@ -12,6 +10,7 @@ class SBM(BasicNewsRecipe):
     max_articles_per_feed = 15
     no_stylesheets        = True
     use_embedded_content  = False
+    auto_cleanup = True
     encoding              = 'utf-8'
     publisher             = 'SBM'
     category              = 'science, sbm, ebm, blog, pseudoscience'
@@ -27,16 +26,16 @@ class SBM(BasicNewsRecipe):
                         , 'pretty_print'     : True
                         }
 
-    keep_only_tags = [
-                      dict(name='a', attrs={'title':re.compile(r'Posts by.*', re.DOTALL|re.IGNORECASE)}),
-                      dict(name='div', attrs={'class':'entry'})
-                      ]
+    # keep_only_tags = [
+                      #dict(name='a', attrs={'title':re.compile(r'Posts by.*', re.DOTALL|re.IGNORECASE)}),
+                      #dict(name='div', attrs={'class':'entry'})
+                      #]
 
     feeds = [(u'Science Based Medicine', u'http://www.sciencebasedmedicine.org/?feed=rss2')]
 
-    def preprocess_html(self, soup):
-        mtag = Tag(soup,'meta',[('http-equiv','Content-Type'),('context','text/html; charset=utf-8')])
-        soup.head.insert(0,mtag)
-        soup.html['lang'] = self.lang
-        return self.adeify_images(soup)
+    # def preprocess_html(self, soup):
+        #mtag = Tag(soup,'meta',[('http-equiv','Content-Type'),('context','text/html; charset=utf-8')])
+        # soup.head.insert(0,mtag)
+        #soup.html['lang'] = self.lang
+        # return self.adeify_images(soup)
 

From ae285264c53e1a14e5e3df66cbfe3d9895532b12 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 16:17:35 +0530
Subject: [PATCH 1087/1154] Update dotNet Magazine

---
 recipes/dot_net.recipe | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/recipes/dot_net.recipe b/recipes/dot_net.recipe
index 6b39b8c97e..33c53d4757 100644
--- a/recipes/dot_net.recipe
+++ b/recipes/dot_net.recipe
@@ -11,30 +11,31 @@ class dotnetMagazine (BasicNewsRecipe):
     no_stylesheets        = True
     encoding              = 'utf8'
     use_embedded_content  = False
+    auto_cleanup = True
     # recursion = 1
     language              = 'en'
     remove_empty_feeds    = True
     extra_css             = ' body{font-family: Arial,Helvetica,sans-serif } img{margin-bottom: 0.4em} '
     cover_url = u'http://media.netmagazine.futurecdn.net/sites/all/themes/netmag/logo.png'
 
-    remove_tags_after = dict(name='footer', id=lambda x:not x)
-    remove_tags_before = dict(name='header', id=lambda x:not x)
+    #remove_tags_after = dict(name='footer', id=lambda x:not x)
+    #remove_tags_before = dict(name='header', id=lambda x:not x)
 
-    remove_tags = [
-         dict(name='div', attrs={'class': 'item-list'}),
-         dict(name='h4', attrs={'class': 'std-hdr'}),
-         dict(name='div', attrs={'class': 'item-list share-links'}),  # removes share links
-         dict(name=['script', 'noscript']),
-         dict(name='div', attrs={'id': 'comments-form'}),  # comment these out if you want the comments to show
-         dict(name='div', attrs={'id': re.compile('advertorial_block_($|| )')}),
-         dict(name='div', attrs={'id': 'right-col'}),
-         dict(name='div', attrs={'id': 'comments'}),  # comment these out if you want the comments to show
-         dict(name='div', attrs={'class': 'item-list related-content'}),
+    #remove_tags = [
+         #dict(name='div', attrs={'class': 'item-list'}),
+         #dict(name='h4', attrs={'class': 'std-hdr'}),
+         #dict(name='div', attrs={'class': 'item-list share-links'}),  # removes share links
+         #dict(name=['script', 'noscript']),
+         #dict(name='div', attrs={'id': 'comments-form'}),  # comment these out if you want the comments to show
+         #dict(name='div', attrs={'id': re.compile('advertorial_block_($|| )')}),
+         #dict(name='div', attrs={'id': 'right-col'}),
+         #dict(name='div', attrs={'id': 'comments'}),  # comment these out if you want the comments to show
+         #dict(name='div', attrs={'class': 'item-list related-content'}),
 
-         ]
+         #]
 
     feeds = [
-               (u'net', u'http://feeds.feedburner.com/net/topstories?format=xml')
+               (u'net', u'http://feeds.feedburner.com/creativebloq/')
             ]
 
     def skip_ad_pages(self, soup):

From c83d9e245c9edadad4c6789c62160d881133fd3b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 16:20:18 +0530
Subject: [PATCH 1088/1154] Update MIT Technology Review

---
 recipes/technology_review.recipe | 56 +++++---------------------------
 1 file changed, 9 insertions(+), 47 deletions(-)

diff --git a/recipes/technology_review.recipe b/recipes/technology_review.recipe
index e7cc6700d7..089f5b00d0 100644
--- a/recipes/technology_review.recipe
+++ b/recipes/technology_review.recipe
@@ -1,4 +1,3 @@
-import string
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class TechnologyReview(BasicNewsRecipe):
@@ -11,56 +10,19 @@ class TechnologyReview(BasicNewsRecipe):
     oldest_article = 14
     max_articles_per_feed = 100
     No_stylesheets = True
+    auto_cleanup = True
     extra_css = """
     .ArticleBody {font: normal; text-align: justify}
     .headline {font: bold x-large}
     .subheadline {font: italic large}
     """
     feeds = [
-	(u'Computing', u'http://feeds.technologyreview.com/technology_review_Computing'),
-	(u'Web', u'http://feeds.technologyreview.com/technology_review_Web'),
-	(u'Communications', u'http://feeds.technologyreview.com/technology_review_Communications'),
-	(u'Energy', u'http://feeds.technologyreview.com/technology_review_Energy'),
-	(u'Materials', u'http://feeds.technologyreview.com/technology_review_Materials'),
-	(u'Biomedicine', u'http://feeds.technologyreview.com/technology_review_Biotech'),
-	(u'Business', u'http://feeds.technologyreview.com/technology_review_Biztech')
-	]
-    remove_attributes = ['width', 'align','cellspacing']
+        (u'Computing', u'http://feeds.technologyreview.com/technology_review_Computing'),
+        (u'Web', u'http://feeds.technologyreview.com/technology_review_Web'),
+        (u'Communications', u'http://feeds.technologyreview.com/technology_review_Communications'),
+        (u'Energy', u'http://feeds.technologyreview.com/technology_review_Energy'),
+        (u'Materials', u'http://feeds.technologyreview.com/technology_review_Materials'),
+        (u'Biomedicine', u'http://feeds.technologyreview.com/technology_review_Biotech'),
+        (u'Business', u'http://feeds.technologyreview.com/technology_review_Biztech')
+    ]
 
-    remove_tags = [
-                    dict(name='div', attrs={'id':['CloseLink','footerAdDiv','copyright']}),
-                         ]
-    remove_tags_after = [dict(name='div', attrs={'id':'copyright'})]
-
-    def get_article_url(self, article):
-        return article.get('guid', article.get('id', None))
-
-    def print_version(self, url):
-        baseurl='http://www.technologyreview.com/printer_friendly_article.aspx?id='
-        split1 = string.split(url,"/")
-        xxx=split1 [4]
-        split2= string.split(xxx,"/")
-        s =  baseurl + split2[0]
-        return s
-
-
-    def postprocess_html(self,soup, True):
-        #remove picture
-        headerhtml = soup.find(True, {'class':'header'})
-        headerhtml.replaceWith("")
-
-        #remove close button
-        closehtml = soup.find(True, {'class':'close'})
-        closehtml.replaceWith("")
-
-        #remove banner advertisement
-        bannerhtml = soup.find(True, {'class':'bannerad'})
-        bannerhtml.replaceWith("")
-
-        #thanks kiklop74!  This code removes all links from the text
-        for alink in soup.findAll('a'):
-            if alink.string is not None:
-               tstr = alink.string
-               alink.replaceWith(tstr)
-
-        return soup

From 395eba9518df2ec2506ef2625685ce675773c144 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 17:02:07 +0530
Subject: [PATCH 1089/1154] Update Reuters (Japan)

---
 recipes/reuters_ja.recipe | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/recipes/reuters_ja.recipe b/recipes/reuters_ja.recipe
index ffa084bc88..d7c895cf36 100644
--- a/recipes/reuters_ja.recipe
+++ b/recipes/reuters_ja.recipe
@@ -1,37 +1,22 @@
 from calibre.web.feeds.news import BasicNewsRecipe
-import re
+
 
 class ReutersJa(BasicNewsRecipe):
 
     title = 'Reuters(Japan)'
     description = 'Global news in Japanese'
     __author__ = 'Hiroshi Miura'
-    use_embedded_content   = False
+    use_embedded_content = False
     language = 'ja'
     max_articles_per_feed = 10
     remove_javascript = True
+    auto_cleanup = True
 
-    feeds = [ ('Top Stories', 'http://feeds.reuters.com/reuters/JPTopNews?format=xml'),
-                  ('World News', 'http://feeds.reuters.com/reuters/JPWorldNews?format=xml'),
-                  ('Business News', 'http://feeds.reuters.com/reuters/JPBusinessNews?format=xml'),
-                  ('Technology News', 'http://feeds.reuters.com/reuters/JPTechnologyNews?format=xml'),
-                  ('Oddly Enough News', 'http://feeds.reuters.com/reuters/JPOddlyEnoughNews?format=xml')
-         ]
-
-    remove_tags_before = {'class':"article primaryContent"}
-    remove_tags = [ dict(id="banner"),
-                    dict(id="autilities"),
-                    dict(id="textSizer"),
-                    dict(id="shareFooter"),
-                    dict(id="relatedNews"),
-                    dict(id="editorsChoice"),
-                    dict(id="ecArticles"),
-                    {'class':"secondaryContent"},
-                    {'class':"module"},
-                     ]
-    remove_tags_after = {'class':"assetBuddy"}
-
-    def print_version(self, url):
-        m = re.search('(.*idJPJAPAN-[0-9]+)', url)
-        return m.group(0)+'?sp=true'
-
+    feeds = [(
+        'Top Stories', 'http://feeds.reuters.com/reuters/JPTopNews?format=xml'),
+        ('World News', 'http://feeds.reuters.com/reuters/JPWorldNews?format=xml'),
+        ('Business News', 'http://feeds.reuters.com/reuters/JPBusinessNews?format=xml'),
+        ('Technology News', 'http://feeds.reuters.com/reuters/JPTechnologyNews?format=xml'),
+        ('Oddly Enough News',
+         'http://feeds.reuters.com/reuters/JPOddlyEnoughNews?format=xml')
+    ]

From b05be6f902507c39dd63e579552bdcc45c87b196 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 21:15:40 +0530
Subject: [PATCH 1090/1154] PDF metadata: If one of the keywords in the PDF is
 a valid ISBN, use it as the ISBN for the book

---
 src/calibre/ebooks/metadata/pdf.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/metadata/pdf.py b/src/calibre/ebooks/metadata/pdf.py
index 7c11e18e26..31d1c415b7 100644
--- a/src/calibre/ebooks/metadata/pdf.py
+++ b/src/calibre/ebooks/metadata/pdf.py
@@ -10,7 +10,7 @@ from functools import partial
 from calibre import prints
 from calibre.constants import iswindows
 from calibre.ptempfile import TemporaryDirectory
-from calibre.ebooks.metadata import MetaInformation, string_to_authors
+from calibre.ebooks.metadata import MetaInformation, string_to_authors, check_isbn
 from calibre.utils.ipc.simple_worker import fork_job, WorkerError
 
 #_isbn_pat = re.compile(r'ISBN[: ]*([-0-9Xx]+)')
@@ -107,7 +107,7 @@ def get_metadata(stream, cover=True):
     else:
         au = string_to_authors(au)
     mi = MetaInformation(title, au)
-    #if isbn is not None:
+    # if isbn is not None:
     #    mi.isbn = isbn
 
     creator = info.get('Creator', None)
@@ -118,6 +118,10 @@ def get_metadata(stream, cover=True):
     mi.tags = []
     if keywords:
         mi.tags = [x.strip() for x in keywords.split(',')]
+        isbn = [check_isbn(x) for x in mi.tags if check_isbn(x)]
+        if isbn:
+            mi.isbn = isbn = isbn[0]
+        mi.tags = [x for x in mi.tags if check_isbn(x) != isbn]
 
     subject = info.get('Subject', None)
     if subject:

From 9d5ea307498ef307fa7bdc25c0d5cd5c11967941 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 27 Oct 2013 08:51:15 +0530
Subject: [PATCH 1091/1154] PDF Output: Option to control title of generated
 Table of Contents

Fixes #1245076 [[Enhancement] Add PDF TOC Title, More Margin Options and ePub TOC Heading 1](https://bugs.launchpad.net/calibre/+bug/1245076)
---
 src/calibre/ebooks/conversion/plugins/pdf_output.py |  3 +++
 src/calibre/ebooks/pdf/render/toc.py                |  2 +-
 src/calibre/gui2/convert/pdf_output.py              |  2 +-
 src/calibre/gui2/convert/pdf_output.ui              | 13 +++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/pdf_output.py b/src/calibre/ebooks/conversion/plugins/pdf_output.py
index be48afc8dd..e270239b30 100644
--- a/src/calibre/ebooks/conversion/plugins/pdf_output.py
+++ b/src/calibre/ebooks/conversion/plugins/pdf_output.py
@@ -112,6 +112,9 @@ class PDFOutput(OutputFormatPlugin):
         OptionRecommendation(name='pdf_add_toc', recommended_value=False,
             help=_('Add a Table of Contents at the end of the PDF that lists page numbers. '
                    'Useful if you want to print out the PDF. If this PDF is intended for electronic use, use the PDF Outline instead.')),
+        OptionRecommendation(name='toc_title', recommended_value=None,
+            help=_('Title for generated table of contents.')
+        ),
         ])
 
     def convert(self, oeb_book, output_path, input_plugin, opts, log):
diff --git a/src/calibre/ebooks/pdf/render/toc.py b/src/calibre/ebooks/pdf/render/toc.py
index 9036aba166..6534248d86 100644
--- a/src/calibre/ebooks/pdf/render/toc.py
+++ b/src/calibre/ebooks/pdf/render/toc.py
@@ -64,7 +64,7 @@ def toc_as_html(toc, pdf, opts):
             )
         ),
         BODY(
-            H1(_('Table of Contents')),
+            H1(opts.toc_title or _('Table of Contents')),
             TABLE(),
         )
     )
diff --git a/src/calibre/gui2/convert/pdf_output.py b/src/calibre/gui2/convert/pdf_output.py
index d06f22b672..54047321ee 100644
--- a/src/calibre/gui2/convert/pdf_output.py
+++ b/src/calibre/gui2/convert/pdf_output.py
@@ -23,7 +23,7 @@ class PluginWidget(Widget, Ui_Form):
             'preserve_cover_aspect_ratio', 'pdf_serif_family', 'unit',
             'pdf_sans_family', 'pdf_mono_family', 'pdf_standard_font',
             'pdf_default_font_size', 'pdf_mono_font_size', 'pdf_page_numbers',
-            'pdf_footer_template', 'pdf_header_template', 'pdf_add_toc',
+            'pdf_footer_template', 'pdf_header_template', 'pdf_add_toc', 'toc_title',
         ])
         self.db, self.book_id = db, book_id
 
diff --git a/src/calibre/gui2/convert/pdf_output.ui b/src/calibre/gui2/convert/pdf_output.ui
index d7ee899ffc..8c084ded53 100644
--- a/src/calibre/gui2/convert/pdf_output.ui
+++ b/src/calibre/gui2/convert/pdf_output.ui
@@ -232,6 +232,19 @@
      </property>
     </widget>
    </item>
+   <item row="8" column="1">
+    <widget class="QLineEdit" name="opt_toc_title"/>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="label_14">
+     <property name="text">
+      <string>&amp;Title for ToC:</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_toc_title</cstring>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

From bf686caf97aba17e8292b4a5324c97a6b4fdf49d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 27 Oct 2013 09:49:21 +0530
Subject: [PATCH 1092/1154] Ebook viewer: remember inspector windows size

E-book viewer: Remember the size of the "Inspect" window used to examine
the book's code. Fixes #1245068 [Feature request: web inspector window size and font size](https://bugs.launchpad.net/calibre/+bug/1245068)
---
 src/calibre/gui2/viewer/documentview.py | 10 ++++-
 src/calibre/gui2/viewer/inspector.py    | 52 +++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 src/calibre/gui2/viewer/inspector.py

diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py
index 71f72768e1..2b49983970 100644
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@@ -25,6 +25,7 @@ from calibre.gui2.viewer.position import PagePosition
 from calibre.gui2.viewer.config import config, ConfigDialog, load_themes
 from calibre.gui2.viewer.image_popup import ImagePopup
 from calibre.gui2.viewer.table_popup import TablePopup
+from calibre.gui2.viewer.inspector import WebInspector
 from calibre.ebooks.oeb.display.webview import load_html
 from calibre.constants import isxp, iswindows
 # }}}
@@ -479,6 +480,7 @@ class DocumentView(QWebView):  # {{{
         self.document = Document(self.shortcuts, parent=self,
                 debug_javascript=debug_javascript)
         self.setPage(self.document)
+        self.inspector = WebInspector(self, self.document)
         self.manager = None
         self._reference_mode = False
         self._ignore_scrollbar_signals = False
@@ -672,8 +674,7 @@ class DocumentView(QWebView):  # {{{
                 menu.addAction(self.manager.action_font_size_smaller)
 
         menu.addSeparator()
-        inspectAction = self.pageAction(self.document.InspectElement)
-        menu.addAction(inspectAction)
+        menu.addAction(_('Inspect'), self.inspect)
 
         if not text and img.isNull() and self.manager is not None:
             menu.addSeparator()
@@ -686,6 +687,11 @@ class DocumentView(QWebView):  # {{{
 
         menu.exec_(ev.globalPos())
 
+    def inspect(self):
+        self.inspector.show()
+        self.inspector.raise_()
+        self.pageAction(self.document.InspectElement).trigger()
+
     def lookup(self, *args):
         if self.manager is not None:
             t = unicode(self.selectedText()).strip()
diff --git a/src/calibre/gui2/viewer/inspector.py b/src/calibre/gui2/viewer/inspector.py
new file mode 100644
index 0000000000..4d97dd4526
--- /dev/null
+++ b/src/calibre/gui2/viewer/inspector.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from PyQt4.Qt import QDialog, QDialogButtonBox, QVBoxLayout, QIcon
+from PyQt4.QtWebKit import QWebInspector
+
+from calibre.gui2 import gprefs
+
+class WebInspector(QDialog):
+
+    def __init__(self, parent, page):
+        QDialog.__init__(self, parent)
+        self.setWindowTitle(_('Inspect book code'))
+        self.setWindowIcon(QIcon(I('debug.png')))
+        l = QVBoxLayout()
+        self.setLayout(l)
+
+        self.inspector = QWebInspector(self)
+        self.inspector.setPage(page)
+        l.addWidget(self.inspector)
+
+        self.bb = bb = QDialogButtonBox(QDialogButtonBox.Close)
+        l.addWidget(bb)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+
+        self.resize(self.sizeHint())
+
+        geom = gprefs.get('viewer_inspector_geom', None)
+        if geom is not None:
+            self.restoreGeometry(geom)
+
+    def save_geometry(self):
+        gprefs['viewer_inspector_geom'] = bytearray(self.saveGeometry())
+
+    def closeEvent(self, ev):
+        self.save_geometry()
+        return QDialog.closeEvent(self, ev)
+
+    def accept(self):
+        self.save_geometry()
+        QDialog.accept(self)
+
+    def reject(self):
+        self.save_geometry()
+        QDialog.reject(self)
+

From 1854a412ec019b9eff3d0e2b2bcbb578d3921f9d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 27 Oct 2013 09:51:40 +0530
Subject: [PATCH 1093/1154] Driver for Lenovo IdeaPad

Fixes #1244857 [Lenovo android ideatab tablet not recognized](https://bugs.launchpad.net/calibre/+bug/1244857)
---
 src/calibre/devices/android/driver.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 89368b965e..ccf3b15635 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -195,6 +195,7 @@ class ANDROID(USBMS):
             0x17ef : {
                     0x7421 : [0x0216],
                     0x741b : [0x9999],
+                    0x7640 : [0x0255],
             },
 
             # Pantech
@@ -251,7 +252,7 @@ class ANDROID(USBMS):
             'S5830I_CARD', 'MID7042', 'LINK-CREATE', '7035', 'VIEWPAD_7E',
             'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS',
             'ICS', 'E400', '__FILE-STOR_GADG', 'ST80208-1', 'GT-S5660M_CARD', 'XT894', '_USB',
-            'PROD_TAB13-201', 'URFPAD2', 'MID1126', 'ST10216-1', 'S5360L_CARD',
+            'PROD_TAB13-201', 'URFPAD2', 'MID1126', 'ST10216-1', 'S5360L_CARD', 'IDEATAB_A1000-F',
     ]
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',

From cbf3dd41c722d79fb84604bdc12520340aa1e6af Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 27 Oct 2013 17:19:45 +0530
Subject: [PATCH 1094/1154] pep8

---
 src/calibre/gui2/dialogs/scheduler.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py
index fc50f164ac..b8d2d51893 100644
--- a/src/calibre/gui2/dialogs/scheduler.py
+++ b/src/calibre/gui2/dialogs/scheduler.py
@@ -243,7 +243,6 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         self.password.setEchoMode(self.password.Normal
                 if state == Qt.Checked else self.password.Password)
 
-
     def schedule_type_selected(self, *args):
         for i, st in enumerate(self.SCHEDULE_TYPES):
             if getattr(self, st).isChecked():
@@ -365,8 +364,10 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         un = pw = ''
         if account_info is not None:
             un, pw = account_info[:2]
-            if not un: un = ''
-            if not pw: pw = ''
+            if not un:
+                un = ''
+            if not pw:
+                pw = ''
         self.username.setText(un)
         self.password.setText(pw)
         self.show_password.setChecked(False)
@@ -390,7 +391,8 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         if scheduled:
             typ, sch, last_downloaded = schedule_info
             d = utcnow() - last_downloaded
-            def hm(x): return (x-x%3600)//3600, (x%3600 - (x%3600)%60)//60
+            def hm(x):
+                return (x-x%3600)//3600, (x%3600 - (x%3600)%60)//60
             hours, minutes = hm(d.seconds)
             tm = _('%(days)d days, %(hours)d hours'
                     ' and %(mins)d minutes ago')%dict(
@@ -417,10 +419,9 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         self.keep_issues.setEnabled(self.add_title_tag.isChecked())
 
 
-
 class Scheduler(QObject):
 
-    INTERVAL = 1 # minutes
+    INTERVAL = 1  # minutes
 
     delete_old_news = pyqtSignal(object)
     start_recipe_fetch = pyqtSignal(object)
@@ -477,7 +478,6 @@ class Scheduler(QObject):
                     self.delete_old_news.emit(ids)
         QTimer.singleShot(60 * 60 * 1000, self.oldest_check)
 
-
     def show_dialog(self, *args):
         self.lock.lock()
         try:

From 4992f3fb37d2db7d8b90f64c3f20c5910944a67a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 27 Oct 2013 17:58:57 +0530
Subject: [PATCH 1095/1154] Option to check for duplicates while copying
 between libraries

Add an option to check for duplicates (books with the same title/author)
when copying between libraries. Option is under Preferences->Adding
books. Fixes #1245089 [When copying or moving book to different library, Calibre does not warn if possible duplicate exists in target library.](https://bugs.launchpad.net/calibre/+bug/1245089)
---
 src/calibre/gui2/actions/copy_to_library.py | 219 +++++++++++++-------
 src/calibre/gui2/preferences/adding.py      |   1 +
 src/calibre/gui2/preferences/adding.ui      | 191 +++++++++--------
 src/calibre/utils/config_base.py            |   2 +
 4 files changed, 245 insertions(+), 168 deletions(-)

diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index f326ed3f12..5a41e1556f 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -11,8 +11,9 @@ from threading import Thread
 from contextlib import closing
 from collections import defaultdict
 
-from PyQt4.Qt import (QToolButton, QDialog, QGridLayout, QIcon, QLabel, QDialogButtonBox,
-                      QFormLayout, QCheckBox, QWidget, QScrollArea, QVBoxLayout)
+from PyQt4.Qt import (
+    QToolButton, QDialog, QGridLayout, QIcon, QLabel, QDialogButtonBox,
+    QFormLayout, QCheckBox, QWidget, QScrollArea, QVBoxLayout, Qt, QListWidgetItem, QListWidget)
 
 from calibre.gui2.actions import InterfaceAction
 from calibre.gui2 import (error_dialog, Dispatcher, warning_dialog, gprefs,
@@ -90,10 +91,10 @@ def ask_about_cc_mismatch(gui, db, newdb, missing_cols, incompatible_cols):  # {
 
 class Worker(Thread):  # {{{
 
-    def __init__(self, ids, db, loc, progress, done, delete_after):
+    def __init__(self, ids, db, loc, progress, done, delete_after, add_duplicates):
         Thread.__init__(self)
         self.ids = ids
-        self.processed = set([])
+        self.processed = set()
         self.db = db
         self.loc = loc
         self.error = None
@@ -101,6 +102,8 @@ class Worker(Thread):  # {{{
         self.done = done
         self.delete_after = delete_after
         self.auto_merged_ids = {}
+        self.add_duplicates = add_duplicates
+        self.duplicate_ids = {}
 
     def run(self):
         try:
@@ -142,57 +145,68 @@ class Worker(Thread):  # {{{
                 fmts = []
             else:
                 fmts = fmts.split(',')
+            identical_book_list = set()
             paths = []
             for fmt in fmts:
                 p = self.db.format(x, fmt, index_is_id=True,
                     as_path=True)
                 if p:
                     paths.append(p)
-            automerged = False
-            if prefs['add_formats_to_existing']:
-                identical_book_list = newdb.find_identical_books(mi)
-                if identical_book_list:  # books with same author and nearly same title exist in newdb
-                    self.auto_merged_ids[x] = _('%(title)s by %(author)s')%\
-                    dict(title=mi.title, author=mi.format_field('authors')[1])
-                    automerged = True
-                    seen_fmts = set()
-                    for identical_book in identical_book_list:
-                        ib_fmts = newdb.formats(identical_book, index_is_id=True)
-                        if ib_fmts:
-                            seen_fmts |= set(ib_fmts.split(','))
-                        replace = gprefs['automerge'] == 'overwrite'
-                        self.add_formats(identical_book, paths, newdb,
-                                replace=replace)
+            try:
+                if not self.add_duplicates:
+                    if prefs['add_formats_to_existing'] or prefs['check_for_dupes_on_ctl']:
+                        # Scanning for dupes can be slow on a large library so
+                        # only do it if the option is set
+                        identical_book_list = newdb.find_identical_books(mi)
+                    if identical_book_list:  # books with same author and nearly same title exist in newdb
+                        if prefs['add_formats_to_existing']:
+                            self.automerge_book(x, mi, identical_book_list, paths, newdb)
+                        else:  # Report duplicates for later processing
+                            self.duplicate_ids[x] = (mi.title, mi.authors)
+                        continue
 
-                    if gprefs['automerge'] == 'new record':
-                        incoming_fmts = \
-                            set([os.path.splitext(path)[-1].replace('.',
-                                '').upper() for path in paths])
-
-                        if incoming_fmts.intersection(seen_fmts):
-                            # There was at least one duplicate format
-                            # so create a new record and put the
-                            # incoming formats into it
-                            # We should arguably put only the duplicate
-                            # formats, but no real harm is done by having
-                            # all formats
-                            newdb.import_book(mi, paths, notify=False, import_hooks=False,
-                                apply_import_tags=tweaks['add_new_book_tags_when_importing_books'],
-                                preserve_uuid=False)
-
-            if not automerged:
                 newdb.import_book(mi, paths, notify=False, import_hooks=False,
                     apply_import_tags=tweaks['add_new_book_tags_when_importing_books'],
                     preserve_uuid=self.delete_after)
                 co = self.db.conversion_options(x, 'PIPE')
                 if co is not None:
                     newdb.set_conversion_options(x, 'PIPE', co)
-            self.processed.add(x)
-            for path in paths:
-                try:
-                    os.remove(path)
-                except:
-                    pass
+                self.processed.add(x)
+            finally:
+                for path in paths:
+                    try:
+                        os.remove(path)
+                    except:
+                        pass
+
+    def automerge_book(self, book_id, mi, identical_book_list, paths, newdb):
+        self.auto_merged_ids[book_id] = _('%(title)s by %(author)s') % dict(title=mi.title, author=mi.format_field('authors')[1])
+        seen_fmts = set()
+        self.processed.add(book_id)
+        for identical_book in identical_book_list:
+            ib_fmts = newdb.formats(identical_book, index_is_id=True)
+            if ib_fmts:
+                seen_fmts |= set(ib_fmts.split(','))
+            replace = gprefs['automerge'] == 'overwrite'
+            self.add_formats(identical_book, paths, newdb,
+                    replace=replace)
+
+        if gprefs['automerge'] == 'new record':
+            incoming_fmts = \
+                set([os.path.splitext(path)[-1].replace('.',
+                    '').upper() for path in paths])
+
+            if incoming_fmts.intersection(seen_fmts):
+                # There was at least one duplicate format
+                # so create a new record and put the
+                # incoming formats into it
+                # We should arguably put only the duplicate
+                # formats, but no real harm is done by having
+                # all formats
+                newdb.import_book(mi, paths, notify=False, import_hooks=False,
+                    apply_import_tags=tweaks['add_new_book_tags_when_importing_books'],
+                    preserve_uuid=False)
+
 
 # }}}
 
@@ -242,6 +256,51 @@ class ChooseLibrary(QDialog):  # {{{
         return (unicode(self.le.text()), self.delete_after_copy)
 # }}}
 
+class DuplicatesQuestion(QDialog):  # {{{
+
+    def __init__(self, parent, duplicates, loc):
+        QDialog.__init__(self, parent)
+        l = QVBoxLayout()
+        self.setLayout(l)
+        self.la = la = QLabel(_('Books with the same title and author as the following already exist in the library %s.'
+                                ' Select which books you want copied anyway.') %
+                              os.path.basename(loc))
+        la.setWordWrap(True)
+        l.addWidget(la)
+        self.setWindowTitle(_('Duplicate books'))
+        self.books = QListWidget(self)
+        self.items = []
+        for book_id, (title, authors) in duplicates.iteritems():
+            i = QListWidgetItem(_('%s by %s') % (title, ' & '.join(authors[:3])), self.books)
+            i.setData(Qt.UserRole, book_id)
+            i.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
+            i.setCheckState(Qt.Checked)
+            self.items.append(i)
+        l.addWidget(self.books)
+        self.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+        self.a = b = bb.addButton(_('Select &all'), bb.ActionRole)
+        b.clicked.connect(self.select_all)
+        self.n = b = bb.addButton(_('Select &none'), bb.ActionRole)
+        b.clicked.connect(self.select_none)
+        l.addWidget(bb)
+        self.resize(600, 400)
+
+    def select_all(self):
+        for i in self.items:
+            i.setCheckState(Qt.Checked)
+
+    def select_none(self):
+        for i in self.items:
+            i.setCheckState(Qt.Unchecked)
+
+    @property
+    def ids(self):
+        return {i.data(Qt.UserRole).toInt()[0] for i in self.items if i.checkState() == Qt.Checked}
+
+# }}}
+
 # Static session-long set of pairs of libraries that have had their custom columns
 # checked for compatibility
 libraries_with_checked_columns = defaultdict(set)
@@ -323,20 +382,9 @@ class CopyToLibraryAction(InterfaceAction):
             return error_dialog(self.gui, _('No library'),
                     _('No library found at %s')%loc, show=True)
 
-        aname = _('Moving to') if delete_after else _('Copying to')
-        dtitle = '%s %s'%(aname, os.path.basename(loc))
-
-        self.pd = ProgressDialog(dtitle, min=0, max=len(ids)-1,
-                parent=self.gui, cancelable=False)
-
-        def progress(idx, title):
-            self.pd.set_msg(title)
-            self.pd.set_value(idx)
-
         # Open the new db so we can check the custom columns. We use only the
         # backend since we only need the custom column definitions, not the
         # rest of the data in the db.
-
         global libraries_with_checked_columns
 
         from calibre.db.legacy import create_backend
@@ -367,9 +415,26 @@ class CopyToLibraryAction(InterfaceAction):
         del newdb
         if not continue_processing:
             return
+        duplicate_ids = self.do_copy(ids, db, loc, delete_after, False)
+        if duplicate_ids:
+            d = DuplicatesQuestion(self.gui, duplicate_ids, loc)
+            if d.exec_() == d.Accepted:
+                ids = d.ids
+                if ids:
+                    self.do_copy(list(ids), db, loc, delete_after, add_duplicates=True)
+
+    def do_copy(self, ids, db, loc, delete_after, add_duplicates=False):
+        aname = _('Moving to') if delete_after else _('Copying to')
+        dtitle = '%s %s'%(aname, os.path.basename(loc))
+        self.pd = ProgressDialog(dtitle, min=0, max=len(ids)-1,
+                parent=self.gui, cancelable=False)
+
+        def progress(idx, title):
+            self.pd.set_msg(title)
+            self.pd.set_value(idx)
 
         self.worker = Worker(ids, db, loc, Dispatcher(progress),
-                             Dispatcher(self.pd.accept), delete_after)
+                             Dispatcher(self.pd.accept), delete_after, add_duplicates)
         self.worker.start()
 
         self.pd.exec_()
@@ -382,29 +447,31 @@ class CopyToLibraryAction(InterfaceAction):
             e, tb = self.worker.error
             error_dialog(self.gui, _('Failed'), _('Could not copy books: ') + e,
                     det_msg=tb, show=True)
-        else:
-            self.gui.status_bar.show_message(donemsg %
-                    dict(num=len(ids), loc=loc), 2000)
-            if self.worker.auto_merged_ids:
-                books = '\n'.join(self.worker.auto_merged_ids.itervalues())
-                info_dialog(self.gui, _('Auto merged'),
-                        _('Some books were automatically merged into existing '
-                            'records in the target library. Click Show '
-                            'details to see which ones. This behavior is '
-                            'controlled by the Auto merge option in '
-                            'Preferences->Adding books.'), det_msg=books,
-                        show=True)
-            if delete_after and self.worker.processed:
-                v = self.gui.library_view
-                ci = v.currentIndex()
-                row = None
-                if ci.isValid():
-                    row = ci.row()
+            return
 
-                v.model().delete_books_by_id(self.worker.processed,
-                        permanent=True)
-                self.gui.iactions['Remove Books'].library_ids_deleted(
-                        self.worker.processed, row)
+        self.gui.status_bar.show_message(donemsg %
+                dict(num=len(ids), loc=loc), 2000)
+        if self.worker.auto_merged_ids:
+            books = '\n'.join(self.worker.auto_merged_ids.itervalues())
+            info_dialog(self.gui, _('Auto merged'),
+                    _('Some books were automatically merged into existing '
+                        'records in the target library. Click Show '
+                        'details to see which ones. This behavior is '
+                        'controlled by the Auto merge option in '
+                        'Preferences->Adding books.'), det_msg=books,
+                    show=True)
+        if delete_after and self.worker.processed:
+            v = self.gui.library_view
+            ci = v.currentIndex()
+            row = None
+            if ci.isValid():
+                row = ci.row()
+
+            v.model().delete_books_by_id(self.worker.processed,
+                    permanent=True)
+            self.gui.iactions['Remove Books'].library_ids_deleted(
+                    self.worker.processed, row)
+        return self.worker.duplicate_ids
 
     def cannot_do_dialog(self):
         warning_dialog(self.gui, _('Not allowed'),
diff --git a/src/calibre/gui2/preferences/adding.py b/src/calibre/gui2/preferences/adding.py
index f41e830083..eb7c34442f 100644
--- a/src/calibre/gui2/preferences/adding.py
+++ b/src/calibre/gui2/preferences/adding.py
@@ -27,6 +27,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('read_file_metadata', prefs)
         r('swap_author_names', prefs)
         r('add_formats_to_existing', prefs)
+        r('check_for_dupes_on_ctl', prefs)
         r('preserve_date_on_ctl', gprefs)
         r('manual_add_auto_convert', gprefs)
         choices = [
diff --git a/src/calibre/gui2/preferences/adding.ui b/src/calibre/gui2/preferences/adding.ui
index 383f1b9b04..be4073d14c 100644
--- a/src/calibre/gui2/preferences/adding.ui
+++ b/src/calibre/gui2/preferences/adding.ui
@@ -24,21 +24,87 @@
        <string>The Add &amp;Process</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="4" column="0" colspan="2">
-        <widget class="QCheckBox" name="opt_add_formats_to_existing">
-         <property name="toolTip">
-          <string>Automerge: If books with similar titles and authors found, merge the incoming formats automatically into
-existing book records. The box to the right controls what happens when an existing record already has
-the incoming format. Note that this option also affects the Copy to library action.
-
-Title match ignores leading indefinite articles (&quot;the&quot;, &quot;a&quot;, &quot;an&quot;), punctuation, case, etc. Author match is exact.</string>
-         </property>
+       <item row="1" column="1" colspan="2">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="opt_swap_author_names">
+           <property name="toolTip">
+            <string>Swap the firstname and lastname of the author. This affects only metadata read from file names.</string>
+           </property>
+           <property name="text">
+            <string>&amp;Swap author firstname and lastname</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_230">
          <property name="text">
-          <string>&amp;Automerge added books if they already exist in the calibre library:</string>
+          <string>&amp;Tags to apply when adding a book:</string>
+         </property>
+         <property name="buddy">
+          <cstring>opt_new_book_tags</cstring>
          </property>
         </widget>
        </item>
-       <item row="4" column="2">
+       <item row="6" column="2">
+        <widget class="QLineEdit" name="opt_new_book_tags">
+         <property name="toolTip">
+          <string>A comma-separated list of tags that will be applied to books added to the library</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="3">
+        <widget class="QGroupBox" name="metadata_box">
+         <property name="title">
+          <string>&amp;Configure metadata from file name</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>363</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="3">
+        <widget class="QCheckBox" name="opt_preserve_date_on_ctl">
+         <property name="text">
+          <string>When using the  &quot;&amp;Copy to library&quot; action to copy books between libraries, preserve the date</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="2">
+        <widget class="QCheckBox" name="opt_manual_add_auto_convert">
+         <property name="text">
+          <string>Automatically &amp;convert added books to the current output format</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="2">
         <widget class="QComboBox" name="opt_automerge">
          <property name="toolTip">
           <string>Automerge: If books with similar titles and authors found, merge the incoming formats automatically into
@@ -71,93 +137,34 @@ Author matching is exact.</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="opt_swap_author_names">
-           <property name="toolTip">
-            <string>Swap the firstname and lastname of the author. This affects only metadata read from file names.</string>
-           </property>
-           <property name="text">
-            <string>&amp;Swap author firstname and lastname</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_230">
-         <property name="text">
-          <string>&amp;Tags to apply when adding a book:</string>
-         </property>
-         <property name="buddy">
-          <cstring>opt_new_book_tags</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="2">
-        <widget class="QLineEdit" name="opt_new_book_tags">
-         <property name="toolTip">
-          <string>A comma-separated list of tags that will be applied to books added to the library</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0" colspan="3">
-        <widget class="QGroupBox" name="metadata_box">
-         <property name="title">
-          <string>&amp;Configure metadata from file name</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <spacer name="verticalSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>363</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="3">
-        <widget class="QCheckBox" name="opt_preserve_date_on_ctl">
-         <property name="text">
-          <string>When using the  &quot;&amp;Copy to library&quot; action to copy books between libraries, preserve the date</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" colspan="2">
-        <widget class="QCheckBox" name="opt_manual_add_auto_convert">
-         <property name="text">
-          <string>Automatically &amp;convert added books to the current output format</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="2">
+       <item row="4" column="2">
         <widget class="QCheckBox" name="opt_mark_new_books">
          <property name="text">
           <string>&amp;Mark newly added books</string>
          </property>
         </widget>
        </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QCheckBox" name="opt_add_formats_to_existing">
+         <property name="toolTip">
+          <string>Automerge: If books with similar titles and authors found, merge the incoming formats automatically into
+existing book records. The box to the right controls what happens when an existing record already has
+the incoming format. Note that this option also affects the Copy to library action.
+
+Title match ignores leading indefinite articles (&quot;the&quot;, &quot;a&quot;, &quot;an&quot;), punctuation, case, etc. Author match is exact.</string>
+         </property>
+         <property name="text">
+          <string>&amp;Automerge added books if they already exist in the calibre library:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="3">
+        <widget class="QCheckBox" name="opt_check_for_dupes_on_ctl">
+         <property name="text">
+          <string>When using the &quot;Copy to Library&quot; action check for &amp;duplicates with the same title and author</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index 3f5e4048b6..2c4f3e38f8 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -398,6 +398,8 @@ def _prefs():
             help=_('Swap author first and last names when reading metadata'))
     c.add_opt('add_formats_to_existing', default=False,
             help=_('Add new formats to existing book records'))
+    c.add_opt('check_for_dupes_on_ctl', default=False,
+            help=_('Check for duplicates when copying to another library'))
     c.add_opt('installation_uuid', default=None, help='Installation UUID')
     c.add_opt('new_book_tags', default=[], help=_('Tags to apply to books added to the library'))
     c.add_opt('mark_new_books', default=False, help=_(

From 2e2f74ea09f716382c5035f13e75c1591b7e0fd3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 27 Oct 2013 18:45:05 +0530
Subject: [PATCH 1096/1154] DOCX Input: Fix hyperlink showing as underlined
 even if the hyperlink style in word is set to not show underlines.

---
 src/calibre/ebooks/docx/styles.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calibre/ebooks/docx/styles.py b/src/calibre/ebooks/docx/styles.py
index daca733330..c9f8f70d4d 100644
--- a/src/calibre/ebooks/docx/styles.py
+++ b/src/calibre/ebooks/docx/styles.py
@@ -446,6 +446,9 @@ class Styles(object):
             /* In word all paragraphs have zero margins unless explicitly specified in a style */
             ul, ol, p, h1, h2, h3, h4, h5, h6 { margin: 0; padding: 0 }
 
+            /* The word hyperlink styling will set text-decoration to underline if needed */
+            a { text-decoration: none }
+
             sup.noteref a { text-decoration: none }
 
             h1.notes-header { page-break-before: always }

From e4557408a8538716ae59d01b2041106fa67c9098 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 08:41:16 +0530
Subject: [PATCH 1097/1154] Fix comments editor in review metadata becoming too
 small

Fix comments editor in review metadata becoming too small
on small screens. Fixes #1245275 [review downloaded metadata doesn't show the comments field](https://bugs.launchpad.net/calibre/+bug/1245275)
---
 src/calibre/gui2/comments_editor.py | 3 +++
 src/calibre/gui2/metadata/diff.py   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index c5058067d5..fa599f37bf 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -640,6 +640,9 @@ class Editor(QWidget):  # {{{
         self.highlighter = Highlighter(self.code_edit.document())
         self.layout().setContentsMargins(0, 0, 0, 0)
 
+    def set_minimum_height_for_editor(self, val):
+        self.editor.setMinimumHeight(val)
+
         # toolbar1 {{{
         self.toolbar1.addAction(self.editor.action_undo)
         self.toolbar1.addAction(self.editor.action_redo)
diff --git a/src/calibre/gui2/metadata/diff.py b/src/calibre/gui2/metadata/diff.py
index 32364da687..17e340dc65 100644
--- a/src/calibre/gui2/metadata/diff.py
+++ b/src/calibre/gui2/metadata/diff.py
@@ -213,6 +213,7 @@ class CommentsEdit(Editor):
 
     def __init__(self, field, is_new, parent, metadata, extra):
         Editor.__init__(self, parent, one_line_toolbar=False)
+        self.set_minimum_height_for_editor(150)
         self.is_new = is_new
         self.field = field
         self.metadata = metadata

From 6d087623448fdb8b9de110f5e223e32c4c627900 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 10:10:59 +0530
Subject: [PATCH 1098/1154] Infrastructure for supporting translations of
 plugins

---
 manual/creating_plugins.rst        | 41 ++++++++++++++++++++++++++++++
 src/calibre/customize/zipplugin.py | 27 ++++++++++++++++++--
 src/calibre/translations/msgfmt.py | 10 +++++---
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/manual/creating_plugins.rst b/manual/creating_plugins.rst
index 9418f4a955..fe58b6e34e 100644
--- a/manual/creating_plugins.rst
+++ b/manual/creating_plugins.rst
@@ -92,6 +92,11 @@ The first thing to note is that this zip file has a lot more files in it, explai
     **about.txt**
         A text file with information about the plugin
 
+    **translations**
+        A folder containing .mo files with the translations of the user
+        interface of your plugin into different languages. See below for
+        details.
+
 Now let's look at the code.
 
 __init__.py
@@ -175,6 +180,42 @@ You can see the ``prefs`` object being used in main.py:
 .. literalinclude:: plugin_examples/interface_demo/main.py
     :pyobject: DemoDialog.config
 
+Adding translations to your plugin
+--------------------------------------
+
+You can have all the user interface strings in your plugin translated and
+displayed in whatever language is set for the main calibre user interface.
+
+The first step is to go through your plugin's source code and mark all user
+visible strings as translatable, by surrounding them in _(). For example::
+
+    action_spec = (_('My plugin'), None, _('My plugin is cool'), None)
+
+Then use some program to generate .po files from your plugin source code. There
+should be one .po file for every language you want to translate into. For
+example: de.po for German, fr.po for French and so on. You can use the 
+`poedit <http://www.poedit.net/>`_ program for this.
+
+Send these .po files to your translators. Once you get them back, compile them
+into .mo files. You can again use poedit for that, or just do::
+
+    calibre-debug -c "from calibre.translations.msgfmt import main; main()" filename.po
+
+Put the .mo files into the ``translations`` folder in your plugin.
+
+The last step is to simply call the function `load_translations()` at the top
+of your plugin's .py files. For performance reasons you should only call this
+function in those .py files that actually have translatable strings. So in a
+typical User Interface plugin you would call it at the top of ``ui.py`` but not
+``__init__.py``.
+
+You can test the translations of your plugins by changing the user interface
+language in calibre under Preferences->Look & Feel or by running calibre like
+this::
+
+    CALIBRE_OVERRIDE_LANG=de calibre
+
+Replace ``de`` with the language code of the language you want to test.
 
 The plugin API
 --------------------------------
diff --git a/src/calibre/customize/zipplugin.py b/src/calibre/customize/zipplugin.py
index ca07462b9c..a5145d8141 100644
--- a/src/calibre/customize/zipplugin.py
+++ b/src/calibre/customize/zipplugin.py
@@ -81,6 +81,30 @@ def get_icons(zfp, name_or_list_of_names):
         ians = ians.pop(names[0])
     return ians
 
+_translations_cache = {}
+
+def load_translations(namespace, zfp):
+    null = object()
+    trans = _translations_cache.get(zfp, null)
+    if trans is None:
+        return
+    if trans is null:
+        from calibre.utils.localization import get_lang
+        lang = get_lang()
+        if not lang or lang == 'en':  # performance optimization
+            _translations_cache[zfp] = None
+            return
+        mo = get_resources(zfp, 'translations/%s.mo' % lang)
+        if mo is None:
+            _translations_cache[zfp] = None
+            return
+        from gettext import GNUTranslations
+        from io import BytesIO
+        trans = _translations_cache[zfp] = GNUTranslations(BytesIO(mo))
+
+    namespace['_'] = trans.gettext
+    namespace['ngettext'] = trans.ngettext
+
 class PluginLoader(object):
 
     def __init__(self):
@@ -147,11 +171,11 @@ class PluginLoader(object):
                 import_name), 'exec', dont_inherit=True)
             mod.__dict__['get_resources'] = partial(get_resources, zfp)
             mod.__dict__['get_icons'] = partial(get_icons, zfp)
+            mod.__dict__['load_translations'] = partial(load_translations, mod.__dict__, zfp)
             exec compiled in mod.__dict__
 
         return mod
 
-
     def load(self, path_to_zip_file):
         if not os.access(path_to_zip_file, os.R_OK):
             raise PluginNotFound('Cannot access %r'%path_to_zip_file)
@@ -193,7 +217,6 @@ class PluginLoader(object):
                 del self.loaded_plugins[plugin_name]
             raise
 
-
     def _locate_code(self, zf, path_to_zip_file):
         names = [x if isinstance(x, unicode) else x.decode('utf-8') for x in
                 zf.namelist()]
diff --git a/src/calibre/translations/msgfmt.py b/src/calibre/translations/msgfmt.py
index a27a6c007f..cd3c890cf0 100644
--- a/src/calibre/translations/msgfmt.py
+++ b/src/calibre/translations/msgfmt.py
@@ -143,7 +143,7 @@ def make(filename, outfile):
                     (infile, lno)
                 sys.exit(1)
             l = l[12:]
-            msgid += '\0' # separator of singular and plural
+            msgid += '\0'  # separator of singular and plural
             is_plural = True
         # Now we are in a msgstr section
         elif l.startswith('msgstr'):
@@ -155,7 +155,7 @@ def make(filename, outfile):
                     sys.exit(1)
                 l = l.split(']', 1)[1]
                 if msgstr:
-                    msgstr += '\0' # Separator of the various plural forms
+                    msgstr += '\0'  # Separator of the various plural forms
             else:
                 if is_plural:
                     print >> sys.stderr, 'indexed msgstr required for plural on  %s:%d' %\
@@ -184,7 +184,11 @@ def make(filename, outfile):
     # Compute output
     output = generate()
 
-    outfile.write(output)
+    try:
+        outfile.write(output)
+    except AttributeError:
+        with open(outfile, 'wb') as f:
+            f.write(output)
 
 
 def main():

From 62d042d9d42227813c8ee91cbfbd157e7096ab2a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 14:18:46 +0530
Subject: [PATCH 1099/1154] Basic parsing with the new html5lib lxml tree
 builder works

---
 src/calibre/ebooks/oeb/parse_utils.py         |   7 +-
 src/calibre/ebooks/oeb/polish/parsing.py      | 196 ++++++++++++++++--
 .../ebooks/oeb/polish/tests/parsing.py        |  33 ++-
 src/html5lib/html5parser.py                   |   8 +-
 src/html5lib/treebuilders/_base.py            |   5 +
 5 files changed, 212 insertions(+), 37 deletions(-)

diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index 88d9a198c3..7ee9f5131f 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -80,11 +80,14 @@ def node_depth(node):
         p = p.getparent()
     return ans
 
+def fix_self_closing_cdata_tags(data):
+    from html5lib.constants import cdataElements, rcdataElements
+    return re.sub(r'<\s*(%s)\s*[^>]*/\s*>' % ('|'.join(cdataElements|rcdataElements)), r'<\1></\1>', data, flags=re.I)
+
 def html5_parse(data, max_nesting_depth=100):
     import html5lib, warnings
-    from html5lib.constants import cdataElements, rcdataElements
     # HTML5 parsing algorithm idiocy: http://code.google.com/p/html5lib/issues/detail?id=195
-    data = re.sub(r'<\s*(%s)\s*[^>]*/\s*>' % ('|'.join(cdataElements|rcdataElements)), r'<\1></\1>', data, flags=re.I)
+    data = fix_self_closing_cdata_tags(data)
 
     with warnings.catch_warnings():
         warnings.simplefilter('ignore')
diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 3377931c73..2d1c204425 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -7,29 +7,38 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import copy
+from functools import partial
 
 from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
 
-from html5lib.constants import namespaces
+from html5lib.constants import namespaces, tableInsertModeElements
 from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
 from html5lib.ihatexml import InfosetFilter
+from html5lib.html5parser import HTMLParser
+
+from calibre.ebooks.chardet import xml_to_unicode
+from calibre.ebooks.oeb.parse_utils import fix_self_closing_cdata_tags
+from calibre.utils.cleantext import clean_xml_chars
 
 infoset_filter = InfosetFilter()
-coerce_comment = infoset_filter.coerceComment
-coerce_text = infoset_filter.coerceCharacters
+to_xml_name = infoset_filter.toXmlName
+known_namespaces = {namespaces[k]:k for k in ('mathml', 'svg')}
 
 def create_lxml_context():
-    parser = XMLParser()
+    parser = XMLParser(no_network=True)
     parser.set_element_class_lookup(ElementDefaultClassLookup(element=Element, comment=Comment))
     return parser
 
 def ElementFactory(name, namespace=None, context=None):
     context = context or create_lxml_context()
     ns = namespace or namespaces['html']
-    return context.makeelement('{%s}%s' % (ns, name), nsmap={None:ns})
+    try:
+        return context.makeelement('{%s}%s' % (ns, name), nsmap={None:ns})
+    except ValueError:
+        return context.makeelement('{%s}%s' % (ns, to_xml_name(name)), nsmap={None:ns})
 
 def CommentFactory(text):
-    return Comment(coerce_comment(text))
+    return Comment(text.replace('--', '- -'))
 
 class Element(ElementBase):
 
@@ -59,15 +68,13 @@ class Element(ElementBase):
     def namespace(self):
         return self.nsmap[self.prefix]
 
-    @dynamic_property
+    @property
+    def nameTuple(self):
+        return self.nsmap[self.prefix], self.tag.rpartition('}')[2]
+
+    @property
     def attributes(self):
-        def fget(self):
-            return self.attrib
-        def fset(self, val):
-            attrs = {('{%s}%s' % k) if isinstance(k, tuple) else k : v for k, v in val.iteritems()}
-            self.attrib.clear()
-            self.attrib.update(attrs)
-        return property(fget=fget, fset=fset)
+        return self.attrib
 
     @dynamic_property
     def childNodes(self):
@@ -94,21 +101,30 @@ class Element(ElementBase):
         self.insert(self.index(ref_node), node)
 
     def insertText(self, data, insertBefore=None):
-        data = coerce_text(data)
+        def append_text(el, attr):
+            try:
+                setattr(el, attr, (getattr(el, attr) or '') + data)
+            except ValueError:
+                text = data.replace('\u000c', ' ')
+                try:
+                    setattr(el, attr, (getattr(el, attr) or '') + text)
+                except ValueError:
+                    setattr(el, attr, (getattr(el, attr) or '') + clean_xml_chars(text))
+
         if len(self) == 0:
-            self.text = (self.text or '') + data
+            append_text(self, 'text')
         elif insertBefore is None:
             # Insert the text as the tail of the last child element
             el = self[-1]
-            el.tail = (el.tail or '') + data
+            append_text(el, 'tail')
         else:
             # Insert the text before the specified node
             index = self.index(insertBefore)
             if index > 0:
                 el = self[index - 1]
-                el.tail = (el.tail or '') + data
+                append_text(el, 'tail')
             else:
-                self.text = (self.text or '') + data
+                append_text(self, 'text')
 
     def reparentChildren(self, new_parent):
         # Move self.text
@@ -129,7 +145,7 @@ class Comment(CommentBase):
         def fget(self):
             return self.text
         def fset(self, val):
-            self.text = coerce_comment(val)
+            self.text = val.replace('--', '- -')
         return property(fget=fget, fset=fset)
 
     @property
@@ -144,6 +160,10 @@ class Comment(CommentBase):
     def namespace(self):
         return None
 
+    @property
+    def nameTuple(self):
+        return None, None
+
     @property
     def childNodes(self):
         return []
@@ -164,7 +184,7 @@ class Comment(CommentBase):
     reparentChildren = no_op
 
     def insertText(self, text, insertBefore=None):
-        self.text = (self.text or '') + coerce_comment(text)
+        self.text = (self.text or '') + text.replace('--', '- -')
 
     def cloneNode(self):
         return copy.copy(self)
@@ -187,6 +207,43 @@ class DocType(object):
         self.text = self.name = name
         self.public_id, self.system_id = public_id, system_id
 
+def process_attribs(attrs, nsmap):
+    attribs = {}
+    namespaced_attribs = {}
+    xmlns = namespaces['xmlns']
+    for k, v in attrs.iteritems():
+        if isinstance(k, tuple):
+            if k[2] == xmlns:
+                prefix, name, ns = k
+                if prefix is None:
+                    nsmap[None] = v
+                else:
+                    nsmap[name] = v
+            else:
+                attribs['{%s}%s' % (k[2], k[1])] = v
+        else:
+            if ':' in k:
+                if k.startswith('xmlns') and (k.startswith('xmlns:') or k == 'xmlns'):
+                    prefix = k.partition(':')[2] or None
+                    nsmap[prefix] = v
+                else:
+                    namespaced_attribs[k] = v
+            else:
+                attribs[k] = v
+
+    for k, v in namespaced_attribs.iteritems():
+        prefix, name = k.partition(':')[0::2]
+        if prefix == 'xml':
+            if name == 'lang':
+                attribs['lang'] = attribs.get('lang', v)
+            continue
+        ns = nsmap.get(prefix, None)
+        if ns is not None:
+            name = '{%s}%s' % (ns, name)
+        attribs[name] =v
+
+    return attribs
+
 class TreeBuilder(BaseTreeBuilder):
 
     elementClass = ElementFactory
@@ -194,6 +251,101 @@ class TreeBuilder(BaseTreeBuilder):
     documentClass = Document
     doctypeClass = DocType
 
-    def __init__(self):
+    def __init__(self, namespaceHTMLElements=True):
         BaseTreeBuilder.__init__(self, True)
+        self.lxml_context = create_lxml_context()
+        self.elementClass = partial(ElementFactory, context=self.lxml_context)
+
+    def getDocument(self):
+        return self.document.root
+
+    # The following methods are re-implementations from BaseTreeBuilder to
+    # handle namespaces properly.
+
+    def insertRoot(self, token):
+        element = self.createElement(token, nsmap={None:namespaces['html']})
+        self.openElements.append(element)
+        self.document.appendChild(element)
+
+    def createElement(self, token, nsmap=None):
+        """Create an element but don't insert it anywhere"""
+        nsmap = nsmap or {}
+        attribs = process_attribs(token['data'], nsmap)
+        name = token["name"]
+        namespace = token.get("namespace", self.defaultNamespace)
+        if ':' in name:
+            prefix, name = name.partition(':')[0::2]
+            namespace = nsmap.get(prefix, namespace)
+        try:
+            elem = self.lxml_context.makeelement('{%s}%s' % (namespace, name), attrib=attribs, nsmap=nsmap)
+        except ValueError:
+            attribs = {to_xml_name(k):v for k, v in attribs.iteritems()}
+            elem = self.lxml_context.makeelement('{%s}%s' % (namespace, to_xml_name(name)), attrib=attribs, nsmap=nsmap)
+
+        # Ensure that svg and mathml elements get nice namespace prefixes if
+        # the input document is HTML 5 with no namespace information
+        if elem.prefix is not None and elem.prefix.startswith('ns') and namespace not in set(nsmap.itervalues()) and namespace in known_namespaces:
+            prefix = known_namespaces[namespace]
+            if prefix not in nsmap:
+                nsmap[prefix] = namespace
+                elem = self.lxml_context.makeelement(elem.tag, attrib=elem.attrib, nsmap=nsmap)
+        return elem
+
+    def insertElementNormal(self, token):
+        parent = self.openElements[-1]
+        element = self.createElement(token, parent.nsmap)
+        parent.appendChild(element)
+        self.openElements.append(element)
+        return element
+
+    def insertElementTable(self, token):
+        """Create an element and insert it into the tree"""
+        if self.openElements[-1].name not in tableInsertModeElements:
+            return self.insertElementNormal(token)
+        # We should be in the InTable mode. This means we want to do
+        # special magic element rearranging
+        parent, insertBefore = self.getTableMisnestedNodePosition()
+        element = self.createElement(token, nsmap=parent.nsmap)
+        if insertBefore is None:
+            parent.appendChild(element)
+        else:
+            parent.insertBefore(element, insertBefore)
+        self.openElements.append(element)
+        return element
+
+    def apply_html_attributes(self, attrs):
+        html = self.openElements[0]
+        if len(html) > 0:
+            raise ValueError('Cannot apply attributes to <html> after it has children')
+        nsmap = html.nsmap.copy()
+        attribs = process_attribs(attrs, nsmap)
+        for k, v in attribs.iteritems():
+            if k not in html.attrib:
+                try:
+                    html.set(k, v)
+                except ValueError:
+                    html.set(to_xml_name(k), v)
+        if nsmap != html.nsmap:
+            newroot = self.lxml_context.makeelement(html.tag, attrib=html.attrib, nsmap=nsmap)
+            self.openElements[0] = newroot
+            if self.document.root is html:
+                self.document.root = newroot
+
+def parse(raw, decoder=None):
+    if isinstance(raw, bytes):
+        raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
+    # TODO: Replace entities?
+    raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
+    # TODO: ignore warnings
+    parser = HTMLParser(tree=TreeBuilder)
+    parser.parse(raw, parseMeta=False, useChardet=False)
+    root = parser.tree.getDocument()
+    return root
+
+
+if __name__ == '__main__':
+    from lxml import etree
+    root = parse('<html><p -moo><gah\u000c>')
+    print (etree.tostring(root))
+    print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 014985e02d..ce5d18b494 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -10,6 +10,7 @@ from lxml import etree
 from html5lib.constants import cdataElements, rcdataElements
 
 from calibre.ebooks.oeb.polish.tests.base import BaseTest
+from calibre.ebooks.oeb.polish.parsing import parse
 from calibre.ebooks.oeb.base import XPath, XHTML_NS, SVG_NS, XLINK_NS
 from calibre.ebooks.oeb.parse_utils import html5_parse
 
@@ -28,11 +29,17 @@ def nonvoid_cdata_elements(test, parse_function):
 
 def namespaces(test, parse_function):
     ae = test.assertEqual
+    def match_and_prefix(root, xpath, prefix, err=''):
+        matches = XPath(xpath)(root)
+        ae(len(matches), 1, err)
+        ae(matches[0].prefix, prefix)
+
     markup = ''' <html xmlns="{xhtml}"><head><body id="test"></html> '''.format(xhtml=XHTML_NS)
     root = parse_function(markup)
     ae(
         len(XPath('//h:body[@id="test"]')(root)), 1,
         'Incorrect parsing, parsed markup:\n' + etree.tostring(root))
+    match_and_prefix(root, '//h:body[@id="test"]', None)
 
     markup = '''
     <html xmlns="{xhtml}"><head><body id="test">
@@ -40,9 +47,9 @@ def namespaces(test, parse_function):
     '''.format(xhtml=XHTML_NS, svg=SVG_NS, xlink=XLINK_NS)
     root = parse_function(markup)
     err = 'Incorrect parsing, parsed markup:\n' + etree.tostring(root)
-    ae(len(XPath('//h:body[@id="test"]')(root)), 1, err)
-    ae(len(XPath('//svg:svg')(root)), 1, err)
-    ae(len(XPath('//svg:image[@xl:href]')(root)), 1, err)
+    match_and_prefix(root, '//h:body[@id="test"]', None, err)
+    match_and_prefix(root, '//svg:svg', 'svg', err)
+    match_and_prefix(root, '//svg:image[@xl:href]', 'svg', err)
 
     markup = '''
     <html xmlns="{xhtml}"><head><body id="test">
@@ -50,15 +57,15 @@ def namespaces(test, parse_function):
     '''.format(xhtml=XHTML_NS, svg=SVG_NS, xlink=XLINK_NS)
     root = parse_function(markup)
     err = 'Incorrect parsing, parsed markup:\n' + etree.tostring(root)
-    ae(len(XPath('//h:body[@id="test"]')(root)), 1, err)
-    ae(len(XPath('//svg:svg')(root)), 1, err)
-    ae(len(XPath('//svg:image[@xl:href]')(root)), 1, err)
+    match_and_prefix(root, '//h:body[@id="test"]', None, err)
+    match_and_prefix(root, '//svg:svg', None if parse_function is parse else 'svg', err)
+    match_and_prefix(root, '//svg:image[@xl:href]', None if parse_function is parse else 'svg', err)
 
     markup = '<html><body><svg><image xlink:href="xxx"></svg>'
     root = parse_function(markup)
     err = 'Namespaces not created, parsed markup:\n' + etree.tostring(root)
-    ae(len(XPath('//svg:svg')(root)), 1, err)
-    ae(len(XPath('//svg:image[@xl:href]')(root)), 1, err)
+    match_and_prefix(root, '//svg:svg', 'svg', err)
+    match_and_prefix(root, '//svg:image[@xl:href]', 'svg', err)
 
     markup = '<html><body><ns1:tag1 xmlns:ns1="NS"><ns2:tag2 xmlns:ns2="NS" ns1:id="test"/><ns1:tag3 xmlns:ns1="NS2" ns1:id="test"/></ns1:tag1>'
     root = parse_function(markup)
@@ -70,6 +77,9 @@ def namespaces(test, parse_function):
     ae(len(xpath('//ns2:tag3')), 1, err)
     ae(len(xpath('//ns1:tag2[@ns1:id="test"]')), 1, err)
     ae(len(xpath('//ns2:tag3[@ns2:id="test"]')), 1, err)
+    for tag in root.iter():
+        if 'NS' in tag.tag:
+            ae('ns1', tag.prefix)
 
     markup = '<html xml:lang="en"><body><p lang="de"><p xml:lang="es"><p lang="en" xml:lang="de">'
     root = parse_function(markup)
@@ -84,6 +94,8 @@ def space_characters(test, parse_function):
     root = parse_function(markup)
     err = 'form feed character not converted, parsed markup:\n' + etree.tostring(root)
     test.assertNotIn('\u000c', root.xpath('//*[local-name()="p"]')[0].text, err)
+    markup = '<html><p>\u000b\u000c</p>'
+    root = parse_function(markup)  # Should strip non XML safe control code \u000b
 
 def case_insensitive_element_names(test, parse_function):
     markup = '<HTML><P> </p>'
@@ -99,3 +111,8 @@ class ParsingTests(BaseTest):
         ' Test parsing with the HTML5 parser used for conversion '
         for test in basic_checks:
             test(self, html5_parse)
+
+    def test_polish_parser(self):
+        ' Test parsing with the HTML5 parser used for polishing '
+        for test in basic_checks:
+            test(self, parse)
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
index b0f14f3935..91897f4362 100644
--- a/src/html5lib/html5parser.py
+++ b/src/html5lib/html5parser.py
@@ -155,8 +155,8 @@ class HTMLParser(object):
             new_token = token
             while new_token is not None:
                 currentNode = self.tree.openElements[-1] if self.tree.openElements else None
-                currentNodeNamespace = currentNode.namespace if currentNode else None
-                currentNodeName = currentNode.name if currentNode else None
+                currentNodeNamespace = currentNode.namespace if currentNode is not None else None
+                currentNodeName = currentNode.name if currentNode is not None else None
 
                 type = new_token["type"]
 
@@ -472,9 +472,7 @@ def getPhases(debug):
                 self.parser.parseError("non-html-root")
             # XXX Need a check here to see if the first start tag token emitted is
             # this token... If it's not, invoke self.parser.parseError().
-            for attr, value in token["data"].items():
-                if attr not in self.tree.openElements[0].attributes:
-                    self.tree.openElements[0].attributes[attr] = value
+            self.tree.apply_html_attributes(token['data'])
             self.parser.firstStartTag = False
 
         def processEndTag(self, token):
diff --git a/src/html5lib/treebuilders/_base.py b/src/html5lib/treebuilders/_base.py
index 8b97cc11a2..f426823c1f 100644
--- a/src/html5lib/treebuilders/_base.py
+++ b/src/html5lib/treebuilders/_base.py
@@ -269,6 +269,11 @@ class TreeBuilder(object):
         element.attributes = token["data"]
         return element
 
+    def apply_html_attributes(self, attrs):
+        for attr, value in attrs.items():
+            if attr not in self.openElements[0].attributes:
+                self.openElements[0].attributes[attr] = value
+
     def _getInsertFromTable(self):
         return self._insertFromTable
 

From d3352aeec990014bbdfa94768fd5ae5fcf043cf8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 14:22:05 +0530
Subject: [PATCH 1100/1154] Fix html5 conversion parser not handling ascii
 control chars

---
 src/calibre/ebooks/oeb/parse_utils.py          | 6 +++++-
 src/calibre/ebooks/oeb/polish/tests/parsing.py | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index 7ee9f5131f..1bb13d21a2 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -91,7 +91,11 @@ def html5_parse(data, max_nesting_depth=100):
 
     with warnings.catch_warnings():
         warnings.simplefilter('ignore')
-        data = html5lib.parse(data, treebuilder='lxml').getroot()
+        try:
+            data = html5lib.parse(data, treebuilder='lxml').getroot()
+        except ValueError:
+            from calibre.utils.cleantext import clean_xml_chars
+            data = html5lib.parse(clean_xml_chars(data), treebuilder='lxml').getroot()
 
     # Check that the asinine HTML 5 algorithm did not result in a tree with
     # insane nesting depths
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index ce5d18b494..2bc2dff96f 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -94,8 +94,10 @@ def space_characters(test, parse_function):
     root = parse_function(markup)
     err = 'form feed character not converted, parsed markup:\n' + etree.tostring(root)
     test.assertNotIn('\u000c', root.xpath('//*[local-name()="p"]')[0].text, err)
-    markup = '<html><p>\u000b\u000c</p>'
+    markup = '<html><p>a\u000b\u000c</p>'
     root = parse_function(markup)  # Should strip non XML safe control code \u000b
+    test.assertNotIn('\u000b', root.xpath('//*[local-name()="p"]')[0].text, err)
+    test.assertNotIn('\u000c', root.xpath('//*[local-name()="p"]')[0].text, err)
 
 def case_insensitive_element_names(test, parse_function):
     markup = '<HTML><P> </p>'

From fe32a39f0ff6eaebd014b0d7f8c50e60dc67cc6b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 15:31:07 +0530
Subject: [PATCH 1101/1154] Parse namespace prefixed <html:html> correctly

---
 src/calibre/ebooks/oeb/polish/parsing.py      | 41 +++++++++++++++----
 .../ebooks/oeb/polish/tests/parsing.py        | 12 ++++++
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 2d1c204425..7a7943827f 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import copy
+import copy, re
 from functools import partial
 
 from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
@@ -24,6 +24,12 @@ infoset_filter = InfosetFilter()
 to_xml_name = infoset_filter.toXmlName
 known_namespaces = {namespaces[k]:k for k in ('mathml', 'svg')}
 
+class NamespacedHTMLPresent(ValueError):
+
+    def __init__(self, prefix):
+        ValueError.__init__(self, prefix)
+        self.prefix = prefix
+
 def create_lxml_context():
     parser = XMLParser(no_network=True)
     parser.set_element_class_lookup(ElementDefaultClassLookup(element=Element, comment=Comment))
@@ -225,6 +231,12 @@ def process_attribs(attrs, nsmap):
             if ':' in k:
                 if k.startswith('xmlns') and (k.startswith('xmlns:') or k == 'xmlns'):
                     prefix = k.partition(':')[2] or None
+                    if prefix is not None:
+                        # Use an existing prefix for this namespace, if
+                        # possible
+                        existing = {v:k for k, v in nsmap.iteritems()}.get(v, False)
+                        if existing is not False:
+                            prefix = existing
                     nsmap[prefix] = v
                 else:
                     namespaced_attribs[k] = v
@@ -255,6 +267,7 @@ class TreeBuilder(BaseTreeBuilder):
         BaseTreeBuilder.__init__(self, True)
         self.lxml_context = create_lxml_context()
         self.elementClass = partial(ElementFactory, context=self.lxml_context)
+        self.seen_extra_html = False
 
     def getDocument(self):
         return self.document.root
@@ -272,6 +285,8 @@ class TreeBuilder(BaseTreeBuilder):
         nsmap = nsmap or {}
         attribs = process_attribs(token['data'], nsmap)
         name = token["name"]
+        if name.endswith(':html'):
+            raise NamespacedHTMLPresent(name.rpartition(':')[0])
         namespace = token.get("namespace", self.defaultNamespace)
         if ':' in name:
             prefix, name = name.partition(':')[0::2]
@@ -314,9 +329,9 @@ class TreeBuilder(BaseTreeBuilder):
         return element
 
     def apply_html_attributes(self, attrs):
+        if not attrs:
+            return
         html = self.openElements[0]
-        if len(html) > 0:
-            raise ValueError('Cannot apply attributes to <html> after it has children')
         nsmap = html.nsmap.copy()
         attribs = process_attribs(attrs, nsmap)
         for k, v in attribs.iteritems():
@@ -330,22 +345,34 @@ class TreeBuilder(BaseTreeBuilder):
             self.openElements[0] = newroot
             if self.document.root is html:
                 self.document.root = newroot
+            if len(html) > 0:
+                # TODO: the nsmap changes need to be propagated down the tree
+                for child in html:
+                    newroot.append(copy.copy(child))
 
-def parse(raw, decoder=None):
+def parse(raw, decoder=None, log=None):
     if isinstance(raw, bytes):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
     # TODO: Replace entities?
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
     # TODO: ignore warnings
-    parser = HTMLParser(tree=TreeBuilder)
-    parser.parse(raw, parseMeta=False, useChardet=False)
+    while True:
+        try:
+            parser = HTMLParser(tree=TreeBuilder)
+            parser.parse(raw, parseMeta=False, useChardet=False)
+        except NamespacedHTMLPresent as err:
+            raw = re.sub(r'<\s*/{0,1}(%s:)' % err.prefix, lambda m: m.group().replace(m.group(1), ''), raw, flags=re.I)
+            continue
+        break
     root = parser.tree.getDocument()
+    if root.tag != '{%s}%s' % (namespaces['html'], 'html') or root.prefix:
+        raise ValueError('Failed to parse correctly, root has tag: %s and prefix: %s' % (root.tag, root.prefix))
     return root
 
 
 if __name__ == '__main__':
     from lxml import etree
-    root = parse('<html><p -moo><gah\u000c>')
+    root = parse('<html:html xmlns:html="{html}" id="a"><html:p><html:p></html:html>'.format(html=namespaces['html']))
     print (etree.tostring(root))
     print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 2bc2dff96f..ed83d0342c 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -67,6 +67,18 @@ def namespaces(test, parse_function):
     match_and_prefix(root, '//svg:svg', 'svg', err)
     match_and_prefix(root, '//svg:image[@xl:href]', 'svg', err)
 
+    root = parse_function('<html id="a"><p><html xmlns:x="y" lang="en"><p>')
+    err = 'Multiple HTML tags not handled, parsed markup:\n' + etree.tostring(root)
+    match_and_prefix(root, '//h:html', None, err)
+    match_and_prefix(root, '//h:html[@lang]', None, err)
+    match_and_prefix(root, '//h:html[@id]', None, err)
+
+    if parse_function is not html5_parse:
+        markup = '<html:html xmlns:html="{html}" id="a"><html:body><html:p></html:p></html:body></html>'.format(html=XHTML_NS)
+        root = parse_function(markup)
+        err = 'HTML namespace prefixed, parsed markup:\n' + etree.tostring(root)
+        match_and_prefix(root, '//h:html', None, err)
+
     markup = '<html><body><ns1:tag1 xmlns:ns1="NS"><ns2:tag2 xmlns:ns2="NS" ns1:id="test"/><ns1:tag3 xmlns:ns1="NS2" ns1:id="test"/></ns1:tag1>'
     root = parse_function(markup)
     err = 'Arbitrary namespaces not preserved, parsed markup:\n' + etree.tostring(root)

From 62ebb5e3f62e445da53f005141c4f22bc36eb13b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 15:31:49 +0530
Subject: [PATCH 1102/1154] ...

---
 src/calibre/ebooks/oeb/polish/parsing.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 7a7943827f..248ad1dd26 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -30,6 +30,7 @@ class NamespacedHTMLPresent(ValueError):
         ValueError.__init__(self, prefix)
         self.prefix = prefix
 
+# Nodes {{{
 def create_lxml_context():
     parser = XMLParser(no_network=True)
     parser.set_element_class_lookup(ElementDefaultClassLookup(element=Element, comment=Comment))
@@ -212,6 +213,7 @@ class DocType(object):
     def __init__(self, name, public_id, system_id):
         self.text = self.name = name
         self.public_id, self.system_id = public_id, system_id
+# }}}
 
 def process_attribs(attrs, nsmap):
     attribs = {}

From 03a39f15d1c05ee6a616cbd6c002cdf27a31d245 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 15:35:10 +0530
Subject: [PATCH 1103/1154] Ignore DataLossWarnings

---
 src/calibre/ebooks/oeb/polish/parsing.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 248ad1dd26..174ff7d9e0 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -6,14 +6,14 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import copy, re
+import copy, re, warnings
 from functools import partial
 
 from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
 
 from html5lib.constants import namespaces, tableInsertModeElements
 from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
-from html5lib.ihatexml import InfosetFilter
+from html5lib.ihatexml import InfosetFilter, DataLossWarning
 from html5lib.html5parser import HTMLParser
 
 from calibre.ebooks.chardet import xml_to_unicode
@@ -357,11 +357,12 @@ def parse(raw, decoder=None, log=None):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
     # TODO: Replace entities?
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
-    # TODO: ignore warnings
     while True:
         try:
             parser = HTMLParser(tree=TreeBuilder)
-            parser.parse(raw, parseMeta=False, useChardet=False)
+            with warnings.catch_warnings():
+                warnings.simplefilter('ignore', category=DataLossWarning)
+                parser.parse(raw, parseMeta=False, useChardet=False)
         except NamespacedHTMLPresent as err:
             raw = re.sub(r'<\s*/{0,1}(%s:)' % err.prefix, lambda m: m.group().replace(m.group(1), ''), raw, flags=re.I)
             continue

From 002895ff42ddea84b145ce4d824601deb0b74143 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 15:58:37 +0530
Subject: [PATCH 1104/1154] Replace entities

---
 src/calibre/ebooks/oeb/polish/parsing.py       | 5 +++--
 src/calibre/ebooks/oeb/polish/tests/parsing.py | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 174ff7d9e0..3c99c4915e 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -16,6 +16,7 @@ from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
 from html5lib.ihatexml import InfosetFilter, DataLossWarning
 from html5lib.html5parser import HTMLParser
 
+from calibre import xml_replace_entities
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre.ebooks.oeb.parse_utils import fix_self_closing_cdata_tags
 from calibre.utils.cleantext import clean_xml_chars
@@ -355,8 +356,8 @@ class TreeBuilder(BaseTreeBuilder):
 def parse(raw, decoder=None, log=None):
     if isinstance(raw, bytes):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
-    # TODO: Replace entities?
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
+    raw = xml_replace_entities(raw)
     while True:
         try:
             parser = HTMLParser(tree=TreeBuilder)
@@ -375,7 +376,7 @@ def parse(raw, decoder=None, log=None):
 
 if __name__ == '__main__':
     from lxml import etree
-    root = parse('<html:html xmlns:html="{html}" id="a"><html:p><html:p></html:html>'.format(html=namespaces['html']))
+    root = parse('<html><p>&nbsp;')
     print (etree.tostring(root))
     print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index ed83d0342c..01fb5ec9e9 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -117,7 +117,13 @@ def case_insensitive_element_names(test, parse_function):
     err = 'case sensitive parsing, parsed markup:\n' + etree.tostring(root)
     test.assertEqual(len(XPath('//h:p')(root)), 1, err)
 
-basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insensitive_element_names)
+def entities(test, parse_function):
+    markup = '<html><p>&nbsp;&apos;</p>'
+    root = parse_function(markup)
+    err = 'Entities not handled, parsed markup:\n' + etree.tostring(root)
+    test.assertEqual('\xa0\'', root.xpath('//*[local-name()="p"]')[0].text, err)
+
+basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insensitive_element_names, entities)
 
 class ParsingTests(BaseTest):
 

From ea7930ee832bf5dc1268e77ba5c43366cb625ac3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 16:29:17 +0530
Subject: [PATCH 1105/1154] Speed up parsing by not using element __bool__

---
 src/html5lib/html5parser.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
index 91897f4362..fad66ff3e9 100644
--- a/src/html5lib/html5parser.py
+++ b/src/html5lib/html5parser.py
@@ -1084,7 +1084,7 @@ def getPhases(debug):
 
         def startTagA(self, token):
             afeAElement = self.tree.elementInActiveFormattingElements("a")
-            if afeAElement:
+            if afeAElement is not False:
                 self.parser.parseError("unexpected-start-tag-implies-end-tag",
                                        {"startName": "a", "endName": "a"})
                 self.endTagFormatting(impliedTagToken("a"))
@@ -1407,7 +1407,7 @@ def getPhases(debug):
                 # - has the same tag name as the token.
                 formattingElement = self.tree.elementInActiveFormattingElements(
                     token["name"])
-                if (not formattingElement or
+                if (formattingElement is False or
                     (formattingElement in self.tree.openElements and
                      not self.tree.elementInScope(formattingElement.name))):
                     # If there is no such node, then abort these steps
@@ -1509,7 +1509,7 @@ def getPhases(debug):
                     node = clone
                     # Step 9.9
                     # Remove lastNode from its parents, if any
-                    if lastNode.parent:
+                    if lastNode.parent is not None:
                         lastNode.parent.removeChild(lastNode)
                     node.appendChild(lastNode)
                     # Step 9.10
@@ -1519,7 +1519,7 @@ def getPhases(debug):
                 # Foster parent lastNode if commonAncestor is a
                 # table, tbody, tfoot, thead, or tr we need to foster
                 # parent the lastNode
-                if lastNode.parent:
+                if lastNode.parent is not None:
                     lastNode.parent.removeChild(lastNode)
 
                 if commonAncestor.name in frozenset(("table", "tbody", "tfoot", "thead", "tr")):

From 2c6d5985a5220f8797a0a228afbf7f91a3d730e0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 18:02:42 +0530
Subject: [PATCH 1106/1154] Implement namespace less parsing

---
 src/calibre/ebooks/oeb/polish/parsing.py | 94 +++++++++++++++++++-----
 1 file changed, 76 insertions(+), 18 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 3c99c4915e..5b65b2d989 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -24,6 +24,7 @@ from calibre.utils.cleantext import clean_xml_chars
 infoset_filter = InfosetFilter()
 to_xml_name = infoset_filter.toXmlName
 known_namespaces = {namespaces[k]:k for k in ('mathml', 'svg')}
+html_ns = namespaces['html']
 
 class NamespacedHTMLPresent(ValueError):
 
@@ -32,11 +33,6 @@ class NamespacedHTMLPresent(ValueError):
         self.prefix = prefix
 
 # Nodes {{{
-def create_lxml_context():
-    parser = XMLParser(no_network=True)
-    parser.set_element_class_lookup(ElementDefaultClassLookup(element=Element, comment=Comment))
-    return parser
-
 def ElementFactory(name, namespace=None, context=None):
     context = context or create_lxml_context()
     ns = namespace or namespaces['html']
@@ -45,9 +41,6 @@ def ElementFactory(name, namespace=None, context=None):
     except ValueError:
         return context.makeelement('{%s}%s' % (ns, to_xml_name(name)), nsmap={None:ns})
 
-def CommentFactory(text):
-    return Comment(text.replace('--', '- -'))
-
 class Element(ElementBase):
 
     ''' Implements the interface required by the html5lib tree builders (see
@@ -146,6 +139,24 @@ class Element(ElementBase):
         for child in self:
             new_parent.append(child)
 
+class NoNameSpaceElement(Element):
+
+    @property
+    def namespace(self):
+        return None
+
+    @dynamic_property
+    def name(self):
+        def fget(self):
+            return self.tag
+        def fset(self, val):
+            self.tag = val
+        return property(fget=fget, fset=fset)
+
+    @property
+    def nameTuple(self):
+        return html_ns, self.tag
+
 class Comment(CommentBase):
 
     @dynamic_property
@@ -214,6 +225,12 @@ class DocType(object):
     def __init__(self, name, public_id, system_id):
         self.text = self.name = name
         self.public_id, self.system_id = public_id, system_id
+
+def create_lxml_context(element=Element):
+    parser = XMLParser(no_network=True)
+    parser.set_element_class_lookup(ElementDefaultClassLookup(element=element, comment=Comment))
+    return parser
+
 # }}}
 
 def process_attribs(attrs, nsmap):
@@ -262,15 +279,13 @@ def process_attribs(attrs, nsmap):
 class TreeBuilder(BaseTreeBuilder):
 
     elementClass = ElementFactory
-    commentClass = Comment
     documentClass = Document
     doctypeClass = DocType
 
     def __init__(self, namespaceHTMLElements=True):
-        BaseTreeBuilder.__init__(self, True)
+        BaseTreeBuilder.__init__(self, namespaceHTMLElements)
         self.lxml_context = create_lxml_context()
         self.elementClass = partial(ElementFactory, context=self.lxml_context)
-        self.seen_extra_html = False
 
     def getDocument(self):
         return self.document.root
@@ -288,10 +303,10 @@ class TreeBuilder(BaseTreeBuilder):
         nsmap = nsmap or {}
         attribs = process_attribs(token['data'], nsmap)
         name = token["name"]
-        if name.endswith(':html'):
-            raise NamespacedHTMLPresent(name.rpartition(':')[0])
         namespace = token.get("namespace", self.defaultNamespace)
         if ':' in name:
+            if name.endswith(':html'):
+                raise NamespacedHTMLPresent(name.rpartition(':')[0])
             prefix, name = name.partition(':')[0::2]
             namespace = nsmap.get(prefix, namespace)
         try:
@@ -353,14 +368,56 @@ class TreeBuilder(BaseTreeBuilder):
                 for child in html:
                     newroot.append(copy.copy(child))
 
-def parse(raw, decoder=None, log=None):
+    def insertComment(self, token, parent=None):
+        if parent is None:
+            parent = self.openElements[-1]
+        parent.appendChild(Comment(token["data"].replace('--', '- -')))
+
+def process_namespace_free_attribs(attrs):
+    attribs = {k:v for k, v in attrs.iteritems() if ':' not in k}
+    for k in set(attrs) - set(attribs):
+        prefix, name = k.partition(':')[0::2]
+        if prefix != 'xmlns' and name not in attribs:
+            attribs[name] = attrs[k]
+    return attribs
+
+class NoNamespaceTreeBuilder(TreeBuilder):
+
+    def __init__(self, namespaceHTMLElements=False):
+        BaseTreeBuilder.__init__(self, namespaceHTMLElements)
+        self.lxml_context = create_lxml_context(element=NoNameSpaceElement)
+        self.elementClass = partial(ElementFactory, context=self.lxml_context)
+
+    def createElement(self, token, nsmap=None):
+        name = token['name'].rpartition(':')[2]
+        attribs = process_namespace_free_attribs(token['data'])
+        try:
+            return self.lxml_context.makeelement(name, attrib=attribs)
+        except ValueError:
+            attribs = {to_xml_name(k):v for k, v in attribs.iteritems()}
+            return self.lxml_context.makeelement(to_xml_name(name), attrib=attribs)
+
+    def apply_html_attributes(self, attrs):
+        if not attrs:
+            return
+        html = self.openElements[0]
+        attribs = process_namespace_free_attribs(attrs)
+        for k, v in attribs.iteritems():
+            if k not in html.attrib:
+                try:
+                    html.set(k, v)
+                except ValueError:
+                    html.set(to_xml_name(k), v)
+
+def parse(raw, decoder=None, log=None, discard_namespaces=False):
     if isinstance(raw, bytes):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
     raw = xml_replace_entities(raw)
+    builder = NoNamespaceTreeBuilder if discard_namespaces else TreeBuilder
     while True:
         try:
-            parser = HTMLParser(tree=TreeBuilder)
+            parser = HTMLParser(tree=builder, namespaceHTMLElements=not discard_namespaces)
             with warnings.catch_warnings():
                 warnings.simplefilter('ignore', category=DataLossWarning)
                 parser.parse(raw, parseMeta=False, useChardet=False)
@@ -369,14 +426,15 @@ def parse(raw, decoder=None, log=None):
             continue
         break
     root = parser.tree.getDocument()
-    if root.tag != '{%s}%s' % (namespaces['html'], 'html') or root.prefix:
+    if (discard_namespaces and root.tag != 'html') or (
+        not discard_namespaces and (root.tag != '{%s}%s' % (namespaces['html'], 'html') or root.prefix)):
         raise ValueError('Failed to parse correctly, root has tag: %s and prefix: %s' % (root.tag, root.prefix))
     return root
 
 
 if __name__ == '__main__':
     from lxml import etree
-    root = parse('<html><p>&nbsp;')
-    print (etree.tostring(root))
+    root = parse('<html><p>&nbsp;<b>b', discard_namespaces=True)
+    print (etree.tostring(root, encoding='utf-8'))
     print()
 

From 280add23cabf619b182def34d5276f3dc0b5c0f7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Oct 2013 21:40:44 +0530
Subject: [PATCH 1107/1154] Fix parsing of foreign elements with
 discard_namespaces

Also small speedup by using direct attributes for the
name/namespace/nameTuple attributes.
---
 src/calibre/ebooks/oeb/polish/parsing.py      | 72 ++++++++-----------
 .../ebooks/oeb/polish/tests/parsing.py        |  3 +
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 5b65b2d989..a9896e2b25 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -57,22 +57,6 @@ class Element(ElementBase):
         return '<%s%s%s (%s)>' % (prefix, self.name, attrs, hex(id(self)))
     __repr__ = __str__
 
-    @dynamic_property
-    def name(self):
-        def fget(self):
-            return self.tag.rpartition('}')[2]
-        def fset(self, val):
-            self.tag = '%s}%s' % (self.tag.rpartition('}')[2], val)
-        return property(fget=fget, fset=fset)
-
-    @property
-    def namespace(self):
-        return self.nsmap[self.prefix]
-
-    @property
-    def nameTuple(self):
-        return self.nsmap[self.prefix], self.tag.rpartition('}')[2]
-
     @property
     def attributes(self):
         return self.attrib
@@ -139,23 +123,6 @@ class Element(ElementBase):
         for child in self:
             new_parent.append(child)
 
-class NoNameSpaceElement(Element):
-
-    @property
-    def namespace(self):
-        return None
-
-    @dynamic_property
-    def name(self):
-        def fget(self):
-            return self.tag
-        def fset(self, val):
-            self.tag = val
-        return property(fget=fget, fset=fset)
-
-    @property
-    def nameTuple(self):
-        return html_ns, self.tag
 
 class Comment(CommentBase):
 
@@ -215,7 +182,7 @@ class Document(object):
         self.doctype = None
 
     def appendChild(self, child):
-        if isinstance(child, Element):
+        if isinstance(child, ElementBase):
             self.root = child
         elif isinstance(child, DocType):
             self.doctype = child
@@ -226,9 +193,9 @@ class DocType(object):
         self.text = self.name = name
         self.public_id, self.system_id = public_id, system_id
 
-def create_lxml_context(element=Element):
+def create_lxml_context():
     parser = XMLParser(no_network=True)
-    parser.set_element_class_lookup(ElementDefaultClassLookup(element=element, comment=Comment))
+    parser.set_element_class_lookup(ElementDefaultClassLookup(element=Element, comment=Comment))
     return parser
 
 # }}}
@@ -286,6 +253,7 @@ class TreeBuilder(BaseTreeBuilder):
         BaseTreeBuilder.__init__(self, namespaceHTMLElements)
         self.lxml_context = create_lxml_context()
         self.elementClass = partial(ElementFactory, context=self.lxml_context)
+        self.proxy_cache = []
 
     def getDocument(self):
         return self.document.root
@@ -302,7 +270,7 @@ class TreeBuilder(BaseTreeBuilder):
         """Create an element but don't insert it anywhere"""
         nsmap = nsmap or {}
         attribs = process_attribs(token['data'], nsmap)
-        name = token["name"]
+        name = token_name = token["name"]
         namespace = token.get("namespace", self.defaultNamespace)
         if ':' in name:
             if name.endswith(':html'):
@@ -322,6 +290,12 @@ class TreeBuilder(BaseTreeBuilder):
             if prefix not in nsmap:
                 nsmap[prefix] = namespace
                 elem = self.lxml_context.makeelement(elem.tag, attrib=elem.attrib, nsmap=nsmap)
+        # Keep a reference to elem so that lxml does not delete and re-create
+        # it, losing the name related attributes
+        self.proxy_cache.append(elem)
+        elem.name = token_name
+        elem.namespace = elem.nsmap[elem.prefix]
+        elem.nameTuple = (elem.nsmap[elem.prefix], elem.name)
         return elem
 
     def insertElementNormal(self, token):
@@ -360,6 +334,8 @@ class TreeBuilder(BaseTreeBuilder):
                     html.set(to_xml_name(k), v)
         if nsmap != html.nsmap:
             newroot = self.lxml_context.makeelement(html.tag, attrib=html.attrib, nsmap=nsmap)
+            self.proxy_cache.append(newroot)
+            newroot.name, newroot.namespace, newroot.nameTuple = html.name, html.namespace, html.nameTuple
             self.openElements[0] = newroot
             if self.document.root is html:
                 self.document.root = newroot
@@ -385,17 +361,25 @@ class NoNamespaceTreeBuilder(TreeBuilder):
 
     def __init__(self, namespaceHTMLElements=False):
         BaseTreeBuilder.__init__(self, namespaceHTMLElements)
-        self.lxml_context = create_lxml_context(element=NoNameSpaceElement)
+        self.lxml_context = create_lxml_context()
         self.elementClass = partial(ElementFactory, context=self.lxml_context)
+        self.proxy_cache = []
 
     def createElement(self, token, nsmap=None):
         name = token['name'].rpartition(':')[2]
         attribs = process_namespace_free_attribs(token['data'])
         try:
-            return self.lxml_context.makeelement(name, attrib=attribs)
+            elem = self.lxml_context.makeelement(name, attrib=attribs)
         except ValueError:
             attribs = {to_xml_name(k):v for k, v in attribs.iteritems()}
-            return self.lxml_context.makeelement(to_xml_name(name), attrib=attribs)
+            elem = self.lxml_context.makeelement(to_xml_name(name), attrib=attribs)
+        # Keep a reference to elem so that lxml does not delete and re-create
+        # it, losing _namespace
+        self.proxy_cache.append(elem)
+        elem.name = elem.tag
+        elem.namespace = token.get('namespace', self.defaultNamespace)
+        elem.nameTuple = (elem.namespace or html_ns, elem.name)
+        return elem
 
     def apply_html_attributes(self, attrs):
         if not attrs:
@@ -420,7 +404,10 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False):
             parser = HTMLParser(tree=builder, namespaceHTMLElements=not discard_namespaces)
             with warnings.catch_warnings():
                 warnings.simplefilter('ignore', category=DataLossWarning)
-                parser.parse(raw, parseMeta=False, useChardet=False)
+                try:
+                    parser.parse(raw, parseMeta=False, useChardet=False)
+                finally:
+                    parser.tree.proxy_cache = None
         except NamespacedHTMLPresent as err:
             raw = re.sub(r'<\s*/{0,1}(%s:)' % err.prefix, lambda m: m.group().replace(m.group(1), ''), raw, flags=re.I)
             continue
@@ -434,7 +421,8 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False):
 
 if __name__ == '__main__':
     from lxml import etree
-    root = parse('<html><p>&nbsp;<b>b', discard_namespaces=True)
+    # root = parse('\n<html><head><title>a\n</title><p>&nbsp;\n<b>b', discard_namespaces=False)
+    root = parse('\n<html><p><svg><image /><b></svg>&nbsp;\n<b>xxx', discard_namespaces=True)
     print (etree.tostring(root, encoding='utf-8'))
     print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 01fb5ec9e9..d4474832b8 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -136,3 +136,6 @@ class ParsingTests(BaseTest):
         ' Test parsing with the HTML5 parser used for polishing '
         for test in basic_checks:
             test(self, parse)
+
+        root = parse('<html><p><svg><image /><b></svg>&nbsp;\n<b>xxx', discard_namespaces=True)
+        self.assertFalse(root.xpath('//svg/b'), 'The <b> was not moved out of <svg>')

From d93467b3a3802d939019de6c39290253ae5acc91 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 08:43:42 +0530
Subject: [PATCH 1108/1154] Ensure that svg, mathml tags and xlink attrs have
 the standard namespace prefixes

---
 src/calibre/ebooks/oeb/polish/parsing.py      | 25 ++++++++++++-------
 .../ebooks/oeb/polish/tests/parsing.py        | 11 +++++---
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index a9896e2b25..01f893378c 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -23,8 +23,9 @@ from calibre.utils.cleantext import clean_xml_chars
 
 infoset_filter = InfosetFilter()
 to_xml_name = infoset_filter.toXmlName
-known_namespaces = {namespaces[k]:k for k in ('mathml', 'svg')}
+known_namespaces = {namespaces[k]:k for k in ('mathml', 'svg', 'xlink')}
 html_ns = namespaces['html']
+xlink_ns = namespaces['xlink']
 
 class NamespacedHTMLPresent(ValueError):
 
@@ -213,6 +214,11 @@ def process_attribs(attrs, nsmap):
                 else:
                     nsmap[name] = v
             else:
+                if k[2] == xlink_ns and 'xlink' not in nsmap:
+                    for prefix, ns in tuple(nsmap.iteritems()):
+                        if ns == xlink_ns:
+                            del nsmap[prefix]
+                    nsmap['xlink'] = xlink_ns
                 attribs['{%s}%s' % (k[2], k[1])] = v
         else:
             if ':' in k:
@@ -283,13 +289,14 @@ class TreeBuilder(BaseTreeBuilder):
             attribs = {to_xml_name(k):v for k, v in attribs.iteritems()}
             elem = self.lxml_context.makeelement('{%s}%s' % (namespace, to_xml_name(name)), attrib=attribs, nsmap=nsmap)
 
-        # Ensure that svg and mathml elements get nice namespace prefixes if
-        # the input document is HTML 5 with no namespace information
-        if elem.prefix is not None and elem.prefix.startswith('ns') and namespace not in set(nsmap.itervalues()) and namespace in known_namespaces:
-            prefix = known_namespaces[namespace]
-            if prefix not in nsmap:
-                nsmap[prefix] = namespace
-                elem = self.lxml_context.makeelement(elem.tag, attrib=elem.attrib, nsmap=nsmap)
+        # Ensure that svg and mathml elements get no namespace prefixes
+        if elem.prefix is not None and namespace in known_namespaces:
+            for k, v in tuple(nsmap.iteritems()):
+                if v == namespace:
+                    del nsmap[k]
+            nsmap[None] = namespace
+            elem = self.lxml_context.makeelement(elem.tag, attrib=elem.attrib, nsmap=nsmap)
+
         # Keep a reference to elem so that lxml does not delete and re-create
         # it, losing the name related attributes
         self.proxy_cache.append(elem)
@@ -422,7 +429,7 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False):
 if __name__ == '__main__':
     from lxml import etree
     # root = parse('\n<html><head><title>a\n</title><p>&nbsp;\n<b>b', discard_namespaces=False)
-    root = parse('\n<html><p><svg><image /><b></svg>&nbsp;\n<b>xxx', discard_namespaces=True)
+    root = parse('\n<html><p><svg viewbox="0 0 0 0"><image xlink:href="xxx"/><b></svg>&nbsp;\n<b>xxx', discard_namespaces=False)
     print (etree.tostring(root, encoding='utf-8'))
     print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index d4474832b8..318ab5e3c9 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -48,8 +48,8 @@ def namespaces(test, parse_function):
     root = parse_function(markup)
     err = 'Incorrect parsing, parsed markup:\n' + etree.tostring(root)
     match_and_prefix(root, '//h:body[@id="test"]', None, err)
-    match_and_prefix(root, '//svg:svg', 'svg', err)
-    match_and_prefix(root, '//svg:image[@xl:href]', 'svg', err)
+    match_and_prefix(root, '//svg:svg', None if parse_function is parse else 'svg', err)
+    match_and_prefix(root, '//svg:image[@xl:href]', None if parse_function is parse else 'svg', err)
 
     markup = '''
     <html xmlns="{xhtml}"><head><body id="test">
@@ -64,8 +64,11 @@ def namespaces(test, parse_function):
     markup = '<html><body><svg><image xlink:href="xxx"></svg>'
     root = parse_function(markup)
     err = 'Namespaces not created, parsed markup:\n' + etree.tostring(root)
-    match_and_prefix(root, '//svg:svg', 'svg', err)
-    match_and_prefix(root, '//svg:image[@xl:href]', 'svg', err)
+    match_and_prefix(root, '//svg:svg', None if parse_function is parse else 'svg', err)
+    match_and_prefix(root, '//svg:image[@xl:href]', None if parse_function is parse else 'svg', err)
+    if parse_function is parse:
+        image = XPath('//svg:image')(root)[0]
+        ae(image.nsmap, {'xlink':XLINK_NS, None:SVG_NS})
 
     root = parse_function('<html id="a"><p><html xmlns:x="y" lang="en"><p>')
     err = 'Multiple HTML tags not handled, parsed markup:\n' + etree.tostring(root)

From 0d1c917281e5bc397cbad8b85810a692851a8293 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 11:01:30 +0530
Subject: [PATCH 1109/1154] Speed up parsing some more by using a faster stream
 class

---
 src/calibre/ebooks/oeb/polish/parsing.py | 73 +++++++++++++++++++++++-
 src/html5lib/inputstream.py              |  6 +-
 2 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 01f893378c..7cd9035775 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -8,10 +8,11 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import copy, re, warnings
 from functools import partial
+from bisect import bisect
 
 from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
 
-from html5lib.constants import namespaces, tableInsertModeElements
+from html5lib.constants import namespaces, tableInsertModeElements, EOF
 from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
 from html5lib.ihatexml import InfosetFilter, DataLossWarning
 from html5lib.html5parser import HTMLParser
@@ -400,11 +401,76 @@ class NoNamespaceTreeBuilder(TreeBuilder):
                 except ValueError:
                     html.set(to_xml_name(k), v)
 
-def parse(raw, decoder=None, log=None, discard_namespaces=False):
+_regex_cache = {}
+
+class FastStream(object):
+
+    __slots__ = ('raw', 'pos', 'errors', 'new_lines', 'track_position', 'charEncoding')
+
+    def __init__(self, raw, track_position=False):
+        self.raw = raw
+        self.pos = 0
+        self.errors = []
+        self.charEncoding = ("utf-8", "certain")
+        self.track_position = track_position
+        if track_position:
+            self.new_lines = tuple(m.start() for m in re.finditer(r'\n', raw))
+
+    def reset(self):
+        self.pos = 0
+
+    def char(self):
+        try:
+            ans = self.raw[self.pos]
+        except IndexError:
+            return EOF
+        self.pos += 1
+        return ans
+
+    def unget(self, char):
+        if char is not None:
+            self.pos = max(0, self.pos - 1)
+
+    def charsUntil(self, characters, opposite=False):
+        # Use a cache of regexps to find the required characters
+        try:
+            chars = _regex_cache[(characters, opposite)]
+        except KeyError:
+            regex = "".join(["\\x%02x" % ord(c) for c in characters])
+            if not opposite:
+                regex = "^%s" % regex
+            chars = _regex_cache[(characters, opposite)] = re.compile("[%s]+" % regex)
+
+        # Find the longest matching prefix
+        m = chars.match(self.raw, self.pos)
+        if m is None:
+            return ''
+        self.pos = m.end()
+        return m.group()
+
+    def position(self):
+        if not self.track_position:
+            return (-1, -1)
+        lnum = bisect(self.new_lines, self.pos)
+        if lnum == 0:
+            return (1, self.pos)
+        return (lnum, self.pos - self.new_lines[lnum - 1])
+
+if len("\U0010FFFF") == 1:  # UCS4 build
+    replace_chars = re.compile("[\uD800-\uDFFF]")
+else:
+    replace_chars = re.compile("([\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF])")
+
+def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=True):
     if isinstance(raw, bytes):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
     raw = xml_replace_entities(raw)
+    raw = raw.replace('\r\n', '\n').replace('\r', '\n')
+    raw = replace_chars.sub('', raw)
+
+    stream_class = partial(FastStream, track_position=line_numbers)
+    stream = stream_class(raw)
     builder = NoNamespaceTreeBuilder if discard_namespaces else TreeBuilder
     while True:
         try:
@@ -412,11 +478,12 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False):
             with warnings.catch_warnings():
                 warnings.simplefilter('ignore', category=DataLossWarning)
                 try:
-                    parser.parse(raw, parseMeta=False, useChardet=False)
+                    parser.parse(stream, parseMeta=False, useChardet=False)
                 finally:
                     parser.tree.proxy_cache = None
         except NamespacedHTMLPresent as err:
             raw = re.sub(r'<\s*/{0,1}(%s:)' % err.prefix, lambda m: m.group().replace(m.group(1), ''), raw, flags=re.I)
+            stream = stream_class(raw)
             continue
         break
     root = parser.tree.getDocument()
diff --git a/src/html5lib/inputstream.py b/src/html5lib/inputstream.py
index 004bdd4ad9..fdfb1e98d8 100644
--- a/src/html5lib/inputstream.py
+++ b/src/html5lib/inputstream.py
@@ -27,7 +27,7 @@ asciiLettersBytes = frozenset([item.encode("ascii") for item in asciiLetters])
 asciiUppercaseBytes = frozenset([item.encode("ascii") for item in asciiUppercase])
 spacesAngleBrackets = spaceCharactersBytes | frozenset([b">", b"<"])
 
-invalid_unicode_re = re.compile("[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uD800-\uDFFF\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]")
+invalid_unicode_re = re.compile("[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uD800-\uDFFF\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]")  # noqa
 
 non_bmp_invalid_codepoints = set([0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
                                   0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF,
@@ -118,6 +118,10 @@ class BufferedStream(object):
 
 
 def HTMLInputStream(source, encoding=None, parseMeta=True, chardet=True):
+    if (hasattr(source, 'unget') and hasattr(source, 'charsUntil') and
+        hasattr(source, 'position') and hasattr(source, 'char') and
+        hasattr(source, 'reset') and hasattr(source, 'errors')):
+        return source
     if hasattr(source, "read"):
         isUnicode = isinstance(source.read(0), text_type)
     else:

From 9503652a4b563ae7f2a37dad4085a7261173a942 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 12:47:57 +0530
Subject: [PATCH 1110/1154] Add support for line numbers to the HTML 5 parser

---
 src/calibre/ebooks/oeb/polish/parsing.py      |  56 +++++--
 .../ebooks/oeb/polish/tests/parsing.py        |   9 +
 src/html5lib/html5parser.py                   | 154 +++++++++++-------
 src/html5lib/tokenizer.py                     |   5 +-
 4 files changed, 148 insertions(+), 76 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 7cd9035775..dda22db9f3 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -256,8 +256,9 @@ class TreeBuilder(BaseTreeBuilder):
     documentClass = Document
     doctypeClass = DocType
 
-    def __init__(self, namespaceHTMLElements=True):
+    def __init__(self, namespaceHTMLElements=True, linenumber_attribute=None):
         BaseTreeBuilder.__init__(self, namespaceHTMLElements)
+        self.linenumber_attribute = linenumber_attribute
         self.lxml_context = create_lxml_context()
         self.elementClass = partial(ElementFactory, context=self.lxml_context)
         self.proxy_cache = []
@@ -304,6 +305,20 @@ class TreeBuilder(BaseTreeBuilder):
         elem.name = token_name
         elem.namespace = elem.nsmap[elem.prefix]
         elem.nameTuple = (elem.nsmap[elem.prefix], elem.name)
+        position = token.get('position', None)
+        if position is not None:
+            # Unfortunately, libxml2 can only store line numbers upto 65535
+            # (unsigned short). If you really need to workaround this, use the
+            # patch here:
+            # https://bug325533.bugzilla-attachments.gnome.org/attachment.cgi?id=56951
+            # (replacing int with size_t) and patching lxml correspondingly to
+            # get rid of the OverflowError
+            try:
+                elem.sourceline = position[0][0]
+            except OverflowError:
+                elem.sourceline = 65535
+            if self.linenumber_attribute is not None:
+                elem.set(self.linenumber_attribute, str(position[0][0]))
         return elem
 
     def insertElementNormal(self, token):
@@ -367,8 +382,9 @@ def process_namespace_free_attribs(attrs):
 
 class NoNamespaceTreeBuilder(TreeBuilder):
 
-    def __init__(self, namespaceHTMLElements=False):
+    def __init__(self, namespaceHTMLElements=False, linenumber_attribute=None):
         BaseTreeBuilder.__init__(self, namespaceHTMLElements)
+        self.linenumber_attribute = linenumber_attribute
         self.lxml_context = create_lxml_context()
         self.elementClass = partial(ElementFactory, context=self.lxml_context)
         self.proxy_cache = []
@@ -387,6 +403,14 @@ class NoNamespaceTreeBuilder(TreeBuilder):
         elem.name = elem.tag
         elem.namespace = token.get('namespace', self.defaultNamespace)
         elem.nameTuple = (elem.namespace or html_ns, elem.name)
+        position = token.get('position', None)
+        if position is not None:
+            try:
+                elem.sourceline = position[0][0]
+            except OverflowError:
+                elem.sourceline = 65535
+            if self.linenumber_attribute is not None:
+                elem.set(self.linenumber_attribute, str(position[0][0]))
         return elem
 
     def apply_html_attributes(self, attrs):
@@ -401,6 +425,7 @@ class NoNamespaceTreeBuilder(TreeBuilder):
                 except ValueError:
                     html.set(to_xml_name(k), v)
 
+# Input Stream {{{
 _regex_cache = {}
 
 class FastStream(object):
@@ -414,7 +439,7 @@ class FastStream(object):
         self.charEncoding = ("utf-8", "certain")
         self.track_position = track_position
         if track_position:
-            self.new_lines = tuple(m.start() for m in re.finditer(r'\n', raw))
+            self.new_lines = tuple(m.start() + 1 for m in re.finditer(r'\n', raw))
 
     def reset(self):
         self.pos = 0
@@ -451,17 +476,24 @@ class FastStream(object):
     def position(self):
         if not self.track_position:
             return (-1, -1)
-        lnum = bisect(self.new_lines, self.pos)
-        if lnum == 0:
-            return (1, self.pos)
-        return (lnum, self.pos - self.new_lines[lnum - 1])
+        pos = self.pos
+        lnum = bisect(self.new_lines, pos)
+        # lnum is the line from which the next char() will come, therefore the
+        # current char is a \n and \n is given the line number of the line it
+        # creates.
+        try:
+            offset = self.new_lines[lnum - 1] - pos
+        except IndexError:
+            offset = pos
+        return (lnum + 1, offset)
+# }}}
 
 if len("\U0010FFFF") == 1:  # UCS4 build
     replace_chars = re.compile("[\uD800-\uDFFF]")
 else:
     replace_chars = re.compile("([\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF])")
 
-def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=True):
+def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=True, linenumber_attribute=None):
     if isinstance(raw, bytes):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
@@ -471,10 +503,10 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=Tr
 
     stream_class = partial(FastStream, track_position=line_numbers)
     stream = stream_class(raw)
-    builder = NoNamespaceTreeBuilder if discard_namespaces else TreeBuilder
+    builder = partial(NoNamespaceTreeBuilder if discard_namespaces else TreeBuilder, linenumber_attribute=linenumber_attribute)
     while True:
         try:
-            parser = HTMLParser(tree=builder, namespaceHTMLElements=not discard_namespaces)
+            parser = HTMLParser(tree=builder, track_positions=line_numbers, namespaceHTMLElements=not discard_namespaces)
             with warnings.catch_warnings():
                 warnings.simplefilter('ignore', category=DataLossWarning)
                 try:
@@ -495,8 +527,8 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=Tr
 
 if __name__ == '__main__':
     from lxml import etree
-    # root = parse('\n<html><head><title>a\n</title><p>&nbsp;\n<b>b', discard_namespaces=False)
-    root = parse('\n<html><p><svg viewbox="0 0 0 0"><image xlink:href="xxx"/><b></svg>&nbsp;\n<b>xxx', discard_namespaces=False)
+    root = parse('\n<html><head><title>a\n</title><p>&nbsp;\n<b>b', discard_namespaces=False)
+    # root = parse('\n<html><p><svg viewbox="0 0 0 0"><image xlink:href="xxx"/><b></svg>&nbsp;\n<b>xxx', discard_namespaces=False)
     print (etree.tostring(root, encoding='utf-8'))
     print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 318ab5e3c9..a70df254f0 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -141,4 +141,13 @@ class ParsingTests(BaseTest):
             test(self, parse)
 
         root = parse('<html><p><svg><image /><b></svg>&nbsp;\n<b>xxx', discard_namespaces=True)
+        self.assertTrue(root.xpath('//b'), 'Namespaces not discarded')
         self.assertFalse(root.xpath('//svg/b'), 'The <b> was not moved out of <svg>')
+
+        for ds in (False, True):
+            src = '\n<html>\n<p>\n<svg><image />\n<b></svg>&nbsp'
+            root = parse(src, discard_namespaces=ds)
+            for tag, lnum in {'html':2, 'head':3, 'body':3, 'p':3, 'svg':4, 'image':4, 'b':5}.iteritems():
+                elem = root.xpath('//*[local-name()="%s"]' % tag)[0]
+                self.assertEqual(lnum, elem.sourceline, 'Line number incorrect for %s, source: %s:' % (tag, src))
+
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
index fad66ff3e9..44f44af574 100644
--- a/src/html5lib/html5parser.py
+++ b/src/html5lib/html5parser.py
@@ -37,6 +37,7 @@ def parseFragment(doc, container="div", treebuilder="etree", encoding=None,
 
 def method_decorator_metaclass(function):
     class Decorated(type):
+
         def __new__(meta, classname, bases, classDict):
             for attributeName, attribute in classDict.items():
                 if isinstance(attribute, types.FunctionType):
@@ -48,11 +49,12 @@ def method_decorator_metaclass(function):
 
 
 class HTMLParser(object):
+
     """HTML parser. Generates a tree structure from a stream of (possibly
         malformed) HTML"""
 
     def __init__(self, tree=None, tokenizer=tokenizer.HTMLTokenizer,
-                 strict=False, namespaceHTMLElements=True, debug=False):
+                 strict=False, namespaceHTMLElements=True, debug=False, track_positions=False):
         """
         strict - raise an exception when a parse error is encountered
 
@@ -67,6 +69,7 @@ class HTMLParser(object):
 
         # Raise an exception on the first error encountered
         self.strict = strict
+        self.track_positions = track_positions
 
         if tree is None:
             tree = treebuilders.getTreeBuilder("etree")
@@ -85,6 +88,7 @@ class HTMLParser(object):
         self.tokenizer = self.tokenizer_class(stream, encoding=encoding,
                                               parseMeta=parseMeta,
                                               useChardet=useChardet,
+                                              track_positions=self.track_positions,
                                               parser=self, **kwargs)
         self.reset()
 
@@ -406,6 +410,15 @@ class HTMLParser(object):
 
         self.phase = self.phases["text"]
 
+    def impliedTagToken(self, name, type="EndTag", attributes=None,
+                        selfClosing=False):
+        if attributes is None:
+            attributes = {}
+        ans = {"type": tokenTypes[type], "name": name, "data": attributes,
+                "selfClosing": selfClosing}
+        if self.track_positions:
+            ans['position'] = (self.tokenizer.stream.position(), True)
+        return ans
 
 def getPhases(debug):
     def log(function):
@@ -440,12 +453,14 @@ def getPhases(debug):
             return type
 
     class Phase(with_metaclass(getMetaclass(debug, log))):
+
         """Base class for helper object that implements each phase of processing
         """
 
         def __init__(self, parser, tree):
             self.parser = parser
             self.tree = tree
+            self.impliedTagToken = parser.impliedTagToken
 
         def processEOF(self):
             raise NotImplementedError
@@ -479,6 +494,7 @@ def getPhases(debug):
             return self.endTagHandler[token["name"]](token)
 
     class InitialPhase(Phase):
+
         def processSpaceCharacters(self, token):
             pass
 
@@ -609,8 +625,9 @@ def getPhases(debug):
 
     class BeforeHtmlPhase(Phase):
         # helper methods
+
         def insertHtmlElement(self):
-            self.tree.insertRoot(impliedTagToken("html", "StartTag"))
+            self.tree.insertRoot(self.impliedTagToken("html", "StartTag"))
             self.parser.phase = self.parser.phases["beforeHead"]
 
         # other
@@ -643,6 +660,7 @@ def getPhases(debug):
                 return token
 
     class BeforeHeadPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -658,14 +676,14 @@ def getPhases(debug):
             self.endTagHandler.default = self.endTagOther
 
         def processEOF(self):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
+            self.startTagHead(self.impliedTagToken("head", "StartTag"))
             return True
 
         def processSpaceCharacters(self, token):
             pass
 
         def processCharacters(self, token):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
+            self.startTagHead(self.impliedTagToken("head", "StartTag"))
             return token
 
         def startTagHtml(self, token):
@@ -677,11 +695,11 @@ def getPhases(debug):
             self.parser.phase = self.parser.phases["inHead"]
 
         def startTagOther(self, token):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
+            self.startTagHead(self.impliedTagToken("head", "StartTag"))
             return token
 
         def endTagImplyHead(self, token):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
+            self.startTagHead(self.impliedTagToken("head", "StartTag"))
             return token
 
         def endTagOther(self, token):
@@ -689,6 +707,7 @@ def getPhases(debug):
                                    {"name": token["name"]})
 
     class InHeadPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -781,13 +800,14 @@ def getPhases(debug):
             self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
 
         def anythingElse(self):
-            self.endTagHead(impliedTagToken("head"))
+            self.endTagHead(self.impliedTagToken("head"))
 
     # XXX If we implement a parser for which scripting is disabled we need to
     # implement this phase.
     #
     # class InHeadNoScriptPhase(Phase):
     class AfterHeadPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -850,13 +870,14 @@ def getPhases(debug):
             self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
 
         def anythingElse(self):
-            self.tree.insertElement(impliedTagToken("body", "StartTag"))
+            self.tree.insertElement(self.impliedTagToken("body", "StartTag"))
             self.parser.phase = self.parser.phases["inBody"]
             self.parser.framesetOK = True
 
     class InBodyPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#parsing-main-inbody
         # the really-really-really-very crazy mode
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -1027,12 +1048,12 @@ def getPhases(debug):
 
         def startTagCloseP(self, token):
             if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
+                self.endTagP(self.impliedTagToken("p"))
             self.tree.insertElement(token)
 
         def startTagPreListing(self, token):
             if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
+                self.endTagP(self.impliedTagToken("p"))
             self.tree.insertElement(token)
             self.parser.framesetOK = False
             self.processSpaceCharacters = self.processSpaceCharactersDropNewline
@@ -1042,7 +1063,7 @@ def getPhases(debug):
                 self.parser.parseError("unexpected-start-tag", {"name": "form"})
             else:
                 if self.tree.elementInScope("p", variant="button"):
-                    self.endTagP(impliedTagToken("p"))
+                    self.endTagP(self.impliedTagToken("p"))
                 self.tree.insertElement(token)
                 self.tree.formPointer = self.tree.openElements[-1]
 
@@ -1056,7 +1077,7 @@ def getPhases(debug):
             for node in reversed(self.tree.openElements):
                 if node.name in stopNames:
                     self.parser.phase.processEndTag(
-                        impliedTagToken(node.name, "EndTag"))
+                        self.impliedTagToken(node.name, "EndTag"))
                     break
                 if (node.nameTuple in specialElements and
                         node.name not in ("address", "div", "p")):
@@ -1064,19 +1085,19 @@ def getPhases(debug):
 
             if self.tree.elementInScope("p", variant="button"):
                 self.parser.phase.processEndTag(
-                    impliedTagToken("p", "EndTag"))
+                    self.impliedTagToken("p", "EndTag"))
 
             self.tree.insertElement(token)
 
         def startTagPlaintext(self, token):
             if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
+                self.endTagP(self.impliedTagToken("p"))
             self.tree.insertElement(token)
             self.parser.tokenizer.state = self.parser.tokenizer.plaintextState
 
         def startTagHeading(self, token):
             if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
+                self.endTagP(self.impliedTagToken("p"))
             if self.tree.openElements[-1].name in headingElements:
                 self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
                 self.tree.openElements.pop()
@@ -1087,7 +1108,7 @@ def getPhases(debug):
             if afeAElement is not False:
                 self.parser.parseError("unexpected-start-tag-implies-end-tag",
                                        {"startName": "a", "endName": "a"})
-                self.endTagFormatting(impliedTagToken("a"))
+                self.endTagFormatting(self.impliedTagToken("a"))
                 if afeAElement in self.tree.openElements:
                     self.tree.openElements.remove(afeAElement)
                 if afeAElement in self.tree.activeFormattingElements:
@@ -1104,7 +1125,7 @@ def getPhases(debug):
             if self.tree.elementInScope("nobr"):
                 self.parser.parseError("unexpected-start-tag-implies-end-tag",
                                        {"startName": "nobr", "endName": "nobr"})
-                self.processEndTag(impliedTagToken("nobr"))
+                self.processEndTag(self.impliedTagToken("nobr"))
                 # XXX Need tests that trigger the following
                 self.tree.reconstructActiveFormattingElements()
             self.addFormattingElement(token)
@@ -1113,7 +1134,7 @@ def getPhases(debug):
             if self.tree.elementInScope("button"):
                 self.parser.parseError("unexpected-start-tag-implies-end-tag",
                                        {"startName": "button", "endName": "button"})
-                self.processEndTag(impliedTagToken("button"))
+                self.processEndTag(self.impliedTagToken("button"))
                 return token
             else:
                 self.tree.reconstructActiveFormattingElements()
@@ -1128,7 +1149,7 @@ def getPhases(debug):
 
         def startTagXmp(self, token):
             if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
+                self.endTagP(self.impliedTagToken("p"))
             self.tree.reconstructActiveFormattingElements()
             self.parser.framesetOK = False
             self.parser.parseRCDataRawtext(token, "RAWTEXT")
@@ -1136,7 +1157,7 @@ def getPhases(debug):
         def startTagTable(self, token):
             if self.parser.compatMode != "quirks":
                 if self.tree.elementInScope("p", variant="button"):
-                    self.processEndTag(impliedTagToken("p"))
+                    self.processEndTag(self.impliedTagToken("p"))
             self.tree.insertElement(token)
             self.parser.framesetOK = False
             self.parser.phase = self.parser.phases["inTable"]
@@ -1163,7 +1184,7 @@ def getPhases(debug):
 
         def startTagHr(self, token):
             if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
+                self.endTagP(self.impliedTagToken("p"))
             self.tree.insertElement(token)
             self.tree.openElements.pop()
             token["selfClosingAcknowledged"] = True
@@ -1173,7 +1194,7 @@ def getPhases(debug):
             # No really...
             self.parser.parseError("unexpected-start-tag-treated-as",
                                    {"originalName": "image", "newName": "img"})
-            self.processStartTag(impliedTagToken("img", "StartTag",
+            self.processStartTag(self.impliedTagToken("img", "StartTag",
                                                  attributes=token["data"],
                                                  selfClosing=token["selfClosing"]))
 
@@ -1184,10 +1205,10 @@ def getPhases(debug):
             form_attrs = {}
             if "action" in token["data"]:
                 form_attrs["action"] = token["data"]["action"]
-            self.processStartTag(impliedTagToken("form", "StartTag",
+            self.processStartTag(self.impliedTagToken("form", "StartTag",
                                                  attributes=form_attrs))
-            self.processStartTag(impliedTagToken("hr", "StartTag"))
-            self.processStartTag(impliedTagToken("label", "StartTag"))
+            self.processStartTag(self.impliedTagToken("hr", "StartTag"))
+            self.processStartTag(self.impliedTagToken("label", "StartTag"))
             # XXX Localization ...
             if "prompt" in token["data"]:
                 prompt = token["data"]["prompt"]
@@ -1201,13 +1222,13 @@ def getPhases(debug):
             if "prompt" in attributes:
                 del attributes["prompt"]
             attributes["name"] = "isindex"
-            self.processStartTag(impliedTagToken("input", "StartTag",
+            self.processStartTag(self.impliedTagToken("input", "StartTag",
                                                  attributes=attributes,
                                                  selfClosing=
                                                  token["selfClosing"]))
-            self.processEndTag(impliedTagToken("label"))
-            self.processStartTag(impliedTagToken("hr", "StartTag"))
-            self.processEndTag(impliedTagToken("form"))
+            self.processEndTag(self.impliedTagToken("label"))
+            self.processStartTag(self.impliedTagToken("hr", "StartTag"))
+            self.processEndTag(self.impliedTagToken("form"))
 
         def startTagTextarea(self, token):
             self.tree.insertElement(token)
@@ -1225,7 +1246,7 @@ def getPhases(debug):
 
         def startTagOpt(self, token):
             if self.tree.openElements[-1].name == "option":
-                self.parser.phase.processEndTag(impliedTagToken("option"))
+                self.parser.phase.processEndTag(self.impliedTagToken("option"))
             self.tree.reconstructActiveFormattingElements()
             self.parser.tree.insertElement(token)
 
@@ -1289,9 +1310,9 @@ def getPhases(debug):
 
         def endTagP(self, token):
             if not self.tree.elementInScope("p", variant="button"):
-                self.startTagCloseP(impliedTagToken("p", "StartTag"))
+                self.startTagCloseP(self.impliedTagToken("p", "StartTag"))
                 self.parser.parseError("unexpected-end-tag", {"name": "p"})
-                self.endTagP(impliedTagToken("p", "EndTag"))
+                self.endTagP(self.impliedTagToken("p", "EndTag"))
             else:
                 self.tree.generateImpliedEndTags("p")
                 if self.tree.openElements[-1].name != "p":
@@ -1321,7 +1342,7 @@ def getPhases(debug):
         def endTagHtml(self, token):
             # We repeat the test for the body end tag token being ignored here
             if self.tree.elementInScope("body"):
-                self.endTagBody(impliedTagToken("body"))
+                self.endTagBody(self.impliedTagToken("body"))
                 return token
 
         def endTagBlock(self, token):
@@ -1562,7 +1583,7 @@ def getPhases(debug):
             self.parser.parseError("unexpected-end-tag-treated-as",
                                    {"originalName": "br", "newName": "br element"})
             self.tree.reconstructActiveFormattingElements()
-            self.tree.insertElement(impliedTagToken("br", "StartTag"))
+            self.tree.insertElement(self.impliedTagToken("br", "StartTag"))
             self.tree.openElements.pop()
 
         def endTagOther(self, token):
@@ -1580,6 +1601,7 @@ def getPhases(debug):
                         break
 
     class TextPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
             self.startTagHandler = utils.MethodDispatcher([])
@@ -1614,6 +1636,7 @@ def getPhases(debug):
 
     class InTablePhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-table
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
             self.startTagHandler = utils.MethodDispatcher([
@@ -1685,7 +1708,7 @@ def getPhases(debug):
             self.parser.phase = self.parser.phases["inColumnGroup"]
 
         def startTagCol(self, token):
-            self.startTagColgroup(impliedTagToken("colgroup", "StartTag"))
+            self.startTagColgroup(self.impliedTagToken("colgroup", "StartTag"))
             return token
 
         def startTagRowGroup(self, token):
@@ -1694,13 +1717,13 @@ def getPhases(debug):
             self.parser.phase = self.parser.phases["inTableBody"]
 
         def startTagImplyTbody(self, token):
-            self.startTagRowGroup(impliedTagToken("tbody", "StartTag"))
+            self.startTagRowGroup(self.impliedTagToken("tbody", "StartTag"))
             return token
 
         def startTagTable(self, token):
             self.parser.parseError("unexpected-start-tag-implies-end-tag",
                                    {"startName": "table", "endName": "table"})
-            self.parser.phase.processEndTag(impliedTagToken("table"))
+            self.parser.phase.processEndTag(self.impliedTagToken("table"))
             if not self.parser.innerHTML:
                 return token
 
@@ -1758,6 +1781,7 @@ def getPhases(debug):
             self.tree.insertFromTable = False
 
     class InTableTextPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
             self.originalPhase = None
@@ -1804,6 +1828,7 @@ def getPhases(debug):
 
     class InCaptionPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-caption
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -1835,7 +1860,7 @@ def getPhases(debug):
             self.parser.parseError()
             # XXX Have to duplicate logic here to find out if the tag is ignored
             ignoreEndTag = self.ignoreEndTagCaption()
-            self.parser.phase.processEndTag(impliedTagToken("caption"))
+            self.parser.phase.processEndTag(self.impliedTagToken("caption"))
             if not ignoreEndTag:
                 return token
 
@@ -1863,7 +1888,7 @@ def getPhases(debug):
         def endTagTable(self, token):
             self.parser.parseError()
             ignoreEndTag = self.ignoreEndTagCaption()
-            self.parser.phase.processEndTag(impliedTagToken("caption"))
+            self.parser.phase.processEndTag(self.impliedTagToken("caption"))
             if not ignoreEndTag:
                 return token
 
@@ -1900,13 +1925,13 @@ def getPhases(debug):
                 return
             else:
                 ignoreEndTag = self.ignoreEndTagColgroup()
-                self.endTagColgroup(impliedTagToken("colgroup"))
+                self.endTagColgroup(self.impliedTagToken("colgroup"))
                 if not ignoreEndTag:
                     return True
 
         def processCharacters(self, token):
             ignoreEndTag = self.ignoreEndTagColgroup()
-            self.endTagColgroup(impliedTagToken("colgroup"))
+            self.endTagColgroup(self.impliedTagToken("colgroup"))
             if not ignoreEndTag:
                 return token
 
@@ -1916,7 +1941,7 @@ def getPhases(debug):
 
         def startTagOther(self, token):
             ignoreEndTag = self.ignoreEndTagColgroup()
-            self.endTagColgroup(impliedTagToken("colgroup"))
+            self.endTagColgroup(self.impliedTagToken("colgroup"))
             if not ignoreEndTag:
                 return token
 
@@ -1934,12 +1959,13 @@ def getPhases(debug):
 
         def endTagOther(self, token):
             ignoreEndTag = self.ignoreEndTagColgroup()
-            self.endTagColgroup(impliedTagToken("colgroup"))
+            self.endTagColgroup(self.impliedTagToken("colgroup"))
             if not ignoreEndTag:
                 return token
 
     class InTableBodyPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-table0
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
             self.startTagHandler = utils.MethodDispatcher([
@@ -1987,7 +2013,7 @@ def getPhases(debug):
         def startTagTableCell(self, token):
             self.parser.parseError("unexpected-cell-in-table-body",
                                    {"name": token["name"]})
-            self.startTagTr(impliedTagToken("tr", "StartTag"))
+            self.startTagTr(self.impliedTagToken("tr", "StartTag"))
             return token
 
         def startTagTableOther(self, token):
@@ -1997,7 +2023,7 @@ def getPhases(debug):
                     self.tree.elementInScope("tfoot", variant="table")):
                 self.clearStackToTableBodyContext()
                 self.endTagTableRowGroup(
-                    impliedTagToken(self.tree.openElements[-1].name))
+                    self.impliedTagToken(self.tree.openElements[-1].name))
                 return token
             else:
                 # innerHTML case
@@ -2022,7 +2048,7 @@ def getPhases(debug):
                     self.tree.elementInScope("tfoot", variant="table")):
                 self.clearStackToTableBodyContext()
                 self.endTagTableRowGroup(
-                    impliedTagToken(self.tree.openElements[-1].name))
+                    self.impliedTagToken(self.tree.openElements[-1].name))
                 return token
             else:
                 # innerHTML case
@@ -2038,6 +2064,7 @@ def getPhases(debug):
 
     class InRowPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-row
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
             self.startTagHandler = utils.MethodDispatcher([
@@ -2085,7 +2112,7 @@ def getPhases(debug):
 
         def startTagTableOther(self, token):
             ignoreEndTag = self.ignoreEndTagTr()
-            self.endTagTr(impliedTagToken("tr"))
+            self.endTagTr(self.impliedTagToken("tr"))
             # XXX how are we sure it's always ignored in the innerHTML case?
             if not ignoreEndTag:
                 return token
@@ -2105,7 +2132,7 @@ def getPhases(debug):
 
         def endTagTable(self, token):
             ignoreEndTag = self.ignoreEndTagTr()
-            self.endTagTr(impliedTagToken("tr"))
+            self.endTagTr(self.impliedTagToken("tr"))
             # Reprocess the current tag if the tr end tag was not ignored
             # XXX how are we sure it's always ignored in the innerHTML case?
             if not ignoreEndTag:
@@ -2113,7 +2140,7 @@ def getPhases(debug):
 
         def endTagTableRowGroup(self, token):
             if self.tree.elementInScope(token["name"], variant="table"):
-                self.endTagTr(impliedTagToken("tr"))
+                self.endTagTr(self.impliedTagToken("tr"))
                 return token
             else:
                 self.parser.parseError()
@@ -2127,6 +2154,7 @@ def getPhases(debug):
 
     class InCellPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-cell
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
             self.startTagHandler = utils.MethodDispatcher([
@@ -2146,9 +2174,9 @@ def getPhases(debug):
         # helper
         def closeCell(self):
             if self.tree.elementInScope("td", variant="table"):
-                self.endTagTableCell(impliedTagToken("td"))
+                self.endTagTableCell(self.impliedTagToken("td"))
             elif self.tree.elementInScope("th", variant="table"):
-                self.endTagTableCell(impliedTagToken("th"))
+                self.endTagTableCell(self.impliedTagToken("th"))
 
         # the rest
         def processEOF(self):
@@ -2202,6 +2230,7 @@ def getPhases(debug):
             return self.parser.phases["inBody"].processEndTag(token)
 
     class InSelectPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -2249,12 +2278,12 @@ def getPhases(debug):
 
         def startTagSelect(self, token):
             self.parser.parseError("unexpected-select-in-select")
-            self.endTagSelect(impliedTagToken("select"))
+            self.endTagSelect(self.impliedTagToken("select"))
 
         def startTagInput(self, token):
             self.parser.parseError("unexpected-input-in-select")
             if self.tree.elementInScope("select", variant="select"):
-                self.endTagSelect(impliedTagToken("select"))
+                self.endTagSelect(self.impliedTagToken("select"))
                 return token
             else:
                 assert self.parser.innerHTML
@@ -2302,6 +2331,7 @@ def getPhases(debug):
                                    {"name": token["name"]})
 
     class InSelectInTablePhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -2325,7 +2355,7 @@ def getPhases(debug):
 
         def startTagTable(self, token):
             self.parser.parseError("unexpected-table-element-start-tag-in-select-in-table", {"name": token["name"]})
-            self.endTagOther(impliedTagToken("select"))
+            self.endTagOther(self.impliedTagToken("select"))
             return token
 
         def startTagOther(self, token):
@@ -2334,7 +2364,7 @@ def getPhases(debug):
         def endTagTable(self, token):
             self.parser.parseError("unexpected-table-element-end-tag-in-select-in-table", {"name": token["name"]})
             if self.tree.elementInScope(token["name"], variant="table"):
-                self.endTagOther(impliedTagToken("select"))
+                self.endTagOther(self.impliedTagToken("select"))
                 return token
 
         def endTagOther(self, token):
@@ -2456,6 +2486,7 @@ def getPhases(debug):
             return new_token
 
     class AfterBodyPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -2504,6 +2535,7 @@ def getPhases(debug):
 
     class InFramesetPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-frameset
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -2561,6 +2593,7 @@ def getPhases(debug):
 
     class AfterFramesetPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#after3
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -2597,6 +2630,7 @@ def getPhases(debug):
                                    {"name": token["name"]})
 
     class AfterAfterBodyPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -2635,6 +2669,7 @@ def getPhases(debug):
             return token
 
     class AfterAfterFramesetPhase(Phase):
+
         def __init__(self, parser, tree):
             Phase.__init__(self, parser, tree)
 
@@ -2698,14 +2733,7 @@ def getPhases(debug):
     }
 
 
-def impliedTagToken(name, type="EndTag", attributes=None,
-                    selfClosing=False):
-    if attributes is None:
-        attributes = {}
-    return {"type": tokenTypes[type], "name": name, "data": attributes,
-            "selfClosing": selfClosing}
-
-
 class ParseError(Exception):
+
     """Error in parsed document"""
     pass
diff --git a/src/html5lib/tokenizer.py b/src/html5lib/tokenizer.py
index 797745787a..2d9e4456b9 100644
--- a/src/html5lib/tokenizer.py
+++ b/src/html5lib/tokenizer.py
@@ -35,10 +35,11 @@ class HTMLTokenizer(object):
     """
 
     def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
-                 lowercaseElementName=True, lowercaseAttrName=True, parser=None):
+                 lowercaseElementName=True, lowercaseAttrName=True, parser=None, track_positions=False):
 
         self.stream = HTMLInputStream(stream, encoding, parseMeta, useChardet)
         self.parser = parser
+        self.track_positions = track_positions
 
         # Perform case conversions?
         self.lowercaseElementName = lowercaseElementName
@@ -378,6 +379,8 @@ class HTMLTokenizer(object):
                                  "name": data, "data": [],
                                  "selfClosing": False,
                                  "selfClosingAcknowledged": False}
+            if self.track_positions:
+                self.currentToken['position'] = (self.stream.position(), False)
             self.state = self.tagNameState
         elif data == ">":
             # XXX In theory it could be something besides a tag name. But

From 3e986bccf32d4a2fa3dd4c033eff09f86f47bc4b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 13:17:09 +0530
Subject: [PATCH 1111/1154] Speed up unnecessarily slow and obtuse dict
 comparison

---
 src/html5lib/html5parser.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
index 44f44af574..936a99c20e 100644
--- a/src/html5lib/html5parser.py
+++ b/src/html5lib/html5parser.py
@@ -949,17 +949,8 @@ def getPhases(debug):
             self.endTagHandler.default = self.endTagOther
 
         def isMatchingFormattingElement(self, node1, node2):
-            if node1.name != node2.name or node1.namespace != node2.namespace:
-                return False
-            elif len(node1.attributes) != len(node2.attributes):
-                return False
-            else:
-                attributes1 = sorted(node1.attributes.items())
-                attributes2 = sorted(node2.attributes.items())
-                for attr1, attr2 in zip(attributes1, attributes2):
-                    if attr1 != attr2:
-                        return False
-            return True
+            return (node1.name == node2.name and node1.namespace ==
+                    node2.namespace and node1.attributes == node2.attributes)
 
         # helper
         def addFormattingElement(self, token):

From 6310c2feacb2d231cd71411b23e9da7643d4675f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 13:41:16 +0530
Subject: [PATCH 1112/1154] Handle attributes from multiple body tags

---
 src/calibre/ebooks/oeb/polish/parsing.py      | 24 +++++++++++++++++++
 .../ebooks/oeb/polish/tests/parsing.py        | 11 ++++++++-
 src/html5lib/html5parser.py                   |  4 +---
 src/html5lib/treebuilders/_base.py            |  5 ++++
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index dda22db9f3..e6a56a2591 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -367,6 +367,18 @@ class TreeBuilder(BaseTreeBuilder):
                 for child in html:
                     newroot.append(copy.copy(child))
 
+    def apply_body_attributes(self, attrs):
+        body = self.openElements[1]
+        nsmap = body.nsmap.copy()
+        attribs = process_attribs(attrs, nsmap)
+        for k, v in attribs.iteritems():
+            if k not in body.attrib:
+                try:
+                    body.set(k, v)
+                except ValueError:
+                    body.set(to_xml_name(k), v)
+        # We ignore xmlns attributes on non-first <body> tags
+
     def insertComment(self, token, parent=None):
         if parent is None:
             parent = self.openElements[-1]
@@ -425,6 +437,18 @@ class NoNamespaceTreeBuilder(TreeBuilder):
                 except ValueError:
                     html.set(to_xml_name(k), v)
 
+    def apply_body_attributes(self, attrs):
+        if not attrs:
+            return
+        body = self.openElements[1]
+        attribs = process_namespace_free_attribs(attrs)
+        for k, v in attribs.iteritems():
+            if k not in body.attrib:
+                try:
+                    body.set(k, v)
+                except ValueError:
+                    body.set(to_xml_name(k), v)
+
 # Input Stream {{{
 _regex_cache = {}
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index a70df254f0..ec65fe6d51 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -126,7 +126,16 @@ def entities(test, parse_function):
     err = 'Entities not handled, parsed markup:\n' + etree.tostring(root)
     test.assertEqual('\xa0\'', root.xpath('//*[local-name()="p"]')[0].text, err)
 
-basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insensitive_element_names, entities)
+def multiple_html_and_body(test, parse_function):
+    markup = '<html id="1"><body id="2"><p><html lang="en"><body lang="de"></p>'
+    root = parse_function(markup)
+    err = 'multiple html and body not handled, parsed markup:\n' + etree.tostring(root)
+    test.assertEqual(len(XPath('//h:html')(root)), 1, err)
+    test.assertEqual(len(XPath('//h:body')(root)), 1, err)
+    test.assertEqual(len(XPath('//h:html[@id and @lang]')(root)), 1, err)
+    test.assertEqual(len(XPath('//h:body[@id and @lang]')(root)), 1, err)
+
+basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insensitive_element_names, entities, multiple_html_and_body)
 
 class ParsingTests(BaseTest):
 
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
index 936a99c20e..49d290e37c 100644
--- a/src/html5lib/html5parser.py
+++ b/src/html5lib/html5parser.py
@@ -1019,9 +1019,7 @@ def getPhases(debug):
                 assert self.parser.innerHTML
             else:
                 self.parser.framesetOK = False
-                for attr, value in token["data"].items():
-                    if attr not in self.tree.openElements[1].attributes:
-                        self.tree.openElements[1].attributes[attr] = value
+                self.tree.apply_body_attributes(token['data'])
 
         def startTagFrameset(self, token):
             self.parser.parseError("unexpected-start-tag", {"name": "frameset"})
diff --git a/src/html5lib/treebuilders/_base.py b/src/html5lib/treebuilders/_base.py
index f426823c1f..250cc06dfc 100644
--- a/src/html5lib/treebuilders/_base.py
+++ b/src/html5lib/treebuilders/_base.py
@@ -274,6 +274,11 @@ class TreeBuilder(object):
             if attr not in self.openElements[0].attributes:
                 self.openElements[0].attributes[attr] = value
 
+    def apply_body_attributes(self, attrs):
+        for attr, value in attrs.items():
+            if attr not in self.tree.openElements[1].attributes:
+                self.tree.openElements[1].attributes[attr] = value
+
     def _getInsertFromTable(self):
         return self._insertFromTable
 

From 12a581786bca88b1620560d7ced8524a495f637e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 14:57:03 +0530
Subject: [PATCH 1113/1154] oops

---
 src/html5lib/treebuilders/_base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/html5lib/treebuilders/_base.py b/src/html5lib/treebuilders/_base.py
index 250cc06dfc..196f6689d2 100644
--- a/src/html5lib/treebuilders/_base.py
+++ b/src/html5lib/treebuilders/_base.py
@@ -276,8 +276,8 @@ class TreeBuilder(object):
 
     def apply_body_attributes(self, attrs):
         for attr, value in attrs.items():
-            if attr not in self.tree.openElements[1].attributes:
-                self.tree.openElements[1].attributes[attr] = value
+            if attr not in self.openElements[1].attributes:
+                self.openElements[1].attributes[attr] = value
 
     def _getInsertFromTable(self):
         return self._insertFromTable

From dd676227b83fd8a4b648d8ec9ba0a764a748ee7f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 14:57:42 +0530
Subject: [PATCH 1114/1154] Preserve attribute order when parsing

---
 src/calibre/ebooks/oeb/polish/parsing.py      |  78 +++++++++----
 .../ebooks/oeb/polish/tests/parsing.py        |  17 ++-
 src/html5lib/constants.py                     |  67 +++++++++++
 src/html5lib/html5parser.py                   | 109 +++---------------
 4 files changed, 153 insertions(+), 118 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index e6a56a2591..85843c1441 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -9,6 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import copy, re, warnings
 from functools import partial
 from bisect import bisect
+from collections import OrderedDict
 
 from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
 
@@ -203,7 +204,7 @@ def create_lxml_context():
 # }}}
 
 def process_attribs(attrs, nsmap):
-    attribs = {}
+    attrib_name_map = {}
     namespaced_attribs = {}
     xmlns = namespaces['xmlns']
     for k, v in attrs.iteritems():
@@ -220,7 +221,7 @@ def process_attribs(attrs, nsmap):
                         if ns == xlink_ns:
                             del nsmap[prefix]
                     nsmap['xlink'] = xlink_ns
-                attribs['{%s}%s' % (k[2], k[1])] = v
+                attrib_name_map[k] = '{%s}%s' % (k[2], k[1])
         else:
             if ':' in k:
                 if k.startswith('xmlns') and (k.startswith('xmlns:') or k == 'xmlns'):
@@ -228,27 +229,46 @@ def process_attribs(attrs, nsmap):
                     if prefix is not None:
                         # Use an existing prefix for this namespace, if
                         # possible
-                        existing = {v:k for k, v in nsmap.iteritems()}.get(v, False)
+                        existing = {x:k for k, x in nsmap.iteritems()}.get(v, False)
                         if existing is not False:
                             prefix = existing
                     nsmap[prefix] = v
                 else:
                     namespaced_attribs[k] = v
             else:
-                attribs[k] = v
+                attrib_name_map[k] = k
 
+    xml_lang = None
     for k, v in namespaced_attribs.iteritems():
         prefix, name = k.partition(':')[0::2]
         if prefix == 'xml':
             if name == 'lang':
-                attribs['lang'] = attribs.get('lang', v)
+                xml_lang = v
             continue
         ns = nsmap.get(prefix, None)
         if ns is not None:
             name = '{%s}%s' % (ns, name)
-        attribs[name] =v
+        attrib_name_map[k] = name
 
-    return attribs
+    ans = OrderedDict((attrib_name_map.get(k, None), v) for k, v in attrs.iteritems())
+    ans.pop(None, None)
+    if xml_lang:
+        ans['lang'] = ans.get('lang', xml_lang)
+    return ans
+
+def makeelement_ns(ctx, namespace, name, attrib, nsmap):
+    try:
+        elem = ctx.makeelement('{%s}%s' % (namespace, name), nsmap=nsmap)
+    except ValueError:
+        elem = ctx.makeelement('{%s}%s' % (namespace, to_xml_name(name)), nsmap=nsmap)
+    # Unfortunately, lxml randomizes attrib order if passed in the makeelement
+    # constructor, therefore they have to be set one by one.
+    for k, v in attrib.iteritems():
+        try:
+            elem.set(k, v)
+        except ValueError:
+            elem.set(to_xml_name(k), v)
+    return elem
 
 class TreeBuilder(BaseTreeBuilder):
 
@@ -285,11 +305,7 @@ class TreeBuilder(BaseTreeBuilder):
                 raise NamespacedHTMLPresent(name.rpartition(':')[0])
             prefix, name = name.partition(':')[0::2]
             namespace = nsmap.get(prefix, namespace)
-        try:
-            elem = self.lxml_context.makeelement('{%s}%s' % (namespace, name), attrib=attribs, nsmap=nsmap)
-        except ValueError:
-            attribs = {to_xml_name(k):v for k, v in attribs.iteritems()}
-            elem = self.lxml_context.makeelement('{%s}%s' % (namespace, to_xml_name(name)), attrib=attribs, nsmap=nsmap)
+        elem = makeelement_ns(self.lxml_context, namespace, name, attribs, nsmap)
 
         # Ensure that svg and mathml elements get no namespace prefixes
         if elem.prefix is not None and namespace in known_namespaces:
@@ -297,7 +313,10 @@ class TreeBuilder(BaseTreeBuilder):
                 if v == namespace:
                     del nsmap[k]
             nsmap[None] = namespace
-            elem = self.lxml_context.makeelement(elem.tag, attrib=elem.attrib, nsmap=nsmap)
+            nelem = self.lxml_context.makeelement(elem.tag, nsmap=nsmap)
+            for k, v in elem.items():  # Only elem.items() preserves attrib order
+                nelem.set(k, v)
+            elem = nelem
 
         # Keep a reference to elem so that lxml does not delete and re-create
         # it, losing the name related attributes
@@ -385,12 +404,26 @@ class TreeBuilder(BaseTreeBuilder):
         parent.appendChild(Comment(token["data"].replace('--', '- -')))
 
 def process_namespace_free_attribs(attrs):
-    attribs = {k:v for k, v in attrs.iteritems() if ':' not in k}
-    for k in set(attrs) - set(attribs):
+    anm = {k:k for k, v in attrs.iteritems() if ':' not in k}
+    for k in frozenset(attrs) - frozenset(anm):
         prefix, name = k.partition(':')[0::2]
-        if prefix != 'xmlns' and name not in attribs:
-            attribs[name] = attrs[k]
-    return attribs
+        if prefix != 'xmlns' and name not in anm:
+            anm[name] = k
+    ans = OrderedDict((anm.get(k, None), v) for k, v in attrs.iteritems())
+    ans.pop(None, None)
+    return ans
+
+def makeelement(ctx, name, attrib):
+    try:
+        elem = ctx.makeelement(name)
+    except ValueError:
+        elem = ctx.makeelement(to_xml_name(name))
+    for k, v in attrib.iteritems():
+        try:
+            elem.set(k, v)
+        except ValueError:
+            elem.set(to_xml_name(k), v)
+    return elem
 
 class NoNamespaceTreeBuilder(TreeBuilder):
 
@@ -404,11 +437,7 @@ class NoNamespaceTreeBuilder(TreeBuilder):
     def createElement(self, token, nsmap=None):
         name = token['name'].rpartition(':')[2]
         attribs = process_namespace_free_attribs(token['data'])
-        try:
-            elem = self.lxml_context.makeelement(name, attrib=attribs)
-        except ValueError:
-            attribs = {to_xml_name(k):v for k, v in attribs.iteritems()}
-            elem = self.lxml_context.makeelement(to_xml_name(name), attrib=attribs)
+        elem = makeelement(self.lxml_context, name, attribs)
         # Keep a reference to elem so that lxml does not delete and re-create
         # it, losing _namespace
         self.proxy_cache.append(elem)
@@ -551,8 +580,7 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=Tr
 
 if __name__ == '__main__':
     from lxml import etree
-    root = parse('\n<html><head><title>a\n</title><p>&nbsp;\n<b>b', discard_namespaces=False)
-    # root = parse('\n<html><p><svg viewbox="0 0 0 0"><image xlink:href="xxx"/><b></svg>&nbsp;\n<b>xxx', discard_namespaces=False)
+    root = parse('\n<html><head><title>a\n</title><p b=1 c=2 a=0>&nbsp;\n<b>b<svg ass="wipe" viewbox="0">', discard_namespaces=False)
     print (etree.tostring(root, encoding='utf-8'))
     print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index ec65fe6d51..0346821745 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -135,7 +135,15 @@ def multiple_html_and_body(test, parse_function):
     test.assertEqual(len(XPath('//h:html[@id and @lang]')(root)), 1, err)
     test.assertEqual(len(XPath('//h:body[@id and @lang]')(root)), 1, err)
 
-basic_checks = (nonvoid_cdata_elements, namespaces, space_characters, case_insensitive_element_names, entities, multiple_html_and_body)
+def attribute_replacement(test, parse_function):
+    markup = '<html><body><svg viewbox="0"></svg><svg xmlns="%s" viewbox="1">' % SVG_NS
+    root = parse_function(markup)
+    err = 'SVG attributes not normalized, parsed markup:\n' + etree.tostring(root)
+    test.assertEqual(len(XPath('//svg:svg[@viewBox]')(root)), 2, err)
+
+basic_checks = (nonvoid_cdata_elements, namespaces, space_characters,
+                case_insensitive_element_names, entities,
+                multiple_html_and_body, attribute_replacement)
 
 class ParsingTests(BaseTest):
 
@@ -160,3 +168,10 @@ class ParsingTests(BaseTest):
                 elem = root.xpath('//*[local-name()="%s"]' % tag)[0]
                 self.assertEqual(lnum, elem.sourceline, 'Line number incorrect for %s, source: %s:' % (tag, src))
 
+        for ds in (False, True):
+            src = '\n<html>\n<p b=1 a=2 c=3 d=4 e=5 f=6 g=7 h=8><svg b=1 a=2 c=3 d=4 e=5 f=6 g=7 h=8>\n'
+            root = parse(src, discard_namespaces=ds)
+            for tag in ('p', 'svg'):
+                for i, (k, v) in enumerate(root.xpath('//*[local-name()="%s"]' % tag)[0].items()):
+                    self.assertEqual(i+1, int(v))
+
diff --git a/src/html5lib/constants.py b/src/html5lib/constants.py
index e7089846d5..6d5ccb176b 100644
--- a/src/html5lib/constants.py
+++ b/src/html5lib/constants.py
@@ -433,6 +433,73 @@ mathmlTextIntegrationPointElements = frozenset((
     (namespaces["mathml"], "mtext")
 ))
 
+adjustSVGAttributes = {
+    "attributename": "attributeName",
+    "attributetype": "attributeType",
+    "basefrequency": "baseFrequency",
+    "baseprofile": "baseProfile",
+    "calcmode": "calcMode",
+    "clippathunits": "clipPathUnits",
+    "contentscripttype": "contentScriptType",
+    "contentstyletype": "contentStyleType",
+    "diffuseconstant": "diffuseConstant",
+    "edgemode": "edgeMode",
+    "externalresourcesrequired": "externalResourcesRequired",
+    "filterres": "filterRes",
+    "filterunits": "filterUnits",
+    "glyphref": "glyphRef",
+    "gradienttransform": "gradientTransform",
+    "gradientunits": "gradientUnits",
+    "kernelmatrix": "kernelMatrix",
+    "kernelunitlength": "kernelUnitLength",
+    "keypoints": "keyPoints",
+    "keysplines": "keySplines",
+    "keytimes": "keyTimes",
+    "lengthadjust": "lengthAdjust",
+    "limitingconeangle": "limitingConeAngle",
+    "markerheight": "markerHeight",
+    "markerunits": "markerUnits",
+    "markerwidth": "markerWidth",
+    "maskcontentunits": "maskContentUnits",
+    "maskunits": "maskUnits",
+    "numoctaves": "numOctaves",
+    "pathlength": "pathLength",
+    "patterncontentunits": "patternContentUnits",
+    "patterntransform": "patternTransform",
+    "patternunits": "patternUnits",
+    "pointsatx": "pointsAtX",
+    "pointsaty": "pointsAtY",
+    "pointsatz": "pointsAtZ",
+    "preservealpha": "preserveAlpha",
+    "preserveaspectratio": "preserveAspectRatio",
+    "primitiveunits": "primitiveUnits",
+    "refx": "refX",
+    "refy": "refY",
+    "repeatcount": "repeatCount",
+    "repeatdur": "repeatDur",
+    "requiredextensions": "requiredExtensions",
+    "requiredfeatures": "requiredFeatures",
+    "specularconstant": "specularConstant",
+    "specularexponent": "specularExponent",
+    "spreadmethod": "spreadMethod",
+    "startoffset": "startOffset",
+    "stddeviation": "stdDeviation",
+    "stitchtiles": "stitchTiles",
+    "surfacescale": "surfaceScale",
+    "systemlanguage": "systemLanguage",
+    "tablevalues": "tableValues",
+    "targetx": "targetX",
+    "targety": "targetY",
+    "textlength": "textLength",
+    "viewbox": "viewBox",
+    "viewtarget": "viewTarget",
+    "xchannelselector": "xChannelSelector",
+    "ychannelselector": "yChannelSelector",
+    "zoomandpan": "zoomAndPan"
+}
+
+adjustMathMLAttributes = {"definitionurl": "definitionURL"}
+
 adjustForeignAttributes = {
     "xlink:actuate": ("xlink", "actuate", namespaces["xlink"]),
     "xlink:arcrole": ("xlink", "arcrole", namespaces["xlink"]),
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
index 49d290e37c..b96699c26d 100644
--- a/src/html5lib/html5parser.py
+++ b/src/html5lib/html5parser.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, division, unicode_literals
 from six import with_metaclass
 
 import types
+from collections import OrderedDict
 
 from . import inputstream
 from . import tokenizer
@@ -10,14 +11,12 @@ from . import treebuilders
 from .treebuilders._base import Marker
 
 from . import utils
-from . import constants
-from .constants import spaceCharacters, asciiUpper2Lower
-from .constants import specialElements
-from .constants import headingElements
-from .constants import cdataElements, rcdataElements
-from .constants import tokenTypes, ReparseException, namespaces
-from .constants import htmlIntegrationPointElements, mathmlTextIntegrationPointElements
-from .constants import adjustForeignAttributes as adjustForeignAttributesMap
+from .constants import (
+    spaceCharacters, asciiUpper2Lower, specialElements, headingElements,
+    cdataElements, rcdataElements, tokenTypes, tagTokenTypes, ReparseException, namespaces,
+    htmlIntegrationPointElements, mathmlTextIntegrationPointElements,
+    adjustForeignAttributes as adjustForeignAttributesMap, adjustSVGAttributes,
+    adjustMathMLAttributes)
 
 
 def parse(doc, treebuilder="etree", encoding=None,
@@ -255,96 +254,18 @@ class HTMLParser(object):
         """ HTML5 specific normalizations to the token stream """
 
         if token["type"] == tokenTypes["StartTag"]:
-            token["data"] = dict(token["data"][::-1])
+            token["data"] = OrderedDict(token['data'])
 
         return token
 
     def adjustMathMLAttributes(self, token):
-        replacements = {"definitionurl": "definitionURL"}
-        for k, v in replacements.items():
-            if k in token["data"]:
-                token["data"][v] = token["data"][k]
-                del token["data"][k]
+        adjust_attributes(token, adjustMathMLAttributes)
 
     def adjustSVGAttributes(self, token):
-        replacements = {
-            "attributename": "attributeName",
-            "attributetype": "attributeType",
-            "basefrequency": "baseFrequency",
-            "baseprofile": "baseProfile",
-            "calcmode": "calcMode",
-            "clippathunits": "clipPathUnits",
-            "contentscripttype": "contentScriptType",
-            "contentstyletype": "contentStyleType",
-            "diffuseconstant": "diffuseConstant",
-            "edgemode": "edgeMode",
-            "externalresourcesrequired": "externalResourcesRequired",
-            "filterres": "filterRes",
-            "filterunits": "filterUnits",
-            "glyphref": "glyphRef",
-            "gradienttransform": "gradientTransform",
-            "gradientunits": "gradientUnits",
-            "kernelmatrix": "kernelMatrix",
-            "kernelunitlength": "kernelUnitLength",
-            "keypoints": "keyPoints",
-            "keysplines": "keySplines",
-            "keytimes": "keyTimes",
-            "lengthadjust": "lengthAdjust",
-            "limitingconeangle": "limitingConeAngle",
-            "markerheight": "markerHeight",
-            "markerunits": "markerUnits",
-            "markerwidth": "markerWidth",
-            "maskcontentunits": "maskContentUnits",
-            "maskunits": "maskUnits",
-            "numoctaves": "numOctaves",
-            "pathlength": "pathLength",
-            "patterncontentunits": "patternContentUnits",
-            "patterntransform": "patternTransform",
-            "patternunits": "patternUnits",
-            "pointsatx": "pointsAtX",
-            "pointsaty": "pointsAtY",
-            "pointsatz": "pointsAtZ",
-            "preservealpha": "preserveAlpha",
-            "preserveaspectratio": "preserveAspectRatio",
-            "primitiveunits": "primitiveUnits",
-            "refx": "refX",
-            "refy": "refY",
-            "repeatcount": "repeatCount",
-            "repeatdur": "repeatDur",
-            "requiredextensions": "requiredExtensions",
-            "requiredfeatures": "requiredFeatures",
-            "specularconstant": "specularConstant",
-            "specularexponent": "specularExponent",
-            "spreadmethod": "spreadMethod",
-            "startoffset": "startOffset",
-            "stddeviation": "stdDeviation",
-            "stitchtiles": "stitchTiles",
-            "surfacescale": "surfaceScale",
-            "systemlanguage": "systemLanguage",
-            "tablevalues": "tableValues",
-            "targetx": "targetX",
-            "targety": "targetY",
-            "textlength": "textLength",
-            "viewbox": "viewBox",
-            "viewtarget": "viewTarget",
-            "xchannelselector": "xChannelSelector",
-            "ychannelselector": "yChannelSelector",
-            "zoomandpan": "zoomAndPan"
-        }
-        for originalName in list(token["data"].keys()):
-            if originalName in replacements:
-                svgName = replacements[originalName]
-                token["data"][svgName] = token["data"][originalName]
-                del token["data"][originalName]
+        adjust_attributes(token, adjustSVGAttributes)
 
     def adjustForeignAttributes(self, token):
-        replacements = adjustForeignAttributesMap
-
-        for originalName in token["data"].keys():
-            if originalName in replacements:
-                foreignName = replacements[originalName]
-                token["data"][foreignName] = token["data"][originalName]
-                del token["data"][originalName]
+        adjust_attributes(token, adjustForeignAttributesMap)
 
     def reparseTokenNormal(self, token):
         self.parser.phase()
@@ -424,7 +345,7 @@ def getPhases(debug):
     def log(function):
         """Logger that records which phase processes each token"""
         type_names = dict((value, key) for key, value in
-                          constants.tokenTypes.items())
+                          tokenTypes.items())
 
         def wrapped(self, *args, **kwargs):
             if function.__name__.startswith("process") and len(args) > 0:
@@ -433,7 +354,7 @@ def getPhases(debug):
                     info = {"type": type_names[token['type']]}
                 except:
                     raise
-                if token['type'] in constants.tagTokenTypes:
+                if token['type'] in tagTokenTypes:
                     info["name"] = token['name']
 
                 self.parser.log.append((self.parser.tokenizer.state.__name__,
@@ -2721,6 +2642,10 @@ def getPhases(debug):
         # XXX after after frameset
     }
 
+def adjust_attributes(token, replacements):
+    if frozenset(token['data']) & frozenset(replacements):
+        token['data'] = OrderedDict(
+            (replacements.get(k, k), v) for k, v in token['data'].iteritems())
 
 class ParseError(Exception):
 

From 45c2211c4b5731bffbc6c2ef004af0a5c13d299f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Oct 2013 21:03:52 +0530
Subject: [PATCH 1115/1154] Rename parse to parse_html5

---
 src/calibre/ebooks/oeb/polish/parsing.py       | 4 ++--
 src/calibre/ebooks/oeb/polish/tests/parsing.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 85843c1441..9e8dfaff92 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -546,7 +546,7 @@ if len("\U0010FFFF") == 1:  # UCS4 build
 else:
     replace_chars = re.compile("([\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF])")
 
-def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=True, linenumber_attribute=None):
+def parse_html5(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=True, linenumber_attribute=None):
     if isinstance(raw, bytes):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
@@ -580,7 +580,7 @@ def parse(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=Tr
 
 if __name__ == '__main__':
     from lxml import etree
-    root = parse('\n<html><head><title>a\n</title><p b=1 c=2 a=0>&nbsp;\n<b>b<svg ass="wipe" viewbox="0">', discard_namespaces=False)
+    root = parse_html5('\n<html><head><title>a\n</title><p b=1 c=2 a=0>&nbsp;\n<b>b<svg ass="wipe" viewbox="0">', discard_namespaces=False)
     print (etree.tostring(root, encoding='utf-8'))
     print()
 
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 0346821745..256d214fdf 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -10,7 +10,7 @@ from lxml import etree
 from html5lib.constants import cdataElements, rcdataElements
 
 from calibre.ebooks.oeb.polish.tests.base import BaseTest
-from calibre.ebooks.oeb.polish.parsing import parse
+from calibre.ebooks.oeb.polish.parsing import parse_html5 as parse
 from calibre.ebooks.oeb.base import XPath, XHTML_NS, SVG_NS, XLINK_NS
 from calibre.ebooks.oeb.parse_utils import html5_parse
 

From ddec629bd72410b5eaa43c16e50b05cace2968d1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 13:22:54 +0530
Subject: [PATCH 1116/1154] Add function to measure performance

---
 .../ebooks/oeb/polish/tests/parsing.py        | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 256d214fdf..00b4cde043 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -6,6 +6,8 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
+from functools import partial
+
 from lxml import etree
 from html5lib.constants import cdataElements, rcdataElements
 
@@ -32,7 +34,7 @@ def namespaces(test, parse_function):
     def match_and_prefix(root, xpath, prefix, err=''):
         matches = XPath(xpath)(root)
         ae(len(matches), 1, err)
-        ae(matches[0].prefix, prefix)
+        ae(matches[0].prefix, prefix, err)
 
     markup = ''' <html xmlns="{xhtml}"><head><body id="test"></html> '''.format(xhtml=XHTML_NS)
     root = parse_function(markup)
@@ -175,3 +177,20 @@ class ParsingTests(BaseTest):
                 for i, (k, v) in enumerate(root.xpath('//*[local-name()="%s"]' % tag)[0].items()):
                     self.assertEqual(i+1, int(v))
 
+def timing():
+    import time, sys
+    from calibre.ebooks.chardet import xml_to_unicode
+    from html5lib import parse as vanilla
+    filename = sys.argv[-1]
+    with open(filename, 'rb') as f:
+        raw = f.read()
+    raw = xml_to_unicode(raw)[0]
+
+    for name, f in (('calibre', partial(parse, line_numbers=False)), ('html5lib', vanilla), ('calibre-old', html5_parse)):
+        timings = []
+        for i in xrange(5):
+            st = time.time()
+            f(raw)
+            timings.append(time.time() - st)
+        avg = sum(timings)/len(timings)
+        print ('Average time for %s: %.2g' % (name, avg))

From 2462f6b8320e4c4f4d4a953d35cb774a8788456b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 13:24:57 +0530
Subject: [PATCH 1117/1154] ...

---
 src/calibre/ebooks/oeb/polish/tests/parsing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index 00b4cde043..efea117c19 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -188,7 +188,7 @@ def timing():
 
     for name, f in (('calibre', partial(parse, line_numbers=False)), ('html5lib', vanilla), ('calibre-old', html5_parse)):
         timings = []
-        for i in xrange(5):
+        for i in xrange(10):
             st = time.time()
             f(raw)
             timings.append(time.time() - st)

From a228d95678d269c517158216c0478d8444874d0a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 13:34:28 +0530
Subject: [PATCH 1118/1154] Speed up parsing by only special casing non-XML
 safe attributes

---
 src/calibre/ebooks/oeb/polish/parsing.py | 220 ++++++++++++-----------
 1 file changed, 117 insertions(+), 103 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 9e8dfaff92..b02a6c9fba 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -9,7 +9,6 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import copy, re, warnings
 from functools import partial
 from bisect import bisect
-from collections import OrderedDict
 
 from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
 
@@ -28,6 +27,7 @@ to_xml_name = infoset_filter.toXmlName
 known_namespaces = {namespaces[k]:k for k in ('mathml', 'svg', 'xlink')}
 html_ns = namespaces['html']
 xlink_ns = namespaces['xlink']
+xml_ns = namespaces['xmlns']
 
 class NamespacedHTMLPresent(ValueError):
 
@@ -203,71 +203,106 @@ def create_lxml_context():
 
 # }}}
 
-def process_attribs(attrs, nsmap):
-    attrib_name_map = {}
-    namespaced_attribs = {}
-    xmlns = namespaces['xmlns']
-    for k, v in attrs.iteritems():
-        if isinstance(k, tuple):
-            if k[2] == xmlns:
-                prefix, name, ns = k
-                if prefix is None:
-                    nsmap[None] = v
-                else:
-                    nsmap[name] = v
-            else:
-                if k[2] == xlink_ns and 'xlink' not in nsmap:
-                    for prefix, ns in tuple(nsmap.iteritems()):
-                        if ns == xlink_ns:
-                            del nsmap[prefix]
-                    nsmap['xlink'] = xlink_ns
-                attrib_name_map[k] = '{%s}%s' % (k[2], k[1])
-        else:
-            if ':' in k:
-                if k.startswith('xmlns') and (k.startswith('xmlns:') or k == 'xmlns'):
-                    prefix = k.partition(':')[2] or None
-                    if prefix is not None:
-                        # Use an existing prefix for this namespace, if
-                        # possible
-                        existing = {x:k for k, x in nsmap.iteritems()}.get(v, False)
-                        if existing is not False:
-                            prefix = existing
-                    nsmap[prefix] = v
-                else:
-                    namespaced_attribs[k] = v
-            else:
-                attrib_name_map[k] = k
+def clean_attrib(name, val, nsmap, attrib, namespaced_attribs):
 
-    xml_lang = None
-    for k, v in namespaced_attribs.iteritems():
-        prefix, name = k.partition(':')[0::2]
+    if isinstance(name, tuple):
+        prefix, name, ns = name
+        if ns == xml_ns:
+            if prefix is None:
+                nsmap[None] = val
+            else:
+                nsmap[name] = val
+            return None, True
+        nsmap_changed = False
+        if ns == xlink_ns and 'xlink' not in nsmap:
+            for prefix, nns in tuple(nsmap.iteritems()):
+                if nns == xlink_ns:
+                    del nsmap[prefix]
+            nsmap['xlink'] = xlink_ns
+            nsmap_changed = True
+        return ('{%s}%s' % (ns, name)), nsmap_changed
+
+    if ':' in name:
+        prefix, name = name.partition(':')[0::2]
+        if prefix == 'xmlns':
+            # Use an existing prefix for this namespace, if
+            # possible
+            existing = {x:k for k, x in nsmap.iteritems()}.get(val, False)
+            if existing is not False:
+                name = existing
+            nsmap[name] = val
+            return None, True
         if prefix == 'xml':
-            if name == 'lang':
-                xml_lang = v
-            continue
+            if name != 'lang' or name in attrib:
+                return None, False
+            return name, False
+
         ns = nsmap.get(prefix, None)
-        if ns is not None:
-            name = '{%s}%s' % (ns, name)
-        attrib_name_map[k] = name
+        if ns is None:
+            namespaced_attribs[(prefix, name)] = val
+            return None, True
+        return '{%s}%s' % (ns, name), False
 
-    ans = OrderedDict((attrib_name_map.get(k, None), v) for k, v in attrs.iteritems())
-    ans.pop(None, None)
-    if xml_lang:
-        ans['lang'] = ans.get('lang', xml_lang)
-    return ans
+    return name, False
 
-def makeelement_ns(ctx, namespace, name, attrib, nsmap):
+def makeelement_ns(ctx, namespace, prefix, name, attrib, nsmap):
+    nns = attrib.pop('xmlns', None)
+    if nns is not None:
+        nsmap[None] = nns
     try:
         elem = ctx.makeelement('{%s}%s' % (namespace, name), nsmap=nsmap)
     except ValueError:
         elem = ctx.makeelement('{%s}%s' % (namespace, to_xml_name(name)), nsmap=nsmap)
     # Unfortunately, lxml randomizes attrib order if passed in the makeelement
     # constructor, therefore they have to be set one by one.
+    nsmap_changed = False
+    namespaced_attribs = {}
     for k, v in attrib.iteritems():
         try:
             elem.set(k, v)
-        except ValueError:
-            elem.set(to_xml_name(k), v)
+        except (ValueError, TypeError):
+            k, is_namespace = clean_attrib(k, v, nsmap, attrib, namespaced_attribs)
+            nsmap_changed |= is_namespace
+            if k is not None:
+                try:
+                    elem.set(k, v)
+                except ValueError:
+                    elem.set(to_xml_name(k), v)
+    if nsmap_changed:
+        nelem = ctx.makeelement(elem.tag, nsmap=nsmap)
+        for k, v in elem.items():  # Only elem.items() preserves attrib order
+            nelem.set(k, v)
+        for (prefix, name), v in namespaced_attribs.iteritems():
+            ns = nsmap.get('prefix', None)
+            if ns is not None:
+                try:
+                    nelem.set('{%s}%s' % (ns, name), v)
+                except ValueError:
+                    nelem.set('{%s}%s' % (ns, to_xml_name(name)), v)
+            else:
+                nelem.set(to_xml_name('%s:%s' % (prefix, name)), v)
+        elem = nelem
+
+    # Handle namespace prefixed tag names
+    if prefix is not None:
+        namespace = nsmap.get(prefix, None)
+        if namespace is not None and namespace != elem.nsmap[elem.prefix]:
+            nelem = ctx.makeelement('{%s}%s' %(nsmap[prefix], elem.tag.rpartition('}')[2]), nsmap=nsmap)
+            for k, v in elem.items():
+                nelem.set(k, v)
+            elem = nelem
+
+    # Ensure that svg and mathml elements get no namespace prefixes
+    if elem.prefix is not None and namespace in known_namespaces:
+        for k, v in tuple(nsmap.iteritems()):
+            if v == namespace:
+                del nsmap[k]
+        nsmap[None] = namespace
+        nelem = ctx.makeelement(elem.tag, nsmap=nsmap)
+        for k, v in elem.items():
+            nelem.set(k, v)
+        elem = nelem
+
     return elem
 
 class TreeBuilder(BaseTreeBuilder):
@@ -297,26 +332,15 @@ class TreeBuilder(BaseTreeBuilder):
     def createElement(self, token, nsmap=None):
         """Create an element but don't insert it anywhere"""
         nsmap = nsmap or {}
-        attribs = process_attribs(token['data'], nsmap)
         name = token_name = token["name"]
         namespace = token.get("namespace", self.defaultNamespace)
+        prefix = None
         if ':' in name:
             if name.endswith(':html'):
                 raise NamespacedHTMLPresent(name.rpartition(':')[0])
             prefix, name = name.partition(':')[0::2]
             namespace = nsmap.get(prefix, namespace)
-        elem = makeelement_ns(self.lxml_context, namespace, name, attribs, nsmap)
-
-        # Ensure that svg and mathml elements get no namespace prefixes
-        if elem.prefix is not None and namespace in known_namespaces:
-            for k, v in tuple(nsmap.iteritems()):
-                if v == namespace:
-                    del nsmap[k]
-            nsmap[None] = namespace
-            nelem = self.lxml_context.makeelement(elem.tag, nsmap=nsmap)
-            for k, v in elem.items():  # Only elem.items() preserves attrib order
-                nelem.set(k, v)
-            elem = nelem
+        elem = makeelement_ns(self.lxml_context, namespace, prefix, name, token['data'], nsmap)
 
         # Keep a reference to elem so that lxml does not delete and re-create
         # it, losing the name related attributes
@@ -366,54 +390,39 @@ class TreeBuilder(BaseTreeBuilder):
         if not attrs:
             return
         html = self.openElements[0]
-        nsmap = html.nsmap.copy()
-        attribs = process_attribs(attrs, nsmap)
-        for k, v in attribs.iteritems():
-            if k not in html.attrib:
+        for k, v in attrs.iteritems():
+            if k not in html.attrib and k != 'xmlns':
                 try:
                     html.set(k, v)
+                except TypeError:
+                    pass
                 except ValueError:
+                    if k == 'xml:lang' and 'lang' not in html.attrib:
+                        k = 'lang'
                     html.set(to_xml_name(k), v)
-        if nsmap != html.nsmap:
-            newroot = self.lxml_context.makeelement(html.tag, attrib=html.attrib, nsmap=nsmap)
-            self.proxy_cache.append(newroot)
-            newroot.name, newroot.namespace, newroot.nameTuple = html.name, html.namespace, html.nameTuple
-            self.openElements[0] = newroot
-            if self.document.root is html:
-                self.document.root = newroot
-            if len(html) > 0:
-                # TODO: the nsmap changes need to be propagated down the tree
-                for child in html:
-                    newroot.append(copy.copy(child))
 
     def apply_body_attributes(self, attrs):
+        if not attrs:
+            return
         body = self.openElements[1]
-        nsmap = body.nsmap.copy()
-        attribs = process_attribs(attrs, nsmap)
-        for k, v in attribs.iteritems():
-            if k not in body.attrib:
+        for k, v in attrs.iteritems():
+            if k not in body.attrib and k !='xmlns':
                 try:
                     body.set(k, v)
+                except TypeError:
+                    pass
                 except ValueError:
+                    if k == 'xml:lang' and 'lang' not in body.attrib:
+                        k = 'lang'
                     body.set(to_xml_name(k), v)
-        # We ignore xmlns attributes on non-first <body> tags
 
     def insertComment(self, token, parent=None):
         if parent is None:
             parent = self.openElements[-1]
         parent.appendChild(Comment(token["data"].replace('--', '- -')))
 
-def process_namespace_free_attribs(attrs):
-    anm = {k:k for k, v in attrs.iteritems() if ':' not in k}
-    for k in frozenset(attrs) - frozenset(anm):
-        prefix, name = k.partition(':')[0::2]
-        if prefix != 'xmlns' and name not in anm:
-            anm[name] = k
-    ans = OrderedDict((anm.get(k, None), v) for k, v in attrs.iteritems())
-    ans.pop(None, None)
-    return ans
-
 def makeelement(ctx, name, attrib):
+    attrib.pop('xmlns', None)
     try:
         elem = ctx.makeelement(name)
     except ValueError:
@@ -421,7 +430,11 @@ def makeelement(ctx, name, attrib):
     for k, v in attrib.iteritems():
         try:
             elem.set(k, v)
+        except TypeError:
+            elem.set(to_xml_name(k[1]), v)
         except ValueError:
+            if k == 'xml:lang' and 'lang' not in attrib:
+                k = 'lang'
             elem.set(to_xml_name(k), v)
     return elem
 
@@ -436,8 +449,7 @@ class NoNamespaceTreeBuilder(TreeBuilder):
 
     def createElement(self, token, nsmap=None):
         name = token['name'].rpartition(':')[2]
-        attribs = process_namespace_free_attribs(token['data'])
-        elem = makeelement(self.lxml_context, name, attribs)
+        elem = makeelement(self.lxml_context, name, token['data'])
         # Keep a reference to elem so that lxml does not delete and re-create
         # it, losing _namespace
         self.proxy_cache.append(elem)
@@ -458,24 +470,26 @@ class NoNamespaceTreeBuilder(TreeBuilder):
         if not attrs:
             return
         html = self.openElements[0]
-        attribs = process_namespace_free_attribs(attrs)
-        for k, v in attribs.iteritems():
-            if k not in html.attrib:
+        for k, v in attrs.iteritems():
+            if k not in html.attrib and k != 'xmlns':
                 try:
                     html.set(k, v)
                 except ValueError:
+                    if k == 'xml:lang' and 'lang' not in html.attrib:
+                        k = 'lang'
                     html.set(to_xml_name(k), v)
 
     def apply_body_attributes(self, attrs):
         if not attrs:
             return
         body = self.openElements[1]
-        attribs = process_namespace_free_attribs(attrs)
-        for k, v in attribs.iteritems():
-            if k not in body.attrib:
+        for k, v in attrs.iteritems():
+            if k not in body.attrib and k != 'xmlns':
                 try:
                     body.set(k, v)
                 except ValueError:
+                    if k == 'xml:lang' and 'lang' not in body.attrib:
+                        k = 'lang'
                     body.set(to_xml_name(k), v)
 
 # Input Stream {{{

From a2aae7fa8ef2a4c39adf4ab08102b4431c07be35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 15:15:47 +0530
Subject: [PATCH 1119/1154] A parse method that first tries to parse as XML

Fallback to much slower HTML 5 parsing only if parsing as XML fails.
---
 src/calibre/ebooks/oeb/polish/parsing.py | 39 +++++++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index b02a6c9fba..961ce8b5a9 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -10,7 +10,7 @@ import copy, re, warnings
 from functools import partial
 from bisect import bisect
 
-from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase
+from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase, fromstring, Element as LxmlElement
 
 from html5lib.constants import namespaces, tableInsertModeElements, EOF
 from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
@@ -18,7 +18,7 @@ from html5lib.ihatexml import InfosetFilter, DataLossWarning
 from html5lib.html5parser import HTMLParser
 
 from calibre import xml_replace_entities
-from calibre.ebooks.chardet import xml_to_unicode
+from calibre.ebooks.chardet import xml_to_unicode, strip_encoding_declarations
 from calibre.ebooks.oeb.parse_utils import fix_self_closing_cdata_tags
 from calibre.utils.cleantext import clean_xml_chars
 
@@ -560,12 +560,14 @@ if len("\U0010FFFF") == 1:  # UCS4 build
 else:
     replace_chars = re.compile("([\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF])")
 
-def parse_html5(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=True, linenumber_attribute=None):
+def parse_html5(raw, decoder=None, log=None, discard_namespaces=False, line_numbers=True, linenumber_attribute=None, replace_entities=True, fix_newlines=True):
     if isinstance(raw, bytes):
         raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
     raw = fix_self_closing_cdata_tags(raw)  # TODO: Handle this in the parser
-    raw = xml_replace_entities(raw)
-    raw = raw.replace('\r\n', '\n').replace('\r', '\n')
+    if replace_entities:
+        raw = xml_replace_entities(raw)
+    if fix_newlines:
+        raw = raw.replace('\r\n', '\n').replace('\r', '\n')
     raw = replace_chars.sub('', raw)
 
     stream_class = partial(FastStream, track_position=line_numbers)
@@ -591,6 +593,33 @@ def parse_html5(raw, decoder=None, log=None, discard_namespaces=False, line_numb
         raise ValueError('Failed to parse correctly, root has tag: %s and prefix: %s' % (root.tag, root.prefix))
     return root
 
+def parse(raw, decoder=None, log=None, line_numbers=True, linenumber_attribute=None):
+    if isinstance(raw, bytes):
+        raw = xml_to_unicode(raw)[0] if decoder is None else decoder(raw)
+    raw = xml_replace_entities(raw).replace('\0', '')  # Handle &#0;
+    raw = raw.replace('\r\n', '\n').replace('\r', '\n')
+
+    # Remove any preamble before the opening html tag as it can cause problems,
+    # especially doctypes, preserve the original linenumbers by inserting
+    # newlines at the start
+    pre = raw[:2048]
+    for match in re.finditer(r'<\s*html', pre, flags=re.I):
+        newlines = raw.count('\n', 0, match.start())
+        raw = ('\n' * newlines) + raw[match.start():]
+        break
+
+    raw = strip_encoding_declarations(raw)
+    try:
+        parser = XMLParser(no_network=True)
+        ans = fromstring(raw, parser=parser)
+        if linenumber_attribute:
+            for elem in ans.iter(LxmlElement):
+                if elem.sourceline is not None:
+                    elem.set(linenumber_attribute, str(elem.sourceline))
+    except Exception:
+        if log is not None:
+            log.exception('Failed to parse as XML, parsing as tag soup')
+        return parse_html5(raw, log=log, line_numbers=line_numbers, linenumber_attribute=linenumber_attribute, replace_entities=False, fix_newlines=False)
 
 if __name__ == '__main__':
     from lxml import etree

From 106b7172080ef522009d440ea7be440f1942d2e1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 16:22:23 +0530
Subject: [PATCH 1120/1154] Use the new parser for Tweak Books

---
 src/calibre/ebooks/oeb/polish/container.py    | 28 ++++++++++++-------
 src/calibre/ebooks/oeb/polish/parsing.py      |  1 +
 .../ebooks/oeb/polish/tests/container.py      |  6 +++-
 src/calibre/gui2/tweak_book/boss.py           |  6 +++-
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index f6b5841ca5..d87f90a73c 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -30,6 +30,7 @@ from calibre.ebooks.oeb.base import (
     serialize, OEB_DOCS, _css_logger, OEB_STYLES, OPF2_NS, DC11_NS, OPF,
     rewrite_links, iterlinks, itercsslinks, urlquote, urlunquote)
 from calibre.ebooks.oeb.polish.errors import InvalidBook, DRMError
+from calibre.ebooks.oeb.polish.parsing import parse as parse_html_tweak
 from calibre.ebooks.oeb.parse_utils import NotHTML, parse_html, RECOVER_PARSER
 from calibre.ptempfile import PersistentTemporaryDirectory, PersistentTemporaryFile
 from calibre.utils.filenames import nlinks_file, hardlink_file
@@ -98,6 +99,7 @@ class Container(object):  # {{{
         self.log = log
         self.html_preprocessor = HTMLPreProcessor()
         self.css_preprocessor = CSSPreProcessor()
+        self.tweak_mode = False
 
         self.parsed_cache = {}
         self.mime_map = {}
@@ -110,7 +112,7 @@ class Container(object):  # {{{
 
         if clone_data is not None:
             self.cloned = True
-            for x in ('name_path_map', 'opf_name', 'mime_map', 'pretty_print', 'encoding_map'):
+            for x in ('name_path_map', 'opf_name', 'mime_map', 'pretty_print', 'encoding_map', 'tweak_mode'):
                 setattr(self, x, clone_data[x])
             self.opf_dir = os.path.dirname(self.name_path_map[self.opf_name])
             return
@@ -150,6 +152,7 @@ class Container(object):  # {{{
             'mime_map': self.mime_map.copy(),
             'pretty_print': set(self.pretty_print),
             'encoding_map': self.encoding_map.copy(),
+            'tweak_mode': self.tweak_mode,
             'name_path_map': {
                 name:os.path.join(dest_dir, os.path.relpath(path, self.root))
                 for name, path in self.name_path_map.iteritems()}
@@ -343,13 +346,16 @@ class Container(object):  # {{{
         return etree.fromstring(data, parser=RECOVER_PARSER)
 
     def parse_xhtml(self, data, fname):
-        try:
-            return parse_html(
-                data, log=self.log, decoder=self.decode,
-                preprocessor=self.html_preprocessor, filename=fname,
-                non_html_file_tags={'ncx'})
-        except NotHTML:
-            return self.parse_xml(data)
+        if self.tweak_mode:
+            return parse_html_tweak(data, log=self.log, decoder=self.decode)
+        else:
+            try:
+                return parse_html(
+                    data, log=self.log, decoder=self.decode,
+                    preprocessor=self.html_preprocessor, filename=fname,
+                    non_html_file_tags={'ncx'})
+            except NotHTML:
+                return self.parse_xml(data)
 
     def parse(self, path, mime):
         with open(path, 'rb') as src:
@@ -367,7 +373,8 @@ class Container(object):  # {{{
         log.setLevel(logging.WARN)
         log.raiseExceptions = False
         data = self.decode(data)
-        data = self.css_preprocessor(data)
+        if not self.tweak_mode:
+            data = self.css_preprocessor(data)
         parser = CSSParser(loglevel=logging.WARNING,
                            # We dont care about @import rules
                            fetcher=lambda x: (None, None), log=_css_logger)
@@ -1000,11 +1007,12 @@ class AZW3Container(Container):
         return set(self.name_path_map)
 # }}}
 
-def get_container(path, log=None, tdir=None):
+def get_container(path, log=None, tdir=None, tweak_mode=False):
     if log is None:
         log = default_log
     ebook = (AZW3Container if path.rpartition('.')[-1].lower() in {'azw3', 'mobi'}
             else EpubContainer)(path, log, tdir=tdir)
+    ebook.tweak_mode = tweak_mode
     return ebook
 
 def test_roundtrip():
diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index 961ce8b5a9..4a697bb473 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -616,6 +616,7 @@ def parse(raw, decoder=None, log=None, line_numbers=True, linenumber_attribute=N
             for elem in ans.iter(LxmlElement):
                 if elem.sourceline is not None:
                     elem.set(linenumber_attribute, str(elem.sourceline))
+        return ans
     except Exception:
         if log is not None:
             log.exception('Failed to parse as XML, parsing as tag soup')
diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py
index 0ca95730d1..cc836b7b04 100644
--- a/src/calibre/ebooks/oeb/polish/tests/container.py
+++ b/src/calibre/ebooks/oeb/polish/tests/container.py
@@ -10,11 +10,15 @@ import os, subprocess
 
 from calibre.ebooks.oeb.polish.tests.base import BaseTest, get_simple_book
 
-from calibre.ebooks.oeb.polish.container import get_container, clone_container, OCF_NS
+from calibre.ebooks.oeb.polish.container import get_container as _gc, clone_container, OCF_NS
 from calibre.ebooks.oeb.polish.replace import rename_files
 from calibre.utils.filenames import nlinks_file
 from calibre.ptempfile import TemporaryFile
 
+def get_container(*args, **kwargs):
+    kwargs['tweak_mode'] = True
+    return _gc(*args, **kwargs)
+
 class ContainerTests(BaseTest):
 
     def test_clone(self):
diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index e12b6e0026..b2084a3820 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -17,7 +17,7 @@ from calibre import prints
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.ebooks.oeb.base import urlnormalize
 from calibre.ebooks.oeb.polish.main import SUPPORTED
-from calibre.ebooks.oeb.polish.container import get_container, clone_container, guess_type
+from calibre.ebooks.oeb.polish.container import get_container as _gc, clone_container, guess_type
 from calibre.ebooks.oeb.polish.replace import rename_files
 from calibre.gui2 import error_dialog, choose_files, question_dialog, info_dialog
 from calibre.gui2.dialogs.confirm_delete import confirm
@@ -25,6 +25,10 @@ from calibre.gui2.tweak_book import set_current_container, current_container, tp
 from calibre.gui2.tweak_book.undo import GlobalUndoHistory
 from calibre.gui2.tweak_book.save import SaveManager
 
+def get_container(*args, **kwargs):
+    kwargs['tweak_mode'] = True
+    return _gc(*args, **kwargs)
+
 class Boss(QObject):
 
     def __init__(self, parent):

From b1c59e0c03d3cfd025e686a1007ea08b22b818f6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 28 Oct 2013 21:41:55 +0530
Subject: [PATCH 1121/1154] Set busy cursor on long job

---
 src/calibre/gui2/tweak_book/job.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/tweak_book/job.py b/src/calibre/gui2/tweak_book/job.py
index 4dd2a6946d..5c5b277725 100644
--- a/src/calibre/gui2/tweak_book/job.py
+++ b/src/calibre/gui2/tweak_book/job.py
@@ -10,7 +10,7 @@ import time
 from threading import Thread
 from functools import partial
 
-from PyQt4.Qt import (QWidget, QVBoxLayout, QLabel, Qt, QPainter, QBrush, QRect)
+from PyQt4.Qt import (QWidget, QVBoxLayout, QLabel, Qt, QPainter, QBrush, QRect, QApplication, QCursor)
 
 from calibre.gui2 import Dispatcher
 from calibre.gui2.progress_indicator import ProgressIndicator
@@ -65,8 +65,10 @@ class BlockingJob(QWidget):
         self.raise_()
         self.setFocus(Qt.OtherFocusReason)
         self.pi.startAnimation()
+        QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
 
     def stop(self):
+        QApplication.restoreOverrideCursor()
         self.pi.stopAnimation()
         self.setVisible(False)
         self.parent().setEnabled(True)

From b79113cff90e3d80b83d2d1ff77a03db411e6056 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 29 Oct 2013 08:48:47 +0530
Subject: [PATCH 1122/1154] Add instructions on setting environment variables
 in OS X

---
 manual/customize.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manual/customize.rst b/manual/customize.rst
index 5dde2b226d..cfd63cea66 100644
--- a/manual/customize.rst
+++ b/manual/customize.rst
@@ -30,11 +30,12 @@ Environment variables
     * ``CALIBRE_OVERRIDE_DATABASE_PATH`` - allows you to specify the full path to metadata.db. Using this variable you can have metadata.db be in a location other than the library folder. Useful if your library folder is on a networked drive that does not support file locking.
     * ``CALIBRE_DEVELOP_FROM`` - Used to run from a calibre development environment. See :ref:`develop`.
     * ``CALIBRE_OVERRIDE_LANG`` - Used to force the language used by the interface (ISO 639 language code)
-    * ``CALIBRE_NO_NATIVE_FILEDIALOGS`` - Causes calibre to not use native file dialogs for selecting files/directories.
+    * ``CALIBRE_NO_NATIVE_FILEDIALOGS`` - Causes calibre to not use native file dialogs for selecting files/directories. Set it to 1 to enable.
     * ``SYSFS_PATH`` - Use if sysfs is mounted somewhere other than /sys
     * ``http_proxy`` - Used on linux to specify an HTTP proxy
 
-See `How to set environment variables in windows <http://www.computerhope.com/issues/ch000549.htm>`_.
+See `How to set environment variables in windows <http://www.computerhope.com/issues/ch000549.htm>`_ or
+`How to set environment variables in OS X <http://blog.dowdandassociates.com/content/howto-set-an-environment-variable-in-mac-os-x-home-slash-dot-macosx-slash-environment-dot-plist/>`_.
 
 Tweaks
 ------------

From 2d69246fa5dfdace9e2ce79e5de420fdfca9df50 Mon Sep 17 00:00:00 2001
From: David Forrester <davidfor@internode.on.net>
Date: Tue, 29 Oct 2013 10:42:50 +1100
Subject: [PATCH 1123/1154] Bump firmware version for Kobo Touch driver

New firmware version released, updating versions to match.
Fixes #1245707 [Update to support Kobo firmware 2.10.0](https://bugs.launchpad.net/calibre/+bug/1245707)
---
 src/calibre/devices/kobo/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 2c1c063817..2a4c93bb4e 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -63,7 +63,7 @@ class KOBO(USBMS):
     gui_name = 'Kobo Reader'
     description = _('Communicate with the Kobo Reader')
     author = 'Timothy Legge and David Forrester'
-    version = (2, 1, 4)
+    version = (2, 1, 5)
 
     dbversion = 0
     fwversion = 0
@@ -1251,7 +1251,7 @@ class KOBOTOUCH(KOBO):
     min_dbversion_activiy           = 77
     min_dbversion_keywords          = 82
 
-    max_supported_fwversion         = (2,9,1)
+    max_supported_fwversion         = (2,10,1)
     min_fwversion_images_on_sdcard  = (2,4,1)
     min_fwversion_images_tree       = (2,9,0)  # Cover images stored in tree under .kobo-images
 

From 4005b8e502924caffbb8add3d10c7f49cf877407 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 29 Oct 2013 09:51:13 +0530
Subject: [PATCH 1124/1154] Use <h2> for inserted ToC title for MOBI and PDF as
 well

See #1245076 ([Enhancement] Add PDF TOC Title, More Margin Options and ePub TOC Heading 1)
---
 src/calibre/ebooks/oeb/transforms/htmltoc.py | 2 +-
 src/calibre/ebooks/pdf/render/toc.py         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/transforms/htmltoc.py b/src/calibre/ebooks/oeb/transforms/htmltoc.py
index 0e1b2b5f10..c7a0cfce94 100644
--- a/src/calibre/ebooks/oeb/transforms/htmltoc.py
+++ b/src/calibre/ebooks/oeb/transforms/htmltoc.py
@@ -102,7 +102,7 @@ class HTMLTOCAdder(object):
                 href=css_href)
         body = element(contents, XHTML('body'),
                        attrib={'class': 'calibre_toc'})
-        h1 = element(body, XHTML('h1'),
+        h1 = element(body, XHTML('h2'),
                      attrib={'class': 'calibre_toc_header'})
         h1.text = title
         self.add_toc_level(body, oeb.toc)
diff --git a/src/calibre/ebooks/pdf/render/toc.py b/src/calibre/ebooks/pdf/render/toc.py
index 6534248d86..f1a812ce6f 100644
--- a/src/calibre/ebooks/pdf/render/toc.py
+++ b/src/calibre/ebooks/pdf/render/toc.py
@@ -9,7 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import os
 
 from lxml.html import tostring
-from lxml.html.builder import (HTML, HEAD, BODY, TABLE, TR, TD, H1, STYLE)
+from lxml.html.builder import (HTML, HEAD, BODY, TABLE, TR, TD, H2, STYLE)
 
 def convert_node(toc, table, level, pdf):
     tr = TR(
@@ -64,7 +64,7 @@ def toc_as_html(toc, pdf, opts):
             )
         ),
         BODY(
-            H1(opts.toc_title or _('Table of Contents')),
+            H2(opts.toc_title or _('Table of Contents')),
             TABLE(),
         )
     )

From a3ebc6e3edbcd9acbcbd36e5954114ab138ea16d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 29 Oct 2013 11:55:09 +0530
Subject: [PATCH 1125/1154] Remember window size of comments editor dialog

---
 src/calibre/gui2/dialogs/comments_dialog.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/calibre/gui2/dialogs/comments_dialog.py b/src/calibre/gui2/dialogs/comments_dialog.py
index eee23f4b3e..70d4a4a5a3 100644
--- a/src/calibre/gui2/dialogs/comments_dialog.py
+++ b/src/calibre/gui2/dialogs/comments_dialog.py
@@ -4,6 +4,8 @@ __docformat__ = 'restructuredtext en'
 __license__   = 'GPL v3'
 
 from PyQt4.Qt import Qt, QDialog, QDialogButtonBox
+
+from calibre.gui2 import gprefs
 from calibre.gui2.dialogs.comments_dialog_ui import Ui_CommentsDialog
 from calibre.library.comments import comments_to_html
 
@@ -27,3 +29,22 @@ class CommentsDialog(QDialog, Ui_CommentsDialog):
         if column_name:
             self.setWindowTitle(_('Edit "{0}"').format(column_name))
 
+        geom = gprefs.get('comments_dialog_geom', None)
+        if geom is not None:
+            self.restoreGeometry(geom)
+
+    def save_geometry(self):
+        gprefs.set('comments_dialog_geom', bytearray(self.saveGeometry()))
+
+    def accept(self):
+        self.save_geometry()
+        QDialog.accept(self)
+
+    def reject(self):
+        self.save_geometry()
+        QDialog.reject(self)
+
+    def closeEvent(self, ev):
+        self.save_geometry()
+        return QDialog.closeEvent(self, ev)
+

From a66904da25d2821de76852ca521949a4a1e28d08 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 29 Oct 2013 22:10:52 +0530
Subject: [PATCH 1126/1154] Start work on the editor component for Tweak Book

---
 src/calibre/gui2/tweak_book/__init__.py       |   4 +
 .../gui2/tweak_book/editor/__init__.py        |  10 +
 .../gui2/tweak_book/editor/syntax/__init__.py |  10 +
 .../gui2/tweak_book/editor/syntax/base.py     |  28 +++
 .../gui2/tweak_book/editor/syntax/html.py     | 238 ++++++++++++++++++
 src/calibre/gui2/tweak_book/editor/text.py    | 131 ++++++++++
 src/calibre/gui2/tweak_book/editor/themes.py  | 131 ++++++++++
 7 files changed, 552 insertions(+)
 create mode 100644 src/calibre/gui2/tweak_book/editor/__init__.py
 create mode 100644 src/calibre/gui2/tweak_book/editor/syntax/__init__.py
 create mode 100644 src/calibre/gui2/tweak_book/editor/syntax/base.py
 create mode 100644 src/calibre/gui2/tweak_book/editor/syntax/html.py
 create mode 100644 src/calibre/gui2/tweak_book/editor/text.py
 create mode 100644 src/calibre/gui2/tweak_book/editor/themes.py

diff --git a/src/calibre/gui2/tweak_book/__init__.py b/src/calibre/gui2/tweak_book/__init__.py
index 63519c9bea..0af48bb02e 100644
--- a/src/calibre/gui2/tweak_book/__init__.py
+++ b/src/calibre/gui2/tweak_book/__init__.py
@@ -9,6 +9,10 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 from calibre.utils.config import JSONConfig
 tprefs = JSONConfig('tweak_book_gui')
 
+tprefs.defaults['editor_theme'] = None
+tprefs.defaults['editor_font_family'] = None
+tprefs.defaults['editor_font_size'] = 12
+
 _current_container = None
 
 def current_container():
diff --git a/src/calibre/gui2/tweak_book/editor/__init__.py b/src/calibre/gui2/tweak_book/editor/__init__.py
new file mode 100644
index 0000000000..2dfbaa2fb8
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/editor/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/__init__.py b/src/calibre/gui2/tweak_book/editor/syntax/__init__.py
new file mode 100644
index 0000000000..2dfbaa2fb8
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/editor/syntax/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py
new file mode 100644
index 0000000000..c0d3ca5541
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from PyQt4.Qt import (QSyntaxHighlighter, QApplication, QCursor, Qt)
+
+from ..themes import highlight_to_char_format
+
+class SyntaxHighlighter(QSyntaxHighlighter):
+
+    def rehighlight(self):
+        self.outlineexplorer_data = {}
+        QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+        QSyntaxHighlighter.rehighlight(self)
+        QApplication.restoreOverrideCursor()
+
+    def apply_theme(self, theme):
+        self.theme = {k:highlight_to_char_format(v) for k, v in theme.iteritems()}
+        self.create_formats()
+        self.rehighlight()
+
+    def create_formats(self):
+        pass
+
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
new file mode 100644
index 0000000000..cbae374885
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -0,0 +1,238 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import re
+
+from PyQt4.Qt import (QTextCharFormat)
+
+from .base import SyntaxHighlighter
+from html5lib.constants import cdataElements, rcdataElements
+
+entity_pat = re.compile(r'&#{0,1}[a-zA-Z0-9]{1,8};')
+tag_name_pat = re.compile(r'/{0,1}[a-zA-Z0-9:]+')
+space_chars = ' \t\r\n\u000c'
+attribute_name_pat = re.compile(r'''[^%s"'/>=]+''' % space_chars)
+self_closing_pat = re.compile(r'/\s*>')
+unquoted_val_pat = re.compile(r'''[^%s'"=<>`]+''' % space_chars)
+
+class State(object):
+
+    ''' Store the parsing state, a stack of bold and italic formatting and the
+    last seen open tag, all in a single integer, so that it can be used with.
+    This assumes an int is at least 32 bits.'''
+
+    NORMAL = 0
+    IN_OPENING_TAG = 1
+    IN_CLOSING_TAG = 2
+    IN_COMMENT = 3
+    IN_PI = 4
+    IN_DOCTYPE = 5
+    ATTRIBUTE_NAME = 6
+    ATTRIBUTE_VALUE = 7
+    SQ_VAL = 8
+    DQ_VAL = 9
+
+    TAGS = {x:i+1 for i, x in enumerate(cdataElements | rcdataElements | {'b', 'em', 'i', 'string', 'a'} | {'h%d' % d for d in range(1, 7)})}
+    TAGS_RMAP = {v:k for k, v in TAGS.iteritems()}
+    UNKNOWN_TAG = '___'
+
+    def __init__(self, num):
+        self.parse  = num & 0b1111
+        self.bold   = (num >> 4) & 0b11111111
+        self.italic = (num >> 12) & 0b11111111
+        self.tag    = self.TAGS_RMAP.get(num >> 20, self.UNKNOWN_TAG)
+
+    @property
+    def value(self):
+        tag = self.TAGS.get(self.tag.lower(), 0)
+        return (self.parse & 0b1111) | ((self.bold & 0b11111111) << 4) | ((self.italic & 0b11111111) << 12) | (tag << 20)
+
+def err(formats, msg):
+    ans = QTextCharFormat(formats['error'])
+    ans.setToolTip(msg)
+    return ans
+
+def normal(state, text, i, formats):
+    ' The normal state in between tags '
+    ch = text[i]
+    if ch == '<':
+        if text[i:i+4] == '<!--':
+            state.parse, fmt = state.IN_COMMENT, formats['comment']
+            return [(4, fmt)]
+
+        if text[i:i+2] == '<?':
+            state.parse, fmt = state.IN_PI, formats['special']
+            return [(2, fmt)]
+
+        if text[i:i+2] == '<!' and text[i+2:].lstrip().lower().startswith('doctype'):
+            state.parse, fmt = state.IN_DOCTYPE, formats['special']
+            return [(2, fmt)]
+
+        m = tag_name_pat.match(text, i + 1)
+        if m is None:
+            return [(1, err(formats, _('An unescaped < is not allowed. Replace it with &lt;')))]
+
+        name = m.group()
+        closing = name.startswith('/')
+        state.parse = state.IN_CLOSING_TAG if closing else state.IN_OPENING_TAG
+        state.tag = name[1:] if closing else name
+        num = 2 if closing else 1
+        return [(num, formats['end_tag' if closing else 'tag']), (len(state.tag), formats['tag_name'])]
+
+    if ch == '&':
+        m = entity_pat.match(text, i)
+        if m is None:
+            return [(1, err(formats, _('An unescaped ampersand is not allowed. Replace it with &amp;')))]
+        return [(len(m.group()), formats['entity'])]
+
+    if ch == '>':
+        return [(1, err(formats, _('An unescaped > is not allowed. Replace it with &gt;')))]
+
+    return [(1, None)]
+
+def opening_tag(state, text, i, formats):
+    'An opening tag, like <a>'
+    ch = text[i]
+    if ch in space_chars:
+        return [(1, None)]
+    if ch == '/':
+        m = self_closing_pat.match(text, i)
+        if m is None:
+            return [(1, err(formats, _('/ not allowed except at the end of the tag')))]
+        state.parse = state.NORMAL
+        state.tag = State.UNKNOWN_TAG
+        return [(len(m.group()), formats['tag'])]
+    if ch == '>':
+        state.parse = state.NORMAL
+        state.tag = State.UNKNOWN_TAG
+        return [(1, formats['tag'])]
+    m = attribute_name_pat.match(text, i)
+    if m is None:
+        return [(1, err(formats, _('Unknown character')))]
+    state.parse = state.ATTRIBUTE_NAME
+    num = len(m.group())
+    return [(num, formats['attr'])]
+
+def attribute_name(state, text, i, formats):
+    ' After attribute name '
+    ch = text[i]
+    if ch in space_chars:
+        return [(1, None)]
+    if ch == '=':
+        state.parse = State.ATTRIBUTE_VALUE
+        return [(1, formats['attr'])]
+    state.parse = State.IN_OPENING_TAG
+    return [(-1, None)]
+
+def attribute_value(state, text, i, formats):
+    ' After attribute = '
+    ch = text[i]
+    if ch in space_chars:
+        return [(1, None)]
+    if ch in {'"', "'"}:
+        state.parse = State.SQ_VAL if ch == "'" else State.DQ_VAL
+        return [(1, formats['string'])]
+    m = unquoted_val_pat.match(text, i)
+    state.parse = State.IN_OPENING_TAG
+    return [(len(m.group()), formats['string'])]
+
+def quoted_val(state, text, i, formats):
+    ' A quoted attribute value '
+    quote = '"' if state.parse == State.DQ_VAL else "'"
+    pos = text.find(quote, i)
+    if pos == -1:
+        num = len(text) - i
+    else:
+        num = pos - i + 1
+        state.parse = State.IN_OPENING_TAG
+    return [(num, formats['string'])]
+
+def closing_tag(state, text, i, formats):
+    ' A closing tag like </a> '
+    ch = text[i]
+    if ch in space_chars:
+        return [(1, None)]
+    pos = text.find('>', i)
+    if pos == -1:
+        return [(len(text) - i, err(formats, _('A closing tag must contain only the tag name and nothing else')))]
+    state.parse = state.NORMAL
+    num = pos - i + 1
+    ans = [(1, formats['end_tag'])]
+    if num > 1:
+        ans.insert(0, (num - 1, err(formats, _('A closing tag must contain only the tag name and nothing else'))))
+    return ans
+
+def in_comment(state, text, i, formats):
+    ' Comment, processing instruction or doctype '
+    end = {state.IN_COMMENT:'-->', state.IN_PI:'?>'}.get(state.parse, '>')
+    pos = text.find(end, i+1)
+    fmt = formats['comment' if state.parse == state.IN_COMMENT else 'special']
+    if pos == -1:
+        num = len(text) - i
+    else:
+        num = pos - i + len(end)
+        state.parse = state.NORMAL
+    return [(num, fmt)]
+
+state_map = {
+    State.NORMAL:normal,
+    State.IN_OPENING_TAG: opening_tag,
+    State.IN_CLOSING_TAG: closing_tag,
+    State.ATTRIBUTE_NAME: attribute_name,
+    State.ATTRIBUTE_VALUE: attribute_value,
+}
+
+for x in (State.IN_COMMENT, State.IN_PI, State.IN_DOCTYPE):
+    state_map[x] = in_comment
+
+for x in (State.SQ_VAL, State.DQ_VAL):
+    state_map[x] = quoted_val
+
+class HTMLHighlighter(SyntaxHighlighter):
+
+    def __init__(self, parent):
+        SyntaxHighlighter.__init__(self, parent)
+
+    def create_formats(self):
+        t = self.theme
+        self.formats = {
+            'normal': QTextCharFormat(),
+            'tag': t['Function'],
+            'end_tag': t['Identifier'],
+            'attr': t['Type'],
+            'tag_name' : t['Statement'],
+            'entity': t['Special'],
+            'error': t['Error'],
+            'comment': t['Comment'],
+            'special': t['Special'],
+            'string': t['String'],
+        }
+
+    def highlightBlock(self, text):
+        try:
+            self.do_highlight(unicode(text))
+        except:
+            import traceback
+            traceback.print_exc()
+
+    def do_highlight(self, text):
+        state = self.previousBlockState()
+        if state == -1:
+            state = State.NORMAL
+        state = State(state)
+
+        i = 0
+        while i < len(text):
+            fmt = state_map[state.parse](state, text, i, self.formats)
+            for num, f in fmt:
+                if f is not None:
+                    self.setFormat(i, num, f)
+                i += num
+
+        self.setCurrentBlockState(state.value)
+
diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py
new file mode 100644
index 0000000000..0a40b9da92
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/editor/text.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import textwrap
+
+from PyQt4.Qt import (
+    QPlainTextEdit, QApplication, QFontDatabase, QToolTip, QPalette, QFont)
+
+from calibre.gui2.tweak_book import tprefs
+from calibre.gui2.tweak_book.editor.themes import THEMES, DEFAULT_THEME, theme_color
+from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
+from calibre.gui2.tweak_book.editor.syntax.html import HTMLHighlighter
+
+_dff = None
+def default_font_family():
+    global _dff
+    if _dff is None:
+        families = set(map(unicode, QFontDatabase().families()))
+        for x in ('Ubuntu Mono', 'Consolas', 'Liberation Mono'):
+            if x in families:
+                _dff = x
+                break
+        if _dff is None:
+            _dff = 'Courier New'
+    return _dff
+
+class TextEdit(QPlainTextEdit):
+
+    def __init__(self, parent=None):
+        QPlainTextEdit.__init__(self, parent)
+        self.highlighter = SyntaxHighlighter(self)
+        self.apply_theme()
+        self.setMouseTracking(True)
+
+    def apply_theme(self):
+        theme = THEMES.get(tprefs['editor_theme'], None)
+        if theme is None:
+            theme = THEMES[DEFAULT_THEME]
+        self.theme = theme
+        pal = self.palette()
+        pal.setColor(pal.Base, theme_color(theme, 'Normal', 'bg'))
+        pal.setColor(pal.Text, theme_color(theme, 'Normal', 'fg'))
+        pal.setColor(pal.Highlight, theme_color(theme, 'Visual', 'bg'))
+        pal.setColor(pal.HighlightedText, theme_color(theme, 'Visual', 'fg'))
+        self.setPalette(pal)
+        self.tooltip_palette = pal = QPalette()
+        pal.setColor(pal.ToolTipBase, theme_color(theme, 'Tooltip', 'bg'))
+        pal.setColor(pal.ToolTipText, theme_color(theme, 'Tooltip', 'fg'))
+        font = self.font()
+        ff = tprefs['editor_font_family']
+        if ff is None:
+            ff = default_font_family()
+        font.setFamily(ff)
+        font.setPointSize(tprefs['editor_font_size'])
+        self.tooltip_font = QFont(font)
+        self.tooltip_font.setPointSize(font.pointSize() - 1)
+        self.setFont(font)
+        self.highlighter.apply_theme(theme)
+
+    def load_text(self, text, syntax='html'):
+        self.highlighter = {'html':HTMLHighlighter}.get(syntax, SyntaxHighlighter)(self)
+        self.highlighter.apply_theme(self.theme)
+        self.highlighter.setDocument(self.document())
+        self.setPlainText(text)
+
+    def event(self, ev):
+        if ev.type() == ev.ToolTip:
+            self.show_tooltip(ev)
+            return True
+        return QPlainTextEdit.event(self, ev)
+
+    def syntax_format_for_cursor(self, cursor):
+        if cursor.isNull():
+            return
+        pos = cursor.positionInBlock()
+        for r in cursor.block().layout().additionalFormats():
+            if r.start <= pos < r.start + r.length:
+                return r.format
+
+    def show_tooltip(self, ev):
+        c = self.cursorForPosition(ev.pos())
+        fmt = self.syntax_format_for_cursor(c)
+        if fmt is not None:
+            tt = unicode(fmt.toolTip())
+            if tt:
+                QToolTip.setFont(self.tooltip_font)
+                QToolTip.setPalette(self.tooltip_palette)
+                QToolTip.showText(ev.globalPos(), textwrap.fill(tt))
+        QToolTip.hideText()
+        ev.ignore()
+
+if __name__ == '__main__':
+    app = QApplication([])
+    t = TextEdit()
+    t.show()
+    t.load_text(textwrap.dedent('''\
+                <html>
+                <head>
+                    <title>Page title</title>
+                    <style type="text/css">
+                        body { color: green; }
+                    </style>
+                </head id="1">
+                <body>
+                <!-- The start of the document -->a
+                <h1 class="head" id="one" >A heading</h1>
+                <p> A single &. An proper entity &amp;.
+                A single < and a single >.
+                These cases are perfectly simple and easy to
+                distinguish. In a free hour, when our power of choice is
+                untrammelled and when nothing prevents our being able to do
+                what we like best, every pleasure is to be welcomed and every
+                pain avoided.</p>
+
+                <p>
+                But in certain circumstances and owing to the claims of duty or the obligations
+                of business it will frequently occur that pleasures have to be
+                repudiated and annoyances accepted. The wise man therefore
+                always holds in these matters to this principle of selection:
+                he rejects pleasures to secure other greater pleasures, or else
+                he endures pains.</p>
+                </body>
+                </html>
+                '''))
+    app.exec_()
+
diff --git a/src/calibre/gui2/tweak_book/editor/themes.py b/src/calibre/gui2/tweak_book/editor/themes.py
new file mode 100644
index 0000000000..f068be64de
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/editor/themes.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from collections import namedtuple
+
+from PyQt4.Qt import (QColor, QTextCharFormat, QBrush, QFont)
+
+underline_styles = {'single', 'dash', 'dot', 'dash_dot', 'dash_dot_dot', 'wave', 'spell'}
+
+DEFAULT_THEME = 'calibre-dark'
+
+THEMES = {
+    'calibre-dark':  # {{{  Based on the wombat color scheme for vim
+    '''
+    CursorLine   bg=2d2d2d
+    CursorColumn bg=2d2d2d
+    ColorColumn  bg=2d2d2d
+    MatchParen   fg=f6f3e8 bg=857b6f bold
+    Pmenu        fg=f6f3e8 bg=444444
+    PmenuSel     fg=yellow bg=cae682
+    Tooltip      fg=black bg=ffffed
+
+    Cursor       bg=656565
+    Normal       fg=f6f3e8 bg=242424
+    NonText      fg=808080 bg=303030
+    LineNr       fg=857b6f bg=000000
+    StatusLine   fg=f6f3e8 bg=444444 italic
+    StatusLineNC fg=857b6f bg=444444
+    VertSplit    fg=444444 bg=444444
+    Folded       bg=384048 fg=a0a8b0
+    Title        fg=f6f3e8 bold
+    Visual       fg=f6f3e8 bg=444444
+    SpecialKey   fg=808080 bg=343434
+
+    Comment      fg=99968b
+    Todo         fg=8f8f8f
+    Constant     fg=e5786d
+    String       fg=95e454
+    Identifier   fg=cae682
+    Function     fg=cae682
+    Type         fg=cae682
+    Statement    fg=8ac6f2
+    Keyword      fg=8ac6f2
+    PreProc      fg=e5786d
+    Number       fg=e5786d
+    Special      fg=e7f6da
+    Error        us=wave uc=red
+
+    ''',  # }}}
+
+}
+
+def read_color(col):
+    if QColor.isValidColor(col):
+        return QBrush(QColor(col))
+    try:
+        r, g, b = col[0:2], col[2:4], col[4:6]
+        r, g, b = int(r, 16), int(g, 16), int(b, 16)
+        return QBrush(QColor(r, g, b))
+    except Exception:
+        pass
+
+Highlight = namedtuple('Highlight', 'fg bg bold italic underline underline_color')
+
+def read_theme(raw):
+    ans = {}
+    for line in raw.splitlines():
+        line = line.strip()
+        if not line or line.startswith('#'):
+            continue
+        bold = italic = False
+        fg = bg = name = underline = underline_color = None
+        for i, token in enumerate(line.split()):
+            if i == 0:
+                name = token
+            else:
+                if token == 'bold':
+                    bold = True
+                elif token == 'italic':
+                    italic = True
+                elif '=' in token:
+                    prefix, val = token.partition('=')[0::2]
+                    if prefix == 'us':
+                        underline = val if val in underline_styles else None
+                    elif prefix == 'uc':
+                        underline_color = read_color(val)
+                    elif prefix == 'fg':
+                        fg = read_color(val)
+                    elif prefix == 'bg':
+                        bg = read_color(val)
+        if name is not None:
+            ans[name] = Highlight(fg, bg, bold, italic, underline, underline_color)
+    return ans
+
+
+THEMES = {k:read_theme(raw) for k, raw in THEMES.iteritems()}
+
+def u(x):
+    x = {'spell':'SpellCheck', 'dash_dot':'DashDot', 'dash_dot_dot':'DashDotDot'}.get(x, x.capitalize())
+    if 'Dot' in x:
+        return x + 'Line'
+    return x + 'Underline'
+underline_styles = {x:getattr(QTextCharFormat, u(x)) for x in underline_styles}
+
+def highlight_to_char_format(h):
+    ans = QTextCharFormat()
+    if h.bold:
+        ans.setFontWeight(QFont.Bold)
+    if h.italic:
+        ans.setFontItalic(True)
+    if h.fg is not None:
+        ans.setForeground(h.fg)
+    if h.bg is not None:
+        ans.setBackground(h.bg)
+    if h.underline is not None:
+        ans.setUnderlineStyle(underline_styles[h.underline])
+        if h.underline_color is not None:
+            ans.setUnderlineColor(h.underline_color.color())
+    return ans
+
+def theme_color(theme, name, attr):
+    try:
+        return getattr(theme[name], attr).color()
+    except (KeyError, AttributeError):
+        return getattr(THEMES[DEFAULT_THEME], attr).color()
+

From a1a89053f360efc73c99852ce31fd528efc26024 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 08:23:17 +0530
Subject: [PATCH 1127/1154] Pre-create error formats

---
 .../gui2/tweak_book/editor/syntax/html.py     | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index cbae374885..f4d575fcad 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -52,11 +52,6 @@ class State(object):
         tag = self.TAGS.get(self.tag.lower(), 0)
         return (self.parse & 0b1111) | ((self.bold & 0b11111111) << 4) | ((self.italic & 0b11111111) << 12) | (tag << 20)
 
-def err(formats, msg):
-    ans = QTextCharFormat(formats['error'])
-    ans.setToolTip(msg)
-    return ans
-
 def normal(state, text, i, formats):
     ' The normal state in between tags '
     ch = text[i]
@@ -75,7 +70,7 @@ def normal(state, text, i, formats):
 
         m = tag_name_pat.match(text, i + 1)
         if m is None:
-            return [(1, err(formats, _('An unescaped < is not allowed. Replace it with &lt;')))]
+            return [(1, formats['<'])]
 
         name = m.group()
         closing = name.startswith('/')
@@ -87,11 +82,11 @@ def normal(state, text, i, formats):
     if ch == '&':
         m = entity_pat.match(text, i)
         if m is None:
-            return [(1, err(formats, _('An unescaped ampersand is not allowed. Replace it with &amp;')))]
+            return [(1, formats['&'])]
         return [(len(m.group()), formats['entity'])]
 
     if ch == '>':
-        return [(1, err(formats, _('An unescaped > is not allowed. Replace it with &gt;')))]
+        return [(1, formats['>'])]
 
     return [(1, None)]
 
@@ -103,7 +98,7 @@ def opening_tag(state, text, i, formats):
     if ch == '/':
         m = self_closing_pat.match(text, i)
         if m is None:
-            return [(1, err(formats, _('/ not allowed except at the end of the tag')))]
+            return [(1, formats['/'])]
         state.parse = state.NORMAL
         state.tag = State.UNKNOWN_TAG
         return [(len(m.group()), formats['tag'])]
@@ -113,7 +108,7 @@ def opening_tag(state, text, i, formats):
         return [(1, formats['tag'])]
     m = attribute_name_pat.match(text, i)
     if m is None:
-        return [(1, err(formats, _('Unknown character')))]
+        return [(1, formats['?'])]
     state.parse = state.ATTRIBUTE_NAME
     num = len(m.group())
     return [(num, formats['attr'])]
@@ -159,12 +154,12 @@ def closing_tag(state, text, i, formats):
         return [(1, None)]
     pos = text.find('>', i)
     if pos == -1:
-        return [(len(text) - i, err(formats, _('A closing tag must contain only the tag name and nothing else')))]
+        return [(len(text) - i, formats['bad-closing'])]
     state.parse = state.NORMAL
     num = pos - i + 1
     ans = [(1, formats['end_tag'])]
     if num > 1:
-        ans.insert(0, (num - 1, err(formats, _('A closing tag must contain only the tag name and nothing else'))))
+        ans.insert(0, (num - 1, formats['bad-closing']))
     return ans
 
 def in_comment(state, text, i, formats):
@@ -201,7 +196,6 @@ class HTMLHighlighter(SyntaxHighlighter):
     def create_formats(self):
         t = self.theme
         self.formats = {
-            'normal': QTextCharFormat(),
             'tag': t['Function'],
             'end_tag': t['Identifier'],
             'attr': t['Type'],
@@ -212,6 +206,16 @@ class HTMLHighlighter(SyntaxHighlighter):
             'special': t['Special'],
             'string': t['String'],
         }
+        for name, msg in {
+            '<': _('An unescaped < is not allowed. Replace it with &lt;'),
+            '&': _('An unescaped ampersand is not allowed. Replace it with &amp;'),
+            '>': _('An unescaped > is not allowed. Replace it with &gt;'),
+            '/': _('/ not allowed except at the end of the tag'),
+            '?': _('Unknown character'),
+            'bad-closing': _('A closing tag must contain only the tag name and nothing else'),
+        }.iteritems():
+            f = self.formats[name] = QTextCharFormat(self.formats['error'])
+            f.setToolTip(msg)
 
     def highlightBlock(self, text):
         try:

From aa9e04aeb08e65a5f213f4207f48557b69ba0690 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 08:29:53 +0530
Subject: [PATCH 1128/1154] Highlight cursor line

---
 src/calibre/gui2/tweak_book/editor/text.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py
index 0a40b9da92..67ff2cdd1c 100644
--- a/src/calibre/gui2/tweak_book/editor/text.py
+++ b/src/calibre/gui2/tweak_book/editor/text.py
@@ -9,7 +9,8 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import textwrap
 
 from PyQt4.Qt import (
-    QPlainTextEdit, QApplication, QFontDatabase, QToolTip, QPalette, QFont)
+    QPlainTextEdit, QApplication, QFontDatabase, QToolTip, QPalette, QFont,
+    QTextEdit, QTextFormat)
 
 from calibre.gui2.tweak_book import tprefs
 from calibre.gui2.tweak_book.editor.themes import THEMES, DEFAULT_THEME, theme_color
@@ -36,6 +37,7 @@ class TextEdit(QPlainTextEdit):
         self.highlighter = SyntaxHighlighter(self)
         self.apply_theme()
         self.setMouseTracking(True)
+        self.cursorPositionChanged.connect(self.highlight_cursor_line)
 
     def apply_theme(self):
         theme = THEMES.get(tprefs['editor_theme'], None)
@@ -44,6 +46,7 @@ class TextEdit(QPlainTextEdit):
         self.theme = theme
         pal = self.palette()
         pal.setColor(pal.Base, theme_color(theme, 'Normal', 'bg'))
+        pal.setColor(pal.AlternateBase, theme_color(theme, 'CursorLine', 'bg'))
         pal.setColor(pal.Text, theme_color(theme, 'Normal', 'fg'))
         pal.setColor(pal.Highlight, theme_color(theme, 'Visual', 'bg'))
         pal.setColor(pal.HighlightedText, theme_color(theme, 'Visual', 'fg'))
@@ -68,6 +71,14 @@ class TextEdit(QPlainTextEdit):
         self.highlighter.setDocument(self.document())
         self.setPlainText(text)
 
+    def highlight_cursor_line(self):
+        sel = QTextEdit.ExtraSelection()
+        sel.format.setBackground(self.palette().alternateBase())
+        sel.format.setProperty(QTextFormat.FullWidthSelection, True)
+        sel.cursor = self.textCursor()
+        sel.cursor.clearSelection()
+        self.setExtraSelections([sel])
+
     def event(self, ev):
         if ev.type() == ev.ToolTip:
             self.show_tooltip(ev)

From 0c25bb466cddaac50dcc8835f8bd8a959fce18b6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 09:40:21 +0530
Subject: [PATCH 1129/1154] Keep only useful entries in the color theme

---
 src/calibre/gui2/tweak_book/editor/themes.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/themes.py b/src/calibre/gui2/tweak_book/editor/themes.py
index f068be64de..74ba428129 100644
--- a/src/calibre/gui2/tweak_book/editor/themes.py
+++ b/src/calibre/gui2/tweak_book/editor/themes.py
@@ -27,15 +27,9 @@ THEMES = {
 
     Cursor       bg=656565
     Normal       fg=f6f3e8 bg=242424
-    NonText      fg=808080 bg=303030
     LineNr       fg=857b6f bg=000000
-    StatusLine   fg=f6f3e8 bg=444444 italic
-    StatusLineNC fg=857b6f bg=444444
-    VertSplit    fg=444444 bg=444444
-    Folded       bg=384048 fg=a0a8b0
-    Title        fg=f6f3e8 bold
+    LineNrC      fg=yellow
     Visual       fg=f6f3e8 bg=444444
-    SpecialKey   fg=808080 bg=343434
 
     Comment      fg=99968b
     Todo         fg=8f8f8f
@@ -75,6 +69,7 @@ def read_theme(raw):
             continue
         bold = italic = False
         fg = bg = name = underline = underline_color = None
+        line = line.partition('#')[0]
         for i, token in enumerate(line.split()):
             if i == 0:
                 name = token

From 059e28e867ba9c4b2b765734a5b825374a4622b5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 10:03:26 +0530
Subject: [PATCH 1130/1154] Line numbers

---
 src/calibre/gui2/tweak_book/editor/text.py | 94 +++++++++++++++++++++-
 1 file changed, 92 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py
index 67ff2cdd1c..4da8404f53 100644
--- a/src/calibre/gui2/tweak_book/editor/text.py
+++ b/src/calibre/gui2/tweak_book/editor/text.py
@@ -7,10 +7,11 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import textwrap
+from future_builtins import map
 
 from PyQt4.Qt import (
     QPlainTextEdit, QApplication, QFontDatabase, QToolTip, QPalette, QFont,
-    QTextEdit, QTextFormat)
+    QTextEdit, QTextFormat, QWidget, QSize, QPainter, Qt, QRect)
 
 from calibre.gui2.tweak_book import tprefs
 from calibre.gui2.tweak_book.editor.themes import THEMES, DEFAULT_THEME, theme_color
@@ -30,6 +31,18 @@ def default_font_family():
             _dff = 'Courier New'
     return _dff
 
+class LineNumbers(QWidget):  # {{{
+
+    def __init__(self, parent):
+        QWidget.__init__(self, parent)
+
+    def sizeHint(self):
+        return QSize(self.parent().line_number_area_width(), 0)
+
+    def paintEvent(self, ev):
+        self.parent().paint_line_numbers(ev)
+# }}}
+
 class TextEdit(QPlainTextEdit):
 
     def __init__(self, parent=None):
@@ -38,8 +51,11 @@ class TextEdit(QPlainTextEdit):
         self.apply_theme()
         self.setMouseTracking(True)
         self.cursorPositionChanged.connect(self.highlight_cursor_line)
+        self.blockCountChanged[int].connect(self.update_line_number_area_width)
+        self.updateRequest.connect(self.update_line_number_area)
+        self.line_number_area = LineNumbers(self)
 
-    def apply_theme(self):
+    def apply_theme(self):  # {{{
         theme = THEMES.get(tprefs['editor_theme'], None)
         if theme is None:
             theme = THEMES[DEFAULT_THEME]
@@ -54,6 +70,10 @@ class TextEdit(QPlainTextEdit):
         self.tooltip_palette = pal = QPalette()
         pal.setColor(pal.ToolTipBase, theme_color(theme, 'Tooltip', 'bg'))
         pal.setColor(pal.ToolTipText, theme_color(theme, 'Tooltip', 'fg'))
+        self.line_number_palette = pal = QPalette()
+        pal.setColor(pal.Base, theme_color(theme, 'LineNr', 'bg'))
+        pal.setColor(pal.Text, theme_color(theme, 'LineNr', 'fg'))
+        pal.setColor(pal.BrightText, theme_color(theme, 'LineNrC', 'fg'))
         font = self.font()
         ff = tprefs['editor_font_family']
         if ff is None:
@@ -64,6 +84,9 @@ class TextEdit(QPlainTextEdit):
         self.tooltip_font.setPointSize(font.pointSize() - 1)
         self.setFont(font)
         self.highlighter.apply_theme(theme)
+        w = self.fontMetrics().width
+        self.number_width = max(map(lambda x:w(str(x)), xrange(10)))
+    # }}}
 
     def load_text(self, text, syntax='html'):
         self.highlighter = {'html':HTMLHighlighter}.get(syntax, SyntaxHighlighter)(self)
@@ -71,6 +94,7 @@ class TextEdit(QPlainTextEdit):
         self.highlighter.setDocument(self.document())
         self.setPlainText(text)
 
+    # Line numbers and cursor line {{{
     def highlight_cursor_line(self):
         sel = QTextEdit.ExtraSelection()
         sel.format.setBackground(self.palette().alternateBase())
@@ -78,7 +102,72 @@ class TextEdit(QPlainTextEdit):
         sel.cursor = self.textCursor()
         sel.cursor.clearSelection()
         self.setExtraSelections([sel])
+        # Update the cursor line's line number in the line number area
+        try:
+            self.line_number_area.update(0, self.last_current_lnum[0], self.line_number_area.width(), self.last_current_lnum[1])
+        except AttributeError:
+            pass
+        block = self.textCursor().block()
+        top = int(self.blockBoundingGeometry(block).translated(self.contentOffset()).top())
+        height = int(self.blockBoundingRect(block).height())
+        self.line_number_area.update(0, top, self.line_number_area.width(), height)
 
+    def update_line_number_area_width(self, block_count=0):
+        self.setViewportMargins(self.line_number_area_width(), 0, 0, 0)
+
+    def line_number_area_width(self):
+        digits = 1
+        limit = max(1, self.blockCount())
+        while limit >= 10:
+            limit /= 10
+            digits += 1
+
+        return 8 + self.number_width * digits
+
+    def update_line_number_area(self, rect, dy):
+        if dy:
+            self.line_number_area.scroll(0, dy)
+        else:
+            self.line_number_area.update(0, rect.y(), self.line_number_area.width(), rect.height())
+        if rect.contains(self.viewport().rect()):
+            self.update_line_number_area_width()
+
+    def resizeEvent(self, ev):
+        QPlainTextEdit.resizeEvent(self, ev)
+        cr = self.contentsRect()
+        self.line_number_area.setGeometry(QRect(cr.left(), cr.top(), self.line_number_area_width(), cr.height()))
+
+    def paint_line_numbers(self, ev):
+        painter = QPainter(self.line_number_area)
+        painter.fillRect(ev.rect(), self.line_number_palette.color(QPalette.Base))
+
+        block = self.firstVisibleBlock()
+        num = block.blockNumber()
+        top = int(self.blockBoundingGeometry(block).translated(self.contentOffset()).top())
+        bottom = top + int(self.blockBoundingRect(block).height())
+        current = self.textCursor().block().blockNumber()
+        painter.setPen(self.line_number_palette.color(QPalette.Text))
+
+        while block.isValid() and top <= ev.rect().bottom():
+            if block.isVisible() and bottom >= ev.rect().top():
+                if current == num:
+                    painter.save()
+                    painter.setPen(self.line_number_palette.color(QPalette.BrightText))
+                    f = QFont(self.font())
+                    f.setBold(True)
+                    painter.setFont(f)
+                    self.last_current_lnum = (top, bottom - top)
+                painter.drawText(0, top, self.line_number_area.width() - 5, self.fontMetrics().height(),
+                              Qt.AlignRight, str(num + 1))
+                if current == num:
+                    painter.restore()
+            block = block.next()
+            top = bottom
+            bottom = top + int(self.blockBoundingRect(block).height())
+            num += 1
+    # }}}
+
+    # Tooltips {{{
     def event(self, ev):
         if ev.type() == ev.ToolTip:
             self.show_tooltip(ev)
@@ -104,6 +193,7 @@ class TextEdit(QPlainTextEdit):
                 QToolTip.showText(ev.globalPos(), textwrap.fill(tt))
         QToolTip.hideText()
         ev.ignore()
+    # }}}
 
 if __name__ == '__main__':
     app = QApplication([])

From b50168bbe9068f0a2451079b742d7fc08af2022c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 10:26:24 +0530
Subject: [PATCH 1131/1154] Bulk metadata edit: Fix clearing of series and
 publishers

Bulk metadata edit: Only clear series if the clear series checkbox is
checked. Also add a clear checkbox for publishers, so that publishers
can be removed. Fixes #1245058 [Calibre is deleting Series field even when it's not being modified](https://bugs.launchpad.net/calibre/+bug/1245058)
---
 src/calibre/gui2/dialogs/metadata_bulk.py | 10 +++++++---
 src/calibre/gui2/dialogs/metadata_bulk.ui | 10 ++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 1bdaacf7ab..37e71a6340 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -56,7 +56,7 @@ def get_cover_data(stream, ext):  # {{{
 
 Settings = namedtuple('Settings', 'remove_all remove add au aus do_aus rating pub do_series do_autonumber do_remove_format '
                       'remove_format do_swap_ta do_remove_conv do_auto_author series do_series_restart series_start_value '
-                      'do_title_case cover_action clear_series pubdate adddate do_title_sort languages clear_languages restore_original comments')
+                      'do_title_case cover_action clear_series clear_pub pubdate adddate do_title_sort languages clear_languages restore_original comments')
 null = object()
 
 class MyBlockingBusy(QDialog):  # {{{
@@ -240,6 +240,9 @@ class MyBlockingBusy(QDialog):  # {{{
         if args.rating != -1:
             cache.set_field('rating', {bid:args.rating*2 for bid in self.ids})
 
+        if args.clear_pub:
+            cache.set_field('publisher', {bid:'' for bid in self.ids})
+
         if args.pub:
             cache.set_field('publisher', {bid:args.pub for bid in self.ids})
 
@@ -957,6 +960,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         pub = unicode(self.publisher.text())
         do_series = self.write_series
         clear_series = self.clear_series.isChecked()
+        clear_pub = self.clear_pub.isChecked()
         series = unicode(self.series.currentText()).strip()
         do_autonumber = self.autonumber_series.isChecked()
         do_series_restart = self.series_numbering_restarts.isChecked()
@@ -992,7 +996,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         args = Settings(remove_all, remove, add, au, aus, do_aus, rating, pub, do_series,
                 do_autonumber, do_remove_format, remove_format, do_swap_ta,
                 do_remove_conv, do_auto_author, series, do_series_restart,
-                series_start_value, do_title_case, cover_action, clear_series,
+                series_start_value, do_title_case, cover_action, clear_series, clear_pub,
                 pubdate, adddate, do_title_sort, languages, clear_languages,
                 restore_original, self.comments)
 
@@ -1023,7 +1027,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
         return QDialog.accept(self)
 
     def series_changed(self, *args):
-        self.write_series = True
+        self.write_series = bool(unicode(self.series.currentText()).strip())
         self.autonumber_series.setEnabled(True)
 
     def s_r_remove_query(self, *args):
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index b6e86652e8..33cdf438d6 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -662,6 +662,16 @@ as that of the first selected book.</string>
              </property>
             </widget>
            </item>
+           <item row="4" column="2">
+            <widget class="QCheckBox" name="clear_pub">
+             <property name="toolTip">
+              <string>If checked, the publisher will be cleared</string>
+             </property>
+             <property name="text">
+              <string>&amp;Clear pub</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
          <widget class="QWidget" name="tab">

From 690644c0425deb8eb5fbb4d539d295603c74f328 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 11:10:45 +0530
Subject: [PATCH 1132/1154] Method to launch editor widget in its own dialog

---
 src/calibre/gui2/tweak_book/editor/text.py | 31 ++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py
index 4da8404f53..c6d521e89a 100644
--- a/src/calibre/gui2/tweak_book/editor/text.py
+++ b/src/calibre/gui2/tweak_book/editor/text.py
@@ -11,7 +11,7 @@ from future_builtins import map
 
 from PyQt4.Qt import (
     QPlainTextEdit, QApplication, QFontDatabase, QToolTip, QPalette, QFont,
-    QTextEdit, QTextFormat, QWidget, QSize, QPainter, Qt, QRect)
+    QTextEdit, QTextFormat, QWidget, QSize, QPainter, Qt, QRect, QDialog, QVBoxLayout)
 
 from calibre.gui2.tweak_book import tprefs
 from calibre.gui2.tweak_book.editor.themes import THEMES, DEFAULT_THEME, theme_color
@@ -55,6 +55,9 @@ class TextEdit(QPlainTextEdit):
         self.updateRequest.connect(self.update_line_number_area)
         self.line_number_area = LineNumbers(self)
 
+    def sizeHint(self):
+        return self.size_hint
+
     def apply_theme(self):  # {{{
         theme = THEMES.get(tprefs['editor_theme'], None)
         if theme is None:
@@ -84,8 +87,9 @@ class TextEdit(QPlainTextEdit):
         self.tooltip_font.setPointSize(font.pointSize() - 1)
         self.setFont(font)
         self.highlighter.apply_theme(theme)
-        w = self.fontMetrics().width
-        self.number_width = max(map(lambda x:w(str(x)), xrange(10)))
+        w = self.fontMetrics()
+        self.number_width = max(map(lambda x:w.width(str(x)), xrange(10)))
+        self.size_hint = QSize(100 * w.averageCharWidth(), 50 * w.height())
     # }}}
 
     def load_text(self, text, syntax='html'):
@@ -195,11 +199,23 @@ class TextEdit(QPlainTextEdit):
         ev.ignore()
     # }}}
 
-if __name__ == '__main__':
-    app = QApplication([])
+def launch_editor(path_to_edit):
+    if '<html' in path_to_edit:
+        raw = path_to_edit
+    else:
+        with open(path_to_edit, 'rb') as f:
+            raw = f.read().decode('utf-8')
+    app = QApplication([])  # noqa
     t = TextEdit()
-    t.show()
-    t.load_text(textwrap.dedent('''\
+    t.load_text(raw)
+    d = QDialog()
+    d.setLayout(QVBoxLayout())
+    d.layout().addWidget(t)
+    d.exec_()
+
+if __name__ == '__main__':
+    launch_editor(
+    textwrap.dedent('''\
                 <html>
                 <head>
                     <title>Page title</title>
@@ -228,5 +244,4 @@ if __name__ == '__main__':
                 </body>
                 </html>
                 '''))
-    app.exec_()
 

From 8111d646ae3a9243c790f77e6d9d08808feb04a7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 11:27:20 +0530
Subject: [PATCH 1133/1154] Syntax highlight namespace prefixes

---
 .../gui2/tweak_book/editor/syntax/html.py     | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index f4d575fcad..a8c2c6a8d5 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -10,7 +10,7 @@ import re
 
 from PyQt4.Qt import (QTextCharFormat)
 
-from .base import SyntaxHighlighter
+from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
 from html5lib.constants import cdataElements, rcdataElements
 
 entity_pat = re.compile(r'&#{0,1}[a-zA-Z0-9]{1,8};')
@@ -75,9 +75,15 @@ def normal(state, text, i, formats):
         name = m.group()
         closing = name.startswith('/')
         state.parse = state.IN_CLOSING_TAG if closing else state.IN_OPENING_TAG
-        state.tag = name[1:] if closing else name
-        num = 2 if closing else 1
-        return [(num, formats['end_tag' if closing else 'tag']), (len(state.tag), formats['tag_name'])]
+        ans = [(2 if closing else 1, formats['end_tag' if closing else 'tag'])]
+        if closing:
+            name = name[1:]
+        prefix, name = name.partition(':')[0::2]
+        state.tag = name or prefix
+        if prefix and name:
+            ans.append((len(prefix)+1, formats['nsprefix']))
+        ans.append((len(name or prefix), formats['tag_name']))
+        return ans
 
     if ch == '&':
         m = entity_pat.match(text, i)
@@ -110,8 +116,10 @@ def opening_tag(state, text, i, formats):
     if m is None:
         return [(1, formats['?'])]
     state.parse = state.ATTRIBUTE_NAME
-    num = len(m.group())
-    return [(num, formats['attr'])]
+    prefix, name = m.group().partition(':')[0::2]
+    if prefix and name:
+        return [(len(prefix) + 1, formats['nsprefix']), (len(name), formats['attr'])]
+    return [(len(prefix), formats['attr'])]
 
 def attribute_name(state, text, i, formats):
     ' After attribute name '
@@ -205,6 +213,7 @@ class HTMLHighlighter(SyntaxHighlighter):
             'comment': t['Comment'],
             'special': t['Special'],
             'string': t['String'],
+            'nsprefix': t['Constant'],
         }
         for name, msg in {
             '<': _('An unescaped < is not allowed. Replace it with &lt;'),
@@ -240,3 +249,23 @@ class HTMLHighlighter(SyntaxHighlighter):
 
         self.setCurrentBlockState(state.value)
 
+if __name__ == '__main__':
+    from calibre.gui2.tweak_book.editor.text import launch_editor
+    launch_editor('''\
+<!DOCTYPE html>
+<html xml:lang="en" lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>A title with a tag <b> in it</title>
+        <style type="text/css">
+            body {
+                  color: green;
+                  font-size: 12pt;
+            }
+        </style>
+    </head id="invalid attribute on closing tag">
+    <body>
+        <svg:svg xmlns:svg="http://whatever" />
+    </body>
+</html>
+''')

From fc4ca20e9978c4ae5da69fcc96ebbd1c6384fcd5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 11:40:27 +0530
Subject: [PATCH 1134/1154] Amazon metadata download: Fix spurious ratings for
 unrated books

Amazon metadata download: Fix spurious ratings being returned for
unrated books. Fixes #1245449 [Amazon source picks up ratings from ANY book on the page (suggested etc)](https://bugs.launchpad.net/calibre/+bug/1245449)
---
 src/calibre/ebooks/metadata/sources/amazon.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index aa083011fe..6fe97c2782 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -436,6 +436,11 @@ class Worker(Thread):  # Get details {{{
         return authors
 
     def parse_rating(self, root):
+        for x in root.xpath('//div[@id="cpsims-feature" or @id="purchase-sims-feature" or @id="rhf"]'):
+            # Remove the similar books section as it can cause sppurious
+            # ratings matches
+            x.getparent().remove(x)
+
         rating_paths = ('//div[@data-feature-name="averageCustomerReviews"]',
                         '//div[@class="jumpBar"]/descendant::span[contains(@class,"asinReviewsSummary")]',
                         '//div[@class="buying"]/descendant::span[contains(@class,"asinReviewsSummary")]',

From 952658394b67395c7ed996d50cdbb1deca6b8884 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 15:36:11 +0530
Subject: [PATCH 1135/1154] Parse CDATA tags and fix errors in bad attribute
 parsing

---
 .../gui2/tweak_book/editor/syntax/html.py     | 56 +++++++++++++++----
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index a8c2c6a8d5..40ddefb3b3 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -8,17 +8,19 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import re
 
-from PyQt4.Qt import (QTextCharFormat)
+from PyQt4.Qt import (QTextCharFormat, QFont)
 
 from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
 from html5lib.constants import cdataElements, rcdataElements
 
+cdata_tags = cdataElements | rcdataElements
 entity_pat = re.compile(r'&#{0,1}[a-zA-Z0-9]{1,8};')
 tag_name_pat = re.compile(r'/{0,1}[a-zA-Z0-9:]+')
 space_chars = ' \t\r\n\u000c'
-attribute_name_pat = re.compile(r'''[^%s"'/>=]+''' % space_chars)
+attribute_name_pat = re.compile(r'''[^%s"'/><=]+''' % space_chars)
 self_closing_pat = re.compile(r'/\s*>')
 unquoted_val_pat = re.compile(r'''[^%s'"=<>`]+''' % space_chars)
+cdata_close_pats = {x:re.compile(r'</%s' % x, flags=re.I) for x in cdata_tags}
 
 class State(object):
 
@@ -36,8 +38,9 @@ class State(object):
     ATTRIBUTE_VALUE = 7
     SQ_VAL = 8
     DQ_VAL = 9
+    CDATA = 10
 
-    TAGS = {x:i+1 for i, x in enumerate(cdataElements | rcdataElements | {'b', 'em', 'i', 'string', 'a'} | {'h%d' % d for d in range(1, 7)})}
+    TAGS = {x:i+1 for i, x in enumerate(cdata_tags | {'b', 'em', 'i', 'string', 'a'} | {'h%d' % d for d in range(1, 7)})}
     TAGS_RMAP = {v:k for k, v in TAGS.iteritems()}
     UNKNOWN_TAG = '___'
 
@@ -50,7 +53,21 @@ class State(object):
     @property
     def value(self):
         tag = self.TAGS.get(self.tag.lower(), 0)
-        return (self.parse & 0b1111) | ((self.bold & 0b11111111) << 4) | ((self.italic & 0b11111111) << 12) | (tag << 20)
+        return ((self.parse & 0b1111) |
+                ((max(0, self.bold) & 0b11111111) << 4) |
+                ((max(0, self.italic) & 0b11111111) << 12) |
+                (tag << 20))
+
+def cdata(state, text, i, formats):
+    'CDATA inside tags like <title> or <style>'
+    pat = cdata_close_pats[state.tag]
+    m = pat.search(text, i)
+    fmt = formats['title' if state.tag == 'title' else 'special']
+    if m is None:
+        return [(len(text) - i, fmt)]
+    state.parse = State.IN_CLOSING_TAG
+    num = m.start() - i
+    return [(num, fmt), (2, formats['end_tag']), (len(m.group()) - 2, formats['tag_name'])]
 
 def normal(state, text, i, formats):
     ' The normal state in between tags '
@@ -61,11 +78,11 @@ def normal(state, text, i, formats):
             return [(4, fmt)]
 
         if text[i:i+2] == '<?':
-            state.parse, fmt = state.IN_PI, formats['special']
+            state.parse, fmt = state.IN_PI, formats['preproc']
             return [(2, fmt)]
 
         if text[i:i+2] == '<!' and text[i+2:].lstrip().lower().startswith('doctype'):
-            state.parse, fmt = state.IN_DOCTYPE, formats['special']
+            state.parse, fmt = state.IN_DOCTYPE, formats['preproc']
             return [(2, fmt)]
 
         m = tag_name_pat.match(text, i + 1)
@@ -110,7 +127,8 @@ def opening_tag(state, text, i, formats):
         return [(len(m.group()), formats['tag'])]
     if ch == '>':
         state.parse = state.NORMAL
-        state.tag = State.UNKNOWN_TAG
+        if state.tag in cdata_tags:
+            state.parse = state.CDATA
         return [(1, formats['tag'])]
     m = attribute_name_pat.match(text, i)
     if m is None:
@@ -130,7 +148,10 @@ def attribute_name(state, text, i, formats):
         state.parse = State.ATTRIBUTE_VALUE
         return [(1, formats['attr'])]
     state.parse = State.IN_OPENING_TAG
-    return [(-1, None)]
+    if ch in {'>', '/'}:
+        # Standalone attribute with no value
+        return [(0, None)]
+    return [(1, formats['no-attr-value'])]
 
 def attribute_value(state, text, i, formats):
     ' After attribute = '
@@ -140,8 +161,10 @@ def attribute_value(state, text, i, formats):
     if ch in {'"', "'"}:
         state.parse = State.SQ_VAL if ch == "'" else State.DQ_VAL
         return [(1, formats['string'])]
-    m = unquoted_val_pat.match(text, i)
     state.parse = State.IN_OPENING_TAG
+    m = unquoted_val_pat.match(text, i)
+    if m is None:
+        return [(1, formats['no-attr-value'])]
     return [(len(m.group()), formats['string'])]
 
 def quoted_val(state, text, i, formats):
@@ -168,13 +191,14 @@ def closing_tag(state, text, i, formats):
     ans = [(1, formats['end_tag'])]
     if num > 1:
         ans.insert(0, (num - 1, formats['bad-closing']))
+    state.tag = State.UNKNOWN_TAG
     return ans
 
 def in_comment(state, text, i, formats):
     ' Comment, processing instruction or doctype '
     end = {state.IN_COMMENT:'-->', state.IN_PI:'?>'}.get(state.parse, '>')
     pos = text.find(end, i+1)
-    fmt = formats['comment' if state.parse == state.IN_COMMENT else 'special']
+    fmt = formats['comment' if state.parse == state.IN_COMMENT else 'preproc']
     if pos == -1:
         num = len(text) - i
     else:
@@ -188,6 +212,7 @@ state_map = {
     State.IN_CLOSING_TAG: closing_tag,
     State.ATTRIBUTE_NAME: attribute_name,
     State.ATTRIBUTE_VALUE: attribute_value,
+    State.CDATA: cdata,
 }
 
 for x in (State.IN_COMMENT, State.IN_PI, State.IN_DOCTYPE):
@@ -205,7 +230,7 @@ class HTMLHighlighter(SyntaxHighlighter):
         t = self.theme
         self.formats = {
             'tag': t['Function'],
-            'end_tag': t['Identifier'],
+            'end_tag': t['Function'],
             'attr': t['Type'],
             'tag_name' : t['Statement'],
             'entity': t['Special'],
@@ -214,6 +239,7 @@ class HTMLHighlighter(SyntaxHighlighter):
             'special': t['Special'],
             'string': t['String'],
             'nsprefix': t['Constant'],
+            'preproc': t['PreProc'],
         }
         for name, msg in {
             '<': _('An unescaped < is not allowed. Replace it with &lt;'),
@@ -222,9 +248,12 @@ class HTMLHighlighter(SyntaxHighlighter):
             '/': _('/ not allowed except at the end of the tag'),
             '?': _('Unknown character'),
             'bad-closing': _('A closing tag must contain only the tag name and nothing else'),
+            'no-attr-value': _('Expecting an attribute value'),
         }.iteritems():
             f = self.formats[name] = QTextCharFormat(self.formats['error'])
             f.setToolTip(msg)
+        f = self.formats['title'] = QTextCharFormat()
+        f.setFontWeight(QFont.Bold)
 
     def highlightBlock(self, text):
         try:
@@ -256,7 +285,7 @@ if __name__ == '__main__':
 <html xml:lang="en" lang="en">
     <head>
         <meta charset="utf-8" />
-        <title>A title with a tag <b> in it</title>
+        <title>A title with a tag <span> in it</title>
         <style type="text/css">
             body {
                   color: green;
@@ -265,7 +294,10 @@ if __name__ == '__main__':
         </style>
     </head id="invalid attribute on closing tag">
     <body>
+        <!-- The start of the actual body text -->
+        <h1>A heading that should appear in bold, with an <i>italic</i> word</h1>
         <svg:svg xmlns:svg="http://whatever" />
+        <input disabled><input disabled /><span attr=<></span>
     </body>
 </html>
 ''')

From b5be77fe43c80fe0785db9bc4d8d297cb66ee20c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 16:01:04 +0530
Subject: [PATCH 1136/1154] Highlight text enclosed by  heading/bold/italic
 tags

---
 .../gui2/tweak_book/editor/syntax/html.py     | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index 40ddefb3b3..17e7b30b81 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -14,6 +14,9 @@ from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
 from html5lib.constants import cdataElements, rcdataElements
 
 cdata_tags = cdataElements | rcdataElements
+bold_tags = {'b', 'strong'} | {'h%d' % d for d in range(1, 7)}
+italic_tags = {'i', 'em'}
+normal_pat = re.compile(r'[^<>&]')
 entity_pat = re.compile(r'&#{0,1}[a-zA-Z0-9]{1,8};')
 tag_name_pat = re.compile(r'/{0,1}[a-zA-Z0-9:]+')
 space_chars = ' \t\r\n\u000c'
@@ -40,7 +43,7 @@ class State(object):
     DQ_VAL = 9
     CDATA = 10
 
-    TAGS = {x:i+1 for i, x in enumerate(cdata_tags | {'b', 'em', 'i', 'string', 'a'} | {'h%d' % d for d in range(1, 7)})}
+    TAGS = {x:i+1 for i, x in enumerate(cdata_tags | bold_tags | italic_tags)}
     TAGS_RMAP = {v:k for k, v in TAGS.iteritems()}
     UNKNOWN_TAG = '___'
 
@@ -111,7 +114,15 @@ def normal(state, text, i, formats):
     if ch == '>':
         return [(1, formats['>'])]
 
-    return [(1, None)]
+    t = normal_pat.search(text, i).group()
+    fmt = None
+    if state.bold or state.italic:
+        fmt = QTextCharFormat()
+        if state.bold:
+            fmt.setFontWeight(QFont.Bold)
+        if state.italic:
+            fmt.setFontItalic(True)
+    return [(len(t), fmt)]
 
 def opening_tag(state, text, i, formats):
     'An opening tag, like <a>'
@@ -127,8 +138,11 @@ def opening_tag(state, text, i, formats):
         return [(len(m.group()), formats['tag'])]
     if ch == '>':
         state.parse = state.NORMAL
-        if state.tag in cdata_tags:
+        tag = state.tag.lower()
+        if tag in cdata_tags:
             state.parse = state.CDATA
+        state.bold += int(tag in bold_tags)
+        state.italic += int(tag in italic_tags)
         return [(1, formats['tag'])]
     m = attribute_name_pat.match(text, i)
     if m is None:
@@ -187,6 +201,9 @@ def closing_tag(state, text, i, formats):
     if pos == -1:
         return [(len(text) - i, formats['bad-closing'])]
     state.parse = state.NORMAL
+    tag = state.tag.lower()
+    state.bold -= int(tag in bold_tags)
+    state.italic -= int(tag in italic_tags)
     num = pos - i + 1
     ans = [(1, formats['end_tag'])]
     if num > 1:
@@ -285,7 +302,7 @@ if __name__ == '__main__':
 <html xml:lang="en" lang="en">
     <head>
         <meta charset="utf-8" />
-        <title>A title with a tag <span> in it</title>
+        <title>A title with a tag <span> in it, the tag is treated as normal text</title>
         <style type="text/css">
             body {
                   color: green;
@@ -296,6 +313,9 @@ if __name__ == '__main__':
     <body>
         <!-- The start of the actual body text -->
         <h1>A heading that should appear in bold, with an <i>italic</i> word</h1>
+        <p>Some text with inline formatting, that is syntax highlighted. A <b>bold</b> word, and an <em>italic</em> word. \
+<i>Some italic text with a <b>bold italic</b> word in </i> middle.</p>
+        <!-- Let's see what exotic constructs like namespace prefixes and empty attributes look like -->
         <svg:svg xmlns:svg="http://whatever" />
         <input disabled><input disabled /><span attr=<></span>
     </body>

From d565ccc71729145e37296507fbcb90d83305f425 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 16:46:47 +0530
Subject: [PATCH 1137/1154] Syntax highlight non-breaking spaces

---
 .../gui2/tweak_book/editor/syntax/html.py     | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index 17e7b30b81..7fd7d0fa18 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -24,6 +24,7 @@ attribute_name_pat = re.compile(r'''[^%s"'/><=]+''' % space_chars)
 self_closing_pat = re.compile(r'/\s*>')
 unquoted_val_pat = re.compile(r'''[^%s'"=<>`]+''' % space_chars)
 cdata_close_pats = {x:re.compile(r'</%s' % x, flags=re.I) for x in cdata_tags}
+nbsp_pat = re.compile('\xa0+')
 
 class State(object):
 
@@ -72,6 +73,23 @@ def cdata(state, text, i, formats):
     num = m.start() - i
     return [(num, fmt), (2, formats['end_tag']), (len(m.group()) - 2, formats['tag_name'])]
 
+def mark_nbsp(state, text, nbsp_format):
+    ans = []
+    fmt = None
+    if state.bold or state.italic:
+        fmt = QTextCharFormat()
+        if state.bold:
+            fmt.setFontWeight(QFont.Bold)
+        if state.italic:
+            fmt.setFontItalic(True)
+    last = 0
+    for m in nbsp_pat.finditer(text):
+        ans.extend([(m.start() - last, fmt), (m.end() - m.start(), nbsp_format)])
+    if not ans:
+        ans = [(len(text), fmt)]
+    return ans
+
+
 def normal(state, text, i, formats):
     ' The normal state in between tags '
     ch = text[i]
@@ -115,14 +133,7 @@ def normal(state, text, i, formats):
         return [(1, formats['>'])]
 
     t = normal_pat.search(text, i).group()
-    fmt = None
-    if state.bold or state.italic:
-        fmt = QTextCharFormat()
-        if state.bold:
-            fmt.setFontWeight(QFont.Bold)
-        if state.italic:
-            fmt.setFontItalic(True)
-    return [(len(t), fmt)]
+    return mark_nbsp(state, t, formats['nbsp'])
 
 def opening_tag(state, text, i, formats):
     'An opening tag, like <a>'
@@ -257,6 +268,7 @@ class HTMLHighlighter(SyntaxHighlighter):
             'string': t['String'],
             'nsprefix': t['Constant'],
             'preproc': t['PreProc'],
+            'nbsp': t['CursorLine'],
         }
         for name, msg in {
             '<': _('An unescaped < is not allowed. Replace it with &lt;'),
@@ -314,10 +326,12 @@ if __name__ == '__main__':
         <!-- The start of the actual body text -->
         <h1>A heading that should appear in bold, with an <i>italic</i> word</h1>
         <p>Some text with inline formatting, that is syntax highlighted. A <b>bold</b> word, and an <em>italic</em> word. \
-<i>Some italic text with a <b>bold italic</b> word in </i> middle.</p>
+<i>Some italic text with a <b>bold-italic</b> word in </i>the middle.</p>
         <!-- Let's see what exotic constructs like namespace prefixes and empty attributes look like -->
         <svg:svg xmlns:svg="http://whatever" />
         <input disabled><input disabled /><span attr=<></span>
+        <!-- Non-breaking spaces are rendered differently from normal spaces, so that they stand out -->
+        <p>Some\xa0words\xa0separated\xa0by\xa0non-breaking\xa0spaces.</p>
     </body>
 </html>
 ''')

From 2e5808c9deea798ed91fd6946c7ae7f802263bea Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 18:57:00 +0530
Subject: [PATCH 1138/1154] Refactor boilerplate functionality into base class

---
 .../gui2/tweak_book/editor/syntax/base.py     | 24 +++++++++++++++++
 .../gui2/tweak_book/editor/syntax/html.py     | 26 +++----------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py
index c0d3ca5541..1911c145b0 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/base.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py
@@ -26,3 +26,27 @@ class SyntaxHighlighter(QSyntaxHighlighter):
     def create_formats(self):
         pass
 
+    def highlightBlock(self, text):
+        try:
+            state = self.previousBlockState()
+            if state == -1:
+                state = 0
+            self.do_highlight(state, unicode(text))
+        except:
+            import traceback
+            traceback.print_exc()
+
+    def do_highlight(self, state, text):
+        state = self.state_class(state)
+
+        i = 0
+        while i < len(text):
+            fmt = self.state_map[state.parse](state, text, i, self.formats)
+            for num, f in fmt:
+                if f is not None:
+                    self.setFormat(i, num, f)
+                i += num
+
+        self.setCurrentBlockState(state.value)
+
+
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index 7fd7d0fa18..2883e84eee 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -251,6 +251,9 @@ for x in (State.SQ_VAL, State.DQ_VAL):
 
 class HTMLHighlighter(SyntaxHighlighter):
 
+    state_map = state_map
+    state_class = State
+
     def __init__(self, parent):
         SyntaxHighlighter.__init__(self, parent)
 
@@ -284,29 +287,6 @@ class HTMLHighlighter(SyntaxHighlighter):
         f = self.formats['title'] = QTextCharFormat()
         f.setFontWeight(QFont.Bold)
 
-    def highlightBlock(self, text):
-        try:
-            self.do_highlight(unicode(text))
-        except:
-            import traceback
-            traceback.print_exc()
-
-    def do_highlight(self, text):
-        state = self.previousBlockState()
-        if state == -1:
-            state = State.NORMAL
-        state = State(state)
-
-        i = 0
-        while i < len(text):
-            fmt = state_map[state.parse](state, text, i, self.formats)
-            for num, f in fmt:
-                if f is not None:
-                    self.setFormat(i, num, f)
-                i += num
-
-        self.setCurrentBlockState(state.value)
-
 if __name__ == '__main__':
     from calibre.gui2.tweak_book.editor.text import launch_editor
     launch_editor('''\

From b637effcb2053741b334eee55992dee6a2e09dea Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 21:14:03 +0530
Subject: [PATCH 1139/1154] ...

---
 src/calibre/gui2/device.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index ef7e3665de..94ed6de339 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1189,7 +1189,7 @@ class DeviceMixin(object): # {{{
                 return
             if d.format():
                 fmt = d.format().lower()
-        dest, sub_dest = dest.split(':')
+        dest, sub_dest = dest.partition(':')[0::2]
         if dest in ('main', 'carda', 'cardb'):
             if not self.device_connected or not self.device_manager:
                 error_dialog(self, _('No device'),

From dbfbf17146bb6a24ecf587e60c67bdac5c324892 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Oct 2013 21:21:02 +0530
Subject: [PATCH 1140/1154] More refactoring

---
 .../gui2/tweak_book/editor/syntax/base.py     | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py
index 1911c145b0..3e59729762 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/base.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py
@@ -10,8 +10,30 @@ from PyQt4.Qt import (QSyntaxHighlighter, QApplication, QCursor, Qt)
 
 from ..themes import highlight_to_char_format
 
+class SimpleState(object):
+
+    def __init__(self, value):
+        self.parse = value
+
+    @property
+    def value(self):
+        return self.parse
+
+def run_loop(state, state_map, set_format, formats, text):
+    i = 0
+    while i < len(text):
+        fmt = state_map[state.parse](state, text, i, formats)
+        for num, f in fmt:
+            if f is not None:
+                set_format(i, num, f)
+            i += num
+
 class SyntaxHighlighter(QSyntaxHighlighter):
 
+    state_class = SimpleState
+    state_map = {0:lambda state, text, i, formats:[(len(text), None)]}
+    formats = {}
+
     def rehighlight(self):
         self.outlineexplorer_data = {}
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
@@ -31,22 +53,10 @@ class SyntaxHighlighter(QSyntaxHighlighter):
             state = self.previousBlockState()
             if state == -1:
                 state = 0
-            self.do_highlight(state, unicode(text))
+            state = self.state_class(state)
+            run_loop(state, self.state_map, self.setFormat, self.formats, unicode(text))
+            self.setCurrentBlockState(state.value)
         except:
             import traceback
             traceback.print_exc()
 
-    def do_highlight(self, state, text):
-        state = self.state_class(state)
-
-        i = 0
-        while i < len(text):
-            fmt = self.state_map[state.parse](state, text, i, self.formats)
-            for num, f in fmt:
-                if f is not None:
-                    self.setFormat(i, num, f)
-                i += num
-
-        self.setCurrentBlockState(state.value)
-
-

From f959ec195e91bb50581e0177e66f9fff7f534777 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 08:20:40 +0530
Subject: [PATCH 1141/1154] Driver for Nook Glowlight

---
 src/calibre/devices/nook/driver.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py
index e24950359c..918cf333cb 100644
--- a/src/calibre/devices/nook/driver.py
+++ b/src/calibre/devices/nook/driver.py
@@ -84,15 +84,17 @@ class NOOK(USBMS):
 
 class NOOK_COLOR(NOOK):
     name           = 'Nook Color Device Interface'
-    description    = _('Communicate with the Nook Color, TSR and Tablet eBook readers.')
+    description    = _('Communicate with the Nook Color, TSR, Glowlight and Tablet eBook readers.')
 
-    PRODUCT_ID  = [0x002, 0x003, 0x004]
+    PRODUCT_ID  = [0x002, 0x003, 0x004,
+                   # Glowlight from 2013
+                   0x007]
     if isosx:
         PRODUCT_ID.append(0x005)  # Nook HD+
     BCD         = [0x216]
 
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['EBOOK_DISK', 'NOOK_TABLET',
-            'NOOK_SIMPLETOUCH']
+            'NOOK_SIMPLETOUCH', 'NOOK_GLOWLIGHT']
     EBOOK_DIR_MAIN = 'My Files'
     SCAN_FROM_ROOT = True
     NEWS_IN_FOLDER = False

From 67e6a01fb2bdf71f291c61e3bc9facd6f9263f0d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 09:40:12 +0530
Subject: [PATCH 1142/1154] ebook-convert .recipe: specify number of feeds and
 articles

When developing recipes using the command line, allow specifying the
number of feeds and articles when using the --test parameter. Fixes #1246061 [[Enhancement] Make --test option to ebooks-convert take parameters specifying the number of feeds to download and number of items per feed to download](https://bugs.launchpad.net/calibre/+bug/1246061).
---
 src/calibre/ebooks/conversion/cli.py          | 37 ++++++++++++++++++-
 .../ebooks/conversion/plugins/recipe_input.py |  9 +++--
 src/calibre/web/feeds/jsnews.py               |  2 +-
 src/calibre/web/feeds/news.py                 | 10 +++--
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 3d079b9181..e19df1cc91 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -104,13 +104,46 @@ def option_recommendation_to_cli_option(add_option, rec):
 def group_titles():
     return _('INPUT OPTIONS'), _('OUTPUT OPTIONS')
 
+def recipe_test(option, opt_str, value, parser):
+    assert value is None
+    value = []
+
+    def floatable(str):
+        try:
+            float(str)
+            return True
+        except ValueError:
+            return False
+
+    for arg in parser.rargs:
+        # stop on --foo like options
+        if arg[:2] == "--":
+            break
+        # stop on -a, but not on -3 or -3.0
+        if arg[:1] == "-" and len(arg) > 1 and not floatable(arg):
+            break
+        try:
+            value.append(int(arg))
+        except (TypeError, ValueError, AttributeError):
+            break
+        if len(value) == 2:
+            break
+    del parser.rargs[:len(value)]
+
+    while len(value) < 2:
+        value.append(2)
+
+    setattr(parser.values, option.dest, tuple(value))
+
 def add_input_output_options(parser, plumber):
     input_options, output_options = \
                                 plumber.input_options, plumber.output_options
-
     def add_options(group, options):
         for opt in options:
-            option_recommendation_to_cli_option(group, opt)
+            if plumber.input_fmt == 'recipe' and opt.option.long_switch == 'test':
+                group(Option('--test', dest='test', action='callback', callback=recipe_test))
+            else:
+                option_recommendation_to_cli_option(group, opt)
 
     if input_options:
         title = group_titles()[0]
diff --git a/src/calibre/ebooks/conversion/plugins/recipe_input.py b/src/calibre/ebooks/conversion/plugins/recipe_input.py
index 2630ff0c85..1f7e35f10b 100644
--- a/src/calibre/ebooks/conversion/plugins/recipe_input.py
+++ b/src/calibre/ebooks/conversion/plugins/recipe_input.py
@@ -34,8 +34,11 @@ class RecipeInput(InputFormatPlugin):
 
     options = set([
         OptionRecommendation(name='test', recommended_value=False,
-            help=_('Useful for recipe development. Forces '
-            'max_articles_per_feed to 2 and downloads at most 2 feeds.')),
+            help=_(
+            'Useful for recipe development. Forces'
+            ' max_articles_per_feed to 2 and downloads at most 2 feeds.'
+            ' You can change the number of feeds and articles by supplying optional arguments.'
+            ' For example: --test 3 1 will download at most 3 feeds and only 1 article per feed.')),
         OptionRecommendation(name='username', recommended_value=None,
             help=_('Username for sites that require a login to access '
                 'content.')),
@@ -85,7 +88,7 @@ class RecipeInput(InputFormatPlugin):
                     self.recipe_source = raw
                     if recipe.requires_version > numeric_version:
                         log.warn(
-                        'Downloaded recipe needs calibre version at least: %s' % \
+                        'Downloaded recipe needs calibre version at least: %s' %
                         ('.'.join(recipe.requires_version)))
                         builtin = True
                 except:
diff --git a/src/calibre/web/feeds/jsnews.py b/src/calibre/web/feeds/jsnews.py
index df16e84ace..bb8d891d06 100644
--- a/src/calibre/web/feeds/jsnews.py
+++ b/src/calibre/web/feeds/jsnews.py
@@ -321,7 +321,7 @@ class JavascriptRecipe(BasicNewsRecipe):
         if self.ignore_duplicate_articles is not None:
             feeds = self.remove_duplicate_articles(feeds)
         if self.test:
-            feeds = feeds[:2]
+            feeds = feeds[:self.test[0]]
         self.has_single_feed = len(feeds) == 1
         index = os.path.join(self.output_dir, 'index.html')
 
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index fcf346f6ed..5d09071423 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -425,7 +425,7 @@ class BasicNewsRecipe(Recipe):
         if not self.feeds:
             raise NotImplementedError
         if self.test:
-            return self.feeds[:2]
+            return self.feeds[:self.test[0]]
         return self.feeds
 
     @classmethod
@@ -839,6 +839,8 @@ class BasicNewsRecipe(Recipe):
         self.output_dir = os.path.abspath(os.getcwdu())
         self.verbose = options.verbose
         self.test = options.test
+        if self.test and not isinstance(self.test, tuple):
+            self.test = (2, 2)
         self.username = options.username
         self.password = options.password
         self.lrf = options.lrf
@@ -847,8 +849,8 @@ class BasicNewsRecipe(Recipe):
         if self.touchscreen:
             self.template_css += self.output_profile.touchscreen_news_css
 
-        if options.test:
-            self.max_articles_per_feed = 2
+        if self.test:
+            self.max_articles_per_feed = self.test[1]
             self.simultaneous_downloads = min(4, self.simultaneous_downloads)
 
         if self.debug:
@@ -1163,7 +1165,7 @@ class BasicNewsRecipe(Recipe):
         self.resolve_masthead()
 
         if self.test:
-            feeds = feeds[:2]
+            feeds = feeds[:self.test[0]]
         self.has_single_feed = len(feeds) == 1
 
         index = os.path.join(self.output_dir, 'index.html')

From 71908700d00906303090fdb58264d66016022602 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 10:05:25 +0530
Subject: [PATCH 1143/1154] Content server: Display book title on permalink
 page

Fixes #1246523 [No title shown in permalink view](https://bugs.launchpad.net/calibre/+bug/1246523)
---
 src/calibre/library/server/browse.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 470eb0c1f3..cd0bfb2c48 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -836,7 +836,7 @@ class BrowseServer(object):
         raw = json.dumps('\n'.join(summs), ensure_ascii=True)
         return raw
 
-    def browse_render_details(self, id_, add_random_button=False):
+    def browse_render_details(self, id_, add_random_button=False, add_title=False):
         try:
             mi = self.db.get_metadata(id_, index_is_id=True)
         except:
@@ -894,6 +894,8 @@ class BrowseServer(object):
                 fields.append((m['name'], r))
 
             fields.sort(key=lambda x: sort_key(x[0]))
+            if add_title:
+                fields.insert(0, ('Title', u'<strong>%s: </strong>%s' % (xml(_('Title')), xml(mi.title))))
             fields = [u'<div class="field">{0}</div>'.format(f[1]) for f in
                     fields]
             fields = u'<div class="fields">%s</div>'%('\n\n'.join(fields))
@@ -934,7 +936,7 @@ class BrowseServer(object):
             book_id = random.choice(self.search_for_books(''))
         except IndexError:
             raise cherrypy.HTTPError(404, 'This library has no books')
-        ans = self.browse_render_details(book_id, add_random_button=True)
+        ans = self.browse_render_details(book_id, add_random_button=True, add_title=True)
         return self.browse_template('').format(
                 title='', script='book();', main=ans)
 
@@ -945,9 +947,9 @@ class BrowseServer(object):
         except:
             raise cherrypy.HTTPError(404, 'invalid id: %r'%id)
 
-        ans = self.browse_render_details(id_)
+        ans = self.browse_render_details(id_, add_title=True)
         return self.browse_template('').format(
-                title='', script='book();', main=ans)
+                title=self.db.title(id_, index_is_id=True), script='book();', main=ans)
 
     # }}}
 

From 289d05a020b0d1dd961c8e7eb24aa0943ea9bc37 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 10:13:59 +0530
Subject: [PATCH 1144/1154] Content server: Show the most important fields
 (authors/series/tags) at the top in the book details view.

---
 src/calibre/library/server/browse.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index cd0bfb2c48..fb35c69dfc 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -880,7 +880,7 @@ class BrowseServer(object):
                             for name, id_typ, id_val, url in urls]
                     links = u', '.join(links)
                     if links:
-                        fields.append((m['name'], u'<strong>%s: </strong>%s'%(
+                        fields.append((field, m['name'], u'<strong>%s: </strong>%s'%(
                             _('Ids'), links)))
                         continue
 
@@ -891,12 +891,15 @@ class BrowseServer(object):
                 else:
                     r = u'<strong>%s: </strong>'%xml(m['name']) + \
                                 args[field]
-                fields.append((m['name'], r))
+                fields.append((field, m['name'], r))
 
-            fields.sort(key=lambda x: sort_key(x[0]))
+            def fsort(x):
+                num = {'authors':0, 'series':1, 'tags':2}.get(x[0], 100)
+                return (num, sort_key(x[-1]))
+            fields.sort(key=fsort)
             if add_title:
-                fields.insert(0, ('Title', u'<strong>%s: </strong>%s' % (xml(_('Title')), xml(mi.title))))
-            fields = [u'<div class="field">{0}</div>'.format(f[1]) for f in
+                fields.insert(0, ('title', 'Title', u'<strong>%s: </strong>%s' % (xml(_('Title')), xml(mi.title))))
+            fields = [u'<div class="field">{0}</div>'.format(f[-1]) for f in
                     fields]
             fields = u'<div class="fields">%s</div>'%('\n\n'.join(fields))
 

From 5a33e7a5c698d25b535b7a870c39ebb42c1f97b1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 10:14:56 +0530
Subject: [PATCH 1145/1154] ...

---
 src/calibre/library/server/browse.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index fb35c69dfc..5991522cd6 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -941,7 +941,7 @@ class BrowseServer(object):
             raise cherrypy.HTTPError(404, 'This library has no books')
         ans = self.browse_render_details(book_id, add_random_button=True, add_title=True)
         return self.browse_template('').format(
-                title='', script='book();', main=ans)
+                title=self.db.title(book_id, index_is_id=True), script='book();', main=ans)
 
     @Endpoint()
     def browse_book(self, id=None, category_sort=None):

From 557e96cbdf9fda821668a849b808429be8dc9396 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 10:16:13 +0530
Subject: [PATCH 1146/1154] ...

---
 src/calibre/library/server/browse.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 5991522cd6..1a8aa24765 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -941,7 +941,7 @@ class BrowseServer(object):
             raise cherrypy.HTTPError(404, 'This library has no books')
         ans = self.browse_render_details(book_id, add_random_button=True, add_title=True)
         return self.browse_template('').format(
-                title=self.db.title(book_id, index_is_id=True), script='book();', main=ans)
+                title=prepare_string_for_xml(self.db.title(book_id, index_is_id=True)), script='book();', main=ans)
 
     @Endpoint()
     def browse_book(self, id=None, category_sort=None):
@@ -952,7 +952,7 @@ class BrowseServer(object):
 
         ans = self.browse_render_details(id_, add_title=True)
         return self.browse_template('').format(
-                title=self.db.title(id_, index_is_id=True), script='book();', main=ans)
+                title=prepare_string_for_xml(self.db.title(id_, index_is_id=True)), script='book();', main=ans)
 
     # }}}
 

From 04745b77b97d8202da984cbcf4d0db0d9cf03f60 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 11:16:24 +0530
Subject: [PATCH 1147/1154] Bulk metadata download fix reviewing only covers

Bulk metadata download: When downloading only covers and some covers
fail, do not show the failed books while reviewing downloaded metadata.
Fixes #1238271 [Download only Covers:  Reviewing -> The books with "no cover found" are also displayed.](https://bugs.launchpad.net/calibre/+bug/1238271)
---
 src/calibre/gui2/actions/edit_metadata.py  | 5 +++++
 src/calibre/gui2/metadata/bulk_download.py | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 367e4bbc37..16dff2f44a 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -146,6 +146,11 @@ class EditMetadataAction(InterfaceAction):
             checkbox_msg = _('Show the &failed books in the main book list '
                     'after updating metadata')
 
+        if getattr(job, 'metadata_and_covers', None) == (False, True):
+            # Only covers, remove failed cover downloads from id_map
+            for book_id in failed_covers:
+                if hasattr(id_map, 'discard'):
+                    id_map.discard(book_id)
         payload = (id_map, tdir, log_file, lm_map,
                 failed_ids.union(failed_covers))
         review_apply = partial(self.apply_downloaded_metadata, True)
diff --git a/src/calibre/gui2/metadata/bulk_download.py b/src/calibre/gui2/metadata/bulk_download.py
index 9c56b5b0f8..e3b0203e82 100644
--- a/src/calibre/gui2/metadata/bulk_download.py
+++ b/src/calibre/gui2/metadata/bulk_download.py
@@ -131,6 +131,7 @@ def start_download(gui, ids, callback, ensure_fields=None):
         _('Download metadata for %d books')%len(ids),
         download, (ids, tf.name, gui.current_db, d.identify, d.covers,
             ensure_fields), {}, callback)
+    job.metadata_and_covers = (d.identify, d.covers)
     job.download_debug_log = tf.name
     gui.job_manager.run_threaded_job(job)
     gui.status_bar.show_message(_('Metadata download started'), 3000)
@@ -153,7 +154,7 @@ def get_job_details(job):
             all_failed, det_msg, lm_map)
 
 class HeartBeat(object):
-    CHECK_INTERVAL = 300 # seconds
+    CHECK_INTERVAL = 300  # seconds
     ''' Check that the file count in tdir changes every five minutes '''
 
     def __init__(self, tdir):

From ab4f53331e8e603f24a101a146851bf6fd15948a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 11:34:23 +0530
Subject: [PATCH 1148/1154] Start work on CSS syntax highlighter

---
 .../gui2/tweak_book/editor/syntax/css.py      | 51 +++++++++++++++++++
 .../gui2/tweak_book/editor/syntax/html.py     |  2 +-
 src/calibre/gui2/tweak_book/editor/text.py    | 45 ++++------------
 3 files changed, 62 insertions(+), 36 deletions(-)
 create mode 100644 src/calibre/gui2/tweak_book/editor/syntax/css.py

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/css.py b/src/calibre/gui2/tweak_book/editor/syntax/css.py
new file mode 100644
index 0000000000..4b6a432384
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/editor/syntax/css.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
+
+class State(object):
+
+    NORMAL = 0
+
+    def __init__(self, num):
+        self.parse  = num & 0b1111
+        self.blocks = num >> 4
+
+    @property
+    def value(self):
+        return ((self.parse & 0b1111) | (max(0, self.blocks) << 4))
+
+
+def normal(state, text, i, formats):
+    ' The normal state (outside everything) '
+    return [(len(text), None)]
+
+state_map = {
+    State.NORMAL:normal,
+}
+
+class CSSHighlighter(SyntaxHighlighter):
+
+    state_map = state_map
+    state_class = State
+
+    def __init__(self, parent):
+        SyntaxHighlighter.__init__(self, parent)
+
+    def create_formats(self):
+        # t = self.theme
+        self.formats = {
+        }
+
+if __name__ == '__main__':
+    from calibre.gui2.tweak_book.editor.text import launch_editor
+    launch_editor('''\
+@charset "utf-8";
+/* A demonstration css sheet */
+''', path_is_raw=True, syntax='css')
+
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index 2883e84eee..dccb4f7043 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -314,4 +314,4 @@ if __name__ == '__main__':
         <p>Some\xa0words\xa0separated\xa0by\xa0non-breaking\xa0spaces.</p>
     </body>
 </html>
-''')
+''', path_is_raw=True)
diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py
index c6d521e89a..78a40606c8 100644
--- a/src/calibre/gui2/tweak_book/editor/text.py
+++ b/src/calibre/gui2/tweak_book/editor/text.py
@@ -17,6 +17,7 @@ from calibre.gui2.tweak_book import tprefs
 from calibre.gui2.tweak_book.editor.themes import THEMES, DEFAULT_THEME, theme_color
 from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
 from calibre.gui2.tweak_book.editor.syntax.html import HTMLHighlighter
+from calibre.gui2.tweak_book.editor.syntax.css import CSSHighlighter
 
 _dff = None
 def default_font_family():
@@ -93,7 +94,7 @@ class TextEdit(QPlainTextEdit):
     # }}}
 
     def load_text(self, text, syntax='html'):
-        self.highlighter = {'html':HTMLHighlighter}.get(syntax, SyntaxHighlighter)(self)
+        self.highlighter = {'html':HTMLHighlighter, 'css':CSSHighlighter}.get(syntax, SyntaxHighlighter)(self)
         self.highlighter.apply_theme(self.theme)
         self.highlighter.setDocument(self.document())
         self.setPlainText(text)
@@ -199,49 +200,23 @@ class TextEdit(QPlainTextEdit):
         ev.ignore()
     # }}}
 
-def launch_editor(path_to_edit):
-    if '<html' in path_to_edit:
+def launch_editor(path_to_edit, path_is_raw=False, syntax='html'):
+    if path_is_raw:
         raw = path_to_edit
     else:
         with open(path_to_edit, 'rb') as f:
             raw = f.read().decode('utf-8')
+        ext = path_to_edit.rpartition('.')[-1].lower()
+        if ext in ('html', 'htm', 'xhtml', 'xhtm'):
+            syntax = 'html'
+        elif ext in ('css',):
+            syntax = 'css'
     app = QApplication([])  # noqa
     t = TextEdit()
-    t.load_text(raw)
+    t.load_text(raw, syntax=syntax)
     d = QDialog()
     d.setLayout(QVBoxLayout())
     d.layout().addWidget(t)
     d.exec_()
 
-if __name__ == '__main__':
-    launch_editor(
-    textwrap.dedent('''\
-                <html>
-                <head>
-                    <title>Page title</title>
-                    <style type="text/css">
-                        body { color: green; }
-                    </style>
-                </head id="1">
-                <body>
-                <!-- The start of the document -->a
-                <h1 class="head" id="one" >A heading</h1>
-                <p> A single &. An proper entity &amp;.
-                A single < and a single >.
-                These cases are perfectly simple and easy to
-                distinguish. In a free hour, when our power of choice is
-                untrammelled and when nothing prevents our being able to do
-                what we like best, every pleasure is to be welcomed and every
-                pain avoided.</p>
-
-                <p>
-                But in certain circumstances and owing to the claims of duty or the obligations
-                of business it will frequently occur that pleasures have to be
-                repudiated and annoyances accepted. The wise man therefore
-                always holds in these matters to this principle of selection:
-                he rejects pleasures to secure other greater pleasures, or else
-                he endures pains.</p>
-                </body>
-                </html>
-                '''))
 

From 45aec8c2e1c47846e1a660b484f9eb58061c4299 Mon Sep 17 00:00:00 2001
From: Alex Biddle <alexbiddle@gmail.com>
Date: Thu, 31 Oct 2013 09:57:26 +0000
Subject: [PATCH 1149/1154] Fix Bug #1228905 Calibre does not create a valid
 .bib file

---
 src/calibre/library/catalogs/bibtex.py |  2 ++
 src/calibre/utils/bibtex.py            | 28 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/calibre/library/catalogs/bibtex.py b/src/calibre/library/catalogs/bibtex.py
index d87005f863..6d1c2609cf 100644
--- a/src/calibre/library/catalogs/bibtex.py
+++ b/src/calibre/library/catalogs/bibtex.py
@@ -179,6 +179,8 @@ class BIBTEX(CatalogPlugin):
                     #\n removal
                     item = item.replace(u'\r\n',u' ')
                     item = item.replace(u'\n',u' ')
+                    # unmatched brace removal (users should use \leftbrace or \rightbrace for single braces)
+                    item = bibtexdict.stripUnmatchedSyntax(item, u'{', u'}')
                     #html to text
                     try:
                         item = html2text(item)
diff --git a/src/calibre/utils/bibtex.py b/src/calibre/utils/bibtex.py
index 2ffd2003c2..5f8fb9d7ee 100644
--- a/src/calibre/utils/bibtex.py
+++ b/src/calibre/utils/bibtex.py
@@ -2902,3 +2902,31 @@ class BibTeX:
         """
         return self.utf8ToBibtex(u' and '.join([author for author in item]))
 
+    def stripUnmatchedSyntax(self, text, open_character, close_character):
+        """ 
+        Strips unmatched BibTeX syntax
+        """
+        stack = list()
+    
+        if len(open_character) > 1 or len(close_character) > 1:
+            raise ValueError("Only single characters accepted")
+        
+        for i in text:
+            if i == open_character: 
+                stack.append(open_character)
+            # if there is already an orphan closing character strip everything
+            elif i == close_character and not stack:
+                text = text.replace(open_character, u'')
+                text = text.replace(close_character, u'')
+                return text 
+            elif i == close_character and stack:
+                    stack.pop()
+                    
+        # if there are still open_tokens on the stack they have not been closed strip everything
+        if stack:
+            text = text.replace(open_character, u'')
+            text = text.replace(close_character, u'')
+            return text
+        # if nothing left on stack all characters matched and do nothing
+        else:
+            return text

From 966f4ab841f432d8c078ee0897cbeb8d2b3c1628 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 16:39:59 +0530
Subject: [PATCH 1150/1154] Working CSS syntax highlighting

---
 .../gui2/tweak_book/editor/syntax/css.py      | 231 +++++++++++++++++-
 src/calibre/gui2/tweak_book/editor/themes.py  |   2 +-
 2 files changed, 229 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/css.py b/src/calibre/gui2/tweak_book/editor/syntax/css.py
index 4b6a432384..cbc3ebf5a0 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/css.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/css.py
@@ -6,11 +6,127 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
+import re
+from functools import partial
+
 from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
 
+from PyQt4.Qt import QTextCharFormat
+
+space_pat = re.compile(r'[ \n\t\r\f]+')
+cdo_pat = re.compile(r'/\*')
+sheet_tokens = [(re.compile(k), v, n) for k, v, n in [
+    (r'\:[a-zA-Z0-9_-]+', 'pseudo_selector', 'pseudo-selector'),
+    (r'\.[a-zA-Z0-9_-]+', 'class_selector', 'class-selector'),
+    (r'\#[a-zA-Z0-9_-]+', 'id_selector', 'id-selector'),
+    (r'@[a-zA-Z0-9_-]+', 'preproc', 'atrule'),
+    (r'[a-zA-Z0-9_-]+', 'tag', 'tag'),
+    (r'[~\^\*!%&\[\]\(\)<>\|+=@:;,./?-]', 'operator', 'operator'),
+]]
+
+content_tokens = [(re.compile(k), v, n) for k, v, n in [
+    (r'url\(.*?\)', 'string', 'url'),
+    (r'@\S+', 'preproc', 'at-rule'),
+    (r'(azimuth|background-attachment|background-color|'
+    r'background-image|background-position|background-repeat|'
+    r'background|border-bottom-color|border-bottom-style|'
+    r'border-bottom-width|border-left-color|border-left-style|'
+    r'border-left-width|border-right|border-right-color|'
+    r'border-right-style|border-right-width|border-top-color|'
+    r'border-top-style|border-top-width|border-bottom|'
+    r'border-collapse|border-left|border-width|border-color|'
+    r'border-spacing|border-style|border-top|border|caption-side|'
+    r'clear|clip|color|content|counter-increment|counter-reset|'
+    r'cue-after|cue-before|cue|cursor|direction|display|'
+    r'elevation|empty-cells|float|font-family|font-size|'
+    r'font-size-adjust|font-stretch|font-style|font-variant|'
+    r'font-weight|font|height|letter-spacing|line-height|'
+    r'list-style-type|list-style-image|list-style-position|'
+    r'list-style|margin-bottom|margin-left|margin-right|'
+    r'margin-top|margin|marker-offset|marks|max-height|max-width|'
+    r'min-height|min-width|opacity|orphans|outline|outline-color|'
+    r'outline-style|outline-width|overflow(?:-x|-y)?|padding-bottom|'
+    r'padding-left|padding-right|padding-top|padding|page|'
+    r'page-break-after|page-break-before|page-break-inside|'
+    r'pause-after|pause-before|pause|pitch|pitch-range|'
+    r'play-during|position|quotes|richness|right|size|'
+    r'speak-header|speak-numeral|speak-punctuation|speak|'
+    r'speech-rate|stress|table-layout|text-align|text-decoration|'
+    r'text-indent|text-shadow|text-transform|top|unicode-bidi|'
+    r'vertical-align|visibility|voice-family|volume|white-space|'
+    r'widows|width|word-spacing|z-index|bottom|left|'
+    r'above|absolute|always|armenian|aural|auto|avoid|baseline|'
+    r'behind|below|bidi-override|blink|block|bold|bolder|both|'
+    r'capitalize|center-left|center-right|center|circle|'
+    r'cjk-ideographic|close-quote|collapse|condensed|continuous|'
+    r'crop|crosshair|cross|cursive|dashed|decimal-leading-zero|'
+    r'decimal|default|digits|disc|dotted|double|e-resize|embed|'
+    r'extra-condensed|extra-expanded|expanded|fantasy|far-left|'
+    r'far-right|faster|fast|fixed|georgian|groove|hebrew|help|'
+    r'hidden|hide|higher|high|hiragana-iroha|hiragana|icon|'
+    r'inherit|inline-table|inline|inset|inside|invert|italic|'
+    r'justify|katakana-iroha|katakana|landscape|larger|large|'
+    r'left-side|leftwards|level|lighter|line-through|list-item|'
+    r'loud|lower-alpha|lower-greek|lower-roman|lowercase|ltr|'
+    r'lower|low|medium|message-box|middle|mix|monospace|'
+    r'n-resize|narrower|ne-resize|no-close-quote|no-open-quote|'
+    r'no-repeat|none|normal|nowrap|nw-resize|oblique|once|'
+    r'open-quote|outset|outside|overline|pointer|portrait|px|'
+    r'relative|repeat-x|repeat-y|repeat|rgb|ridge|right-side|'
+    r'rightwards|s-resize|sans-serif|scroll|se-resize|'
+    r'semi-condensed|semi-expanded|separate|serif|show|silent|'
+    r'slow|slower|small-caps|small-caption|smaller|soft|solid|'
+    r'spell-out|square|static|status-bar|super|sw-resize|'
+    r'table-caption|table-cell|table-column|table-column-group|'
+    r'table-footer-group|table-header-group|table-row|'
+    r'table-row-group|text|text-bottom|text-top|thick|thin|'
+    r'transparent|ultra-condensed|ultra-expanded|underline|'
+    r'upper-alpha|upper-latin|upper-roman|uppercase|url|'
+    r'visible|w-resize|wait|wider|x-fast|x-high|x-large|x-loud|'
+    r'x-low|x-small|x-soft|xx-large|xx-small|yes)\b', 'keyword', 'keyword'),
+    (r'(indigo|gold|firebrick|indianred|yellow|darkolivegreen|'
+    r'darkseagreen|mediumvioletred|mediumorchid|chartreuse|'
+    r'mediumslateblue|black|springgreen|crimson|lightsalmon|brown|'
+    r'turquoise|olivedrab|cyan|silver|skyblue|gray|darkturquoise|'
+    r'goldenrod|darkgreen|darkviolet|darkgray|lightpink|teal|'
+    r'darkmagenta|lightgoldenrodyellow|lavender|yellowgreen|thistle|'
+    r'violet|navy|orchid|blue|ghostwhite|honeydew|cornflowerblue|'
+    r'darkblue|darkkhaki|mediumpurple|cornsilk|red|bisque|slategray|'
+    r'darkcyan|khaki|wheat|deepskyblue|darkred|steelblue|aliceblue|'
+    r'gainsboro|mediumturquoise|floralwhite|coral|purple|lightgrey|'
+    r'lightcyan|darksalmon|beige|azure|lightsteelblue|oldlace|'
+    r'greenyellow|royalblue|lightseagreen|mistyrose|sienna|'
+    r'lightcoral|orangered|navajowhite|lime|palegreen|burlywood|'
+    r'seashell|mediumspringgreen|fuchsia|papayawhip|blanchedalmond|'
+    r'peru|aquamarine|white|darkslategray|ivory|dodgerblue|'
+    r'lemonchiffon|chocolate|orange|forestgreen|slateblue|olive|'
+    r'mintcream|antiquewhite|darkorange|cadetblue|moccasin|'
+    r'limegreen|saddlebrown|darkslateblue|lightskyblue|deeppink|'
+    r'plum|aqua|darkgoldenrod|maroon|sandybrown|magenta|tan|'
+    r'rosybrown|pink|lightblue|palevioletred|mediumseagreen|'
+    r'dimgray|powderblue|seagreen|snow|mediumblue|midnightblue|'
+    r'paleturquoise|palegoldenrod|whitesmoke|darkorchid|salmon|'
+    r'lightslategray|lawngreen|lightgreen|tomato|hotpink|'
+    r'lightyellow|lavenderblush|linen|mediumaquamarine|green|'
+    r'blueviolet|peachpuff)\b', 'colorname', 'colorname'),
+    (r'\!important', 'preproc', 'important'),
+    (r'\#[a-zA-Z0-9]{1,6}', 'number', 'hexnumber'),
+    (r'[\.-]?[0-9]*[\.]?[0-9]+(em|px|pt|pc|in|mm|cm|ex|s|rem)\b', 'number', 'dimension'),
+    (r'[\.-]?[0-9]*[\.]?[0-9]+%($|[ \n\t\f\r;}{()\[\]])', 'number', 'dimension'),
+    (r'-?[0-9]+', 'number', 'number'),
+    (r'[~\^\*!%&<>\|+=@:,./?-]+', 'operator', 'operator'),
+    (r'[\[\]();]+', 'bracket', 'bracket'),
+    (r'[a-zA-Z_][a-zA-Z0-9_]*', 'identifier', 'ident')
+
+]]
+
 class State(object):
 
     NORMAL = 0
+    IN_COMMENT = 1
+    IN_SQS = 2
+    IN_DQS = 3
+    IN_CONTENT = 4
 
     def __init__(self, num):
         self.parse  = num & 0b1111
@@ -22,11 +138,85 @@ class State(object):
 
 
 def normal(state, text, i, formats):
-    ' The normal state (outside everything) '
-    return [(len(text), None)]
+    ' The normal state (outside content blocks {})'
+    m = space_pat.match(text, i)
+    if m is not None:
+        return [(len(m.group()), None)]
+    cdo = cdo_pat.match(text, i)
+    if cdo is not None:
+        state.parse = State.IN_COMMENT
+        return [(len(cdo.group()), formats['comment'])]
+    if text[i] == '"':
+        state.parse = State.IN_DQS
+        return [(1, formats['string'])]
+    if text[i] == "'":
+        state.parse = State.IN_SQS
+        return [(1, formats['string'])]
+    if text[i] == '{':
+        state.parse = State.IN_CONTENT
+        state.blocks += 1
+        return [(1, formats['bracket'])]
+    for token, fmt, name in sheet_tokens:
+        m = token.match(text, i)
+        if m is not None:
+            return [(len(m.group()), formats[fmt])]
+
+    return [(len(text) - i, formats['unknown-normal'])]
+
+def content(state, text, i, formats):
+    ' Inside content blocks '
+    m = space_pat.match(text, i)
+    if m is not None:
+        return [(len(m.group()), None)]
+    cdo = cdo_pat.match(text, i)
+    if cdo is not None:
+        state.parse = State.IN_COMMENT
+        return [(len(cdo.group()), formats['comment'])]
+    if text[i] == '"':
+        state.parse = State.IN_DQS
+        return [(1, formats['string'])]
+    if text[i] == "'":
+        state.parse = State.IN_SQS
+        return [(1, formats['string'])]
+    if text[i] == '}':
+        state.blocks -= 1
+        state.parse = State.NORMAL if state.blocks < 1 else State.IN_CONTENT
+        return [(1, formats['bracket'])]
+    if text[i] == '{':
+        state.blocks += 1
+        return [(1, formats['bracket'])]
+    for token, fmt, name in content_tokens:
+        m = token.match(text, i)
+        if m is not None:
+            return [(len(m.group()), formats[fmt])]
+
+    return [(len(text) - i, formats['unknown-normal'])]
+
+def comment(state, text, i, formats):
+    ' Inside a comment '
+    pos = text.find('*/', i)
+    if pos == -1:
+        return [(len(text), formats['comment'])]
+    state.parse = State.NORMAL
+    return [(pos - i + 2, formats['comment'])]
+
+def in_string(q, state, text, i, formats):
+    'Inside a string'
+    pos = text.find(q, i)
+    if pos == -1:
+        if text[-1] == '\\':
+            return [(len(text) - i, formats['string'])]
+        state.parse = (State.NORMAL if state.blocks < 1 else State.IN_CONTENT)
+        return [(len(text) - i, formats['unterminated-string'])]
+    state.parse = (State.NORMAL if state.blocks < 1 else State.IN_CONTENT)
+    return [(pos - i + len(q), formats['string'])]
 
 state_map = {
     State.NORMAL:normal,
+    State.IN_COMMENT: comment,
+    State.IN_SQS: partial(in_string, "'"),
+    State.IN_DQS: partial(in_string, '"'),
+    State.IN_CONTENT: content,
 }
 
 class CSSHighlighter(SyntaxHighlighter):
@@ -38,14 +228,49 @@ class CSSHighlighter(SyntaxHighlighter):
         SyntaxHighlighter.__init__(self, parent)
 
     def create_formats(self):
-        # t = self.theme
+        t = self.theme
         self.formats = {
+            'comment': t['Comment'],
+            'error': t['Error'],
+            'string': t['String'],
+            'preproc': t['PreProc'],
+            'keyword': t['Keyword'],
+            'colorname': t['Constant'],
+            'number': t['Number'],
+            'operator': t['Function'],
+            'bracket': t['Special'],
+            'identifier': t['Identifier'],
+            'id_selector': t['Special'],
+            'class_selector': t['Special'],
+            'pseudo_selector': t['Special'],
+            'tag': t['Identifier'],
         }
+        for name, msg in {
+            'unknown-normal': _('Invalid text'),
+            'unterminated-string': _('Unterminated string'),
+        }.iteritems():
+            f = self.formats[name] = QTextCharFormat(self.formats['error'])
+            f.setToolTip(msg)
+
 
 if __name__ == '__main__':
     from calibre.gui2.tweak_book.editor.text import launch_editor
     launch_editor('''\
 @charset "utf-8";
 /* A demonstration css sheet */
+body {
+    color: green;
+    font-size: 12pt
+}
+
+div#main > a:hover {
+    background: url("../image.png");
+    font-family: "A font", sans-serif;
+}
+
+li[rel="mewl"], p.mewl {
+    margin-top: 2% 0 23pt 1em;
+}
+
 ''', path_is_raw=True, syntax='css')
 
diff --git a/src/calibre/gui2/tweak_book/editor/themes.py b/src/calibre/gui2/tweak_book/editor/themes.py
index 74ba428129..3d3b5fa618 100644
--- a/src/calibre/gui2/tweak_book/editor/themes.py
+++ b/src/calibre/gui2/tweak_book/editor/themes.py
@@ -33,13 +33,13 @@ THEMES = {
 
     Comment      fg=99968b
     Todo         fg=8f8f8f
-    Constant     fg=e5786d
     String       fg=95e454
     Identifier   fg=cae682
     Function     fg=cae682
     Type         fg=cae682
     Statement    fg=8ac6f2
     Keyword      fg=8ac6f2
+    Constant     fg=e5786d
     PreProc      fg=e5786d
     Number       fg=e5786d
     Special      fg=e7f6da

From 96a2c155e92cde3b6b319f2bdad279d7afd4f904 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 17:24:46 +0530
Subject: [PATCH 1151/1154] Refactor the highlighter classes to make them
 completely trivial

---
 .../gui2/tweak_book/editor/syntax/base.py     |  7 +-
 .../gui2/tweak_book/editor/syntax/css.py      | 65 +++++++++---------
 .../gui2/tweak_book/editor/syntax/html.py     | 66 +++++++++----------
 3 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py
index 3e59729762..e9ce07dfb9 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/base.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py
@@ -32,7 +32,10 @@ class SyntaxHighlighter(QSyntaxHighlighter):
 
     state_class = SimpleState
     state_map = {0:lambda state, text, i, formats:[(len(text), None)]}
-    formats = {}
+    create_formats_func = lambda highlighter: {}
+
+    def __init__(self, *args, **kwargs):
+        QSyntaxHighlighter.__init__(self, *args, **kwargs)
 
     def rehighlight(self):
         self.outlineexplorer_data = {}
@@ -46,7 +49,7 @@ class SyntaxHighlighter(QSyntaxHighlighter):
         self.rehighlight()
 
     def create_formats(self):
-        pass
+        self.formats = self.create_formats_func()
 
     def highlightBlock(self, text):
         try:
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/css.py b/src/calibre/gui2/tweak_book/editor/syntax/css.py
index cbc3ebf5a0..c4ad909ac0 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/css.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/css.py
@@ -7,7 +7,6 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import re
-from functools import partial
 
 from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
 
@@ -200,8 +199,9 @@ def comment(state, text, i, formats):
     state.parse = State.NORMAL
     return [(pos - i + 2, formats['comment'])]
 
-def in_string(q, state, text, i, formats):
+def in_string(state, text, i, formats):
     'Inside a string'
+    q = '"' if state.parse == State.IN_DQS else "'"
     pos = text.find(q, i)
     if pos == -1:
         if text[-1] == '\\':
@@ -214,44 +214,43 @@ def in_string(q, state, text, i, formats):
 state_map = {
     State.NORMAL:normal,
     State.IN_COMMENT: comment,
-    State.IN_SQS: partial(in_string, "'"),
-    State.IN_DQS: partial(in_string, '"'),
+    State.IN_SQS: in_string,
+    State.IN_DQS: in_string,
     State.IN_CONTENT: content,
 }
 
+def create_formats(highlighter):
+    theme = highlighter.theme
+    formats = {
+        'comment': theme['Comment'],
+        'error': theme['Error'],
+        'string': theme['String'],
+        'preproc': theme['PreProc'],
+        'keyword': theme['Keyword'],
+        'colorname': theme['Constant'],
+        'number': theme['Number'],
+        'operator': theme['Function'],
+        'bracket': theme['Special'],
+        'identifier': theme['Identifier'],
+        'id_selector': theme['Special'],
+        'class_selector': theme['Special'],
+        'pseudo_selector': theme['Special'],
+        'tag': theme['Identifier'],
+    }
+    for name, msg in {
+        'unknown-normal': _('Invalid text'),
+        'unterminated-string': _('Unterminated string'),
+    }.iteritems():
+        f = formats[name] = QTextCharFormat(formats['error'])
+        f.setToolTip(msg)
+    return formats
+
+
 class CSSHighlighter(SyntaxHighlighter):
 
     state_map = state_map
     state_class = State
-
-    def __init__(self, parent):
-        SyntaxHighlighter.__init__(self, parent)
-
-    def create_formats(self):
-        t = self.theme
-        self.formats = {
-            'comment': t['Comment'],
-            'error': t['Error'],
-            'string': t['String'],
-            'preproc': t['PreProc'],
-            'keyword': t['Keyword'],
-            'colorname': t['Constant'],
-            'number': t['Number'],
-            'operator': t['Function'],
-            'bracket': t['Special'],
-            'identifier': t['Identifier'],
-            'id_selector': t['Special'],
-            'class_selector': t['Special'],
-            'pseudo_selector': t['Special'],
-            'tag': t['Identifier'],
-        }
-        for name, msg in {
-            'unknown-normal': _('Invalid text'),
-            'unterminated-string': _('Unterminated string'),
-        }.iteritems():
-            f = self.formats[name] = QTextCharFormat(self.formats['error'])
-            f.setToolTip(msg)
-
+    create_formats_func = create_formats
 
 if __name__ == '__main__':
     from calibre.gui2.tweak_book.editor.text import launch_editor
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index dccb4f7043..c9aa5a6f73 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -249,43 +249,43 @@ for x in (State.IN_COMMENT, State.IN_PI, State.IN_DOCTYPE):
 for x in (State.SQ_VAL, State.DQ_VAL):
     state_map[x] = quoted_val
 
+def create_formats(highlighter):
+    t = highlighter.theme
+    formats = {
+        'tag': t['Function'],
+        'end_tag': t['Function'],
+        'attr': t['Type'],
+        'tag_name' : t['Statement'],
+        'entity': t['Special'],
+        'error': t['Error'],
+        'comment': t['Comment'],
+        'special': t['Special'],
+        'string': t['String'],
+        'nsprefix': t['Constant'],
+        'preproc': t['PreProc'],
+        'nbsp': t['CursorLine'],
+    }
+    for name, msg in {
+        '<': _('An unescaped < is not allowed. Replace it with &lt;'),
+        '&': _('An unescaped ampersand is not allowed. Replace it with &amp;'),
+        '>': _('An unescaped > is not allowed. Replace it with &gt;'),
+        '/': _('/ not allowed except at the end of the tag'),
+        '?': _('Unknown character'),
+        'bad-closing': _('A closing tag must contain only the tag name and nothing else'),
+        'no-attr-value': _('Expecting an attribute value'),
+    }.iteritems():
+        f = formats[name] = QTextCharFormat(formats['error'])
+        f.setToolTip(msg)
+    f = formats['title'] = QTextCharFormat()
+    f.setFontWeight(QFont.Bold)
+    return formats
+
+
 class HTMLHighlighter(SyntaxHighlighter):
 
     state_map = state_map
     state_class = State
-
-    def __init__(self, parent):
-        SyntaxHighlighter.__init__(self, parent)
-
-    def create_formats(self):
-        t = self.theme
-        self.formats = {
-            'tag': t['Function'],
-            'end_tag': t['Function'],
-            'attr': t['Type'],
-            'tag_name' : t['Statement'],
-            'entity': t['Special'],
-            'error': t['Error'],
-            'comment': t['Comment'],
-            'special': t['Special'],
-            'string': t['String'],
-            'nsprefix': t['Constant'],
-            'preproc': t['PreProc'],
-            'nbsp': t['CursorLine'],
-        }
-        for name, msg in {
-            '<': _('An unescaped < is not allowed. Replace it with &lt;'),
-            '&': _('An unescaped ampersand is not allowed. Replace it with &amp;'),
-            '>': _('An unescaped > is not allowed. Replace it with &gt;'),
-            '/': _('/ not allowed except at the end of the tag'),
-            '?': _('Unknown character'),
-            'bad-closing': _('A closing tag must contain only the tag name and nothing else'),
-            'no-attr-value': _('Expecting an attribute value'),
-        }.iteritems():
-            f = self.formats[name] = QTextCharFormat(self.formats['error'])
-            f.setToolTip(msg)
-        f = self.formats['title'] = QTextCharFormat()
-        f.setFontWeight(QFont.Bold)
+    create_formats_func = create_formats
 
 if __name__ == '__main__':
     from calibre.gui2.tweak_book.editor.text import launch_editor

From a5cd87de728d98eab579402864ceff2a58d8e1aa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 17:25:26 +0530
Subject: [PATCH 1152/1154] ...

---
 src/calibre/gui2/tweak_book/editor/syntax/css.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/css.py b/src/calibre/gui2/tweak_book/editor/syntax/css.py
index c4ad909ac0..3b836e8f64 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/css.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/css.py
@@ -205,6 +205,7 @@ def in_string(state, text, i, formats):
     pos = text.find(q, i)
     if pos == -1:
         if text[-1] == '\\':
+            # Multi-line string
             return [(len(text) - i, formats['string'])]
         state.parse = (State.NORMAL if state.blocks < 1 else State.IN_CONTENT)
         return [(len(text) - i, formats['unterminated-string'])]

From 4d405d7b907373e8c48c68d4d40f809b31fe626a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 18:27:06 +0530
Subject: [PATCH 1153/1154] Highlight CSS inside <style> tags

---
 .../gui2/tweak_book/editor/syntax/base.py     |  9 ++--
 .../gui2/tweak_book/editor/syntax/html.py     | 48 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py
index e9ce07dfb9..4524bd1934 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/base.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py
@@ -19,13 +19,12 @@ class SimpleState(object):
     def value(self):
         return self.parse
 
-def run_loop(state, state_map, set_format, formats, text):
+def run_loop(state, state_map, formats, text):
     i = 0
     while i < len(text):
         fmt = state_map[state.parse](state, text, i, formats)
         for num, f in fmt:
-            if f is not None:
-                set_format(i, num, f)
+            yield i, num, f
             i += num
 
 class SyntaxHighlighter(QSyntaxHighlighter):
@@ -57,7 +56,9 @@ class SyntaxHighlighter(QSyntaxHighlighter):
             if state == -1:
                 state = 0
             state = self.state_class(state)
-            run_loop(state, self.state_map, self.setFormat, self.formats, unicode(text))
+            for i, num, fmt in run_loop(state, self.state_map, self.formats, unicode(text)):
+                if fmt is not None:
+                    self.setFormat(i, num, fmt)
             self.setCurrentBlockState(state.value)
         except:
             import traceback
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index c9aa5a6f73..189c67706e 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -10,7 +10,9 @@ import re
 
 from PyQt4.Qt import (QTextCharFormat, QFont)
 
-from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter
+from calibre.gui2.tweak_book.editor.syntax.base import SyntaxHighlighter, run_loop
+from calibre.gui2.tweak_book.editor.syntax.css import create_formats as create_css_formats, state_map as css_state_map, State as CSSState
+
 from html5lib.constants import cdataElements, rcdataElements
 
 cdata_tags = cdataElements | rcdataElements
@@ -43,6 +45,7 @@ class State(object):
     SQ_VAL = 8
     DQ_VAL = 9
     CDATA = 10
+    CSS = 11
 
     TAGS = {x:i+1 for i, x in enumerate(cdata_tags | bold_tags | italic_tags)}
     TAGS_RMAP = {v:k for k, v in TAGS.iteritems()}
@@ -53,15 +56,43 @@ class State(object):
         self.bold   = (num >> 4) & 0b11111111
         self.italic = (num >> 12) & 0b11111111
         self.tag    = self.TAGS_RMAP.get(num >> 20, self.UNKNOWN_TAG)
+        self.css    = 0
+        if self.parse == State.CSS:
+            self.css = num >> 4
 
     @property
     def value(self):
+        if self.parse == State.CSS:
+            return ((self.parse & 0b1111) | (self.css << 4))
         tag = self.TAGS.get(self.tag.lower(), 0)
         return ((self.parse & 0b1111) |
                 ((max(0, self.bold) & 0b11111111) << 4) |
                 ((max(0, self.italic) & 0b11111111) << 12) |
                 (tag << 20))
 
+    def clear(self):
+        self.parse = self.bold = self.italic = self.css = 0
+        self.tag = self.UNKNOWN_TAG
+
+def css(state, text, i, formats):
+    ' Inside a <style> tag '
+    pat = cdata_close_pats['style']
+    m = pat.search(text, i)
+    if m is None:
+        css_text = text[i:]
+    else:
+        css_text = text[i:m.start()]
+    ans = []
+    css_state = CSSState(state.css)
+    for j, num, fmt in run_loop(css_state, css_state_map, state.css_formats, css_text):
+        ans.append((num, fmt))
+    state.css = css_state.value
+    if m is not None:
+        state.clear()
+        state.parse = State.IN_CLOSING_TAG
+        ans.extend([(2, formats['end_tag']), (len(m.group()) - 2, formats['tag_name'])])
+    return ans
+
 def cdata(state, text, i, formats):
     'CDATA inside tags like <title> or <style>'
     pat = cdata_close_pats[state.tag]
@@ -152,6 +183,9 @@ def opening_tag(state, text, i, formats):
         tag = state.tag.lower()
         if tag in cdata_tags:
             state.parse = state.CDATA
+            if tag == 'style':
+                state.clear()
+                state.parse = state.CSS
         state.bold += int(tag in bold_tags)
         state.italic += int(tag in italic_tags)
         return [(1, formats['tag'])]
@@ -241,6 +275,7 @@ state_map = {
     State.ATTRIBUTE_NAME: attribute_name,
     State.ATTRIBUTE_VALUE: attribute_value,
     State.CDATA: cdata,
+    State.CSS: css,
 }
 
 for x in (State.IN_COMMENT, State.IN_PI, State.IN_DOCTYPE):
@@ -287,6 +322,16 @@ class HTMLHighlighter(SyntaxHighlighter):
     state_class = State
     create_formats_func = create_formats
 
+    def create_formats(self):
+        super(HTMLHighlighter, self).create_formats()
+        self.css_formats = create_css_formats(self)
+        self.state_class = self.create_state
+
+    def create_state(self, val):
+        ans = State(val)
+        ans.css_formats = self.css_formats
+        return ans
+
 if __name__ == '__main__':
     from calibre.gui2.tweak_book.editor.text import launch_editor
     launch_editor('''\
@@ -301,6 +346,7 @@ if __name__ == '__main__':
                   font-size: 12pt;
             }
         </style>
+        <style type="text/css">p.small { font-size: x-small; color:gray }</style>
     </head id="invalid attribute on closing tag">
     <body>
         <!-- The start of the actual body text -->

From bf634eef36b04bd46ac4968bc099ec2f5bb20190 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 31 Oct 2013 21:36:06 +0530
Subject: [PATCH 1154/1154] Add device ids for Kindle Fire HDX to linux MTP
 driver

Fixes #1246775 [Please add Kindle Fire HDX to MTP list](https://bugs.launchpad.net/calibre/+bug/1246775)
---
 src/calibre/devices/mtp/unix/devices.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/devices/mtp/unix/devices.c b/src/calibre/devices/mtp/unix/devices.c
index c8d000bc09..37e25cbdf2 100644
--- a/src/calibre/devices/mtp/unix/devices.c
+++ b/src/calibre/devices/mtp/unix/devices.c
@@ -13,6 +13,8 @@ const calibre_device_entry_t calibre_mtp_device_table[] = {
 
     , { "Acer", 0x0502, "MT65xx Android Phone", 0x353c, DEVICE_FLAGS_ANDROID_BUGS }
 
+    , { "Amazon", 0x1949, "Kindle Fire HDX", 0x000c, DEVICE_FLAGS_ANDROID_BUGS }
+
     , { NULL, 0xffff, NULL, 0xffff, DEVICE_FLAG_NONE }
 };